summaryrefslogtreecommitdiff
path: root/lib/pkcs7
diff options
context:
space:
mode:
authorJ.C. Jones <jjones@mozilla.com>2018-03-23 09:58:32 -0700
committerJ.C. Jones <jjones@mozilla.com>2018-03-23 09:58:32 -0700
commit9eb3bed595dbd8e39f8dd3c88a2136cea29b01ce (patch)
treeb3dc946bb3dca4c0b7922d211dcf8175afad1ae8 /lib/pkcs7
parent39596a619367115c6341b6baab39d0b5cf03a170 (diff)
downloadnss-hg-9eb3bed595dbd8e39f8dd3c88a2136cea29b01ce.tar.gz
Bug 1278071 - Limit iterations for PKCS #12 export for Windows r?kaie
Per Bug 1436873, Windows is limited on importing PKCS12 files of 600k rounds or less. So for compatibility's sake, let's limit there, too.
Diffstat (limited to 'lib/pkcs7')
-rw-r--r--lib/pkcs7/p7create.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pkcs7/p7create.c b/lib/pkcs7/p7create.c
index a79d5aa26..f19330386 100644
--- a/lib/pkcs7/p7create.c
+++ b/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
;