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

mozilla/security/nss/lib/softoken/pkcs11i.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/. */
 /*
  * Internal data structures and functions used by pkcs11.c
  */
 #ifndef _PKCS11I_H_
 #define _PKCS11I_H_ 1
 
 #include "nssilock.h"
 #include "seccomon.h"
 #include "secoidt.h"
-#include "lowkeyti.h"
+#include "lowkeyti.h" 
 #include "pkcs11t.h"
 
-#include "sftkdbt.h"
+#include "sftkdbt.h" 
 #include "hasht.h"
 
 /* 
  * Configuration Defines 
  *
  * The following defines affect the space verse speed trade offs of
  * the PKCS #11 module. For the most part the current settings are optimized
  * for web servers, where we want faster speed and lower lock contention at
  * the expense of space.
  */
@@ skipping 33 matching lines @@
 #define SPACE_SESSION_OBJECT_HASH_SIZE 32
 #define SPACE_SESSION_HASH_SIZE 32
 #define TIME_ATTRIBUTE_HASH_SIZE 32
 #define TIME_SESSION_OBJECT_HASH_SIZE 1024
 #define TIME_SESSION_HASH_SIZE 1024
 #define MAX_OBJECT_LIST_SIZE 800  
                                   /* how many objects to keep on the free list
                                    * before we start freeing them */
 #define MAX_KEY_LEN 256           /* maximum symmetric key length in bytes */
 
-#define MULTIACCESS "multiaccess:"
-
 /*
  * LOG2_BUCKETS_PER_SESSION_LOCK must be a prime number.
  * With SESSION_HASH_SIZE=1024, LOG2 can be 9, 5, 1, or 0.
  * With SESSION_HASH_SIZE=4096, LOG2 can be 11, 9, 5, 1, or 0.
  *
  * HASH_SIZE   LOG2_BUCKETS_PER   BUCKETS_PER_LOCK  NUMBER_OF_BUCKETS
  * 1024        9                  512               2
  * 1024        5                  32                32
  * 1024        1                  2                 512
  * 1024        0                  1                 1024
@@ skipping 457 matching lines @@
     PRBool noCertDB;
     PRBool forceOpen;
     PRBool pwRequired;
     PRBool optimizeSpace;
     sftk_token_parameters *tokens;
     int token_count;
 } sftk_parameters;
 
 
 /* path stuff (was machine dependent) used by dbinit.c and pk11db.c */
-#define PATH_SEPARATOR "/"
-#define SECMOD_DB "secmod.db"
 #define CERT_DB_FMT "%scert%s.db"
 #define KEY_DB_FMT "%skey%s.db"
 
 SEC_BEGIN_PROTOS
 
 /* shared functions between pkcs11.c and fipstokn.c */
 extern PRBool nsf_init;
 extern CK_RV nsc_CommonInitialize(CK_VOID_PTR pReserved, PRBool isFIPS);
 extern CK_RV nsc_CommonFinalize(CK_VOID_PTR pReserved, PRBool isFIPS);
 extern PRBool sftk_ForkReset(CK_VOID_PTR pReserved, CK_RV* crv);
@@ skipping 92 matching lines @@
 extern PRBool sftk_IsWeakKey(unsigned char *key,CK_KEY_TYPE key_type);
 
 /* mechanism allows this operation */
 extern CK_RV sftk_MechAllowsOperation(CK_MECHANISM_TYPE type, CK_ATTRIBUTE_TYPE op);
 
 /* helper function which calls nsslowkey_FindKeyByPublicKey after safely
  * acquiring a reference to the keydb from the slot */
 NSSLOWKEYPrivateKey *sftk_FindKeyByPublicKey(SFTKSlot *slot, SECItem *dbKey);
 
 /*
+ * parameter parsing functions
+ */
+CK_RV sftk_parseParameters(char *param, sftk_parameters *parsed, PRBool isFIPS);
+void sftk_freeParams(sftk_parameters *params);
+
+
+/*
  * narrow objects
  */
 SFTKSessionObject * sftk_narrowToSessionObject(SFTKObject *);
 SFTKTokenObject * sftk_narrowToTokenObject(SFTKObject *);
 
 /*
  * token object utilities
  */
 void sftk_addHandle(SFTKSearchResults *search, CK_OBJECT_HANDLE handle);
 PRBool sftk_poisonHandle(SFTKSlot *slot, SECItem *dbkey, 
@@ skipping 22 matching lines @@
  */
 
 extern CK_RV
 sftk_TLSPRFInit(SFTKSessionContext *context, 
                   SFTKObject *        key, 
                   CK_KEY_TYPE         key_type);
 
 SEC_END_PROTOS
 
 #endif /* _PKCS11I_H_ */