From a80324acf9506e31c48d180eebc82844bd04bc1f Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Fri, 8 May 2020 00:54:06 -0700
Subject: remove certificate key pinning options

---
 platform                                                         | 2 +-
 webbrowser/components/preferences/security.xul                   | 4 ----
 webbrowser/locales/en-US/chrome/browser/preferences/security.dtd | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/platform b/platform
index 568ea8d..f2b6fd2 160000
--- a/platform
+++ b/platform
@@ -1 +1 @@
-Subproject commit 568ea8deaa4fa5f07b6987e75d35e53eb3af66dd
+Subproject commit f2b6fd2481ae5e7381a938d52f7d8f14bfc4f5c2
diff --git a/webbrowser/components/preferences/security.xul b/webbrowser/components/preferences/security.xul
index bae6cca..29a5388 100644
--- a/webbrowser/components/preferences/security.xul
+++ b/webbrowser/components/preferences/security.xul
@@ -144,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/webbrowser/locales/en-US/chrome/browser/preferences/security.dtd b/webbrowser/locales/en-US/chrome/browser/preferences/security.dtd
index 930736d..c18ed60 100644
--- a/webbrowser/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/webbrowser/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">
-- 
cgit v1.2.3