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

mozilla/security/nss/lib/softoken/sftkdb.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. For the rest of NSS, only one kind of database handle exists:
  *
  *     SFTKDBHandle
  *
  * There is one SFTKDBHandle for the each key database and one for each cert 
  * database. These databases are opened as associated pairs, one pair per
  * slot. SFTKDBHandles are reference counted objects.
  *
  * Each SFTKDBHandle points to a low level database handle (SDB). This handle
  * represents the underlying physical database. These objects are not 
  * reference counted, an are 'owned' by their respective SFTKDBHandles.
  *
  *  
  */
 #include "sftkdb.h"
 #include "sftkdbti.h"
 #include "pkcs11t.h"
 #include "pkcs11i.h"
 #include "sdb.h"
 #include "prprf.h" 
-#include "secmodt.h"
 #include "pratom.h"
 #include "lgglue.h"
-#include "sftkpars.h"
+#include "utilpars.h"
 #include "secerr.h"
 #include "softoken.h"
 
 /*
  * We want all databases to have the same binary representation independent of
  * endianness or length of the host architecture. In general PKCS #11 attributes
  * are endian/length independent except those attributes that pass CK_ULONG.
  *
  * The following functions fixes up the CK_ULONG type attributes so that the data
  * base sees a machine independent view. CK_ULONGs are stored as 4 byte network
@@ skipping 2528 matching lines @@
  */
 CK_RV 
 sftk_DBInit(const char *configdir, const char *certPrefix,
                 const char *keyPrefix, const char *updatedir,
                 const char *updCertPrefix, const char *updKeyPrefix, 
                 const char *updateID, PRBool readOnly, PRBool noCertDB,
                 PRBool noKeyDB, PRBool forceOpen, PRBool isFIPS,
                 SFTKDBHandle **certDB, SFTKDBHandle **keyDB)
 {
     const char *confdir;
-    SDBType dbType;
+    NSSDBType dbType = NSS_DB_TYPE_NONE;
     char *appName = NULL;
     SDB *keySDB, *certSDB;
     CK_RV crv = CKR_OK;
     int flags = SDB_RDONLY;
     PRBool newInit = PR_FALSE;
     PRBool needUpdate = PR_FALSE;
 
     if (!readOnly) {
         flags = SDB_CREATE;
     }
 
     *certDB = NULL;
     *keyDB = NULL;
 
     if (noKeyDB && noCertDB) {
         return CKR_OK;
     }
-    confdir = sftk_EvaluateConfigDir(configdir, &dbType, &appName);
+    confdir = _NSSUTIL_EvaluateConfigDir(configdir, &dbType, &appName);
 
     /*
      * now initialize the appropriate database
      */
     switch (dbType) {
-    case SDB_LEGACY:
+    case NSS_DB_TYPE_LEGACY:
         crv = sftkdbCall_open(confdir, certPrefix, keyPrefix, 8, 3, flags,
                  isFIPS, noCertDB? NULL : &certSDB, noKeyDB ? NULL: &keySDB);
         break;
-    case SDB_MULTIACCESS:
+    case NSS_DB_TYPE_MULTIACCESS:
         crv = sftkdbCall_open(configdir, certPrefix, keyPrefix, 8, 3, flags,
                 isFIPS, noCertDB? NULL : &certSDB, noKeyDB ? NULL: &keySDB);
         break;
-    case SDB_SQL:
-    case SDB_EXTERN: /* SHOULD open a loadable db */
+    case NSS_DB_TYPE_SQL:
+    case NSS_DB_TYPE_EXTERN: /* SHOULD open a loadable db */
         crv = s_open(confdir, certPrefix, keyPrefix, 9, 4, flags, 
                 noCertDB? NULL : &certSDB, noKeyDB ? NULL : &keySDB, &newInit);
 
         /*
          * if we failed to open the DB's read only, use the old ones if
          * the exists.
          */
         if (crv != CKR_OK) {
             if ((flags == SDB_RDONLY)  &&
                  sftk_hasLegacyDB(confdir, certPrefix, keyPrefix, 8, 3)) {
@@ skipping 107 matching lines @@
 }
 
 CK_RV 
 sftkdb_Shutdown(void)
 {
   s_shutdown();
   sftkdbCall_Shutdown();
   return CKR_OK;
 }