Update third_party/nss to NSS 3.15.4.

nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocspcertid.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/. */
 /*
  * pkix_pl_ocspcertid.c
  *
  * Certificate ID Object for OCSP
  *
  */
 
@@ skipping 166 matching lines @@
         PKIX_PL_OcspCertID *cid, 
         PKIX_PL_Date *validity,
         PKIX_Boolean *hasFreshStatus,
         PKIX_Boolean *statusIsGood,
         SECErrorCodes *missingResponseError,
         void *plContext)
 {
         PRTime time = 0;
         SECStatus rv;
         SECStatus rvOcsp;
+        OCSPFreshness freshness;
 
         PKIX_ENTER(DATE, "PKIX_PL_OcspCertID_GetFreshCacheStatus");
         PKIX_NULLCHECK_THREE(cid, hasFreshStatus, statusIsGood);
 
         if (validity != NULL) {
                 PKIX_CHECK(pkix_pl_Date_GetPRTime(validity, &time, plContext),
                         PKIX_DATEGETPRTIMEFAILED);
         } else {
                 time = PR_Now();
         }
 
-        rv = ocsp_GetCachedOCSPResponseStatusIfFresh(
+        rv = ocsp_GetCachedOCSPResponseStatus(
                 cid->certID, time, PR_TRUE, /*ignoreGlobalOcspFailureSetting*/
-                &rvOcsp, missingResponseError);
+                &rvOcsp, missingResponseError, &freshness);
 
-        *hasFreshStatus = (rv == SECSuccess);
+        *hasFreshStatus = (rv == SECSuccess && freshness == ocspFresh);
         if (*hasFreshStatus) {
                 *statusIsGood = (rvOcsp == SECSuccess);
         }
 cleanup:
         PKIX_RETURN(OCSPCERTID);
 }
 
 /*
  * FUNCTION: PKIX_PL_OcspCertID_RememberOCSPProcessingFailure
  * DESCRIPTION:
@@ skipping 28 matching lines @@
 
         cert_RememberOCSPProcessingFailure(cid->certID, &certIDWasConsumed);
 
         if (certIDWasConsumed) {
                 cid->certID = NULL;
         }
 
         PKIX_RETURN(OCSPCERTID);
 }