Author: olegk Date: Fri Feb 10 08:45:54 2006 New Revision: 376759 URL: http://svn.apache.org/viewcvs?rev=376759&view=rev Log: PR #38425 (SSL contrib files do not use standard javax.net.ssl package provided from JDK 1.4.2)
Contributed by Christian BOITEL <cboitel at lfdj.com> Reviewed by Oleg Kalnichevski Modified: jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLInitializationError.java jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLProtocolSocketFactory.java jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLX509TrustManager.java jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java Modified: jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLInitializationError.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLInitializationError.java?rev=376759&r1=376758&r2=376759&view=diff ============================================================================== --- jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLInitializationError.java (original) +++ jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLInitializationError.java Fri Feb 10 08:45:54 2006 @@ -24,9 +24,6 @@ * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. - * - * [Additional notices, if required by prior licensing conditions] - * */ package org.apache.commons.httpclient.contrib.ssl; Modified: jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLProtocolSocketFactory.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLProtocolSocketFactory.java?rev=376759&r1=376758&r2=376759&view=diff ============================================================================== --- jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLProtocolSocketFactory.java (original) +++ jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLProtocolSocketFactory.java Fri Feb 10 08:45:54 2006 @@ -51,12 +51,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.sun.net.ssl.KeyManager; -import com.sun.net.ssl.KeyManagerFactory; -import com.sun.net.ssl.SSLContext; -import com.sun.net.ssl.TrustManager; -import com.sun.net.ssl.TrustManagerFactory; -import com.sun.net.ssl.X509TrustManager; +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.X509TrustManager; /** * <p> @@ -166,7 +166,7 @@ * <p> * DISCLAIMER: HttpClient developers DO NOT actively support this component. * The component is provided as a reference material, which may be inappropriate - * to be used without additional customization. + * for use without additional customization. * </p> */ Modified: jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLX509TrustManager.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLX509TrustManager.java?rev=376759&r1=376758&r2=376759&view=diff ============================================================================== --- jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLX509TrustManager.java (original) +++ jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/AuthSSLX509TrustManager.java Fri Feb 10 08:45:54 2006 @@ -31,7 +31,8 @@ import java.security.cert.X509Certificate; -import com.sun.net.ssl.X509TrustManager; +import javax.net.ssl.X509TrustManager; +import java.security.cert.CertificateException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -69,9 +70,9 @@ } /** - * @see com.sun.net.ssl.X509TrustManager#isClientTrusted(X509Certificate[]) + * @see javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[],String authType) */ - public boolean isClientTrusted(X509Certificate[] certificates) { + public void checkClientTrusted(X509Certificate[] certificates,String authType) throws CertificateException { if (LOG.isInfoEnabled() && certificates != null) { for (int c = 0; c < certificates.length; c++) { X509Certificate cert = certificates[c]; @@ -83,13 +84,13 @@ LOG.info(" Issuer: " + cert.getIssuerDN()); } } - return this.defaultTrustManager.isClientTrusted(certificates); + defaultTrustManager.checkClientTrusted(certificates,authType); } /** - * @see com.sun.net.ssl.X509TrustManager#isServerTrusted(X509Certificate[]) + * @see javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[],String authType) */ - public boolean isServerTrusted(X509Certificate[] certificates) { + public void checkServerTrusted(X509Certificate[] certificates,String authType) throws CertificateException { if (LOG.isInfoEnabled() && certificates != null) { for (int c = 0; c < certificates.length; c++) { X509Certificate cert = certificates[c]; @@ -101,11 +102,11 @@ LOG.info(" Issuer: " + cert.getIssuerDN()); } } - return this.defaultTrustManager.isServerTrusted(certificates); + defaultTrustManager.checkServerTrusted(certificates,authType); } /** - * @see com.sun.net.ssl.X509TrustManager#getAcceptedIssuers() + * @see javax.net.ssl.X509TrustManager#getAcceptedIssuers() */ public X509Certificate[] getAcceptedIssuers() { return this.defaultTrustManager.getAcceptedIssuers(); Modified: jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java?rev=376759&r1=376758&r2=376759&view=diff ============================================================================== --- jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java (original) +++ jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java Fri Feb 10 08:45:54 2006 @@ -42,8 +42,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.sun.net.ssl.SSLContext; -import com.sun.net.ssl.TrustManager; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; /** * <p> Modified: jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java?rev=376759&r1=376758&r2=376759&view=diff ============================================================================== --- jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java (original) +++ jakarta/commons/proper/httpclient/trunk/src/contrib/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java Fri Feb 10 08:45:54 2006 @@ -31,9 +31,9 @@ import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -import com.sun.net.ssl.TrustManagerFactory; -import com.sun.net.ssl.TrustManager; -import com.sun.net.ssl.X509TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -71,26 +71,26 @@ */ public EasyX509TrustManager(KeyStore keystore) throws NoSuchAlgorithmException, KeyStoreException { super(); - TrustManagerFactory factory = TrustManagerFactory.getInstance("SunX509"); + TrustManagerFactory factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); factory.init(keystore); TrustManager[] trustmanagers = factory.getTrustManagers(); if (trustmanagers.length == 0) { - throw new NoSuchAlgorithmException("SunX509 trust manager not supported"); + throw new NoSuchAlgorithmException("no trust manager found"); } this.standardTrustManager = (X509TrustManager)trustmanagers[0]; } /** - * @see com.sun.net.ssl.X509TrustManager#isClientTrusted(X509Certificate[]) + * @see javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[],String authType) */ - public boolean isClientTrusted(X509Certificate[] certificates) { - return this.standardTrustManager.isClientTrusted(certificates); + public void checkClientTrusted(X509Certificate[] certificates,String authType) throws CertificateException { + standardTrustManager.checkClientTrusted(certificates,authType); } /** - * @see com.sun.net.ssl.X509TrustManager#isServerTrusted(X509Certificate[]) + * @see javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[],String authType) */ - public boolean isServerTrusted(X509Certificate[] certificates) { + public void checkServerTrusted(X509Certificate[] certificates,String authType) throws CertificateException { if ((certificates != null) && LOG.isDebugEnabled()) { LOG.debug("Server certificate chain:"); for (int i = 0; i < certificates.length; i++) { @@ -104,16 +104,14 @@ } catch (CertificateException e) { LOG.error(e.toString()); - return false; } - return true; } else { - return this.standardTrustManager.isServerTrusted(certificates); + standardTrustManager.checkServerTrusted(certificates,authType); } } /** - * @see com.sun.net.ssl.X509TrustManager#getAcceptedIssuers() + * @see javax.net.ssl.X509TrustManager#getAcceptedIssuers() */ public X509Certificate[] getAcceptedIssuers() { return this.standardTrustManager.getAcceptedIssuers(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]