Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pk11wrap/pk11pars.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * The following handles the loading, unloading and management of
  * various PCKS #11 modules
  */
 
 #include <ctype.h>
 #include "pkcs11.h"
@@ skipping 116 matching lines @@
                                                      *the other flags are set */
 #define SECMOD_FLAG_INTERNAL_KEY_SLOT          0x02
 
 /*
  * for 3.4 we continue to use the old SECMODModule structure
  */
 SECMODModule *
 SECMOD_CreateModule(const char *library, const char *moduleName, 
                                 const char *parameters, const char *nss)
 {
+    return SECMOD_CreateModuleEx(library, moduleName, parameters, nss, NULL);
+}
+
+/*
+ * for 3.4 we continue to use the old SECMODModule structure
+ */
+SECMODModule *
+SECMOD_CreateModuleEx(const char *library, const char *moduleName, 
+                                const char *parameters, const char *nss,
+                                const char *config)
+{
     SECMODModule *mod = secmod_NewModule();
     char *slotParams,*ciphers;
     /* pk11pars.h still does not have const char * interfaces */
     char *nssc = (char *)nss;
     if (mod == NULL) return NULL;
 
     mod->commonName = PORT_ArenaStrdup(mod->arena,moduleName ? moduleName : "");
     if (library) {
         mod->dllName = PORT_ArenaStrdup(mod->arena,library);
     }
     /* new field */
     if (parameters) {
         mod->libraryParams = PORT_ArenaStrdup(mod->arena,parameters);
     }
+    if (config) {
+        /* XXX: Apply configuration */
+    }
     mod->internal   = NSSUTIL_ArgHasFlag("flags","internal",nssc);
     mod->isFIPS     = NSSUTIL_ArgHasFlag("flags","FIPS",nssc);
     mod->isCritical = NSSUTIL_ArgHasFlag("flags","critical",nssc);
     slotParams      = NSSUTIL_ArgGetParamValue("slotParams",nssc);
     mod->slotInfo   = NSSUTIL_ArgParseSlotInfo(mod->arena,slotParams,
                                                         &mod->slotInfoCount);
     if (slotParams) PORT_Free(slotParams);
     /* new field */
     mod->trustOrder  = NSSUTIL_ArgReadLong("trustOrder",nssc,
                                         NSSUTIL_DEFAULT_TRUST_ORDER,NULL);
@@ skipping 809 matching lines @@
     return SECFailure;
 }
 
 /*
  * load a PKCS#11 module but do not add it to the default NSS trust domain
  */
 SECMODModule *
 SECMOD_LoadModule(char *modulespec,SECMODModule *parent, PRBool recurse)
 {
     char *library = NULL, *moduleName = NULL, *parameters = NULL, *nss= NULL;
+    char *config = NULL;
     SECStatus status;
     SECMODModule *module = NULL;
     SECMODModule *oldModule = NULL;
     SECStatus rv;
 
     /* initialize the underlying module structures */
     SECMOD_Init();
 
-    status = NSSUTIL_ArgParseModuleSpec(modulespec, &library, &moduleName, 
-                                                        &parameters, &nss);
+    status = NSSUTIL_ArgParseModuleSpecEx(modulespec, &library, &moduleName, 
+                                                        &parameters, &nss,
+                                                        &config);
     if (status != SECSuccess) {
         goto loser;
     }
 
-    module = SECMOD_CreateModule(library, moduleName, parameters, nss);
+    module = SECMOD_CreateModuleEx(library, moduleName, parameters, nss, config);
     if (library) PORT_Free(library);
     if (moduleName) PORT_Free(moduleName);
     if (parameters) PORT_Free(parameters);
     if (nss) PORT_Free(nss);
+    if (config) PORT_Free(config);
     if (!module) {
         goto loser;
     }
     if (parent) {
         module->parent = SECMOD_ReferenceModule(parent);
         if (module->internal && secmod_IsInternalKeySlot(parent)) {
             module->internal = parent->internal;
         }
     }
 
@@ skipping 116 matching lines @@
 
     SECMOD_GetReadLock(moduleLock);
     rv = STAN_RemoveModuleFromDefaultTrustDomain(mod);
     SECMOD_ReleaseReadLock(moduleLock);
     if (SECSuccess != rv) {
         return SECFailure;
     }
     return SECMOD_DeleteModuleEx(NULL, mod, &atype, PR_FALSE);
 }