poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_ecrecover' of https://github.com/ebuchman/go-ethereum into ebuchman-fix_ecrecover

This commit is contained in:
obscuren 2015-03-29 13:34:41 +02:00
parent 3b20603eb1 d2fa6e7753
commit af153e7884
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/vm/address.go
View File

@ -3,8 +3,8 @@ package vm
import ( import (
"math/big" "math/big"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
) )
type Address interface { type Address interface {
@ -61,15 +61,29 @@ func ripemd160Func(in []byte) []byte {
return common.LeftPadBytes(crypto.Ripemd160(in), 32) return common.LeftPadBytes(crypto.Ripemd160(in), 32)
} }
const EcRecoverInputLength = 128
func ecrecoverFunc(in []byte) []byte { func ecrecoverFunc(in []byte) []byte {
// In case of an invalid sig. Defaults to return nil // "in" is (hash, v, r, s), each 32 bytes
defer func() { recover() }() // but for ecrecover we want (r, s, v)
if len(in) < EcRecoverInputLength {
return nil
}
hash := in[:32] 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) sig := append(in[64:], v)
pubKey := crypto.Ecrecover(append(hash, sig...))
return common.LeftPadBytes(crypto.Sha3(crypto.Ecrecover(append(hash, sig...))[1:])[12:], 32) // 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 { func memCpy(in []byte) []byte {