aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-04-08 02:48:56 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-04-08 02:48:56 +0800
commit758205b187e079080193c2fed2a21caff2377329 (patch)
treef8c82d47703aac292ab549c8fe3bfaf046075c1a /crypto
parentf5978639279bac0bcd6270ebb4589099bae570ed (diff)
parent2591883a18113f1b60e6057313ff552c92d7f261 (diff)
downloadgo-tangerine-758205b187e079080193c2fed2a21caff2377329.tar
go-tangerine-758205b187e079080193c2fed2a21caff2377329.tar.gz
go-tangerine-758205b187e079080193c2fed2a21caff2377329.tar.bz2
go-tangerine-758205b187e079080193c2fed2a21caff2377329.tar.lz
go-tangerine-758205b187e079080193c2fed2a21caff2377329.tar.xz
go-tangerine-758205b187e079080193c2fed2a21caff2377329.tar.zst
go-tangerine-758205b187e079080193c2fed2a21caff2377329.zip
Merge pull request #648 from Gustav-Simonsson/forward_ecrecover_err_and_remove_dup_checks
Forward and log EC recover err and remove dup pubkey len check
Diffstat (limited to 'crypto')
-rw-r--r--crypto/crypto.go16
1 files changed, 7 insertions, 9 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go
index 9a1559fbf..7d1d51fa6 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -68,10 +68,8 @@ func Ripemd160(data []byte) []byte {
return ripemd.Sum(nil)
}
-func Ecrecover(hash, sig []byte) []byte {
- r, _ := secp256k1.RecoverPubkey(hash, sig)
-
- return r
+func Ecrecover(hash, sig []byte) ([]byte, error) {
+ return secp256k1.RecoverPubkey(hash, sig)
}
// New methods using proper ecdsa keys from the stdlib
@@ -145,14 +143,14 @@ func GenerateKey() (*ecdsa.PrivateKey, error) {
return ecdsa.GenerateKey(S256(), rand.Reader)
}
-func SigToPub(hash, sig []byte) *ecdsa.PublicKey {
- s := Ecrecover(hash, sig)
- if s == nil || len(s) != 65 {
- return nil
+func SigToPub(hash, sig []byte) (*ecdsa.PublicKey, error) {
+ s, err := Ecrecover(hash, sig)
+ if err != nil {
+ return nil, err
}
x, y := elliptic.Unmarshal(S256(), s)
- return &ecdsa.PublicKey{S256(), x, y}
+ return &ecdsa.PublicKey{S256(), x, y}, nil
}
func Sign(hash []byte, prv *ecdsa.PrivateKey) (sig []byte, err error) {