Tree - rpms/nss - CentOS Git server

Blob History Raw

		74fc46	`# HG changeset patch`
		74fc46	`# User Kai Engert <kaie@kuix.de>`
		74fc46	`# Date 1511356939 -3600`
		74fc46	`# Wed Nov 22 14:22:19 2017 +0100`
		74fc46	`# Node ID 93109d4cbedd397f5e75a2096257f9842a0ac5a1`
		74fc46	`# Parent 6a27e4b4c92c8c3694132b75a1a54c23688789bd`
		74fc46	`Bug 1278071, increase number of iterations for export to PKCS #12, r=fkiefer`
		74fc46
		74fc46	`diff --git a/lib/pkcs7/p7create.c b/lib/pkcs7/p7create.c`
		74fc46	`--- a/lib/pkcs7/p7create.c`
		74fc46	`+++ b/lib/pkcs7/p7create.c`
		74fc46	`@@ -18,7 +18,13 @@`
		74fc46	`#include "secder.h"`
		74fc46	`#include "secpkcs5.h"`
		74fc46
		74fc46	`-const int NSS_PBE_DEFAULT_ITERATION_COUNT = 100000; /* used in p12e.c too */`
		74fc46	`+const int NSS_PBE_DEFAULT_ITERATION_COUNT = /* used in p12e.c too */`
		74fc46	`+#ifdef DEBUG`
		74fc46	`+ 10000`
		74fc46	`+#else`
		74fc46	`+ 1000000`
		74fc46	`+#endif`
		74fc46	`+ ;`
		74fc46
		74fc46	`static SECStatus`
		74fc46	`sec_pkcs7_init_content_info(SEC_PKCS7ContentInfo cinfo, PLArenaPool poolp,`