summaryrefslogtreecommitdiff
path: root/ssh-sk.h
diff options
context:
space:
mode:
Diffstat (limited to 'ssh-sk.h')
-rw-r--r--ssh-sk.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/ssh-sk.h b/ssh-sk.h
index 348759a98..ea9ff6e1a 100644
--- a/ssh-sk.h
+++ b/ssh-sk.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-sk.h,v 1.8 2019/12/30 09:23:28 djm Exp $ */ 1/* $OpenBSD: ssh-sk.h,v 1.9 2020/01/06 02:00:47 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2019 Google LLC 3 * Copyright (c) 2019 Google LLC
4 * 4 *
@@ -20,9 +20,10 @@
20 20
21struct sshbuf; 21struct sshbuf;
22struct sshkey; 22struct sshkey;
23struct sk_option;
23 24
24/* Version of protocol expected from ssh-sk-helper */ 25/* Version of protocol expected from ssh-sk-helper */
25#define SSH_SK_HELPER_VERSION 3 26#define SSH_SK_HELPER_VERSION 4
26 27
27/* ssh-sk-helper messages */ 28/* ssh-sk-helper messages */
28#define SSH_SK_HELPER_ERROR 0 /* Only valid H->C */ 29#define SSH_SK_HELPER_ERROR 0 /* Only valid H->C */
@@ -40,8 +41,9 @@ struct sshkey;
40 * If successful and the attest_data buffer is not NULL then attestation 41 * If successful and the attest_data buffer is not NULL then attestation
41 * information is placed there. 42 * information is placed there.
42 */ 43 */
43int sshsk_enroll(int type, const char *provider_path, const char *application, 44int sshsk_enroll(int type, const char *provider_path, const char *device,
44 uint8_t flags, const char *pin, struct sshbuf *challenge_buf, 45 const char *application, const char *userid, uint8_t flags,
46 const char *pin, struct sshbuf *challenge_buf,
45 struct sshkey **keyp, struct sshbuf *attest); 47 struct sshkey **keyp, struct sshbuf *attest);
46 48
47/* 49/*
@@ -60,8 +62,8 @@ int sshsk_sign(const char *provider_path, struct sshkey *key,
60 * 62 *
61 * Returns 0 on success or a ssherr.h error code on failure. 63 * Returns 0 on success or a ssherr.h error code on failure.
62 */ 64 */
63int sshsk_load_resident(const char *provider_path, const char *pin, 65int sshsk_load_resident(const char *provider_path, const char *device,
64 struct sshkey ***keysp, size_t *nkeysp); 66 const char *pin, struct sshkey ***keysp, size_t *nkeysp);
65 67
66#endif /* _SSH_SK_H */ 68#endif /* _SSH_SK_H */
67 69