- tor-commits - lists.torproject.org

[tor/master] Fix some dead code in tortls.c
by nickm＠torproject.org 18 Dec '15

18 Dec '15

commit 9e2c4ee557a499a0fa6b12f5912cef4fccc46e5a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 18 10:04:01 2015 -0500 Fix some dead code in tortls.c If SSL_CIPHER_find exists, then we won't use either of the two kludges that would replace it. Found by Coverity; fixes CID 1340256. --- src/common/tortls.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index b1d3f6f..a1facec 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1322,7 +1322,8 @@ find_cipher_by_id(const SSL *ssl, const SSL_METHOD *m, uint16_t cipher) tor_assert((SSL_CIPHER_get_id(c) & 0xffff) == cipher); return c != NULL; } -#elif defined(HAVE_STRUCT_SSL_METHOD_ST_GET_CIPHER_BY_CHAR) +#else +#if defined(HAVE_STRUCT_SSL_METHOD_ST_GET_CIPHER_BY_CHAR) if (m && m->get_cipher_by_char) { unsigned char cipherid[3]; set_uint16(cipherid, htons(cipher)); @@ -1333,7 +1334,7 @@ find_cipher_by_id(const SSL *ssl, const SSL_METHOD *m, uint16_t cipher) if (c) tor_assert((c->id & 0xffff) == cipher); return c != NULL; - } else + } #endif #if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) if (m && m->get_cipher && m->num_ciphers) { @@ -1351,6 +1352,7 @@ find_cipher_by_id(const SSL *ssl, const SSL_METHOD *m, uint16_t cipher) return 0; } #endif +#endif (void) ssl; (void) m; (void) cipher;

1 0

[tor/master] Fix remaining memory leaks in unit tests.
by nickm＠torproject.org 18 Dec '15

18 Dec '15

commit 2e74d182b2a10a32efd7203e9e430d9b431397c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 18 09:58:14 2015 -0500 Fix remaining memory leaks in unit tests. --- src/test/test_tortls.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 8602d9e..1bb70ad 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -1128,7 +1128,9 @@ test_tortls_check_lifetime(void *ignored) ret = tor_tls_check_lifetime(LOG_WARN, tls, 0, 0); tt_int_op(ret, OP_EQ, 0); + ASN1_STRING_free(validCert->cert_info->validity->notBefore); validCert->cert_info->validity->notBefore = ASN1_TIME_set(NULL, now-10); + ASN1_STRING_free(validCert->cert_info->validity->notAfter); validCert->cert_info->validity->notAfter = ASN1_TIME_set(NULL, now+60); ret = tor_tls_check_lifetime(LOG_WARN, tls, 0, -1000); @@ -1454,17 +1456,21 @@ test_tortls_try_to_extract_certs_from_tls(void *ignored) try_to_extract_certs_from_tls(LOG_WARN, tls, &cert, &id_cert); tt_assert(cert == c1); tt_assert(!id_cert); + X509_free(cert); /* decrease refcnt */ sess->cert_chain = sk_X509_new_null(); try_to_extract_certs_from_tls(LOG_WARN, tls, &cert, &id_cert); tt_assert(cert == c1); tt_assert(!id_cert); + X509_free(cert); /* decrease refcnt */ sk_X509_push(sess->cert_chain, c1); sk_X509_push(sess->cert_chain, c2); try_to_extract_certs_from_tls(LOG_WARN, tls, &cert, &id_cert); tt_assert(cert == c1); tt_assert(id_cert); + X509_free(cert); /* decrease refcnt */ + X509_free(id_cert); /* decrease refcnt */ done: sk_X509_free(sess->cert_chain); @@ -1472,6 +1478,8 @@ test_tortls_try_to_extract_certs_from_tls(void *ignored) tor_free(tls->ssl->session); tor_free(tls->ssl); tor_free(tls); + X509_free(c1); + X509_free(c2); } #endif

1 0

[tor/master] Add zlib path when linking the switch_id test
by nickm＠torproject.org 18 Dec '15

18 Dec '15

commit 6598581d8163516f4879f5cb3c563dae10de80d1 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Dec 18 10:04:06 2015 +0100 Add zlib path when linking the switch_id test --- src/test/include.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/include.am b/src/test/include.am index d52867b..a6663dc 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -143,6 +143,7 @@ src_test_test_switch_id_SOURCES = \ src/test/test_switch_id.c src_test_test_switch_id_CPPFLAGS= $(src_test_AM_CPPFLAGS) src_test_test_switch_id_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) +src_test_test_switch_id_LDFLAGS = @TOR_LDFLAGS_zlib@ src_test_test_switch_id_LDADD = \ src/common/libor-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@

1 0

[webwml/master] Add new TBB version
by gk＠torproject.org 18 Dec '15

18 Dec '15

commit feae0d1904e8f52e5c3f33e19e480fa7f0c94154 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 18 12:10:03 2015 +0000 Add new TBB version --- projects/torbrowser/RecommendedTBBVersions | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 49b35e9..82c8ee9 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -16,5 +16,7 @@ "5.5a5-MacOS", "5.5a5-Windows", "5.5a4-hardened", -"5.5a4-hardened-Linux" +"5.5a4-hardened-Linux", +"5.5a5-hardened", +"5.5a5-hardened-Linux" ]

1 0

[webwml/master] Add new TBB version, remove 5.0.4
by gk＠torproject.org 18 Dec '15

18 Dec '15

commit db011e5aca9e9a9032ab3fbc6894e715c1eba8b0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 18 11:50:51 2015 +0000 Add new TBB version, remove 5.0.4 --- include/versions.wmi | 10 +++++----- projects/torbrowser/RecommendedTBBVersions | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index d87725e..287c49d 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -19,10 +19,10 @@ <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a4</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a5</define-tag> <define-tag version-torbrowserbundle whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>5.5a4</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>5.5a5</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -33,8 +33,8 @@ <define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a4</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a4</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a5</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a5</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -42,7 +42,7 @@ <define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a4</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a5</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index d6cf460..49b35e9 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,8 +1,4 @@ [ -"5.0.4", -"5.0.4-Linux", -"5.0.4-MacOS", -"5.0.4-Windows", "5.0.5", "5.0.5-Linux", "5.0.5-MacOS", @@ -15,6 +11,10 @@ "5.5a4-Linux", "5.5a4-MacOS", "5.5a4-Windows", +"5.5a5", +"5.5a5-Linux", +"5.5a5-MacOS", +"5.5a5-Windows", "5.5a4-hardened", "5.5a4-hardened-Linux" ]

1 0

[onionoo/master] Made the 'field' parameter case-insensitive, as specified by the protocol.
by karsten＠torproject.org 18 Dec '15

18 Dec '15

commit 1974b5585a74e6f6a29c53ea6f62972c47f86fc1 Author: vi <vi(a)vikramverma.com> Date: Thu Dec 17 15:30:46 2015 +0000 Made the 'field' parameter case-insensitive, as specified by the protocol. The protocol document states that field names are case-insensitive, but prior to this commit, the server implementation was non-compliant: % for field in as_number AS_Number; do % curl -s "https://onionoo.torproject.org/details?limit=1&fields=$field" % done | jq .relays[] { "as_number": "AS24940" } {} This bug accidentally discovered during performance analysis, using <https://gist.github.com/fmap/6f44efe6f3ca3f79683b>. --- src/main/java/org/torproject/onionoo/server/ResourceServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 1b6ad7f..9b19d44 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -479,7 +479,7 @@ public class ResourceServlet extends HttpServlet { /* Fields contain illegal character(s). */ return null; } - return parameter.split(","); + return parameter.toLowerCase().split(","); } }

1 0

[onionoo/master] Protocol: correct ordering in {first, last}_seen_days description.
by karsten＠torproject.org 18 Dec '15

18 Dec '15

commit 234f8dff6645a433f9072b26478325c3d6a00966 Author: vi <vi(a)vikramverma.com> Date: Thu Dec 17 15:30:46 2015 +0000 Protocol: correct ordering in {first,last}_seen_days description. For "at least x and at most y days" to be inhabited in cases where x /= y, the relation must be x <= y, rather than y >= x. This interpretation is consistent with that in the code; the server otherwise responds with 400s: % curl -o /dev/null -w '%{http_code}\n' -s \ % 'https://onionoo.torproject.org/details?limit=1&first_seen_days=2-1' 400 % curl -o /dev/null -w '%{http_code}\n' -s \ % 'https://onionoo.torproject.org/details?limit=1&first_seen_days=1-2' 200 This bug accidentally discovered during performance analysis, using <https://gist.github.com/fmap/6f44efe6f3ca3f79683b>. --- web/protocol.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/protocol.html b/web/protocol.html index e18afea..eee99ba 100644 --- a/web/protocol.html +++ b/web/protocol.html @@ -378,7 +378,7 @@ Filtering by flag is case-insensitive. <p> Return only relays or bridges which have first been seen during the given range of days ago. -A parameter value "x-y" with x >= y returns relays or bridges that have +A parameter value "x-y" with x <= y returns relays or bridges that have first been seen at least x and at most y days ago. Accepted short forms are "x", "x-", and "-y" which are interpreted as "x-x", "x-infinity", and "0-y". @@ -390,7 +390,7 @@ Accepted short forms are "x", "x-", and "-y" which are interpreted as <p> Return only relays or bridges which have last been seen during the given range of days ago. -A parameter value "x-y" with x >= y returns relays or bridges that have +A parameter value "x-y" with x <= y returns relays or bridges that have last been seen at least x and at most y days ago. Accepted short forms are "x", "x-", and "-y" which are interpreted as "x-x", "x-infinity", and "0-y".

1 0

[webwml/master] Add new TBB version
by gk＠torproject.org 18 Dec '15

18 Dec '15

commit c57ae616ea27e5a01f05d94c12b7afb0a7846c7d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 18 05:22:50 2015 +0000 Add new TBB version --- include/versions.wmi | 12 ++++++------ projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index d2b3745..d87725e 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,10 +18,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>5.0.5</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a4</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>5.0.5</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>5.5a4</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> @@ -31,8 +31,8 @@ <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.5</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.5</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a4</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a4</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -40,8 +40,8 @@ <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.5</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.5</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a4</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 238c801..d6cf460 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -7,6 +7,10 @@ "5.0.5-Linux", "5.0.5-MacOS", "5.0.5-Windows", +"5.0.6", +"5.0.6-Linux", +"5.0.6-MacOS", +"5.0.6-Windows", "5.5a4", "5.5a4-Linux", "5.5a4-MacOS",

1 0

[gettor/develop] Update signature body for GetTor (see 17424#comment:6)
by sukhbir＠torproject.org 18 Dec '15

18 Dec '15

commit b2b07f3eabfdc2672e55124cd9d633e8a58fca93 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Dec 17 23:58:36 2015 -0500 Update signature body for GetTor (see 17424#comment:6) --- lang/smtp/i18n/en/LC_MESSAGES/en.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lang/smtp/i18n/en/LC_MESSAGES/en.po b/lang/smtp/i18n/en/LC_MESSAGES/en.po index f987648..13ea727 100644 --- a/lang/smtp/i18n/en/LC_MESSAGES/en.po +++ b/lang/smtp/i18n/en/LC_MESSAGES/en.po @@ -30,9 +30,8 @@ does not work for you, try the next one.\n\ %s\n\ \n\ \n\ -All the best.\n\ --\n\ -GetTor team" +GetTor" #: Mirrors message msgid "mirrors_msg"

1 0

[meek/bug13171] fmt.
by dcf＠torproject.org 17 Dec '15

17 Dec '15

commit cf2fb397689c6e6ab3d71105822a0e5fac07b5b2 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 17 17:10:12 2015 -0800 fmt. --- meek-server/useraddr_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meek-server/useraddr_test.go b/meek-server/useraddr_test.go index 572d31f..3f975fa 100644 --- a/meek-server/useraddr_test.go +++ b/meek-server/useraddr_test.go @@ -89,8 +89,7 @@ func TestOriginalClientPrecedence(t *testing.T) { Expected net.IP }{ { - http.Request{ - }, + http.Request{}, nil, }, { @@ -140,7 +139,7 @@ func TestOriginalClientPrecedence(t *testing.T) { http.Request{ RemoteAddr: "5.6.7.8:5678", Header: http.Header{ - http.CanonicalHeaderKey("Meek-IP"): []string{"1.2.3.4"}, + http.CanonicalHeaderKey("Meek-IP"): []string{"1.2.3.4"}, http.CanonicalHeaderKey("X-Forwarded-For"): []string{"2.2.2.2"}, }, },

1 0