May 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.3] Merge branch 'bug34077_042' into bug34077_043
by nickm＠torproject.org 05 May '20

05 May '20

commit 6aaee6133d089611050a3507d7258486dcf97d1e Merge: 42507429c b4b1882da Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 30 23:01:58 2020 -0400 Merge branch 'bug34077_042' into bug34077_043 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Fix a GCC 10.0.1 compilation warning.
by nickm＠torproject.org 05 May '20

05 May '20

commit d7e166bd95411d3f5caa573e0293356bff78c481 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 30 22:56:31 2020 -0400 Fix a GCC 10.0.1 compilation warning. Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC first gives this warning for 9eeff921ae7b786d960ea4286d5bba56) --- changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug34077 b/changes/bug34077 new file mode 100644 index 000000000..29458bd9d --- /dev/null +++ b/changes/bug34077 @@ -0,0 +1,3 @@ + o Minor bugfixes (compiler warnings): + - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix on + 0.4.0.3-alpha. diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index b669e3836..58c203e20 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -1057,8 +1057,9 @@ sr_state_set_valid_after(time_t valid_after) sr_phase_t sr_state_get_phase(void) { - void *ptr; + void *ptr=NULL; state_query(SR_STATE_ACTION_GET, SR_STATE_OBJ_PHASE, NULL, &ptr); + tor_assert(ptr); return *(sr_phase_t *) ptr; }

1 0

[tor/maint-0.4.3] Merge branch 'bug34077_041' into bug34077_042
by nickm＠torproject.org 05 May '20

05 May '20

commit b4b1882da012697136d3ffd40f693b1f97964a5b Merge: 2d34d4d1a d7e166bd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 30 22:59:08 2020 -0400 Merge branch 'bug34077_041' into bug34077_042 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Merge branch 'bug34077_041' into maint-0.4.1
by nickm＠torproject.org 05 May '20

05 May '20

commit a02e866642c28b4c0cbe415f8573c4ede4d9caf7 Merge: 987f2fa50 d7e166bd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:14:38 2020 -0400 Merge branch 'bug34077_041' into maint-0.4.1 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Fix a GCC 10.0.1 compilation error.
by nickm＠torproject.org 05 May '20

05 May '20

commit b1c383e3e65ec539ebe4394652429f1954e3d805 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 30 23:04:56 2020 -0400 Fix a GCC 10.0.1 compilation error. Do not try to stuff "HS_DESC_DECODE_GENERIC_ERROR" (-1) into a socks5_reply_status_t (enum). It doesn't actually make sense, and isn't one of our documented extensions. (This can only happen on a nonfatal assertion that we haven't seen, so it probably isn't happening in practice.) Fixes another case of bug 34077; bugfix on 0.4.3.1-alpha. --- src/feature/hs/hs_client.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index da1202b64..68d6619ce 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -1350,7 +1350,7 @@ client_desc_missing_bad_client_auth(const smartlist_t *entry_conns, /* We should not be called with another type of status. Recover by * sending a generic error. */ tor_assert_nonfatal_unreached(); - code = HS_DESC_DECODE_GENERIC_ERROR; + code = SOCKS5_GENERAL_ERROR; } entry_conn->socks_request->socks_extended_error_code = code; connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_MISC); @@ -2493,4 +2493,3 @@ set_hs_client_auths_map(digest256map_t *map) } #endif /* defined(TOR_UNIT_TESTS) */ -

1 0

[tor/maint-0.4.3] Merge branch 'bug34077_043' into maint-0.4.3
by nickm＠torproject.org 05 May '20

05 May '20

commit 711385c47f93230aad049b2b7952d391a9114f68 Merge: 42507429c b1c383e3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:25:45 2020 -0400 Merge branch 'bug34077_043' into maint-0.4.3 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- src/feature/hs/hs_client.c | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tpo/master] Add new Tor Browser version 9.0.10
by sysrqb＠torproject.org 05 May '20

05 May '20

commit 892e053601460ce5104d434295b8729b2fa349d3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 5 14:01:47 2020 +0000 Add new Tor Browser version 9.0.10 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ++++ databags/versions.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index e86ed14e..8e269a4c 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -17,6 +17,10 @@ body: "9.0.9-MacOS", "9.0.9-Linux", "9.0.9-Windows", +"9.0.10", +"9.0.10-MacOS", +"9.0.10-Linux", +"9.0.10-Windows", "9.5a8", "9.5a8-MacOS", "9.5a8-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index 89863399..ec820b6b 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,5 +1,5 @@ [torbrowser-stable] -version = 9.0.9 +version = 9.0.10 win32 = 0.4.2.7 [torbrowser-alpha]

1 0

[onionperf/master] Fix tests for setting DataDirectoryGroupReadable.
by karsten＠torproject.org 05 May '20

05 May '20

commit 5ce7277436ca39853989081adbde0da95d7a138a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 5 11:33:17 2020 +0200 Fix tests for setting DataDirectoryGroupReadable. --- onionperf/tests/test_measurement.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/onionperf/tests/test_measurement.py b/onionperf/tests/test_measurement.py index 1898cbf..f577c61 100644 --- a/onionperf/tests/test_measurement.py +++ b/onionperf/tests/test_measurement.py @@ -32,7 +32,7 @@ def test_create_tor_config_env_var(): meas = measurement.Measurement(None, None, None, None, None, None, None, None, None) known_config = "UseBridges 1\nRunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\n" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\n" config_client = meas.create_tor_config(9001, 9050, "/tmp/", "client") config_server = meas.create_tor_config(9001, 9050, "/tmp/", "server") @@ -52,10 +52,10 @@ def test_create_tor_config_client_lines(): """ known_config = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseBridges 1\n" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseBridges 1\n" known_config_server = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseEntryGuards 0" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0" meas = measurement.Measurement(None, None, None, None, None, None, "UseBridges 1\n", None, None) @@ -75,10 +75,10 @@ def test_create_tor_config_client_file(): """ known_config_server = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseEntryGuards 0" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0" known_config = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseBridges 1\n" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseBridges 1\n" meas = measurement.Measurement(None, None, None, None, None, None, None, absolute_data_path("config"), None) @@ -98,10 +98,10 @@ def test_create_tor_config_server_file(): """ known_config_server = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseBridges 1\n" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseBridges 1\n" known_config = "RunAsDaemon 0\nORPort 0\nDirPort 0\nControlPort 9001\nSocksPort 9050\nSocksListenAddress 127.0.0.1\nClientOnly 1\n\ -WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nLog INFO stdout\nUseEntryGuards 0" +WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nDataDirectory /tmp/\nDataDirectoryGroupReadable 1\nLog INFO stdout\nUseEntryGuards 0" meas = measurement.Measurement(None, None, None, None, None, None, None, None, absolute_data_path("config"))

1 0

[onionperf/master] Fix reprocessing mode test.
by karsten＠torproject.org 05 May '20

05 May '20

commit c8763fc024bcdf7bcefa33b0dbef91cc9df98d7d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 5 11:42:12 2020 +0200 Fix reprocessing mode test. --- onionperf/tests/test_reprocessing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onionperf/tests/test_reprocessing.py b/onionperf/tests/test_reprocessing.py index ef800ab..76d5b4b 100644 --- a/onionperf/tests/test_reprocessing.py +++ b/onionperf/tests/test_reprocessing.py @@ -25,7 +25,7 @@ def test_log_collection_tgen(): def test_log_collection_torctl(): log_list = reprocessing.collect_logs(DATA_DIR, '*torctl.log') - well_known_list = [ DATA_DIR + 'logs/onionperf_2019-01-10_23:59:59.torctl.log', DATA_DIR + 'logs/onionperf.torctl.log' ] + well_known_list = [ DATA_DIR + 'logs/onionperf.torctl.log', DATA_DIR + 'logs/onionperf_2019-01-10_23:59:59.torctl.log' ] assert_equals(log_list, well_known_list ) def test_log_match():

1 0

[onionperf/master] Fix test for compressing logs during rotation.
by karsten＠torproject.org 05 May '20

05 May '20

commit 48ab3857f502f5bc0e68739e8a19fe9dcdca409f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 5 11:32:07 2020 +0200 Fix test for compressing logs during rotation. Still part of #33396. --- onionperf/tests/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onionperf/tests/test_utils.py b/onionperf/tests/test_utils.py index 940e0b6..71056ff 100644 --- a/onionperf/tests/test_utils.py +++ b/onionperf/tests/test_utils.py @@ -300,7 +300,7 @@ def test_file_writable_rotate_file(): test_writable.write("onionperf") test_writable.rotate_file(datetime.datetime(2018, 11, 27, 0, 0, 0)) created_dir = os.path.join(work_dir, "log_archive") - rotated_file = os.path.join(created_dir, "logfile_2018-11-27_00:00:00") + rotated_file = os.path.join(created_dir, "logfile_2018-11-27_00:00:00.gz") assert(os.path.exists(created_dir)) assert(os.path.isdir(created_dir)) assert(os.path.exists(rotated_file))

1 0