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

[tor/release-0.2.2] rend_service_introduce(): do protocol violation check before anything else.
by arma＠torproject.org 23 Apr '12

23 Apr '12

commit 2d276ab9d9193d5152fe2599e9d39f2df9ea7d43 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 19 00:47:37 2012 +0200 rend_service_introduce(): do protocol violation check before anything else. (Cherry-picked from 6ba13e4 by nickm) --- changes/bug5644 | 5 +++++ src/or/rendservice.c | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/changes/bug5644 b/changes/bug5644 new file mode 100644 index 0000000..a390eba --- /dev/null +++ b/changes/bug5644 @@ -0,0 +1,5 @@ + o Major bugfixes + - Prevent a client-side assertion failure when receiving an + INTRODUCE2 cell by an exit relay, in a general purpose + circuit. Fixes bug 5644; bugfix on tor-0.2.1.6-alpha + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index bb3aacd..a1daa8a 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -909,13 +909,6 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, time_t *access_time; or_options_t *options = get_options(); - tor_assert(circuit->rend_data); - - base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1, - circuit->rend_data->rend_pk_digest, REND_SERVICE_ID_LEN); - log_info(LD_REND, "Received INTRODUCE2 cell for service %s on circ %d.", - escaped(serviceid), circuit->_base.n_circ_id); - if (circuit->_base.purpose != CIRCUIT_PURPOSE_S_INTRO) { log_warn(LD_PROTOCOL, "Got an INTRODUCE2 over a non-introduction circuit %d.", @@ -923,6 +916,13 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, return -1; } + tor_assert(circuit->rend_data); + + base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1, + circuit->rend_data->rend_pk_digest, REND_SERVICE_ID_LEN); + log_info(LD_REND, "Received INTRODUCE2 cell for service %s on circ %d.", + escaped(serviceid), circuit->_base.n_circ_id); + /* min key length plus digest length plus nickname length */ if (request_len < DIGEST_LEN+REND_COOKIE_LEN+(MAX_NICKNAME_LEN+1)+ DH_KEY_LEN+42) {

1 0

[tor/release-0.2.2] Fix a log-uninitialized-buffer bug.
by arma＠torproject.org 23 Apr '12

23 Apr '12

commit f6afd4efa6c24fab8ace710fc0eac4c8811b93dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 23:02:09 2012 -0400 Fix a log-uninitialized-buffer bug. Fix for 5647; bugfix on 0.2.1.5-alpha. --- changes/bug5647 | 4 ++++ src/or/routerparse.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug5647 b/changes/bug5647 new file mode 100644 index 0000000..92f41c8 --- /dev/null +++ b/changes/bug5647 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Avoid logging uninitialized data when unable to decode a hidden + service descriptor cookie. Fixes bug 5647; bugfix on 0.2.1.5-alpha. + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 322a2b5..8c4f582 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5056,7 +5056,6 @@ rend_parse_client_keys(strmap_t *parsed_clients, const char *ckstr) while (!strcmpstart(current_entry, "client-name ")) { rend_authorized_client_t *parsed_entry; size_t len; - char descriptor_cookie_base64[REND_DESC_COOKIE_LEN_BASE64+2+1]; char descriptor_cookie_tmp[REND_DESC_COOKIE_LEN+2]; /* Determine end of string. */ const char *eos = strstr(current_entry, "\nclient-name "); @@ -5125,7 +5124,7 @@ rend_parse_client_keys(strmap_t *parsed_clients, const char *ckstr) tok->args[0], REND_DESC_COOKIE_LEN_BASE64+2+1) != REND_DESC_COOKIE_LEN)) { log_warn(LD_REND, "Descriptor cookie contains illegal characters: " - "%s", descriptor_cookie_base64); + "%s", escaped(tok->args[0])); goto err; } memcpy(parsed_entry->descriptor_cookie, descriptor_cookie_tmp,

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 23 Apr '12

23 Apr '12

commit 5c6a601323e817cbd8e2922053c4d7086459b016 Merge: 1614e00 f6afd4e Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 23 03:39:02 2012 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug5644 | 5 +++++ changes/bug5647 | 4 ++++ src/or/rendservice.c | 14 +++++++------- src/or/routerparse.c | 3 +-- 4 files changed, 17 insertions(+), 9 deletions(-)

1 0

[tor/master] bump to 0.2.3.14-alpha-dev
by arma＠torproject.org 23 Apr '12

23 Apr '12

commit bdd7e2878b642e3ab06a62d9097ae5e7484240e9 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 23 03:34:04 2012 -0400 bump to 0.2.3.14-alpha-dev --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 5cd312c..e2dc0f1 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.14-alpha) +AM_INIT_AUTOMAKE(tor, 0.2.3.14-alpha-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 3773f93..424a1be 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.14-alpha" +!define VERSION "0.2.3.14-alpha-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 6084f1d..b3e579e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -233,7 +233,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.14-alpha" +#define VERSION "0.2.3.14-alpha-dev"

1 0

r25623: {website} new alpha tor version (website/trunk/include)
by Roger Dingledine 23 Apr '12

23 Apr '12

Author: arma Date: 2012-04-23 07:30:09 +0000 (Mon, 23 Apr 2012) New Revision: 25623 Modified: website/trunk/include/versions.wmi Log: new alpha tor version Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-04-23 04:27:55 UTC (rev 25622) +++ website/trunk/include/versions.wmi 2012-04-23 07:30:09 UTC (rev 25623) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.2.35</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.13-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.14-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.35</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.12-alpha</define-tag>

1 0

[tor/master] bump to 0.2.3.14-alpha
by arma＠torproject.org 23 Apr '12

23 Apr '12

commit 987b5d08b2fbb106f7930586052e7854d80a7e18 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 23 03:17:28 2012 -0400 bump to 0.2.3.14-alpha --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index e14d56e..5cd312c 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.13-alpha-dev) +AM_INIT_AUTOMAKE(tor, 0.2.3.14-alpha) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 383a40d..3773f93 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.13-alpha-dev" +!define VERSION "0.2.3.14-alpha" !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 dc27f34..6084f1d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -233,7 +233,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.13-alpha-dev" +#define VERSION "0.2.3.14-alpha"

1 0

[tor/master] give 0.2.3.14-alpha a blurb
by arma＠torproject.org 23 Apr '12

23 Apr '12

commit 9ebf858824796a3d9cb97580d0970c7881b473e7 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 23 03:22:42 2012 -0400 give 0.2.3.14-alpha a blurb --- ChangeLog | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index e92fca0..a89a01a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,23 +1,26 @@ -Changes in version 0.2.3.14-alpha - 2012-04-2? +Changes in version 0.2.3.14-alpha - 2012-04-23 + Tor 0.2.3.14-alpha fixes yet more bugs to get us closer to a release + candidate. It also dramatically speeds up AES: fast relays should + consider switching to the newer OpenSSL library. o Directory authority changes: - Change IP address for ides (v3 directory authority), and rename it to turtles. o Major bugfixes: - - When we start a Tor client with a normal consensus already cached, - be willing to download a microdescriptor consensus. Fixes bug 4011; - fix on 0.2.3.1-alpha. + - Avoid logging uninitialized data when unable to decode a hidden + service descriptor cookie. Fixes bug 5647; bugfix on 0.2.1.5-alpha. + - Avoid a client-side assertion failure when receiving an INTRODUCE2 + cell on a general purpose circuit. Fixes bug 5644; bugfix on + 0.2.1.6-alpha. - If authorities are unable to get a v2 consensus document from other directory authorities, they no longer fall back to fetching them from regular directory caches. Fixes bug 5635; bugfix on 0.2.2.26-beta, where routers stopped downloading v2 consensus documents entirely. - - Avoid a client-side assertion failure when receiving an INTRODUCE2 - cell on a general purpose circuit. Fixes bug 5644; bugfix on - 0.2.1.6-alpha. - - Avoid logging uninitialized data when unable to decode a hidden - service descriptor cookie. Fixes bug 5647; bugfix on 0.2.1.5-alpha. + - When we start a Tor client with a normal consensus already cached, + be willing to download a microdescriptor consensus. Fixes bug 4011; + fix on 0.2.3.1-alpha. o Major features (performance): - When built to use OpenSSL 1.0.1, and built for an x86 or x86_64

1 0

[tor/master] update the torrc.sample timestamp, and clarify socksport 0
by arma＠torproject.org 23 Apr '12

23 Apr '12

commit 770433f19428defec874a5bfe92f646d3058e283 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 23 03:10:40 2012 -0400 update the torrc.sample timestamp, and clarify socksport 0 --- src/config/torrc.sample.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index f128434..a1a08aa 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -1,5 +1,5 @@ ## Configuration file for a typical Tor user -## Last updated 8 February 2012 for Tor 0.2.3.12-alpha. +## Last updated 22 April 2012 for Tor 0.2.3.14-alpha. ## (may or may not work for much older or much newer versions of Tor.) ## ## Lines that begin with "## " try to explain what's going on. Lines @@ -12,9 +12,9 @@ ## Tor will look for this file in various places based on your platform: ## https://www.torproject.org/docs/faq#torrc - -## Replace this with "SocksPort 0" if you plan to run Tor only as a -## relay, and not make any local application connections yourself. +## Tor opens a socks proxy on port 9050 by default -- even if you don't +## configure one below. Set "SocksPort 0" if you plan to run Tor only +## as a relay, and not make any local application connections yourself. #SocksPort 9050 # Default: Bind to localhost:9050 for local connections. #SocksPort 192.168.0.1:9100 # Bind to this adddress:port too.

1 0

[tor/master] fold in remaining changes
by arma＠torproject.org 23 Apr '12

23 Apr '12

commit 56b8597c5e02db3cbfad25dd05479bf30ef71236 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 23 02:36:19 2012 -0400 fold in remaining changes --- ChangeLog | 14 ++++++++++++-- changes/bug4607 | 9 --------- changes/no-listenaddr | 3 --- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9936e91..e92fca0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,11 @@ Changes in version 0.2.3.14-alpha - 2012-04-2? much faster than other AES implementations. o Minor bugfixes (0.2.2.x and earlier): + - Don't launch more than 10 service-side introduction-point circuits + for a hidden service in five minutes. Previously, we would consider + launching more introduction-point circuits if at least one second + had passed without any introduction-point circuits failing. Fixes + bug 4607; bugfix on 0.0.7pre1. - Change the BridgePassword feature (part of the "bridge community" design, which is not yet implemented) to use a time-independent comparison. The old behavior might have allowed an adversary @@ -67,10 +72,15 @@ Changes in version 0.2.3.14-alpha - 2012-04-2? code "??" which means we at least count them. Resolves ticket 5053; improves on 0.2.3.9-alpha. - Update to the April 3 2012 Maxmind GeoLite Country database. - - o Documentation: - Begin a doc/state-contents.txt file to explain the contents of the Tor state file. Fixes bug 2987. + + o Default torrc changes: + - Stop listing "socksport 9050" in torrc.sample. We open a socks + port on 9050 by default anyway, so this should not change anything + in practice. + - Stop mentioning the deprecated *ListenAddress options in + torrc.sample. Fixes bug 5438. - Document unit of bandwidth related options in sample torrc. Fixes bug 5621. diff --git a/changes/bug4607 b/changes/bug4607 deleted file mode 100644 index dd064cc..0000000 --- a/changes/bug4607 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - - Don't launch more than 10 (service-side) introduction-point - circuits for a hidden service in five minutes. Previously, we - would consider launching more introduction-point circuits if at - least one second had passed without any introduction-point - circuits failing. Fixes bug 4607; bugfix on 0.0.7rc1. - - diff --git a/changes/no-listenaddr b/changes/no-listenaddr deleted file mode 100644 index 0097be7..0000000 --- a/changes/no-listenaddr +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation fixes: - - Stop mentioning the deprecated *ListenAddress options in - torrc.sample. Fixes bug 5438.

1 0

[tor/master] Merge remote-tracking branch 'nickm/bug5438'
by arma＠torproject.org 23 Apr '12

23 Apr '12

commit 6718b6e78106a110894654db7bf7cc848e2d04c4 Merge: 54d0cde 548f2e3 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 23 02:03:40 2012 -0400 Merge remote-tracking branch 'nickm/bug5438' changes/no-listenaddr | 3 +++ src/config/torrc.sample.in | 27 ++++++++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-)

1 0