summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-01-04 21:06:45 +0000
committerGitHub <noreply@github.com>2020-01-04 21:06:45 +0000
commite30d68b699bb3dca89534727974a08d4b43b62f8 (patch)
tree131d45d45617de18fb3d632c0b6c50b64d14dafe /toolkit
parent26b297510a11758727438df4669357a2a2bc42ce (diff)
parentb1694ef0a1d5a1ba7c8f243ac19634ee2d7b3b8f (diff)
downloadUXP-e30d68b699bb3dca89534727974a08d4b43b62f8.tar
UXP-e30d68b699bb3dca89534727974a08d4b43b62f8.tar.gz
UXP-e30d68b699bb3dca89534727974a08d4b43b62f8.tar.lz
UXP-e30d68b699bb3dca89534727974a08d4b43b62f8.tar.xz
UXP-e30d68b699bb3dca89534727974a08d4b43b62f8.zip
Merge pull request #1341 from MoonchildProductions/nss-work
Update NSPR and NSS
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/xre/nsAppRunner.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 035d35a9d..ab3f3881d 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2800,6 +2800,18 @@ XREMain::XRE_mainInit(bool* aExitFlag)
#endif
SetupErrorHandling(gArgv[0]);
+
+ // Set up environment for NSS DBM database
+
+ // Allow iteration counts in DBM mode
+ SaveToEnv("NSS_ALLOW_LEGACY_DBM_ITERATION_COUNT=1");
+ // Set default Master Password rounds to a sane value for DBM which is slower
+ // than SQL for PKDBF. The NSS hard-coded default of 10,000 is too much.
+#ifdef DEBUG
+ SaveToEnv("NSS_MAX_MP_PBE_ITERATION_COUNT=15");
+#else
+ SaveToEnv("NSS_MAX_MP_PBE_ITERATION_COUNT=500");
+#endif
#ifdef CAIRO_HAS_DWRITE_FONT
{