tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
obscuren 2015-03-29 15:02:49 +02:00
parent af153e7884
commit 61c5edcb57
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/vm/address.go
View File

@ -61,27 +61,30 @@ func ripemd160Func(in []byte) []byte {
return common.LeftPadBytes(crypto.Ripemd160(in), 32) return common.LeftPadBytes(crypto.Ripemd160(in), 32)
} }
const EcRecoverInputLength = 128 const ecRecoverInputLength = 128
func ecrecoverFunc(in []byte) []byte { func ecrecoverFunc(in []byte) []byte {
// "in" is (hash, v, r, s), each 32 bytes // "in" is (hash, v, r, s), each 32 bytes
// but for ecrecover we want (r, s, v) // but for ecrecover we want (r, s, v)
if len(in) < EcRecoverInputLength { if len(in) < ecRecoverInputLength {
return nil return nil
} }
hash := in[:32]
// v is only a bit, but comes as 32 bytes from vm. We only need least significant byte // Treat V as a 256bit integer
encodedV := in[32:64] v := new(big.Int).Sub(common.Bytes2Big(in[32:64]), big.NewInt(27))
v := encodedV[31] - 27 // Ethereum requires V to be either 0 or 1 => (27 || 28)
if !(v == 0 || v == 1) { if !(v.Cmp(Zero) == 0 || v.Cmp(One) == 0) {
return nil return nil
} }
sig := append(in[64:], v)
pubKey := crypto.Ecrecover(append(hash, sig...)) // v needs to be moved to the end
// secp256.go returns either nil or 65 bytes rsv := append(in[64:128], byte(v.Uint64()))
pubKey := crypto.Ecrecover(in[:32], rsv)
// make sure the public key is a valid one
if pubKey == nil || len(pubKey) != 65 { if pubKey == nil || len(pubKey) != 65 {
return nil return nil
} }
// the first byte of pubkey is bitcoin heritage // the first byte of pubkey is bitcoin heritage
return common.LeftPadBytes(crypto.Sha3(pubKey[1:])[12:], 32) return common.LeftPadBytes(crypto.Sha3(pubKey[1:])[12:], 32)
} }

16
crypto/crypto.go
View File

@ -68,13 +68,8 @@ func Ripemd160(data []byte) []byte {
return ripemd.Sum(nil) return ripemd.Sum(nil)
} }
func Ecrecover(data []byte) []byte { func Ecrecover(hash, sig []byte) []byte {
var in = struct { r, _ := secp256k1.RecoverPubkey(hash, sig)
hash []byte
sig []byte
}{data[:32], data[32:]}
r, _ := secp256k1.RecoverPubkey(in.hash, in.sig)
return r return r
} }
@ -151,9 +146,12 @@ func GenerateKey() (*ecdsa.PrivateKey, error) {
} }
func SigToPub(hash, sig []byte) *ecdsa.PublicKey { func SigToPub(hash, sig []byte) *ecdsa.PublicKey {
s := Ecrecover(append(hash, sig...)) s := Ecrecover(hash, sig)
x, y := elliptic.Unmarshal(S256(), s) if s == nil || len(s) != 65 {
return nil
}
x, y := elliptic.Unmarshal(S256(), s)
return &ecdsa.PublicKey{S256(), x, y} return &ecdsa.PublicKey{S256(), x, y}
} }