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

[tor/release-0.4.0] Fix a memory leak on failure to create keys directory.
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 85ff6f9114eb2d492d88ed55d01a69f7bafb10be Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 18:18:14 2019 -0400 Fix a memory leak on failure to create keys directory. Fixes bug 30148, which is also CID 1437429 and CID 1437454. Bugfix on 0.3.3.1-alpha, when separate key directories became a thing. --- changes/bug30148 | 4 ++++ src/or/routerkeys.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug30148 b/changes/bug30148 new file mode 100644 index 000000000..7d0257e3f --- /dev/null +++ b/changes/bug30148 @@ -0,0 +1,4 @@ + o Minor bugfixes (memory leak): + - Avoid a minor memory leak that could occur on relays when + creating a keys directory failed. Fixes bug 30148; bugfix on + 0.3.3.1-alpha. diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 43460da8c..dd19d28d0 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -816,7 +816,7 @@ load_ed_keys(const or_options_t *options, time_t now) /* Check/Create the key directory */ if (create_keys_directory(options) < 0) - return -1; + goto err; char *fname; if (options->master_key_fname) { @@ -1403,4 +1403,3 @@ routerkeys_free_all(void) rsa_ed_crosscert = NULL; // redundant rsa_ed_crosscert_len = 0; } -

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

1 0

[tor/release-0.4.0] num_bridges_usable(): only count configured bridges.
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 8015979eeba2c8b10fb058318628debf228fb023 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 12:19:29 2019 -0400 num_bridges_usable(): only count configured bridges. When this function was implemented, it counted all the entry guards in the bridge set. But this included previously configured bridges, as well as currently configured ones! Instead, only count the _filtered_ bridges (ones that are configured and possibly reachable) as maybe usable. Fixes bug 29875; bugfix on 0.3.0.1-alpha. --- src/feature/client/entrynodes.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index e543289ce..15ec83059 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -3300,6 +3300,9 @@ num_bridges_usable,(int use_maybe_reachable)) } SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { + /* Not a bridge, or not one we are configured to be able to use. */ + if (! guard->is_filtered_guard) + continue; /* Definitely not usable */ if (guard->is_reachable == GUARD_REACHABLE_NO) continue;

1 0

[tor/release-0.4.0] Fix a logic error in deciding whether to accept SessionGroup=
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 70b85358afd0a8d4291489f9e9f5654ab2d53371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 08:26:10 2019 -0400 Fix a logic error in deciding whether to accept SessionGroup= Fixes bug 22619; bugfix on 0.2.7.2-alpha --- changes/bug22619 | 3 +++ src/app/config/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug22619 b/changes/bug22619 new file mode 100644 index 000000000..9c71996f5 --- /dev/null +++ b/changes/bug22619 @@ -0,0 +1,3 @@ + o Minor bugfixes (circuit isolation): + - Fix a logic error that prevented the SessionGroup sub-option from + being accepted. Fixes bug 22619; bugfix on 0.2.7.2-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 2a504d306..352559759 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -7080,7 +7080,7 @@ parse_port_config(smartlist_t *out, if (!strcasecmpstart(elt, "SessionGroup=")) { int group = (int)tor_parse_long(elt+strlen("SessionGroup="), 10, 0, INT_MAX, &ok, NULL); - if (!ok || !allow_no_stream_options) { + if (!ok || allow_no_stream_options) { log_warn(LD_CONFIG, "Invalid %sPort option '%s'", portname, escaped(elt)); goto err;

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 8ea0903222610b75e8b0c58297148267a299af31 Merge: 6ed56ee4e 0ab4dc7ef Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:45:32 2019 +1000 Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5 changes/bug30316 | 4 ++++ src/feature/dirauth/dirvote.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.0] Do not warn about compatible OpenSSL upgrades
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 8c4e68438dd680b6b36f9b337b12d098b08db9d8 Author: Bernhard M. Wiedemann <bwiedemann(a)suse.de> Date: Mon Apr 15 13:57:24 2019 +0200 Do not warn about compatible OpenSSL upgrades When releasing OpenSSL patch-level maintenance updates, we do not want to rebuild binaries using it. And since they guarantee ABI stability, we do not have to. Without this patch, warning messages were produced that confused users: https://bugzilla.opensuse.org/show_bug.cgi?id=1129411 Fixes bug 30190; bugfix on 0.2.4.2-alpha commit 7607ad2bec Signed-off-by: Bernhard M. Wiedemann <bwiedemann(a)suse.de> --- changes/bug30190 | 3 +++ src/lib/crypt_ops/crypto_openssl_mgt.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug30190 b/changes/bug30190 new file mode 100644 index 000000000..e2352c3b9 --- /dev/null +++ b/changes/bug30190 @@ -0,0 +1,3 @@ + o Minor bugfixes (lib): + do not log a warning for OpenSSL versions that should be compatible + Fixes bug 30190; bugfix on 0.2.4.2-alpha diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index 60e4ea795..c97815f9a 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -213,6 +213,14 @@ crypto_openssl_early_init(void) !strcmp(version_str, OPENSSL_VERSION_TEXT)) { log_info(LD_CRYPTO, "OpenSSL version matches version from headers " "(%lx: %s).", version_num, version_str); + } else if ((version_num & 0xffff0000) == + (OPENSSL_VERSION_NUMBER & 0xffff0000)) { + log_notice(LD_CRYPTO, + "We compiled with OpenSSL %lx: %s and we " + "are running with OpenSSL %lx: %s. " + "These two versions should be binary compatible.", + (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + version_num, version_str); } else { log_warn(LD_CRYPTO, "OpenSSL version from headers does not match the " "version we're running with. If you get weird crashes, that "

1 0

[tor/release-0.4.0] OOM-purge the DNS cache one part at a time
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 37aae23945c45c459091b38699130a14466d33ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 17 10:03:41 2019 -0400 OOM-purge the DNS cache one part at a time Previously we purged it in 1-hour increments -- but one-hour is the maximum TTL for the cache! Now we do it in 25%-TTL increments. Fixes bug 29617; bugfix on 0.3.5.1-alpha. --- changes/ticket29617 | 4 ++++ src/feature/relay/dns.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/ticket29617 b/changes/ticket29617 new file mode 100644 index 000000000..4d50ea962 --- /dev/null +++ b/changes/ticket29617 @@ -0,0 +1,4 @@ + o Minor bugfixes (out-of-memory handler): + - When purging the DNS cache because of an out-of-memory condition, + try purging just the older entries at first. Previously, we would + purge the whole thing. Fixes bug 29617; bugfix on 0.3.5.1-alpha. diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index d3660c47e..cc9f4cf49 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -2130,7 +2130,8 @@ dns_cache_handle_oom(time_t now, size_t min_remove_bytes) current_size -= bytes_removed; total_bytes_removed += bytes_removed; - time_inc += 3600; /* Increase time_inc by 1 hour. */ + /* Increase time_inc by a reasonable fraction. */ + time_inc += (MAX_DNS_TTL_AT_EXIT / 4); } while (total_bytes_removed < min_remove_bytes); return total_bytes_removed;

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 789fdbed0586aeec5b312195a453c9ddaf8d58be Merge: a92b05392 3c3158f18 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:52:56 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5 changes/bug22619 | 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12 +++++------- 3 files changed, 9 insertions(+), 8 deletions(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit a57e168caa21f9798be85adb56af726da7385810 Merge: 5df0b3662 9b7cdd23d Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:36:14 2019 +1000 Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5 doc/tor.1.txt | 13 +++++++------ src/config/torrc.sample.in | 21 ++++++++++++++++----- 2 files changed, 23 insertions(+), 11 deletions(-)

1 0

[tor/release-0.4.0] Consider dir info to have changed when the bridges change
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 5b3c8865842f3b12d3ea35db19e8feb135bb46dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 11:46:58 2019 -0400 Consider dir info to have changed when the bridges change Otherwise, we won't realize that we haven't got enough bridge information to build circuits. Part of a fix for ticket 29875. --- src/app/config/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 2a504d306..7f6657db3 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2412,7 +2412,8 @@ options_act(const or_options_t *old_options) if (!bool_eq(directory_fetches_dir_info_early(options), directory_fetches_dir_info_early(old_options)) || !bool_eq(directory_fetches_dir_info_later(options), - directory_fetches_dir_info_later(old_options))) { + directory_fetches_dir_info_later(old_options)) || + !config_lines_eq(old_options->Bridges, options->Bridges)) { /* Make sure update_router_have_minimum_dir_info() gets called. */ router_dir_info_changed(); /* We might need to download a new consensus status later or sooner than

1 0