commit 41d319a845bcd8f6f918e371f70a86e632d3c6e4 Author: Georg Koppen gk@torproject.org Date: Mon May 6 20:37:56 2019 +0000

Revert "Bug 30388: Disable nocertdb pref for armagadd-on 2.0 cert inclusion if needed"

This reverts commit 1ca734a5a94048a925ea455ff3a5ee780f1653cc. --- 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);