tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
fix type of ed25519 values

Upstream-ID: b32d0cb372bbe918ca2de56906901eae225a59b0
This commit is contained in:
djm@openbsd.org 2016-05-19 07:45:32 +00:00 committed by Damien Miller
parent 75e21688f5
commit 531c135409
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PROTOCOL.agent
View File

@ -210,8 +210,8 @@ ED25519 keys may be added using the following request
byte SSH2_AGENTC_ADD_IDENTITY or byte SSH2_AGENTC_ADD_IDENTITY or
SSH2_AGENTC_ADD_ID_CONSTRAINED SSH2_AGENTC_ADD_ID_CONSTRAINED
string "ssh-ed25519" string "ssh-ed25519"
mpint ed25519_public_key string ed25519_public_key
mpint ed25519_private_key string ed25519_private_key || ed25519_public_key
string key_comment string key_comment
constraint[] key_constraints constraint[] key_constraints
@ -220,11 +220,14 @@ ED25519 certificates may be added with:
SSH2_AGENTC_ADD_ID_CONSTRAINED SSH2_AGENTC_ADD_ID_CONSTRAINED
string "ssh-ed25519-cert-v01@openssh.com" string "ssh-ed25519-cert-v01@openssh.com"
string certificate string certificate
mpint ed25519_public_key string ed25519_public_key
mpint ed25519_private_key string ed25519_private_key || ed25519_public_key
string key_comment string key_comment
constraint[] key_constraints 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: RSA keys may be added with this request:
byte SSH2_AGENTC_ADD_IDENTITY or 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_LIFETIME 1
SSH_AGENT_CONSTRAIN_CONFIRM 2 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 $