Bug 1445731 - land NSS dedf5290c679 UPGRADE_NSS_RELEASE, r=me

--HG-- extra : rebase_source : 79460bf0f6ec7dc53589ae104538f758ee5a7f41
2024-10-18 15:55:36 +00:00 · 2018-03-26 08:04:57 -07:00 · 2018-03-26 08:04:57 -07:00 · 6a6f82c15e
commit 6a6f82c15e
parent f9ce570d9b
3 changed files with 3 additions and 2 deletions
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@ -1 +1 @@
-1bde21f90bd1
+dedf5290c679
--- a/security/nss/coreconf/coreconf.dep
+++ b/security/nss/coreconf/coreconf.dep
@ -10,3 +10,4 @@
 */

 #error "Do not include this header file."
+
--- a/security/nss/lib/pkcs7/p7create.c
+++ b/security/nss/lib/pkcs7/p7create.c
@ -22,7 +22,7 @@ const int NSS_PBE_DEFAULT_ITERATION_COUNT = /* used in p12e.c too */
 #ifdef DEBUG
    10000
 #else
-    1000000
+    600000
 #endif
    ;