- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Log at info level when disabling SSLv3
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit 4752b348793f599cbdc93d0503d18def03e45c7a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jan 4 20:41:28 2012 -0800 Log at info level when disabling SSLv3 --- src/common/tortls.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 22b0e31..d88a59b 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -771,6 +771,12 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, (SSLeay() >= 0x00909000L && SSLeay() < 0x1000006fL)) { /* And not SSL3 if it's subject to CVE-2011-4657. */ + log_info(LD_NET, "Disabling SSLv3 because this OpenSSL version " + "might otherwise be vulnerable to CVE-2011-4657 " + "(compile-time version %08lx (%s); " + "runtime version %08lx (%s))", + OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + SSLeay(), SSLeay_version(SSLEAY_VERSION)); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); }

1 0

[tor/maint-0.2.2] Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit b839ace7d092fe073b66a2d7d329644e82ec843b Merge: df17b62 4752b34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 5 14:11:42 2012 -0500 Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1 changes/bug4822 | 13 +++++++++++++ src/common/tortls.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit ccd8289958b6d81cd5575c15dc6c1218d8ecb2d0 Merge: a1074c7 b839ace Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 5 14:16:30 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug4822 | 13 +++++++++++++ src/common/tortls.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.1] Log at info level when disabling SSLv3
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit 4752b348793f599cbdc93d0503d18def03e45c7a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jan 4 20:41:28 2012 -0800 Log at info level when disabling SSLv3 --- src/common/tortls.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 22b0e31..d88a59b 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -771,6 +771,12 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, (SSLeay() >= 0x00909000L && SSLeay() < 0x1000006fL)) { /* And not SSL3 if it's subject to CVE-2011-4657. */ + log_info(LD_NET, "Disabling SSLv3 because this OpenSSL version " + "might otherwise be vulnerable to CVE-2011-4657 " + "(compile-time version %08lx (%s); " + "runtime version %08lx (%s))", + OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + SSLeay(), SSLeay_version(SSLEAY_VERSION)); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); }

1 0

[tor/maint-0.2.1] Add a changes file for bug4822
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit 0a00678e56ec3030b9028a7188f68ab6c10a3fa3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 4 21:17:52 2012 -0500 Add a changes file for bug4822 --- changes/bug4822 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/changes/bug4822 b/changes/bug4822 new file mode 100644 index 0000000..73f43f0 --- /dev/null +++ b/changes/bug4822 @@ -0,0 +1,13 @@ + o Major security workaround: + - When building or running with any version of OpenSSL earlier + than 0.9.8s or 1.0.0f, disable SSLv3 support. These versions had + a bug (CVE-2011-4576) in which their block cipher padding + included uninitialized data, potentially leaking sensitive + information to any peer with whom they made a SSLv3 + connection. Tor does not use SSL v3 by default, but a hostile + client or server could force an SSLv3 connection in order to + gain information that they shouldn't have been able to get. The + best solution here is to upgrade to OpenSSL 0.9.8s or 1.0.0f (or + later). But when building or running with a non-upgraded + OpenSSL, we should instead make sure that the bug can't happen + by disabling SSLv3 entirely.

1 0

[tor/maint-0.2.1] Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit b839ace7d092fe073b66a2d7d329644e82ec843b Merge: df17b62 4752b34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 5 14:11:42 2012 -0500 Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1 changes/bug4822 | 13 +++++++++++++ src/common/tortls.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.1] Disable SSLv3 when using a not-up-to-date openssl
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit db78fe45898a6d03727f8db68642bfebdfc10bf8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 4 17:15:50 2012 -0500 Disable SSLv3 when using a not-up-to-date openssl This is to address bug 4822, and CVE-2011-4576. --- src/common/tortls.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index cc805f8..22b0e31 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -64,6 +64,16 @@ #define ADDR(tls) (((tls) && (tls)->address) ? tls->address : "peer") +#if (OPENSSL_VERSION_NUMBER < 0x0090813fL || \ + (OPENSSL_VERSION_NUMBER >= 0x00909000L && \ + OPENSSL_VERSION_NUMBER < 0x1000006fL)) +/* This is a version of OpenSSL before 0.9.8s/1.0.0f. It does not have + * the CVE-2011-4657 fix, and as such it can't use RELEASE_BUFFERS and + * SSL3 safely at the same time. + */ +#define DISABLE_SSL3_HANDSHAKE +#endif + /* We redefine these so that we can run correctly even if the vendor gives us * a version of OpenSSL that does not match its header files. (Apple: I am * looking at you.) @@ -739,16 +749,31 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, result->key = crypto_pk_dup_key(rsa); } -#ifdef EVERYONE_HAS_AES - /* Tell OpenSSL to only use TLS1 */ +#if 0 + /* Tell OpenSSL to only use TLS1. This would actually break compatibility + * with clients that are configured to use SSLv23_method(), so we should + * probably never use it. + */ if (!(result->ctx = SSL_CTX_new(TLSv1_method()))) goto error; -#else +#endif + /* Tell OpenSSL to use SSL3 or TLS1 but not SSL2. */ if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); + + if ( +#ifdef DISABLE_SSL3_HANDSHAKE + 1 || #endif + SSLeay() < 0x0090813fL || + (SSLeay() >= 0x00909000L && + SSLeay() < 0x1000006fL)) { + /* And not SSL3 if it's subject to CVE-2011-4657. */ + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); + } + SSL_CTX_set_options(result->ctx, SSL_OP_SINGLE_DH_USE); #ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION

1 0

r25286: {website} get all the expert bundle versions (in website/trunk: . download/en)
by Erinn Clark 05 Jan '12

05 Jan '12

Author: erinn Date: 2012-01-05 18:46:55 +0000 (Thu, 05 Jan 2012) New Revision: 25286 Modified: website/trunk/Makefile website/trunk/download/en/download.wml website/trunk/publish Log: get all the expert bundle versions Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-01-05 18:40:50 UTC (rev 25285) +++ website/trunk/Makefile 2012-01-05 18:46:55 UTC (rev 25286) @@ -2,7 +2,7 @@ # # 1. Clone the Tor git repository and make TORGIT point to it: # -# git clone git://git.torproject.org/tor/ tor.git +# git clone git://git.torproject.org/tor/ tor # # Note that you will need to point to the actual .git directory. # 2. Edit include/versions.wmi or others if you like @@ -10,9 +10,9 @@ # 4. make # 5. ./publish -export TORGIT=set this to your tor.git path -export STABLETAG=tor-0.2.2.35 -export DEVTAG=tor-0.2.3.10-alpha +export TORGIT=/Users/erinn/src/tor.git/.git +export STABLETAG=tor-0.2.2.24-alpha +export DEVTAG=tor-0.2.2.24-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2012-01-05 18:40:50 UTC (rev 25285) +++ website/trunk/download/en/download.wml 2012-01-05 18:46:55 UTC (rev 25286) @@ -115,11 +115,11 @@  <div class="package"> <div class="downloads"> - <a class="button" href="../dist/win32/tor-<version-win32-stable>-win32.exe"><span class="strong">Download</span><span class="normal">Expert Bundle</span></a> + <a class="button" href="../dist/win32/tor-<version-win32-stable>-win32-1.exe"><span class="strong">Download</span><span class="normal">Expert Bundle</span></a> <div class="sig"> (<a href="../dist/win32/tor-<version-win32-stable>-win32-1.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - <a class="additional" href="../dist/win32/tor-<version-win32-alpha>-win32-1.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>) + <a class="additional" href="../dist/win32/tor-<version-win32-alpha>-win32-1.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32-1.exe.asc">sig</a>) </div> <h2>Expert Bundle</h2> Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-01-05 18:40:50 UTC (rev 25285) +++ website/trunk/publish 2012-01-05 18:46:55 UTC (rev 25286) @@ -1,13 +1,7 @@ #!/bin/sh set -e # stop if we encounter an error -# pull the latest changes svn update - -# clean up the working directory -make clean - -# actually build the site make -j3 # don't copy over stuff with permissions that make it useless

1 0

r25285: {website} update tor expert bundle version (website/trunk/download/en)
by Erinn Clark 05 Jan '12

05 Jan '12

Author: erinn Date: 2012-01-05 18:40:50 +0000 (Thu, 05 Jan 2012) New Revision: 25285 Modified: website/trunk/download/en/download.wml Log: update tor expert bundle version Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2012-01-05 17:20:18 UTC (rev 25284) +++ website/trunk/download/en/download.wml 2012-01-05 18:40:50 UTC (rev 25285) @@ -117,9 +117,9 @@ <div class="downloads"> <a class="button" href="../dist/win32/tor-<version-win32-stable>-win32.exe"><span class="strong">Download</span><span class="normal">Expert Bundle</span></a> <div class="sig"> - (<a href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a href="../dist/win32/tor-<version-win32-stable>-win32-1.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - <a class="additional" href="../dist/win32/tor-<version-win32-alpha>-win32.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>) + <a class="additional" href="../dist/win32/tor-<version-win32-alpha>-win32-1.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>) </div> <h2>Expert Bundle</h2>

1 0

[stem/master] Tidying up lower runlevel logging
by atagar＠torproject.org 05 Jan '12

05 Jan '12

commit 4788095929ab2a3bfde04ade0b2cdf52fe82dc82 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 3 18:52:14 2012 -0800 Tidying up lower runlevel logging Cleaning up the log output for DEBUG and INFO runlevels we encounter when running the unit tests to be more helpful and user friendly. --- run_tests.py | 4 +-- stem/connection.py | 2 +- stem/socket.py | 34 +++++++++++++++++++++---------- stem/util/log.py | 1 + stem/util/system.py | 2 +- test/unit/connection/authentication.py | 9 ++++++++ 6 files changed, 36 insertions(+), 16 deletions(-) diff --git a/run_tests.py b/run_tests.py index 280b05e..c0ab23d 100755 --- a/run_tests.py +++ b/run_tests.py @@ -8,7 +8,6 @@ import os import sys import time import getopt -import logging import unittest import StringIO @@ -208,10 +207,9 @@ if __name__ == '__main__': test.output.colorize, ) - stem_logger = logging.getLogger("stem") + stem_logger = log.get_logger() logging_buffer = test.output.LogBuffer(log.logging_level(logging_runlevel)) stem_logger.addHandler(logging_buffer) - stem_logger.setLevel(logging.DEBUG) if run_unit_tests: print_divider("UNIT TESTS", True) diff --git a/stem/connection.py b/stem/connection.py index 37578cf..5c1fc55 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -795,7 +795,7 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): else: unknown_auth_methods.append(method) message_id = "stem.connection.unknown_auth_%s" % method - log.log_once(message_id, log.INFO, "PROTOCOLINFO response had an unrecognized authentication method: %s" % method) + log.log_once(message_id, log.INFO, "PROTOCOLINFO response included a type of authentication that we don't recognize: %s" % method) # our auth_methods should have a single AuthMethod.UNKNOWN entry if # any unknown authentication methods exist diff --git a/stem/socket.py b/stem/socket.py index b2bde2b..d383d35 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -690,6 +690,7 @@ def recv_message(control_file): """ parsed_content, raw_content = [], "" + logging_prefix = "Error while receiving a control message (%s): " while True: try: line = control_file.readline() @@ -697,13 +698,15 @@ def recv_message(control_file): # if the control_file has been closed then we will receive: # AttributeError: 'NoneType' object has no attribute 'recv' - log.info("SocketClosed: socket file has been closed") + prefix = logging_prefix % "SocketClosed" + log.info(prefix + "socket file has been closed") raise SocketClosed("socket file has been closed") except socket.error, exc: # when disconnected we get... # socket.error: [Errno 107] Transport endpoint is not connected - log.info("SocketClosed: received an exception (%s)" % exc) + prefix = logging_prefix % "SocketClosed" + log.info(prefix + "received exception \"%s\"" % exc) raise SocketClosed(exc) raw_content += line @@ -715,16 +718,20 @@ def recv_message(control_file): # if the socket is disconnected then the readline() method will provide # empty content - log.info("SocketClosed: empty socket content") + prefix = logging_prefix % "SocketClosed" + log.info(prefix + "empty socket content") raise SocketClosed("Received empty socket content.") elif len(line) < 4: - log.info("ProtocolError: line too short (%s)" % log.escape(line)) + prefix = logging_prefix % "ProtocolError" + log.info(prefix + "line too short, \"%s\"" % log.escape(line)) raise ProtocolError("Badly formatted reply line: too short") elif not re.match(r'^[a-zA-Z0-9]{3}[-+ ]', line): - log.info("ProtocolError: malformed status code/divider (%s)" % log.escape(line)) + prefix = logging_prefix % "ProtocolError" + log.info(prefix + "malformed status code/divider, \"%s\"" % log.escape(line)) raise ProtocolError("Badly formatted reply line: beginning is malformed") elif not line.endswith("\r\n"): - log.info("ProtocolError: no CRLF linebreak (%s)" % log.escape(line)) + prefix = logging_prefix % "ProtocolError" + log.info(prefix + "no CRLF linebreak, \"%s\"" % log.escape(line)) raise ProtocolError("All lines should end with CRLF") line = line[:-2] # strips off the CRLF @@ -740,7 +747,7 @@ def recv_message(control_file): # uses a newline divider if this is a multi-line message (more readable) log_message = raw_content.replace("\r\n", "\n").rstrip() div = "\n" if "\n" in log_message else " " - log.debug("Received:" + div + log_message) + log.trace("Received from Tor:" + div + log_message) return ControlMessage(parsed_content, raw_content) elif divider == "+": @@ -749,12 +756,16 @@ def recv_message(control_file): while True: try: line = control_file.readline() - except socket.error, exc: raise SocketClosed(exc) + except socket.error, exc: + prefix = logging_prefix % "SocketClosed" + log.info(prefix + "received an exception while mid-way through a data reply (exception: \"%s\", read content: \"%s\")" % (exc, log.escape(raw_content))) + raise SocketClosed(exc) raw_content += line if not line.endswith("\r\n"): - log.info("ProtocolError: no CRLF linebreak for data entry (%s)" % log.escape(line)) + prefix = logging_prefix % "ProtocolError" + log.info(prefix + "CRLF linebreaks missing from a data reply, \"%s\"" % log.escape(raw_content)) raise ProtocolError("All lines should end with CRLF") elif line == ".\r\n": break # data block termination @@ -775,8 +786,9 @@ def recv_message(control_file): else: # this should never be reached due to the prefix regex, but might as well # be safe... - log.warn("ProtocolError: unrecognized divider type (%s)" % line) - raise ProtocolError("Unrecognized type '%s': %s" % (divider, line)) + prefix = logging_prefix % "ProtocolError" + log.warn(prefix + "\"%s\" isn't a recognized divider type" % line) + raise ProtocolError("Unrecognized divider type '%s': %s" % (divider, line)) def send_formatting(message): """ diff --git a/stem/util/log.py b/stem/util/log.py index de84ead..fc4244f 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -36,6 +36,7 @@ LOG_VALUES = { } LOGGER = logging.getLogger("stem") +LOGGER.setLevel(LOG_VALUES[TRACE]) # There's some messages that we don't want to log more than once. This set has # the messages IDs that we've logged which fall into this category. diff --git a/stem/util/system.py b/stem/util/system.py index aa1180e..40d0669 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -245,7 +245,7 @@ def get_pid_by_name(process_name): pid = results[0].strip() if pid.isdigit(): return int(pid) - log.debug("failed to resolve a pid for %s" % process_name) + log.debug("failed to resolve a pid for '%s'" % process_name) return None def get_pid_by_port(port): diff --git a/test/unit/connection/authentication.py b/test/unit/connection/authentication.py index 729e6c7..ba56ccd 100644 --- a/test/unit/connection/authentication.py +++ b/test/unit/connection/authentication.py @@ -7,6 +7,7 @@ import functools import unittest import stem.connection +import stem.util.log as log # Functors to replace get_protocolinfo and authenticate_*. All of them take any # number of arguments. @@ -106,6 +107,11 @@ class TestAuthenticate(unittest.TestCase): subclass being raised. """ + # mute the logger for this test since otherwise the output is overwhelming + + stem_logger = log.get_logger() + stem_logger.setLevel(log.logging_level(None)) + # exceptions that the authentication functions are documented to raise auth_none_exc_types = (None, stem.connection.OpenAuthRejected) @@ -151,4 +157,7 @@ class TestAuthenticate(unittest.TestCase): stem.connection.authenticate(None, "blah", protocolinfo_input) else: self.assertRaises(stem.connection.AuthenticationFailure, stem.connection.authenticate, None, "blah", protocolinfo_input) + + # revert logging back to normal + stem_logger.setLevel(log.logging_level(log.TRACE))

1 0