diff --git a/crypto/crypto.go b/crypto/crypto.go index 8161769d3d533d9d2793f97149653bc82f473e76..3a98bfb5036217bd5f28b40022163fde3cc3a7e6 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -98,6 +98,9 @@ func toECDSA(d []byte, strict bool) (*ecdsa.PrivateKey, error) { } priv.D = new(big.Int).SetBytes(d) priv.PublicKey.X, priv.PublicKey.Y = priv.PublicKey.Curve.ScalarBaseMult(d) + if priv.PublicKey.X == nil { + return nil, errors.New("invalid private key") + } return priv, nil } diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index b4c441e5f7f1221a2ad7df2d3de1c3b44966589b..83503546234919af65c9a42901a434b8406c4135 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -40,6 +40,15 @@ func TestKeccak256Hash(t *testing.T) { checkhash(t, "Sha3-256-array", func(in []byte) []byte { h := Keccak256Hash(in); return h[:] }, msg, exp) } +func TestToECDSAErrors(t *testing.T) { + if _, err := HexToECDSA("0000000000000000000000000000000000000000000000000000000000000000"); err == nil { + t.Fatal("HexToECDSA should've returned error") + } + if _, err := HexToECDSA("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); err == nil { + t.Fatal("HexToECDSA should've returned error") + } +} + func BenchmarkSha3(b *testing.B) { a := []byte("hello world") for i := 0; i < b.N; i++ {