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

This commit is contained in:
Dave Grijalva 2016-06-07 10:34:06 -07:00
commit 6fd0370e43
5 changed files with 7 additions and 6 deletions

View File

@ -69,7 +69,7 @@ func (m *SigningMethodECDSA) Verify(signingString, signature string, key interfa
case *ecdsa.PublicKey: case *ecdsa.PublicKey:
ecdsaKey = k ecdsaKey = k
default: default:
return ErrInvalidKey return ErrInvalidKeyType
} }
if len(sig) != 2*m.KeySize { if len(sig) != 2*m.KeySize {
@ -103,7 +103,7 @@ func (m *SigningMethodECDSA) Sign(signingString string, key interface{}) (string
case *ecdsa.PrivateKey: case *ecdsa.PrivateKey:
ecdsaKey = k ecdsaKey = k
default: default:
return "", ErrInvalidKey return "", ErrInvalidKeyType
} }
// Create the hasher // Create the hasher

View File

@ -6,7 +6,8 @@ import (
// Error constants // Error constants
var ( 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") ErrHashUnavailable = errors.New("the requested hash function is unavailable")
) )

View File

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

2
rsa.go
View File

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

View File

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