Merge
authormullan
Thu, 06 Nov 2008 11:58:06 -0500
changeset 1568 494b4ff9a892
parent 1517 4ca99a6fc74e (current diff)
parent 1567 58ef474069d7 (diff)
child 1569 54e1de48703e
Merge
--- a/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Fri Oct 31 17:34:52 2008 +0100
+++ b/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Thu Nov 06 11:58:06 2008 -0500
@@ -151,6 +151,10 @@
 
     private SingleResponse singleResponse;
 
+    // Maximum clock skew in milliseconds (10 minutes) allowed when checking
+    // validity of OCSP responses
+    private static final long MAX_CLOCK_SKEW = 600000;
+
     // an array of all of the CRLReasons (used in SingleResponse)
     private static CRLReason[] values = CRLReason.values();
 
@@ -583,7 +587,9 @@
                 }
             }
 
-            Date now = new Date();
+            long now = System.currentTimeMillis();
+            Date nowPlusSkew = new Date(now + MAX_CLOCK_SKEW);
+            Date nowMinusSkew = new Date(now - MAX_CLOCK_SKEW);
             if (DEBUG != null) {
                 String until = "";
                 if (nextUpdate != null) {
@@ -593,8 +599,8 @@
                     thisUpdate + until);
             }
             // Check that the test date is within the validity interval
-            if ((thisUpdate != null && now.before(thisUpdate)) ||
-                (nextUpdate != null && now.after(nextUpdate))) {
+            if ((thisUpdate != null && nowPlusSkew.before(thisUpdate)) ||
+                (nextUpdate != null && nowMinusSkew.after(nextUpdate))) {
 
                 if (DEBUG != null) {
                     DEBUG.println("Response is unreliable: its validity " +