From b466f956c32cbaff4200bfcd5db6739fe4bc7d04 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Tue, 3 May 2016 10:24:27 +0000 Subject: upstream commit add ed25519 keys that are supported but missing from this documents; from Peter Moody Upstream-ID: 8caac2d8e8cfd2fca6dc304877346e0a064b014b --- PROTOCOL.agent | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'PROTOCOL.agent') 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: string key_comment constraint[] key_constraints +ED25519 keys may be added using the following request + byte SSH2_AGENTC_ADD_IDENTITY or + SSH2_AGENTC_ADD_ID_CONSTRAINED + string "ssh-ed25519"  + mpint ed25519_public_key + mpint ed25519_private_key + string key_comment + constraint[] key_constraints + +ED25519 certificates may be added with: + byte SSH2_AGENTC_ADD_IDENTITY or + SSH2_AGENTC_ADD_ID_CONSTRAINED + string "ssh-ed25519-cert-v01@openssh.com"  + string certificate + mpint ed25519_public_key + mpint ed25519_private_key + string key_comment + constraint[] key_constraints + RSA keys may be added with this request: byte SSH2_AGENTC_ADD_IDENTITY or @@ -557,4 +576,4 @@ Locking and unlocking affects both protocol 1 and protocol 2 keys. SSH_AGENT_CONSTRAIN_LIFETIME 1 SSH_AGENT_CONSTRAIN_CONFIRM 2 -$OpenBSD: PROTOCOL.agent,v 1.8 2015/05/08 03:56:51 djm Exp $ +$OpenBSD: PROTOCOL.agent,v 1.9 2016/05/03 10:24:27 djm Exp $ -- cgit v1.2.3 From 910e59bba09ac309d78ce61e356da35292212935 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Wed, 4 May 2016 12:16:39 +0000 Subject: upstream commit fix junk characters after quotes Upstream-ID: cc4d0cd32cb6b55a2ef98975d2f7ae857d0dc578 --- PROTOCOL.agent | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'PROTOCOL.agent') diff --git a/PROTOCOL.agent b/PROTOCOL.agent index e6016412c..c386d161b 100644 --- a/PROTOCOL.agent +++ b/PROTOCOL.agent @@ -209,7 +209,7 @@ ECDSA certificates may be added with: ED25519 keys may be added using the following request byte SSH2_AGENTC_ADD_IDENTITY or SSH2_AGENTC_ADD_ID_CONSTRAINED - string "ssh-ed25519"  + string "ssh-ed25519" mpint ed25519_public_key mpint ed25519_private_key string key_comment @@ -218,7 +218,7 @@ ED25519 keys may be added using the following request ED25519 certificates may be added with: byte SSH2_AGENTC_ADD_IDENTITY or SSH2_AGENTC_ADD_ID_CONSTRAINED - string "ssh-ed25519-cert-v01@openssh.com"  + string "ssh-ed25519-cert-v01@openssh.com" string certificate mpint ed25519_public_key mpint ed25519_private_key @@ -576,4 +576,4 @@ Locking and unlocking affects both protocol 1 and protocol 2 keys. SSH_AGENT_CONSTRAIN_LIFETIME 1 SSH_AGENT_CONSTRAIN_CONFIRM 2 -$OpenBSD: PROTOCOL.agent,v 1.9 2016/05/03 10:24:27 djm Exp $ +$OpenBSD: PROTOCOL.agent,v 1.10 2016/05/04 12:16:39 djm Exp $ -- cgit v1.2.3 From 531c135409b8d8810795b1f3692a4ebfd5c9cae0 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Thu, 19 May 2016 07:45:32 +0000 Subject: upstream commit fix type of ed25519 values Upstream-ID: b32d0cb372bbe918ca2de56906901eae225a59b0 --- PROTOCOL.agent | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'PROTOCOL.agent') 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 byte SSH2_AGENTC_ADD_IDENTITY or SSH2_AGENTC_ADD_ID_CONSTRAINED string "ssh-ed25519" - mpint ed25519_public_key - mpint ed25519_private_key + string ed25519_public_key + string ed25519_private_key || ed25519_public_key string key_comment constraint[] key_constraints @@ -220,11 +220,14 @@ ED25519 certificates may be added with: SSH2_AGENTC_ADD_ID_CONSTRAINED string "ssh-ed25519-cert-v01@openssh.com" string certificate - mpint ed25519_public_key - mpint ed25519_private_key + string ed25519_public_key + string ed25519_private_key || ed25519_public_key string key_comment constraint[] key_constraints +For both ssh-ed25519 and ssh-ed25519-cert-v01@openssh.com keys, the private +key has the public key appended (for historical reasons). + RSA keys may be added with this request: byte SSH2_AGENTC_ADD_IDENTITY or @@ -576,4 +579,4 @@ Locking and unlocking affects both protocol 1 and protocol 2 keys. SSH_AGENT_CONSTRAIN_LIFETIME 1 SSH_AGENT_CONSTRAIN_CONFIRM 2 -$OpenBSD: PROTOCOL.agent,v 1.10 2016/05/04 12:16:39 djm Exp $ +$OpenBSD: PROTOCOL.agent,v 1.11 2016/05/19 07:45:32 djm Exp $ -- cgit v1.2.3