summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrelyea%netscape.com <devnull@localhost>2001-09-28 00:48:51 +0000
committerrelyea%netscape.com <devnull@localhost>2001-09-28 00:48:51 +0000
commit5b50706e4d616189f23f101fdb49149117ae63e8 (patch)
tree67824d67b5c8921ad32c93a1e24237e5bbad4157
parenta4039bd266c15a80499d586ce6a10d67ac152a37 (diff)
downloadnss-hg-5b50706e4d616189f23f101fdb49149117ae63e8.tar.gz
Fix compile bugs in the new auto DB handling code
-rw-r--r--security/nss/lib/softoken/pkcs11i.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/security/nss/lib/softoken/pkcs11i.h b/security/nss/lib/softoken/pkcs11i.h
index 60d87ae1c..bada687f7 100644
--- a/security/nss/lib/softoken/pkcs11i.h
+++ b/security/nss/lib/softoken/pkcs11i.h
@@ -41,6 +41,7 @@
#include "secoidt.h"
#include "lowkeyti.h"
#include "pkcs11t.h"
+#include "pcertt.h"
#define PKCS11_USE_THREADS
@@ -264,8 +265,8 @@ struct PK11SlotStr {
PRBool ssoLoggedIn;
PRBool needLogin;
PRBool DB_loaded;
- NSSLOWCERTDBHandle *certdb;
- NSSLOWKEYDBHandle *keydb;
+ NSSLOWCERTCertDBHandle *certDB;
+ NSSLOWKEYDBHandle *keyDB;
int sessionIDCount;
int sessionCount;
int rwSessionCount;
@@ -391,7 +392,8 @@ SEC_BEGIN_PROTOS
/* shared functions between PKCS11.c and PK11FIPS.c */
extern CK_RV PK11_LowInitialize(CK_VOID_PTR pReserved);
-extern CK_RV PK11_SlotInit(CK_SLOT_ID slotID, PRBool needLogin);
+extern CK_RV PK11_SlotInit(CK_SLOT_ID slotID, PRBool needLogin,
+ NSSLOWCERTCertDBHandle *certdb, NSSLOWKEYDBHandle *keydb);
/* internal utility functions used by pkcs11.c */
extern PK11Attribute *pk11_FindAttribute(PK11Object *object,