Enable SQL and disable DBM

application/basilisk/confvars.sh

@@ -59,6 +59,8 @@ MOZ_SERVICES_SYNC=1
 MOZ_SERVICES_HEALTHREPORT=
 MOZ_GAMEPAD=1
 MOZ_AV1=1
+MOZ_SECURITY_SQLSTORE=1
+NSS_DISABLE_DBM=1
 
 if test "$OS_ARCH" = "WINNT" -o \
         "$OS_ARCH" = "Darwin"; then

application/palemoon/components/nsBrowserGlue.js

@@ -1551,27 +1551,6 @@ BrowserGlue.prototype = {
       Services.prefs.clearUserPref("security.cert_pinning.enforcement_level");
     }
 
-    if (currentUIVersion < 21) {
-      // Remove key4.db and cert9.db if those files exist
-      // XXX: Remove this code block once we actually start using them.
-      let dsCertFile = Cc["@mozilla.org/file/directory_service;1"]
-                    .getService(Ci.nsIProperties)
-                    .get("ProfD", Ci.nsIFile);
-      dsKeyFile = dsCertFile.clone();
-      dsCertFile.append("cert9.db");
-      if (dsCertFile.exists()) {
-        try {
-          dsCertFile.remove(false);
-        } catch(e) {}
-      }
-      dsKeyFile.append("key4.db");
-      if (dsKeyFile.exists()) {
-        try {
-          dsKeyFile.remove(false);
-        } catch(e) {}
-      }
-    }
-
     if (currentUIVersion < 23) {
       if (Services.prefs.prefHasUserValue("layers.acceleration.disabled")) {
         let HWADisabled = Services.prefs.getBoolPref("layers.acceleration.disabled");

application/palemoon/confvars.sh

@@ -47,6 +47,10 @@ MOZ_PHOENIX=1
 # Lightweight Themes
 MOZ_PERSONAS=1
 
+# Enable SQL storage format for certs and passwords in NSS
+MOZ_SECURITY_SQLSTORE=1
+NSS_DISABLE_DBM=1
+
 # Browser Feature: Profile Migration Component
 MOZ_PROFILE_MIGRATOR=