diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-03-19 19:01:09 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-03-19 19:01:09 -0400 |
| commit | c602553b23331b7e64f0f9c0e57b9bf8f9cb985f (patch) | |
| tree | 45de09d9bec4a7ad51c124493c47cbf23bddf7d8 | |
| parent | cef212cb84a6a17e0798f9f198ab759400aa82ad (diff) | |
| download | palemoon-nss9-uimigrate-work.tar.gz | |
Issue MoonchildProductions/UXP#1467 - Make UI Migration code nss9 file mitigation conditional dependent on MOZ_SECURITY_SQLSTOREnss9-uimigrate-work
| -rw-r--r-- | palemoon/components/nsBrowserGlue.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/palemoon/components/nsBrowserGlue.js b/palemoon/components/nsBrowserGlue.js index 081c26065..110fd2db8 100644 --- a/palemoon/components/nsBrowserGlue.js +++ b/palemoon/components/nsBrowserGlue.js @@ -1432,12 +1432,11 @@ BrowserGlue.prototype = { Services.prefs.clearUserPref("security.cert_pinning.enforcement_level"); } +#ifndef MOZ_SECURITY_SQLSTORE 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); + 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()) { @@ -1452,6 +1451,7 @@ BrowserGlue.prototype = { } catch(e) { } } } +#endif if (currentUIVersion < 22) { if (Services.prefs.prefHasUserValue("layers.acceleration.disabled")) { |