Update NSS to NSS 3.13.5 (from NSS 3.13.3).

nss/mozilla/security/nss/lib/pkcs7/p7create.c

Index: nss/mozilla/security/nss/lib/pkcs7/p7create.c
===================================================================
--- nss/mozilla/security/nss/lib/pkcs7/p7create.c	(revision 142244)
+++ nss/mozilla/security/nss/lib/pkcs7/p7create.c	(working copy)
@@ -37,7 +37,7 @@
 /*
  * PKCS7 creation.
  *
- * $Id: p7create.c,v 1.9 2008/02/03 06:08:48 nelson%bolyard.com Exp $
+ * $Id: p7create.c,v 1.10 2012/03/19 22:16:34 kaie%kuix.de Exp $
  */
 
 #include "p7local.h"
@@ -52,6 +52,8 @@
 #include "secder.h"
 #include "secpkcs5.h"
 
+const int NSS_PBE_DEFAULT_ITERATION_COUNT = 2000; /* used in p12e.c too */
+
 static SECStatus
 sec_pkcs7_init_content_info (SEC_PKCS7ContentInfo *cinfo, PRArenaPool *poolp,
 			     SECOidTag kind, PRBool detached)
@@ -1293,7 +1295,9 @@
          * CMS encrypted data, so we can't tell SEC_PKCS7CreateEncryptedtedData
          * to create pkcs5v2 PBEs */
 	SECAlgorithmID *pbe_algid;
-	pbe_algid = PK11_CreatePBEAlgorithmID (algorithm, 1, NULL);
+	pbe_algid = PK11_CreatePBEAlgorithmID(algorithm,
+                                              NSS_PBE_DEFAULT_ITERATION_COUNT,
+                                              NULL);
 	if (pbe_algid == NULL) {
 	    rv = SECFailure;
 	} else {