sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow cpuworkers to exist without onion keys 

Now that we allow cpuworkers for dirport-only hosts (to fix 23693),
we need to allow dup_onion_keys() to succeed for them.

The change to construct_ntor_key_map() is for correctness,
but is not strictly necessary.
This commit is contained in:
Nick Mathewson 2018-04-22 17:12:18 -04:00
parent 386f8016b7
commit c3e40a8361
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/or/router.c
View File

@ -131,7 +131,8 @@ get_onion_key(void)
} }
/** Store a full copy of the current onion key into *<b>key</b>, and a full /** Store a full copy of the current onion key into *<b>key</b>, and a full
* copy of the most recent onion key into *<b>last</b>. * copy of the most recent onion key into *<b>last</b>. Store NULL into
* a pointer if the corresponding key does not exist.
*/ */
void void
dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last) dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last)
@ -139,8 +140,10 @@ dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last)
tor_assert(key); tor_assert(key);
tor_assert(last); tor_assert(last);
tor_mutex_acquire(key_lock); tor_mutex_acquire(key_lock);
tor_assert(onionkey); if (onionkey)
*key = crypto_pk_copy_full(onionkey); *key = crypto_pk_copy_full(onionkey);
else
*last = NULL;
if (lastonionkey) if (lastonionkey)
*last = crypto_pk_copy_full(lastonionkey); *last = crypto_pk_copy_full(lastonionkey);
else else
@ -207,10 +210,14 @@ construct_ntor_key_map(void)
{ {
di_digest256_map_t *m = NULL; di_digest256_map_t *m = NULL;
dimap_add_entry(&m, if (!tor_mem_is_zero((const char*)
curve25519_onion_key.pubkey.public_key, curve25519_onion_key.pubkey.public_key,
tor_memdup(&curve25519_onion_key, CURVE25519_PUBKEY_LEN)) {
sizeof(curve25519_keypair_t))); dimap_add_entry(&m,
curve25519_onion_key.pubkey.public_key,
tor_memdup(&curve25519_onion_key,
sizeof(curve25519_keypair_t)));
}
if (!tor_mem_is_zero((const char*) if (!tor_mem_is_zero((const char*)
last_curve25519_onion_key.pubkey.public_key, last_curve25519_onion_key.pubkey.public_key,
CURVE25519_PUBKEY_LEN)) { CURVE25519_PUBKEY_LEN)) {