Merge pull request jgarzik#15 from runeksvendsen/master

Jeff Garzik · Jeff Garzik · commit 2b3a74f434b3 · 2013-09-06T12:19:52.000-07:00
Key generation from secret: handle failure of point multiplication
diff --git a/bitcoin/key.py b/bitcoin/key.py
@@ -42,6 +42,8 @@ def generate(self, secret=None):
             group = ssl.EC_KEY_get0_group(self.k)
             pub_key = ssl.EC_POINT_new(group)
             ctx = ssl.BN_CTX_new()
+            if not ssl.EC_POINT_mul(group, pub_key, priv_key, None, None, ctx):
+                raise ValueError("Could not derive public key from the supplied secret.")
             ssl.EC_POINT_mul(group, pub_key, priv_key, None, None, ctx)
             ssl.EC_KEY_set_private_key(self.k, priv_key)
             ssl.EC_KEY_set_public_key(self.k, pub_key)
