commit 83b8034a98552fd35ce437e968d45583f5a96b69 Author: Neel Chauhan <neel@neelc.org> Date: Tue Nov 21 09:16:18 2017 -0500 Introduce node_get_curve25519_onion_key() in extend_info_from_node() --- changes/ticket23760 | 4 ++++ src/or/circuitbuild.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/ticket23760 b/changes/ticket23760 new file mode 100644 index 000000000..9213b1462 --- /dev/null +++ b/changes/ticket23760 @@ -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. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 7f0bcc415..2e6b63b4d 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2707,12 +2707,16 @@ extend_info_from_node(const node_t *node, int for_direct_connect) 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) return extend_info_new(node->ri->nickname, node->identity, ed_pubkey, node->ri->onion_pkey, - node->ri->onion_curve25519_pkey, + curve_pubkey, &ap.addr, ap.port); 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, ed_pubkey, node->md->onion_pkey, - node->md->onion_curve25519_pkey, + curve_pubkey, &ap.addr, ap.port); else