diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:03:12 +0100 |
commit | 30337f8b66c66af6b368d1e3c789e75f1247176c (patch) | |
tree | 17e0b8652fea31c04faa19ffc4cd088552ee473a /PROTOCOL.u2f | |
parent | aef2be11c5ea90bc66e774923e6570213e54c195 (diff) | |
parent | 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff) |
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'PROTOCOL.u2f')
-rw-r--r-- | PROTOCOL.u2f | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/PROTOCOL.u2f b/PROTOCOL.u2f index 748111d56..917e669cd 100644 --- a/PROTOCOL.u2f +++ b/PROTOCOL.u2f | |||
@@ -142,7 +142,7 @@ choose not to include this information in the public key or save it by | |||
142 | default. | 142 | default. |
143 | 143 | ||
144 | Attestation information is useful for out-of-band key and certificate | 144 | Attestation information is useful for out-of-band key and certificate |
145 | registration worksflows, e.g. proving to a CA that a key is backed | 145 | registration workflows, e.g. proving to a CA that a key is backed |
146 | by trusted hardware before it will issue a certificate. To support this | 146 | by trusted hardware before it will issue a certificate. To support this |
147 | case, OpenSSH optionally allows retaining the attestation information | 147 | case, OpenSSH optionally allows retaining the attestation information |
148 | at the time of key generation. It will take the following format: | 148 | at the time of key generation. It will take the following format: |
@@ -169,7 +169,7 @@ is signed over a blob that consists of: | |||
169 | byte[] extensions | 169 | byte[] extensions |
170 | byte[32] SHA256(message) | 170 | byte[32] SHA256(message) |
171 | 171 | ||
172 | No extensons are yet defined for SSH use. If any are defined in the future, | 172 | No extensions are yet defined for SSH use. If any are defined in the future, |
173 | it will be possible to infer their presence from the contents of the "flags" | 173 | it will be possible to infer their presence from the contents of the "flags" |
174 | value. | 174 | value. |
175 | 175 | ||
@@ -236,7 +236,7 @@ support for the common case of USB HID security keys internally. | |||
236 | 236 | ||
237 | The middleware library need only expose a handful of functions: | 237 | The middleware library need only expose a handful of functions: |
238 | 238 | ||
239 | #define SSH_SK_VERSION_MAJOR 0x00040000 /* API version */ | 239 | #define SSH_SK_VERSION_MAJOR 0x00050000 /* API version */ |
240 | #define SSH_SK_VERSION_MAJOR_MASK 0xffff0000 | 240 | #define SSH_SK_VERSION_MAJOR_MASK 0xffff0000 |
241 | 241 | ||
242 | /* Flags */ | 242 | /* Flags */ |