diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-12-13 19:09:10 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-12-14 07:17:44 +1100 |
commit | b52ec0ba3983859514aa7b57d6100fa9759fe696 (patch) | |
tree | 262c9a2ebc4e6972594f45ea75fc15e8ae3bfefb /ssh-sk.h | |
parent | c33d46868c3d88e04a92610cdb429094aeeb5847 (diff) |
upstream: use ssh-sk-helper for all security key signing operations
This extracts and refactors the client interface for ssh-sk-helper
from ssh-agent and generalises it for use by the other programs.
This means that most OpenSSH tools no longer need to link against
libfido2 or directly interact with /dev/uhid*
requested by, feedback and ok markus@
OpenBSD-Commit-ID: 1abcd3aea9a7460eccfbf8ca154cdfa62f1dc93f
Diffstat (limited to 'ssh-sk.h')
-rw-r--r-- | ssh-sk.h | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-sk.h,v 1.5 2019/11/12 19:31:45 markus Exp $ */ | 1 | /* $OpenBSD: ssh-sk.h,v 1.6 2019/12/13 19:09:10 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019 Google LLC | 3 | * Copyright (c) 2019 Google LLC |
4 | * | 4 | * |
@@ -21,9 +21,6 @@ | |||
21 | struct sshbuf; | 21 | struct sshbuf; |
22 | struct sshkey; | 22 | struct sshkey; |
23 | 23 | ||
24 | /* Version of protocol between ssh-agent and ssh-sk-helper */ | ||
25 | #define SSH_SK_HELPER_VERSION 1 | ||
26 | |||
27 | /* | 24 | /* |
28 | * Enroll (generate) a new security-key hosted private key of given type | 25 | * Enroll (generate) a new security-key hosted private key of given type |
29 | * via the specified provider middleware. | 26 | * via the specified provider middleware. |
@@ -44,7 +41,7 @@ int sshsk_enroll(int type, const char *provider_path, const char *application, | |||
44 | * | 41 | * |
45 | * Returns 0 on success or a ssherr.h error code on failure. | 42 | * Returns 0 on success or a ssherr.h error code on failure. |
46 | */ | 43 | */ |
47 | int sshsk_sign(const char *provider_path, const struct sshkey *key, | 44 | int sshsk_sign(const char *provider_path, struct sshkey *key, |
48 | u_char **sigp, size_t *lenp, const u_char *data, size_t datalen, | 45 | u_char **sigp, size_t *lenp, const u_char *data, size_t datalen, |
49 | u_int compat); | 46 | u_int compat); |
50 | 47 | ||