summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2019-11-01 12:10:43 +0000
committerDamien Miller <djm@mindrot.org>2019-11-02 11:12:50 +1100
commitad38406fc95fa223b0ef2edf8ff50508f8ab1cb6 (patch)
tree0d682806a09cbebd1a06c0dc32c0c442eb8157aa
parent9cac151c2dc76b8e5b727b2fa216f572e372170f (diff)
upstream: fix miscellaneous text problems; ok djm@
OpenBSD-Commit-ID: 0cbf411a14d8fa0b269b69cbb1b4fc0ca699fe9f
-rw-r--r--PROTOCOL.u2f16
1 files changed, 8 insertions, 8 deletions
diff --git a/PROTOCOL.u2f b/PROTOCOL.u2f
index ab9e3e33..a587480b 100644
--- a/PROTOCOL.u2f
+++ b/PROTOCOL.u2f
@@ -22,13 +22,13 @@ given key is backed by hardware. Finally the signature format includes
a monotonic signature counter that can be used (at scale) to detect
concurrent use of a private key, should it be extracted from hardware.
-U2F private keys are generatted through an enrollment operation,
+U2F private keys are generated through an enrollment operation,
which takes an application ID - a URL-like string, typically "ssh:"
in this case, but a HTTP origin for the case of web authentication,
and a challenge string (typically randomly generated). The enrollment
operation returns a public key, a key handle that must be used to invoke
the hardware-backed private key, some flags and signed attestation
-information that may be used to verify that private key is hosted on a
+information that may be used to verify that a private key is hosted on a
particular hardware instance.
It is common for U2F hardware to derive private keys from the key handle
@@ -73,7 +73,7 @@ The corresponding private key contains:
The certificate form of a SSH U2F key appends the usual certificate
information to the public key:
- string "sk-ecdsa-sha2-nistp256@openssh.com"
+ string "sk-ecdsa-sha2-nistp256-cert-v01@openssh.com"
string nonce
ec_point Q
string application
@@ -98,7 +98,7 @@ choose not to include this information in the public key or save it by
default.
Attestation information is very useful however in an organisational
-context, where it may be used by an CA as part of certificate
+context, where it may be used by a CA as part of certificate
issuance. In this case, exposure to the CA of hardware identity is
desirable. To support this case, OpenSSH optionally allows retaining the
attestation information at the time of key generation. It will take the
@@ -151,16 +151,16 @@ ecdsa_signature field returned from the hardware.
ssh-agent protocol extensions
-----------------------------
-ssh-agent requires some protocol extension to support U2F keys. At
+ssh-agent requires a protocol extension to support U2F keys. At
present the closest analogue to Security Keys in ssh-agent are PKCS#11
tokens, insofar as they require a middleware library to communicate with
the device that holds the keys. Unfortunately, the protocol message used
to add PKCS#11 keys to ssh-agent does not include any way to send the
key handle to the agent as U2F keys require.
-To avoid this, without having to add wholy new messages to the agent
-protocol we will use the existing SSH2_AGENTC_ADD_ID_CONSTRAINED message
-with a new a key constraint extension to encode a path to the middleware
+To avoid this, without having to add wholly new messages to the agent
+protocol, we will use the existing SSH2_AGENTC_ADD_ID_CONSTRAINED message
+with a new key constraint extension to encode a path to the middleware
library for the key. The format of this constraint extension would be:
byte SSH_AGENT_CONSTRAIN_EXTENSION