Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/softoken/pkcs11u.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/. */
 /*
  * Internal PKCS #11 functions. Should only be called by pkcs11.c
  */
 #include "pkcs11.h"
 #include "pkcs11i.h"
 #include "lowkeyi.h"
 #include "secasn1.h"
@@ skipping 1156 matching lines @@
 } 
 
 /*
  * delete an object from a slot and session queue
  */
 CK_RV
 sftk_DeleteObject(SFTKSession *session, SFTKObject *object)
 {
     SFTKSlot *slot = sftk_SlotFromSession(session);
     SFTKSessionObject *so = sftk_narrowToSessionObject(object);
-    SFTKTokenObject *to = sftk_narrowToTokenObject(object);
     CK_RV crv = CKR_OK;
     PRUint32 index = sftk_hash(object->handle, slot->sessObjHashSize);
 
     /* Handle Token case */
     if (so && so->session) {
         SFTKSession *session = so->session;
         PZ_Lock(session->objectLock);
         sftkqueue_delete(&so->sessionList,0,session->objects,0);
         PZ_Unlock(session->objectLock);
         PZ_Lock(slot->objectLock);
         sftkqueue_delete2(object, object->handle, index, slot->sessObjHashTable);
         PZ_Unlock(slot->objectLock);
         sftkqueue_clear_deleted_element(object);
         sftk_FreeObject(object); /* free the reference owned by the queue */
     } else {
         SFTKDBHandle *handle = sftk_getDBForTokenObject(slot, object->handle);
-
+#ifdef DEBUG
+        SFTKTokenObject *to = sftk_narrowToTokenObject(object);
         PORT_Assert(to);
+#endif
         crv = sftkdb_DestroyObject(handle, object->handle);
         sftk_freeDB(handle);
     } 
     return crv;
 }
 
 /*
  * Token objects don't explicitly store their attributes, so we need to know
  * what attributes make up a particular token object before we can copy it.
  * below are the tables by object type.
@@ skipping 686 matching lines @@
     objClassTemplate.ulValueLen = sizeof(*objClass);
     crv = sftkdb_GetAttributeValue(dbHandle, handle, &objClassTemplate, 1);
     sftk_freeDB(dbHandle);
     return crv;
 }
 
 SFTKObject *
 sftk_NewTokenObject(SFTKSlot *slot, SECItem *dbKey, CK_OBJECT_HANDLE handle)
 {
     SFTKObject *object = NULL;
-    SFTKTokenObject *tokObject = NULL;
     PRBool hasLocks = PR_FALSE;
     CK_RV crv;
 
     object = sftk_GetObjectFromList(&hasLocks, PR_FALSE, &tokenObjectList,  0,
                                                         PR_FALSE);
     if (object == NULL) {
         return NULL;
     }
-    tokObject = (SFTKTokenObject *) object;
 
     object->handle = handle;
     /* every object must have a class, if we can't get it, the object
      * doesn't exist */
     crv = handleToClass(slot, handle, &object->objclass);
     if (crv != CKR_OK) {
         goto loser;
     }
     object->slot = slot;
     object->objectInfo = NULL;
@@ skipping 48 matching lines @@
 {
     return !sftk_isToken(obj->handle) ? (SFTKSessionObject *)obj : NULL;
 }
 
 SFTKTokenObject *
 sftk_narrowToTokenObject(SFTKObject *obj)
 {
     return sftk_isToken(obj->handle) ? (SFTKTokenObject *)obj : NULL;
 }