mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Teach channel_rsa_id_group_set_badness_() about Ed25519

Browse source 
(Only run the connection_or_group_set_badness_() function on groups
of channels that have the same RSA and Ed25519 identities.)

There's a possible opportunity here where we might want to set a
channel to "bad" if it has no ed25519 identity and some other
channel has some.  Also there's an opportunity to add a warning if
we ever have an Ed mismatch on open connections with the same RSA
ID.
This commit is contained in:
Nick Mathewson 2016-11-10 16:38:04 -05:00
parent 5ada249579
commit 3b1e04fe45
2 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/or/channel.c
View file

@ -4551,18 +4551,45 @@ channel_set_circid_type,(channel_t *chan,
static void
channel_rsa_id_group_set_badness(struct channel_list_s *lst, int force)
{
/*XXXX This function should really be about channels. 15056 */
channel_t *chan;
smartlist_t *or_conns = smartlist_new();
/* First, get a minimal list of the ed25519 identites */
smartlist_t *ed_identities = smartlist_new();
TOR_LIST_FOREACH(chan, lst, next_with_same_id) {
channel_tls_t *chantls = BASE_CHAN_TO_TLS(chan);
or_connection_t *orconn = chantls->conn;
if (orconn)
smartlist_add(or_conns, orconn);
uint8_t *id_copy =
tor_memdup(&chan->ed25519_identity.pubkey, DIGEST256_LEN);
smartlist_add(ed_identities, id_copy);
}
/*XXXX This function should really be about channels. 15056 */
connection_or_group_set_badness_(or_conns, force);
smartlist_sort_digests256(ed_identities);
smartlist_uniq_digests256(ed_identities);
/* Now, for each Ed identity, build a smartlist and find the best entry on
* it. */
smartlist_t *or_conns = smartlist_new();
SMARTLIST_FOREACH_BEGIN(ed_identities, const uint8_t *, ed_id) {
TOR_LIST_FOREACH(chan, lst, next_with_same_id) {
channel_tls_t *chantls = BASE_CHAN_TO_TLS(chan);
if (tor_memneq(ed_id, &chan->ed25519_identity.pubkey, DIGEST256_LEN))
continue;
or_connection_t *orconn = chantls->conn;
if (orconn) {
tor_assert(orconn->chan == chantls);
smartlist_add(or_conns, orconn);
}
}
connection_or_group_set_badness_(or_conns, force);
smartlist_clear(or_conns);
} SMARTLIST_FOREACH_END(ed_id);
/* XXXX 15056 we may want to do something special with connections that have
* no set Ed25519 identity! */
smartlist_free(or_conns);
SMARTLIST_FOREACH(ed_identities, uint8_t *, ed_id, tor_free(ed_id));
smartlist_free(ed_identities);
}
/** Go through all the channels (or if <b>digest</b> is non-NULL, just

6
src/or/connection_or.c
View file

@ -966,9 +966,9 @@ connection_or_mark_bad_for_new_circs(or_connection_t *or_conn)
void
connection_or_group_set_badness_(smartlist_t *group, int force)
{
/* XXXX this should be entirely about channels, not OR connections. 15056*/
/* XXXX Look at Ed25519 ids too! 15056 */
/* XXXX this function should be entirely about channels, not OR
* XXXX connections. */
or_connection_t *best = NULL;
int n_old = 0, n_inprogress = 0, n_canonical = 0, n_other = 0;
time_t now = time(NULL);