From bb54bf8c1db42be2c5002f6c5a5e46e074533229 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 8 Jun 2012 22:21:16 -0700 Subject: [PATCH] Change some BN_free to BN_clear_free --- src/DeterministicKeys.cpp | 12 ++++++------ src/key.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/DeterministicKeys.cpp b/src/DeterministicKeys.cpp index 75e36bdc21..2373fe52c1 100644 --- a/src/DeterministicKeys.cpp +++ b/src/DeterministicKeys.cpp @@ -78,7 +78,7 @@ EC_KEY* CKey::GenerateRootDeterministicKey(const uint128& seed) { // set the random point as the private key assert(false); EC_KEY_free(pkey); - BN_free(privKey); + BN_clear_free(privKey); BN_CTX_free(ctx); return NULL; } @@ -87,13 +87,13 @@ EC_KEY* CKey::GenerateRootDeterministicKey(const uint128& seed) if(!EC_POINT_mul(EC_KEY_get0_group(pkey), pubKey, privKey, NULL, NULL, ctx)) { // compute the corresponding public key point assert(false); - BN_free(privKey); + BN_clear_free(privKey); EC_POINT_free(pubKey); EC_KEY_free(pkey); BN_CTX_free(ctx); return NULL; } - BN_free(privKey); + BN_clear_free(privKey); if(!EC_KEY_set_public_key(pkey, pubKey)) { assert(false); @@ -272,19 +272,19 @@ EC_KEY* CKey::GeneratePrivateDeterministicKey(const NewcoinAddress& pubGen, cons EC_POINT* pubKey=EC_POINT_new(EC_KEY_get0_group(pkey)); if(!pubKey) { - BN_free(privKey); + BN_clear_free(privKey); BN_CTX_free(ctx); EC_KEY_free(pkey); return NULL; } if(EC_POINT_mul(EC_KEY_get0_group(pkey), pubKey, privKey, NULL, NULL, ctx)==0) { - BN_free(privKey); + BN_clear_free(privKey); BN_CTX_free(ctx); EC_KEY_free(pkey); return NULL; } - BN_free(privKey); + BN_clear_free(privKey); EC_KEY_set_public_key(pkey, pubKey); EC_POINT_free(pubKey); diff --git a/src/key.h b/src/key.h index c287c51490..38a47e8c26 100644 --- a/src/key.h +++ b/src/key.h @@ -239,11 +239,11 @@ public: BIGNUM* bn = BN_bin2bn(key.begin(), key.size(), NULL); if (!EC_KEY_set_private_key(pkey, bn)) { - BN_free(bn); + BN_clear_free(bn); throw key_error("CKey::SetPrivateKeyU: EC_KEY_set_private_key failed"); } fSet = true; - BN_free(bn); + BN_clear_free(bn); } void SetPubSeq(const NewcoinAddress& masterKey, int keyNum)