Update NSS to NSS 3.14 pre-release snapshot 2012-06-28 01:00:00 PDT.

mozilla/security/nss/lib/nss/nssinit.c

 /*
  * NSS utility functions
  *
  * 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/. */
-/* $Id: nssinit.c,v 1.116 2012/04/25 14:50:04 gerv%gerv.net Exp $ */
+/* $Id: nssinit.c,v 1.117 2012/06/26 22:27:30 rrelyea%redhat.com Exp $ */
 
 #include <ctype.h>
 #include <string.h>
 #include "seccomon.h"
 #include "prerror.h"
 #include "prinit.h"
 #include "prprf.h"
 #include "prmem.h"
 #include "prtypes.h"
 #include "cert.h"
 #include "key.h"
 #include "secmod.h"
 #include "secoid.h"
 #include "nss.h"
 #include "pk11func.h"
 #include "secerr.h"
 #include "nssbase.h"
 #include "nssutil.h"
 #ifndef NSS_DISABLE_LIBPKIX
 #include "pkixt.h"
 #include "pkix.h"
 #include "pkix_tools.h"
 #endif  /* NSS_DISABLE_LIBPKIX */
 
 #include "pki3hack.h"
 #include "certi.h"
 #include "secmodi.h"
 #include "ocspti.h"
 #include "ocspi.h"
+#include "utilpars.h"
 
 /*
  * On Windows nss3.dll needs to export the symbol 'mktemp' to be
  * fully backward compatible with the nss3.dll in NSS 3.2.x and
  * 3.3.x.  This symbol was unintentionally exported and its
  * definition (in DBM) was moved from nss3.dll to softokn3.dll
  * in NSS 3.4.  See bug 142575.
  */
 #ifdef WIN32_NSS3_DLL_COMPAT
 #include <io.h>
@@ skipping 321 matching lines @@
     }
 
     flags = nss_makeFlags(readOnly,noCertDB,noModDB,forceOpen,
                                         pwRequired, optimizeSpace);
     if (flags == NULL) return rv;
 
     /*
      * configdir is double nested, and Windows uses the same character
      * for file seps as we use for escapes! (sigh).
      */
-    lconfigdir = secmod_DoubleEscape(configdir, '\'', '\"');
+    lconfigdir = NSSUTIL_DoubleEscape(configdir, '\'', '\"');
     if (lconfigdir == NULL) {
         goto loser;
     }
-    lcertPrefix = secmod_DoubleEscape(certPrefix, '\'', '\"');
+    lcertPrefix = NSSUTIL_DoubleEscape(certPrefix, '\'', '\"');
     if (lcertPrefix == NULL) {
         goto loser;
     }
-    lkeyPrefix = secmod_DoubleEscape(keyPrefix, '\'', '\"');
+    lkeyPrefix = NSSUTIL_DoubleEscape(keyPrefix, '\'', '\"');
     if (lkeyPrefix == NULL) {
         goto loser;
     }
-    lsecmodName = secmod_DoubleEscape(secmodName, '\'', '\"');
+    lsecmodName = NSSUTIL_DoubleEscape(secmodName, '\'', '\"');
     if (lsecmodName == NULL) {
         goto loser;
     }
-    lupdateDir = secmod_DoubleEscape(updateDir, '\'', '\"');
+    lupdateDir = NSSUTIL_DoubleEscape(updateDir, '\'', '\"');
     if (lupdateDir == NULL) {
         goto loser;
     }
-    lupdCertPrefix = secmod_DoubleEscape(updCertPrefix, '\'', '\"');
+    lupdCertPrefix = NSSUTIL_DoubleEscape(updCertPrefix, '\'', '\"');
     if (lupdCertPrefix == NULL) {
         goto loser;
     }
-    lupdKeyPrefix = secmod_DoubleEscape(updKeyPrefix, '\'', '\"');
+    lupdKeyPrefix = NSSUTIL_DoubleEscape(updKeyPrefix, '\'', '\"');
     if (lupdKeyPrefix == NULL) {
         goto loser;
     }
-    lupdateID = secmod_DoubleEscape(updateID, '\'', '\"');
+    lupdateID = NSSUTIL_DoubleEscape(updateID, '\'', '\"');
     if (lupdateID == NULL) {
         goto loser;
     }
-    lupdateName = secmod_DoubleEscape(updateName, '\'', '\"');
+    lupdateName = NSSUTIL_DoubleEscape(updateName, '\'', '\"');
     if (lupdateName == NULL) {
         goto loser;
     }
 
     moduleSpec = PR_smprintf(
      "name=\"%s\" parameters=\"configdir='%s' certPrefix='%s' keyPrefix='%s' "
      "secmod='%s' flags=%s updatedir='%s' updateCertPrefix='%s' "
      "updateKeyPrefix='%s' updateid='%s' updateTokenDescription='%s' %s\" "
      "NSS=\"flags=internal,moduleDB,moduleDBOnly,critical%s\"",
                 configName ? configName : NSS_DEFAULT_MOD_NAME,
@@ skipping 858 matching lines @@
         return PR_FALSE;
     }
     return PR_TRUE;
 }
 
 const char *
 NSS_GetVersion(void)
 {
     return NSS_VERSION;
 }