mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.2'

Browse source
This commit is contained in:
Nick Mathewson 2010-10-26 13:59:09 -04:00
commit ccec0a1bd3
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/crypto.c
View file

@ -405,6 +405,7 @@ crypto_free_pk_env(crypto_pk_env_t *env)
if (--env->refs > 0) if (--env->refs > 0)
return; return;
tor_assert(env->refs == 0);
if (env->key) if (env->key)
RSA_free(env->key); RSA_free(env->key);

2
src/or/router.c
View file

@ -575,7 +575,7 @@ init_keys(void)
* otherwise, set the server identity key as our client identity * otherwise, set the server identity key as our client identity
* key. */ * key. */
if (public_server_mode(options)) { if (public_server_mode(options)) {
set_client_identity_key(prkey); /* set above */ set_client_identity_key(crypto_pk_dup_key(prkey)); /* set above */
} else { } else {
if (!(prkey = crypto_new_pk_env())) if (!(prkey = crypto_new_pk_env()))
return -1; return -1;