From 79487a1a05a9e912c63d7a5259db2eccfc59af2b Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sun, 4 Nov 2018 23:39:37 +0100
Subject: Backout opportunistic encryption changes.

Apparently there is some functional and naming confusion here.
Backing out to re-land after evaluation and possible changes.
Tag #863.
---
 application/basilisk/app/profile/basilisk.js                      | 3 ---
 application/palemoon/components/preferences/security.xul          | 8 --------
 .../locales/en-US/chrome/browser/preferences/security.dtd         | 2 --
 3 files changed, 13 deletions(-)

(limited to 'application')

diff --git a/application/basilisk/app/profile/basilisk.js b/application/basilisk/app/profile/basilisk.js
index c326698de..eeec29eb9 100644
--- a/application/basilisk/app/profile/basilisk.js
+++ b/application/basilisk/app/profile/basilisk.js
@@ -580,9 +580,6 @@ pref("network.captive-portal-service.enabled", true);
 // If true, network link events will change the value of navigator.onLine
 pref("network.manage-offline-status", true);
 
-// Enable opportunistic encryption by default
-pref("network.http.opportunistic-encryption", true);
-
 // We want to make sure mail URLs are handled externally...
 pref("network.protocol-handler.external.mailto", true); // for mail
 pref("network.protocol-handler.external.news", true);   // for news
diff --git a/application/palemoon/components/preferences/security.xul b/application/palemoon/components/preferences/security.xul
index d9c3dd55d..d3d321b16 100644
--- a/application/palemoon/components/preferences/security.xul
+++ b/application/palemoon/components/preferences/security.xul
@@ -49,10 +49,6 @@
       <preference id="security.cert_pinning.enforcement_level"
                   name="security.cert_pinning.enforcement_level"
                   type="int"/>
-                  
-      <preference id="network.http.opportunistic-encryption"
-                  name="network.http.opportunistic-encryption"
-                  type="bool"/>
       
       <!-- XSS Filter -->
       <!--
@@ -148,10 +144,6 @@
                   oncommand="gSecurityPane.updateHPKPPref();"/>
       </vbox>
     </groupbox>
-    
-    <checkbox id="enableOpEnc"
-              label="&enableOpEnc.label;"
-              preference="network.http.opportunistic-encryption" />
 
     <!-- XSS Filter -->
     <!--
diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
index d88c55dc5..2bd3b3aec 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
@@ -40,8 +40,6 @@
 <!ENTITY  enableHPKP.label           "Enable Certificate Key Pinning (HPKP)">
 <!ENTITY  enableHPKP.accesskey       "C">
 
-<!ENTITY  enableOpEnc.label          "Enable Opportunistic Encryption">
-
 <!ENTITY  XSSFilt.label              "XSS Filter">
 <!ENTITY  enableXSSFilt.label        "Enable XSS filter">
 <!ENTITY  enableXSSFilt.accesskey    "f">
-- 
cgit v1.2.3