May 2018 - tor-commits - lists.torproject.org

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 11 May '18

11 May '18

commit a2fdbb9476d070a117c544867d36d547f708776a Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 11 14:17:29 2018 +0000 Update translations for tails-perl5lib --- de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de.po b/de.po index 81d977d0d..2c75b1001 100644 --- a/de.po +++ b/de.po @@ -5,6 +5,7 @@ # Translators: # Lukas N <luki.niesen(a)gmail.com>, 2018 # max weber, 2016 +# spriver, 2018 # Tobias Bannert <tobannert(a)gmail.com>, 2013 # rike, 2014-2015 msgid "" @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2018-03-15 12:15+0000\n" -"PO-Revision-Date: 2018-05-10 10:24+0000\n" -"Last-Translator: Lukas N <luki.niesen(a)gmail.com>\n" +"PO-Revision-Date: 2018-05-11 14:17+0000\n" +"Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,4 +36,4 @@ msgstr "Das Gerät, von dem Tails ausgeführt wird, konnte nicht gefunden werden msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "Das Speichermedium von dem Tails ausgeführt wird konnte nicht gefunden werden. Haben Sie vielleicht die `toram' Option benutzt?" +msgstr "Das Speichermedium, von dem Tails ausgeführt wird, konnte nicht gefunden werden. Haben Sie vielleicht die `toram' Option benutzt?"

1 0

[tor/master] control: Mask the event(s) before using ANY_EVENT_IS_INTERESTING()
by nickm＠torproject.org 11 May '18

11 May '18

commit 51f65c185ed88576ab15b66babcbdf3a6553ef71 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri May 11 08:58:11 2018 -0400 control: Mask the event(s) before using ANY_EVENT_IS_INTERESTING() Before this commit, the control events were never triggered. It was introduced with commit 0c19ce7bdece5906e035e71d3fb682632c8bb9cb. Fixes #26082 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/control.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 237a8572d..6f87f5ab5 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -115,7 +115,7 @@ static int disable_log_messages = 0; /** Macro: true if any event from the bitfield 'e' is interesting. */ #define ANY_EVENT_IS_INTERESTING(e) \ - EVENT_IS_INTERESTING(e) + (!! (global_event_mask & (e))) /** If we're using cookie-type authentication, how long should our cookies be? */ @@ -375,11 +375,11 @@ int control_any_per_second_event_enabled(void) { return ANY_EVENT_IS_INTERESTING( - EVENT_BANDWIDTH_USED | - EVENT_CELL_STATS | - EVENT_CIRC_BANDWIDTH_USED | - EVENT_CONN_BW | - EVENT_STREAM_BANDWIDTH_USED + EVENT_MASK_(EVENT_BANDWIDTH_USED) | + EVENT_MASK_(EVENT_CELL_STATS) | + EVENT_MASK_(EVENT_CIRC_BANDWIDTH_USED) | + EVENT_MASK_(EVENT_CONN_BW) | + EVENT_MASK_(EVENT_STREAM_BANDWIDTH_USED) ); }

1 0

[tor/master] Properly ignore retval of event_del().
by nickm＠torproject.org 11 May '18

11 May '18

commit efe8f17a4dc48d43cbc0a523c9dc0560771ff2c5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri May 11 15:17:52 2018 +0300 Properly ignore retval of event_del(). Fixes #26078: CID 1435546. --- src/common/compat_libevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 56ee682fd..e60eb148d 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -283,7 +283,7 @@ void periodic_timer_disable(periodic_timer_t *timer) { tor_assert(timer); - event_del(timer->ev); + (void) event_del(timer->ev); } /** Stop and free a periodic timer */

1 0

[tor/master] Merge remote-tracking branch 'asn-github/bug26078'
by nickm＠torproject.org 11 May '18

11 May '18

commit 9800f4769f2dd7a58c061661c224c0f860ff76ca Merge: d50d07fce efe8f17a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 08:20:49 2018 -0400 Merge remote-tracking branch 'asn-github/bug26078' src/common/compat_libevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] testing: X509 certificate structure needs to be initialized
by nickm＠torproject.org 11 May '18

11 May '18

commit 308eec7532691f6a352446020aeb7839a6af927e Author: Marcin Cieślak <saper(a)saper.info> Date: Fri May 11 00:16:52 2018 +0000 testing: X509 certificate structure needs to be initialized We alloc/free X.509 structures in three ways: 1) X509 structure allocated with X509_new() and X509_free() 2) Fake X509 structure allocated with fake_x509_malloc() and fake_x509_free() May contain valid pointers inside. 3) Empty X509 structure shell allocated with tor_malloc_zero() and freed with tor_free() --- src/test/test_tortls.c | 53 +++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 896e09396..388f6df32 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -522,7 +522,7 @@ test_tortls_x509_cert_free(void *ignored) tor_x509_cert_free(cert); cert = tor_malloc_zero(sizeof(tor_x509_cert_t)); - cert->cert = tor_malloc_zero(sizeof(X509)); + cert->cert = X509_new(); cert->encoded = tor_malloc_zero(1); tor_x509_cert_free(cert); } @@ -560,6 +560,15 @@ fixed_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) return 1; } +/* + * Use only for the matching fake_x509_free() call + */ +static X509 * +fake_x509_malloc(void) +{ + return tor_malloc_zero(sizeof(X509)); +} + static void fake_x509_free(X509 *cert) { @@ -590,9 +599,9 @@ test_tortls_cert_matches_key(void *ignored) tls = tor_malloc_zero(sizeof(tor_tls_t)); cert = tor_malloc_zero(sizeof(tor_x509_cert_t)); - one = tor_malloc_zero(sizeof(X509)); + one = fake_x509_malloc(); one->references = 1; - two = tor_malloc_zero(sizeof(X509)); + two = fake_x509_malloc(); two->references = 1; res = tor_tls_cert_matches_key(tls, cert); @@ -648,7 +657,7 @@ test_tortls_cert_get_key(void *ignored) crypto_pk_t *res = NULL; cert = tor_malloc_zero(sizeof(tor_x509_cert_t)); X509 *key = NULL; - key = tor_malloc_zero(sizeof(X509)); + key = fake_x509_malloc(); key->references = 1; res = tor_tls_cert_get_key(cert); @@ -2475,8 +2484,8 @@ test_tortls_context_new(void *ignored) fixed_crypto_pk_generate_key_with_bits_result[1] = 0; fixed_tor_tls_create_certificate_result_index = 0; fixed_tor_tls_create_certificate_result[0] = NULL; - fixed_tor_tls_create_certificate_result[1] = tor_malloc_zero(sizeof(X509)); - fixed_tor_tls_create_certificate_result[2] = tor_malloc_zero(sizeof(X509)); + fixed_tor_tls_create_certificate_result[1] = X509_new(); + fixed_tor_tls_create_certificate_result[2] = X509_new(); ret = tor_tls_context_new(NULL, 0, 0, 0); tt_assert(!ret); @@ -2486,9 +2495,9 @@ test_tortls_context_new(void *ignored) fixed_crypto_pk_new_result[2] = NULL; fixed_crypto_pk_generate_key_with_bits_result_index = 0; fixed_tor_tls_create_certificate_result_index = 0; - fixed_tor_tls_create_certificate_result[0] = tor_malloc_zero(sizeof(X509)); + fixed_tor_tls_create_certificate_result[0] = X509_new(); fixed_tor_tls_create_certificate_result[1] = NULL; - fixed_tor_tls_create_certificate_result[2] = tor_malloc_zero(sizeof(X509)); + fixed_tor_tls_create_certificate_result[2] = X509_new(); ret = tor_tls_context_new(NULL, 0, 0, 0); tt_assert(!ret); @@ -2498,8 +2507,8 @@ test_tortls_context_new(void *ignored) fixed_crypto_pk_new_result[2] = NULL; fixed_crypto_pk_generate_key_with_bits_result_index = 0; fixed_tor_tls_create_certificate_result_index = 0; - fixed_tor_tls_create_certificate_result[0] = tor_malloc_zero(sizeof(X509)); - fixed_tor_tls_create_certificate_result[1] = tor_malloc_zero(sizeof(X509)); + fixed_tor_tls_create_certificate_result[0] = X509_new(); + fixed_tor_tls_create_certificate_result[1] = X509_new(); fixed_tor_tls_create_certificate_result[2] = NULL; ret = tor_tls_context_new(NULL, 0, 0, 0); tt_assert(!ret); @@ -2511,9 +2520,9 @@ test_tortls_context_new(void *ignored) fixed_crypto_pk_new_result[2] = NULL; fixed_crypto_pk_generate_key_with_bits_result_index = 0; fixed_tor_tls_create_certificate_result_index = 0; - fixed_tor_tls_create_certificate_result[0] = tor_malloc_zero(sizeof(X509)); - fixed_tor_tls_create_certificate_result[1] = tor_malloc_zero(sizeof(X509)); - fixed_tor_tls_create_certificate_result[2] = tor_malloc_zero(sizeof(X509)); + fixed_tor_tls_create_certificate_result[0] = X509_new(); + fixed_tor_tls_create_certificate_result[1] = X509_new(); + fixed_tor_tls_create_certificate_result[2] = X509_new(); fixed_tor_x509_cert_new_result_index = 0; fixed_tor_x509_cert_new_result[0] = NULL; fixed_tor_x509_cert_new_result[1] = NULL; @@ -2527,9 +2536,9 @@ test_tortls_context_new(void *ignored) fixed_crypto_pk_new_result[2] = NULL; fixed_crypto_pk_generate_key_with_bits_result_index = 0; fixed_tor_tls_create_certificate_result_index = 0; - fixed_tor_tls_create_certificate_result[0] = tor_malloc_zero(sizeof(X509)); - fixed_tor_tls_create_certificate_result[1] = tor_malloc_zero(sizeof(X509)); - fixed_tor_tls_create_certificate_result[2] = tor_malloc_zero(sizeof(X509)); + fixed_tor_tls_create_certificate_result[0] = X509_new(); + fixed_tor_tls_create_certificate_result[1] = X509_new(); + fixed_tor_tls_create_certificate_result[2] = X509_new(); fixed_tor_x509_cert_new_result_index = 0; fixed_tor_x509_cert_new_result[0] = tor_malloc_zero(sizeof(tor_x509_cert_t)); fixed_tor_x509_cert_new_result[1] = NULL; @@ -2543,9 +2552,9 @@ test_tortls_context_new(void *ignored) fixed_crypto_pk_new_result[2] = NULL; fixed_crypto_pk_generate_key_with_bits_result_index = 0; fixed_tor_tls_create_certificate_result_index = 0; - fixed_tor_tls_create_certificate_result[0] = tor_malloc_zero(sizeof(X509)); - fixed_tor_tls_create_certificate_result[1] = tor_malloc_zero(sizeof(X509)); - fixed_tor_tls_create_certificate_result[2] = tor_malloc_zero(sizeof(X509)); + fixed_tor_tls_create_certificate_result[0] = X509_new(); + fixed_tor_tls_create_certificate_result[1] = X509_new(); + fixed_tor_tls_create_certificate_result[2] = X509_new(); fixed_tor_x509_cert_new_result_index = 0; fixed_tor_x509_cert_new_result[0] = tor_malloc_zero(sizeof(tor_x509_cert_t)); fixed_tor_x509_cert_new_result[1] = tor_malloc_zero(sizeof(tor_x509_cert_t)); @@ -2559,9 +2568,9 @@ test_tortls_context_new(void *ignored) fixed_crypto_pk_new_result[2] = NULL; fixed_crypto_pk_generate_key_with_bits_result_index = 0; fixed_tor_tls_create_certificate_result_index = 0; - fixed_tor_tls_create_certificate_result[0] = tor_malloc_zero(sizeof(X509)); - fixed_tor_tls_create_certificate_result[1] = tor_malloc_zero(sizeof(X509)); - fixed_tor_tls_create_certificate_result[2] = tor_malloc_zero(sizeof(X509)); + fixed_tor_tls_create_certificate_result[0] = X509_new(); + fixed_tor_tls_create_certificate_result[1] = X509_new(); + fixed_tor_tls_create_certificate_result[2] = X509_new(); fixed_tor_x509_cert_new_result_index = 0; fixed_tor_x509_cert_new_result[0] = tor_malloc_zero(sizeof(tor_x509_cert_t)); fixed_tor_x509_cert_new_result[1] = tor_malloc_zero(sizeof(tor_x509_cert_t));

1 0

[tor/master] Merge remote-tracking branch 'saper-github/x509_cert_free_crash'
by nickm＠torproject.org 11 May '18

11 May '18

commit 3799f3116bfb6ee2dc8f25ec90a5a9b7d17021ee Merge: 75e5b778e 308eec753 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 08:09:26 2018 -0400 Merge remote-tracking branch 'saper-github/x509_cert_free_crash' src/test/test_tortls.c | 53 +++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 22 deletions(-)

1 0

[tor/master] changes file for 25943 and 25944
by nickm＠torproject.org 11 May '18

11 May '18

commit d50d07fce57a023e52e7190ce97de2e85d88ada0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 08:16:02 2018 -0400 changes file for 25943 and 25944 --- changes/bug25943 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug25943 b/changes/bug25943 new file mode 100644 index 000000000..187f9a287 --- /dev/null +++ b/changes/bug25943 @@ -0,0 +1,7 @@ + o Minor bugfixes (tests): + - Use X509_new() to allocate certificates that will be freed later + with X509_free(). Previously, some parts of the unit tests had + used tor_malloc_zero(), which is incorrect, and which caused + test failures on Windows when they were built with extra hardening. + Fixes bugs 25943 and 25944; bugfix on 0.2.8.1-alpha. + Patch by Marcin Cieślak.

1 0

[tor/master] Don't crash when closing a connection before initializing libevent
by nickm＠torproject.org 10 May '18

10 May '18

commit 8b1380cbd08f40dc2abee171a390df6d04e999d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 14:30:30 2018 -0400 Don't crash when closing a connection before initializing libevent Fixes bug 25981; bugfix on 96c5ac338a7df. Bug not in any released version of Tor. --- src/or/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index c3505a2d9..87b57f89e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1676,6 +1676,11 @@ static mainloop_event_t *postloop_cleanup_ev=NULL; void mainloop_schedule_postloop_cleanup(void) { + if (PREDICT_UNLIKELY(postloop_cleanup_ev == NULL)) { + // (It's possible that we can get here if we decide to close a connection + // in the earliest stages of our configuration, before we create events.) + return; + } mainloop_event_activate(postloop_cleanup_ev); }

1 0

[tor/master] Merge remote-tracking branch 'public/bug25981'
by nickm＠torproject.org 10 May '18

10 May '18

commit 75e5b778e10cbc6caa4e4902e288a0c63f92ce06 Merge: 382beb93c 8b1380cbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 19:31:11 2018 -0400 Merge remote-tracking branch 'public/bug25981' src/or/main.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[doctor/master] Use new methods to reference diretories
by atagar＠torproject.org 10 May '18

10 May '18

commit 49cce6ce032d36c35f65a43ad17efe01a5d403a1 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 10 12:51:21 2018 -0700 Use new methods to reference diretories Using stem's new stem.directory module rather than the deprecated aliases. --- consensus_health_checker.py | 3 ++- descriptor_checker.py | 3 ++- fallback_directories.py | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 9710b5e..993ef73 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -16,6 +16,7 @@ import util import stem.descriptor import stem.descriptor.remote +import stem.directory import stem.util.conf import stem.util.enum @@ -24,7 +25,7 @@ from stem.util.lru_cache import lru_cache Runlevel = stem.util.enum.UppercaseEnum('NOTICE', 'WARNING', 'ERROR') -DIRECTORY_AUTHORITIES = stem.descriptor.remote.get_authorities() +DIRECTORY_AUTHORITIES = stem.directory.Authority.from_cache() del DIRECTORY_AUTHORITIES['tor26'] # DirPort does not service requests without a '.z' suffix EMAIL_SUBJECT = 'Consensus issues' diff --git a/descriptor_checker.py b/descriptor_checker.py index fd7c91d..9764f87 100755 --- a/descriptor_checker.py +++ b/descriptor_checker.py @@ -17,6 +17,7 @@ import util import stem.descriptor import stem.descriptor.remote +import stem.directory EMAIL_SUBJECT = 'Unable to retrieve tor descriptors' @@ -61,7 +62,7 @@ def main(): # download the consensus from each authority - for authority in stem.descriptor.remote.get_authorities().values(): + for authority in stem.directory.Authority.from_cache().values(): if authority.v3ident is None: continue # authority doesn't vote in the consensus elif authority.nickname == 'tor26': diff --git a/fallback_directories.py b/fallback_directories.py index 8ede789..3e4ce06 100755 --- a/fallback_directories.py +++ b/fallback_directories.py @@ -9,7 +9,8 @@ Report for how many of our fallback directories are unreachable. import time import traceback -from stem.descriptor.remote import DescriptorDownloader, FallbackDirectory +import stem.descriptor.remote +import stem.directory import util @@ -24,12 +25,12 @@ EMAIL_BODY = """\ """ -downloader = DescriptorDownloader(timeout = 30) +downloader = stem.descriptor.remote.DescriptorDownloader(timeout = 30) def main(): try: - fallback_directories = FallbackDirectory.from_remote().values() + fallback_directories = stem.directory.Fallback.from_remote().values() log.info('Retrieved %i fallback directories' % len(fallback_directories)) except IOError as exc: raise IOError("Unable to determine tor's fallback directories: %s" % exc)

1 0