commit 531c135409b8d8810795b1f3692a4ebfd5c9cae0
author djm@openbsd.org <djm@openbsd.org> Thu May 19 07:45:32 2016 +0000
committer Damien Miller <djm@mindrot.org> Thu May 19 17:48:36 2016 +1000
tree ad3d7fe277d3b93486010fadc7fa7d5cc48f341d
parent 75e21688f523799c9e0cc6601d76a9c5ca79f787

upstream commit

fix type of ed25519 values

Upstream-ID: b32d0cb372bbe918ca2de56906901eae225a59b0

PROTOCOL.agent

diff --git a/PROTOCOL.agent b/PROTOCOL.agent
index c386d16..60d36f9 100644
--- a/PROTOCOL.agent
+++ b/PROTOCOL.agent
@@ -210,8 +210,8 @@
 	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 @@
 				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 @@
 	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 $