From 8ea2c0d5edd99760019daacee9356a6810ebf51a Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Fri, 27 Mar 2020 15:13:00 +0100
Subject: Issue #1498 - Part 4: Remove clearPreloads.

Also tag #1280
---
 security/manager/ssl/nsISiteSecurityService.idl         |  5 -----
 security/manager/ssl/nsSiteSecurityService.cpp          | 11 -----------
 security/manager/ssl/tests/unit/test_pinning_dynamic.js |  4 ----
 3 files changed, 20 deletions(-)

(limited to 'security')

diff --git a/security/manager/ssl/nsISiteSecurityService.idl b/security/manager/ssl/nsISiteSecurityService.idl
index 6b2e47d38..6677792e8 100644
--- a/security/manager/ssl/nsISiteSecurityService.idl
+++ b/security/manager/ssl/nsISiteSecurityService.idl
@@ -151,11 +151,6 @@ interface nsISiteSecurityService : nsISupports
      */
     void clearAll();
 
-    /**
-     * Removes all preloaded security state.
-     */
-    void clearPreloads();
-
     /**
      * Returns an array of sha256-hashed key pins for the given domain, if any.
      * If these pins also apply to subdomains of the given domain,
diff --git a/security/manager/ssl/nsSiteSecurityService.cpp b/security/manager/ssl/nsSiteSecurityService.cpp
index ab2a3dd0b..8617d00fe 100644
--- a/security/manager/ssl/nsSiteSecurityService.cpp
+++ b/security/manager/ssl/nsSiteSecurityService.cpp
@@ -1101,17 +1101,6 @@ nsSiteSecurityService::ClearAll()
   return mSiteStateStorage->Clear();
 }
 
-NS_IMETHODIMP
-nsSiteSecurityService::ClearPreloads()
-{
-  // Child processes are not allowed direct access to this.
-  if (!XRE_IsParentProcess()) {
-    MOZ_CRASH("Child process: no direct access to nsISiteSecurityService::ClearPreloads");
-  }
-
-  return mPreloadStateStorage->Clear();
-}
-
 bool entryStateNotOK(SiteHPKPState& state, mozilla::pkix::Time& aEvalTime) {
   return state.mState != SecurityPropertySet || state.IsExpired(aEvalTime) ||
          state.mSHA256keys.Length() < 1;
diff --git a/security/manager/ssl/tests/unit/test_pinning_dynamic.js b/security/manager/ssl/tests/unit/test_pinning_dynamic.js
index 7333ad6b3..60e85e041 100644
--- a/security/manager/ssl/tests/unit/test_pinning_dynamic.js
+++ b/security/manager/ssl/tests/unit/test_pinning_dynamic.js
@@ -239,9 +239,5 @@ function checkPreloadClear() {
   gSSService.clearAll();
   checkFail(certFromFile('b.preload.example.com-badca'), "b.preload.example.com");
 
-  // Check that the preloaded pins are cleared when we clear preloads
-  gSSService.clearPreloads();
-  checkOK(certFromFile('b.preload.example.com-badca'), "b.preload.example.com");
-
   do_test_finished();
 }
-- 
cgit v1.2.3