summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKai Engert <kaie@kuix.de>2017-11-22 14:22:19 +0100
committerKai Engert <kaie@kuix.de>2017-11-22 14:22:19 +0100
commitcf4872c227ba4948689077bf7f12b1a4fc263cb8 (patch)
tree130177239f8cb7defe89ff3745677a08b6688c32 /lib
parenteb92a5ddf1160c9a0ad21ec66d2e2191f7a37bac (diff)
downloadnss-hg-cf4872c227ba4948689077bf7f12b1a4fc263cb8.tar.gz
Bug 1278071, increase number of iterations for export to PKCS #12, r=fkiefer
Diffstat (limited to 'lib')
-rw-r--r--lib/pkcs7/p7create.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/pkcs7/p7create.c b/lib/pkcs7/p7create.c
index d8f436954..a79d5aa26 100644
--- a/lib/pkcs7/p7create.c
+++ b/lib/pkcs7/p7create.c
@@ -18,7 +18,13 @@
#include "secder.h"
#include "secpkcs5.h"
-const int NSS_PBE_DEFAULT_ITERATION_COUNT = 100000; /* used in p12e.c too */
+const int NSS_PBE_DEFAULT_ITERATION_COUNT = /* used in p12e.c too */
+#ifdef DEBUG
+ 10000
+#else
+ 1000000
+#endif
+ ;
static SECStatus
sec_pkcs7_init_content_info(SEC_PKCS7ContentInfo *cinfo, PLArenaPool *poolp,