aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorRobert Hogan <robert@roberthogan.net>2010-10-17 12:27:57 +0100
committerNick Mathewson <nickm@torproject.org>2010-11-12 19:51:06 -0500
commit7488fe5a224bf1c40d22769ff3986361d947d6f7 (patch)
tree04e21768db50686d507b11b598ac764d08b85f3b /src/or/connection_edge.c
parente1d86d381714cb4e85f543fab0ca71f13e58767b (diff)
downloadtor-7488fe5a224bf1c40d22769ff3986361d947d6f7.tar
tor-7488fe5a224bf1c40d22769ff3986361d947d6f7.tar.gz
Issues with router_get_by_nickname()
https://trac.torproject.org/projects/tor/ticket/1859 Use router_get_by_digest() instead of router_get_by_hexdigest() in circuit_discard_optional_exit_enclaves() and rend_client_get_random_intro(), per Nick's comments. Using router_get_by_digest() in rend_client_get_random_intro() will break hidden services published by Tor versions pre 0.1.2.18 and 0.2.07-alpha as they only publish by nickname. This is acceptable however as these versions only publish to authority tor26 and don't work for versions in the 0.2.2.x series anyway.
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index eba83ba9e..f72aa9418 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -571,7 +571,7 @@ circuit_discard_optional_exit_enclaves(extend_info_t *info)
!edge_conn->chosen_exit_retries)
continue;
r1 = router_get_by_nickname(edge_conn->chosen_exit_name, 0);
- r2 = router_get_by_hexdigest(info->identity_digest);
+ r2 = router_get_by_digest(info->identity_digest);
if (!r1 || !r2 || r1 != r2)
continue;
tor_assert(edge_conn->socks_request);