December 2018 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1474626 - fix timestamp test and values, r=rpl
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit b3d74f7db1cc0ddf54771e3e9e5de4b8549b0c88 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Wed Jul 11 14:54:03 2018 -0300 Bug 1474626 - fix timestamp test and values, r=rpl The test was incorrect and the timestamp should be milliseconds, not microseconds. MozReview-Commit-ID: 2d79r6PHH4Z --HG-- extra : rebase_source : edd97899f0646f2cae2fbf119206ec470a6b97a0 --- .../extensions/test/mochitest/test_ext_webrequest_hsts.html | 6 +++++- toolkit/modules/addons/SecurityInfo.jsm | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html index df8b541808f9..b8385ca08843 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html @@ -38,7 +38,11 @@ function getExtension() { browser.test.assertTrue(securityInfo.certificates.length == 1, "no certificate chain"); } let cert = securityInfo.certificates[0]; - browser.test.assertTrue(cert.validity.start < Date.now() < cert.validity.end, "cert validity is correct"); + let now = Date.now(); + browser.test.assertTrue(Number.isInteger(cert.validity.start), "cert start is integer"); + browser.test.assertTrue(Number.isInteger(cert.validity.end), "cert end is integer"); + browser.test.assertTrue(cert.validity.start < now, "cert start validity is correct"); + browser.test.assertTrue(now < cert.validity.end, "cert end validity is correct"); if (options.rawDER) { for (let cert of securityInfo.certificates) { browser.test.assertTrue(cert.rawDER.length > 0, "have rawDER"); diff --git a/toolkit/modules/addons/SecurityInfo.jsm b/toolkit/modules/addons/SecurityInfo.jsm index a931602b517a..de0084398aa6 100644 --- a/toolkit/modules/addons/SecurityInfo.jsm +++ b/toolkit/modules/addons/SecurityInfo.jsm @@ -214,8 +214,8 @@ const SecurityInfo = { subject: cert.subjectName, issuer: cert.issuerName, validity: { - start: cert.validity.notBefore, - end: cert.validity.notAfter, + start: cert.validity.notBefore ? Math.trunc(cert.validity.notBefore / 1000) : 0, + end: cert.validity.notAfter ? Math.trunc(cert.validity.notAfter / 1000) : 0, }, fingerprint: { sha1: cert.sha1Fingerprint,

1 0

[torbutton/master] Bug 28540: Use new text for 2018 donation banner
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 4ad39b362dd7692b5e24841c616f63a5ca2bc67a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 20 17:25:48 2018 -0800 Bug 28540: Use new text for 2018 donation banner --- src/chrome/content/aboutTor/aboutTor-content.js | 2 +- src/chrome/content/aboutTor/aboutTor.xhtml | 24 +++++++++++++++--------- src/chrome/content/torbutton.js | 2 +- src/defaults/preferences/preferences.js | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index d34bbe5c..e53266bd 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -72,7 +72,7 @@ var AboutTorListener = { sendAsyncMessage(that.kAboutTorHideDonationBanner); }); }); - bindPrefAndInit("extensions.torbutton.donation_banner_countdown", + bindPrefAndInit("extensions.torbutton.donation_banner_countdown2", countdown => { if (content.document && content.document.body) { content.document.body.setAttribute( diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 94dd13f3..5f5fccdc 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -37,15 +37,17 @@ window.addEventListener("pageshow", function() { <div id="donation-banner-lines"> <div id="donation-banner-line1">&aboutTor.donationBanner.line1;</div> <div id="donation-banner-line2" - data-0="&aboutTor.donationBanner.line2a;" - data-1="&aboutTor.donationBanner.line2b;" - data-2="&aboutTor.donationBanner.line2c;" - data-3="&aboutTor.donationBanner.line2d;" - data-4="&aboutTor.donationBanner.line2e;" - data-5="&aboutTor.donationBanner.line2f;"> - &aboutTor.donationBanner.line2a; + data-6="&aboutTor.donationBanner.line2e;" + data-7="&aboutTor.donationBanner.line2f;" + data-8="&aboutTor.donationBanner.line2g;" + data-9="&aboutTor.donationBanner.line2h;" + data-10="&aboutTor.donationBanner.line2i;" + data-11="&aboutTor.donationBanner.line2j;"> + &aboutTor.donationBanner.line2e; </div> - <div id="donation-banner-line3">&aboutTor.donationBanner.line3;</div> + <div id="donation-banner-line3" + data-b="&aboutTor.donationBanner.line3b;"> + &aboutTor.donationBanner.line3;</div> <a id="donation-banner-button" href="https://www.torproject.org/donate/donate-sin-tbd0-0" type="button" @@ -58,13 +60,17 @@ window.addEventListener("pageshow", function() { </div> <script type="text/javascript"> <![CDATA[ - let lineChoice = Math.floor(Math.random() * 6); + let lineChoice = 6 + Math.floor(Math.random() * 6); let line2 = document.getElementById("donation-banner-line2"); let line2text = line2.getAttribute(`data-${lineChoice}`); let line2pieces = line2text.split(" "); let line2end = '<span>' + line2pieces.pop() + '</span>'; line2pieces.push(line2end); line2.innerHTML = line2pieces.join(" "); + line3 = document.getElementById("donation-banner-line3"); + if (lineChoice === 11) { + line3.innerHTML = line3.getAttribute("data-b"); + } let buttonChoice = Math.floor(Math.random() * 2); let button = document.getElementById("donation-banner-button"); button.innerHTML = button.getAttribute(`data-${buttonChoice}`); diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ee13f461..8bd847f9 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -17,7 +17,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown"; +const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown2"; var m_tb_prefs = Services.prefs; diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 9beb3993..eb055a65 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.donation_banner_countdown", 12); +pref("extensions.torbutton.donation_banner_countdown2", 12); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[tor-browser-build/master] Update OpenSSL to 1.0.2q
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 30c764db2bbbde93ebee67e2b190a4d9c88873b9 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 3 08:06:40 2018 +0000 Update OpenSSL to 1.0.2q --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index d3ed959..e91e820 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2p +version: 1.0.2q filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00 + sha256sum: 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684

1 0

[tor-browser-build/master] Tagging build2
by gk＠torproject.org 01 Dec '18

01 Dec '18

commit c1667c29be45ba7296dae3e268115137c4f687a5 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 1 13:50:15 2018 +0000 Tagging build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 5d1d861..0d53855 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a4 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 28677: Copy all the bundles for our releases
by gk＠torproject.org 01 Dec '18

01 Dec '18

commit e9a2fc5a9d9ee5571ca6daf94ac367e14732cd50 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 1 13:33:54 2018 +0000 Bug 28677: Copy all the bundles for our releases --- projects/release/build | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 2c9912f..e7c7410 100644 --- a/projects/release/build +++ b/projects/release/build @@ -6,7 +6,6 @@ destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" [% IF c("var/torbrowser-android-armv7") -%] mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ - [% RETURN %] [% END -%] [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/

1 0