Make all unsupported algorithms return a more informative error

Signed-off-by: hslatman <herman+github@smallstep.com>
veraison · Aug 8, 2023 · 0eac3fc · 0eac3fc
1 parent 754dc9d
commit 0eac3fc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/signer.go b/signer.go
@@ -88,9 +88,7 @@ func NewSigner(alg Algorithm, key crypto.Signer) (Signer, error) {
  return &ed25519Signer{
  key: key,
  }, nil
- case AlgorithmRS256, AlgorithmRS384, AlgorithmRS512:
- return nil, fmt.Errorf("can't create new Signer for %s: %w", alg, ErrAlgorithmNotSupported)
  default:
- return nil, ErrAlgorithmNotSupported
+ return nil, fmt.Errorf("can't create new Signer for %s: %w", alg, ErrAlgorithmNotSupported)
  }
 }
diff --git a/signer_test.go b/signer_test.go
@@ -118,7 +118,12 @@ func TestNewSigner(t *testing.T) {
  {
  name: "unknown algorithm",
  alg: 0,
- wantErr: "algorithm not supported",
+ wantErr: "can't create new Signer for Reserved: algorithm not supported",
+ },
+ {
+ name: "unassigned algorithm",
+ alg: -1,
+ wantErr: "can't create new Signer for unknown algorithm value -1: algorithm not supported",
  },
  }
  for _, tt := range tests {

diff --git a/verifier.go b/verifier.go
@@ -74,9 +74,7 @@ func NewVerifier(alg Algorithm, key crypto.PublicKey) (Verifier, error) {
  return &ed25519Verifier{
  key: vk,
  }, nil
- case AlgorithmRS256, AlgorithmRS384, AlgorithmRS512:
- return nil, fmt.Errorf("can't create new Verifier for %s: %w", alg, ErrAlgorithmNotSupported)
  default:
- return nil, ErrAlgorithmNotSupported
+ return nil, fmt.Errorf("can't create new Verifier for %s: %w", alg, ErrAlgorithmNotSupported)
  }
 }
diff --git a/verifier_test.go b/verifier_test.go
@@ -114,7 +114,12 @@ func TestNewVerifier(t *testing.T) {
  {
  name: "unknown algorithm",
  alg: 0,
- wantErr: "algorithm not supported",
+ wantErr: "can't create new Verifier for Reserved: algorithm not supported",
+ },
+ {
+ name: "unassigned algorithm",
+ alg: -1,
+ wantErr: "can't create new Verifier for unknown algorithm value -1: algorithm not supported",
  },
  {
  name: "bogus ecdsa public key (point not on curve)",