From 9a6bac9c27397e546ac6f7055e83c1e9ec8405b8 Mon Sep 17 00:00:00 2001 From: Peter Moody Date: Thu, 7 Jul 2016 15:51:40 -0700 Subject: [PATCH] x/crypto/ssh/agent: ecdsa key/cert typo Introduced by me in 21536 Change-Id: I4a5f3507270a3d6eea9779508642ea5789d1efca Reviewed-on: https://go-review.googlesource.com/24811 Reviewed-by: Han-Wen Nienhuys Run-TryBot: Han-Wen Nienhuys TryBot-Result: Gobot Gobot --- ssh/agent/server.go | 4 ++-- ssh/agent/server_test.go | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ssh/agent/server.go b/ssh/agent/server.go index 092fd8f..68a333f 100644 --- a/ssh/agent/server.go +++ b/ssh/agent/server.go @@ -257,7 +257,7 @@ func parseECDSAKey(req []byte) (*AddedKey, error) { return nil, err } - return &AddedKey{PrivateKey: &priv, Comment: k.Comments}, nil + return &AddedKey{PrivateKey: priv, Comment: k.Comments}, nil } func parseRSACert(req []byte) (*AddedKey, error) { @@ -393,7 +393,7 @@ func (s *server) insertIdentity(req []byte) error { case ssh.KeyAlgoDSA: addedKey, err = parseDSAKey(req) case ssh.KeyAlgoECDSA256, ssh.KeyAlgoECDSA384, ssh.KeyAlgoECDSA521: - addedKey, err = parseECDSACert(req) + addedKey, err = parseECDSAKey(req) case ssh.KeyAlgoED25519: addedKey, err = parseEd25519Key(req) case ssh.CertAlgoRSAv01: diff --git a/ssh/agent/server_test.go b/ssh/agent/server_test.go index b5e92a6..ec9cdee 100644 --- a/ssh/agent/server_test.go +++ b/ssh/agent/server_test.go @@ -150,6 +150,9 @@ func TestKeyTypes(t *testing.T) { if err := addKeyToAgent(v); err != nil { t.Errorf("error adding key type %s, %v", k, err) } + if err := addCertToAgentSock(v, nil); err != nil { + t.Errorf("error adding key type %s, %v", k, err) + } } }