From c39fd786cb4226c12e949fa5aeb6f9ca0afc1f35 Mon Sep 17 00:00:00 2001 From: "richard.freedman%sun.com" Date: Mon, 14 Nov 2005 20:15:38 +0000 Subject: [PATCH] Change call to PKIX_Initialize; plContext arg must not be NULL! git-svn-id: svn://10.0.0.236/branches/NSS_LIBPKIX_BRANCH@184590 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/nss/nssinit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mozilla/security/nss/lib/nss/nssinit.c b/mozilla/security/nss/lib/nss/nssinit.c index 4bdeef8cf8d..38affcc0cfd 100644 --- a/mozilla/security/nss/lib/nss/nssinit.c +++ b/mozilla/security/nss/lib/nss/nssinit.c @@ -36,7 +36,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: nssinit.c,v 1.67.10.1 2005-11-14 19:45:24 richard.freedman%sun.com Exp $ */ +/* $Id: nssinit.c,v 1.67.10.2 2005-11-14 20:15:38 richard.freedman%sun.com Exp $ */ #include #include "seccomon.h" @@ -395,6 +395,7 @@ nss_FindExternalRoot(const char *dbpath, const char* secmodprefix) */ static PRBool nss_IsInitted = PR_FALSE; +static void* plContext = NULL; extern SECStatus secoid_Init(void); @@ -490,8 +491,9 @@ loser: nss_IsInitted = PR_TRUE; } - pkixError = PKIX_Initialize(PKIX_FALSE, PKIX_TRUE, PKIX_MAJOR_VERSION, - PKIX_MINOR_VERSION, PKIX_MINOR_VERSION, &actualMinorVersion, NULL); + pkixError = PKIX_Initialize + (PKIX_FALSE, PKIX_TRUE, PKIX_MAJOR_VERSION, PKIX_MINOR_VERSION, + PKIX_MINOR_VERSION, &actualMinorVersion, &plContext); if (pkixError != NULL) { return SECFailure;