changeset 6105:05e7d9925f3e

8015275: Resolve ambiguity in OCSPChecker & CrlRevocationChecker Summary: Replace use of java.security.cert.* to avoid conflict with class in OpenJDK 6. Reviewed-by: mullan
author andrew
date Fri, 24 May 2013 16:50:36 +0100
parents cb92124a3507
children d8cb3b571560
files src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java src/share/classes/sun/security/provider/certpath/OCSPChecker.java
diffstat 2 files changed, 32 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java	Fri May 24 15:01:50 2013 +0400
+++ b/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java	Fri May 24 16:50:36 2013 +0100
@@ -38,8 +38,27 @@
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 import java.security.PublicKey;
-import java.security.cert.*;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateRevokedException;
+import java.security.cert.CertPathBuilder;
+import java.security.cert.CertPathBuilderException;
+import java.security.cert.CertPathValidatorException;
 import java.security.cert.CertPathValidatorException.BasicReason;
+import java.security.cert.CertStore;
+import java.security.cert.CollectionCertStoreParameters;
+import java.security.cert.CRLException;
+import java.security.cert.CRLReason;
+import java.security.cert.PKIXBuilderParameters;
+import java.security.cert.PKIXCertPathBuilderResult;
+import java.security.cert.PKIXCertPathChecker;
+import java.security.cert.PKIXParameters;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509Certificate;
+import java.security.cert.X509CertSelector;
+import java.security.cert.X509CRL;
+import java.security.cert.X509CRLEntry;
+import java.security.cert.X509CRLSelector;
 import java.security.interfaces.DSAPublicKey;
 import javax.security.auth.x500.X500Principal;
 import sun.security.util.Debug;
--- a/src/share/classes/sun/security/provider/certpath/OCSPChecker.java	Fri May 24 15:01:50 2013 +0400
+++ b/src/share/classes/sun/security/provider/certpath/OCSPChecker.java	Fri May 24 16:50:36 2013 +0100
@@ -31,8 +31,19 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.Security;
-import java.security.cert.*;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateRevokedException;
+import java.security.cert.CertPath;
+import java.security.cert.CertPathValidatorException;
 import java.security.cert.CertPathValidatorException.BasicReason;
+import java.security.cert.CertStore;
+import java.security.cert.CertStoreException;
+import java.security.cert.PKIXCertPathChecker;
+import java.security.cert.PKIXParameters;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509Certificate;
+import java.security.cert.X509CertSelector;
 import java.net.URI;
 import java.net.URISyntaxException;
 import javax.security.auth.x500.X500Principal;