diff options
author | obscuren <geffobscura@gmail.com> | 2015-03-29 19:34:41 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-03-29 19:34:41 +0800 |
commit | af153e78849871cff7cef494533fb7f028957083 (patch) | |
tree | bba3abea350040aa74857974a98c22365d89eaeb /core | |
parent | 3b20603eb1373cab402babd1d3878a96fe7de5a7 (diff) | |
parent | d2fa6e7753deb0f7fe5e1d802460c88c2885b954 (diff) | |
download | go-tangerine-af153e78849871cff7cef494533fb7f028957083.tar go-tangerine-af153e78849871cff7cef494533fb7f028957083.tar.gz go-tangerine-af153e78849871cff7cef494533fb7f028957083.tar.bz2 go-tangerine-af153e78849871cff7cef494533fb7f028957083.tar.lz go-tangerine-af153e78849871cff7cef494533fb7f028957083.tar.xz go-tangerine-af153e78849871cff7cef494533fb7f028957083.tar.zst go-tangerine-af153e78849871cff7cef494533fb7f028957083.zip |
Merge branch 'fix_ecrecover' of https://github.com/ebuchman/go-ethereum into ebuchman-fix_ecrecover
Diffstat (limited to 'core')
-rw-r--r-- | core/vm/address.go | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/core/vm/address.go b/core/vm/address.go index 215f4bc8f..e4c33ec80 100644 --- a/core/vm/address.go +++ b/core/vm/address.go @@ -3,8 +3,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/crypto" ) type Address interface { @@ -61,15 +61,29 @@ func ripemd160Func(in []byte) []byte { return common.LeftPadBytes(crypto.Ripemd160(in), 32) } -func ecrecoverFunc(in []byte) []byte { - // In case of an invalid sig. Defaults to return nil - defer func() { recover() }() +const EcRecoverInputLength = 128 +func ecrecoverFunc(in []byte) []byte { + // "in" is (hash, v, r, s), each 32 bytes + // but for ecrecover we want (r, s, v) + if len(in) < EcRecoverInputLength { + return nil + } hash := in[:32] - v := common.BigD(in[32:64]).Bytes()[0] - 27 + // v is only a bit, but comes as 32 bytes from vm. We only need least significant byte + encodedV := in[32:64] + v := encodedV[31] - 27 + if !(v == 0 || v == 1) { + return nil + } sig := append(in[64:], v) - - return common.LeftPadBytes(crypto.Sha3(crypto.Ecrecover(append(hash, sig...))[1:])[12:], 32) + pubKey := crypto.Ecrecover(append(hash, sig...)) + // secp256.go returns either nil or 65 bytes + if pubKey == nil || len(pubKey) != 65 { + return nil + } + // the first byte of pubkey is bitcoin heritage + return common.LeftPadBytes(crypto.Sha3(pubKey[1:])[12:], 32) } func memCpy(in []byte) []byte { |