commit 7dc624cfe9d6e8c7f58d481232b9be7e2a66b7ff Author: Sukhbir Singh sukhbir@torproject.org Date: Mon Aug 28 22:13:42 2017 -0400

Update patch 0001 (all-instantbird.js)

Set security.cert_pinning.enforcement_level to 2 just once. --- .../0001-Set-Tor-Messenger-preferences.patch | 21 ++++++++++++++++----- ...ac-21634-Autologin-default-should-be-false.patch | 2 +- .../0003-XMPP-in-band-registration.patch | 2 +- .../instantbird/0004-Remove-search-from-UI.patch | 2 +- .../0005-Add-Tor-Messenger-branding.patch | 2 +- ...ove-option-for-configuring-account-picture.patch | 2 +- .../0007-Modify-top-protocol-defaults.patch | 2 +- projects/instantbird/0008-Modify-IRC-defaults.patch | 2 +- .../0009-Do-not-set-default-XMPP-server.patch | 2 +- projects/instantbird/0010-Modify-themes.patch | 2 +- projects/instantbird/0011-Remove-logging-UI.patch | 2 +- projects/instantbird/0012-Cert-override.patch | 2 +- .../0013-Display-all-traffic-over-Tor.patch | 2 +- .../instantbird/0014-Trac-17480-Content-sink.patch | 2 +- .../0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...1-Use-built-in-functions-instead-of-an-svg.patch | 2 +- ...0-Add-a-pref-to-disable-JavaScript-in-brow.patch | 2 +- ...7517-Use-different-color-for-Add-Exception.patch | 2 +- ...-21736-Hide-account-timestamp-from-message.patch | 4 ++-- ...owed-duplicated-files-for-Windows-and-Linu.patch | 2 +- ...ug-13855-Use-known-onions-for-XMPP-servers.patch | 2 +- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 2 +- 22 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 454b0e6..09ed103 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,14 +1,14 @@ -From 945f92e09e833c6e6a86d2abdea5eac0da6f21a2 Mon Sep 17 00:00:00 2001 +From 730e73eb45eb1bd60f48b887e08fea837eb2fb40 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 14:30:41 -0400 Subject: [PATCH 01/22] Set Tor Messenger preferences

--- - im/app/profile/all-instantbird.js | 451 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 429 insertions(+), 22 deletions(-) + im/app/profile/all-instantbird.js | 455 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 431 insertions(+), 24 deletions(-)

diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 127c86a662..454ca7ea1b 100644 +index 127c86a662..fd95a1e6b1 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -1,3 +1,53 @@ @@ -124,6 +124,17 @@ index 127c86a662..454ca7ea1b 100644

// disable logging for the search service update system by default pref("browser.search.update.log", false); +@@ -220,8 +267,8 @@ pref("services.kinto.update_enabled", false); + // Block insecure active content on https pages + pref("security.mixed_content.block_active_content", true); + +-// 1 = allow MITM for certificate pinning checks. +-pref("security.cert_pinning.enforcement_level", 1); ++// 2 = Enforce strict cert pinning. ++pref("security.cert_pinning.enforcement_level", 2); + + /* Extension manager */ + pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul"); @@ -235,10 +282,10 @@ pref("extensions.ignoreMTimeChanges", false); pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0"); @@ -529,7 +540,7 @@ index 127c86a662..454ca7ea1b 100644 +pref("security.tls.unrestricted_rc4_fallback", false); + +// Enforce certificate pinning, see: https://bugs.torproject.org/16206 -+pref("security.cert_pinning.enforcement_level", 2); ++// pref("security.cert_pinning.enforcement_level", 2); // TM + +// Don't allow MitM via Microsoft Family Safety, see bug 21686 +pref("security.family_safety.mode", 0); diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch index fdb5a5a..8a31703 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -1,4 +1,4 @@ -From daa4c63a9235f95096e878360e3e84f0d1da8eb6 Mon Sep 17 00:00:00 2001 +From f30bf9e5ec7b7cc90e2e1a2bf37ec5688d00297a Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/22] Trac 21634: Autologin default should be false diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index 3e2aa9d..a1ac6fd 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From a71e9f9b63396b38184c2ee9554a0c752eed898e Mon Sep 17 00:00:00 2001 +From 9c7ed538de969fdaef7de441d275d4c2cd294d9a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 15:09:40 -0400 Subject: [PATCH 03/22] XMPP in-band registration diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index ada0dc6..a63aed3 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From 93d9f82d1f4c6bb6af794bbc78510440da96dc2e Mon Sep 17 00:00:00 2001 +From b6f227a7743eff289177a7c855eb60c87d492f47 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 04/22] Remove search from UI diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index dfc3bc0..7dff68d 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 2501959f0047cc79909fe5ea2d9cf36bb49b0e84 Mon Sep 17 00:00:00 2001 +From 752e23122e3d407fe1bb316e5f1ca71e53415d69 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 15:46:51 -0400 Subject: [PATCH 05/22] Add Tor Messenger branding diff --git a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch index 139eb03..161a25a 100644 --- a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch +++ b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch @@ -1,4 +1,4 @@ -From 29aa4176a752fb024272145e1407c4c8294667a7 Mon Sep 17 00:00:00 2001 +From 90c949783c917b45c02ef7b6767ee22a4a8e92fe Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 06/22] Remove option for configuring account picture diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index 36a545e..db878ff 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 7e5fbd59826780777c7b92379d78862d8bd05612 Mon Sep 17 00:00:00 2001 +From e0736b7a8ca7cea1720015c47552b6b7d7175085 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 16:16:09 -0400 Subject: [PATCH 07/22] Modify top protocol defaults diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index 1dc5e0c..4ccae28 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 6024e2204e047b331726aa6e7d55f53d3f5b1f7a Mon Sep 17 00:00:00 2001 +From 14ebf2df4c9c5e7a0d2c3a9268e10b393fe63d3b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 08/22] Modify IRC defaults diff --git a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch index 605c89d..4af3d80 100644 --- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch +++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch @@ -1,4 +1,4 @@ -From e95333af34cbd0b25deb34eb30ad91a249f1273d Mon Sep 17 00:00:00 2001 +From 9ea7c5e3a1bc12ced843b1d4e19b67f333b47f10 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Fri, 28 Jul 2017 12:11:57 -0400 Subject: [PATCH 09/22] Do not set default XMPP server diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index 9158663..3998f61 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From 386c3799c372ceb41ff845e942d03d54cc8c05b9 Mon Sep 17 00:00:00 2001 +From 85ab3e684647cb41335fcc712c94a26248669a3d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 10/22] Modify themes diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 965a989..12ad58e 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From ae240a3b037a79565b22e2a4f2112769369485de Mon Sep 17 00:00:00 2001 +From 6427bba530252605b5895dca13514397b36bb086 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 11/22] Remove logging UI diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index e681f36..c306165 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From db82a34a94c888c4f5946a1c5741e64953145c3b Mon Sep 17 00:00:00 2001 +From e39504d2376db51c2cc5b77101b94a9fe13cd8ea Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 12/22] Cert override diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index 79fb463..b532820 100644 --- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From e0797717c02828c4c3cb6ba909e2dd7b60191a53 Mon Sep 17 00:00:00 2001 +From 3dc1f46d93c261253f12d108c6e06b715d0a9ba1 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 13/22] Display all traffic over Tor diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index f69e907..8f457f0 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From 41d1a9ba1370706db0e3ac0be00e696234e557a7 Mon Sep 17 00:00:00 2001 +From 9ce5029c19bd6d1ddb1cd0d7f91b9fc3451cb7d8 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 14/22] Trac 17480: Content sink diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 39aab97..7b7f0e6 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From 6bdfde03b90d893e66697fab2edacf65189212fe Mon Sep 17 00:00:00 2001 +From 8e54edd20a485ac7e015d6371383e20afd5401e9 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE diff --git a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index 688d2ab..17acc1d 100644 --- a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,4 +1,4 @@ -From a0d55979dcd4049dc03fc512be8dc7880af6cbfe Mon Sep 17 00:00:00 2001 +From ac74be92685ee7544465667b0acb55d1aedb814c Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 26 Jul 2017 17:14:19 -0400 Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg diff --git a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index c1554fa..2993bff 100644 --- a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From f2c58bf5598e72f827dc785586a1130a859c99a7 Mon Sep 17 00:00:00 2001 +From ee7295bd39f49a23166feae02f2a1b68d52352c5 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 26 Jul 2017 16:35:33 -0400 Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in diff --git a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch index a9e330d..91457c2 100644 --- a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,4 +1,4 @@ -From e3338fcbf8b93f4503332b1b6a5b19b8260e044f Mon Sep 17 00:00:00 2001 +From 8514adfb848b12498b5e819b60211cd6d2a53dd0 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy huyvq.c633@gmail.com Date: Wed, 26 Jul 2017 16:38:19 -0400 Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception diff --git a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch index cb76f05..9d661c8 100644 --- a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch +++ b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch @@ -1,4 +1,4 @@ -From 630a3e4368eff760c8a8445f3743a15796facd19 Mon Sep 17 00:00:00 2001 +From 6234ea255a9e81a93287eab492733ffd8c03424f Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy huyvq.c633@gmail.com Date: Sun, 2 Apr 2017 13:07:09 -0400 Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message @@ -44,7 +44,7 @@ index a723d742bf..95d917f0d7 100644 }

diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 454ca7ea1b..e23c93a4b3 100644 +index fd95a1e6b1..fbc540bc5e 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -47,6 +47,11 @@ pref("extensions.systemAddon.update.url", ""); diff --git a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch index 510d3f1..4fbe1da 100644 --- a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch +++ b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch @@ -1,4 +1,4 @@ -From fdaaef5f4d89795c9b8e6ae9f3abe036708572ff Mon Sep 17 00:00:00 2001 +From c73ff7051711ba1c44b8d3efc158930ee57b2b73 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Thu, 27 Jul 2017 15:16:54 -0400 Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch index 9fe7a4f..e3abbd2 100644 --- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch +++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch @@ -1,4 +1,4 @@ -From 13d28415441e3c6b481d9eed98658a6ee16784bf Mon Sep 17 00:00:00 2001 +From a98e6bc72aa36c55fc6eccd872ca943e61d752b3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Tue, 15 Aug 2017 16:40:33 -0400 Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 2a71000..51d95ed 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From f0e0efda610e24a5e191ac5e6fd583a5b6c99724 Mon Sep 17 00:00:00 2001 +From bf433088d6f7c9af269c0d42a623f164062f09ae Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts