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

relay: Refactor some long lines from circuit_extend()

Browse Source 
Part of 33633.
This commit is contained in:
teor 2020-03-18 18:48:01 +10:00
parent 5cb2bbea7d
commit 2640030b10
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/feature/relay/circuitbuild_relay.c
View File

@ -133,12 +133,12 @@ circuit_extend_lspec_valid_helper(const extend_cell_t *ec,
return -1;
}
const channel_t *p_chan = CONST_TO_OR_CIRCUIT(circ)->p_chan;
/* Next, check if we're being asked to connect to the hop that the
* extend cell came from. There isn't any reason for that, and it can
* assist circular-path attacks. */
if (tor_memeq(ec->node_id,
CONST_TO_OR_CIRCUIT(circ)->p_chan->identity_digest,
DIGEST_LEN)) {
if (tor_memeq(ec->node_id, p_chan->identity_digest, DIGEST_LEN)) {
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Client asked me to extend back to the previous hop.");
return -1;
@ -146,8 +146,7 @@ circuit_extend_lspec_valid_helper(const extend_cell_t *ec,
/* Check the previous hop Ed25519 ID too */
if (! ed25519_public_key_is_zero(&ec->ed_pubkey) &&
ed25519_pubkey_eq(&ec->ed_pubkey,
&CONST_TO_OR_CIRCUIT(circ)->p_chan->ed25519_identity)) {
ed25519_pubkey_eq(&ec->ed_pubkey, &p_chan->ed25519_identity)) {
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Client asked me to extend back to the previous hop "
"(by Ed25519 ID).");