summaryrefslogtreecommitdiff
path: root/src/or/channeltls.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-06 16:26:47 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-15 09:35:59 -0400
commite05414d2411a5354dc43bde3a791938697a9799b (patch)
tree76b1f504e62e80c8d66f865f62742cf34f0160d8 /src/or/channeltls.c
parentb440560b8bdd6034ddf94720bf9e3683aca68f72 (diff)
downloadtor-e05414d2411a5354dc43bde3a791938697a9799b.tar.gz
tor-e05414d2411a5354dc43bde3a791938697a9799b.zip
Fix several places where md-using relays would get wrong behavior.
This patch replaces a few calls to router_get_by_id_digest ("do we have a routerinfo?") with connection_or_digest_is_known_relay ("do we know this relay to be in the consensus, or have been there some time recently?"). Found while doing the 21585 audit; fixes bug 23533. Bugfix on 0.3.0.1-alpha.
Diffstat (limited to 'src/or/channeltls.c')
-rw-r--r--src/or/channeltls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index f44e4fc8ea..c6a0bb21e9 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -1823,7 +1823,7 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan)
/** Warn when we get a netinfo skew with at least this value. */
#define NETINFO_NOTICE_SKEW 3600
if (labs(apparent_skew) > NETINFO_NOTICE_SKEW &&
- router_get_by_id_digest(chan->conn->identity_digest)) {
+ connection_or_digest_is_known_relay(chan->conn->identity_digest)) {
int trusted = router_digest_is_trusted_dir(chan->conn->identity_digest);
clock_skew_warning(TO_CONN(chan->conn), apparent_skew, trusted, LD_GENERAL,
"NETINFO cell", "OR");