mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Merge remote branch 'origin/maint-0.2.2'
This commit is contained in:
commit
ccec0a1bd3
@ -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);
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user