summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2020-02-16 10:17:11 +0000
committerintrigeri <intrigeri@boum.org>2020-02-16 10:17:11 +0000
commit6a024a3d0c723cbe72fe7fd62c58acb99c8599cc (patch)
treeb032b9c9a282ea3580f6d97bbd271484fabcc67f
parente4c8259d35036298de246afc60405701b9f072ee (diff)
parent259efcbdb672477b99e9a0f83897658c40acd351 (diff)
Merge branch 'bugfix/17481-refresh-thunderbird-patches' into feature/17439-enable-cachewebsite-by-default
-rw-r--r--config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Add-pref-for-whether-to-accept-plaintext-protocols-d.patch28
-rw-r--r--config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Add-pref-for-whether-we-accept-OAuth2-during-autocon.patch79
-rw-r--r--config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Avoid-local-timestamp-disclosure-in-Date-header.patch27
-rw-r--r--config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Avoid-spellchecking-language-disclosure-in-Content-Language-header.patch8
-rw-r--r--config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Make-use-of-non-SSL-Exchange-AutoDiscover-methods-op.patch11
-rw-r--r--config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Prefer-fetched-configurations-using-SSL-over-plainte.patch11
6 files changed, 76 insertions, 88 deletions
diff --git a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Add-pref-for-whether-to-accept-plaintext-protocols-d.patch b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Add-pref-for-whether-to-accept-plaintext-protocols-d.patch
index c9bb089..cf6431e 100644
--- a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Add-pref-for-whether-to-accept-plaintext-protocols-d.patch
+++ b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Add-pref-for-whether-to-accept-plaintext-protocols-d.patch
@@ -1,20 +1,16 @@
-From 619c17e0dc3d1cbfdf3859b18c9e71ec00694f9c Mon Sep 17 00:00:00 2001
-From: anonym <anonym@riseup.net>
-Date: Wed, 27 Feb 2019 10:59:33 +0100
+From: intrigeri <intrigeri@boum.org>
+Date: Sun, 16 Feb 2020 09:29:00 +0000
Subject: [PATCH] Add pref for whether to accept plaintext protocols during
autoconfiguration.
-Let's make it possible for security-focused distributions (and
-extensions like TorBirdy) to prevent insecure configurations to ever
-be displayed to users; for other users there is a warning explaining
-the consequences of accepting a non-SSL configuration.
-
+Author: anonym <anonym@riseup.net>
---
- .../components/accountcreation/content/readFromXML.js | 10 ++++++++++
- comm/mailnews/mailnews.js | 6 ++++++
+ comm/mail/components/accountcreation/content/readFromXML.js | 10 ++++++++++
+ comm/mailnews/mailnews.js | 6 ++++++
2 files changed, 16 insertions(+)
diff --git a/comm/mail/components/accountcreation/content/readFromXML.js b/comm/mail/components/accountcreation/content/readFromXML.js
+index 780229f..6a9fef9 100644
--- a/comm/mail/components/accountcreation/content/readFromXML.js
+++ b/comm/mail/components/accountcreation/content/readFromXML.js
@@ -34,6 +34,8 @@ function readFromXML(clientConfigXML) {
@@ -26,10 +22,10 @@ diff --git a/comm/mail/components/accountcreation/content/readFromXML.js b/comm/
var exception;
if (
typeof clientConfigXML != "object" ||
-@@ -113,6 +115,10 @@ function readFromXML(clientConfigXML) {
+@@ -115,6 +117,10 @@ function readFromXML(clientConfigXML) {
}
exception = null;
-
+
+ if (ssl_only && iO.socketType == 1) {
+ continue;
+ }
@@ -37,10 +33,10 @@ diff --git a/comm/mail/components/accountcreation/content/readFromXML.js b/comm/
for (let iXauth of array_or_undef(iX.$authentication)) {
try {
iO.auth = sanitize.translate(iXauth, {
-@@ -255,6 +261,10 @@ function readFromXML(clientConfigXML) {
+@@ -257,6 +263,10 @@ function readFromXML(clientConfigXML) {
}
exception = null;
-
+
+ if (ssl_only && oO.socketType == 1) {
+ continue;
+ }
@@ -49,9 +45,10 @@ diff --git a/comm/mail/components/accountcreation/content/readFromXML.js b/comm/
try {
oO.auth = sanitize.translate(oXauth, {
diff --git a/comm/mailnews/mailnews.js b/comm/mailnews/mailnews.js
+index 8f598b2..7dda1ad 100644
--- a/comm/mailnews/mailnews.js
+++ b/comm/mailnews/mailnews.js
-@@ -962,6 +962,12 @@ pref("mailnews.auto_config.guess.sslOnly", false);
+@@ -969,6 +969,12 @@ pref("mailnews.auto_config.guess.sslOnly", false);
pref("mailnews.auto_config.guess.timeout", 10);
// Whether we allow fetched configurations using OAuth2.
pref("mailnews.auto_config.account_constraints.allow_oauth2", true);
@@ -63,3 +60,4 @@ diff --git a/comm/mailnews/mailnews.js b/comm/mailnews/mailnews.js
+pref("mailnews.auto_config.sslOnly", false);
// Work around bug 1454325 by disabling mimetype mungling in XmlHttpRequest
pref("dom.xhr.standard_content_type_normalization", false);
+
diff --git a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Add-pref-for-whether-we-accept-OAuth2-during-autocon.patch b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Add-pref-for-whether-we-accept-OAuth2-during-autocon.patch
index 97f9ef8..1cf40e7 100644
--- a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Add-pref-for-whether-we-accept-OAuth2-during-autocon.patch
+++ b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Add-pref-for-whether-we-accept-OAuth2-during-autocon.patch
@@ -1,6 +1,5 @@
-From bd42ea2e3864f97608530d3f79efb8f816f2c71a Mon Sep 17 00:00:00 2001
-From: anonym <anonym@riseup.net>
-Date: Wed, 27 Feb 2019 10:34:33 +0100
+From: intrigeri <intrigeri@boum.org>
+Date: Sun, 16 Feb 2020 09:23:28 +0000
Subject: [PATCH] Add pref for whether we accept OAuth2 during
autoconfiguration.
@@ -9,29 +8,41 @@ disabled autoconfiguration then result in a terrible UX (e.g. the web
login fails, has to manually alter the authentication method). Let's
provide a pref that discards OAuth2 configurations so e.g. extensions
that disables JavaScript (like TorBirdy) can provide a workaround.
+
+Original author: anonym <anonym@riseup.net>
---
- .../accountcreation/content/emailWizard.js | 74 ++++++++++---------
- .../accountcreation/content/readFromXML.js | 13 ++++
- comm/mailnews/mailnews.js | 2 +
- 3 files changed, 54 insertions(+), 35 deletions(-)
+ .../accountcreation/content/emailWizard.js | 64 ++++++++++++----------
+ .../accountcreation/content/readFromXML.js | 13 +++++
+ comm/mailnews/mailnews.js | 2 +
+ 3 files changed, 49 insertions(+), 30 deletions(-)
+diff --git a/comm/mail/components/accountcreation/content/emailWizard.js b/comm/mail/components/accountcreation/content/emailWizard.js
+index 3780792..86bef64 100644
--- a/comm/mail/components/accountcreation/content/emailWizard.js
+++ b/comm/mail/components/accountcreation/content/emailWizard.js
-@@ -1338,25 +1338,27 @@ EmailConfigWizard.prototype = {
+@@ -1432,21 +1432,23 @@ EmailConfigWizard.prototype = {
}
this.fillPortDropdown(config.incoming.type);
-
-- // If the hostname supports OAuth2 and imap is enabled, enable OAuth2.
+
+- // If the incoming server hostname supports OAuth2, enable OAuth2 for it.
- let iDetails = OAuth2Providers.getHostnameDetails(config.incoming.hostname);
+- e("in-authMethod-oauth2").hidden = !iDetails;
- if (iDetails) {
- gEmailWizardLogger.info(
- "OAuth2 details for incoming server " +
- config.incoming.hostname +
- " is " +
- iDetails
+- );
+- config.oauthSettings = {};
+- [config.oauthSettings.issuer, config.oauthSettings.scope] = iDetails;
+- // oauthsettings are not stored nor changeable in the user interface, so just
+- // store them in the base configuration.
+- this._currentConfig.oauthSettings = config.oauthSettings;
+ if (Services.prefs.getBoolPref("mailnews.auto_config.account_constraints.allow_oauth2")) {
-+ // If the hostname supports OAuth2 and imap is enabled, enable OAuth2.
++ // If the incoming server hostname supports OAuth2, enable OAuth2 for it.
+ let iDetails = OAuth2Providers.getHostnameDetails(config.incoming.hostname);
++ e("in-authMethod-oauth2").hidden = !iDetails;
+ if (iDetails) {
+ gEmailWizardLogger.info(
+ "OAuth2 details for incoming server " +
@@ -39,21 +50,6 @@ that disables JavaScript (like TorBirdy) can provide a workaround.
+ " is " +
+ iDetails
+ );
-+ }
-+ e("in-authMethod-oauth2").hidden = !(
-+ iDetails && e("incoming_protocol").value == 1
- );
-- }
-- e("in-authMethod-oauth2").hidden = !(
-- iDetails && e("incoming_protocol").value == 1
-- );
-- if (!e("in-authMethod-oauth2").hidden) {
-- config.oauthSettings = {};
-- [config.oauthSettings.issuer, config.oauthSettings.scope] = iDetails;
-- // oauthsettings are not stored nor changeable in the user interface, so just
-- // store them in the base configuration.
-- this._currentConfig.oauthSettings = config.oauthSettings;
-+ if (!e("in-authMethod-oauth2").hidden) {
+ config.oauthSettings = {};
+ [config.oauthSettings.issuer, config.oauthSettings.scope] = iDetails;
+ // oauthsettings are not stored nor changeable in the user interface, so just
@@ -61,14 +57,15 @@ that disables JavaScript (like TorBirdy) can provide a workaround.
+ this._currentConfig.oauthSettings = config.oauthSettings;
+ }
}
-
+
// outgoing server
-@@ -1381,23 +1383,25 @@ EmailConfigWizard.prototype = {
+@@ -1471,21 +1473,23 @@ EmailConfigWizard.prototype = {
this.adjustOutgoingPortToSSLAndProtocol(config);
}
-
-- // If the hostname supports OAuth2 and imap is enabled, enable OAuth2.
+
+- // If the smtp hostname supports OAuth2, enable OAuth2 for it.
- let oDetails = OAuth2Providers.getHostnameDetails(config.outgoing.hostname);
+- e("out-authMethod-oauth2").hidden = !oDetails;
- if (oDetails) {
- gEmailWizardLogger.info(
- "OAuth2 details for outgoing server " +
@@ -76,17 +73,15 @@ that disables JavaScript (like TorBirdy) can provide a workaround.
- " is " +
- oDetails
- );
-- }
-- e("out-authMethod-oauth2").hidden = !oDetails;
-- if (!e("out-authMethod-oauth2").hidden) {
- config.oauthSettings = {};
- [config.oauthSettings.issuer, config.oauthSettings.scope] = oDetails;
- // oauthsettings are not stored nor changeable in the user interface, so just
- // store them in the base configuration.
- this._currentConfig.oauthSettings = config.oauthSettings;
+ if (Services.prefs.getBoolPref("mailnews.auto_config.account_constraints.allow_oauth2")) {
-+ // If the hostname supports OAuth2 and imap is enabled, enable OAuth2.
++ // If the smtp hostname supports OAuth2, enable OAuth2 for it.
+ let oDetails = OAuth2Providers.getHostnameDetails(config.outgoing.hostname);
++ e("out-authMethod-oauth2").hidden = !oDetails;
+ if (oDetails) {
+ gEmailWizardLogger.info(
+ "OAuth2 details for outgoing server " +
@@ -94,9 +89,6 @@ that disables JavaScript (like TorBirdy) can provide a workaround.
+ " is " +
+ oDetails
+ );
-+ }
-+ e("out-authMethod-oauth2").hidden = !oDetails;
-+ if (!e("out-authMethod-oauth2").hidden) {
+ config.oauthSettings = {};
+ [config.oauthSettings.issuer, config.oauthSettings.scope] = oDetails;
+ // oauthsettings are not stored nor changeable in the user interface, so just
@@ -104,9 +96,10 @@ that disables JavaScript (like TorBirdy) can provide a workaround.
+ this._currentConfig.oauthSettings = config.oauthSettings;
+ }
}
-
+
// populate fields even if existingServerKey, in case user changes back
diff --git a/comm/mail/components/accountcreation/content/readFromXML.js b/comm/mail/components/accountcreation/content/readFromXML.js
+index 8c7ecdd..780229f 100644
--- a/comm/mail/components/accountcreation/content/readFromXML.js
+++ b/comm/mail/components/accountcreation/content/readFromXML.js
@@ -32,6 +32,8 @@ function readFromXML(clientConfigXML) {
@@ -118,7 +111,7 @@ diff --git a/comm/mail/components/accountcreation/content/readFromXML.js b/comm/
var exception;
if (
typeof clientConfigXML != "object" ||
-@@ -124,6 +126,12 @@ function readFromXML(clientConfigXML) {
+@@ -126,6 +128,12 @@ function readFromXML(clientConfigXML) {
NTLM: Ci.nsMsgAuthMethod.NTLM,
OAuth2: Ci.nsMsgAuthMethod.OAuth2,
});
@@ -131,10 +124,10 @@ diff --git a/comm/mail/components/accountcreation/content/readFromXML.js b/comm/
break; // take first that we support
} catch (e) {
exception = e;
-@@ -267,6 +275,11 @@ function readFromXML(clientConfigXML) {
+@@ -269,6 +277,11 @@ function readFromXML(clientConfigXML) {
OAuth2: Ci.nsMsgAuthMethod.OAuth2,
});
-
+
+ if (!allow_oauth2 && oO.auth == Ci.nsMsgAuthMethod.OAuth2) {
+ oO.auth = null;
+ continue;
@@ -144,9 +137,10 @@ diff --git a/comm/mail/components/accountcreation/content/readFromXML.js b/comm/
} catch (e) {
exception = e;
diff --git a/comm/mailnews/mailnews.js b/comm/mailnews/mailnews.js
+index bde86d3..8f598b2 100644
--- a/comm/mailnews/mailnews.js
+++ b/comm/mailnews/mailnews.js
-@@ -960,6 +960,8 @@ pref("mailnews.auto_config.guess.enabled", true);
+@@ -967,6 +967,8 @@ pref("mailnews.auto_config.guess.enabled", true);
pref("mailnews.auto_config.guess.sslOnly", false);
// The timeout (in seconds) for each guess
pref("mailnews.auto_config.guess.timeout", 10);
@@ -154,3 +148,4 @@ diff --git a/comm/mailnews/mailnews.js b/comm/mailnews/mailnews.js
+pref("mailnews.auto_config.account_constraints.allow_oauth2", true);
// Work around bug 1454325 by disabling mimetype mungling in XmlHttpRequest
pref("dom.xhr.standard_content_type_normalization", false);
+
diff --git a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Avoid-local-timestamp-disclosure-in-Date-header.patch b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Avoid-local-timestamp-disclosure-in-Date-header.patch
index f6f24d3..05e675a 100644
--- a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Avoid-local-timestamp-disclosure-in-Date-header.patch
+++ b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Avoid-local-timestamp-disclosure-in-Date-header.patch
@@ -1,23 +1,23 @@
-# This patch is based on the patch "Bug 902573 - Avoid local timestamp disclosure in Date header".
-# Link to the original patch: https://bug902573.bmoattachments.org/attachment.cgi?id=8684089
-# The original author is Arthur Edelstein <arthuredelstein@gmail.com>.
-# It is licensed under Mozilla Public License Version 2.0:
-# https://www.mozilla.org/en-US/MPL/
-
-From 611d58eb2ee6a67a6c1c112eebbc04551d98065b Mon Sep 17 00:00:00 2001
From: segfault <segfault@riseup.net>
Date: Wed, 27 Nov 2019 16:47:24 +0100
Subject: [PATCH] Bug 902573 - Avoid local timestamp disclosure in Date header
+This patch is based on the patch "Bug 902573 - Avoid local timestamp disclosure in Date header".
+Link to the original patch: https://bug902573.bmoattachments.org/attachment.cgi?id=8684089
+The original author is Arthur Edelstein <arthuredelstein@gmail.com>.
+It is licensed under Mozilla Public License Version 2.0:
+https://www.mozilla.org/en-US/MPL/
+
---
- comm/mailnews/mailnews.js | 7 ++++
- comm/mailnews/mime/jsmime/jsmime.js | 42 +++++++++++++++----
+ comm/mailnews/mailnews.js | 7 +++++++
+ comm/mailnews/mime/jsmime/jsmime.js | 42 +++++++++++++++++++++++++++++--------
+ 2 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/comm/mailnews/mailnews.js b/comm/mailnews/mailnews.js
-index 270cef339f8..3418ad12b65 100644
+index 7dda1ad..2673c8b 100644
--- a/comm/mailnews/mailnews.js
+++ b/comm/mailnews/mailnews.js
-@@ -1022,3 +1022,10 @@ pref("mail.imap.qos", 0);
+@@ -1029,3 +1029,10 @@ pref("mail.imap.qos", 0);
// PgpMime Addon
pref("mail.pgpmime.addon_url", "https://addons.mozilla.org/addon/enigmail/");
@@ -29,7 +29,7 @@ index 270cef339f8..3418ad12b65 100644
+// the user across accounts more difficult.
+pref("mail.mime.avoid_fingerprinting", false);
diff --git a/comm/mailnews/mime/jsmime/jsmime.js b/comm/mailnews/mime/jsmime/jsmime.js
-index 75ee0c8d773..74183b885bf 100644
+index 75ee0c8..74183b8 100644
--- a/comm/mailnews/mime/jsmime/jsmime.js
+++ b/comm/mailnews/mime/jsmime/jsmime.js
@@ -3450,9 +3450,34 @@
@@ -99,6 +99,3 @@ index 75ee0c8d773..74183b885bf 100644
tzOffsetStr,
].join(" ");
this.addText(dayTime, false);
---
-2.24.0
-
diff --git a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Avoid-spellchecking-language-disclosure-in-Content-Language-header.patch b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Avoid-spellchecking-language-disclosure-in-Content-Language-header.patch
index 4220050..2ad48d4 100644
--- a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Avoid-spellchecking-language-disclosure-in-Content-Language-header.patch
+++ b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Avoid-spellchecking-language-disclosure-in-Content-Language-header.patch
@@ -1,4 +1,3 @@
-From 2a943f8a23977e5d0ac87fac7536fedd001c1efc Mon Sep 17 00:00:00 2001
From: segfault <segfault@riseup.net>
Date: Wed, 27 Nov 2019 23:37:55 +0100
Subject: [PATCH] Bug 1370217 - Avoid spellchecking language disclosure in
@@ -9,10 +8,10 @@ Subject: [PATCH] Bug 1370217 - Avoid spellchecking language disclosure in
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/comm/mail/components/compose/content/MsgComposeCommands.js b/comm/mail/components/compose/content/MsgComposeCommands.js
-index be339ba0173..6fa60636b6c 100644
+index ba73704..170ca9c 100644
--- a/comm/mail/components/compose/content/MsgComposeCommands.js
+++ b/comm/mail/components/compose/content/MsgComposeCommands.js
-@@ -2875,9 +2875,10 @@ function ComposeStartup(aParams) {
+@@ -2868,9 +2868,10 @@ function ComposeStartup(aParams) {
// Update the language in the composition fields, so we can save it
// to the draft next time.
if (gMsgCompose && gMsgCompose.compFields) {
@@ -26,6 +25,3 @@ index be339ba0173..6fa60636b6c 100644
}
}
});
---
-2.24.0
-
diff --git a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Make-use-of-non-SSL-Exchange-AutoDiscover-methods-op.patch b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Make-use-of-non-SSL-Exchange-AutoDiscover-methods-op.patch
index 2c31865..cee5e3f 100644
--- a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Make-use-of-non-SSL-Exchange-AutoDiscover-methods-op.patch
+++ b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Make-use-of-non-SSL-Exchange-AutoDiscover-methods-op.patch
@@ -1,4 +1,3 @@
-From d3a3855b1ddbd3fa445e463d23082abda2e0d921 Mon Sep 17 00:00:00 2001
From: anonym <anonym@riseup.net>
Date: Wed, 27 Feb 2019 16:15:59 +0100
Subject: [PATCH] Make use of non-SSL Exchange AutoDiscover methods optional.
@@ -8,15 +7,17 @@ server's HTTP response to redirect to an attacker controller Exchange
server instead. So let's provide protection against this via the
mailnews.auto_config.sslOnly pref.
---
- .../content/exchangeAutoDiscover.js | 20 ++++++++++---------
+ .../accountcreation/content/exchangeAutoDiscover.js | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
+diff --git a/comm/mail/components/accountcreation/content/exchangeAutoDiscover.js b/comm/mail/components/accountcreation/content/exchangeAutoDiscover.js
+index f9d2a6e..4c3e1ce 100644
--- a/comm/mail/components/accountcreation/content/exchangeAutoDiscover.js
+++ b/comm/mail/components/accountcreation/content/exchangeAutoDiscover.js
-@@ -127,15 +127,17 @@
+@@ -127,15 +127,17 @@ function fetchConfigFromExchange(
fetch.start();
call.setAbortable(fetch);
-
+
- call = priority.addCall();
- fetch3 = new FetchHTTP(
- url3,
@@ -37,6 +38,6 @@ mailnews.auto_config.sslOnly pref.
+ fetch3.start();
+ call.setAbortable(fetch3);
+ }
-
+
// url3 is an HTTP URL that will redirect to the real one, usually a HTTPS
// URL of the hoster. XMLHttpRequest unfortunately loses the call
diff --git a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Prefer-fetched-configurations-using-SSL-over-plainte.patch b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Prefer-fetched-configurations-using-SSL-over-plainte.patch
index 754d61a..8999ee8 100644
--- a/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Prefer-fetched-configurations-using-SSL-over-plainte.patch
+++ b/config/chroot_local-includes/usr/share/tails/build/thunderbird-patches/Prefer-fetched-configurations-using-SSL-over-plainte.patch
@@ -1,15 +1,16 @@
-From d333d5a79b41809798d692b22ae0a2fc85723c0f Mon Sep 17 00:00:00 2001
From: anonym <anonym@riseup.net>
Date: Wed, 27 Feb 2019 09:45:04 +0100
Subject: [PATCH] Prefer fetched configurations using SSL over plaintext.
---
- comm/mail/components/accountcreation/content/readFromXML.js | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
+ comm/mail/components/accountcreation/content/readFromXML.js | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+diff --git a/comm/mail/components/accountcreation/content/readFromXML.js b/comm/mail/components/accountcreation/content/readFromXML.js
+index 76b553b..8c7ecdd 100644
--- a/comm/mail/components/accountcreation/content/readFromXML.js
+++ b/comm/mail/components/accountcreation/content/readFromXML.js
-@@ -98,7 +98,10 @@
+@@ -100,7 +100,10 @@ function readFromXML(clientConfigXML) {
SSL: 2,
STARTTLS: 3,
});
@@ -21,7 +22,7 @@ Subject: [PATCH] Prefer fetched configurations using SSL over plaintext.
} catch (e) {
exception = e;
}
-@@ -231,7 +234,10 @@
+@@ -233,7 +236,10 @@ function readFromXML(clientConfigXML) {
SSL: 2,
STARTTLS: 3,
});