nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'teor/bug23760_nc'

Browse Source
This commit is contained in:
Nick Mathewson 2017-11-21 13:56:57 -05:00
commit 1cc344b277
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket23760 Normal file
View File

@ -0,0 +1,4 @@
o Code simplification and refactoring:
- We make extend_info_from_node() use node_get_curve25519_onion_key()
introduced in ticket 23577 to access the curve25519 public keys rather
than accessing it directly. Closes ticket 23760. Patch by Neel Chauhan.

8
src/or/circuitbuild.c
View File

@ -2707,12 +2707,16 @@ extend_info_from_node(const node_t *node, int for_direct_connect)
node_describe(node)); node_describe(node));
} }
/* Retrieve the curve25519 pubkey. */
const curve25519_public_key_t *curve_pubkey =
node_get_curve25519_onion_key(node);
if (valid_addr && node->ri) if (valid_addr && node->ri)
return extend_info_new(node->ri->nickname, return extend_info_new(node->ri->nickname,
node->identity, node->identity,
ed_pubkey, ed_pubkey,
node->ri->onion_pkey, node->ri->onion_pkey,
node->ri->onion_curve25519_pkey, curve_pubkey,
&ap.addr, &ap.addr,
ap.port); ap.port);
else if (valid_addr && node->rs && node->md) else if (valid_addr && node->rs && node->md)
@ -2720,7 +2724,7 @@ extend_info_from_node(const node_t *node, int for_direct_connect)
node->identity, node->identity,
ed_pubkey, ed_pubkey,
node->md->onion_pkey, node->md->onion_pkey,
node->md->onion_curve25519_pkey, curve_pubkey,
&ap.addr, &ap.addr,
ap.port); ap.port);
else else