diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-29 21:03:30 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-29 21:03:30 +0800 |
| commit | b7a0bc70313597ada37cc1a348bbd0d39696ec6e (patch) | |
| tree | d9bbd2d19cea7a1bcfbe53d2a02252976709c58f /crypto | |
| parent | 3b20603eb1373cab402babd1d3878a96fe7de5a7 (diff) | |
| parent | 61c5edcb57a200764bfa37e3a7da909727a7852b (diff) | |
| download | dexon-b7a0bc70313597ada37cc1a348bbd0d39696ec6e.tar dexon-b7a0bc70313597ada37cc1a348bbd0d39696ec6e.tar.gz dexon-b7a0bc70313597ada37cc1a348bbd0d39696ec6e.tar.bz2 dexon-b7a0bc70313597ada37cc1a348bbd0d39696ec6e.tar.lz dexon-b7a0bc70313597ada37cc1a348bbd0d39696ec6e.tar.xz dexon-b7a0bc70313597ada37cc1a348bbd0d39696ec6e.tar.zst dexon-b7a0bc70313597ada37cc1a348bbd0d39696ec6e.zip | |
Merge branch 'ebuchman-fix_ecrecover' into develop
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto.go | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go index 442942c6c..9a1559fbf 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -68,13 +68,8 @@ func Ripemd160(data []byte) []byte { return ripemd.Sum(nil) } -func Ecrecover(data []byte) []byte { - var in = struct { - hash []byte - sig []byte - }{data[:32], data[32:]} - - r, _ := secp256k1.RecoverPubkey(in.hash, in.sig) +func Ecrecover(hash, sig []byte) []byte { + r, _ := secp256k1.RecoverPubkey(hash, sig) return r } @@ -151,9 +146,12 @@ func GenerateKey() (*ecdsa.PrivateKey, error) { } func SigToPub(hash, sig []byte) *ecdsa.PublicKey { - s := Ecrecover(append(hash, sig...)) - x, y := elliptic.Unmarshal(S256(), s) + s := Ecrecover(hash, sig) + if s == nil || len(s) != 65 { + return nil + } + x, y := elliptic.Unmarshal(S256(), s) return &ecdsa.PublicKey{S256(), x, y} } |