Merged the fix for bug 144487 (rev. 1.48) on the NSS_3_5_BRANCH.

1 files changed, 25 insertions, 1 deletions

diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c
index 639b651ae..2a6a43a85 100644
--- a/security/nss/lib/softoken/pkcs11.c
+++ b/security/nss/lib/softoken/pkcs11.c
@@ -2366,6 +2366,25 @@ static void nscFreeAllSlots(int moduleIndex)
     }
 }
 
+static void
+pk11_closePeer(PRBool isFIPS)
+{
+    CK_SLOT_ID slotID = isFIPS ? PRIVATE_KEY_SLOT_ID: FIPS_SLOT_ID;
+    PK11Slot *slot;
+    int moduleIndex = isFIPS? NSC_NON_FIPS_MODULE : NSC_FIPS_MODULE;
+    PLHashTable *tmpSlotHashTable = nscSlotHashTable[moduleIndex];
+
+    slot = (PK11Slot *) PL_HashTableLookup(tmpSlotHashTable, (void *)slotID);
+    if (slot == NULL) {
+	return;
+    }
+    pk11_DBShutdown(slot->certDB,slot->keyDB);
+    slot->certDB = NULL;
+    slot->keyDB = NULL;
+    return;
+}
+
+static PRBool nsc_init = PR_FALSE;
 
 /* NSC_Initialize initializes the Cryptoki library. */
 CK_RV nsc_CommonInitialize(CK_VOID_PTR pReserved, PRBool isFIPS)
@@ -2407,6 +2426,12 @@ CK_RV nsc_CommonInitialize(CK_VOID_PTR pReserved, PRBool isFIPS)
 	    goto loser;
 	}
 
+	/* if we have a peer already open, have him close his DB's so we
+	 * don't clobber each other. */
+	if ((isFIPS && nsc_init) || (!isFIPS && nsf_init)) {
+	    pk11_closePeer(isFIPS);
+	}
+
 	for (i=0; i < paramStrings.token_count; i++) {
 	    crv = 
 		PK11_SlotInit(paramStrings.configdir, &paramStrings.tokens[i],
@@ -2423,7 +2448,6 @@ loser:
     return crv;
 }
 
-static PRBool nsc_init = PR_FALSE;
 CK_RV NSC_Initialize(CK_VOID_PTR pReserved)
 {
     CK_RV crv;