January 2015 - tor-commits - lists.torproject.org

[tor/master] Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit b08cfc65a78527cc97f4d0aeff3217d5f1c93e08 Author: teor <teor2345(a)gmail.com> Date: Sun Jan 11 19:33:04 2015 +1100 Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value Check for a missing option value in parse_virtual_addr_network before asserting on the NULL in tor_addr_parse_mask_ports. This avoids crashing on torrc lines like Vi[rtualAddrNetworkIPv[4|6]] when no value follows the option. Bugfix on 0.2.3 (de4cc126cbb5 on 24 November 2012), fixes #14142. --- changes/bug14142-parse-virtual-addr | 7 +++++++ src/or/addressmap.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug14142-parse-virtual-addr b/changes/bug14142-parse-virtual-addr new file mode 100644 index 0000000..f78b7c7 --- /dev/null +++ b/changes/bug14142-parse-virtual-addr @@ -0,0 +1,7 @@ + o Minor bugfixes (client): + - Check for a missing option value in parse_virtual_addr_network + before asserting on the NULL in tor_addr_parse_mask_ports. + This avoids crashing on torrc lines like + Vi[rtualAddrNetworkIPv[4|6]] when no value follows the option. + Bugfix on 0.2.3 (de4cc126cbb5 on 24 November 2012), fixes #14142. + Patch by "teor". diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 998770a..4253532 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -738,6 +738,12 @@ parse_virtual_addr_network(const char *val, sa_family_t family, const int max_bits = ipv6 ? 40 : 16; virtual_addr_conf_t *conf = ipv6 ? &virtaddr_conf_ipv6 : &virtaddr_conf_ipv4; + if (!val || val[0] == '\0') { + if (msg) + tor_asprintf(msg, "Value not present (%s) after VirtualAddressNetwork%s", + val?"Empty":"NULL", ipv6?"IPv6":""); + return -1; + } if (tor_addr_parse_mask_ports(val, 0, &addr, &bits, NULL, NULL) < 0) { if (msg) tor_asprintf(msg, "Error parsing VirtualAddressNetwork%s %s",

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit 7b51667d638242b9e47bdd0d4357596c380f7c94 Merge: b266329 b08cfc6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 11 11:05:31 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14142-parse-virtual-addr | 7 +++++++ src/or/addressmap.c | 6 ++++++ 2 files changed, 13 insertions(+)

1 0

[tor/maint-0.2.5] Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value
by nickm＠torproject.org 11 Jan '15

11 Jan '15

commit b08cfc65a78527cc97f4d0aeff3217d5f1c93e08 Author: teor <teor2345(a)gmail.com> Date: Sun Jan 11 19:33:04 2015 +1100 Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value Check for a missing option value in parse_virtual_addr_network before asserting on the NULL in tor_addr_parse_mask_ports. This avoids crashing on torrc lines like Vi[rtualAddrNetworkIPv[4|6]] when no value follows the option. Bugfix on 0.2.3 (de4cc126cbb5 on 24 November 2012), fixes #14142. --- changes/bug14142-parse-virtual-addr | 7 +++++++ src/or/addressmap.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug14142-parse-virtual-addr b/changes/bug14142-parse-virtual-addr new file mode 100644 index 0000000..f78b7c7 --- /dev/null +++ b/changes/bug14142-parse-virtual-addr @@ -0,0 +1,7 @@ + o Minor bugfixes (client): + - Check for a missing option value in parse_virtual_addr_network + before asserting on the NULL in tor_addr_parse_mask_ports. + This avoids crashing on torrc lines like + Vi[rtualAddrNetworkIPv[4|6]] when no value follows the option. + Bugfix on 0.2.3 (de4cc126cbb5 on 24 November 2012), fixes #14142. + Patch by "teor". diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 998770a..4253532 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -738,6 +738,12 @@ parse_virtual_addr_network(const char *val, sa_family_t family, const int max_bits = ipv6 ? 40 : 16; virtual_addr_conf_t *conf = ipv6 ? &virtaddr_conf_ipv6 : &virtaddr_conf_ipv4; + if (!val || val[0] == '\0') { + if (msg) + tor_asprintf(msg, "Value not present (%s) after VirtualAddressNetwork%s", + val?"Empty":"NULL", ipv6?"IPv6":""); + return -1; + } if (tor_addr_parse_mask_ports(val, 0, &addr, &bits, NULL, NULL) < 0) { if (msg) tor_asprintf(msg, "Error parsing VirtualAddressNetwork%s %s",

1 0

[tor-browser-bundle/maint-4.0] We are at 4.0.3 now
by gk＠torproject.org 11 Jan '15

11 Jan '15

commit 2a3a14746c15aed4350425ce96e2b7967cafee85 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 11 12:08:20 2015 +0000 We are at 4.0.3 now --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 911afdd..7cd1a03 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ channels: release: 4.0.3 alpha: 4.5-alpha-2 versions: - 4.0.2: + 4.0.3: platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en download_url: https://www.torproject.org/dist/torbrowser/4.0.3

1 0

[tor-browser-bundle/maint-4.0] Update the config.yml
by gk＠torproject.org 11 Jan '15

11 Jan '15

commit 1c40c56419150c42daf5b874b4dccd52507b8d85 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 11 12:04:58 2015 +0000 Update the config.yml --- tools/update-responses/config.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index bdecdec..911afdd 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,23 +6,21 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.2 - alpha: 4.5-alpha-1 + release: 4.0.3 + alpha: 4.5-alpha-2 versions: 4.0.2: - platformVersion: 31.3.0 + platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.2 + download_url: https://www.torproject.org/dist/torbrowser/4.0.3 incremental_from: - - 4.0 - - 4.0.1 - 4.5-alpha-1: - platformVersion: 31.2.0 + - 4.0.2 + 4.5-alpha-2: + platformVersion: 31.3.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-1 + download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-2 incremental_from: - - 4.0 - - 4.0.1 + - 4.5-alpha-1 migrate_archs: osx32: osx64 osx32:

1 0

[stem/master] Fix tutorial_examples.py to be unordered
by atagar＠torproject.org 11 Jan '15

11 Jan '15

commit 75b7cc1211bc674e5f8c4fa8db8a4726d9d6f29b Author: Foxboron <mcfoxax(a)gmail.com> Date: Sun Jan 11 01:36:42 2015 +0100 Fix tutorial_examples.py to be unordered https://trac.torproject.org/projects/tor/ticket/14076 --- test/unit/tutorial_examples.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 5ad5189..873c984 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -12,6 +12,7 @@ except ImportError: import stem.response import stem.descriptor.remote +import stem.prereq from stem import str_type from stem.control import Controller @@ -132,6 +133,12 @@ def _get_router_status(address = None, port = None, nickname = None, fingerprint class TestTutorialExamples(unittest.TestCase): + def assert_equal_unordered(self, expected, actual): + if stem.prereq.is_python_3(): + self.assertCountEqual(expected.splitlines(), actual.splitlines()) + else: + self.assertListEqual(expected.splitlines(), actual.splitlines()) + @patch('sys.stdout', new_callable = StringIO) @patch('stem.control.Controller.from_port', spec = Controller) def test_list_circuits(self, from_port_mock, stdout_mock): @@ -183,7 +190,7 @@ class TestTutorialExamples(unittest.TestCase): }[fingerprint] tutorial_example() - self.assertEqual(LIST_CIRCUITS_OUTPUT, stdout_mock.getvalue()) + self.assert_equal_unordered(LIST_CIRCUITS_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @patch('stem.control.Controller.from_port', spec = Controller) @@ -234,7 +241,7 @@ class TestTutorialExamples(unittest.TestCase): controller.get_info.return_value = 'unknown' tutorial_example(event) - self.assertEqual(EXIT_USED_OUTPUT, stdout_mock.getvalue()) + self.assert_equal_unordered(EXIT_USED_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @patch('stem.descriptor.remote.DescriptorDownloader') @@ -267,7 +274,7 @@ class TestTutorialExamples(unittest.TestCase): tutorial_example() - self.assertEqual(OUTDATED_RELAYS_OUTPUT, stdout_mock.getvalue()) + self.assert_equal_unordered(OUTDATED_RELAYS_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @patch('stem.descriptor.remote.Query') @@ -350,7 +357,7 @@ class TestTutorialExamples(unittest.TestCase): ] tutorial_example() - self.assertEqual(COMPARE_FLAGS_OUTPUT, stdout_mock.getvalue()) + self.assert_equal_unordered(COMPARE_FLAGS_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @patch('stem.descriptor.remote.get_authorities') @@ -419,7 +426,7 @@ class TestTutorialExamples(unittest.TestCase): query_mock.side_effect = [query1, query2, query3, query4] tutorial_example() - self.assertEqual(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT, stdout_mock.getvalue()) + self.assert_equal_unordered(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @patch('stem.descriptor.parse_file')

1 0

[tor/master] Fix tortls.c build with GCC<4.6
by nickm＠torproject.org 10 Jan '15

10 Jan '15

commit b2663298e9179368d521d9088b2bbf0f12b490e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 10 17:25:16 2015 -0500 Fix tortls.c build with GCC<4.6 apparantly, "pragma GCC diagnostic push/pop" don't exist with older versions. Fixes bug in 740e592790f570c446cbb5e6d4a77f842f75; bug not in any released Tor. --- src/common/tortls.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index ea6ee0d..ca62913 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -31,7 +31,13 @@ #endif #ifdef __GNUC__ +#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +#endif + +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 #pragma GCC diagnostic push +#endif /* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */ #pragma GCC diagnostic ignored "-Wredundant-decls" @@ -45,8 +51,12 @@ #include <openssl/bio.h> #include <openssl/opensslv.h> -#ifdef __GNUC__ +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 #pragma GCC diagnostic pop +#else +#pragma GCC diagnostic warning "-Wredundant-decls" +#endif #endif #ifdef USE_BUFFEREVENTS

1 0

[tor/master] Better workaround for CFLAGS issues from #14072; fixes #14162
by nickm＠torproject.org 10 Jan '15

10 Jan '15

commit dc25fb7382b5cb930aaf0cdc842490ff5c11233e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 10 17:21:11 2015 -0500 Better workaround for CFLAGS issues from #14072; fixes #14162 When I applied patch fcc78e5f8a3249eadfea31db, I somehow broke stack trace symbols on Linux. I'll leave it to others to figure out why that happens. This should be better. Really. Fixes bug 14162; bug not in any released version of Tor. --- Makefile.am | 1 + configure.ac | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f105464..67c9cc9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ noinst_PROGRAMS= DISTCLEANFILES= bin_SCRIPTS= AM_CPPFLAGS= +AM_CFLAGS = @TOR_SYSTEMD_CFLAGS@ include src/include.am include doc/include.am include contrib/include.am diff --git a/configure.ac b/configure.ac index 2c92a6c..1fd5960 100644 --- a/configure.ac +++ b/configure.ac @@ -130,9 +130,10 @@ fi if test x$have_systemd = xyes; then AC_DEFINE(HAVE_SYSTEMD,1,[Have systemd]) - CFLAGS="${CFLAGS} ${SYSTEMD_CFLAGS}" + TOR_SYSTEMD_CFLAGS="${SYSTEMD_CFLAGS}" TOR_SYSTEMD_LIBS="${SYSTEMD_LIBS}" fi +AC_SUBST(TOR_SYSTEMD_CFLAGS) AC_SUBST(TOR_SYSTEMD_LIBS) if test x$enable_systemd = xyes -a x$have_systemd != xyes ; then @@ -1543,7 +1544,7 @@ fi if test "$GCC" = yes; then # Disable GCC's strict aliasing checks. They are an hours-to-debug # accident waiting to happen. - CFLAGS="$CFLAGS -Wall -fno-strict-aliasing -g -O2" + CFLAGS="$CFLAGS -Wall -fno-strict-aliasing" else # Override optimization level for non-gcc compilers CFLAGS="$CFLAGS -O"

1 0

[tor/master] Ignore warning for redundant decl in openssl/srtp.h
by nickm＠torproject.org 10 Jan '15

10 Jan '15

commit 740e592790f570c446cbb5e6d4a77f842f75d512 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 10 16:06:25 2015 -0500 Ignore warning for redundant decl in openssl/srtp.h --- src/common/tortls.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/common/tortls.c b/src/common/tortls.c index dd33b33..ea6ee0d 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -29,6 +29,14 @@ #include <ws2tcpip.h> #endif #endif + +#ifdef __GNUC__ +#pragma GCC diagnostic push +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */ +#pragma GCC diagnostic ignored "-Wredundant-decls" +#endif + #include <openssl/ssl.h> #include <openssl/ssl3.h> #include <openssl/err.h> @@ -37,6 +45,10 @@ #include <openssl/bio.h> #include <openssl/opensslv.h> +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + #ifdef USE_BUFFEREVENTS #include <event2/bufferevent_ssl.h> #include <event2/buffer.h>

1 0

[tor/master] Fix a minor misspelling in util.c
by nickm＠torproject.org 10 Jan '15

10 Jan '15

commit 5ac26cb7c70e160315cdb0e5d56a123e86f81b70 Author: teor <teor2345(a)gmail.com> Date: Sat Jan 10 15:52:55 2015 +1100 Fix a minor misspelling in util.c --- src/common/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/util.c b/src/common/util.c index 6226dd7..abf4813 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2953,7 +2953,7 @@ expand_filename(const char *filename) tor_free(username); rest = slash ? (slash+1) : ""; #else - log_warn(LD_CONFIG, "Couldn't expend homedir on system without pwd.h"); + log_warn(LD_CONFIG, "Couldn't expand homedir on system without pwd.h"); return tor_strdup(filename); #endif }

1 0