瀏覽代碼

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 <hanwen@google.com>
Run-TryBot: Han-Wen Nienhuys <hanwen@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Peter Moody 9 年之前
父節點
當前提交
9a6bac9c27
共有 2 個文件被更改,包括 5 次插入2 次删除
  1. 2 2
      ssh/agent/server.go
  2. 3 0
      ssh/agent/server_test.go

+ 2 - 2
ssh/agent/server.go

@@ -257,7 +257,7 @@ func parseECDSAKey(req []byte) (*AddedKey, error) {
 		return nil, err
 		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) {
 func parseRSACert(req []byte) (*AddedKey, error) {
@@ -393,7 +393,7 @@ func (s *server) insertIdentity(req []byte) error {
 	case ssh.KeyAlgoDSA:
 	case ssh.KeyAlgoDSA:
 		addedKey, err = parseDSAKey(req)
 		addedKey, err = parseDSAKey(req)
 	case ssh.KeyAlgoECDSA256, ssh.KeyAlgoECDSA384, ssh.KeyAlgoECDSA521:
 	case ssh.KeyAlgoECDSA256, ssh.KeyAlgoECDSA384, ssh.KeyAlgoECDSA521:
-		addedKey, err = parseECDSACert(req)
+		addedKey, err = parseECDSAKey(req)
 	case ssh.KeyAlgoED25519:
 	case ssh.KeyAlgoED25519:
 		addedKey, err = parseEd25519Key(req)
 		addedKey, err = parseEd25519Key(req)
 	case ssh.CertAlgoRSAv01:
 	case ssh.CertAlgoRSAv01:

+ 3 - 0
ssh/agent/server_test.go

@@ -150,6 +150,9 @@ func TestKeyTypes(t *testing.T) {
 		if err := addKeyToAgent(v); err != nil {
 		if err := addKeyToAgent(v); err != nil {
 			t.Errorf("error adding key type %s, %v", k, err)
 			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)
+		}
 	}
 	}
 }
 }