Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/certdb/certdb.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/. */
 
 /*
  * Certificate handling code
  */
 
 #include "nssilock.h"
 #include "prmon.h"
@@ skipping 2425 matching lines @@
 }
 
 SECStatus
 CERT_ImportCerts(CERTCertDBHandle *certdb, SECCertUsage usage,
                  unsigned int ncerts, SECItem **derCerts,
                  CERTCertificate ***retCerts, PRBool keepCerts,
                  PRBool caOnly, char *nickname)
 {
     unsigned int i;
     CERTCertificate **certs = NULL;
-    SECStatus rv;
     unsigned int fcerts = 0;
 
     if ( ncerts ) {
         certs = PORT_ZNewArray(CERTCertificate*, ncerts);
         if ( certs == NULL ) {
             return(SECFailure);
         }
     
         /* decode all of the certs into the temporary DB */
         for ( i = 0, fcerts= 0; i < ncerts; i++) {
@@ skipping 27 matching lines @@
                     canickname = CERT_MakeCANickname(certs[i]);
                 }
 
                 if(isCA && (fcerts > 1)) {
                     /* if we are importing only a single cert and specifying
                      * a nickname, we want to use that nickname if it a CA,
                      * otherwise if there are more than one cert, we don't
                      * know which cert it belongs to. But we still may try
                      * the individual canickname from the cert itself.
                      */
-                    rv = CERT_AddTempCertToPerm(certs[i], canickname, NULL);
+                    /* Bug 1192442 - propagate errors from these calls. */
+                    (void)CERT_AddTempCertToPerm(certs[i], canickname, NULL);
                 } else {
-                    rv = CERT_AddTempCertToPerm(certs[i],
-                                                nickname?nickname:canickname, NULL);
+                    (void)CERT_AddTempCertToPerm(certs[i],
+                                                 nickname?nickname:canickname, NULL);
                 }
 
                 PORT_Free(canickname);
                 /* don't care if it fails - keep going */
             }
         }
     }
 
     if ( retCerts ) {
         *retCerts = certs;
     } else {
         if (certs) {
             CERT_DestroyCertArray(certs, fcerts);
         }
     }
 
-    return ((fcerts || !ncerts) ? SECSuccess : SECFailure);
+    return (fcerts || !ncerts) ? SECSuccess : SECFailure;
 }
 
 /*
  * a real list of certificates - need to convert CERTCertificateList
  * stuff and ASN 1 encoder/decoder over to using this...
  */
 CERTCertList *
 CERT_NewCertList(void)
 {
     PLArenaPool *arena = NULL;
@@ skipping 361 matching lines @@
     PZ_Lock(certRefCountLock);
     return;
 }
 
 /*
  * Free the cert reference count lock
  */
 void
 CERT_UnlockCertRefCount(CERTCertificate *cert)
 {
-    PRStatus prstat;
-
     PORT_Assert(certRefCountLock != NULL);
     
-    prstat = PZ_Unlock(certRefCountLock);
-    
-    PORT_Assert(prstat == PR_SUCCESS);
-
-    return;
+#ifdef DEBUG
+    {
+        PRStatus prstat = PZ_Unlock(certRefCountLock);
+        PORT_Assert(prstat == PR_SUCCESS);
+    }
+#else
+    PZ_Unlock(certRefCountLock);
+#endif
 }
 
 static PZLock *certTrustLock = NULL;
 
 /*
  * Acquire the cert trust lock
  * There is currently one global lock for all certs, but I'm putting a cert
  * arg here so that it will be easy to make it per-cert in the future if
  * that turns out to be necessary.
  */
@@ skipping 51 matching lines @@
     }
     return rv;
 }
 
 /*
  * Free the cert trust lock
  */
 void
 CERT_UnlockCertTrust(const CERTCertificate *cert)
 {
-    PRStatus prstat;
-
     PORT_Assert(certTrustLock != NULL);
     
-    prstat = PZ_Unlock(certTrustLock);
-    
-    PORT_Assert(prstat == PR_SUCCESS);
-
-    return;
+#ifdef DEBUG
+    {
+        PRStatus prstat = PZ_Unlock(certTrustLock);
+        PORT_Assert(prstat == PR_SUCCESS);
+    }
+#else
+    PZ_Unlock(certTrustLock);
+#endif
 }
 
 
 /*
  * Get the StatusConfig data for this handle
  */
 CERTStatusConfig *
 CERT_GetStatusConfig(CERTCertDBHandle *handle)
 {
   return handle->statusConfig;
@@ skipping 277 matching lines @@
     CERTCertificate *cert = NULL;
     SECItem *derCert;
 
     derCert = cert_FindDERCertBySubjectKeyID(subjKeyID);
     if (derCert) {
         cert = CERT_FindCertByDERCert(handle, derCert);
         SECITEM_FreeItem(derCert, PR_TRUE);
     }
     return cert;
 }