Bugzilla Bug 342476: NSS should set and check the pReserved field in the

(extended) CK_C_INITIALIZE_ARGS structure.  r=nelsonb,relyea.
Modified files: pk11wrap/pk11load.c softoken/pkcs11.c

security/nss/lib/pk11wrap/pk11load.c

@@ -145,6 +145,7 @@ secmod_ModuleInit(SECMODModule *mod, PRBool* alreadyLoaded)
     } else {
 	moduleArgs = secmodLockFunctions;
 	moduleArgs.LibraryParameters = (void *) mod->libraryParams;
+	moduleArgs.pReserved = NULL;
 	pInitArgs = &moduleArgs;
     }
     crv = PK11_GETTAB(mod)->C_Initialize(pInitArgs);

security/nss/lib/softoken/pkcs11.c

@@ -3037,7 +3037,7 @@ CK_RV nsc_CommonInitialize(CK_VOID_PTR pReserved, PRBool isFIPS)
         }
     }
     crv = CKR_ARGUMENTS_BAD;
-    if ((init_args && init_args->LibraryParameters)) {
+    if ((init_args && init_args->LibraryParameters && !init_args->pReserved)) {
 	sftk_parameters paramStrings;
        
 	crv = secmod_parseParameters