[tor-commits] [tor-browser/tor-browser-60.6.1esr-8.5-1] Revert "Bug 30388: Disable nocertdb pref for armagadd-on 2.0 cert inclusion if needed"

[gk at torproject.org]

commit 7f0035949b56c64a52b63d0289ad689cd66633ad
Author: Georg Koppen <gk at torproject.org>
Date:   Wed May 8 21:06:32 2019 +0000

    Revert "Bug 30388: Disable nocertdb pref for armagadd-on 2.0 cert inclusion if needed"
    
    This reverts commit 1d2d420ff1c7231a60ec3ff497bd57815fc1d665.
---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 3aa0e41b625f..6cffc02d90ba 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -1824,13 +1824,6 @@ function addMissingIntermediateCertificate() {
   }
   logger.debug("hotfix for addon signing cert has not been applied; applying");
 
-  // temporarily disable nocertb so we can write cert
-  const PREF_NOCERTDB = "security.nocertdb";
-  let userNocertdb = Services.prefs.getBoolPref(PREF_NOCERTDB, true);
-  if (userNocertdb) {
-    Services.prefs.setBoolPref(PREF_NOCERTDB, false);
-  }
-
   try {
     let certDB = Cc["@mozilla.org/security/x509certdb;1"].getService(Ci.nsIX509CertDB);
     certDB.addCertFromBase64(MISSING_INTERMEDIATE_CERTIFICATE, ",,");
@@ -1838,11 +1831,6 @@ function addMissingIntermediateCertificate() {
   } catch (e) {
     logger.error("failed to add new intermediate certificate:", e);
     return;
-  } finally {
-    // revert nocertdb pref to original value (even if exception thrown)
-    if (userNocertdb) {
-      Services.prefs.setBoolPref(PREF_NOCERTDB, true);
-    }
   }
 
   Services.prefs.setBoolPref(PREF_SIGNER_HOTFIXED, true);