Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/dev/devtoken.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/. */
 
 #include "pkcs11.h"
 
 #ifndef DEVM_H
 #include "devm.h"
 #endif /* DEVM_H */
 
@@ skipping 1448 matching lines @@
   void *arg
 )
 {
     CK_RV ckrv;
     CK_ULONG count;
     CK_OBJECT_HANDLE *objectHandles;
     CK_ATTRIBUTE_PTR attr;
     CK_ATTRIBUTE cert_template[2];
     CK_ULONG ctsize;
     NSSArena *arena;
-    PRStatus status;
     PRUint32 arraySize, numHandles;
     nssCryptokiObject **objects;
     void *epv = nssToken_GetCryptokiEPV(token);
     nssSession *session = (sessionOpt) ? sessionOpt : token->defaultSession;
 
     /* Don't ask the module to use an invalid session handle. */
     if (!session || session->handle == CK_INVALID_SESSION) {
         PORT_SetError(SEC_ERROR_NO_TOKEN);
         return PR_FAILURE;
     }
@@ skipping 57 matching lines @@
     nssSession_ExitMonitor(session); /* ==== end session lock === */
     if (ckrv != CKR_OK) {
         goto loser;
     }
     if (numHandles > 0) {
         objects = create_objects_from_handles(token, session,
                                               objectHandles, numHandles);
         if (objects) {
             nssCryptokiObject **op;
             for (op = objects; *op; op++) {
-                status = (*callback)(*op, arg);
+                (void)(*callback)(*op, arg);
             }
             nss_ZFreeIf(objects);
         }
     }
     nssArena_Destroy(arena);
     return PR_SUCCESS;
 loser:
     nssArena_Destroy(arena);
     return PR_FAILURE;
 }
@@ skipping 13 matching lines @@
     theClass = CKO_PRIVATE_KEY;
     if (!nssSlot_IsLoggedIn(token->slot)) {
         theClass = CKO_PUBLIC_KEY;
     }
     if (PK11_MatchItem(token->pk11slot, instance->handle, theClass) 
                                                 != CK_INVALID_HANDLE) {
         return PR_TRUE;
     }
     return PR_FALSE;
 }