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

Merge branch 'careful_with_all_descs' into maint-0.2.1

Browse Source
This commit is contained in:
Nick Mathewson 2011-03-06 13:35:42 -05:00
commit 0f637492e3
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/all_descs Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes (bridge authority)
- Do not allow encrypte requests for "all" bridges to return all
bridges.

2
src/or/dirserv.c
View File

@ -2699,6 +2699,8 @@ dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key,
SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r, SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r,
smartlist_add(fps_out, smartlist_add(fps_out,
tor_memdup(r->cache_info.identity_digest, DIGEST_LEN))); tor_memdup(r->cache_info.identity_digest, DIGEST_LEN)));
/* Treat "all" requests as if they were unencrypted */
for_unencrypted_conn = 1;
} else if (!strcmp(key, "authority")) { } else if (!strcmp(key, "authority")) {
routerinfo_t *ri = router_get_my_routerinfo(); routerinfo_t *ri = router_get_my_routerinfo();
if (ri) if (ri)