Update third_party/nss to NSS 3.15.4.

nss/lib/certhigh/ocspi.h

 /* 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/. */
 /*
  * ocspi.h - NSS internal interfaces to OCSP code
  */
 
 #ifndef _OCSPI_H_
 #define _OCSPI_H_
 
@@ skipping 23 matching lines @@
                              SECItem *tbsResponseDataDER,
                              void *pwArg);
 
 CERTOCSPRequest *
 cert_CreateSingleCertOCSPRequest(CERTOCSPCertID *certID, 
                                  CERTCertificate *singleCert, 
                                  PRTime time,
                                  PRBool addServiceLocator,
                                  CERTCertificate *signerCert);
 
+typedef enum { ocspMissing, ocspFresh, ocspStale } OCSPFreshness;
+
 SECStatus
-ocsp_GetCachedOCSPResponseStatusIfFresh(CERTOCSPCertID *certID, 
-                                        PRTime time,
-                                        PRBool ignoreOcspFailureMode,
-                                        SECStatus *rvOcsp,
-                                        SECErrorCodes *missingResponseError);
+ocsp_GetCachedOCSPResponseStatus(CERTOCSPCertID *certID,
+                                 PRTime time,
+                                 PRBool ignoreOcspFailureMode,
+                                 SECStatus *rvOcsp,
+                                 SECErrorCodes *missingResponseError,
+                                 OCSPFreshness *freshness);
 
 /*
  * FUNCTION: cert_ProcessOCSPResponse
  *  Same behavior and basic parameters as CERT_GetOCSPStatusForCertID.
  *  In addition it can update the OCSP cache (using information
  *  available internally to this function).
  * INPUTS:
  *  CERTCertDBHandle *handle
  *    certificate DB of the cert that is being checked
  *  CERTOCSPResponse *response
@@ skipping 72 matching lines @@
 /* FUNCTION: ocsp_FetchingFailureIsVerificationFailure
  * The function checks the global ocsp settings and
  * tells how to treat an ocsp response fetching failure.
  * RETURNS:
  *   if PR_TRUE is returned, then treat fetching as a
  *   revoked cert status.
  */
 PRBool
 ocsp_FetchingFailureIsVerificationFailure(void);
 
+size_t
+ocsp_UrlEncodeBase64Buf(const char *base64Buf, char *outputBuf);
+
+SECStatus
+ocsp_GetVerifiedSingleResponseForCertID(CERTCertDBHandle *handle, 
+                                        CERTOCSPResponse *response, 
+                                        CERTOCSPCertID   *certID,
+                                        CERTCertificate  *signerCert,
+                                        PRTime            time,
+                                        CERTOCSPSingleResponse **pSingleResponse);
+
+SECStatus
+ocsp_CertHasGoodStatus(ocspCertStatus *status, PRTime time);
+
+void
+ocsp_CacheSingleResponse(CERTOCSPCertID *certID,
+                         CERTOCSPSingleResponse *single,
+                         PRBool *certIDWasConsumed);
+
 #endif /* _OCSPI_H_ */