- tor-commits - lists.torproject.org

[tor/release-0.2.2] add a changes file for ticket 4825
by arma＠torproject.org 05 Jan '12

05 Jan '12

commit df17b62d54fb11949ec581dedc5dc03673edcfae Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jan 5 06:42:26 2012 -0500 add a changes file for ticket 4825 --- changes/geoip-january2012 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/geoip-january2012 b/changes/geoip-january2012 new file mode 100644 index 0000000..2f4180e --- /dev/null +++ b/changes/geoip-january2012 @@ -0,0 +1,3 @@ + o Minor features: + - Update to the January 3 2012 Maxmind GeoLite Country database. +

1 0

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

05 Jan '12

commit a1074c7aa2afab595d434c52754ee47cec404189 Merge: d861b4c df17b62 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jan 5 06:45:28 2012 -0500 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-january2012 | 3 + src/config/geoip | 9630 ++++++++++++++++++++++++--------------------- 2 files changed, 5096 insertions(+), 4537 deletions(-)

1 0

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

05 Jan '12

commit 98402d0865b70fc9b920c21f196b5f1b3a499938 Merge: 1208c17 a1074c7 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jan 5 06:46:01 2012 -0500 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug1240 | 8 + changes/bug4786 | 9 + changes/bug4788 | 6 + changes/bug4803 | 4 + changes/clang_30_options | 5 + changes/geoip-january2012 | 3 + changes/timersub_bug | 7 + configure.in | 10 +- src/common/compat.h | 4 +- src/config/geoip | 9630 ++++++++++++++++++++++++--------------------- src/or/connection.c | 29 +- src/or/dirserv.c | 23 +- src/or/relay.c | 4 - 13 files changed, 5164 insertions(+), 4578 deletions(-)

1 0

[tor/release-0.2.2] Build with warnings and clang 3.0
by arma＠torproject.org 05 Jan '12

05 Jan '12

commit bcca541da9f60d95fe7f0f7b3aa6ef4a8251b1e2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Dec 12 15:36:08 2011 +0100 Build with warnings and clang 3.0 --enable-gcc-warnings enables two warnings that clang doesn't support, so the build fails. We had hoped clang 3.0 would add those, but it didn't, so let's just always disable those warnings when building with clang. We can still fix it later once they add support --- changes/clang_30_options | 5 +++++ configure.in | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changes/clang_30_options b/changes/clang_30_options new file mode 100644 index 0000000..e8e34c8 --- /dev/null +++ b/changes/clang_30_options @@ -0,0 +1,5 @@ + o Code simplifications and refactoring: + - During configure, detect when we're building with clang version 3.0 or + lower and disable the -Wnormalized=id and -Woverride-init CFLAGS. + clang doesn't support them yet. + diff --git a/configure.in b/configure.in index a9339cc..424cccb 100644 --- a/configure.in +++ b/configure.in @@ -940,10 +940,10 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy #error #endif])], have_gcc43=yes, have_gcc43=no) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ -#if !defined(__clang__) || (__clang_major__ > 2) || (__clang_major__ == 2 && __clang_minor__ > 9) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ +#if !defined(__clang__) #error -#endif])], have_clang29orlower=yes, have_clang29orlower=no) +#endif])], have_clang=yes, have_clang=no) save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wshorten-64-to-32" @@ -980,10 +980,8 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3. fi - if test x$have_gcc42 = xyes && test x$have_clang29orlower = xno; then + if test x$have_gcc42 = xyes && test x$have_clang = xno; then # These warnings break gcc 4.0.2 and clang, but work on gcc 4.2 - # We only disable these for clang 2.9 and lower, in case they are - # supported in later versions. CFLAGS="$CFLAGS -Wnormalized=id -Woverride-init" fi

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'sebastian/clang-3.0-fixes_022' into maint-0.2.2
by arma＠torproject.org 05 Jan '12

05 Jan '12

commit cefff11950d0b80de02bc956d5eb21ceeb81260c Merge: 562c974 bcca541 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 16 17:49:41 2011 -0500 Merge remote-tracking branch 'sebastian/clang-3.0-fixes_022' into maint-0.2.2 changes/clang_30_options | 5 +++++ configure.in | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/release-0.2.2] Do not even try to keep going on a socket with socklen==0
by arma＠torproject.org 05 Jan '12

05 Jan '12

commit b5e6bbc01dc5d89285aba8a1440a2f5833e531a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 14:37:52 2011 -0500 Do not even try to keep going on a socket with socklen==0 Back in #1240, r1eo linked to information about how this could happen with older Linux kernels in response to nmap. Bugs #4545 and #4547 are about how our approach to trying to deal with this condition was broken and stupid. Thanks to wanoskarnet for reminding us about #1240. This is a fix for the abovementioned bugs, and is a bugfix on 0.1.0.3-rc. --- changes/bug1240 | 8 ++++++++ src/or/connection.c | 27 ++++++++++----------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/changes/bug1240 b/changes/bug1240 new file mode 100644 index 0000000..6570664 --- /dev/null +++ b/changes/bug1240 @@ -0,0 +1,8 @@ + o Minor bugfixes: + - When running with an older Linux kernel that erroneously responds + to strange nmap behavior by having accept() return successfully + with a zero-length socket, just close the connection. Previously, + we would try harder to learn the remote address: but there was no + such remote address to learn, and our method for trying to learn + it was incorrect. Fixes bugs #1240, #4745, and #4747. Bugfix on + 0.1.0.3-rc. Reported and diagnosed by "r1eo". diff --git a/src/or/connection.c b/src/or/connection.c index 2049f42..d36a37a 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1076,7 +1076,12 @@ connection_create_listener(const struct sockaddr *listensockaddr, } /** Do basic sanity checking on a newly received socket. Return 0 - * if it looks ok, else return -1. */ + * if it looks ok, else return -1. + * + * Notably, some TCP stacks can erroneously have accept() return successfully + * with socklen 0, when the client sends an RST before the accept call (as + * nmap does). We want to detect that, and not go on with the connection. + */ static int check_sockaddr(struct sockaddr *sa, int len, int level) { @@ -1142,7 +1147,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) tor_socket_t news; /* the new socket */ connection_t *newconn; /* information about the remote peer when connecting to other routers */ - char addrbuf[256]; + char addrbuf[256]; /*XXX023 use sockaddr_storage instead*/ struct sockaddr *remote = (struct sockaddr*)addrbuf; /* length of the remote address. Must be whatever accept() needs. */ socklen_t remotelen = (socklen_t)sizeof(addrbuf); @@ -1186,21 +1191,9 @@ connection_handle_listener_read(connection_t *conn, int new_type) uint16_t port; if (check_sockaddr(remote, remotelen, LOG_INFO)<0) { log_info(LD_NET, - "accept() returned a strange address; trying getsockname()."); - remotelen=sizeof(addrbuf); - memset(addrbuf, 0, sizeof(addrbuf)); - if (getsockname(news, remote, &remotelen)<0) { - int e = tor_socket_errno(news); - log_warn(LD_NET, "getsockname() for new connection failed: %s", - tor_socket_strerror(e)); - } else { - if (check_sockaddr((struct sockaddr*)addrbuf, remotelen, - LOG_WARN) < 0) { - log_warn(LD_NET,"Something's wrong with this conn. Closing it."); - tor_close_socket(news); - return 0; - } - } + "accept() returned a strange address; closing connection."); + tor_close_socket(news); + return 0; } if (check_sockaddr_family_match(remote->sa_family, conn) < 0) {

1 0

[tor/release-0.2.2] Provide correct timeradd/timersup replacements
by arma＠torproject.org 05 Jan '12

05 Jan '12

commit da876aec63b133b64eb6e71f8b87df5c84e7ec3b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Dec 25 23:19:08 2011 +0100 Provide correct timeradd/timersup replacements Bug caught and patch provided by Vektor. Fixes bug 4778.t --- changes/timersub_bug | 7 +++++++ src/common/compat.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/timersub_bug b/changes/timersub_bug new file mode 100644 index 0000000..9183862 --- /dev/null +++ b/changes/timersub_bug @@ -0,0 +1,7 @@ + o Major bugfixes: + - Provide correct replacements for the timeradd() and timersub() functions + for platforms that lack them (for example, windows). The timersub() + function is used when expiring circuits, timeradd() is currently unused. + Patch written by Vektor, who also reported the bug. Thanks! Bugfix + on 0.2.2.24-alpha/0.2.3.1-alpha, fixes bug 4778. + diff --git a/src/common/compat.h b/src/common/compat.h index 3e1b5b8..e0b074c 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -334,7 +334,7 @@ struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); #define timeradd(tv1,tv2,tvout) \ do { \ (tvout)->tv_sec = (tv1)->tv_sec + (tv2)->tv_sec; \ - (tvout)->tv_usec = (tv2)->tv_usec + (tv2)->tv_usec; \ + (tvout)->tv_usec = (tv1)->tv_usec + (tv2)->tv_usec; \ if ((tvout)->tv_usec >= 1000000) { \ (tvout)->tv_usec -= 1000000; \ (tvout)->tv_sec++; \ @@ -348,7 +348,7 @@ struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); #define timersub(tv1,tv2,tvout) \ do { \ (tvout)->tv_sec = (tv1)->tv_sec - (tv2)->tv_sec; \ - (tvout)->tv_usec = (tv2)->tv_usec - (tv2)->tv_usec; \ + (tvout)->tv_usec = (tv1)->tv_usec - (tv2)->tv_usec; \ if ((tvout)->tv_usec < 0) { \ (tvout)->tv_usec += 1000000; \ (tvout)->tv_sec--; \

1 0

[tor/release-0.2.2] Authorities reject insecure Tors.
by arma＠torproject.org 05 Jan '12

05 Jan '12

commit 9bcb18738747e12629c38ae366b96993e2002859 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 27 21:47:04 2011 -0500 Authorities reject insecure Tors. This patch should make us reject every Tor that was vulnerable to CVE-2011-0427. Additionally, it makes us reject every Tor that couldn't handle RELAY_EARLY cells, which helps with proposal 110 (#4339). --- changes/bug4788 | 6 ++++++ src/or/dirserv.c | 23 ++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/changes/bug4788 b/changes/bug4788 new file mode 100644 index 0000000..d65c001 --- /dev/null +++ b/changes/bug4788 @@ -0,0 +1,6 @@ + o Minor features (directory server): + - Directory servers now reject versions of Tor older than 0.2.1.30, + and Tor versions between 0.2.2.1-alpha and 0.2.2.20-alpha + (inclusive). These versions accounted for only a small fraction of + the Tor network, and have numerous known security issues. Resolves + issue #4788. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 634b3ec..0308d4d 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -388,19 +388,20 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, strmap_size(fingerprint_list->fp_by_name), digestmap_size(fingerprint_list->status_by_digest)); - /* Tor 0.2.0.26-rc is the oldest version that currently caches the right - * directory information. Once more of them die off, we should raise this - * minimum. */ - if (platform && !tor_version_as_new_as(platform,"0.2.0.26-rc")) { + /* Versions before Tor 0.2.1.30 have known security issues that + * make them unsuitable for the current network. */ + if (platform && !tor_version_as_new_as(platform,"0.2.1.30")) { if (msg) - *msg = "Tor version is far too old to work."; - return FP_REJECT; - } else if (platform && tor_version_as_new_as(platform,"0.2.1.3-alpha") - && !tor_version_as_new_as(platform, "0.2.1.19")) { - /* These versions mishandled RELAY_EARLY cells on rend circuits. */ - if (msg) - *msg = "Tor version is too buggy to work."; + *msg = "Tor version is insecure. Please upgrade!"; return FP_REJECT; + } else if (platform && tor_version_as_new_as(platform,"0.2.2.1-alpha")) { + /* Versions from 0.2.2.1-alpha...0.2.2.20-alpha have known security + * issues that make them unusable for the current network */ + if (!tor_version_as_new_as(platform, "0.2.2.21-alpha")) { + if (msg) + *msg = "Tor version is insecure. Please upgrade!"; + return FP_REJECT; + } } result = dirserv_get_name_status(id_digest, nickname);

1 0

[tor/release-0.2.2] Bug 4786 fix: don't convert EARLY to RELAY on v1 connections
by arma＠torproject.org 05 Jan '12

05 Jan '12

commit 120a7453465260ddf84770ed1e5e289afe1b14b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 27 16:41:25 2011 -0500 Bug 4786 fix: don't convert EARLY to RELAY on v1 connections We used to do this as a workaround for older Tors, but now it's never the correct thing to do (especially since anything that didn't understand RELAY_EARLY is now deprecated hard). --- changes/bug4786 | 9 +++++++++ src/or/relay.c | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug4786 b/changes/bug4786 new file mode 100644 index 0000000..7c1c60f --- /dev/null +++ b/changes/bug4786 @@ -0,0 +1,9 @@ + - Feature removal: + - When sending or relaying a RELAY_EARLY cell, we used to convert + it to a RELAY cell if the connection was using the v1 link + protocol. This was a workaround for older versions of Tor, which + didn't handle RELAY_EARLY cells properly. Now that all supported + versions can handle RELAY_EARLY cells, and now that we're + enforcing the "no RELAY_EXTEND commands except in RELAY_EARLY + cells" rule, we're removing this workaround. Addresses bug 4786. + diff --git a/src/or/relay.c b/src/or/relay.c index 59e2c5c..272deb1 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1858,10 +1858,6 @@ append_cell_to_circuit_queue(circuit_t *circ, or_connection_t *orconn, queue = &orcirc->p_conn_cells; streams_blocked = circ->streams_blocked_on_p_conn; } - if (cell->command == CELL_RELAY_EARLY && orconn->link_proto < 2) { - /* V1 connections don't understand RELAY_EARLY. */ - cell->command = CELL_RELAY; - } cell_queue_append_packed_copy(queue, cell);

1 0

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

05 Jan '12

commit c563551eefefdf5a8e5e32feb1ca84a517770fda Merge: da876ae 120a745 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 28 15:56:37 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug4786 | 9 +++++++++ src/or/relay.c | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0