Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pki/trustdomain.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/. */
 
 #ifndef DEV_H
 #include "dev.h"
 #endif /* DEV_H */
 
 #ifndef PKIM_H
 #include "pkim.h"
@@ skipping 973 matching lines @@
     return nssPKIObjectCollection_AddInstanceAsObject(collection, instance);
 }
 
 NSS_IMPLEMENT PRStatus *
 NSSTrustDomain_TraverseCertificates (
   NSSTrustDomain *td,
   PRStatus (*callback)(NSSCertificate *c, void *arg),
   void *arg
 )
 {
-    PRStatus status = PR_FAILURE;
     NSSToken *token = NULL;
     NSSSlot **slots = NULL;
     NSSSlot **slotp;
     nssPKIObjectCollection *collection = NULL;
     nssPKIObjectCallback pkiCallback;
     nssUpdateLevel updateLevel;
     NSSCertificate **cached = NULL;
     nssList *certList;
 
     certList = nssList_Create(NULL, PR_FALSE);
@@ skipping 16 matching lines @@
     for (slotp = slots; *slotp; slotp++) {
         /* get the token for the slot, if present */
         token = nssSlot_GetToken(*slotp);
         if (token) {
             nssSession *session;
             nssTokenSearchType tokenOnly = nssTokenSearchType_TokenOnly;
             /* get a session for the token */
             session = nssTrustDomain_GetSessionForToken(td, token);
             if (session) {
                 /* perform the traversal */
-                status = nssToken_TraverseCertificates(token,
+                (void)nssToken_TraverseCertificates(token,
                                                        session,
                                                        tokenOnly,
                                                        collector,
                                                        collection);
             }
             nssToken_Destroy(token);
         }
     }
 
     /* Traverse the collection */
     pkiCallback.func.cert = callback;
     pkiCallback.arg = arg;
-    status = nssPKIObjectCollection_Traverse(collection, &pkiCallback);
+    (void)nssPKIObjectCollection_Traverse(collection, &pkiCallback);
 loser:
     if (slots) {
         nssSlotArray_Destroy(slots);
     }
     if (collection) {
         nssPKIObjectCollection_Destroy(collection);
     }
     return NULL;
 }
 
@@ skipping 186 matching lines @@
 NSS_IMPLEMENT NSSCryptoContext *
 NSSTrustDomain_CreateCryptoContextForAlgorithmAndParameters (
   NSSTrustDomain *td,
   NSSAlgorithmAndParameters *ap
 )
 {
     nss_SetError(NSS_ERROR_NOT_FOUND);
     return NULL;
 }