- tor-commits - lists.torproject.org

[tor/master] Make Tor build happily with OpenSSL master and libressl.
by nickm＠torproject.org 03 Feb '16

03 Feb '16

commit 27582325dc691f02c41612a258483a73f2e0e000 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 11:13:12 2016 -0500 Make Tor build happily with OpenSSL master and libressl. Also tested with 1.0.0t and 1.0.2f. Closes ticket 19784. Closes most of 17921. (Still need to make some tests pass.) --- changes/bug17921_bug17984 | 4 ++++ src/common/aes.c | 31 +++++++++++++++---------------- src/common/aes.h | 1 - src/common/compat_openssl.h | 2 ++ src/common/crypto.c | 4 ++++ src/common/tortls.c | 16 +++++++++++----- src/common/tortls.h | 7 ++++--- src/test/test_crypto.c | 14 ++++++++++---- src/test/test_tortls.c | 9 ++++----- 9 files changed, 54 insertions(+), 34 deletions(-) diff --git a/changes/bug17921_bug17984 b/changes/bug17921_bug17984 new file mode 100644 index 0000000..f254e29 --- /dev/null +++ b/changes/bug17921_bug17984 @@ -0,0 +1,4 @@ + o Minor features (compilation): + - Tor builds successfully with the unreleased OpenSSL 1.1 alpha + releases, and with the latest LibreSSL. Closes tickets 17921 and + 17984. diff --git a/src/common/aes.c b/src/common/aes.c index 7b6cc39..89c99c1 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -81,47 +81,46 @@ #ifdef USE_EVP_AES_CTR -struct aes_cnt_cipher { - EVP_CIPHER_CTX evp; -}; +/* We don't actually define the struct here. */ aes_cnt_cipher_t * aes_new_cipher(const char *key, const char *iv) { - aes_cnt_cipher_t *cipher; - cipher = tor_malloc_zero(sizeof(aes_cnt_cipher_t)); - EVP_EncryptInit(&cipher->evp, EVP_aes_128_ctr(), + EVP_CIPHER_CTX *cipher = EVP_CIPHER_CTX_new(); + EVP_EncryptInit(cipher, EVP_aes_128_ctr(), (const unsigned char*)key, (const unsigned char *)iv); - return cipher; + return (aes_cnt_cipher_t *) cipher; } void -aes_cipher_free(aes_cnt_cipher_t *cipher) +aes_cipher_free(aes_cnt_cipher_t *cipher_) { - if (!cipher) + if (!cipher_) return; - EVP_CIPHER_CTX_cleanup(&cipher->evp); - memwipe(cipher, 0, sizeof(aes_cnt_cipher_t)); - tor_free(cipher); + EVP_CIPHER_CTX *cipher = (EVP_CIPHER_CTX *) cipher_; + EVP_CIPHER_CTX_cleanup(cipher); + EVP_CIPHER_CTX_free(cipher); } void -aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, +aes_crypt(aes_cnt_cipher_t *cipher_, const char *input, size_t len, char *output) { int outl; + EVP_CIPHER_CTX *cipher = (EVP_CIPHER_CTX *) cipher_; tor_assert(len < INT_MAX); - EVP_EncryptUpdate(&cipher->evp, (unsigned char*)output, + EVP_EncryptUpdate(cipher, (unsigned char*)output, &outl, (const unsigned char *)input, (int)len); } void -aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len) +aes_crypt_inplace(aes_cnt_cipher_t *cipher_, char *data, size_t len) { int outl; + EVP_CIPHER_CTX *cipher = (EVP_CIPHER_CTX *) cipher_; tor_assert(len < INT_MAX); - EVP_EncryptUpdate(&cipher->evp, (unsigned char*)data, + EVP_EncryptUpdate(cipher, (unsigned char*)data, &outl, (unsigned char*)data, (int)len); } int diff --git a/src/common/aes.h b/src/common/aes.h index df2f3aa..5500db7 100644 --- a/src/common/aes.h +++ b/src/common/aes.h @@ -13,7 +13,6 @@ * \brief Headers for aes.c */ -struct aes_cnt_cipher; typedef struct aes_cnt_cipher aes_cnt_cipher_t; aes_cnt_cipher_t* aes_new_cipher(const char *key, const char *iv); diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h index 9c98181..d5333a2 100644 --- a/src/common/compat_openssl.h +++ b/src/common/compat_openssl.h @@ -35,9 +35,11 @@ (((st) == SSL3_ST_SW_SRVR_HELLO_A) || \ ((st) == SSL3_ST_SW_SRVR_HELLO_B)) #define OSSL_HANDSHAKE_STATE int +#define CONST_IF_OPENSSL_1_1_API #else #define STATE_IS_SW_SERVER_HELLO(st) \ ((st) == TLS_ST_SW_SRVR_HELLO) +#define CONST_IF_OPENSSL_1_1_API const #endif #endif diff --git a/src/common/crypto.c b/src/common/crypto.c index a42c461..bc659b1 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -373,8 +373,12 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir) used by Tor and the set of algorithms available in the engine */ log_engine("RSA", ENGINE_get_default_RSA()); log_engine("DH", ENGINE_get_default_DH()); +#ifdef OPENSSL_1_1_API + log_engine("EC", ENGINE_get_default_EC()); +#else log_engine("ECDH", ENGINE_get_default_ECDH()); log_engine("ECDSA", ENGINE_get_default_ECDSA()); +#endif log_engine("RAND", ENGINE_get_default_RAND()); log_engine("RAND (which we will not use)", ENGINE_get_default_RAND()); log_engine("SHA1", ENGINE_get_digest_engine(NID_sha1)); diff --git a/src/common/tortls.c b/src/common/tortls.c index 6e4cd3d..5f84e5c 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -911,7 +911,7 @@ tor_tls_cert_is_valid(int severity, } else if (cert_key) { int min_bits = 1024; #ifdef EVP_PKEY_EC - if (EVP_PKEY_type(cert_key->type) == EVP_PKEY_EC) + if (EVP_PKEY_base_id(cert_key) == EVP_PKEY_EC) min_bits = 128; #endif if (EVP_PKEY_bits(cert_key) >= min_bits) @@ -1414,7 +1414,7 @@ tor_tls_classify_client_ciphers(const SSL *ssl, /* Now we need to see if there are any ciphers whose presence means we're * dealing with an updated Tor. */ for (i = 0; i < sk_SSL_CIPHER_num(peer_ciphers); ++i) { - SSL_CIPHER *cipher = sk_SSL_CIPHER_value(peer_ciphers, i); + const SSL_CIPHER *cipher = sk_SSL_CIPHER_value(peer_ciphers, i); const char *ciphername = SSL_CIPHER_get_name(cipher); if (strcmp(ciphername, TLS1_TXT_DHE_RSA_WITH_AES_128_SHA) && strcmp(ciphername, TLS1_TXT_DHE_RSA_WITH_AES_256_SHA) && @@ -1431,7 +1431,7 @@ tor_tls_classify_client_ciphers(const SSL *ssl, { const uint16_t *v2_cipher = v2_cipher_list; for (i = 0; i < sk_SSL_CIPHER_num(peer_ciphers); ++i) { - SSL_CIPHER *cipher = sk_SSL_CIPHER_value(peer_ciphers, i); + const SSL_CIPHER *cipher = sk_SSL_CIPHER_value(peer_ciphers, i); uint16_t id = SSL_CIPHER_get_id(cipher) & 0xffff; if (id == 0x00ff) /* extended renegotiation indicator. */ continue; @@ -1453,7 +1453,7 @@ tor_tls_classify_client_ciphers(const SSL *ssl, smartlist_t *elts = smartlist_new(); char *s; for (i = 0; i < sk_SSL_CIPHER_num(peer_ciphers); ++i) { - SSL_CIPHER *cipher = sk_SSL_CIPHER_value(peer_ciphers, i); + const SSL_CIPHER *cipher = sk_SSL_CIPHER_value(peer_ciphers, i); const char *ciphername = SSL_CIPHER_get_name(cipher); smartlist_add(elts, (char*)ciphername); } @@ -1562,7 +1562,8 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val) STATIC int tor_tls_session_secret_cb(SSL *ssl, void *secret, int *secret_len, STACK_OF(SSL_CIPHER) *peer_ciphers, - SSL_CIPHER **cipher, void *arg) + CONST_IF_OPENSSL_1_1_API SSL_CIPHER **cipher, + void *arg) { (void) secret; (void) secret_len; @@ -1733,8 +1734,13 @@ tor_tls_block_renegotiation(tor_tls_t *tls) void tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls) { +#if defined(SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) && \ + SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION != 0 long options = SSL_get_options(tls->ssl); tor_assert(0 != (options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)); +#else + (void) tls; +#endif } /** Return whether this tls initiated the connect (client) or diff --git a/src/common/tortls.h b/src/common/tortls.h index 6a4ef9a..7239eb9 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -143,9 +143,10 @@ STATIC size_t SSL_SESSION_get_master_key(SSL_SESSION *s, uint8_t *out, STATIC void tor_tls_debug_state_callback(const SSL *ssl, int type, int val); STATIC void tor_tls_server_info_callback(const SSL *ssl, int type, int val); STATIC int tor_tls_session_secret_cb(SSL *ssl, void *secret, - int *secret_len, - STACK_OF(SSL_CIPHER) *peer_ciphers, - SSL_CIPHER **cipher, void *arg); + int *secret_len, + STACK_OF(SSL_CIPHER) *peer_ciphers, + CONST_IF_OPENSSL_1_1_API SSL_CIPHER **cipher, + void *arg); STATIC int find_cipher_by_id(const SSL *ssl, const SSL_METHOD *m, uint16_t cipher); MOCK_DECL(STATIC X509*, tor_tls_create_certificate,(crypto_pk_t *rsa, diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index fb21f3a..3244c21 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1108,6 +1108,11 @@ test_crypto_digests(void *arg) crypto_pk_free(k); } +#ifndef OPENSSL_1_1_API +#define EVP_ENCODE_CTX_new() tor_malloc_zero(sizeof(EVP_ENCODE_CTX)) +#define EVP_ENCODE_CTX_free(ctx) tor_free(ctx) +#endif + /** Encode src into dest with OpenSSL's EVP Encode interface, returning the * length of the encoded data in bytes. */ @@ -1115,12 +1120,13 @@ static int base64_encode_evp(char *dest, char *src, size_t srclen) { const unsigned char *s = (unsigned char*)src; - EVP_ENCODE_CTX ctx; + EVP_ENCODE_CTX *ctx = EVP_ENCODE_CTX_new(); int len, ret; - EVP_EncodeInit(&ctx); - EVP_EncodeUpdate(&ctx, (unsigned char *)dest, &len, s, (int)srclen); - EVP_EncodeFinal(&ctx, (unsigned char *)(dest + len), &ret); + EVP_EncodeInit(ctx); + EVP_EncodeUpdate(ctx, (unsigned char *)dest, &len, s, (int)srclen); + EVP_EncodeFinal(ctx, (unsigned char *)(dest + len), &ret); + EVP_ENCODE_CTX_free(ctx); return ret+ len; } diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 98f5fac..ce7e6bc 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -1347,11 +1347,10 @@ test_tortls_get_buffer_sizes(void *ignored) tls->ssl->s3->wbuf.offset = 0; tls->ssl->s3->wbuf.left = 43; + ret = tor_tls_get_buffer_sizes(tls, &rbuf_c, &rbuf_b, &wbuf_c, &wbuf_b); #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) - ret = tor_tls_get_buffer_sizes(NULL, NULL, NULL, NULL, NULL); tt_int_op(ret, OP_EQ, -1); #else - ret = tor_tls_get_buffer_sizes(tls, &rbuf_c, &rbuf_b, &wbuf_c, &wbuf_b); tt_int_op(ret, OP_EQ, 0); tt_int_op(rbuf_c, OP_EQ, 0); tt_int_op(wbuf_c, OP_EQ, 0); @@ -2594,14 +2593,14 @@ test_tortls_create_certificate(void *ignored) tt_assert(!ret); fixed_crypto_pk_get_evp_pkey_result_index = 0; - fixed_crypto_pk_get_evp_pkey_result[0] = tor_malloc_zero(sizeof(EVP_PKEY)); + fixed_crypto_pk_get_evp_pkey_result[0] = EVP_PKEY_new(); fixed_crypto_pk_get_evp_pkey_result[1] = NULL; ret = tor_tls_create_certificate(pk1, pk2, "hello", "hello2", 1); tt_assert(!ret); fixed_crypto_pk_get_evp_pkey_result_index = 0; - fixed_crypto_pk_get_evp_pkey_result[0] = tor_malloc_zero(sizeof(EVP_PKEY)); - fixed_crypto_pk_get_evp_pkey_result[1] = tor_malloc_zero(sizeof(EVP_PKEY)); + fixed_crypto_pk_get_evp_pkey_result[0] = EVP_PKEY_new(); + fixed_crypto_pk_get_evp_pkey_result[1] = EVP_PKEY_new(); ret = tor_tls_create_certificate(pk1, pk2, "hello", "hello2", 1); tt_assert(!ret);

1 0

[tor/master] Make tortls unit tests pass with LibreSSL.
by nickm＠torproject.org 03 Feb '16

03 Feb '16

commit fa52b6f075a8bb90a3f3a014ef7423940f8a20b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 11:31:57 2016 -0500 Make tortls unit tests pass with LibreSSL. Part of the fix for 17921. --- src/common/tortls.c | 2 +- src/test/test_tortls.c | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 5f84e5c..827abc4 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1338,7 +1338,7 @@ find_cipher_by_id(const SSL *ssl, const SSL_METHOD *m, uint16_t cipher) return c != NULL; } # endif -# if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) +# ifndef OPENSSL_1_1_API if (m && m->get_cipher && m->num_ciphers) { /* It would seem that some of the "let's-clean-up-openssl" forks have * removed the get_cipher_by_char function. Okay, so now you get a diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index ce7e6bc..71b3863 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -1600,12 +1600,19 @@ test_tortls_block_renegotiation(void *ignored) tls = tor_malloc_zero(sizeof(tor_tls_t)); tls->ssl = tor_malloc_zero(sizeof(SSL)); tls->ssl->s3 = tor_malloc_zero(sizeof(SSL3_STATE)); - tls->ssl->s3->flags = 0x0010; +#ifndef SUPPORT_UNSAFE_RENEGOTIATION_FLAG +#define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0 +#endif - tor_tls_block_renegotiation(tls); + tls->ssl->s3->flags = SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION; - tt_assert(!(SSL_get_options(tls->ssl) & 0x0010)); + tor_tls_block_renegotiation(tls); +#ifndef OPENSSL_1_1_API + tt_assert(!(tls->ssl->s3->flags & + SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)); +#endif + done: tor_free(tls->ssl->s3); tor_free(tls->ssl); @@ -1622,7 +1629,9 @@ test_tortls_unblock_renegotiation(void *ignored) tls->ssl = tor_malloc_zero(sizeof(SSL)); tor_tls_unblock_renegotiation(tls); - tt_assert(SSL_get_options(tls->ssl) & 0x00040000L); + tt_uint_op(SSL_get_options(tls->ssl) & + SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION, OP_EQ, + SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION); done: tor_free(tls->ssl); @@ -1906,6 +1915,7 @@ fixed_ssl_shutdown(SSL *s) return fixed_ssl_shutdown_result; } +#ifndef LIBRESSL_VERSION_NUMBER static int fixed_ssl_state_to_set; static tor_tls_t *fixed_tls; @@ -1923,6 +1933,7 @@ setting_version_and_state_ssl_shutdown(SSL *s) s->version = SSL2_VERSION; return fixed_ssl_shutdown_result; } +#endif static int dummy_handshake_func(SSL *s) @@ -1956,6 +1967,7 @@ test_tortls_shutdown(void *ignored) ret = tor_tls_shutdown(tls); tt_int_op(ret, OP_EQ, -9); +#ifndef LIBRESSL_VERSION_NUMBER tls->ssl->handshake_func = dummy_handshake_func; fixed_ssl_read_result_index = 0; @@ -2017,6 +2029,7 @@ test_tortls_shutdown(void *ignored) method->ssl_shutdown = setting_version_and_state_ssl_shutdown; ret = tor_tls_shutdown(tls); tt_int_op(ret, OP_EQ, TOR_TLS_ERROR_MISC); +#endif done: teardown_capture_of_logs(previous_log); @@ -2079,6 +2092,7 @@ test_tortls_read(void *ignored) ret = tor_tls_read(tls, buf, 10); tt_int_op(negotiated_callback_called, OP_EQ, 1); +#ifndef LIBRESSL_VERSION_NUMBER fixed_ssl_read_result_index = 0; fixed_ssl_read_result[0] = 0; tls->ssl->version = SSL2_VERSION; @@ -2086,7 +2100,7 @@ test_tortls_read(void *ignored) ret = tor_tls_read(tls, buf, 10); tt_int_op(ret, OP_EQ, TOR_TLS_CLOSE); tt_int_op(tls->state, OP_EQ, TOR_TLS_ST_CLOSED); - +#endif // TODO: fill up done:

1 0

[tor/master] Make crypto/rng_engine test pass on libressl. Bug not in any released tor.
by nickm＠torproject.org 03 Feb '16

03 Feb '16

commit c1c3e45eab08b3ce31254c749fe10d93c6b65cb9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 11:18:16 2016 -0500 Make crypto/rng_engine test pass on libressl. Bug not in any released tor. --- src/test/test_crypto.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 3244c21..671ae7d 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -147,8 +147,14 @@ test_crypto_rng_engine(void *arg) /* We should correct the method if it's a dummy. */ RAND_set_rand_method(&dummy_method); +#ifdef LIBRESSL_VERSION_NUMBER + /* On libressl, you can't override the RNG. */ + tt_assert(RAND_get_rand_method() == RAND_OpenSSL()); + tt_int_op(0, ==, crypto_force_rand_ssleay()); +#else tt_assert(RAND_get_rand_method() == &dummy_method); tt_int_op(1, ==, crypto_force_rand_ssleay()); +#endif tt_assert(RAND_get_rand_method() == RAND_OpenSSL()); /* Make sure we aren't calling dummy_method */

1 0

[tor/master] Merge branch 'openssl_compat'
by nickm＠torproject.org 03 Feb '16

03 Feb '16

commit a5f7a8b047e3e0e58604b054ef98b998be537523 Merge: 957cdb5 fa52b6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 14:46:33 2016 -0500 Merge branch 'openssl_compat' changes/bug17921_bug17984 | 4 ++++ src/common/aes.c | 31 +++++++++++++++---------------- src/common/aes.h | 1 - src/common/compat_openssl.h | 2 ++ src/common/crypto.c | 4 ++++ src/common/tortls.c | 18 ++++++++++++------ src/common/tortls.h | 7 ++++--- src/test/test_crypto.c | 20 ++++++++++++++++---- src/test/test_tortls.c | 33 +++++++++++++++++++++++---------- 9 files changed, 80 insertions(+), 40 deletions(-)

1 0

[tordnsel/master] Ignore cabal sandbox files
by arlo＠torproject.org 03 Feb '16

03 Feb '16

commit 7ca5cac4a0a72bafa758567fe574f50478b37341 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Feb 3 10:58:21 2016 -0800 Ignore cabal sandbox files --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 849ddff..1efea40 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ dist/ +.cabal-sandbox/ +cabal.sandbox.config +

1 0

[tordnsel/master] Update more design doc links
by arlo＠torproject.org 03 Feb '16

03 Feb '16

commit 60cf36913c0b409b2d8514d2ac40af19ec89cd2e Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Feb 3 09:54:10 2016 -0800 Update more design doc links --- src/TorDNSEL/DNS/Server/Internals.hs | 2 +- src/TorDNSEL/Main.hsc | 2 +- src/tordnsel.hs | 2 +- tordnsel.cabal | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/TorDNSEL/DNS/Server/Internals.hs b/src/TorDNSEL/DNS/Server/Internals.hs index 87ad170..008af72 100644 --- a/src/TorDNSEL/DNS/Server/Internals.hs +++ b/src/TorDNSEL/DNS/Server/Internals.hs @@ -216,7 +216,7 @@ dropAuthZone (DomainName authZone) (DomainName name) = -- | Queries asking whether there's a Tor exit node at a specific IP address. data ExitListQuery -- | Query type 1 from - -- <https://gitweb.torproject.org/tordnsel.git/blob/HEAD:/doc/torel-design.txt> + -- <https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt> = IPPort { -- | The address of the candidate exit node. queryAddr :: {-# UNPACK #-} !HostAddress, diff --git a/src/TorDNSEL/Main.hsc b/src/TorDNSEL/Main.hsc index 609543f..5a76519 100644 --- a/src/TorDNSEL/Main.hsc +++ b/src/TorDNSEL/Main.hsc @@ -16,7 +16,7 @@ -- Implements a DNSBL-style interface providing information about whether a -- client for a network service is likely connecting through a Tor exit node. -- --- See <https://gitweb.torproject.org/tordnsel.git/blob/HEAD:/doc/torel-design.txt> for +-- See <https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt> for -- details. -- ----------------------------------------------------------------------------- diff --git a/src/tordnsel.hs b/src/tordnsel.hs index 6218d89..d3f76da 100644 --- a/src/tordnsel.hs +++ b/src/tordnsel.hs @@ -11,7 +11,7 @@ -- Implements a DNSBL-style interface providing information about whether a -- client for a network service is likely connecting through a Tor exit node. -- --- See <https://gitweb.torproject.org/tordnsel.git/blob/HEAD:/doc/torel-design.txt> for +-- See <https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt> for -- details. -- ----------------------------------------------------------------------------- diff --git a/tordnsel.cabal b/tordnsel.cabal index 243e026..8780326 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -3,7 +3,7 @@ Version: 0.1.1-dev Synopsis: provides a DNSBL-style interface for detecting Tor exit nodes Description: TorDNSEL implements a design for a DNSBL-style interface for detecting connections exiting the Tor network. This design and its rationale - is described at <https://gitweb.torproject.org/tordnsel.git/blob/HEAD:/doc/torel-design.txt>. + is described at <https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt>. License: PublicDomain License-File: LICENSE Homepage: http://p56soo2ibjkx23xo.onion/

1 0

[tordnsel/master] Update design doc link in readme
by arlo＠torproject.org 03 Feb '16

03 Feb '16

commit 2a3cad8d041558aebd480d385c3cd47cbf660054 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Feb 3 09:54:10 2016 -0800 Update design doc link in readme --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 9037af6..214b582 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ For an overview, see the man page at doc/tordnsel.8. The design document for TorDNSEL can be found at: - https://gitweb.torproject.org/tordnsel.git/blob/HEAD:/doc/torel-design.txt + https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt Currently, only query type 1 from torel-design.txt is supported:

1 0

[tor/master] Start editing on the changelog entries
by nickm＠torproject.org 03 Feb '16

03 Feb '16

commit 957cdb54699937818b539c75e413e88760ee34cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 3 09:19:05 2016 -0500 Start editing on the changelog entries --- ChangeLog | 67 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7179877..44d4c88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,8 +6,9 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? subsystem. o Major key updates: - - Update the V3 identity key for dannenberg: it was changed on 18 - November 2015. Closes task 17906. Patch by "teor". + - Update the V3 identity key for the dannenberg directory authority: + it was changed on 18 November 2015. Closes task 17906. Patch by + "teor". o Removed features: - Remove client-side support for connecting to Tor servers running @@ -17,55 +18,57 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? patches by Tom van der Woerdt. o Major features (security, Linux): - - When Tor is started as root on Linux and told to switch user ID, - it can now retain the capabilitity to bind to low ports. By + - When Tor starts as root on Linux and is told to switch user ID, + it can now retain the capability to bind to low ports. By default, Tor will do this only when it's switching user ID and some low ports have been configured. You can change this behavior with the new option KeepBindCapabilities. Closes ticket 8195. o Major features (directory system): - - Schedule multiple in-progress consensus downloads during client - bootstrap. Use the first one that starts downloading, close the - rest. This reduces failures when authorities are slow or down. - Together with the code for feature 15775, it reduces failures due - to fallback churn. Implements ticket 4483 (reduce failures when - authorities are down). Patch by "teor". Implements IPv4 portions + - When bootstrapping we not launch multiple consensus downloads + at a time, use the first one that starts downloading, and close the + rest. This reduces failures when authorities or fallback directories are slow or down. + Together with the code for feature 15775, this feature should reduces failures due + to fallback churn. Implements ticket 4483. + Patch by "teor". Implements IPv4 portions of proposal 210 by "mikeperry" and "teor". - - Include an opt-in trial list of default fallback directories in - add_default_fallback_dir_servers(). Doing this should improve - client reliability and initial bootstrap performance, and reduce + - Include a trial list of default fallback directories, based + on an opt-in survey of suitable relays. Doing this should make + clients bootstrap more quickly and reliably, and reduce the load on the directory authorities. Closes ticket 15775. Patch by - "teor". OnionOO script by "weasel", "teor", "gsathya", + "teor". Candidates identified using an OnionOO script by "weasel", "teor", "gsathya", and "karsten". - - Previously only relays who explicitly opened a directory port + - Previously only relays that explicitly opened a directory port (DirPort) accepted directory requests from clients. Now all - relays, with and without a DirPort, who do not disable the - DirCache option accept and serve directory requests sent - (tunnelled) through their ORPort. Closes ticket 12538. + relays, with and without a DirPort, + accept and serve tunneled directory requests that they + receive through their ORPort. You can disable this behavior using + the new DirCache option. + Closes ticket 12538. o Minor features (security, clock): - - Warn when the system clock is set back in time (when the state + - Warn when the system clock appears to move back in time (when the state file was last written in the future). Tor doesn't know that consensuses have expired if the clock is in the past. Patch by "teor". Implements ticket 17188. o Minor features (security, exit policies): - - ExitPolicyRejectPrivate rejects more private addresses by default. - Specifically, it rejects the relay's outbound bind addresses (if + - ExitPolicyRejectPrivate now rejects more private addresses by default. + Specifically, it now rejects the relay's outbound bind addresses (if configured), and the relay's configured port addresses (such as ORPort and DirPort). Fixes bug 17027; bugfix on 0.2.0.11-alpha. Patch by "teor". o Minor features (security, memory erasure): - - Set unused entires in a smartlist to NULL. This helped catch + - Set the unused entires in a smartlist to NULL. This helped catch a (harmless) bug, and shouldn't affect performance too much. Implements ticket 17026. - Use SecureMemoryWipe() function to securely clean memory on - Windows. Implements feature 17986. + Windows. Previously we'd use OpenSSL's OPENSSL_cleanse() function. Implements feature 17986. - Use explicit_bzero or memset_s when present. Previously, we'd use OpenSSL's OPENSSL_cleanse() function. Closes ticket 7419; patches from <logan(a)hackers.mu> and <selven(a)hackers.mu>. - - Make memwipe() do nothing when passed a NULL pointer or zero size. + - Make memwipe() do nothing when passed a NULL pointer or buffer of zero size. Check size argument to memwipe() for underflow. Fixes bug 18089; bugfix on 0.2.3.25 and 0.2.4.6-alpha. Reported by "gk", patch by "teor". @@ -73,25 +76,27 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? o Minor features (security, RNG): - Adjust Tor's use of OpenSSL's RNG APIs so that they absolutely, positively are not allowed to fail. Previously we depended on - internals about OpenSSL behavior. Closes ticket 17686. + internal details of OpenSSL's behavior. Closes ticket 17686. - Never use the system entropy output directly for anything besides seeding the PRNG. When we want to generate important keys, instead - of using system entropy directly, hash it with the PRNG stream. + of using system entropy directly, we now hash it with the PRNG stream. This may help resist certain attacks based on broken OS entropy implementations. Closes part of ticket 17694. - - Use modern system calls to generate strong entropy on platforms - that provide them. Closes ticket 13696. + - Use modern system calls (like getentropy() or getrandom()) to generate strong entropy on platforms + that have them. Closes ticket 13696. o Minor features (accounting): - - Added two modes to AccountingRule in torrc for limiting just input - or just output. Closes ticket 15989; patch from "unixninja92". + - Added two modes to AccountingRule in torrc for limiting just the + number of bytes sent ("AccountingRule out") or the number of bytes + received ("AccountingRule in"). + Closes ticket 15989; patch from "unixninja92". o Minor features (build): - Since our build process now uses 'make distcheck', we no longer force "make dist" to depend on "make check". Closes ticket 17893; patch from "cypherpunks." - Repair some compilation issues with some recent (unreleased, - alpha) vesions of OpenSSL 1.1. Closes ticket 17549. + alpha) versions of OpenSSL 1.1. Closes ticket 17549. o Minor features (controller): - Adds FallbackDir entries to 'GETINFO config/defaults'. Closes

1 0

[tor-messenger-build/master] Update changelog for b443cc69
by arlo＠torproject.org 03 Feb '16

03 Feb '16

commit ef112518876a3a0b8da6d5d88da896a219f33ef9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Feb 2 16:21:11 2016 -0800 Update changelog for b443cc69 --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c78ed29..92f886b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ Tor Messenger -- * All Platforms - * Remove SPI root certificate because Debian no longer ships it (#13795) + * Bug 13795: Remove SPI root certificate because Debian no longer ships it + * Bug 18094: Remove references to torbutton from start-tor-messenger script Tor Messenger 0.1.0b4 -- November 22 2015 * All Platforms

1 0

[tor/master] draft a blurb, mostly stolen from 0.2.7.1-alpha
by nickm＠torproject.org 02 Feb '16

02 Feb '16

commit f087a895d31f72c74d415719eafd1ac55d3526d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 2 13:57:55 2016 -0500 draft a blurb, mostly stolen from 0.2.7.1-alpha --- ChangeLog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d06f403..7179877 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,15 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? - XXXX Blurb goes here XXXX + Tor 0.2.8.1-alpha is the first alpha release in its series. It + includes numerous small features and bugfixes against previous Tor + versions, and numerous small infrastructure improvements. The most + notable features are a set of improvements to the directory + subsystem. o Major key updates: - Update the V3 identity key for dannenberg: it was changed on 18 November 2015. Closes task 17906. Patch by "teor". - o Removed features: + o Removed features: - Remove client-side support for connecting to Tor servers running versions of Tor before 0.2.3.6-alpha. These servers didn't support the v3 TLS handshake protocol, and are no longer allowed on the

1 0