February 2014 - tor-commits - lists.torproject.org

[tor/release-0.2.4] Make sure orconn->chan gets nulled out when channels exit from channel_free_all() too
by arma＠torproject.org 10 Feb '14

10 Feb '14

commit c330d63ff7614b2382dfa0e84da0b40ed6348ced Author: Andrea Shepard <andrea(a)torproject.org> Date: Sat Feb 8 14:05:51 2014 -0800 Make sure orconn->chan gets nulled out when channels exit from channel_free_all() too --- src/or/channeltls.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 495f856..d5428c1 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -53,6 +53,7 @@ static void channel_tls_common_init(channel_tls_t *tlschan); static void channel_tls_close_method(channel_t *chan); static const char * channel_tls_describe_transport_method(channel_t *chan); +static void channel_tls_free_method(channel_t *chan); static int channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out); static const char * @@ -112,6 +113,7 @@ channel_tls_common_init(channel_tls_t *tlschan) chan->state = CHANNEL_STATE_OPENING; chan->close = channel_tls_close_method; chan->describe_transport = channel_tls_describe_transport_method; + chan->free = channel_tls_free_method; chan->get_remote_addr = channel_tls_get_remote_addr_method; chan->get_remote_descr = channel_tls_get_remote_descr_method; chan->has_queued_writes = channel_tls_has_queued_writes_method; @@ -384,6 +386,30 @@ channel_tls_describe_transport_method(channel_t *chan) } /** + * Free a channel_tls_t + * + * This is called by the generic channel layer when freeing a channel_tls_t; + * this happens either on a channel which has already reached + * CHANNEL_STATE_CLOSED or CHANNEL_STATE_ERROR from channel_run_cleanup() or + * on shutdown from channel_free_all(). In the latter case we might still + * have an orconn active (which connection_free_all() will get to later), + * so we should null out its channel pointer now. + */ + +static void +channel_tls_free_method(channel_t *chan) +{ + channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); + + tor_assert(tlschan); + + if (tlschan->conn) { + tlschan->conn->chan = NULL; + tlschan->conn = NULL; + } +} + +/** * Get the remote address of a channel_tls_t * * This implements the get_remote_addr method for channel_tls_t; copy the

1 0

[tor/release-0.2.4] Survive fedora's openssl in our benchmarks
by arma＠torproject.org 10 Feb '14

10 Feb '14

commit 9bb34aa897e4ecac27a6f8d50a659803f73c6cb9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 7 17:36:11 2014 -0500 Survive fedora's openssl in our benchmarks Apparently fedora currently has ECDH but not P224. This isn't a huge deal, since we no longer use OpenSSL's P224 ever (see #9780 and 72c1e5acfe1c6). But we shouldn't have segfaulting benchmarks really. Fixes bug 10835; bugfix on 0.2.4.8-alpha. --- changes/bug10835 | 4 ++++ src/test/bench.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug10835 b/changes/bug10835 new file mode 100644 index 0000000..9df7bdd --- /dev/null +++ b/changes/bug10835 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Fix a segmentation fault in our benchmark code when running with + Fedora's OpenSSL package, or any other OpenSSL that provides + ECDH but not P224. Fixes bug 10835; bugfix on 0.2.4.8-alpha. diff --git a/src/test/bench.c b/src/test/bench.c index 5a8d21d..706b8bc 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -440,6 +440,10 @@ bench_ecdh_impl(int nid, const char *name) ssize_t slen_a, slen_b; EC_KEY *dh_a = EC_KEY_new_by_curve_name(nid); EC_KEY *dh_b = EC_KEY_new_by_curve_name(nid); + if (!dh_a || !dh_b) { + puts("Skipping. (No implementation?)"); + return; + } EC_KEY_generate_key(dh_a); EC_KEY_generate_key(dh_b);

1 0

[tor/release-0.2.4] Some anti-forensics paranoia...
by arma＠torproject.org 10 Feb '14

10 Feb '14

commit 01132c93fdfd634475c6d56455efdfe1cff1fe83 Author: Florent Daigniere <nextgens(a)freenetproject.org> Date: Sun Feb 2 18:40:30 2014 +0000 Some anti-forensics paranoia... sed -i 's/BN_free/BN_clear_free/g' --- src/common/crypto.c | 20 ++++++++++---------- src/common/tortls.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 940a756..925beb3 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -486,7 +486,7 @@ crypto_pk_generate_key_with_bits(crypto_pk_t *env, int bits) r = NULL; done: if (e) - BN_free(e); + BN_clear_free(e); if (r) RSA_free(r); } @@ -1922,7 +1922,7 @@ crypto_set_tls_dh_prime(const char *dynamic_dh_modulus_fname) /* If the space is occupied, free the previous TLS DH prime */ if (dh_param_p_tls) { - BN_free(dh_param_p_tls); + BN_clear_free(dh_param_p_tls); dh_param_p_tls = NULL; } @@ -2084,8 +2084,8 @@ crypto_dh_generate_public(crypto_dh_t *dh) log_warn(LD_CRYPTO, "Weird! Our own DH key was invalid. I guess once-in-" "the-universe chances really do happen. Trying again."); /* Free and clear the keys, so OpenSSL will actually try again. */ - BN_free(dh->dh->pub_key); - BN_free(dh->dh->priv_key); + BN_clear_free(dh->dh->pub_key); + BN_clear_free(dh->dh->priv_key); dh->dh->pub_key = dh->dh->priv_key = NULL; goto again; } @@ -2147,10 +2147,10 @@ tor_check_dh_key(int severity, BIGNUM *bn) log_fn(severity, LD_CRYPTO, "DH key must be at most p-2."); goto err; } - BN_free(x); + BN_clear_free(x); return 0; err: - BN_free(x); + BN_clear_free(x); s = BN_bn2hex(bn); log_fn(severity, LD_CRYPTO, "Rejecting insecure DH key [%s]", s); OPENSSL_free(s); @@ -2209,7 +2209,7 @@ crypto_dh_compute_secret(int severity, crypto_dh_t *dh, done: crypto_log_errors(LOG_WARN, "completing DH handshake"); if (pubkey_bn) - BN_free(pubkey_bn); + BN_clear_free(pubkey_bn); if (secret_tmp) { memwipe(secret_tmp, 0, secret_tmp_len); tor_free(secret_tmp); @@ -3118,11 +3118,11 @@ crypto_global_cleanup(void) ERR_free_strings(); if (dh_param_p) - BN_free(dh_param_p); + BN_clear_free(dh_param_p); if (dh_param_p_tls) - BN_free(dh_param_p_tls); + BN_clear_free(dh_param_p_tls); if (dh_param_g) - BN_free(dh_param_g); + BN_clear_free(dh_param_g); #ifndef DISABLE_ENGINES ENGINE_cleanup(); diff --git a/src/common/tortls.c b/src/common/tortls.c index 60444f1..886ee0d 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -694,7 +694,7 @@ tor_tls_create_certificate(crypto_pk_t *rsa, if (pkey) EVP_PKEY_free(pkey); if (serial_number) - BN_free(serial_number); + BN_clear_free(serial_number); if (name) X509_NAME_free(name); if (name_issuer)

1 0

[tor/release-0.2.4] changelog for 10793
by arma＠torproject.org 10 Feb '14

10 Feb '14

commit 9e2de8cecc97a9bc6d346d309a1bd6a800a34751 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 3 10:47:49 2014 -0500 changelog for 10793 --- changes/bug10793 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug10793 b/changes/bug10793 new file mode 100644 index 0000000..24c4025 --- /dev/null +++ b/changes/bug10793 @@ -0,0 +1,4 @@ + o Minor features (security): + - Always clear OpenSSL bignums before freeing them--even bignums + that don't contain secrets. Resolves ticket 10793. Patch by + Florent Daigniere.

1 0

[tor/release-0.2.4] Add a missing include
by arma＠torproject.org 10 Feb '14

10 Feb '14

commit 655adbf6677fde28ba37f029701083901eda7efd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 6 13:25:36 2014 -0500 Add a missing include --- src/or/status.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/status.c b/src/or/status.c index 4c42155..69f92ed 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -15,6 +15,7 @@ #include "circuitlist.h" #include "main.h" #include "hibernate.h" +#include "rephist.h" /** Return the total number of circuits. */ static int

1 0

[tor/release-0.2.4] Attribute bug 9602 to a version.
by arma＠torproject.org 10 Feb '14

10 Feb '14

commit a7e946596d6da9aca80456141b7fddbc198c217c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 7 10:38:00 2014 -0500 Attribute bug 9602 to a version. --- changes/bug9602 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changes/bug9602 b/changes/bug9602 index 9e9a3ca..2dc13c4 100644 --- a/changes/bug9602 +++ b/changes/bug9602 @@ -1,4 +1,5 @@ o Bugfixes - Null out orconn->chan->conn when closing orconn in case orconn is freed before channel_run_cleanup() gets to orconn->chan, and handle the null - conn edge case correctly in channel_tls_t methods. Fixes bug #9602. + conn edge case correctly in channel_tls_t methods. Fixes bug #9602; + bugfix on 0.2.4.4-alpha.

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug9716_024' into maint-0.2.4
by arma＠torproject.org 10 Feb '14

10 Feb '14

commit b4e8d8dc0e6f942346895a5cff123db3aa1f94d5 Merge: 9e2de8c a2754d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 6 16:29:08 2014 -0500 Merge remote-tracking branch 'public/bug9716_024' into maint-0.2.4 changes/bug9716 | 4 ++++ src/or/connection.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 10 Feb '14

10 Feb '14

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'andrea/bug9602' into maint-0.2.4
by arma＠torproject.org 10 Feb '14

10 Feb '14

commit 7f6aa780e3183f34b2fa771e17813018e6b28115 Merge: 9bb34aa c330d63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 9 21:41:24 2014 -0500 Merge remote-tracking branch 'andrea/bug9602' into maint-0.2.4 src/or/channeltls.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)

1 0

[tor/release-0.2.4] Try using INT_MAX, not SOMAXCONN, to set listen() backlog.
by arma＠torproject.org 10 Feb '14

10 Feb '14

commit a2754d418dffb6188717d5e84d9bea59a2c9853b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 11 13:30:45 2013 -0400 Try using INT_MAX, not SOMAXCONN, to set listen() backlog. Fall back to SOMAXCONN if INT_MAX doesn't work. We'd like to do this because the actual maximum is overrideable by the kernel, and the value in the header file might not be right at all. All implementations I can find out about claim that this is supported. Fix for 9716; bugfix on every Tor. --- changes/bug9716 | 4 ++++ src/or/connection.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/changes/bug9716 b/changes/bug9716 new file mode 100644 index 0000000..5e39077 --- /dev/null +++ b/changes/bug9716 @@ -0,0 +1,4 @@ + o Bugfixes (performance): + - Set the listen() backlog limit to the largest actually supported + on the system, not to the value in a header file. Fixes bug 9716; + bugfix on every released Tor. diff --git a/src/or/connection.c b/src/or/connection.c index 6e754a0..41946e4 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -926,6 +926,27 @@ make_socket_reuseable(tor_socket_t sock) #endif } +/** Max backlog to pass to listen. We start at */ +static int listen_limit = INT_MAX; + +/* Listen on <b>fd</b> with appropriate backlog. Return as for listen. */ +static int +tor_listen(tor_socket_t fd) +{ + int r; + + if ((r = listen(fd, listen_limit)) < 0) { + if (listen_limit == SOMAXCONN) + return r; + if ((r = listen(fd, SOMAXCONN)) == 0) { + listen_limit = SOMAXCONN; + log_warn(LD_NET, "Setting listen backlog to INT_MAX connections " + "didn't work, but SOMAXCONN did. Lowering backlog limit."); + } + } + return r; +} + /** Bind a new non-blocking socket listening to the socket described * by <b>listensockaddr</b>. * @@ -1009,7 +1030,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, } if (is_tcp) { - if (listen(s,SOMAXCONN) < 0) { + if (tor_listen(s) < 0) { log_warn(LD_NET, "Could not listen on %s:%u: %s", address, usePort, tor_socket_strerror(tor_socket_errno(s))); tor_close_socket(s);

1 0