diff options
| author | Moonchild <git-repo@palemoon.org> | 2020-03-20 09:43:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 09:43:07 +0100 |
| commit | 0212d618116f86f7efd58dbb0a5ab9bfb3bb36d9 (patch) | |
| tree | dcf21d873ead6863cb877d6732ba0f1fd0d6e533 /toolkit/xre | |
| parent | 90a4813d175552d73d42230764f1d0aac7a66a27 (diff) | |
| parent | 6f1d8fcce1f064447ccf778ea9925efae95bb5fc (diff) | |
| download | UXP-0212d618116f86f7efd58dbb0a5ab9bfb3bb36d9.tar UXP-0212d618116f86f7efd58dbb0a5ab9bfb3bb36d9.tar.gz UXP-0212d618116f86f7efd58dbb0a5ab9bfb3bb36d9.tar.lz UXP-0212d618116f86f7efd58dbb0a5ab9bfb3bb36d9.tar.xz UXP-0212d618116f86f7efd58dbb0a5ab9bfb3bb36d9.zip | |
Merge pull request #1487 from MoonchildProductions/1467
Make UXP applications capable of using SQLite for NSS instead of DBM
Diffstat (limited to 'toolkit/xre')
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index e3705a5c2..55072c474 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2781,19 +2781,26 @@ XREMain::XRE_mainInit(bool* aExitFlag) #endif SetupErrorHandling(gArgv[0]); - - // Set up environment for NSS DBM database + // Set up environment for NSS database choice +#ifndef NSS_DISABLE_DBM // 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 PBKDF. The NSS hard-coded default of 10,000 is too much. - // See also Bug 1606992 for perf issues. +#endif + #ifdef DEBUG + // Reduce the number of rounds for debug builds for perf/test reasons. SaveToEnv("NSS_MAX_MP_PBE_ITERATION_COUNT=15"); #else +#ifdef MOZ_SECURITY_SQLSTORE + // We're using SQL; NSS's defaults for rounds are fine. +#else + // Set default Master Password rounds to a sane value for DBM which is slower + // than SQL for PBKDF. The NSS hard-coded default of 10,000 is too much. + // See also Bug 1606992 for perf issues. SaveToEnv("NSS_MAX_MP_PBE_ITERATION_COUNT=500"); #endif +#endif #ifdef CAIRO_HAS_DWRITE_FONT { |