diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-12-10 23:37:31 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-12-11 19:11:07 +1100 |
commit | a62f4e1960691f3aeb1f972e009788b29e2ae464 (patch) | |
tree | 65569906c0aaebae24715a5abc68bcc3c13f9509 /PROTOCOL.u2f | |
parent | 22d4beb79622fc82d7111ac941269861fc7aef8d (diff) |
upstream: some more corrections for documentation problems spotted
by Ron Frederick
document certifiate private key format
correct flags type for sk-ssh-ed25519@openssh.com keys
OpenBSD-Commit-ID: fc4e9a1ed7f9f7f9dd83e2e2c59327912e933e74
Diffstat (limited to 'PROTOCOL.u2f')
-rw-r--r-- | PROTOCOL.u2f | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/PROTOCOL.u2f b/PROTOCOL.u2f index 823f53634..32bfa20f3 100644 --- a/PROTOCOL.u2f +++ b/PROTOCOL.u2f | |||
@@ -86,7 +86,7 @@ With a private half consisting of: | |||
86 | string "sk-ssh-ed25519@openssh.com" | 86 | string "sk-ssh-ed25519@openssh.com" |
87 | string public key | 87 | string public key |
88 | string application (user-specified, but typically "ssh:") | 88 | string application (user-specified, but typically "ssh:") |
89 | uint32 flags | 89 | uint8 flags |
90 | string key_handle | 90 | string key_handle |
91 | string reserved | 91 | string reserved |
92 | 92 | ||
@@ -110,6 +110,8 @@ information to the public key: | |||
110 | string signature key | 110 | string signature key |
111 | string signature | 111 | string signature |
112 | 112 | ||
113 | and for security key ed25519 certificates: | ||
114 | |||
113 | string "sk-ssh-ed25519-cert-v01@openssh.com" | 115 | string "sk-ssh-ed25519-cert-v01@openssh.com" |
114 | string nonce | 116 | string nonce |
115 | string public key | 117 | string public key |
@@ -126,6 +128,15 @@ information to the public key: | |||
126 | string signature key | 128 | string signature key |
127 | string signature | 129 | string signature |
128 | 130 | ||
131 | Both security key certificates use the following encoding for private keys: | ||
132 | |||
133 | string type (e.g. "sk-ssh-ed25519-cert-v01@openssh.com") | ||
134 | string pubkey (the above key/cert structure) | ||
135 | string application | ||
136 | uint8 flags | ||
137 | string key_handle | ||
138 | string reserved | ||
139 | |||
129 | During key generation, the hardware also returns attestation information | 140 | During key generation, the hardware also returns attestation information |
130 | that may be used to cryptographically prove that a given key is | 141 | that may be used to cryptographically prove that a given key is |
131 | hardware-backed. Unfortunately, the protocol required for this proof is | 142 | hardware-backed. Unfortunately, the protocol required for this proof is |
@@ -188,7 +199,6 @@ For Ed25519 keys the signature is encoded as: | |||
188 | byte flags | 199 | byte flags |
189 | uint32 counter | 200 | uint32 counter |
190 | 201 | ||
191 | |||
192 | ssh-agent protocol extensions | 202 | ssh-agent protocol extensions |
193 | ----------------------------- | 203 | ----------------------------- |
194 | 204 | ||