Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/softoken/pkcs11u.c

Index: nss/lib/softoken/pkcs11u.c
diff --git a/nss/lib/softoken/pkcs11u.c b/nss/lib/softoken/pkcs11u.c
index 78e2fdc9c4488aedee0ca2c42a3447138c35fa49..de5cbbc29b02c800c61dbf3ab9d9f99ffeec23e5 100644
--- a/nss/lib/softoken/pkcs11u.c
+++ b/nss/lib/softoken/pkcs11u.c
@@ -1174,7 +1174,6 @@ 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);
 
@@ -1191,8 +1190,10 @@ sftk_DeleteObject(SFTKSession *session, SFTKObject *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);
     } 
@@ -1899,7 +1900,6 @@ SFTKObject *
 sftk_NewTokenObject(SFTKSlot *slot, SECItem *dbKey, CK_OBJECT_HANDLE handle)
 {
     SFTKObject *object = NULL;
-    SFTKTokenObject *tokObject = NULL;
     PRBool hasLocks = PR_FALSE;
     CK_RV crv;
 
@@ -1908,7 +1908,6 @@ sftk_NewTokenObject(SFTKSlot *slot, SECItem *dbKey, CK_OBJECT_HANDLE handle)
     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