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

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 02 May '18

02 May '18

commit 993e314c6f08d587480070e9f19d313b81b39a09 Merge: bb35405d2 d465bd27e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 08:46:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26007 | 5 +++++ src/or/dirserv.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 02 May '18

02 May '18

commit 993e314c6f08d587480070e9f19d313b81b39a09 Merge: bb35405d2 d465bd27e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 08:46:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26007 | 5 +++++ src/or/dirserv.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/master] Stop logging stack contents when reading a zero-length bandwidth file
by nickm＠torproject.org 02 May '18

02 May '18

commit d465bd27ed79b1924cf893d4e810786a491ee613 Author: teor <teor2345(a)gmail.com> Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the contents of an uninitialised buffer. Log a warning about the empty file instead. Fixes bug 26007; bugfix on 0.2.2.1-alpha. --- changes/bug26007 | 5 +++++ src/or/dirserv.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/bug26007 b/changes/bug26007 new file mode 100644 index 000000000..efcd15084 --- /dev/null +++ b/changes/bug26007 @@ -0,0 +1,5 @@ + o Major bugfixes (directory authorities, security): + - When directory authorities read a zero-byte bandwidth file, they log + a warning with the contents of an uninitialised buffer. Log a warning + about the empty file instead. + Fixes bug 26007; bugfix on 0.2.2.1-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 41c6bf3dc..94290d5dd 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2750,14 +2750,23 @@ dirserv_read_measured_bandwidths(const char *from_file, time_t file_time, now; int ok; + /* Initialise line, so that we can't possibly run off the end. */ + memset(line, 0, sizeof(line)); + if (fp == NULL) { log_warn(LD_CONFIG, "Can't open bandwidth file at configured location: %s", from_file); return -1; } - if (!fgets(line, sizeof(line), fp) - || !strlen(line) || line[strlen(line)-1] != '\n') { + /* If fgets fails, line is either unmodified, or indeterminate. */ + if (!fgets(line, sizeof(line), fp)) { + log_warn(LD_DIRSERV, "Empty bandwidth file"); + fclose(fp); + return -1; + } + + if (!strlen(line) || line[strlen(line)-1] != '\n') { log_warn(LD_DIRSERV, "Long or truncated time in bandwidth file: %s", escaped(line)); fclose(fp);

1 0

[tor/master] coverage: Repeat the test for avoiding failed intro points
by nickm＠torproject.org 02 May '18

02 May '18

commit a2b53c1d0bb759bfe039bb417281bda743655bfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 1 19:58:39 2018 -0400 coverage: Repeat the test for avoiding failed intro points This test, in test_client_pick_intro(), will have different coverage depending on whether it selects a good intro point the first time or whether it has to try a few times. Since it produces the shorter coverage with P=1/4, repeat this test 64 times so that it only provides reduced coverage with P=1/2^128. The performance cost is negligible. Closes ticket 25996. This test was introduced in 0.3.2.1-alpha. --- changes/ticket25996 | 5 +++++ src/test/test_hs_client.c | 18 +++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/changes/ticket25996 b/changes/ticket25996 new file mode 100644 index 000000000..f523bc630 --- /dev/null +++ b/changes/ticket25996 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - Repeat part of the test in test_client_pick_intro() a number of times, + to give it consistent coverage. Fixes bug 25996; bugfix on + 0.3.2.1-alpha. + diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c index 58e12abca..50dca588e 100644 --- a/src/test/test_hs_client.c +++ b/src/test/test_hs_client.c @@ -397,21 +397,25 @@ test_client_pick_intro(void *arg) } SMARTLIST_FOREACH_END(ip); /* Try to get a random intro: Should return the chosen one! */ - extend_info_t *ip = client_get_random_intro(&service_kp.pubkey); - tor_assert(ip); - tt_assert(!tor_mem_is_zero((char*)ip->identity_digest, DIGEST_LEN)); - tt_mem_op(ip->identity_digest, OP_EQ, chosen_intro_ei->identity_digest, - DIGEST_LEN); + /* (We try several times, to make sure this behavior is consistent, and to + * cover the different cases of client_get_random_intro().) */ + for (int i = 0; i < 64; ++i) { + extend_info_t *ip = client_get_random_intro(&service_kp.pubkey); + tor_assert(ip); + tt_assert(!tor_mem_is_zero((char*)ip->identity_digest, DIGEST_LEN)); + tt_mem_op(ip->identity_digest, OP_EQ, chosen_intro_ei->identity_digest, + DIGEST_LEN); + extend_info_free(ip); + } extend_info_free(chosen_intro_ei); - extend_info_free(ip); /* Now also mark the chosen one as failed: See that we can't get any intro points anymore. */ hs_cache_client_intro_state_note(&service_kp.pubkey, &chosen_intro_point->auth_key_cert->signed_key, INTRO_POINT_FAILURE_TIMEOUT); - ip = client_get_random_intro(&service_kp.pubkey); + extend_info_t *ip = client_get_random_intro(&service_kp.pubkey); tor_assert(!ip); }

1 0

[tor/master] Merge branch 'ticket25996'
by nickm＠torproject.org 02 May '18

02 May '18

commit f26d6ead21015b7ba6f7d72ebfc2ebf29da0863b Merge: da8996d61 a2b53c1d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 08:45:35 2018 -0400 Merge branch 'ticket25996' changes/ticket25996 | 5 +++++ src/test/test_hs_client.c | 18 +++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/master] Bug 26000: Fix missing ";"
by nickm＠torproject.org 02 May '18

02 May '18

commit da8996d611438a1e0f9ad001f95bb78398b0ad86 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 2 06:20:26 2018 +0000 Bug 26000: Fix missing ";" --- src/common/compat_time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index b3723f533..40847a844 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -630,7 +630,7 @@ int32_t monotime_coarse_diff_msec32_(const monotime_coarse_t *start, const monotime_coarse_t *end) { - return (int32_t)monotime_coarse_diff_msec(start, end) + return (int32_t)monotime_coarse_diff_msec(start, end); } int64_t

1 0

[tor-browser-build/maint-7.5] Release preparations for 7.5.4
by gk＠torproject.org 02 May '18

02 May '18

commit ad2095ad97cdb3b27f800561529578f3bac511f7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 2 07:52:50 2018 +0000 Release preparations for 7.5.4 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 6 +++--- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ rbm.conf | 5 ++--- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 22c7a0b..886cfdc 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.7.3 + firefox_platform_version: 52.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 38eb2be..cfa0a78 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.3.13 +version: 2018.4.11 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f9a328a..7f5a736 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 7.5.4 -- May 9 2018 + * All platforms + * Update Firefox to 52.8.0esr + * Update HTTPS Everywhere to 2018.4.11 + * Update NoScript to 5.1.8.5 + * Bug 23439: Exempt .onion domains from mixed content warnings + * Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable + * Bug 22659: Changes to `intl.accept.languages` get overwritten after restart + * Bug 25973: Backport off-by-one fix (bug 1352073) + * Bug 25020: Add a tbb_version.json file + Tor Browser 7.5.3 -- March 26 2018 * All platforms * Update Firefox to 52.7.3esr diff --git a/rbm.conf b/rbm.conf index 1f7d0d4..ca427f9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5.3' + torbrowser_version: '7.5.4' torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5.1 - - 7.5.2 + - 7.5.3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-7.5] Bug 25020: add a tbb_version.json file
by gk＠torproject.org 02 May '18

02 May '18

commit 38e9d1caaa0d7cf49e4052e7c709b48ebdba9e31 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 8 14:55:10 2018 +0100 Bug 25020: add a tbb_version.json file Add a tbb_version.json file containing informations about the installed bundle. --- projects/tor-browser/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 7431e26..978d988 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -198,6 +198,8 @@ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/00 [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults +# create tbb_version.json file for #25020 +echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_verson.json popd # Prepare our language packs for using the proper search engines and embed @@ -327,6 +329,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults + # create tbb_version.json file for #25020 + echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang %]"}' > ../tbb_verson.json popd # Set the update.locale (it is used to replace %LOCALE% within

1 0

[tor-browser-build/maint-7.5] Bug 25572: Update NoScript to version 5.1.8.5
by gk＠torproject.org 02 May '18

02 May '18

commit f0f669e25747a9c33f07d365397a030a21ede864 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 11 11:59:12 2018 +0000 Bug 25572: Update NoScript to version 5.1.8.5 --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 661b8e2..dec5648 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://secure.informaction.com/download/releases/noscript-5.1.8.5.xpi name: noscript - sha256sum: 1c85a72cd0d7d210f8dd463f9700214703a5f28319c2b1679db00f861a5289f7 + sha256sum: 7180f8d24ca31989682dee229b95e3503699f2bb25cb593a6a1f2ce0a2253792 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/maint-7.5] Bug 25020: fix a typo in tbb_version.json filename
by gk＠torproject.org 02 May '18

02 May '18

commit f99490f12132557981907254495d2b1d6053018e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Feb 24 21:54:29 2018 +0100 Bug 25020: fix a typo in tbb_version.json filename --- projects/tor-browser/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 978d988..c542818 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -199,7 +199,7 @@ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/00 zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults # create tbb_version.json file for #25020 -echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_verson.json +echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_version.json popd # Prepare our language packs for using the proper search engines and embed @@ -330,7 +330,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults # create tbb_version.json file for #25020 - echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang %]"}' > ../tbb_verson.json + echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang %]"}' > ../tbb_version.json popd # Set the update.locale (it is used to replace %LOCALE% within

1 0