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

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

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * Initialize the PCKS 11 subsystem
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "nssilock.h"
 #include "secmodi.h"
@@ skipping 1064 matching lines @@
                 slot->flagSeries = series;
                 SECMOD_ReleaseReadLock(moduleLock);
                 PZ_Lock(mod->refLock);
                 mod->evControlMask &= ~SECMOD_END_WAIT;
                 PZ_Unlock(mod->refLock);
                 return PK11_ReferenceSlot(slot);
             }
         }
         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;
         }
         if (flags & CKF_DONT_BLOCK) {
             PZ_Lock(mod->refLock);
             break;
         }
         PR_Sleep(latency);
         PZ_Lock(mod->refLock);
@@ skipping 148 matching lines @@
     SECMOD_GetReadLock(moduleLock);
     for (i=0; i < mod->slotCount; i++) {
         PK11SlotInfo *slot = mod->slots[i];
         /* perm modules are not inserted or removed */
         if (slot->isPerm) {
             continue;
         }
         ret = PR_TRUE;
         break;
     }
+    if (mod->slotCount == 0 ) {
+        ret = PR_TRUE;
+    }
     SECMOD_ReleaseReadLock(moduleLock);
     return ret;
 }
 
 /*
  * helper function to actually create and destroy user defined slots
  */
 static SECStatus
 secmod_UserDBOp(PK11SlotInfo *slot, CK_OBJECT_CLASS objClass, 
                 const char *sendSpec)
@@ skipping 292 matching lines @@
      * on multiple failures, we are only returning the lastError. The caller
      * can determine which slots are bad by calling PK11_IsDisabled().
      */
     if (rrv != SECSuccess) {
         /* restore the last error code */
         PORT_SetError(lastError);
     }
 
     return rrv;
 }