From bcbc8c51cbc026e73e831f6641f5d1fd6ebebd9d Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 3 Mar 2011 23:51:07 -0500 Subject: [PATCH 1/2] Do not serve encrypt-only descriptors with the "all" request. Reported by piebeer --- src/or/dirserv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 1649bd7408..7db6c19a33 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2699,6 +2699,8 @@ dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key, SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r, smartlist_add(fps_out, 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")) { routerinfo_t *ri = router_get_my_routerinfo(); if (ri) From b231026c42ea5cd884b4bde25cde3ba2c6e5ca98 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 6 Mar 2011 13:35:24 -0500 Subject: [PATCH 2/2] changes file for careful_with_all_descs --- changes/all_descs | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/all_descs diff --git a/changes/all_descs b/changes/all_descs new file mode 100644 index 0000000000..10711b2621 --- /dev/null +++ b/changes/all_descs @@ -0,0 +1,4 @@ + o Major bugfixes (bridge authority) + - Do not allow encrypte requests for "all" bridges to return all + bridges. +