Update third_party/nss to 3.15.5 Beta 2.

nss/lib/certhigh/ocsp.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/. */
 
 /*
  * Implementation of OCSP services, for both client and server.
  * (XXX, really, mostly just for client right now, but intended to do both.)
  */
 
 #include "prerror.h"
@@ skipping 4209 matching lines @@
 
     return rv;
 }
 
 /*
  * See if the request's certID and the single response's certID match.
  * This can be easy or difficult, depending on whether the same hash
  * algorithm was used.
  */
 static PRBool
-ocsp_CertIDsMatch(CERTCertDBHandle *handle,
-                  CERTOCSPCertID *requestCertID,
+ocsp_CertIDsMatch(CERTOCSPCertID *requestCertID,
                   CERTOCSPCertID *responseCertID)
 {
     PRBool match = PR_FALSE;
     SECOidTag hashAlg;
     SECItem *keyHash = NULL;
     SECItem *nameHash = NULL;
 
     /*
      * In order to match, they must have the same issuer and the same
      * serial number.
@@ skipping 36 matching lines @@
     case SEC_OID_MD5:
         keyHash = &requestCertID->issuerMD5KeyHash;
         nameHash = &requestCertID->issuerMD5NameHash;
         break;
     case SEC_OID_MD2:
         keyHash = &requestCertID->issuerMD2KeyHash;
         nameHash = &requestCertID->issuerMD2NameHash;
         break;
     default:
         PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
-        return SECFailure;
+        return PR_FALSE;
     }
 
     if ((keyHash != NULL)
         && (SECITEM_CompareItem(nameHash,
                                 &responseCertID->issuerNameHash) == SECEqual)
         && (SECITEM_CompareItem(keyHash,
                                 &responseCertID->issuerKeyHash) == SECEqual)) {
         match = PR_TRUE;
     }
 
@@ skipping 13 matching lines @@
                                 CERTOCSPCertID *certID)
 {
     CERTOCSPSingleResponse *single;
     int i;
 
     if (responses == NULL)
         return NULL;
 
     for (i = 0; responses[i] != NULL; i++) {
         single = responses[i];
-        if (ocsp_CertIDsMatch(handle, certID, single->certID)) {
+        if (ocsp_CertIDsMatch(certID, single->certID)) {
             return single;
         }
     }
 
     /*
      * The OCSP server should have included a response even if it knew
      * nothing about the certificate in question.  Since it did not,
      * this will make it look as if it had.
      * 
      * XXX Should we make this a separate error to notice the server's
@@ skipping 1837 matching lines @@
       case ocspResponse_unauthorized:
         PORT_SetError(SEC_ERROR_OCSP_UNAUTHORIZED_REQUEST);
         break;
       case ocspResponse_unused:
       default:
         PORT_SetError(SEC_ERROR_OCSP_UNKNOWN_RESPONSE_STATUS);
         break;
     }
     return SECFailure;
 }