Merge remote branch 'origin/maint-0.2.2'

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

View File

@ -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);

View File

@ -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;