more NewSigner tests

core.go

@@ -63,6 +63,11 @@ func NewSigner(alg *Algorithm, options interface{}) (signer *Signer, err error)
 	var privateKey crypto.PrivateKey
 
 	if alg.privateKeyType == KeyTypeECDSA {
+		if alg.privateKeyECDSACurve == nil {
+			err = fmt.Errorf("No ECDSA curve found for algorithm")
+			return nil, err
+		}
+
 		privateKey, err = ecdsa.GenerateKey(alg.privateKeyECDSACurve, rand.Reader)
 		if err != nil {
 			err = errors.Wrapf(err, "error generating ecdsa signer private key")

core_test.go

@@ -65,7 +65,18 @@ func TestNewSigner(t *testing.T) {
 	_, err = NewSigner(PS256, nil)
 	assert.Nil(err)
 
-	signer, err := NewSigner(PS256, RSAOptions{Size: 2050})
+	edDSA := getAlgByNameOrPanic("EdDSA")
+
+	signer, err := NewSigner(edDSA, nil)
+	assert.NotNil(err)
+	assert.Equal(err.Error(), ErrUnknownPrivateKeyType.Error())
+
+	edDSA.privateKeyType = KeyTypeECDSA
+	signer, err = NewSigner(edDSA, nil)
+	assert.NotNil(err)
+	assert.Equal(err.Error(), "No ECDSA curve found for algorithm")
+
+	signer, err = NewSigner(PS256, RSAOptions{Size: 2050})
 	assert.Nil(err)
 	rkey := signer.privateKey.(*rsa.PrivateKey)
 	keySize := rkey.D.BitLen()
@@ -123,11 +134,7 @@ func TestVerifyRSASuccess(t *testing.T) {
 func TestVerifyInvalidAlgErrors(t *testing.T) {
 	assert := assert.New(t)
 
-	signer, err := NewSigner(getAlgByNameOrPanic("EdDSA"), nil)
-	assert.NotNil(err)
-	assert.Equal(err.Error(), ErrUnknownPrivateKeyType.Error())
-
-	signer, err = NewSignerFromKey(ES256, &ecdsaPrivateKey)
+	signer, err := NewSignerFromKey(ES256, &ecdsaPrivateKey)
 	assert.Nil(err, "Error creating signer")
 
 	verifier := signer.Verifier()