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

connection_or_set_identity_digest(): handle zero ed_id better

Browse Source 
It looks like our code actually assumes (by dereferencing it in a
log call) that ed_id will _not_ be NULL, but rather will be a bunch
of zero bytes.  Refactor the code accordingly, and stop using NULL
tests on ed_id.
This commit is contained in:
Nick Mathewson 2022-03-02 09:38:58 -05:00
parent ecbab95998
commit 33bb1c5fca
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/or/connection_or.c
View File

@ -165,9 +165,6 @@ connection_or_set_identity_digest(or_connection_t *conn,
if (conn->chan) if (conn->chan)
chan = TLS_CHAN_TO_BASE(conn->chan); chan = TLS_CHAN_TO_BASE(conn->chan);
if (BUG(ed_id && ed25519_public_key_is_zero(ed_id)))
ed_id = NULL;
log_info(LD_HANDSHAKE, "Set identity digest for %s at %p: %s %s.", log_info(LD_HANDSHAKE, "Set identity digest for %s at %p: %s %s.",
connection_describe(TO_CONN(conn)), connection_describe(TO_CONN(conn)),
conn, conn,
@ -180,10 +177,12 @@ connection_or_set_identity_digest(or_connection_t *conn,
const int rsa_id_was_set = ! tor_digest_is_zero(conn->identity_digest); const int rsa_id_was_set = ! tor_digest_is_zero(conn->identity_digest);
const int ed_id_was_set = const int ed_id_was_set =
chan && !ed25519_public_key_is_zero(&chan->ed25519_identity); chan && !ed25519_public_key_is_zero(&chan->ed25519_identity);
const int new_ed_id_is_set =
(ed_id && !ed25519_public_key_is_zero(ed_id));
const int rsa_changed = const int rsa_changed =
tor_memneq(conn->identity_digest, rsa_digest, DIGEST_LEN); tor_memneq(conn->identity_digest, rsa_digest, DIGEST_LEN);
const int ed_changed = (!ed_id_was_set && ed_id) || const int ed_changed = bool_neq(ed_id_was_set, new_ed_id_is_set) ||
(ed_id_was_set && ed_id && chan && (ed_id_was_set && new_ed_id_is_set && chan &&
!ed25519_pubkey_eq(ed_id, &chan->ed25519_identity)); !ed25519_pubkey_eq(ed_id, &chan->ed25519_identity));
if (BUG(rsa_changed && rsa_id_was_set)) if (BUG(rsa_changed && rsa_id_was_set))
@ -204,8 +203,7 @@ connection_or_set_identity_digest(or_connection_t *conn,
memcpy(conn->identity_digest, rsa_digest, DIGEST_LEN); memcpy(conn->identity_digest, rsa_digest, DIGEST_LEN);
/* If we're initializing the IDs to zero, don't add a mapping yet. */ /* If we're initializing the IDs to zero, don't add a mapping yet. */
if (tor_digest_is_zero(rsa_digest) && if (tor_digest_is_zero(rsa_digest) && !new_ed_id_is_set)
(!ed_id || ed25519_public_key_is_zero(ed_id)))
return; return;
/* Deal with channels */ /* Deal with channels */