Merge branch 'master' of https://github.com/martinlindhe/jwt-go into …

…patch_109
fredbi · Jun 7, 2016 · 6fd0370 · 6fd0370
2 parents c5c24ad + f728899
commit 6fd0370
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/ecdsa.go b/ecdsa.go
@@ -69,7 +69,7 @@ func (m *SigningMethodECDSA) Verify(signingString, signature string, key interfa
 	case *ecdsa.PublicKey:
 		ecdsaKey = k
 	default:
-		return ErrInvalidKey
+		return ErrInvalidKeyType
 	}
 
 	if len(sig) != 2*m.KeySize {
@@ -103,7 +103,7 @@ func (m *SigningMethodECDSA) Sign(signingString string, key interface{}) (string
 	case *ecdsa.PrivateKey:
 		ecdsaKey = k
 	default:
-		return "", ErrInvalidKey
+		return "", ErrInvalidKeyType
 	}
 
 	// Create the hasher

diff --git a/errors.go b/errors.go
@@ -6,7 +6,8 @@ import (
 
 // Error constants
 var (
-	ErrInvalidKey      = errors.New("key is invalid or of invalid type")
+	ErrInvalidKey      = errors.New("key is invalid")
+	ErrInvalidKeyType  = errors.New("key is of invalid type")
 	ErrHashUnavailable = errors.New("the requested hash function is unavailable")
 )
 

diff --git a/hmac.go b/hmac.go
@@ -49,7 +49,7 @@ func (m *SigningMethodHMAC) Verify(signingString, signature string, key interfac
 	// Verify the key is the right type
 	keyBytes, ok := key.([]byte)
 	if !ok {
-		return ErrInvalidKey
+		return ErrInvalidKeyType
 	}
 
 	// Decode signature, for comparison

diff --git a/rsa.go b/rsa.go
@@ -58,7 +58,7 @@ func (m *SigningMethodRSA) Verify(signingString, signature string, key interface
 	var ok bool
 
 	if rsaKey, ok = key.(*rsa.PublicKey); !ok {
-		return ErrInvalidKey
+		return ErrInvalidKeyType
 	}
 
 	// Create hasher

diff --git a/rsa_pss.go b/rsa_pss.go
@@ -106,7 +106,7 @@ func (m *SigningMethodRSAPSS) Sign(signingString string, key interface{}) (strin
 	case *rsa.PrivateKey:
 		rsaKey = k
 	default:
-		return "", ErrInvalidKey
+		return "", ErrInvalidKeyType
 	}
 
 	// Create the hasher