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

mozilla/security/nss/lib/softoken/sdb.h

 /* 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/. */
 /*
  * This file implements PKCS 11 on top of our existing security modules
  *
  * For more information about PKCS 11 See PKCS 11 Token Inteface Standard.
  *   This implementation has two slots:
  *      slot 1 is our generic crypto support. It does not require login.
  *   It supports Public Key ops, and all they bulk ciphers and hashes. 
@@ skipping 18 matching lines @@
 #include "sftkdbt.h"
 
 #define STATIC_CMD_SIZE 2048
 
 typedef struct SDBFindStr SDBFind;
 typedef struct SDBStr SDB;
 
 struct SDBStr {
     void *private;
     int  version;
-    SDBType sdb_type;
+    int  reserved;
     int  sdb_flags;
     void *app_private;
     CK_RV (*sdb_FindObjectsInit)(SDB *sdb, const CK_ATTRIBUTE *template, 
                                  CK_ULONG count, SDBFind **find);
     CK_RV (*sdb_FindObjects)(SDB *sdb, SDBFind *find, CK_OBJECT_HANDLE *ids, 
                                 CK_ULONG arraySize, CK_ULONG *count);
     CK_RV (*sdb_FindObjectsFinal)(SDB *sdb, SDBFind *find);
     CK_RV (*sdb_GetAttributeValue)(SDB *sdb, CK_OBJECT_HANDLE object, 
                                 CK_ATTRIBUTE *template, CK_ULONG count);
     CK_RV (*sdb_SetAttributeValue)(SDB *sdb, CK_OBJECT_HANDLE object, 
@@ skipping 19 matching lines @@
              int flags, SDB **certdb, SDB **keydb, int *newInit);
 CK_RV s_shutdown();
 
 /* flags */
 #define SDB_RDONLY      1
 #define SDB_RDWR        2
 #define SDB_CREATE      4
 #define SDB_HAS_META    8
 
 #endif