eiac/crypto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ssh: don't use dsa keys in integration tests

Browse Source 
DSA has been disabled by default since OpenSSH 9.8, so tests
fail with newer versions of OpenSSH

Change-Id: I57b9abde8845cd05116a637a21cbbb8af740b2e0
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/599955
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Auto-Submit: Nicola Murino <nicola.murino@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Roland Shoemaker <roland@golang.org>
This commit is contained in:
Nicola Murino
2024-07-22 17:35:33 +00:00
committed by Gopher Robot
parent 6879722274
commit bb80217080
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ssh/agent/client_test.go
+5 -5
View File
@@ -165,9 +165,9 @@ func testAgentInterface(t *testing.T, agent ExtendedAgent, key interface{}, cert
sig, err := agent.Sign(pubKey, data) sig, err := agent.Sign(pubKey, data)
if err != nil { if err != nil {
t.Logf("sign failed with key type %q", pubKey.Type()) t.Logf("sign failed with key type %q", pubKey.Type())
// In integration tests ssh-dss and ssh-rsa (SHA1 signatures) may be // In integration tests ssh-rsa (SHA1 signatures) may be disabled for
// disabled for security reasons, we check SHA-2 variants later. // security reasons, we check SHA-2 variants later.
if pubKey.Type() != ssh.KeyAlgoDSA && pubKey.Type() != ssh.KeyAlgoRSA && pubKey.Type() != ssh.CertAlgoRSAv01 { if pubKey.Type() != ssh.KeyAlgoRSA && pubKey.Type() != ssh.CertAlgoRSAv01 {
t.Fatalf("Sign(%s): %v", pubKey.Type(), err) t.Fatalf("Sign(%s): %v", pubKey.Type(), err)
} }
} else { } else {
@@ -251,7 +251,7 @@ func TestMalformedRequests(t *testing.T) {
} }
func TestAgent(t *testing.T) { func TestAgent(t *testing.T) {
for _, keyType := range []string{"rsa", "dsa", "ecdsa", "ed25519"} { for _, keyType := range []string{"rsa", "ecdsa", "ed25519"} {
testOpenSSHAgent(t, testPrivateKeys[keyType], nil, 0) testOpenSSHAgent(t, testPrivateKeys[keyType], nil, 0)
testKeyringAgent(t, testPrivateKeys[keyType], nil, 0) testKeyringAgent(t, testPrivateKeys[keyType], nil, 0)
} }
@@ -409,7 +409,7 @@ func testLockAgent(agent Agent, t *testing.T) {
if err := agent.Add(AddedKey{PrivateKey: testPrivateKeys["rsa"], Comment: "comment 1"}); err != nil { if err := agent.Add(AddedKey{PrivateKey: testPrivateKeys["rsa"], Comment: "comment 1"}); err != nil {
t.Errorf("Add: %v", err) t.Errorf("Add: %v", err)
} }
if err := agent.Add(AddedKey{PrivateKey: testPrivateKeys["dsa"], Comment: "comment dsa"}); err != nil { if err := agent.Add(AddedKey{PrivateKey: testPrivateKeys["ecdsa"], Comment: "comment ecdsa"}); err != nil {
t.Errorf("Add: %v", err) t.Errorf("Add: %v", err)
} }
if keys, err := agent.List(); err != nil { if keys, err := agent.List(); err != nil {
ssh/test/agent_unix_test.go
+3 -3
View File
@@ -20,17 +20,17 @@ func TestAgentForward(t *testing.T) {
defer conn.Close() defer conn.Close()
keyring := agent.NewKeyring() keyring := agent.NewKeyring()
if err := keyring.Add(agent.AddedKey{PrivateKey: testPrivateKeys["dsa"]}); err != nil { if err := keyring.Add(agent.AddedKey{PrivateKey: testPrivateKeys["ecdsa"]}); err != nil {
t.Fatalf("Error adding key: %s", err) t.Fatalf("Error adding key: %s", err)
} }
if err := keyring.Add(agent.AddedKey{ if err := keyring.Add(agent.AddedKey{
PrivateKey: testPrivateKeys["dsa"], PrivateKey: testPrivateKeys["ecdsa"],
ConfirmBeforeUse: true, ConfirmBeforeUse: true,
LifetimeSecs: 3600, LifetimeSecs: 3600,
}); err != nil { }); err != nil {
t.Fatalf("Error adding key with constraints: %s", err) t.Fatalf("Error adding key with constraints: %s", err)
} }
pub := testPublicKeys["dsa"] pub := testPublicKeys["ecdsa"]
sess, err := conn.NewSession() sess, err := conn.NewSession()
if err != nil { if err != nil {