forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 05:06:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add CRYPTO logger, remove duplicated pubkey len check

Browse source
This commit is contained in:
Gustav Simonsson 2015-04-02 22:09:05 +02:00
parent 607fc788e3
commit 6e91142dc2
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/vm/address.go
View file

@ -82,7 +82,7 @@ func ecrecoverFunc(in []byte) []byte {
rsv := append(in[64:128], byte(v.Uint64())) rsv := append(in[64:128], byte(v.Uint64()))
pubKey := crypto.Ecrecover(in[:32], rsv) pubKey := crypto.Ecrecover(in[:32], rsv)
// make sure the public key is a valid one // make sure the public key is a valid one
if pubKey == nil || len(pubKey) != 65 { if pubKey == nil {
return nil return nil
} }

11
crypto/crypto.go
View file

@ -21,11 +21,16 @@ import (
"github.com/ethereum/go-ethereum/crypto/ecies" "github.com/ethereum/go-ethereum/crypto/ecies"
"github.com/ethereum/go-ethereum/crypto/secp256k1" "github.com/ethereum/go-ethereum/crypto/secp256k1"
"github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/crypto/sha3"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
"golang.org/x/crypto/ripemd160" "golang.org/x/crypto/ripemd160"
) )
var (
cryptologger = logger.NewLogger("CRYPTO")
)
func init() { func init() {
// specify the params for the s256 curve // specify the params for the s256 curve
ecies.AddParamsForCurve(S256(), ecies.ECIES_AES128_SHA256) ecies.AddParamsForCurve(S256(), ecies.ECIES_AES128_SHA256)
@ -69,8 +74,10 @@ func Ripemd160(data []byte) []byte {
} }
func Ecrecover(hash, sig []byte) []byte { func Ecrecover(hash, sig []byte) []byte {
r, _ := secp256k1.RecoverPubkey(hash, sig) r, err := secp256k1.RecoverPubkey(hash, sig)
if err != nil {
cryptologger.Errorf("EC RECOVER FAIL: ", err)
}
return r return r
} }