Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

2015-04-08 13:07:30 +02:00 · 2015-04-08 13:07:30 +02:00 · 6284604b52
commit 6284604b52
parent a953f3ec97 7c0a18edb5
1 changed files with 4 additions and 0 deletions
--- a/crypto/ecies/ecies.go
+++ b/crypto/ecies/ecies.go
@ -303,6 +303,10 @@ func (prv *PrivateKey) Decrypt(rand io.Reader, c, s1, s2 []byte) (m []byte, err
 		err = ErrInvalidPublicKey
 		return
 	}
+	if !R.Curve.IsOnCurve(R.X, R.Y) {
+		err = ErrInvalidCurve
+		return
+	}

 	z, err := prv.GenerateShared(R, params.KeyLen, params.KeyLen)
 	if err != nil {