June 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'tor-github/pr/1031'
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 8e112cecd8cf944e095304257563415e60891780 Merge: e9d99d2e1 58cb98af3 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 11 11:46:38 2019 -0400 Merge branch 'tor-github/pr/1031' changes/ticket29738 | 6 ++++++ doc/tor.1.txt | 6 ------ src/app/config/config.c | 9 +-------- src/app/config/or_options_st.h | 1 - src/feature/dirauth/dirvote.c | 26 -------------------------- src/test/test_options.c | 24 ------------------------ 6 files changed, 7 insertions(+), 65 deletions(-)

1 0

[tor/master] Prop 301: No longer vote on RecommendedPackages
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 58cb98af32e8436eccf9536255b8158271f1c03d Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu May 16 12:54:31 2019 +0100 Prop 301: No longer vote on RecommendedPackages This is the first half of implementing proposal 301. The RecommendedPackages torrc option is marked as obsolete and the test cases for the option removed. Additionally, the code relating to generating and formatting package lines in votes is removed. These lines may still appear in votes from other directory authorities running earlier versions of the code and so consensuses may still contain package lines. A new consensus method will be needed to stop including package lines in consensuses. Fixes: #28465 --- changes/ticket29738 | 6 ++++++ doc/tor.1.txt | 6 ------ src/app/config/config.c | 9 +-------- src/app/config/or_options_st.h | 1 - src/feature/dirauth/dirvote.c | 26 -------------------------- src/test/test_options.c | 24 ------------------------ 6 files changed, 7 insertions(+), 65 deletions(-) diff --git a/changes/ticket29738 b/changes/ticket29738 new file mode 100644 index 000000000..9217cc9a5 --- /dev/null +++ b/changes/ticket29738 @@ -0,0 +1,6 @@ + o Minor features (recommended packages): + - No longer include recommended packages in votes as detailed in proposal + 301. The RecommendedPackages torrc option is deprecated and will no + longer have any effect. "package" lines will still be considered when + computing consensuses for consensus methods that include them. Fixes + ticket 29738. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4bd365c77..064259b15 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2720,12 +2720,6 @@ on the public Tor network. multiple times: the values from multiple lines are spliced together. When this is set then **VersioningAuthoritativeDirectory** should be set too. -[[RecommendedPackages]] **RecommendedPackages** __PACKAGENAME__ __VERSION__ __URL__ __DIGESTTYPE__**=**__DIGEST__ :: - Adds "package" line to the directory authority's vote. This information - is used to vote on the correct URL and digest for the released versions - of different Tor-related packages, so that the consensus can certify - them. This line may appear any number of times. - [[RecommendedClientVersions]] **RecommendedClientVersions** __STRING__:: STRING is a comma-separated list of Tor versions currently believed to be safe for clients to use. This information is included in version 2 diff --git a/src/app/config/config.c b/src/app/config/config.c index d03305627..4382a4472 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -593,7 +593,7 @@ static config_var_t option_vars_[] = { V(RecommendedVersions, LINELIST, NULL), V(RecommendedClientVersions, LINELIST, NULL), V(RecommendedServerVersions, LINELIST, NULL), - V(RecommendedPackages, LINELIST, NULL), + OBSOLETE("RecommendedPackages"), V(ReducedConnectionPadding, BOOL, "0"), V(ConnectionPadding, AUTOBOOL, "auto"), V(RefuseUnknownExits, AUTOBOOL, "auto"), @@ -3521,13 +3521,6 @@ options_validate(or_options_t *old_options, or_options_t *options, "features to be broken in unpredictable ways."); } - for (cl = options->RecommendedPackages; cl; cl = cl->next) { - if (! validate_recommended_package_line(cl->value)) { - log_warn(LD_CONFIG, "Invalid RecommendedPackage line %s will be ignored", - escaped(cl->value)); - } - } - if (options->AuthoritativeDir) { if (!options->ContactInfo && !options->TestingTorNetwork) REJECT("Authoritative directory servers must set ContactInfo"); diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 4e03bec7f..7e79834f8 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -121,7 +121,6 @@ struct or_options_t { struct config_line_t *RecommendedVersions; struct config_line_t *RecommendedClientVersions; struct config_line_t *RecommendedServerVersions; - struct config_line_t *RecommendedPackages; /** Whether dirservers allow router descriptors with private IPs. */ int DirAllowPrivateAddresses; /** Whether routers accept EXTEND cells to routers with private IPs. */ diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index b841ab240..0084fea1e 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -220,7 +220,6 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, networkstatus_t *v3_ns) { smartlist_t *chunks = smartlist_new(); - char *packages = NULL; char fingerprint[FINGERPRINT_LEN+1]; char digest[DIGEST_LEN]; uint32_t addr; @@ -246,19 +245,6 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, v3_ns->server_versions); protocols_lines = format_protocols_lines_for_vote(v3_ns); - if (v3_ns->package_lines) { - smartlist_t *tmp = smartlist_new(); - SMARTLIST_FOREACH(v3_ns->package_lines, const char *, p, - if (validate_recommended_package_line(p)) - smartlist_add_asprintf(tmp, "package %s\n", p)); - smartlist_sort_strings(tmp); - packages = smartlist_join_strings(tmp, "", 0, NULL); - SMARTLIST_FOREACH(tmp, char *, cp, tor_free(cp)); - smartlist_free(tmp); - } else { - packages = tor_strdup(""); - } - /* Get shared random commitments/reveals line(s). */ shared_random_vote_str = sr_get_string_for_vote(); @@ -344,7 +330,6 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, "voting-delay %d %d\n" "%s%s" /* versions */ "%s" /* protocols */ - "%s" /* packages */ "known-flags %s\n" "flag-thresholds %s\n" "params %s\n" @@ -361,7 +346,6 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, client_versions_line, server_versions_line, protocols_lines, - packages, flags, flag_thresholds, params, @@ -461,7 +445,6 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, tor_free(client_versions_line); tor_free(server_versions_line); tor_free(protocols_lines); - tor_free(packages); SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); smartlist_free(chunks); @@ -4669,15 +4652,6 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, tor_assert_nonfatal(protover_all_supported( v3_out->recommended_client_protocols, NULL)); - v3_out->package_lines = smartlist_new(); - { - config_line_t *cl; - for (cl = get_options()->RecommendedPackages; cl; cl = cl->next) { - if (validate_recommended_package_line(cl->value)) - smartlist_add_strdup(v3_out->package_lines, cl->value); - } - } - v3_out->known_flags = smartlist_new(); smartlist_split_string(v3_out->known_flags, DIRVOTE_UNIVERSAL_FLAGS, diff --git a/src/test/test_options.c b/src/test/test_options.c index 396be6b18..d693fe056 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1343,29 +1343,6 @@ test_options_validate__token_bucket(void *ignored) } static void -test_options_validate__recommended_packages(void *ignored) -{ - (void)ignored; - int ret; - char *msg; - setup_capture_of_logs(LOG_WARN); - options_test_data_t *tdata = get_options_test_data( - "RecommendedPackages foo 1.2 http://foo.com sha1=123123123123\n" - "RecommendedPackages invalid-package-line\n"); - - ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); - expect_no_log_msg("Invalid RecommendedPackage line " - "invalid-package-line will be ignored\n"); - - done: - escaped(NULL); // This will free the leaking memory from the previous escaped - teardown_capture_of_logs(); - free_options_test_data(tdata); - tor_free(msg); -} - -static void test_options_validate__fetch_dir(void *ignored) { (void)ignored; @@ -4200,7 +4177,6 @@ struct testcase_t options_tests[] = { LOCAL_VALIDATE_TEST(exclude_nodes), LOCAL_VALIDATE_TEST(node_families), LOCAL_VALIDATE_TEST(token_bucket), - LOCAL_VALIDATE_TEST(recommended_packages), LOCAL_VALIDATE_TEST(fetch_dir), LOCAL_VALIDATE_TEST(conn_limit), LOCAL_VALIDATE_TEST(paths_needed),

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 11 Jun '19

11 Jun '19

commit b6861d64097e0e4f06dc1995e814c220278b92aa Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 11 15:45:39 2019 +0000 Update translations for donatepages-messagespot --- locale/pl/LC_MESSAGES/messages.po | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po index bd7781de3..48927b91e 100644 --- a/locale/pl/LC_MESSAGES/messages.po +++ b/locale/pl/LC_MESSAGES/messages.po @@ -9,12 +9,12 @@ # erinm, 2019 # Dawid Job <hoek(a)tuta.io>, 2019 # Filip <filipiczesio(a)vp.pl>, 2019 -# Waldemar Stoczkowski, 2019 # Dawid Potocki <dpot(a)disroot.org>, 2019 +# Waldemar Stoczkowski, 2019 # msgid "" msgstr "" -"Last-Translator: Dawid Potocki <dpot(a)disroot.org>, 2019\n" +"Last-Translator: Waldemar Stoczkowski, 2019\n" "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n" "Language: pl\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" @@ -1077,6 +1077,8 @@ msgid "" "People also support Tor in non-financial ways, for example by running Tor " "relays to help carry traffic for other users." msgstr "" +"Ludzie wspierają także Tora w niefinansowy sposób, na przykład uruchamiając " +"przekaźniki Tora, aby pomóc w przenoszeniu ruchu dla innych użytkowników." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:131 msgid "" @@ -1084,6 +1086,9 @@ msgid "" "anonymous, because the more people using Tor, the harder it is to identify " "any single individual." msgstr "" +"Ponadto wszyscy, którzy używają Tora, pomagają zachować bezpieczeństwo i " +"anonimowość innych użytkowników, ponieważ im więcej osób używa Tora, tym " +"trudniej jest zidentyfikować pojedynczą osobę." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:137 msgid "How does the Tor software work to protect people's anonymity?" @@ -1095,12 +1100,17 @@ msgid "" "which is a distributed network of relays run by volunteers all around the " "world." msgstr "" +"Tor chroni Cię przez odbijanie komunikacji wokół sieci Tor, która jest " +"rozproszoną siecią przekaźników uruchamianych przez ochotników na całym " +"świecie." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:143 msgid "" "If someone is watching your internet connection, Tor prevents them from " "finding out what sites you are visiting." msgstr "" +"Jeśli ktoś ogląda twoje połączenie internetowe, Tor uniemożliwia mu " +"znalezienie odwiedzanych witryn." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:145 msgid "" @@ -1119,6 +1129,8 @@ msgid "" "I would like to know more about how Tor works, what onion services are, or " "how to run a relay." msgstr "" +"Chciałbym dowiedzieć się więcej o tym, jak działa Tor, jakie są usługi " +"cebulowe lub jak uruchomić przekaźnik." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:158 msgid "" @@ -1137,12 +1149,17 @@ msgid "" "does a better job of keeping you safely anonymous than other options such as" " VPNs, proxychains, or browser \"private browsing\" modes." msgstr "" +"Wierzymy, że Tor jest najlepszym dostępnym obecnie rozwiązaniem i wiemy, że " +"lepiej chroni Cię anonimowo niż inne opcje, takie jak VPN, proxychains lub " +"tryby „prywatnego przeglądania” przeglądarki." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:170 msgid "" "We know that both the Russian government and the NSA have tried in the past " "to crack Tor, and failed." msgstr "" +"Wiemy, że zarówno rząd rosyjski, jak i NSA próbowały w przeszłości złamać " +"Tora i poniosły porażkę." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:172 msgid "" @@ -1236,6 +1253,9 @@ msgid "" " foundations, research institutions, private companies, and over 20,000 " "personal donations from people like you." msgstr "" +"Tor jest wspierany przez agencje finansujące rząd Stanów Zjednoczonych, " +"organizacje pozarządowe, prywatne fundacje, instytucje badawcze, prywatne " +"firmy i ponad 20 000 osobistych darowizn od takich osób jak ty." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:212 msgid "" @@ -1261,6 +1281,10 @@ msgid "" " allows us to spend the money on the projects we think are most important " "and respond quickly to changing events." msgstr "" +"Finansowanie społecznościowe pozwala nam zdywersyfikować naszą bazę " +"darczyńców i jest nieograniczone - pozwala nam wydawać pieniądze na " +"projekty, które uważamy za najważniejsze i szybko reagować na zmieniające " +"się wydarzenia." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:218 msgid "" @@ -1268,6 +1292,8 @@ msgid "" "Tor Project's independence and ensure the sustainability of the products and" " services we provide." msgstr "" +"Dlatego prosimy o pomoc finansową, zwiększenie niezależności Projektu Tor i " +"zapewnienie trwałości oferowanych produktów i usług." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:224 msgid "" @@ -1693,7 +1719,7 @@ msgstr "" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:448 msgid "What is your donor privacy policy?" -msgstr "" +msgstr "Jaka jest polityka prywatności darczyńców?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:452 msgid ""

1 0

[tor/master] Merge branch 'tor-github/pr/1083'
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit e9d99d2e15f09a394ad01189b7965af4888a61a6 Merge: 35dd2d733 6be9d3aed Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 11 11:43:15 2019 -0400 Merge branch 'tor-github/pr/1083' changes/bug30780 | 3 +++ scripts/maint/practracker/exceptions.txt | 2 +- src/feature/dirauth/process_descs.c | 19 +++++++++++-------- src/feature/nodelist/routerlist.c | 13 +++++++------ src/feature/nodelist/routerlist.h | 9 ++++++--- 5 files changed, 28 insertions(+), 18 deletions(-)

1 0

[tor/master] practracker: accept one extra line in routerlist.c
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 6be9d3aed88bf73cf10f06edb99f876fd8eeb1d9 Author: teor <teor(a)torproject.org> Date: Thu Jun 6 18:24:17 2019 +1000 practracker: accept one extra line in routerlist.c practracker exception for 30780. --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index eb0625b8d..4f723c7c1 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -216,7 +216,7 @@ problem function-size /src/feature/nodelist/node_select.c:router_pick_directory_ problem function-size /src/feature/nodelist/node_select.c:compute_weighted_bandwidths() 206 problem function-size /src/feature/nodelist/node_select.c:router_pick_trusteddirserver_impl() 114 problem function-size /src/feature/nodelist/nodelist.c:compute_frac_paths_available() 193 -problem file-size /src/feature/nodelist/routerlist.c 3238 +problem file-size /src/feature/nodelist/routerlist.c 3239 problem function-size /src/feature/nodelist/routerlist.c:router_rebuild_store() 148 problem function-size /src/feature/nodelist/routerlist.c:router_add_to_routerlist() 169 problem function-size /src/feature/nodelist/routerlist.c:routerlist_remove_old_routers() 121

1 0

[tor/master] dirauth: Fix some comments in the router status processing code.
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit a4ea335a6906eb4f8f58b5cf458cf290d322d10f Author: teor <teor(a)torproject.org> Date: Thu Jun 6 08:45:57 2019 +1000 dirauth: Fix some comments in the router status processing code. Fixes comments in dirserv_router_get_status() and was_router_added_t. Preparation for 30780 and 16564. --- src/feature/dirauth/process_descs.c | 15 ++++++++++----- src/feature/nodelist/routerlist.c | 13 +++++++------ src/feature/nodelist/routerlist.h | 4 ++-- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 656922233..17936add5 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -216,9 +216,14 @@ dirserv_load_fingerprint_file(void) #define DISABLE_DISABLING_ED25519 -/** Check whether router has a nickname/identity key combination that - * we recognize from the fingerprint list, or an IP we automatically act on - * according to our configuration. Return the appropriate router status. +/** Check whether router has: + * - a nickname/identity key combination that we recognize from the fingerprint + * list, + * - an IP we automatically act on according to our configuration, + * - an appropriate version, and + * - matching pinned keys. + * + * Return the appropriate router status. * * If the status is 'FP_REJECT' and msg is provided, set * *msg to an explanation of why. */ @@ -236,7 +241,7 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg, return FP_REJECT; } - /* Check for the more usual versions to reject a router first. */ + /* Check for the more common reasons to reject a router first. */ const uint32_t r = dirserv_get_status_impl(d, router->nickname, router->addr, router->or_port, router->platform, msg, severity); @@ -535,7 +540,7 @@ dirserv_add_multiple_descriptors(const char *desc, size_t desclen, int general = purpose == ROUTER_PURPOSE_GENERAL; tor_assert(msg); - r=ROUTER_ADDED_SUCCESSFULLY; /*Least severe return value. */ + r=ROUTER_ADDED_SUCCESSFULLY; /* Least severe return value. */ if (!string_is_utf8_no_bom(desc, desclen)) { *msg = "descriptor(s) or extrainfo(s) not valid UTF-8 or had BOM."; diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 5788347a0..5948445c9 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -1459,12 +1459,13 @@ router_descriptor_is_older_than,(const routerinfo_t *router, int seconds)) } /** Add router to the routerlist, if we don't already have it. Replace - * older entries (if any) with the same key. Note: Callers should not hold - * their pointers to router if this function fails; router - * will either be inserted into the routerlist or freed. Similarly, even - * if this call succeeds, they should not hold their pointers to - * router after subsequent calls with other routerinfo's -- they - * might cause the original routerinfo to get freed. + * older entries (if any) with the same key. + * + * Note: Callers should not hold their pointers to router if this + * function fails; router will either be inserted into the routerlist or + * freed. Similarly, even if this call succeeds, they should not hold their + * pointers to router after subsequent calls with other routerinfo's -- + * they might cause the original routerinfo to get freed. * * Returns the status for the operation. Might set *msg if it wants * the poster of the router to know something. diff --git a/src/feature/nodelist/routerlist.h b/src/feature/nodelist/routerlist.h index 5771ebb1a..d7f44cb80 100644 --- a/src/feature/nodelist/routerlist.h +++ b/src/feature/nodelist/routerlist.h @@ -37,8 +37,8 @@ typedef enum was_router_added_t { ROUTER_WAS_NOT_WANTED = -6, /* Router descriptor was rejected because it was older than * OLD_ROUTER_DESC_MAX_AGE. */ - ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'NOT_NEW' */ - /* DOCDOC */ + ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'ROUTER_IS_ALREADY_KNOWN' */ + /* Some certs on this router are expired. */ ROUTER_CERTS_EXPIRED = -8 } was_router_added_t;

1 0

[tor/master] dirauth: Return a distinct status when formatting annotations fails
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 19bf5806adb80e513bb2707a1686216225fef420 Author: teor <teor(a)torproject.org> Date: Thu Jun 6 08:52:13 2019 +1000 dirauth: Return a distinct status when formatting annotations fails Adds ROUTER_AUTHDIR_BUG_ANNOTATIONS to was_router_added_t. The out-of-order numbering is deliberate: it will be fixed by later commits for 16564. Fixes bug 30780; bugfix on 0.2.0.8-alpha. --- changes/bug30780 | 3 +++ src/feature/dirauth/process_descs.c | 4 +--- src/feature/nodelist/routerlist.h | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/bug30780 b/changes/bug30780 new file mode 100644 index 000000000..5731d201a --- /dev/null +++ b/changes/bug30780 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory authorities): + - Return a distinct status when formatting annotations fails. + Fixes bug 30780; bugfix on 0.2.0.8-alpha. diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 17936add5..a68d15565 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -556,9 +556,7 @@ dirserv_add_multiple_descriptors(const char *desc, size_t desclen, !general ? router_purpose_to_string(purpose) : "", !general ? "\n" : "")<0) { *msg = "Couldn't format annotations"; - /* XXX Not cool: we return -1 below, but (was_router_added_t)-1 is - * ROUTER_BAD_EI, which isn't what's gone wrong here. :( */ - return -1; + return ROUTER_AUTHDIR_BUG_ANNOTATIONS; } s = desc; diff --git a/src/feature/nodelist/routerlist.h b/src/feature/nodelist/routerlist.h index d7f44cb80..dc9203e01 100644 --- a/src/feature/nodelist/routerlist.h +++ b/src/feature/nodelist/routerlist.h @@ -39,7 +39,10 @@ typedef enum was_router_added_t { * OLD_ROUTER_DESC_MAX_AGE. */ ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'ROUTER_IS_ALREADY_KNOWN' */ /* Some certs on this router are expired. */ - ROUTER_CERTS_EXPIRED = -8 + ROUTER_CERTS_EXPIRED = -8, + /* We couldn't format the annotations for this router. This is a directory + * authority bug. */ + ROUTER_AUTHDIR_BUG_ANNOTATIONS = -10 } was_router_added_t; /** How long do we avoid using a directory server after it's given us a 503? */

1 0

[tor/release-0.4.1] Give a more useful failure messgae when we fail to minherit().
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 93ddc51cbd325ef3d5cf3a5b9948ff65c09fc5aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 09:21:45 2019 -0400 Give a more useful failure messgae when we fail to minherit(). Part of ticket 30686. --- src/lib/crypt_ops/crypto_rand_fast.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/crypt_ops/crypto_rand_fast.c b/src/lib/crypt_ops/crypto_rand_fast.c index b71ade81b..d2ce1a542 100644 --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@ -181,7 +181,11 @@ crypto_fast_rng_new_from_seed(const uint8_t *seed) #else /* We decided above that noinherit would always do _something_. Assert here * that we were correct. */ - tor_assert(inherit != INHERIT_RES_KEEP); + tor_assertf(inherit != INHERIT_RES_KEEP, + "We failed to create a non-inheritable memory region, even " + "though we believed such a failure to be impossible! This is " + "probably a bug in Tor support for your platform; please report " + "it."); #endif return result; }

1 0

[tor/release-0.4.1] Give a compile warning when we don't have any flags for minherit().
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit cad0de35bd49064f5712f32a2b6e41ffe6e822e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 09:22:18 2019 -0400 Give a compile warning when we don't have any flags for minherit(). Part of ticket 30686. --- src/lib/malloc/map_anon.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index f4fda00bf..6afea713d 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -70,6 +70,11 @@ #endif +#if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT) +#warn "minherit() is defined, but we couldn't find the right flag for it." +#warn "This is probably a bug in Tor's support for this platform." +#endif + /** * Helper: try to prevent the sz bytes at mem from being swapped * to disk. Return 0 on success or if the facility is not available on this

1 0

[tor/release-0.4.1] Add a changes file for ticket 30686.
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 5068ccab0b1849e836729c43a2ca891139cf107b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 09:23:13 2019 -0400 Add a changes file for ticket 30686. --- changes/ticket30686 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket30686 b/changes/ticket30686 new file mode 100644 index 000000000..36473c1a0 --- /dev/null +++ b/changes/ticket30686 @@ -0,0 +1,5 @@ + o Minor features (logging): + - Give a more useful assertion failure message if we think we have + minherit() but we fail to make a region non-inheritable. Give a + compile-time warning if our support for minherit() is + incomplete. Closes ticket 30686.

1 0