stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6885667: CertPath/CertPathValidatorTest/bugs/bug6383078 fails on jdk6u18/b02, jdk7/pit/b73 and passes on b72

Browse Source 
Wrap all OCSP exceptions in CertPathValidatorException so that we can fallback to CRLs, if enabled.

Reviewed-by: dgu, xuelei
This commit is contained in:
Sean Mullan 2009-10-14 09:36:31 -04:00
parent fb306e5742
commit 581d01d8c4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
View File

@ -64,6 +64,8 @@ public final class OCSP {
private static final Debug debug = Debug.getInstance("certpath"); private static final Debug debug = Debug.getInstance("certpath");
private static final int CONNECT_TIMEOUT = 15000; // 15 seconds
private OCSP() {} private OCSP() {}
/** /**
@ -176,6 +178,8 @@ public final class OCSP {
debug.println("connecting to OCSP service at: " + url); debug.println("connecting to OCSP service at: " + url);
} }
HttpURLConnection con = (HttpURLConnection)url.openConnection(); HttpURLConnection con = (HttpURLConnection)url.openConnection();
con.setConnectTimeout(CONNECT_TIMEOUT);
con.setReadTimeout(CONNECT_TIMEOUT);
con.setDoOutput(true); con.setDoOutput(true);
con.setDoInput(true); con.setDoInput(true);
con.setRequestMethod("POST"); con.setRequestMethod("POST");

8
jdk/src/share/classes/sun/security/provider/certpath/OCSPChecker.java
View File

@ -25,7 +25,6 @@
package sun.security.provider.certpath; package sun.security.provider.certpath;
import java.io.IOException;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.*; import java.util.*;
import java.security.AccessController; import java.security.AccessController;
@ -335,10 +334,11 @@ class OCSPChecker extends PKIXCertPathChecker {
(issuerCert, currCertImpl.getSerialNumberObject()); (issuerCert, currCertImpl.getSerialNumberObject());
response = OCSP.check(Collections.singletonList(certId), uri, response = OCSP.check(Collections.singletonList(certId), uri,
responderCert, pkixParams.getDate()); responderCert, pkixParams.getDate());
} catch (IOException ioe) { } catch (Exception e) {
// should allow this to pass if network failures are acceptable // Wrap all exceptions in CertPathValidatorException so that
// we can fallback to CRLs, if enabled.
throw new CertPathValidatorException throw new CertPathValidatorException
("Unable to send OCSP request", ioe); ("Unable to send OCSP request", e);
} }
RevocationStatus rs = (RevocationStatus) response.getSingleResponse(certId); RevocationStatus rs = (RevocationStatus) response.getSingleResponse(certId);