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

[chutney/master] Traffic: make the unit test compatible with python 3
by teor＠torproject.org 12 Apr '19

12 Apr '19

commit c5ed1580d9b864287068c3b4fa3620835c3c8ede Author: teor <teor(a)torproject.org> Date: Mon Apr 8 15:02:55 2019 +1000 Traffic: make the unit test compatible with python 3 Part of 30063. --- lib/chutney/Traffic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index cb0af2f..26976db 100755 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -430,7 +430,7 @@ class TrafficTester(): def main(): """Test the TrafficTester by sending and receiving some data.""" - DATA = "a foo is a bar" * 1000 + DATA = b"a foo is a bar" * 1000 bind_to = ('localhost', int(sys.argv[1])) tt = TrafficTester(bind_to, DATA)

1 0

[chutney/master] README: Update the default start time
by teor＠torproject.org 12 Apr '19

12 Apr '19

commit fa9588e3ce31715ff934705071ba0c86e39e45df Author: teor <teor(a)torproject.org> Date: Fri Apr 12 12:40:13 2019 +1000 README: Update the default start time --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 59b97cd..c828e1d 100644 --- a/README +++ b/README @@ -154,7 +154,7 @@ Multiple Tests: Waiting for the network: The tools/test-network.sh script uses the chutney wait_for_bootstrap - command to wait for up to CHUTNEY_START_TIME seconds (default: 60), checking + command to wait for up to CHUTNEY_START_TIME seconds (default: 120), checking whether the logged bootstrapped status for every node is 100%. It it is, great: it succeeds. If not, it dumps the bootstrap statuses and exits. test-network.sh does not exit immediately if a tor node fails to bootstrap.

1 0

[chutney/master] shellcheck: Disable SC1117: backslash escaping
by teor＠torproject.org 12 Apr '19

12 Apr '19

commit dc4a018b05f324cbdd9e4ac49474f2ad8a8ad87c Author: teor <teor(a)torproject.org> Date: Mon Apr 8 15:10:28 2019 +1000 shellcheck: Disable SC1117: backslash escaping SC1117 was disabled after shellcheck release 0.5, because it was too pedantic. But shellcheck 0.5.0 is still in the Travis Homebrew cache. So we disable SC1117 in shellcheck-tests.sh. Part of 30065. --- tests/shellcheck-tests.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/shellcheck-tests.sh b/tests/shellcheck-tests.sh index 02afbaa..b24a770 100755 --- a/tests/shellcheck-tests.sh +++ b/tests/shellcheck-tests.sh @@ -5,6 +5,8 @@ set -e # Verbose mode set -v +# SC1117 was disabled after 0.5, because it was too pedantic +EXCLUSIONS="--exclude=SC1117" # Output is prefixed with the name of the script myname=$(basename "$0") @@ -17,7 +19,8 @@ echo "$myname: changing to chutney directory" cd "$CHUTNEY_DIR" -echo "$myname: running shellcheck tests" +echo "$myname: running shellcheck tests with $EXCLUSIONS" -shellcheck chutney -find . -name "*.sh" -exec shellcheck {} + +shellcheck "$EXCLUSIONS" chutney + +find . -name "*.sh" -exec shellcheck "$EXCLUSIONS" {} +

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/21'
by teor＠torproject.org 12 Apr '19

12 Apr '19

commit 1941747db8b14885ae0dfed40b8e5425e47bee2d Merge: fa9588e dc4a018 Author: teor <teor(a)torproject.org> Date: Fri Apr 12 12:41:50 2019 +1000 Merge remote-tracking branch 'tor-github/pr/21' Merged the shellcheck and unit tests. Put shellcheck first. .travis.yml | 9 +++++++++ chutney | 6 ++++-- tests/shellcheck-tests.sh | 26 +++++++++++++++++++++++++ tools/bootstrap-network.sh | 9 +++++---- tools/hsaddress.sh | 11 ++++++----- tools/warnings.sh | 48 +++++++++++++++++++++++++--------------------- 6 files changed, 76 insertions(+), 33 deletions(-) diff --cc .travis.yml index 812ca82,fd04d7d..f5c1d62 --- a/.travis.yml +++ b/.travis.yml @@@ -163,7 -171,7 +171,8 @@@ install - tor --version script: + - tests/shellcheck-tests.sh + - tests/unit-tests.sh - tools/test-network.sh --allow-failures 1 after_failure:

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/19'
by teor＠torproject.org 12 Apr '19

12 Apr '19

commit 81265144939d2f620d36827970e96115d725dd04 Merge: cdd4389 86fb60a Author: teor <teor(a)torproject.org> Date: Fri Apr 12 12:39:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/19' tools/test-network-impl.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/18'
by teor＠torproject.org 12 Apr '19

12 Apr '19

commit cdd438923096a893e7dbe52ef8c3cd2c962ad59b Merge: 9bb251f c5ed158 Author: teor <teor(a)torproject.org> Date: Fri Apr 12 12:38:27 2019 +1000 Merge remote-tracking branch 'tor-github/pr/18' .travis.yml | 1 + lib/chutney/Debug.py | 18 ++++++++++- lib/chutney/Templating.py | 2 +- lib/chutney/TorNet.py | 2 +- lib/chutney/Traffic.py | 8 ++--- tests/unit-tests.sh | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 102 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 11 Apr '19

11 Apr '19

commit 7dd247c5fd91962cf12ffc1c2aced0a3e8d01f29 Merge: 9fabf104e 40471d73e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 17:05:45 2019 -0400 Merge branch 'maint-0.4.0'

1 0

[tor/maint-0.4.0] bump to 0.4.0.4-rc-dev
by nickm＠torproject.org 11 Apr '19

11 Apr '19

commit 40471d73e5270d615a92be2ee1e7c70232dcbbcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 17:05:38 2019 -0400 bump to 0.4.0.4-rc-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index dc8fa7086..062ff5168 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.4-rc]) +AC_INIT([tor],[0.4.0.4-rc-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-10"], # for 0.4.0.4-rc +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-11"], # for 0.4.0.4-rc-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4100b4619..38bbca4c6 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.0.4-rc" +!define VERSION "0.4.0.4-rc-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 09d38cb1e..3a7410b8d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.0.4-rc" +#define VERSION "0.4.0.4-rc-dev"

1 0

[tor/release-0.4.0] bump to 0.4.0.4-rc-dev
by nickm＠torproject.org 11 Apr '19

11 Apr '19

commit 40471d73e5270d615a92be2ee1e7c70232dcbbcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 17:05:38 2019 -0400 bump to 0.4.0.4-rc-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index dc8fa7086..062ff5168 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.4-rc]) +AC_INIT([tor],[0.4.0.4-rc-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-10"], # for 0.4.0.4-rc +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-11"], # for 0.4.0.4-rc-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4100b4619..38bbca4c6 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.0.4-rc" +!define VERSION "0.4.0.4-rc-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 09d38cb1e..3a7410b8d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.0.4-rc" +#define VERSION "0.4.0.4-rc-dev"

1 0

[tor/master] forward-port the 0.4.0.4-rc changelog
by nickm＠torproject.org 11 Apr '19

11 Apr '19

commit adeecce53b68eb7183bf8d5b3051303b5f2f1d45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 17:06:19 2019 -0400 forward-port the 0.4.0.4-rc changelog --- ChangeLog | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9b512c6ae..accde75b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,141 @@ +Changes in version 0.4.0.4-rc - 2019-04-11 + Tor 0.4.0.4-rc is the first release candidate in its series; it fixes + several bugs from earlier versions, including some that had affected + stability, and one that prevented relays from working with NSS. + + o Major bugfixes (NSS, relay): + - When running with NSS, disable TLS 1.2 ciphersuites that use + SHA384 for their PRF. Due to an NSS bug, the TLS key exporters for + these ciphersuites don't work -- which caused relays to fail to + handshake with one another when these ciphersuites were enabled. + Fixes bug 29241; bugfix on 0.3.5.1-alpha. + + o Minor features (bandwidth authority): + - Make bandwidth authorities ignore relays that are reported in the + bandwidth file with the flag "vote=0". This change allows us to + report unmeasured relays for diagnostic reasons without including + their bandwidth in the bandwidth authorities' vote. Closes + ticket 29806. + - When a directory authority is using a bandwidth file to obtain the + bandwidth values that will be included in the next vote, serve + this bandwidth file at /tor/status-vote/next/bandwidth. Closes + ticket 21377. + + o Minor features (circuit padding): + - Stop warning about undefined behavior in the probability + distribution tests. Float division by zero may technically be + undefined behavior in C, but it's well defined in IEEE 754. + Partial backport of 29298. Closes ticket 29527; bugfix + on 0.4.0.1-alpha. + + o Minor features (continuous integration): + - On Travis Rust builds, cleanup Rust registry and refrain from + caching the "target/" directory to speed up builds. Resolves + issue 29962. + + o Minor features (dormant mode): + - Add a DormantCanceledByStartup option to tell Tor that it should + treat a startup event as cancelling any previous dormant state. + Integrators should use this option with caution: it should only be + used if Tor is being started because of something that the user + did, and not if Tor is being automatically started in the + background. Closes ticket 29357. + + o Minor features (geoip): + - Update geoip and geoip6 to the April 2 2019 Maxmind GeoLite2 + Country database. Closes ticket 29992. + + o Minor features (NSS, diagnostic): + - Try to log an error from NSS (if there is any) and a more useful + description of our situation if we are using NSS and a call to + SSL_ExportKeyingMaterial() fails. Diagnostic for ticket 29241. + + o Minor bugfixes (security): + - Fix a potential double free bug when reading huge bandwidth files. + The issue is not exploitable in the current Tor network because + the vulnerable code is only reached when directory authorities + read bandwidth files, but bandwidth files come from a trusted + source (usually the authorities themselves). Furthermore, the + issue is only exploitable in rare (non-POSIX) 32-bit architectures, + which are not used by any of the current authorities. Fixes bug + 30040; bugfix on 0.3.5.1-alpha. Bug found and fixed by + Tobias Stoeckmann. + - Verify in more places that we are not about to create a buffer + with more than INT_MAX bytes, to avoid possible OOB access in the + event of bugs. Fixes bug 30041; bugfix on 0.2.0.16. Found and + fixed by Tobias Stoeckmann. + + o Minor bugfix (continuous integration): + - Reset coverage state on disk after Travis CI has finished. This + should prevent future coverage merge errors from causing the test + suite for the "process" subsystem to fail. The process subsystem + was introduced in 0.4.0.1-alpha. Fixes bug 29036; bugfix + on 0.2.9.15. + - Terminate test-stem if it takes more than 9.5 minutes to run. + (Travis terminates the job after 10 minutes of no output.) + Diagnostic for 29437. Fixes bug 30011; bugfix on 0.3.5.4-alpha. + + o Minor bugfixes (bootstrap reporting): + - During bootstrap reporting, correctly distinguish pluggable + transports from plain proxies. Fixes bug 28925; bugfix + on 0.4.0.1-alpha. + + o Minor bugfixes (C correctness): + - Fix an unlikely memory leak in consensus_diff_apply(). Fixes bug + 29824; bugfix on 0.3.1.1-alpha. This is Coverity warning + CID 1444119. + + o Minor bugfixes (circuitpadding testing): + - Minor tweaks to avoid rare test failures related to timers and + monotonic time. Fixes bug 29500; bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (directory authorities): + - Actually include the bandwidth-file-digest line in directory + authority votes. Fixes bug 29959; bugfix on 0.4.0.2-alpha. + + o Minor bugfixes (logging): + - On Windows, when errors cause us to reload a consensus from disk, + tell the user that we are retrying at log level "notice". + Previously we only logged this information at "info", which was + confusing because the errors themselves were logged at "warning". + Improves previous fix for 28614. Fixes bug 30004; bugfix + on 0.4.0.2-alpha. + + o Minor bugfixes (pluggable transports): + - Restore old behavior when it comes to discovering the path of a + given Pluggable Transport executable file. A change in + 0.4.0.1-alpha had broken this behavior on paths containing a + space. Fixes bug 29874; bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (testing): + - Backport the 0.3.4 src/test/test-network.sh to 0.2.9. We need a + recent test-network.sh to use new chutney features in CI. Fixes + bug 29703; bugfix on 0.2.9.1-alpha. + - Fix a test failure on Windows caused by an unexpected "BUG" + warning in our tests for tor_gmtime_r(-1). Fixes bug 29922; bugfix + on 0.2.9.3-alpha. + + o Minor bugfixes (TLS protocol): + - When classifying a client's selection of TLS ciphers, if the + client ciphers are not yet available, do not cache the result. + Previously, we had cached the unavailability of the cipher list + and never looked again, which in turn led us to assume that the + client only supported the ancient V1 link protocol. This, in turn, + was causing Stem integration tests to stall in some cases. Fixes + bug 30021; bugfix on 0.2.4.8-alpha. + + o Code simplification and refactoring: + - Introduce a connection_dir_buf_add() helper function that detects + whether compression is in use, and adds a string accordingly. + Resolves issue 28816. + - Refactor handle_get_next_bandwidth() to use + connection_dir_buf_add(). Implements ticket 29897. + + o Documentation: + - Clarify that Tor performs stream isolation among *Port listeners + by default. Resolves issue 29121. + + Changes in version 0.4.0.3-alpha - 2019-03-22 Tor 0.4.0.3-alpha is the third in its series; it fixes several small bugs from earlier versions.

1 0