From c3397ea7ecbecee233f54d8562fba7f6e041c8d6 Mon Sep 17 00:00:00 2001
From: Pale Moon <git-repo@palemoon.org>
Date: Sun, 29 Mar 2020 10:31:38 +0200
Subject: [PATCH] [Pale-Moon] Issue MoonchildProductions/UXP#1280 - Remove HPKP
 from Pale Moon

---
 application/palemoon/components/preferences/security.xul | 9 +--------
 .../en-US/chrome/browser/preferences/security.dtd        | 2 --
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/application/palemoon/components/preferences/security.xul b/application/palemoon/components/preferences/security.xul
index 9aa3f7a8af..350eb0d797 100644
--- a/application/palemoon/components/preferences/security.xul
+++ b/application/palemoon/components/preferences/security.xul
@@ -46,10 +46,7 @@
       <preference id="network.stricttransportsecurity.enabled"
                   name="network.stricttransportsecurity.enabled"
                   type="bool"/>
-      <preference id="security.cert_pinning.hpkp.enabled"
-                  name="security.cert_pinning.hpkp.enabled"
-                  type="bool"/>
-      
+
       <!-- Opportunistic Encryption -->
                   
       <preference id="network.http.upgrade-insecure-requests"
@@ -147,10 +144,6 @@
                   label="&enableHSTS.label;"
                   accesskey="&enableHSTS.accesskey;"
                   preference="network.stricttransportsecurity.enabled" />
-        <checkbox id="enableHPKP"
-                  label="&enableHPKP.label;"
-                  accesskey="&enableHPKP.accesskey;"
-                  preference="security.cert_pinning.hpkp.enabled"/>
       </vbox>
     </groupbox>
     
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 930736d56c..c18ed600a8 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
@@ -37,8 +37,6 @@
 <!ENTITY  SecProto.label             "Security Protocols">
 <!ENTITY  enableHSTS.label           "Enable Strict Transport Security (HSTS)">
 <!ENTITY  enableHSTS.accesskey       "S">
-<!ENTITY  enableHPKP.label           "Enable Certificate Key Pinning (HPKP)">
-<!ENTITY  enableHPKP.accesskey       "C">
 
 <!ENTITY  OpEnc.label                "Opportunistic Encryption (OE)">
 <!ENTITY  enableUIROpEnc.label       "Enable Upgrade Insecure Requests">