diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-26 13:59:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-26 13:59:09 -0400 |
| commit | ccec0a1bd37369867f48cd463373d8dd48db5a68 (patch) | |
| tree | 3f971111c7ed102695ec9eed203027cb92a26e54 | |
| parent | 17fdde3d9251e92f01be839efe7fc7cac4854484 (diff) | |
| parent | 213139f887edd5f366108e72d77c33bcfa3f8ba9 (diff) | |
| download | tor-ccec0a1bd37369867f48cd463373d8dd48db5a68.tar.gz tor-ccec0a1bd37369867f48cd463373d8dd48db5a68.zip | |
Merge remote branch 'origin/maint-0.2.2'
| -rw-r--r-- | src/common/crypto.c | 1 | ||||
| -rw-r--r-- | src/or/router.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index bfb81d3ccd..b49547fa4d 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -405,6 +405,7 @@ crypto_free_pk_env(crypto_pk_env_t *env) if (--env->refs > 0) return; + tor_assert(env->refs == 0); if (env->key) RSA_free(env->key); diff --git a/src/or/router.c b/src/or/router.c index 1b548d8fe2..a188d50f94 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -575,7 +575,7 @@ init_keys(void) * otherwise, set the server identity key as our client identity * key. */ if (public_server_mode(options)) { - set_client_identity_key(prkey); /* set above */ + set_client_identity_key(crypto_pk_dup_key(prkey)); /* set above */ } else { if (!(prkey = crypto_new_pk_env())) return -1; |