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

Fix a remaining bug in Robert's bug1859 fix.

Browse Source 
When intro->extend_info is created for an introduction point, it
only starts out with a nickname, not necessarily an identity digest.
Thus, doing router_get_by_digest isn't necessarily safe.
This commit is contained in:
Nick Mathewson 2010-10-21 11:08:15 -04:00
parent 5cd7953a21
commit 2392290c18
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/rendclient.c
View File

@ -810,7 +810,10 @@ rend_client_get_random_intro(const rend_data_t *rend_query)
intro = smartlist_get(entry->parsed->intro_nodes, i); intro = smartlist_get(entry->parsed->intro_nodes, i);
/* Do we need to look up the router or is the extend info complete? */ /* Do we need to look up the router or is the extend info complete? */
if (!intro->extend_info->onion_key) { if (!intro->extend_info->onion_key) {
router = router_get_by_digest(intro->extend_info->identity_digest); if (tor_digest_is_zero(intro->extend_info->identity_digest))
router = router_get_by_hexdigest(intro->extend_info->nickname);
else
router = router_get_by_digest(intro->extend_info->identity_digest);
if (!router) { if (!router) {
log_info(LD_REND, "Unknown router with nickname '%s'; trying another.", log_info(LD_REND, "Unknown router with nickname '%s'; trying another.",
intro->extend_info->nickname); intro->extend_info->nickname);