diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-12-30 09:23:28 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-12-30 20:59:33 +1100 |
commit | c54cd1892c3e7f268b21e1f07ada9f0d9816ffc0 (patch) | |
tree | 71f801c4734b81311ec04f8bba13376c0d6591b0 /sshkey.h | |
parent | 79fe22d9bc2868c5118f032ec1200ac9c2e3aaef (diff) |
upstream: SK API and sk-helper error/PIN passing
Allow passing a PIN via the SK API (API major crank) and let the
ssh-sk-helper API follow.
Also enhance the ssh-sk-helper API to support passing back an error
code instead of a complete reply. Will be used to signal "wrong PIN",
etc.
feedback and ok markus@
OpenBSD-Commit-ID: a1bd6b0a2421646919a0c139b8183ad76d28fb71
Diffstat (limited to 'sshkey.h')
-rw-r--r-- | sshkey.h | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.h,v 1.43 2019/12/30 09:21:59 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.h,v 1.44 2019/12/30 09:23:28 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -51,14 +51,6 @@ | |||
51 | #define SSH_RSA_MINIMUM_MODULUS_SIZE 1024 | 51 | #define SSH_RSA_MINIMUM_MODULUS_SIZE 1024 |
52 | #define SSH_KEY_MAX_SIGN_DATA_SIZE (1 << 20) | 52 | #define SSH_KEY_MAX_SIGN_DATA_SIZE (1 << 20) |
53 | 53 | ||
54 | /* Version of protocol expected from ssh-sk-helper */ | ||
55 | #define SSH_SK_HELPER_VERSION 2 | ||
56 | |||
57 | /* ssh-sk-helper messages */ | ||
58 | #define SSH_SK_HELPER_SIGN 1 | ||
59 | #define SSH_SK_HELPER_ENROLL 2 | ||
60 | #define SSH_SK_HELPER_LOAD_RESIDENT 3 | ||
61 | |||
62 | struct sshbuf; | 54 | struct sshbuf; |
63 | 55 | ||
64 | /* Key types */ | 56 | /* Key types */ |