Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/util/utilpars.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 code handles the storage of PKCS 11 modules used by the
  * NSS. This file is written to abstract away how the modules are
  * stored so we can decide that later.
  */
 #include "secport.h"
 #include "prprf.h" 
@@ skipping 749 matching lines @@
     nssutil_freePair(rootFlagsPair);
     return slotString;
 }
 
 
 /************************************************************************
  * Parse Full module specs into: library, commonName, module parameters,
  * and NSS specifi parameters.
  */
 SECStatus
+NSSUTIL_ArgParseModuleSpecEx(char *modulespec, char **lib, char **mod, 
+                                        char **parameters, char **nss,
+                                        char **config)
+{
+    int next;
+    modulespec = NSSUTIL_ArgStrip(modulespec);
+
+    *lib = *mod = *parameters = *nss = *config = 0;
+
+    while (*modulespec) {
+        NSSUTIL_HANDLE_STRING_ARG(modulespec,*lib,"library=",;)
+        NSSUTIL_HANDLE_STRING_ARG(modulespec,*mod,"name=",;)
+        NSSUTIL_HANDLE_STRING_ARG(modulespec,*parameters,"parameters=",;)
+        NSSUTIL_HANDLE_STRING_ARG(modulespec,*nss,"nss=",;)
+        NSSUTIL_HANDLE_STRING_ARG(modulespec,*config,"config=",;)
+        NSSUTIL_HANDLE_FINAL_ARG(modulespec)
+   }
+   return SECSuccess;
+}
+
+/************************************************************************
+ * Parse Full module specs into: library, commonName, module parameters,
+ * and NSS specifi parameters.
+ */
+SECStatus
 NSSUTIL_ArgParseModuleSpec(char *modulespec, char **lib, char **mod, 
                                         char **parameters, char **nss)
 {
     int next;
     modulespec = NSSUTIL_ArgStrip(modulespec);
 
     *lib = *mod = *parameters = *nss = 0;
 
     while (*modulespec) {
         NSSUTIL_HANDLE_STRING_ARG(modulespec,*lib,"library=",;)
         NSSUTIL_HANDLE_STRING_ARG(modulespec,*mod,"name=",;)
         NSSUTIL_HANDLE_STRING_ARG(modulespec,*parameters,"parameters=",;)
         NSSUTIL_HANDLE_STRING_ARG(modulespec,*nss,"nss=",;)
         NSSUTIL_HANDLE_FINAL_ARG(modulespec)
    }
    return SECSuccess;
 }
 
 /************************************************************************
  * make a new module spec from it's components */
 char *
-NSSUTIL_MkModuleSpec(char *dllName, char *commonName, char *parameters, 
-                                                                char *NSS)
+NSSUTIL_MkModuleSpecEx(char *dllName, char *commonName, char *parameters, 
+                                                                char *NSS,
+                                                                char *config)
 {
     char *moduleSpec;
-    char *lib,*name,*param,*nss;
+    char *lib,*name,*param,*nss,*conf;
 
     /*
      * now the final spec
      */
     lib = nssutil_formatPair("library",dllName,'\"');
     name = nssutil_formatPair("name",commonName,'\"');
     param = nssutil_formatPair("parameters",parameters,'\"');
     nss = nssutil_formatPair("NSS",NSS,'\"');
-    moduleSpec = PR_smprintf("%s %s %s %s", lib,name,param,nss);
+    if (config) {
+        conf = nssutil_formatPair("config",config,'\"');
+        moduleSpec = PR_smprintf("%s %s %s %s %s", lib,name,param,nss,conf);
+        nssutil_freePair(conf);
+    } else {
+        moduleSpec = PR_smprintf("%s %s %s %s", lib,name,param,nss);
+    }
     nssutil_freePair(lib);
     nssutil_freePair(name);
     nssutil_freePair(param);
     nssutil_freePair(nss);
     return (moduleSpec);
 }
 
+/************************************************************************
+ * make a new module spec from it's components */
+char *
+NSSUTIL_MkModuleSpec(char *dllName, char *commonName, char *parameters, 
+                                                                char *NSS)
+{
+    return NSSUTIL_MkModuleSpecEx(dllName, commonName, parameters, NSS, NULL);
+}
+
 
 #define NSSUTIL_ARG_FORTEZZA_FLAG "FORTEZZA"
 /******************************************************************************
  * Parse the cipher flags from the NSS parameter
  */
 void
 NSSUTIL_ArgParseCipherFlags(unsigned long *newCiphers,char *cipherList)
 {
     newCiphers[0] = newCiphers[1] = 0;
     if ((cipherList == NULL) || (*cipherList == 0)) return;
@@ skipping 286 matching lines @@
         value = PR_smprintf("%s" NSSUTIL_PATH_SEPARATOR "%s",
                         lconfigdir,secmodName);
    } else {
         value = PR_smprintf("%s",secmodName);
    }
    if (configdir) PORT_Free(configdir);
    return value;
 }