Update NSS to NSS 3.14 Beta 1.

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"
 #include "secmodti.h"
 #include "pk11func.h"
 #include "pki3hack.h"
 #include "secerr.h"
 #include "dev.h"
 #include "pkcs11ni.h"
+#include "utilpars.h"
 
 /* these are for displaying error messages */
 
 static  SECMODModuleList *modules = NULL;
 static  SECMODModuleList *modulesDB = NULL;
 static  SECMODModuleList *modulesUnload = NULL;
 static  SECMODModule *internalModule = NULL;
 static  SECMODModule *defaultDBModule = NULL;
 static  SECMODModule *pendingModule = NULL;
 static SECMODListLock *moduleLock = NULL;
@@ skipping 1048 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) {
             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 97 matching lines @@
         return NULL;
     }
 
     /* just grab the first slot in the module, any present slot should work */
     slot = PK11_ReferenceSlot(mod->slots[0]);
     if (slot == NULL) {
         return NULL;
     }
 
     /* we've found the slot, now build the moduleSpec */
-    escSpec = secmod_DoubleEscape(moduleSpec, '>', ']');
+    escSpec = NSSUTIL_DoubleEscape(moduleSpec, '>', ']');
     if (escSpec == NULL) {
         PK11_FreeSlot(slot);
         return NULL;
     }
     sendSpec = PR_smprintf("tokens=[0x%x=<%s>]", slotID, escSpec);
     PORT_Free(escSpec);
 
     if (sendSpec == NULL) {
         /* PR_smprintf does not set SEC_ERROR_NO_MEMORY on failure. */
         PK11_FreeSlot(slot);
         PORT_SetError(SEC_ERROR_NO_MEMORY);
         return NULL;
     }
     rv = secmod_UserDBOp(slot, CKO_NETSCAPE_NEWSLOT, sendSpec);
     PR_smprintf_free(sendSpec);
     PK11_FreeSlot(slot);
     if (rv != SECSuccess) {
         return NULL;
     }
 
-    return SECMOD_FindSlotByID(mod, slotID);
+    slot = SECMOD_FindSlotByID(mod, slotID);
+    if (slot) {
+        /* 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 slot;
 }
 
 /*
  * Open a new database using the softoken. The caller is responsible for making
  * sure the module spec is correct and usable. The caller should ask for one
  * new database per call if the caller wants to get meaningful information 
  * about the new database.
  *
  * moduleSpec is the same data that you would pass to softoken at 
  * initialization time under the 'tokens' options. For example, if you were
@@ skipping 153 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;
 }