diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-10-28 02:54:18 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-10-28 13:56:59 +1100 |
| commit | 0001d04e55802d5bd9d6dece1081a99aa4ba2828 (patch) | |
| tree | 9744b3ef6c10636866d1c304846a182451010155 /sk-api.h | |
| parent | d4bed5445646e605c383a4374fa962e23bf9e3a3 (diff) | |
| download | openssh-git-0001d04e55802d5bd9d6dece1081a99aa4ba2828.tar.gz | |
upstream: When downloading resident keys from a FIDO token, pass
back the user ID that was used when the key was created and append it to the
filename the key is written to (if it is not the default).
Avoids keys being clobbered if the user created multiple
resident keys with the same application string but different
user IDs.
feedback Pedro Martelletto; ok markus
NB. increments SSH_SK_VERSION_MAJOR
OpenBSD-Commit-ID: dbd658b5950f583106d945641a634bc6562dd3a3
Diffstat (limited to 'sk-api.h')
| -rw-r--r-- | sk-api.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sk-api.h,v 1.12 2021/02/18 02:15:07 djm Exp $ */ +/* $OpenBSD: sk-api.h,v 1.13 2021/10/28 02:54:18 djm Exp $ */ /* * Copyright (c) 2019 Google LLC * @@ -66,6 +66,8 @@ struct sk_resident_key { char *application; struct sk_enroll_response key; uint8_t flags; + uint8_t *user_id; + size_t user_id_len; }; struct sk_option { @@ -74,7 +76,7 @@ struct sk_option { uint8_t required; }; -#define SSH_SK_VERSION_MAJOR 0x00070000 /* current API version */ +#define SSH_SK_VERSION_MAJOR 0x00080000 /* current API version */ #define SSH_SK_VERSION_MAJOR_MASK 0xffff0000 /* Return the version of the middleware API */ |