Backed out changeset b885a82dc02a (bug 1078108) for breaking B2g ICS Builds
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 10 Oct 2014 09:01:45 +0200
changeset 209745 2ef257fcbcdd77665457ce0ce5329ecdb3a1f9cb
parent 209744 c1617b7400c0caeb7d05acfff5a843b90ec27a1b
child 209746 6275dc4c7cdfc4c0b1b3f22b7c07c16dee61a79b
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs1078108
milestone35.0a1
backs outb885a82dc02a088f2f478c20f568dbb22f72130e
Backed out changeset b885a82dc02a (bug 1078108) for breaking B2g ICS Builds
security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.cpp
security/pkix/test/lib/pkixtestutil.cpp
--- a/security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.cpp
+++ b/security/manager/ssl/tests/unit/tlsserver/lib/OCSPCommon.cpp
@@ -147,17 +147,17 @@ GetOCSPResponseForType(OCSPResponseType 
       break;
   }
   if (aORT == ORTSkipResponseBytes) {
     context.skipResponseBytes = true;
   }
   if (aORT == ORTExpired || aORT == ORTExpiredFreshCA ||
       aORT == ORTRevokedOld || aORT == ORTUnknownOld) {
     context.thisUpdate = oldNow;
-    context.nextUpdate = oldNow + Time::ONE_DAY_IN_SECONDS;
+    context.nextUpdate = oldNow + 10;
   }
   if (aORT == ORTLongValidityAlmostExpired) {
     context.thisUpdate = now - (320 * Time::ONE_DAY_IN_SECONDS);
   }
   if (aORT == ORTAncientAlmostExpired) {
     context.thisUpdate = now - (640 * Time::ONE_DAY_IN_SECONDS);
   }
   if (aORT == ORTRevoked || aORT == ORTRevokedOld) {
--- a/security/pkix/test/lib/pkixtestutil.cpp
+++ b/security/pkix/test/lib/pkixtestutil.cpp
@@ -138,17 +138,17 @@ OCSPResponseContext::OCSPResponseContext
   , includeEmptyExtensions(false)
   , signatureAlgorithm(sha256WithRSAEncryption)
   , badSignature(false)
   , certs(nullptr)
 
   , certStatus(good)
   , revocationTime(0)
   , thisUpdate(time)
-  , nextUpdate(time + Time::ONE_DAY_IN_SECONDS)
+  , nextUpdate(time + 10)
   , includeNextUpdate(true)
 {
 }
 
 static ByteString ResponseBytes(OCSPResponseContext& context);
 static ByteString BasicOCSPResponse(OCSPResponseContext& context);
 static ByteString ResponseData(OCSPResponseContext& context);
 static ByteString ResponderID(OCSPResponseContext& context);