Merge petertodd#200: misc fixes key.py

c31b6e7 misc fixes key.py (Mark B Lundeberg)

Pull request description:

  * BN_bin2bn happy to take null ptr as arg and do allocation.
  * EC_POINT_mul hears you the first time, don't need to call twice.
  * EC_KEY_set_private_key makes a copy of the key; without freeing it we have a memory leak.

Tree-SHA512: 6557c788c27933ee1dc3d6085f3c3f259ed0547811c1a3f7bd3679f8ee664772a53cca81a56e6dfac2eaecea613d006b1c5ccaedc7c7ccd121a15fcd41fb58fb

Author: petertodd

bitcoin/core/key.py

@@ -211,16 +211,16 @@ def __del__(self):
         self.k = None
 
     def set_secretbytes(self, secret):
-        priv_key = _ssl.BN_bin2bn(secret, 32, _ssl.BN_new())
+        priv_key = _ssl.BN_bin2bn(secret, 32, 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)
         _ssl.EC_POINT_free(pub_key)
+        _ssl.BN_free(priv_key)
         _ssl.BN_CTX_free(ctx)
         return self.k