Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(654)

Unified Diff: nss/lib/pk11wrap/pk11util.c

Issue 17773004: Update NSS to NSS_3_15_1_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « nss/lib/nss/nss.h ('k') | nss/lib/pki/tdcache.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/lib/pk11wrap/pk11util.c
===================================================================
--- nss/lib/pk11wrap/pk11util.c (revision 206843)
+++ nss/lib/pk11wrap/pk11util.c (working copy)
@@ -1495,6 +1495,13 @@
}
rv = secmod_UserDBOp(slot, CKO_NETSCAPE_DELSLOT, sendSpec);
PR_smprintf_free(sendSpec);
+ /* if we are in the delay period for the "isPresent" call, reset
+ * the delay since we know things have probably changed... */
+ if (slot->nssToken && slot->nssToken->slot) {
+ nssSlot_ResetDelay(slot->nssToken->slot);
+ /* force the slot info structures to properly reset */
+ (void)PK11_IsPresent(slot);
+ }
return rv;
}
« no previous file with comments | « nss/lib/nss/nss.h ('k') | nss/lib/pki/tdcache.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698