October 2015 - tor-commits - lists.torproject.org

[tor/master] More memory leaks closed in test_tortls
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 13ff8e31bacc249c3d899387cbdc7cecca0ad8a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 14:19:43 2015 -0400 More memory leaks closed in test_tortls --- src/test/test_tortls.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index cbd91b4..c1d1add 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -229,6 +229,7 @@ test_tortls_get_state_description(void *ignored) tor_tls_get_state_description(NULL, buf, 20); tt_str_op(buf, OP_EQ, "(No SSL object)"); + SSL_free(tls->ssl); tls->ssl = NULL; tor_tls_get_state_description(tls, buf, 20); tt_str_op(buf, OP_EQ, "(No SSL object)"); @@ -2485,6 +2486,7 @@ test_tortls_finish_handshake(void *ignored) X509 *c1 = read_cert_from(validCertString); X509 *c2 = read_cert_from(caCertString); + SESS_CERT_local *sess = NULL; ctx = SSL_CTX_new(method); @@ -2514,7 +2516,7 @@ test_tortls_finish_handshake(void *ignored) tls->isServer = 0; - SESS_CERT_local *sess = tor_malloc_zero(sizeof(SESS_CERT_local)); + sess = tor_malloc_zero(sizeof(SESS_CERT_local)); tls->ssl->session->sess_cert = (void *)sess; sess->cert_chain = sk_X509_new_null(); sk_X509_push(sess->cert_chain, c1); @@ -2541,10 +2543,16 @@ test_tortls_finish_handshake(void *ignored) tt_int_op(ret, OP_EQ, -9); done: - if (tls) - SSL_free(tls->ssl); + if (sess) + sk_X509_free(sess->cert_chain); + if (tls->ssl && tls->ssl->session) { + tor_free(tls->ssl->session->sess_cert); + } + SSL_free(tls->ssl); tor_free(tls); SSL_CTX_free(ctx); + tor_free(method); + X509_free(c1); } #endif

1 0

[tor/master] Yet more memory leaks closed in test_tortls
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 79b3c4a8a3c42ef8302e7ab8d5a873a47826f77f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 14:30:34 2015 -0400 Yet more memory leaks closed in test_tortls --- src/test/test_tortls.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index c1d1add..4d92e17 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -897,6 +897,9 @@ test_tortls_classify_client_ciphers(void *ignored) done: sk_SSL_CIPHER_free(ciphers); + SSL_free(tls->ssl); + tor_free(tls); + SSL_CTX_free(ctx); } #endif @@ -1299,6 +1302,7 @@ test_tortls_received_v3_certificate(void *ignored) tor_tls_t *tls; X509 *validCert = read_cert_from(validCertString); X509_NAME *subject=NULL, *issuer=NULL; + EVP_PKEY *key = NULL; tls = tor_malloc_zero(sizeof(tor_tls_t)); tls->ssl = tor_malloc_zero(sizeof(SSL)); @@ -1354,7 +1358,7 @@ test_tortls_received_v3_certificate(void *ignored) ret = tor_tls_received_v3_certificate(tls); tt_int_op(ret, OP_EQ, 0); - EVP_PKEY *key = X509_get_pubkey(validCert); + key = X509_get_pubkey(validCert); key->type = 5; ret = tor_tls_received_v3_certificate(tls); tt_int_op(ret, OP_EQ, 1); @@ -1370,6 +1374,9 @@ test_tortls_received_v3_certificate(void *ignored) tor_free(tls->ssl->session); tor_free(tls->ssl); tor_free(tls); + X509_free(validCert); + if (key) + EVP_PKEY_free(key); } #endif

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 21 Oct '15

21 Oct '15

commit 9701f173f9ab91c7795f8001e2b5b70c70a478a0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 21 18:15:07 2015 +0000 Update translations for bridgedb_completed --- tr/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 4f661de..f050747 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-21 17:38+0000\n" +"PO-Revision-Date: 2015-10-21 18:00+0000\n" "Last-Translator: Ozancan Karataş <ozancankaratas96(a)outlook.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 21 Oct '15

21 Oct '15

commit 92398734dd68cff79dde5dcf183bc5b8471f8c3d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 21 18:15:03 2015 +0000 Update translations for bridgedb --- tr/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 4f661de..f050747 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-21 17:38+0000\n" +"PO-Revision-Date: 2015-10-21 18:00+0000\n" "Last-Translator: Ozancan Karataş <ozancankaratas96(a)outlook.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Fix another pile of test_tortls memory leaks
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit f5a002f69b4995b926cc17e8357042f8cbc566ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 14:06:13 2015 -0400 Fix another pile of test_tortls memory leaks --- src/test/test_tortls.c | 91 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 73 insertions(+), 18 deletions(-) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index cb24cfc..cbd91b4 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -267,6 +267,7 @@ test_tortls_get_state_description(void *ignored) done: SSL_CTX_free(ctx); + SSL_free(tls->ssl); tor_free(buf); tor_free(tls); } @@ -354,6 +355,7 @@ test_tortls_log_one_error(void *ignored) tt_int_op(mock_saved_log_number(), OP_EQ, 1); tt_str_op(mock_saved_log_at(0), OP_EQ, "TLS error with 127.hello: (null) " "(in (null):(null):---)\n"); + tor_free(tls->address); mock_clean_saved_logs(); tls->address = tor_strdup("127.hello"); @@ -416,6 +418,10 @@ test_tortls_log_one_error(void *ignored) teardown_capture_of_logs(previous_log); SSL_free(ssl); SSL_CTX_free(ctx); + if (tls && tls->ssl) + SSL_free(tls->ssl); + if (tls) + tor_free(tls->address); tor_free(tls); } @@ -503,7 +509,9 @@ test_tortls_get_error(void *ignored) done: teardown_capture_of_logs(previous_log); + SSL_free(tls->ssl); tor_free(tls); + SSL_CTX_free(ctx); } #endif @@ -557,7 +565,8 @@ test_tortls_x509_cert_get_id_digests(void *ignored) tt_int_op(res->d[0][0], OP_EQ, 42); done: - (void)0; + tor_free(cert); + tor_free(d); } #ifndef OPENSSL_OPAQUE @@ -569,13 +578,30 @@ fixed_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) } static void +fake_x509_free(X509 *cert) +{ + if (cert) { + if (cert->cert_info) { + if (cert->cert_info->key) { + if (cert->cert_info->key->pkey) { + tor_free(cert->cert_info->key->pkey); + } + tor_free(cert->cert_info->key); + } + tor_free(cert->cert_info); + } + tor_free(cert); + } +} + +static void test_tortls_cert_matches_key(void *ignored) { (void)ignored; int res; tor_tls_t *tls; tor_x509_cert_t *cert; - X509 *one, *two; + X509 *one = NULL, *two = NULL; EVP_PKEY_ASN1_METHOD *meth = EVP_PKEY_asn1_new(999, 0, NULL, NULL); EVP_PKEY_asn1_set_public(meth, NULL, NULL, fixed_pub_cmp, NULL, NULL, NULL); @@ -623,18 +649,22 @@ test_tortls_cert_matches_key(void *ignored) done: EVP_PKEY_asn1_free(meth); + tor_free(tls->ssl->session); + tor_free(tls->ssl); tor_free(tls); tor_free(cert); + fake_x509_free(one); + fake_x509_free(two); } static void test_tortls_cert_get_key(void *ignored) { (void)ignored; - tor_x509_cert_t *cert; + tor_x509_cert_t *cert = NULL; crypto_pk_t *res; cert = tor_malloc_zero(sizeof(tor_x509_cert_t)); - X509 *key; + X509 *key = NULL; key = tor_malloc_zero(sizeof(X509)); key->references = 1; @@ -651,7 +681,8 @@ test_tortls_cert_get_key(void *ignored) tt_assert(!res); done: - (void)0; + fake_x509_free(key); + tor_free(cert); } #endif @@ -731,7 +762,8 @@ test_tortls_get_ciphersuite_name(void *ignored) tt_str_op(ret, OP_EQ, "(NONE)"); done: - (void)1; + tor_free(ctx->ssl); + tor_free(ctx); } static SSL_CIPHER * @@ -863,7 +895,7 @@ test_tortls_classify_client_ciphers(void *ignored) tt_int_op(tls->client_cipher_list_type, OP_EQ, 2); done: - (void)1; + sk_SSL_CIPHER_free(ciphers); } #endif @@ -874,8 +906,9 @@ test_tortls_client_is_using_v2_ciphers(void *ignored) #ifdef HAVE_SSL_GET_CLIENT_CIPHERS tt_skip(); + done: + (void)1; #else - int ret; SSL_CTX *ctx; SSL *ssl; @@ -903,10 +936,10 @@ test_tortls_client_is_using_v2_ciphers(void *ignored) sess->ciphers = ciphers; ret = tor_tls_client_is_using_v2_ciphers(ssl); tt_int_op(ret, OP_EQ, 1); -#endif - done: - (void)1; + SSL_free(ssl); + SSL_CTX_free(ctx); +#endif } #ifndef OPENSSL_OPAQUE @@ -1596,6 +1629,7 @@ test_tortls_get_peer_cert(void *ignored) tor_free(tls->ssl->session); tor_free(tls->ssl); tor_free(tls); + X509_free(cert); } #endif @@ -1625,6 +1659,7 @@ test_tortls_peer_has_cert(void *ignored) tor_free(tls->ssl->session); tor_free(tls->ssl); tor_free(tls); + X509_free(cert); } #endif @@ -1707,6 +1742,7 @@ test_tortls_block_renegotiation(void *ignored) tt_assert(!(SSL_get_options(tls->ssl) & 0x0010)); done: + tor_free(tls->ssl->s3); tor_free(tls->ssl); tor_free(tls); } @@ -1743,6 +1779,7 @@ test_tortls_assert_renegotiation_unblocked(void *ignored) /* No assertion here - this test will fail if tor_assert is turned on * and things are bad. */ + tor_free(tls->ssl); tor_free(tls); } #endif @@ -1763,6 +1800,7 @@ test_tortls_set_logged_address(void *ignored) tt_str_op(tls->address, OP_EQ, "foo bar 2"); done: + tor_free(tls->address); tor_free(tls); } @@ -1802,17 +1840,17 @@ test_tortls_set_renegotiate_callback(void *ignored) #endif #ifndef OPENSSL_OPAQUE +static SSL_CIPHER *fixed_cipher1 = NULL; +static SSL_CIPHER *fixed_cipher2 = NULL; static const SSL_CIPHER * fake_get_cipher(unsigned ncipher) { - SSL_CIPHER *fixed = tor_malloc_zero(sizeof(SSL_CIPHER)); - SSL_CIPHER *fixed2 = tor_malloc_zero(sizeof(SSL_CIPHER)); - fixed2->id = 0xC00A; + switch (ncipher) { case 1: - return fixed; + return fixed_cipher1; case 2: - return fixed2; + return fixed_cipher2; default: return NULL; } @@ -1830,6 +1868,10 @@ test_tortls_find_cipher_by_id(void *ignored) const SSL_METHOD *m = TLSv1_method(); SSL_METHOD *empty_method = tor_malloc_zero(sizeof(SSL_METHOD)); + fixed_cipher1 = tor_malloc_zero(sizeof(SSL_CIPHER)); + fixed_cipher2 = tor_malloc_zero(sizeof(SSL_CIPHER)); + fixed_cipher2->id = 0xC00A; + SSL_library_init(); SSL_load_error_strings(); @@ -1881,6 +1923,7 @@ test_tortls_find_cipher_by_id(void *ignored) tor_free(empty_method); SSL_free(ssl); SSL_CTX_free(ctx); + tor_free(fixed_cipher1); } #endif @@ -1907,6 +1950,8 @@ test_tortls_debug_state_callback(void *ignored) done: teardown_capture_of_logs(previous_log); + tor_free(buf); + tor_free(ssl); } #endif @@ -1973,7 +2018,9 @@ test_tortls_server_info_callback(void *ignored) done: teardown_capture_of_logs(previous_log); - tor_free(ssl); + SSL_free(ssl); + SSL_CTX_free(ctx); + tor_free(tls); } #endif @@ -2185,6 +2232,7 @@ test_tortls_read(void *ignored) teardown_capture_of_logs(previous_log); tor_free(tls->ssl); tor_free(tls); + tor_free(method); } static int fixed_ssl_write_result; @@ -2249,6 +2297,7 @@ test_tortls_write(void *ignored) teardown_capture_of_logs(previous_log); tor_free(tls->ssl); tor_free(tls); + tor_free(method); } static int fixed_ssl_renegotiate_result; @@ -2306,6 +2355,7 @@ test_tortls_renegotiate(void *ignored) SSL_free(tls->ssl); SSL_CTX_free(ctx); tor_free(tls); + tor_free(method); } #endif @@ -2417,6 +2467,7 @@ test_tortls_handshake(void *ignored) SSL_free(tls->ssl); SSL_CTX_free(ctx); tor_free(tls); + tor_free(method); } #endif @@ -2490,8 +2541,10 @@ test_tortls_finish_handshake(void *ignored) tt_int_op(ret, OP_EQ, -9); done: - SSL_CTX_free(ctx); + if (tls) + SSL_free(tls->ssl); tor_free(tls); + SSL_CTX_free(ctx); } #endif @@ -2778,6 +2831,8 @@ test_tortls_create_certificate(void *ignored) done: UNMOCK(crypto_rand); UNMOCK(crypto_pk_get_evp_pkey_); + crypto_pk_free(pk1); + crypto_pk_free(pk2); } static void

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 21 Oct '15

21 Oct '15

commit 75dc11d8a8b09431c106b6ab02e8eaf6ba2eddd9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 21 17:45:07 2015 +0000 Update translations for bridgedb_completed --- tr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 6faae40..4f661de 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-20 18:23+0000\n" +"PO-Revision-Date: 2015-10-21 17:38+0000\n" "Last-Translator: Ozancan Karataş <ozancankaratas96(a)outlook.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -370,7 +370,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "'Evet' seçip ardından 'İleri' üzerine tıklayın. Yeni köprülerinizi ayarlamak için,\nköprü satırlarını kopyalayarak metin kutusuna yapıştırın. 'Bağlan' üzerine tıkladığınızda artık hazırsınız! Sorun yaşıyorsanız, daha fazla yardım almak için 'Tor Ağ Ayarları' yardımcısındaki 'Yardım' düğmesine tıklamayı deneyin." +msgstr "'Evet' seçip ardından 'İleri' üzerine tıklayın.\nYeni köprülerinizi ayarlamak için köprü satırlarını kopyalayarak\nmetin kutusuna yapıştırın.\n'Bağlan' üzerine tıkladığınızda artık hazırsınız! Sorun yaşıyorsanız, daha fazla yardım almak için 'Tor Ağ Ayarları' yardımcısındaki 'Yardım' düğmesine tıklamayı deneyin." #: bridgedb/strings.py:167 msgid "Displays this message."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 21 Oct '15

21 Oct '15

commit e32fabfcc483574b485920f79ab654056c60cb70 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 21 17:45:04 2015 +0000 Update translations for bridgedb --- tr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 6faae40..4f661de 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-20 18:23+0000\n" +"PO-Revision-Date: 2015-10-21 17:38+0000\n" "Last-Translator: Ozancan Karataş <ozancankaratas96(a)outlook.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -370,7 +370,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "'Evet' seçip ardından 'İleri' üzerine tıklayın. Yeni köprülerinizi ayarlamak için,\nköprü satırlarını kopyalayarak metin kutusuna yapıştırın. 'Bağlan' üzerine tıkladığınızda artık hazırsınız! Sorun yaşıyorsanız, daha fazla yardım almak için 'Tor Ağ Ayarları' yardımcısındaki 'Yardım' düğmesine tıklamayı deneyin." +msgstr "'Evet' seçip ardından 'İleri' üzerine tıklayın.\nYeni köprülerinizi ayarlamak için köprü satırlarını kopyalayarak\nmetin kutusuna yapıştırın.\n'Bağlan' üzerine tıkladığınızda artık hazırsınız! Sorun yaşıyorsanız, daha fazla yardım almak için 'Tor Ağ Ayarları' yardımcısındaki 'Yardım' düğmesine tıklamayı deneyin." #: bridgedb/strings.py:167 msgid "Displays this message."

1 0

[tor/release-0.2.7] Fix a memory leak in reading an expired ed signing key.
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 9c4a0aef0c0d8e1c3ad8d9ed7b655eae8a175ccb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:16:28 2015 -0400 Fix a memory leak in reading an expired ed signing key. Closes 17403. --- changes/bug17403 | 3 +++ src/or/routerkeys.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/changes/bug17403 b/changes/bug17403 new file mode 100644 index 0000000..e83a4a2 --- /dev/null +++ b/changes/bug17403 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leaks): + - Fix a memory leak when reading an expired signing key from disk. + Fixes bug 17403; bugfix on 0.2.7.2-rc. diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 765dac8..d88bfca 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -836,6 +836,8 @@ load_ed_keys(const or_options_t *options, time_t now) INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT); char *fname = options_get_datadir_fname2(options, "keys", "ed25519_signing"); + ed25519_keypair_free(sign); + tor_cert_free(sign_cert); sign = ed_key_init_from_file(fname, flags, LOG_WARN, sign_signing_key_with_id, now,

1 0

[tor/release-0.2.7] Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit 4fb49069753c37a2425427864212bc3a1f49d980 Merge: b809c26 9459ae2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 12:02:42 2015 -0400 Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7 src/common/tortls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.2.7] Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7
by nickm＠torproject.org 21 Oct '15

21 Oct '15

commit b809c265e77f4528b59aa3932a3cde8bf5e19fb3 Merge: 9c4a0ae 35bf07b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:51:03 2015 -0400 Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7 changes/bug17404 | 6 ++++++ src/common/tortls.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0