diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-05-19 07:45:32 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-05-19 17:48:36 +1000 |
commit | 531c135409b8d8810795b1f3692a4ebfd5c9cae0 (patch) | |
tree | ad3d7fe277d3b93486010fadc7fa7d5cc48f341d | |
parent | 75e21688f523799c9e0cc6601d76a9c5ca79f787 (diff) |
upstream commit
fix type of ed25519 values
Upstream-ID: b32d0cb372bbe918ca2de56906901eae225a59b0
-rw-r--r-- | PROTOCOL.agent | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/PROTOCOL.agent b/PROTOCOL.agent index c386d161b..60d36f912 100644 --- a/PROTOCOL.agent +++ b/PROTOCOL.agent | |||
@@ -210,8 +210,8 @@ ED25519 keys may be added using the following request | |||
210 | byte SSH2_AGENTC_ADD_IDENTITY or | 210 | byte SSH2_AGENTC_ADD_IDENTITY or |
211 | SSH2_AGENTC_ADD_ID_CONSTRAINED | 211 | SSH2_AGENTC_ADD_ID_CONSTRAINED |
212 | string "ssh-ed25519" | 212 | string "ssh-ed25519" |
213 | mpint ed25519_public_key | 213 | string ed25519_public_key |
214 | mpint ed25519_private_key | 214 | string ed25519_private_key || ed25519_public_key |
215 | string key_comment | 215 | string key_comment |
216 | constraint[] key_constraints | 216 | constraint[] key_constraints |
217 | 217 | ||
@@ -220,11 +220,14 @@ ED25519 certificates may be added with: | |||
220 | SSH2_AGENTC_ADD_ID_CONSTRAINED | 220 | SSH2_AGENTC_ADD_ID_CONSTRAINED |
221 | string "ssh-ed25519-cert-v01@openssh.com" | 221 | string "ssh-ed25519-cert-v01@openssh.com" |
222 | string certificate | 222 | string certificate |
223 | mpint ed25519_public_key | 223 | string ed25519_public_key |
224 | mpint ed25519_private_key | 224 | string ed25519_private_key || ed25519_public_key |
225 | string key_comment | 225 | string key_comment |
226 | constraint[] key_constraints | 226 | constraint[] key_constraints |
227 | 227 | ||
228 | For both ssh-ed25519 and ssh-ed25519-cert-v01@openssh.com keys, the private | ||
229 | key has the public key appended (for historical reasons). | ||
230 | |||
228 | RSA keys may be added with this request: | 231 | RSA keys may be added with this request: |
229 | 232 | ||
230 | byte SSH2_AGENTC_ADD_IDENTITY or | 233 | byte SSH2_AGENTC_ADD_IDENTITY or |
@@ -576,4 +579,4 @@ Locking and unlocking affects both protocol 1 and protocol 2 keys. | |||
576 | SSH_AGENT_CONSTRAIN_LIFETIME 1 | 579 | SSH_AGENT_CONSTRAIN_LIFETIME 1 |
577 | SSH_AGENT_CONSTRAIN_CONFIRM 2 | 580 | SSH_AGENT_CONSTRAIN_CONFIRM 2 |
578 | 581 | ||
579 | $OpenBSD: PROTOCOL.agent,v 1.10 2016/05/04 12:16:39 djm Exp $ | 582 | $OpenBSD: PROTOCOL.agent,v 1.11 2016/05/19 07:45:32 djm Exp $ |