From 28edbd39b9489ea1a158ea296dd38c009c4644e7 Mon Sep 17 00:00:00 2001 From: Mariano Cano Date: Thu, 7 Jul 2022 17:22:39 -0700 Subject: [PATCH] Remove commented test --- kms/sshagentkms/sshagentkms_test.go | 100 ---------------------------- 1 file changed, 100 deletions(-) diff --git a/kms/sshagentkms/sshagentkms_test.go b/kms/sshagentkms/sshagentkms_test.go index 4fe1b7cb..3d4a9a01 100644 --- a/kms/sshagentkms/sshagentkms_test.go +++ b/kms/sshagentkms/sshagentkms_test.go @@ -397,106 +397,6 @@ func TestSSHAgentKMS_CreateSigner(t *testing.T) { } } -/* -func restoreGenerateKey() func() { - oldGenerateKey := generateKey - return func() { - generateKey = oldGenerateKey - } -} -*/ - -/* -func TestSSHAgentKMS_CreateKey(t *testing.T) { - fn := restoreGenerateKey() - defer fn() - - p256, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) - if err != nil { - t.Fatal(err) - } - rsa2048, err := rsa.GenerateKey(rand.Reader, 2048) - if err != nil { - t.Fatal(err) - } - edpub, edpriv, err := ed25519.GenerateKey(rand.Reader) - if err != nil { - t.Fatal(err) - } - - type args struct { - req *apiv1.CreateKeyRequest - } - type params struct { - kty string - crv string - size int - } - tests := []struct { - name string - args args - generateKey func() (interface{}, interface{}, error) - want *apiv1.CreateKeyResponse - wantParams params - wantErr bool - }{ - {"p256", args{&apiv1.CreateKeyRequest{Name: "p256", SignatureAlgorithm: apiv1.ECDSAWithSHA256}}, func() (interface{}, interface{}, error) { - return p256.Public(), p256, nil - }, &apiv1.CreateKeyResponse{Name: "p256", PublicKey: p256.Public(), PrivateKey: p256, CreateSignerRequest: apiv1.CreateSignerRequest{Signer: p256}}, params{"EC", "P-256", 0}, false}, - {"rsa", args{&apiv1.CreateKeyRequest{Name: "rsa3072", SignatureAlgorithm: apiv1.SHA256WithRSA}}, func() (interface{}, interface{}, error) { - return rsa2048.Public(), rsa2048, nil - }, &apiv1.CreateKeyResponse{Name: "rsa3072", PublicKey: rsa2048.Public(), PrivateKey: rsa2048, CreateSignerRequest: apiv1.CreateSignerRequest{Signer: rsa2048}}, params{"RSA", "", 0}, false}, - {"rsa2048", args{&apiv1.CreateKeyRequest{Name: "rsa2048", SignatureAlgorithm: apiv1.SHA256WithRSA, Bits: 2048}}, func() (interface{}, interface{}, error) { - return rsa2048.Public(), rsa2048, nil - }, &apiv1.CreateKeyResponse{Name: "rsa2048", PublicKey: rsa2048.Public(), PrivateKey: rsa2048, CreateSignerRequest: apiv1.CreateSignerRequest{Signer: rsa2048}}, params{"RSA", "", 2048}, false}, - {"rsaPSS2048", args{&apiv1.CreateKeyRequest{Name: "rsa2048", SignatureAlgorithm: apiv1.SHA256WithRSAPSS, Bits: 2048}}, func() (interface{}, interface{}, error) { - return rsa2048.Public(), rsa2048, nil - }, &apiv1.CreateKeyResponse{Name: "rsa2048", PublicKey: rsa2048.Public(), PrivateKey: rsa2048, CreateSignerRequest: apiv1.CreateSignerRequest{Signer: rsa2048}}, params{"RSA", "", 2048}, false}, - {"ed25519", args{&apiv1.CreateKeyRequest{Name: "ed25519", SignatureAlgorithm: apiv1.PureEd25519}}, func() (interface{}, interface{}, error) { - return edpub, edpriv, nil - }, &apiv1.CreateKeyResponse{Name: "ed25519", PublicKey: edpub, PrivateKey: edpriv, CreateSignerRequest: apiv1.CreateSignerRequest{Signer: edpriv}}, params{"OKP", "Ed25519", 0}, false}, - {"default", args{&apiv1.CreateKeyRequest{Name: "default"}}, func() (interface{}, interface{}, error) { - return p256.Public(), p256, nil - }, &apiv1.CreateKeyResponse{Name: "default", PublicKey: p256.Public(), PrivateKey: p256, CreateSignerRequest: apiv1.CreateSignerRequest{Signer: p256}}, params{"EC", "P-256", 0}, false}, - {"fail algorithm", args{&apiv1.CreateKeyRequest{Name: "fail", SignatureAlgorithm: apiv1.SignatureAlgorithm(100)}}, func() (interface{}, interface{}, error) { - return p256.Public(), p256, nil - }, nil, params{}, true}, - {"fail generate key", args{&apiv1.CreateKeyRequest{Name: "fail", SignatureAlgorithm: apiv1.ECDSAWithSHA256}}, func() (interface{}, interface{}, error) { - return nil, nil, fmt.Errorf("an error") - }, nil, params{"EC", "P-256", 0}, true}, - {"fail no signer", args{&apiv1.CreateKeyRequest{Name: "fail", SignatureAlgorithm: apiv1.ECDSAWithSHA256}}, func() (interface{}, interface{}, error) { - return 1, 2, nil - }, nil, params{"EC", "P-256", 0}, true}, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - k := &SSHAgentKMS{} - generateKey = func(kty, crv string, size int) (interface{}, interface{}, error) { - if tt.wantParams.kty != kty { - t.Errorf("GenerateKey() kty = %s, want %s", kty, tt.wantParams.kty) - } - if tt.wantParams.crv != crv { - t.Errorf("GenerateKey() crv = %s, want %s", crv, tt.wantParams.crv) - } - if tt.wantParams.size != size { - t.Errorf("GenerateKey() size = %d, want %d", size, tt.wantParams.size) - } - return tt.generateKey() - } - - got, err := k.CreateKey(tt.args.req) - if (err != nil) != tt.wantErr { - t.Errorf("SSHAgentKMS.CreateKey() error = %v, wantErr %v", err, tt.wantErr) - return - } - if !reflect.DeepEqual(got, tt.want) { - t.Errorf("SSHAgentKMS.CreateKey() = %v, want %v", got, tt.want) - } - }) - } -} -*/ - func TestSSHAgentKMS_GetPublicKey(t *testing.T) { b, err := os.ReadFile("testdata/pub.pem") if err != nil {