aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-02-07 08:54:47 -0500
committerNick Mathewson <nickm@torproject.org>2017-02-07 08:54:47 -0500
commit6b37512dc76152926a16d93f2be52083cd5ae436 (patch)
tree1030b477a53f6a520fb0138d7782df4ed0599b3d /src/common
parent05ec055c417c80bf7b13914fade70a72f11accc5 (diff)
parentd6eae78e2928544ad634356887c7a83a2cd23eaa (diff)
downloadtor-6b37512dc76152926a16d93f2be52083cd5ae436.tar.gz
tor-6b37512dc76152926a16d93f2be52083cd5ae436.zip
Merge branch 'maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'src/common')
-rw-r--r--src/common/crypto.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 43bf5bd6b6..f7362765d2 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -557,8 +557,10 @@ crypto_pk_generate_key_with_bits(crypto_pk_t *env, int bits)
{
tor_assert(env);
- if (env->key)
+ if (env->key) {
RSA_free(env->key);
+ env->key = NULL;
+ }
{
BIGNUM *e = BN_new();