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

[tor/release-0.2.2] Kill non-open OR connections with any data on their inbufs.
by arma＠torproject.org 06 Jun '12

06 Jun '12

commit af54a0182870babec62bf07d067ca82a67c423de Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 31 11:19:35 2012 -0400 Kill non-open OR connections with any data on their inbufs. This fixes a DoS issue where a client could send so much data in 5 minutes that they exhausted the server's RAM. Fix for bug 5934 and 6007. Bugfix on 0.2.0.20-rc, which enabled the v2 handshake. --- changes/bug6007 | 5 +++++ src/or/connection_or.c | 22 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/changes/bug6007 b/changes/bug6007 new file mode 100644 index 0000000..4e81575 --- /dev/null +++ b/changes/bug6007 @@ -0,0 +1,5 @@ + o Major bugfixes (security): + - When waiting for a client to renegotiate, don't allow it to add + any bytes to the input buffer. This fixes a DoS issue. Fix for + bugs 6007 and 5934; bugfix on 0.2.0.20-rc. + diff --git a/src/or/connection_or.c b/src/or/connection_or.c index dc8850e..cb0082b 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -209,7 +209,12 @@ connection_or_reached_eof(or_connection_t *conn) int connection_or_process_inbuf(or_connection_t *conn) { - int ret; + /** Don't let the inbuf of a nonopen OR connection grow beyond this many + * bytes: it's either a broken client, a non-Tor client, or a DOS + * attempt. */ +#define MAX_OR_INBUF_WHEN_NONOPEN 0 + + int ret = 0; tor_assert(conn); switch (conn->_base.state) { @@ -231,8 +236,21 @@ connection_or_process_inbuf(or_connection_t *conn) case OR_CONN_STATE_OR_HANDSHAKING: return connection_or_process_cells_from_inbuf(conn); default: - return 0; /* don't do anything */ + break; /* don't do anything */ } + + if (buf_datalen(conn->_base.inbuf) > MAX_OR_INBUF_WHEN_NONOPEN) { + log_fn(LOG_PROTOCOL_WARN, LD_NET, "Accumulated too much data (%d bytes) " + "on nonopen OR connection %s %s:%u in state %s; closing.", + (int)buf_datalen(conn->_base.inbuf), + connection_or_nonopen_was_started_here(conn) ? "to" : "from", + conn->_base.address, conn->_base.port, + conn_state_to_string(conn->_base.type, conn->_base.state)); + connection_mark_for_close(TO_CONN(conn)); + ret = -1; + } + + return ret; } /** When adding cells to an OR connection's outbuf, keep adding until the

1 0

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

06 Jun '12

commit 4f62f420feb5e5d29ca9db4ea0e486b11023844f Merge: c1414cf 491dc3a Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 5 18:38:32 2012 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug5283 | 6 ++++++ changes/bug5969_022 | 7 +++++++ changes/bug6007 | 5 +++++ changes/bug6033 | 6 ++++++ src/common/compat.h | 5 +++-- src/common/log.c | 7 +++++++ src/common/tortls.c | 15 +++++++++++++++ src/common/util.h | 6 +++++- src/or/circuituse.c | 8 +++++++- src/or/connection_or.c | 22 ++++++++++++++++++++-- src/or/control.c | 16 +++++++++++++--- 11 files changed, 94 insertions(+), 9 deletions(-)

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'public/bug6033' into maint-0.2.2
by arma＠torproject.org 06 Jun '12

06 Jun '12

commit 6d85a796539424882f878ccac5ae4640a6fbb561 Merge: b7e863c 841a8d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 4 11:33:27 2012 -0400 Merge remote-tracking branch 'public/bug6033' into maint-0.2.2 changes/bug6033 | 6 ++++++ src/common/tortls.c | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2
by arma＠torproject.org 06 Jun '12

06 Jun '12

commit 491dc3a601d7c2610503f73192bd1a40bcb37ab2 Merge: 6d85a79 af54a01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 4 11:40:52 2012 -0400 Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2 changes/bug6007 | 5 +++++ src/or/connection_or.c | 22 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-)

1 0

[tor/master] use my time machine to fix the changelog
by arma＠torproject.org 06 Jun '12

06 Jun '12

commit 9ca5fa5984098e2d3750a85b2ed5420517b7250e Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 5 18:36:58 2012 -0400 use my time machine to fix the changelog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index bac46fd..c0cf4c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Changes in version 0.2.3.16-alpha - 2012-06-05 Tor 0.2.3.16-alpha introduces a workaround for a critical renegotiation bug in OpenSSL 1.0.1 (where 20% of the Tor network can't talk to itself - currently). It also fixes a variety of smaller bugs and other cleanups$ + currently). It also fixes a variety of smaller bugs and other cleanups that get us closer to a release candidate. o Major bugfixes (general):

1 0

[tor/master] bump to 0.2.3.16-alpha-dev
by arma＠torproject.org 06 Jun '12

06 Jun '12

commit f136e835d8f98a0508bfa418d01c40f0b73935a3 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 5 18:37:19 2012 -0400 bump to 0.2.3.16-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 5012275..f365b3f 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.16-alpha) +AM_INIT_AUTOMAKE(tor, 0.2.3.16-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 4d01bc1..990301c 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.16-alpha" +!define VERSION "0.2.3.16-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 a544382..b28b732 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.16-alpha" +#define VERSION "0.2.3.16-alpha-dev"

1 0

r25673: {website} 0.2.3.16-alpha tarball is (or at least will be) up (website/trunk/include)
by Roger Dingledine 06 Jun '12

06 Jun '12

Author: arma Date: 2012-06-05 22:31:26 +0000 (Tue, 05 Jun 2012) New Revision: 25673 Modified: website/trunk/include/versions.wmi Log: 0.2.3.16-alpha tarball is (or at least will be) up Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-06-05 13:43:49 UTC (rev 25672) +++ website/trunk/include/versions.wmi 2012-06-05 22:31:26 UTC (rev 25673) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.2.36</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.15-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.16-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.36</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.15-alpha</define-tag>

1 0

[tor/master] add a blurb for 0.2.3.16-alpha
by arma＠torproject.org 06 Jun '12

06 Jun '12

commit e94606a76b98752dac30f366a6eb6877e3438b51 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 5 18:28:52 2012 -0400 add a blurb for 0.2.3.16-alpha --- ChangeLog | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a856bb3..bac46fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ Changes in version 0.2.3.16-alpha - 2012-06-05 + Tor 0.2.3.16-alpha introduces a workaround for a critical renegotiation + bug in OpenSSL 1.0.1 (where 20% of the Tor network can't talk to itself + currently). It also fixes a variety of smaller bugs and other cleanups$ + that get us closer to a release candidate. + o Major bugfixes (general): - Work around a bug in OpenSSL that broke renegotiation with TLS 1.1 and TLS 1.2. Without this workaround, all attempts to speak

1 0

[torbrowser/maint-2.2] Move mingw location to the internal path, so that we are not dependant on the install locations.
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit 360cb483036ab6ea0728f83f897e546f5bcbafaf Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat May 5 00:13:49 2012 +0200 Move mingw location to the internal path, so that we are not dependant on the install locations. --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 0a80f91..ecefc3e 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -17,7 +17,7 @@ BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries -MING=/c/MinGW/bin +MING=/mingw/bin QT_LIB=/c/Qt/$(QT_VER)/bin OPENSSL_LIB=$(COMPILED_BINS) WIX_LIB="/c/Program Files (x86)/Windows Installer XML v3.5/bin"

1 0

[torbrowser/maint-2.2] Linux: Update the Firefox package sequence to a sane variant.
by erinn＠torproject.org 06 Jun '12

06 Jun '12

commit 05d3f1baffd6fd17fa47d847f90b9d60f0eca1ef Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat Jun 2 11:53:27 2012 +0200 Linux: Update the Firefox package sequence to a sane variant. --- build-scripts/linux.mk | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index ef72f13..81b0888 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -85,15 +85,12 @@ build-pidgin: build-firefox: config/dot_mozconfig $(FIREFOX_DIR) cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official - cd $(FIREFOX_DIR) && make -f client.mk build + cd $(FIREFOX_DIR) && make -f client.mk build package INNER_MAKE_PACKAGE=true touch $(STAMP_DIR)/build-firefox copy-firefox: -rm -rf $(BUILD_DIR)/Firefox - ## This is so ugly. Update it to use cool tar --transform soon. - cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-*/ package - cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(BUILD_DIR) - cd $(BUILD_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox + cp -r $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/firefox/* $(BUILD_DIR)/Firefox build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right."

1 0