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

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

Index: mozilla/security/nss/lib/softoken/pkcs11i.h
===================================================================
--- mozilla/security/nss/lib/softoken/pkcs11i.h	(revision 166571)
+++ mozilla/security/nss/lib/softoken/pkcs11i.h	(working copy)
@@ -10,10 +10,10 @@
 #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"
 
 /* 
@@ -67,8 +67,6 @@
 				   * 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.
@@ -546,8 +544,6 @@
 
 
 /* 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"
 
@@ -660,6 +656,13 @@
 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 *);