- tor-commits - lists.torproject.org

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 19 May '16

19 May '16

commit 0a05afa96dde84b010c87546ba49a801df92ab40 Merge: c4b7b4a dd17df2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 08:54:30 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug18809 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.8] Fold new changelog items in
by nickm＠torproject.org 19 May '16

19 May '16

commit 2b8ba551d3eab2793214ab34a1c9a47a888402cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 08:56:06 2016 -0400 Fold new changelog items in --- ChangeLog | 26 ++++++++++++++++++++++++-- changes/bug17150 | 7 ------- changes/bug18809 | 16 ---------------- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd190d0..c2c2821 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ Changes in version 0.2.8.3-alpha - 2016-05-?? - Tor 0.2.8.3-alpha resolves several bugs, most of them introduced over the - course of the 0.2.8 development cycle. It improves the behavior of + Tor 0.2.8.3-alpha resolves several bugs, most of them introduced over + the course of the 0.2.8 development cycle. It improves the behavior of directory clients, fixes several crash bugs, fixes a gap in compiler hardening, and allows the full integration test suite to run on more platforms. @@ -23,6 +23,21 @@ Changes in version 0.2.8.3-alpha - 2016-05-?? the list of relays includes duplicate ed25519 identity keys. Fixes bug 19032; bugfix on 0.2.8.2-alpha. + o Major bugfixes (client, bootstrapping): + - Check if bootstrap consensus downloads are still needed when the + linked connection attaches. This prevents tor making unnecessary + begindir-style connections, which are the only directory + connections tor clients make since the fix for 18483 was merged. + - Fix some edge cases where consensus download connections may not + have been closed, even though they were not needed. Related to fix + for 18809. + - Make relays retry consensus downloads the correct number of times, + rather than the more aggressive client retry count. Fixes part of + ticket 18809. + - Stop downloading consensuses when we have a consensus, even if we + don't have all the certificates for it yet. Fixes bug 18809; + bugfix on 0.2.8.1-alpha. Patches by arma and teor. + o Major bugfixes (directory mirrors): - Decide whether to advertise begindir support in the the same way we decide whether to advertise our DirPort. Allowing these @@ -98,6 +113,13 @@ Changes in version 0.2.8.3-alpha - 2016-05-?? branch (tested against 1.1.0-pre4 and 1.1.0-pre5-dev). Closes ticket 18286. + o Minor bugfixes (directories): + - When fetching extrainfo documents, compare their SHA256 digests + and Ed25519 signing key certificates with the routerinfo that led + us to fetch them, rather than with the most recent routerinfo. + Otherwise we generate many spurious warnings about mismatches. + Fixes bug 17150; bugfix on 0.2.7.2-alpha. + o Minor bugfixes (logging): - When we can't generate a signing key because OfflineMasterKey is set, do not imply that we should have been able to load it. Fixes diff --git a/changes/bug17150 b/changes/bug17150 deleted file mode 100644 index 686cc34..0000000 --- a/changes/bug17150 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (directory warnings): - - When fetching extrainfo documents, compare their SHA256 digests - and Ed25519 signing key certificates - with the routerinfo that led us to fetch them, rather than - with the most recent routerinfo. Otherwise we generate many - spurious warnings about mismatches. Fixes bug 17150; bugfix - on 0.2.7.2-alpha. diff --git a/changes/bug18809 b/changes/bug18809 deleted file mode 100644 index 1e15187..0000000 --- a/changes/bug18809 +++ /dev/null @@ -1,16 +0,0 @@ - o Major bugfixes (bootstrap): - - Check if bootstrap consensus downloads are still needed - when the linked connection attaches. This prevents tor - making unnecessary begindir-style connections, which are - the only directory connections tor clients make since - the fix for 18483 was merged. - - Fix some edge cases where consensus download connections - may not have been closed, even though they were not needed. - Related to fix 18809. - - Make relays retry consensus downloads the correct number of - times, rather than the more aggressive client retry count. - Fixes part of ticket 18809. - - Stop downloading consensuses when we have a consensus, - even if we don't have all the certificates for it yet. - Fixes bug 18809; bugfix on 0.2.8.1-alpha. - Patches by arma and teor.

1 0

[tor/release-0.2.8] simplify more -- we only call these funcs when bootstrapping
by nickm＠torproject.org 19 May '16

19 May '16

commit d5a96286c2877ab56455ea5183d1df2e39453cde Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 14 02:29:12 2016 -0400 simplify more -- we only call these funcs when bootstrapping --- src/or/networkstatus.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3b38c07..6b40852 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -121,8 +121,7 @@ static int have_warned_about_new_version = 0; static void routerstatus_list_update_named_server_map(void); static void update_consensus_bootstrap_multiple_downloads( time_t now, - const or_options_t *options, - int we_are_bootstrapping); + const or_options_t *options); /** Forget that we've warned about anything networkstatus-related, so we will * give fresh warnings if the same behavior happens again. */ @@ -869,8 +868,7 @@ update_consensus_networkstatus_downloads(time_t now) continue; /* Make multiple connections for a bootstrap consensus download. */ - update_consensus_bootstrap_multiple_downloads(now, options, - we_are_bootstrapping); + update_consensus_bootstrap_multiple_downloads(now, options); } else { /* Check if we failed downloading a consensus too recently */ int max_dl_tries = consensus_max_download_tries(options, @@ -909,12 +907,10 @@ static void update_consensus_bootstrap_attempt_downloads( time_t now, const or_options_t *options, - int we_are_bootstrapping, download_status_t *dls, download_want_authority_t want_authority) { - int max_dl_tries = consensus_max_download_tries(options, - we_are_bootstrapping); + int max_dl_tries = consensus_max_download_tries(options, 1); const char *resource = networkstatus_get_flavor_name( usable_consensus_flavor()); @@ -947,8 +943,7 @@ update_consensus_bootstrap_attempt_downloads( */ static void update_consensus_bootstrap_multiple_downloads(time_t now, - const or_options_t *options, - int we_are_bootstrapping) + const or_options_t *options) { const int usable_flavor = usable_consensus_flavor(); @@ -957,12 +952,6 @@ update_consensus_bootstrap_multiple_downloads(time_t now, return; } - /* If we've managed to validate a usable consensus, don't make additional - * connections. */ - if (!we_are_bootstrapping) { - return; - } - /* Launch concurrent consensus download attempt(s) based on the mirror and * authority schedules. Try the mirror first - this makes it slightly more * likely that we'll connect to the fallback first, and then end the @@ -981,8 +970,7 @@ update_consensus_bootstrap_multiple_downloads(time_t now, if (!check_consensus_waiting_for_certs(usable_flavor, now, dls_f)) { /* During bootstrap, DL_WANT_ANY_DIRSERVER means "use fallbacks". */ - update_consensus_bootstrap_attempt_downloads(now, options, - we_are_bootstrapping, dls_f, + update_consensus_bootstrap_attempt_downloads(now, options, dls_f, DL_WANT_ANY_DIRSERVER); } } @@ -992,8 +980,7 @@ update_consensus_bootstrap_multiple_downloads(time_t now, &consensus_bootstrap_dl_status[CONSENSUS_BOOTSTRAP_SOURCE_AUTHORITY]; if (!check_consensus_waiting_for_certs(usable_flavor, now, dls_a)) { - update_consensus_bootstrap_attempt_downloads(now, options, - we_are_bootstrapping, dls_a, + update_consensus_bootstrap_attempt_downloads(now, options, dls_a, DL_WANT_AUTHORITY); } }

1 0

[tor/release-0.2.8] Copy the signing_key_cert field into signed_descriptor_t
by nickm＠torproject.org 19 May '16

19 May '16

commit 8acfac7375e7a0692193434704984d7eb507faf1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 13:14:04 2016 -0400 Copy the signing_key_cert field into signed_descriptor_t We need this field to be in signed_descriptor_t so that routerinfo_incompatible_with_extrainfo can work correctly (#17150). But I don't want to move it completely in this patch, since a great deal of the code that messes with it has been in flux since 0.2.7, when this ticket was opened. I should open another ticket about removing the field from routerinfo_t and extrainfo_t later on. This patch fixes no actual behavior. --- src/or/or.h | 8 ++++++-- src/or/router.c | 3 +++ src/or/routerlist.c | 2 ++ src/or/routerparse.c | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index e0f2eb4..ffff6d6 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1995,6 +1995,8 @@ typedef struct signed_descriptor_t { char extra_info_digest[DIGEST_LEN]; /** For routerdescs only: A SHA256-digest of the extrainfo (if any) */ char extra_info_digest256[DIGEST256_LEN]; + /** Certificate for ed25519 signing key. */ + struct tor_cert_st *signing_key_cert; /** For routerdescs only: Status of downloading the corresponding * extrainfo. */ download_status_t ei_dl_status; @@ -2043,7 +2045,8 @@ typedef struct { crypto_pk_t *identity_pkey; /**< Public RSA key for signing. */ /** Public curve25519 key for onions */ curve25519_public_key_t *onion_curve25519_pkey; - /** Certificate for ed25519 signing key */ + /** Certificate for ed25519 signing key + * (XXXX duplicated in cache_info.) */ struct tor_cert_st *signing_key_cert; /** What's the earliest expiration time on all the certs in this * routerinfo? */ @@ -2115,7 +2118,8 @@ typedef struct extrainfo_t { uint8_t digest256[DIGEST256_LEN]; /** The router's nickname. */ char nickname[MAX_NICKNAME_LEN+1]; - /** Certificate for ed25519 signing key */ + /** Certificate for ed25519 signing key + * (XXXX duplicated in cache_info.) */ struct tor_cert_st *signing_key_cert; /** True iff we found the right key for this extra-info, verified the * signature, and found it to be bad. */ diff --git a/src/or/router.c b/src/or/router.c index 3943643..b3523ec 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1911,6 +1911,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) return -1; } ri->signing_key_cert = tor_cert_dup(get_master_signing_key_cert()); + ri->cache_info.signing_key_cert = tor_cert_dup(get_master_signing_key_cert()); get_platform_str(platform, sizeof(platform)); ri->platform = tor_strdup(platform); @@ -2003,6 +2004,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) strlcpy(ei->nickname, get_options()->Nickname, sizeof(ei->nickname)); ei->cache_info.published_on = ri->cache_info.published_on; ei->signing_key_cert = tor_cert_dup(get_master_signing_key_cert()); + ei->cache_info.signing_key_cert = tor_cert_dup(get_master_signing_key_cert()); + memcpy(ei->cache_info.identity_digest, ri->cache_info.identity_digest, DIGEST_LEN); if (extrainfo_dump_to_string(&ei->cache_info.signed_descriptor_body, diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 140fe21..9b3b794 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2670,6 +2670,7 @@ routerinfo_free(routerinfo_t *router) if (router->identity_pkey) crypto_pk_free(router->identity_pkey); tor_cert_free(router->signing_key_cert); + tor_cert_free(router->cache_info.signing_key_cert); if (router->declared_family) { SMARTLIST_FOREACH(router->declared_family, char *, s, tor_free(s)); smartlist_free(router->declared_family); @@ -2689,6 +2690,7 @@ extrainfo_free(extrainfo_t *extrainfo) if (!extrainfo) return; tor_cert_free(extrainfo->signing_key_cert); + tor_cert_free(extrainfo->cache_info.signing_key_cert); tor_free(extrainfo->cache_info.signed_descriptor_body); tor_free(extrainfo->pending_sig); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index bc6c35f..531a95d 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1403,6 +1403,7 @@ router_parse_entry_from_string(const char *s, const char *end, goto err; } router->signing_key_cert = cert; /* makes sure it gets freed. */ + router->cache_info.signing_key_cert = tor_cert_dup(cert); if (cert->cert_type != CERT_TYPE_ID_SIGNING || ! cert->signing_key_included) { @@ -1778,6 +1779,7 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, goto err; } extrainfo->signing_key_cert = cert; /* makes sure it gets freed. */ + extrainfo->cache_info.signing_key_cert = tor_cert_dup(cert); if (cert->cert_type != CERT_TYPE_ID_SIGNING || ! cert->signing_key_included) { log_warn(LD_DIR, "Invalid form for ed25519 cert");

1 0

[tor/release-0.2.8] fix a bug where relays would use the aggressive client bootstrapping retry number
by nickm＠torproject.org 19 May '16

19 May '16

commit 1f72653544272e24d685bd81abe2da5d32b67caf Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 14 03:03:47 2016 -0400 fix a bug where relays would use the aggressive client bootstrapping retry number --- src/or/networkstatus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 6b40852..3d8bb55 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -871,8 +871,7 @@ update_consensus_networkstatus_downloads(time_t now) update_consensus_bootstrap_multiple_downloads(now, options); } else { /* Check if we failed downloading a consensus too recently */ - int max_dl_tries = consensus_max_download_tries(options, - we_are_bootstrapping); + int max_dl_tries = consensus_max_download_tries(options, 0); /* Let's make sure we remembered to update consensus_dl_status */ tor_assert(consensus_dl_status[i].schedule == DL_SCHED_CONSENSUS);

1 0

[tor/release-0.2.8] Fix documentation for routerinfo_incompatible_with_extrainfo
by nickm＠torproject.org 19 May '16

19 May '16

commit 64748f2f987a28815f056dfe3a8a739f46d9157f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 13:08:34 2016 -0400 Fix documentation for routerinfo_incompatible_with_extrainfo --- src/or/routerlist.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2e347b0..140fe21 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4896,13 +4896,21 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2) return 1; } -/** Check whether ri (a.k.a. sd) is a router compatible with the - * extrainfo document - * ei. If no router is compatible with ei, ei should be +/** Check whether sd describes a router descriptor compatible with the + * extrainfo document ei. + * + * ri (which must also be provided) is the full routerinfo corresponding + * to the same router -- but note that it might not refer to the same specific + * descriptor as sd. + * + * If no router is compatible with ei, ei should be * dropped. Return 0 for "compatible", return 1 for "reject, and inform * whoever uploaded ei, and return -1 for "reject silently.". If * msg is present, set *msg to a description of the * incompatibility (if any). + * + * Set the extrainfo_is_bogus field in sd if the digests matched + * but the extrainfo was nonetheless incompatible. **/ int routerinfo_incompatible_with_extrainfo(const routerinfo_t *ri,

1 0

[tor/release-0.2.8] When making sure digest256 matches in ei, look at sd, not ri.
by nickm＠torproject.org 19 May '16

19 May '16

commit 7d1eb0d57086c9630f7797916d9d2c948117a7e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 12:57:03 2016 -0400 When making sure digest256 matches in ei, look at sd, not ri. The routerinfo we pass to routerinfo_incompatible_with_extrainfo is the latest routerinfo for the relay. The signed_descriptor_t, on the other hand, is the signed_descriptor_t that corresponds to the extrainfo. That means we should be checking the digest256 match with that signed_descriptor_t, not with the routerinfo. Fixes bug 17150 (and 19017); bugfix on 0.2.7.2-alpha. --- changes/bug17150 | 6 ++++++ src/or/routerlist.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug17150 b/changes/bug17150 new file mode 100644 index 0000000..3fb7821 --- /dev/null +++ b/changes/bug17150 @@ -0,0 +1,6 @@ + o Minor bugfixes (directory warnings): + - When fetching extrainfo documents, compare their SHA256 digests + with the routerinfo that led us to fetch them, rather than + with the most recent routerinfo. Otherwise we generate many + spurious warnings about mismatches. Fixes bug 17150; bugfix + on 0.2.7.2-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 3d85d86..2e347b0 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4926,9 +4926,9 @@ routerinfo_incompatible_with_extrainfo(const routerinfo_t *ri, /* Set digest256_matches to 1 if the digest is correct, or if no * digest256 was in the ri. */ digest256_matches = tor_memeq(ei->digest256, - ri->cache_info.extra_info_digest256, DIGEST256_LEN); + sd->extra_info_digest256, DIGEST256_LEN); digest256_matches |= - tor_mem_is_zero(ri->cache_info.extra_info_digest256, DIGEST256_LEN); + tor_mem_is_zero(sd->extra_info_digest256, DIGEST256_LEN); /* The identity must match exactly to have been generated at the same time * by the same router. */

1 0

[tor/release-0.2.8] Fix another, more subtle, case of bug 17150.
by nickm＠torproject.org 19 May '16

19 May '16

commit 49ff09aef27d2883b77008be56c29def2a6a8dff Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 13:16:36 2016 -0400 Fix another, more subtle, case of bug 17150. We need to make sure that the corresponding sd and ei match in their certificates. --- changes/bug17150 | 1 + src/or/routerlist.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changes/bug17150 b/changes/bug17150 index 3fb7821..686cc34 100644 --- a/changes/bug17150 +++ b/changes/bug17150 @@ -1,5 +1,6 @@ o Minor bugfixes (directory warnings): - When fetching extrainfo documents, compare their SHA256 digests + and Ed25519 signing key certificates with the routerinfo that led us to fetch them, rather than with the most recent routerinfo. Otherwise we generate many spurious warnings about mismatches. Fixes bug 17150; bugfix diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 9b3b794..f75ec11 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4949,7 +4949,7 @@ routerinfo_incompatible_with_extrainfo(const routerinfo_t *ri, goto err; /* different servers */ } - if (! tor_cert_opt_eq(ri->signing_key_cert, ei->signing_key_cert)) { + if (! tor_cert_opt_eq(sd->signing_key_cert, ei->signing_key_cert)) { if (msg) *msg = "Extrainfo signing key cert didn't match routerinfo"; goto err; /* different servers */ }

1 0

[tor/release-0.2.8] Move extra_info_digest256 into signed_descriptor_t
by nickm＠torproject.org 19 May '16

19 May '16

commit 44da47d3c1e4809d5aaf91cd708c6f02b01a5396 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 12:53:12 2016 -0400 Move extra_info_digest256 into signed_descriptor_t This patch includes no semantic changes; it's just a field movement. It's prerequisite for a fix to 19017/17150. --- src/or/or.h | 4 ++-- src/or/router.c | 6 +++--- src/or/routerlist.c | 4 ++-- src/or/routerparse.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 431927c..e0f2eb4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1993,6 +1993,8 @@ typedef struct signed_descriptor_t { time_t published_on; /** For routerdescs only: digest of the corresponding extrainfo. */ char extra_info_digest[DIGEST_LEN]; + /** For routerdescs only: A SHA256-digest of the extrainfo (if any) */ + char extra_info_digest256[DIGEST256_LEN]; /** For routerdescs only: Status of downloading the corresponding * extrainfo. */ download_status_t ei_dl_status; @@ -2024,8 +2026,6 @@ typedef int16_t country_t; /** Information about another onion router in the network. */ typedef struct { signed_descriptor_t cache_info; - /** A SHA256-digest of the extrainfo (if any) */ - char extra_info_digest256[DIGEST256_LEN]; char *nickname; /**< Human-readable OR name. */ uint32_t addr; /**< IPv4 address of OR, in host order. */ diff --git a/src/or/router.c b/src/or/router.c index 841f6fd..3943643 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2028,7 +2028,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) memcpy(ri->cache_info.extra_info_digest, ei->cache_info.signed_descriptor_digest, DIGEST_LEN); - memcpy(ri->extra_info_digest256, + memcpy(ri->cache_info.extra_info_digest256, ei->digest256, DIGEST256_LEN); } else { @@ -2543,9 +2543,9 @@ router_dump_router_to_string(routerinfo_t *router, char extra_info_digest[HEX_DIGEST_LEN+1]; base16_encode(extra_info_digest, sizeof(extra_info_digest), router->cache_info.extra_info_digest, DIGEST_LEN); - if (!tor_digest256_is_zero(router->extra_info_digest256)) { + if (!tor_digest256_is_zero(router->cache_info.extra_info_digest256)) { char d256_64[BASE64_DIGEST256_LEN+1]; - digest256_to_base64(d256_64, router->extra_info_digest256); + digest256_to_base64(d256_64, router->cache_info.extra_info_digest256); tor_asprintf(&extra_info_line, "extra-info-digest %s %s\n", extra_info_digest, d256_64); } else { diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 79a5bb3..3d85d86 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4926,9 +4926,9 @@ routerinfo_incompatible_with_extrainfo(const routerinfo_t *ri, /* Set digest256_matches to 1 if the digest is correct, or if no * digest256 was in the ri. */ digest256_matches = tor_memeq(ei->digest256, - ri->extra_info_digest256, DIGEST256_LEN); + ri->cache_info.extra_info_digest256, DIGEST256_LEN); digest256_matches |= - tor_mem_is_zero(ri->extra_info_digest256, DIGEST256_LEN); + tor_mem_is_zero(ri->cache_info.extra_info_digest256, DIGEST256_LEN); /* The identity must match exactly to have been generated at the same time * by the same router. */ diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 6b6e21d..bc6c35f 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1597,7 +1597,7 @@ router_parse_entry_from_string(const char *s, const char *end, } if (tok->n_args >= 2) { - if (digest256_from_base64(router->extra_info_digest256, tok->args[1]) + if (digest256_from_base64(router->cache_info.extra_info_digest256, tok->args[1]) < 0) { log_warn(LD_DIR, "Invalid extra info digest256 %s", escaped(tok->args[1]));

1 0

[tor/release-0.2.8] stop looping once we know what the answer will be
by nickm＠torproject.org 19 May '16

19 May '16

commit aa6341d4b9159e02825a03f1490ce6b731c2a90e Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 6 09:55:06 2016 -0400 stop looping once we know what the answer will be suggested during code review by dgoulet --- src/or/networkstatus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3d8bb55..074922b 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1347,8 +1347,10 @@ networkstatus_consensus_is_already_downloading(const char *resource) connection_t *base = TO_CONN(dirconn); if (base->linked_conn && base->linked_conn->type == CONN_TYPE_AP && - !AP_CONN_STATE_IS_UNATTACHED(base->linked_conn->state)) + !AP_CONN_STATE_IS_UNATTACHED(base->linked_conn->state)) { answer = 1; + break; /* stop looping, because we know the answer will be yes */ + } } SMARTLIST_FOREACH_END(dirconn); smartlist_free(fetching_conns);

1 0