remove everything which is not ECDSA except default values

Author: phbnf

internal/types/tls/types.go

@@ -17,7 +17,6 @@ package tls
 import (
 	"crypto"
 	"crypto/ecdsa"
-	"crypto/rsa"
 	"fmt"
 )
 
@@ -44,25 +43,13 @@ type HashAlgorithm Enum
 
 // HashAlgorithm constants from RFC 5246 s7.4.1.4.1.
 const (
-	None   HashAlgorithm = 0
-	MD5    HashAlgorithm = 1
-	SHA1   HashAlgorithm = 2
-	SHA224 HashAlgorithm = 3
 	SHA256 HashAlgorithm = 4
 	SHA384 HashAlgorithm = 5
 	SHA512 HashAlgorithm = 6
 )
 
 func (h HashAlgorithm) String() string {
 	switch h {
-	case None:
-		return "None"
-	case MD5:
-		return "MD5"
-	case SHA1:
-		return "SHA1"
-	case SHA224:
-		return "SHA224"
 	case SHA256:
 		return "SHA256"
 	case SHA384:
@@ -80,16 +67,13 @@ type SignatureAlgorithm Enum
 // SignatureAlgorithm constants from RFC 5246 s7.4.1.4.1.
 const (
 	Anonymous SignatureAlgorithm = 0
-	RSA       SignatureAlgorithm = 1
 	ECDSA     SignatureAlgorithm = 3
 )
 
 func (s SignatureAlgorithm) String() string {
 	switch s {
 	case Anonymous:
 		return "Anonymous"
-	case RSA:
-		return "RSA"
 	case ECDSA:
 		return "ECDSA"
 	default:
@@ -103,8 +87,6 @@ func SignatureAlgorithmFromPubKey(k crypto.PublicKey) SignatureAlgorithm {
 	switch k.(type) {
 	case *ecdsa.PublicKey:
 		return ECDSA
-	case *rsa.PublicKey:
-		return RSA
 	default:
 		return Anonymous
 	}

internal/types/tls/types_test.go

@@ -17,7 +17,6 @@ package tls
 import (
 	"crypto"
 	"crypto/ecdsa"
-	"crypto/rsa"
 	"testing"
 )
 
@@ -26,10 +25,6 @@ func TestHashAlgorithmString(t *testing.T) {
 		algo HashAlgorithm
 		want string
 	}{
-		{None, "None"},
-		{MD5, "MD5"},
-		{SHA1, "SHA1"},
-		{SHA224, "SHA224"},
 		{SHA256, "SHA256"},
 		{SHA384, "SHA384"},
 		{SHA512, "SHA512"},
@@ -48,7 +43,6 @@ func TestSignatureAlgorithmString(t *testing.T) {
 		want string
 	}{
 		{Anonymous, "Anonymous"},
-		{RSA, "RSA"},
 		{ECDSA, "ECDSA"},
 		{99, "UNKNOWN(99)"},
 	}
@@ -65,8 +59,8 @@ func TestDigitallySignedString(t *testing.T) {
 		want string
 	}{
 		{
-			ds:   DigitallySigned{Algorithm: SignatureAndHashAlgorithm{Hash: SHA1, Signature: RSA}, Signature: []byte{0x01, 0x02}},
-			want: "Signature: HashAlgo=SHA1 SignAlgo=RSA Value=0102",
+			ds:   DigitallySigned{Algorithm: SignatureAndHashAlgorithm{Hash: SHA256, Signature: ECDSA}, Signature: []byte{0x01, 0x02}},
+			want: "Signature: HashAlgo=SHA256 SignAlgo=ECDSA Value=0102",
 		},
 		{
 			ds:   DigitallySigned{Algorithm: SignatureAndHashAlgorithm{Hash: 99, Signature: 99}, Signature: []byte{0x03, 0x04}},
@@ -87,7 +81,6 @@ func TestSignatureAlgorithm(t *testing.T) {
 		want SignatureAlgorithm
 	}{
 		{name: "ECDSA", key: new(ecdsa.PublicKey), want: ECDSA},
-		{name: "RSA", key: new(rsa.PublicKey), want: RSA},
 		{name: "Other", key: "foo", want: Anonymous},
 	} {
 		if got := SignatureAlgorithmFromPubKey(test.key); got != test.want {