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

mozilla/security/nss/lib/pk11wrap/pk11util.c

Index: mozilla/security/nss/lib/pk11wrap/pk11util.c
===================================================================
--- mozilla/security/nss/lib/pk11wrap/pk11util.c	(revision 164196)
+++ mozilla/security/nss/lib/pk11wrap/pk11util.c	(working copy)
@@ -1082,7 +1082,7 @@
 	}
 	SECMOD_ReleaseReadLock(moduleLock);
 	/* if everything was perm modules, don't lock up forever */
-	if (!removableSlotsFound) {
+	if ((mod->slotCount !=0) && !removableSlotsFound) {

[wtc, 2012/11/07 22:12:33]

Hmm... I don't remember reviewing the changes to this file, even
though rrelyea said r=wtc.

http://bonsai.mozilla.org/cvslog.cgi?file=mozilla/security/nss/lib/pk11wrap/p...

 	    error =SEC_ERROR_NO_SLOT_SELECTED;
 	    PZ_Lock(mod->refLock);
 	    break;
@@ -1251,6 +1251,9 @@
 	ret = PR_TRUE;
 	break;
     }
+    if (mod->slotCount == 0 ) {
+	ret = PR_TRUE;
+    }
     SECMOD_ReleaseReadLock(moduleLock);
     return ret;
 }