upstream commit

fix type of ed25519 values

Upstream-ID: b32d0cb372bbe918ca2de56906901eae225a59b0

diff --git a/PROTOCOL.agent b/PROTOCOL.agent
index c386d161b8860c0f6fd1b9c20a63fa874b965248..60d36f912c68a9ca30efbc77dcd2999fd4453dd9 100644 (file)
--- 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 $