diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-05-03 10:24:27 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-05-03 20:29:13 +1000 |
commit | b466f956c32cbaff4200bfcd5db6739fe4bc7d04 (patch) | |
tree | 6cd1553df0489723034d553f5de8561661cc4ed3 | |
parent | 7f3d76319a69dab2efe3a520a8fef5b97e923636 (diff) |
upstream commit
add ed25519 keys that are supported but missing from this
documents; from Peter Moody
Upstream-ID: 8caac2d8e8cfd2fca6dc304877346e0a064b014b
-rw-r--r-- | PROTOCOL.agent | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/PROTOCOL.agent b/PROTOCOL.agent index 27ec0c1de..e6016412c 100644 --- a/PROTOCOL.agent +++ b/PROTOCOL.agent | |||
@@ -206,6 +206,25 @@ ECDSA certificates may be added with: | |||
206 | string key_comment | 206 | string key_comment |
207 | constraint[] key_constraints | 207 | constraint[] key_constraints |
208 | 208 | ||
209 | ED25519 keys may be added using the following request | ||
210 | byte SSH2_AGENTC_ADD_IDENTITY or | ||
211 | SSH2_AGENTC_ADD_ID_CONSTRAINED | ||
212 | string "ssh-ed25519" | ||
213 | mpint ed25519_public_key | ||
214 | mpint ed25519_private_key | ||
215 | string key_comment | ||
216 | constraint[] key_constraints | ||
217 | |||
218 | ED25519 certificates may be added with: | ||
219 | byte SSH2_AGENTC_ADD_IDENTITY or | ||
220 | SSH2_AGENTC_ADD_ID_CONSTRAINED | ||
221 | string "ssh-ed25519-cert-v01@openssh.com" | ||
222 | string certificate | ||
223 | mpint ed25519_public_key | ||
224 | mpint ed25519_private_key | ||
225 | string key_comment | ||
226 | constraint[] key_constraints | ||
227 | |||
209 | RSA keys may be added with this request: | 228 | RSA keys may be added with this request: |
210 | 229 | ||
211 | byte SSH2_AGENTC_ADD_IDENTITY or | 230 | byte SSH2_AGENTC_ADD_IDENTITY or |
@@ -557,4 +576,4 @@ Locking and unlocking affects both protocol 1 and protocol 2 keys. | |||
557 | SSH_AGENT_CONSTRAIN_LIFETIME 1 | 576 | SSH_AGENT_CONSTRAIN_LIFETIME 1 |
558 | SSH_AGENT_CONSTRAIN_CONFIRM 2 | 577 | SSH_AGENT_CONSTRAIN_CONFIRM 2 |
559 | 578 | ||
560 | $OpenBSD: PROTOCOL.agent,v 1.8 2015/05/08 03:56:51 djm Exp $ | 579 | $OpenBSD: PROTOCOL.agent,v 1.9 2016/05/03 10:24:27 djm Exp $ |