summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>2002-06-14 18:42:41 +0000
committerwtc%netscape.com <devnull@localhost>2002-06-14 18:42:41 +0000
commit24e21ee80f3eebe26d9dab79b9ad401de83490a4 (patch)
treef89b82b7ab52ed7e5027e4de5223575ca7aedf68
parenta999542820a4cebca4e4c7f676caff74c9a9965b (diff)
downloadnss-hg-24e21ee80f3eebe26d9dab79b9ad401de83490a4.tar.gz
Merged the fix for bug 144605 from the tip (rev. 1.9).
Tag: NSS_3_5_BRANCH
-rw-r--r--security/nss/lib/dev/devslot.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/security/nss/lib/dev/devslot.c b/security/nss/lib/dev/devslot.c
index 843a5bd4b..a5c875261 100644
--- a/security/nss/lib/dev/devslot.c
+++ b/security/nss/lib/dev/devslot.c
@@ -331,6 +331,12 @@ nssSlot_IsTokenPresent
if (session->handle != CK_INVALID_SESSION) {
return PR_TRUE;
} else {
+ /* the token has been removed, and reinserted, invalidate all the old
+ * information we had on this token */
+#ifdef NSS_3_4_CODE
+ nssToken_NofifyCertsNotVisible(slot->token);
+#endif /* NSS_3_4_CODE */
+ nssToken_Remove(slot->token);
/* token has been removed, need to refresh with new session */
nssrv = nssSlot_Refresh(slot);
if (nssrv != PR_SUCCESS) {