August 2017 - tor-commits - lists.torproject.org

[atlas/master] Revert "Hash the fingerprints from summary documents"
by irl＠torproject.org 09 Aug '17

09 Aug '17

commit f8b1a067011c035575eb3df5505ad000f46e2334 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Aug 9 13:52:31 2017 +0100 Revert "Hash the fingerprints from summary documents" This reverts commit 40426f09f37ff84f93f20f156ab638ce27ff977a. --- js/collections/results.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/js/collections/results.js b/js/collections/results.js index 54cd36a..c341321 100644 --- a/js/collections/results.js +++ b/js/collections/results.js @@ -3,9 +3,8 @@ define([ 'jquery', 'underscore', 'backbone', - 'models/relay', - 'jssha' -], function($, _, Backbone, relayModel, jsSHA){ + 'models/relay' +], function($, _, Backbone, relayModel){ var resultsCollection = Backbone.Collection.extend({ model: relayModel, baseurl: 'https://onionoo.torproject.org/summary?search=', @@ -25,12 +24,12 @@ define([ } _.each(response.relays, function(relay, resultsC) { crelay = new relayModel; - crelay.fingerprint = new jsSHA(relay.f, "HEX").getHash("SHA-1", "HEX").toUpperCase(); + crelay.fingerprint = relay.f; relays.push(crelay); }); _.each(response.bridges, function(relay, resultsC) { crelay = new relayModel; - crelay.fingerprint = new jsSHA(relay.h, "HEX").getHash("SHA-1", "HEX").toUpperCase(); + crelay.fingerprint = relay.h; relays.push(crelay); }); if (relays.length == 0) {

1 0

[tor/master] fix another 32-bit warning
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit d2713b4ddc9d8a98d4b687188bcf392fd3235994 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 9 08:32:39 2017 -0400 fix another 32-bit warning --- src/test/test_hs_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index d79d80bfa..b8b7ab00d 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -179,7 +179,7 @@ test_time_period(void *arg) * from hs_get_next_time_period_num() */ { time_t next_tp_start = hs_get_start_time_of_next_time_period(fake_time); - tt_int_op(hs_get_time_period_num(next_tp_start), OP_EQ, + tt_u64_op(hs_get_time_period_num(next_tp_start), OP_EQ, hs_get_next_time_period_num(fake_time)); }

1 0

[tor/master] Fix a warning on 32-bit clang
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit a3685ba0c53003361402bed2058009da81618ed5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 9 08:31:44 2017 -0400 Fix a warning on 32-bit clang --- src/or/hs_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 0d3d41b7c..6c860b0cf 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -245,7 +245,7 @@ hs_get_start_time_of_next_time_period(time_t now) /* Apply rotation offset as specified by prop224 section [TIME-PERIODS] */ unsigned int time_period_rotation_offset = sr_state_get_phase_duration(); - return start_of_next_tp_in_mins * 60 + time_period_rotation_offset; + return (time_t)(start_of_next_tp_in_mins * 60 + time_period_rotation_offset); } /* Create a new rend_data_t for a specific given <b>version</b>.

1 0

[tor/master] prop224: Fix coverity warnings from #20657 merge.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 21e5146529e4040c7391f3696baa5e6b4370d06d Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Aug 9 13:45:37 2017 +0300 prop224: Fix coverity warnings from #20657 merge. - Fix various ssize_t/size_t confusions in the tests. - Fix a weird memset argument: "bad_memset: Argument -16 in memset loses precision in memset(&desc_two->blinded_kp.pubkey.pubkey, -16, 32UL)." - Fix check_after_deref instance in check_state_line_for_service_rev_counter(): "check_after_deref: Null-checking items suggests that it may be null, but it has already been dereferenced on all paths leading to the check." --- src/or/hs_service.c | 7 +++---- src/test/test_hs_intropoint.c | 14 ++++++++------ src/test/test_hs_service.c | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 5f3696454..cb3a49cb8 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -2111,10 +2111,9 @@ check_state_line_for_service_rev_counter(const char *state_line, b64_key_str, rev_counter); done: - if (items) { - SMARTLIST_FOREACH(items, char*, s, tor_free(s)); - smartlist_free(items); - } + tor_assert(items); + SMARTLIST_FOREACH(items, char*, s, tor_free(s)); + smartlist_free(items); return rev_counter; } diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 09af10904..a5031c5ae 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -446,14 +446,15 @@ test_establish_intro_wrong_sig(void *arg) /* Create outgoing ESTABLISH_INTRO cell and extract its payload so that we attempt to parse it. */ cell_len = new_establish_intro_encoded_cell(circ_nonce, cell_body); - tt_u64_op(cell_len, OP_GT, 0); + tt_i64_op(cell_len, OP_GT, 0); /* Mutate the last byte (signature)! :) */ cell_body[cell_len - 1]++; /* Receive the cell. Should fail. */ setup_full_capture_of_logs(LOG_INFO); - retval = hs_intro_received_establish_intro(intro_circ, cell_body, cell_len); + retval = hs_intro_received_establish_intro(intro_circ, cell_body, + (size_t)cell_len); expect_log_msg_containing("Failed to verify ESTABLISH_INTRO cell."); teardown_capture_of_logs(); tt_int_op(retval, ==, -1); @@ -482,14 +483,15 @@ helper_establish_intro_v3(or_circuit_t *intro_circ) /* Create outgoing ESTABLISH_INTRO cell and extract its payload so that we * attempt to parse it. */ cell_len = new_establish_intro_cell(circ_nonce, &cell); - tt_u64_op(cell_len, OP_GT, 0); + tt_i64_op(cell_len, OP_GT, 0); tt_assert(cell); cell_len = trn_cell_establish_intro_encode(cell_body, sizeof(cell_body), cell); tt_int_op(cell_len, OP_GT, 0); /* Receive the cell */ - retval = hs_intro_received_establish_intro(intro_circ, cell_body, cell_len); + retval = hs_intro_received_establish_intro(intro_circ, cell_body, + (size_t) cell_len); tt_int_op(retval, ==, 0); done: @@ -521,11 +523,11 @@ helper_establish_intro_v2(or_circuit_t *intro_circ) (char*)cell_body, sizeof(cell_body), key1, circ_nonce); - tt_int_op(cell_len, >, 0); + tt_int_op(cell_len, OP_GT, 0); /* Receive legacy establish_intro */ retval = hs_intro_received_establish_intro(intro_circ, - cell_body, cell_len); + cell_body, (size_t) cell_len); tt_int_op(retval, ==, 0); done: diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index aea2c8fbf..60efca15f 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1258,9 +1258,9 @@ test_revision_counter_state(void *arg) /* Prepare both descriptors */ desc_one->desc->plaintext_data.revision_counter = 42; desc_two->desc->plaintext_data.revision_counter = 240; - memset(&desc_one->blinded_kp.pubkey.pubkey, '\x42', + memset(&desc_one->blinded_kp.pubkey.pubkey, 66, sizeof(desc_one->blinded_kp.pubkey.pubkey)); - memset(&desc_two->blinded_kp.pubkey.pubkey, '\xf0', + memset(&desc_two->blinded_kp.pubkey.pubkey, 240, sizeof(desc_one->blinded_kp.pubkey.pubkey)); /* Turn the descriptor rev counters into state lines */

1 0

[tor-browser-bundle/master] Fix typos in changelog
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit e5a74a3aa67c15a093c15a9f40fa221acf2f74fb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 9 11:57:50 2017 +0000 Fix typos in changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 272bd74..aa0c5a8 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,7 +10,7 @@ Tor Browser 7.5a4 -- August 9 2017 * Bug 22618: Downloading pdf file via file:/// is stalling * Bug 22542: Resize slider window to work without scrollbars * Bug 21999: Fix display of language prompt in non-en-US locales - * Bug 18193: Don't let about:tor have chrome privileges + * Bug 18913: Don't let about:tor have chrome privileges * Bug 22535: Search on about:tor discards search query * Bug 21948: Going back to about:tor page gives "Address isn't valid" error * Code clean-up @@ -52,7 +52,7 @@ Tor Browser 7.0.4 -- August 8 2017 * Update Tor to 0.3.0.10 * Update Torbutton to 1.9.7.5 * Bug 21999: Fix display of language prompt in non-en-US locales - * Bug 18193: Don't let about:tor have chrome privileges + * Bug 18913: Don't let about:tor have chrome privileges * Bug 22535: Search on about:tor discards search query * Bug 21948: Going back to about:tor page gives "Address isn't valid" error * Code clean-up

1 0

[tor-browser-build/master] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit cdb545afe64aa22364f2a7e08e0afe27a1f60129 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 16:44:15 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- rbm.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index 6745cdc..4efc57c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -274,8 +274,11 @@ gpg_wrapper: | SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring'; END; -%] - if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ - && [ "$2" = '--verify' ] + # git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 + if ( [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--verify' ] ) \ + || ( [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] ) then [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]}

1 0

[tor-browser-bundle/maint-7.0] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit ddfbe17d6b6a83fc3c7fda2e6737d33221f8539c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 17:08:13 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- gitian/git-gpg-wrapper | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper index f137d6d..b277a48 100755 --- a/gitian/git-gpg-wrapper +++ b/gitian/git-gpg-wrapper @@ -8,6 +8,12 @@ if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ then gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]} +# git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 +elif [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] +then + gpgv "$1" "$4" "$5" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} else exec gpg "$@" fi

1 0

[tor-browser-bundle/master] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit 6b1c63cc05cd28a55a241296808eef448bdf96f3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 17:08:13 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- gitian/git-gpg-wrapper | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper index f137d6d..b277a48 100755 --- a/gitian/git-gpg-wrapper +++ b/gitian/git-gpg-wrapper @@ -8,6 +8,12 @@ if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ then gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]} +# git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 +elif [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] +then + gpgv "$1" "$4" "$5" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} else exec gpg "$@" fi

1 0

[tor-browser-bundle/master] Fold in stable changelog
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit 50046217378fd7b3d95a669cdb3c890a8c085fa9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 9 08:52:54 2017 +0000 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 16c10f5..272bd74 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -46,6 +46,33 @@ Tor Browser 7.5a4 -- August 9 2017 * Linux * Bug 20929: Bump GCC version to 5.4.0 +Tor Browser 7.0.4 -- August 8 2017 + * All Platforms + * Update Firefox to 52.3.0esr + * Update Tor to 0.3.0.10 + * Update Torbutton to 1.9.7.5 + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + * Update Tor Launcher to 0.2.12.3 + * Bug 22592: Default bridge settings are not removed + * Translations update + * Update HTTPS-Everywhere to 5.2.21 + * Update NoScript to 5.0.8.1 + * Bug 22362: Remove workaround for XSS related browser freezing + * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Bug 21321: Exempt .onions from HTTP related security warnings + * Bug 22073: Disable GetAddons option on addons page + * Bug 22884: Fix broken about:tor page on higher security levels + * Windows + * Bug 22829: Remove default obfs4 bridge riemann. + * Bug 21617: Fix single RWX page on Windows (included in 52.3.0esr) + * OS X + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.5a3 -- July 28 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default

1 0

[research-web/master] whoops -- that pdf is important to link to.
by arma＠torproject.org 09 Aug '17

09 Aug '17

commit ddeec9f652be6e47500d1d1c1fbd79968483a67c Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Aug 9 01:39:07 2017 -0400 whoops -- that pdf is important to link to. --- htdocs/safetyboard.html | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/safetyboard.html b/htdocs/safetyboard.html index e1f345f..1058533 100644 --- a/htdocs/safetyboard.html +++ b/htdocs/safetyboard.html @@ -190,6 +190,7 @@ public first. 2017-02: Running HSDir relays to measure longevity of onion services <ul> <li><a href="trsb/2017-02-request.txt">request</a> +<li><a href="trsb/2017-02-request.pdf">request pdf</a> <li><a href="trsb/2017-02-response.txt">response</a> <li><a href="http://tor.ccs.neu.edu/">research project page</a> </ul>

1 0