Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pki/pkibase.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 885 matching lines @@
     }
     return PR_SUCCESS;
 }
 
 NSS_IMPLEMENT PRStatus
 nssPKIObjectCollection_Traverse (
   nssPKIObjectCollection *collection,
   nssPKIObjectCallback *callback
 )
 {
-    PRStatus status;
     PRCList *link = PR_NEXT_LINK(&collection->head);
     pkiObjectCollectionNode *node;
     while (link != &collection->head) {
         node = (pkiObjectCollectionNode *)link;
         if (!node->haveObject) {
             node->object = (*collection->createObject)(node->object);
             if (!node->object) {
                 link = PR_NEXT_LINK(link);
                 /*remove bogus object from list*/
                 nssPKIObjectCollection_RemoveNode(collection,node);
                 continue;
             }
             node->haveObject = PR_TRUE;
         }
         switch (collection->objectType) {
         case pkiObjectType_Certificate: 
-            status = (*callback->func.cert)((NSSCertificate *)node->object, 
+            (void)(*callback->func.cert)((NSSCertificate *)node->object, 
                                             callback->arg);
             break;
         case pkiObjectType_CRL: 
-            status = (*callback->func.crl)((NSSCRL *)node->object, 
+            (void)(*callback->func.crl)((NSSCRL *)node->object, 
                                            callback->arg);
             break;
         case pkiObjectType_PrivateKey: 
-            status = (*callback->func.pvkey)((NSSPrivateKey *)node->object, 
+            (void)(*callback->func.pvkey)((NSSPrivateKey *)node->object, 
                                              callback->arg);
             break;
         case pkiObjectType_PublicKey: 
-            status = (*callback->func.pbkey)((NSSPublicKey *)node->object, 
+            (void)(*callback->func.pbkey)((NSSPublicKey *)node->object, 
                                              callback->arg);
             break;
         }
         link = PR_NEXT_LINK(link);
     }
     return PR_SUCCESS;
 }
 
 NSS_IMPLEMENT PRStatus
 nssPKIObjectCollection_AddInstanceAsObject (
@@ skipping 104 matching lines @@
     }
     return (nssPKIObject *)cert;
 }
 
 NSS_IMPLEMENT nssPKIObjectCollection *
 nssCertificateCollection_Create (
   NSSTrustDomain *td,
   NSSCertificate **certsOpt
 )
 {
-    PRStatus status;
     nssPKIObjectCollection *collection;
     collection = nssPKIObjectCollection_Create(td, NULL, nssPKIMonitor);
+    if (!collection) {
+        return NULL;
+    }
     collection->objectType = pkiObjectType_Certificate;
     collection->destroyObject = cert_destroyObject;
     collection->getUIDFromObject = cert_getUIDFromObject;
     collection->getUIDFromInstance = cert_getUIDFromInstance;
     collection->createObject = cert_createObject;
     if (certsOpt) {
         for (; *certsOpt; certsOpt++) {
             nssPKIObject *object = (nssPKIObject *)(*certsOpt);
-            status = nssPKIObjectCollection_AddObject(collection, object);
+            (void)nssPKIObjectCollection_AddObject(collection, object);
         }
     }
     return collection;
 }
 
 NSS_IMPLEMENT NSSCertificate **
 nssPKIObjectCollection_GetCertificates (
   nssPKIObjectCollection *collection,
   NSSCertificate **rvOpt,
   PRUint32 maximumOpt,
@@ skipping 75 matching lines @@
 {
     return (nssPKIObject *)nssCRL_Create(o);
 }
 
 NSS_IMPLEMENT nssPKIObjectCollection *
 nssCRLCollection_Create (
   NSSTrustDomain *td,
   NSSCRL **crlsOpt
 )
 {
-    PRStatus status;
     nssPKIObjectCollection *collection;
     collection = nssPKIObjectCollection_Create(td, NULL, nssPKILock);
+    if (!collection) {
+        return NULL;
+    }
     collection->objectType = pkiObjectType_CRL;
     collection->destroyObject = crl_destroyObject;
     collection->getUIDFromObject = crl_getUIDFromObject;
     collection->getUIDFromInstance = crl_getUIDFromInstance;
     collection->createObject = crl_createObject;
     if (crlsOpt) {
         for (; *crlsOpt; crlsOpt++) {
             nssPKIObject *object = (nssPKIObject *)(*crlsOpt);
-            status = nssPKIObjectCollection_AddObject(collection, object);
+            (void)nssPKIObjectCollection_AddObject(collection, object);
         }
     }
     return collection;
 }
 
 NSS_IMPLEMENT NSSCRL **
 nssPKIObjectCollection_GetCRLs (
   nssPKIObjectCollection *collection,
   NSSCRL **rvOpt,
   PRUint32 maximumOpt,
@@ skipping 56 matching lines @@
 }
 
 NSS_IMPLEMENT PRTime
 NSSTime_GetPRTime (
   NSSTime *time
 )
 {
   return time->prTime;
 }