Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pk11wrap/pk11slot.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/. */
 /*
  * Deal with PKCS #11 Slots.
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "nssilock.h"
 #include "secmodi.h"
@@ skipping 382 matching lines @@
     slot->cert_count = 0;
     slot->slot_name[0] = 0;
     slot->token_name[0] = 0;
     PORT_Memset(slot->serial,' ',sizeof(slot->serial));
     slot->module = NULL;
     slot->authTransact = 0;
     slot->authTime = LL_ZERO;
     slot->minPassword = 0;
     slot->maxPassword = 0;
     slot->hasRootCerts = PR_FALSE;
+    slot->hasRootTrust = PR_FALSE;
     slot->nssToken = NULL;
     return slot;
 }
     
 /* create a new reference to a slot so it doesn't go away */
 PK11SlotInfo *
 PK11_ReferenceSlot(PK11SlotInfo *slot)
 {
     PR_ATOMIC_INCREMENT(&slot->refCount);
     return slot;
@@ skipping 135 matching lines @@
         if ((!dllName) || (mlp->module->dllName &&
             (0 == PORT_Strcmp(mlp->module->dllName, dllName)))) {
             for (i=0; i < mlp->module->slotCount; i++) {
                 PK11SlotInfo *tmpSlot = (mlp->module->slots?mlp->module->slots[i]:NULL);
                 PORT_Assert(tmpSlot);
                 if (!tmpSlot) {
                     rv = SECFailure;
                     break;
                 }
                 if ((PR_FALSE == presentOnly || PK11_IsPresent(tmpSlot)) &&
-                    ( (!tokenName) || (tmpSlot->token_name &&
-                    (0==PORT_Strcmp(tmpSlot->token_name, tokenName)))) &&
-                    ( (!slotName) || (tmpSlot->slot_name &&
-                    (0==PORT_Strcmp(tmpSlot->slot_name, slotName)))) ) {
+                    ( (!tokenName) ||
+                      (0==PORT_Strcmp(tmpSlot->token_name, tokenName)) ) &&
+                    ( (!slotName) ||
+                      (0==PORT_Strcmp(tmpSlot->slot_name, slotName)) ) ) {
                     if (tmpSlot) {
                         PK11_AddSlotToList(slotList, tmpSlot, PR_TRUE);
                         slotcount++;
                     }
                 }
             }
         }
     }
     SECMOD_ReleaseReadLock(moduleLock);
 
@@ skipping 526 matching lines @@
  * initialize a new token
  * unlike initialize slot, this can be called multiple times in the lifetime
  * of NSS. It reads the information associated with a card or token,
  * that is not going to change unless the card or token changes.
  */
 SECStatus
 PK11_InitToken(PK11SlotInfo *slot, PRBool loadCerts)
 {
     CK_TOKEN_INFO tokenInfo;
     CK_RV crv;
-    char *tmp;
     SECStatus rv;
     PRStatus status;
 
     /* set the slot flags to the current token values */
     if (!slot->isThreadSafe) PK11_EnterSlotMonitor(slot);
     crv = PK11_GETTAB(slot)->C_GetTokenInfo(slot->slotID,&tokenInfo);
     if (!slot->isThreadSafe) PK11_ExitSlotMonitor(slot);
     if (crv != CKR_OK) {
         PORT_SetError(PK11_MapError(crv));
         return SECFailure;
@@ skipping 13 matching lines @@
     slot->protectedAuthPath =
                 ((tokenInfo.flags & CKF_PROTECTED_AUTHENTICATION_PATH) 
                                                         ? PR_TRUE : PR_FALSE);
     slot->lastLoginCheck = 0;
     slot->lastState = 0;
     /* on some platforms Active Card incorrectly sets the 
      * CKF_PROTECTED_AUTHENTICATION_PATH bit when it doesn't mean to. */
     if (slot->isActiveCard) {
         slot->protectedAuthPath = PR_FALSE;
     }
-    tmp = PK11_MakeString(NULL,slot->token_name,
-                        (char *)tokenInfo.label, sizeof(tokenInfo.label));
+    (void)PK11_MakeString(NULL,slot->token_name,
+                          (char *)tokenInfo.label, sizeof(tokenInfo.label));
     slot->minPassword = tokenInfo.ulMinPinLen;
     slot->maxPassword = tokenInfo.ulMaxPinLen;
     PORT_Memcpy(slot->serial,tokenInfo.serialNumber,sizeof(slot->serial));
 
     nssToken_UpdateName(slot->nssToken);
 
     slot->defRWSession = (PRBool)((!slot->readOnly) && 
                                         (tokenInfo.ulMaxSessionCount == 1));
     rv = PK11_ReadMechanismList(slot);
     if (rv != SECSuccess) return rv;
@@ skipping 188 matching lines @@
  * This initialization code is called on each slot a module supports when
  * it is loaded. It does the bringup initialization. The difference between
  * this and InitToken is Init slot does those one time initialization stuff,
  * usually associated with the reader, while InitToken may get called multiple
  * times as tokens are removed and re-inserted.
  */
 void
 PK11_InitSlot(SECMODModule *mod, CK_SLOT_ID slotID, PK11SlotInfo *slot)
 {
     SECStatus rv;
-    char *tmp;
     CK_SLOT_INFO slotInfo;
 
     slot->functionList = mod->functionList;
     slot->isInternal = mod->internal;
     slot->slotID = slotID;
     slot->isThreadSafe = mod->isThreadSafe;
     slot->hasRSAInfo = PR_FALSE;
     
     if (PK11_GETTAB(slot)->C_GetSlotInfo(slotID,&slotInfo) != CKR_OK) {
         slot->disabled = PR_TRUE;
         slot->reason = PK11_DIS_COULD_NOT_INIT_TOKEN;
         return;
     }
 
     /* test to make sure claimed mechanism work */
     slot->needTest = mod->internal ? PR_FALSE : PR_TRUE;
     slot->module = mod; /* NOTE: we don't make a reference here because
                          * modules have references to their slots. This
                          * works because modules keep implicit references
                          * from their slots, and won't unload and disappear
                          * until all their slots have been freed */
-    tmp = PK11_MakeString(NULL,slot->slot_name,
+    (void)PK11_MakeString(NULL,slot->slot_name,
          (char *)slotInfo.slotDescription, sizeof(slotInfo.slotDescription));
     slot->isHW = (PRBool)((slotInfo.flags & CKF_HW_SLOT) == CKF_HW_SLOT);
 #define ACTIVE_CARD "ActivCard SA"
     slot->isActiveCard = (PRBool)(PORT_Strncmp((char *)slotInfo.manufacturerID,
                                 ACTIVE_CARD, sizeof(ACTIVE_CARD)-1) == 0);
     if ((slotInfo.flags & CKF_REMOVABLE_DEVICE) == 0) {
         slot->isPerm = PR_TRUE;
         /* permanment slots must have the token present always */
         if ((slotInfo.flags & CKF_TOKEN_PRESENT) == 0) {
             slot->disabled = PR_TRUE;
@@ skipping 660 matching lines @@
 PK11SlotInfo *
 PK11_GetBestSlotMultipleWithAttributes(CK_MECHANISM_TYPE *type, 
                 CK_FLAGS *mechanismInfoFlags, unsigned int *keySize, 
                 unsigned int mech_count, void *wincx)
 {
     PK11SlotList *list = NULL;
     PK11SlotListElement *le ;
     PK11SlotInfo *slot = NULL;
     PRBool freeit = PR_FALSE;
     PRBool listNeedLogin = PR_FALSE;
-    int i;
+    unsigned int i;
     SECStatus rv;
 
     list = PK11_GetSlotList(type[0]);
 
     if ((list == NULL) || (list->head == NULL)) {
         /* We need to look up all the tokens for the mechanism */
         list = PK11_GetAllTokens(type[0],PR_FALSE,PR_TRUE,wincx);
         freeit = PR_TRUE;
     }
 
@@ skipping 331 matching lines @@
                 first_time_set = PR_TRUE;
             }
             if ((interval-first_time) > timeout) {
                 return waitForRemoval ? PK11TokenPresent : PK11TokenRemoved;
             }
         }
         PR_Sleep(latency);
    }
    return waitForRemoval ? PK11TokenRemoved : PK11TokenPresent;
 }