===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/PROTOCOL.agent,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- src/usr.bin/ssh/PROTOCOL.agent	2016/05/04 12:16:39	1.10
+++ src/usr.bin/ssh/PROTOCOL.agent	2016/05/19 07:45:32	1.11
@@ -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 $