Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-1329: SSLSocketFactory keystorePassword constructor parameter should be char[] instead of java.lang.String 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1463575 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2013-04-02 14:49:41 +00:00
parent 0bbbd742b8
commit ee0997dfff
1 changed files with 99 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
View File

@ -190,7 +190,7 @@ public class SSLSocketFactory implements LayeredConnectionSocketFactory, SchemeL
private static SSLContext createSSLContext( private static SSLContext createSSLContext(
String algorithm, String algorithm,
final KeyStore keystore, final KeyStore keystore,
final String keystorePassword, final char[] keystorePassword,
final KeyStore truststore, final KeyStore truststore,
final SecureRandom random, final SecureRandom random,
final TrustStrategy trustStrategy) final TrustStrategy trustStrategy)
@ -200,7 +200,7 @@ public class SSLSocketFactory implements LayeredConnectionSocketFactory, SchemeL
} }
final KeyManagerFactory kmfactory = KeyManagerFactory.getInstance( final KeyManagerFactory kmfactory = KeyManagerFactory.getInstance(
KeyManagerFactory.getDefaultAlgorithm()); KeyManagerFactory.getDefaultAlgorithm());
kmfactory.init(keystore, keystorePassword != null ? keystorePassword.toCharArray(): null); kmfactory.init(keystore, keystorePassword);
final KeyManager[] keymanagers = kmfactory.getKeyManagers(); final KeyManager[] keymanagers = kmfactory.getKeyManagers();
final TrustManagerFactory tmfactory = TrustManagerFactory.getInstance( final TrustManagerFactory tmfactory = TrustManagerFactory.getInstance(
TrustManagerFactory.getDefaultAlgorithm()); TrustManagerFactory.getDefaultAlgorithm());
@ -222,7 +222,23 @@ public class SSLSocketFactory implements LayeredConnectionSocketFactory, SchemeL
} }
/** /**
* @deprecated (4.1) Use {@link #SSLSocketFactory(String, KeyStore, String, KeyStore, * @since 4.3
*/
public SSLSocketFactory(
final String algorithm,
final KeyStore keystore,
final char[] keystorePassword,
final KeyStore truststore,
final SecureRandom random,
final TrustStrategy trustStrategy,
final X509HostnameVerifier hostnameVerifier)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(createSSLContext(algorithm, keystore, keystorePassword, truststore, random, trustStrategy),
hostnameVerifier);
}
/**
* @deprecated (4.1) Use {@link #SSLSocketFactory(String, KeyStore, char[], KeyStore,
* SecureRandom, X509HostnameVerifier)} * SecureRandom, X509HostnameVerifier)}
*/ */
@Deprecated @Deprecated
@ -235,29 +251,17 @@ public class SSLSocketFactory implements LayeredConnectionSocketFactory, SchemeL
final HostNameResolver nameResolver) final HostNameResolver nameResolver)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException { throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(createSSLContext( this(createSSLContext(
algorithm, keystore, keystorePassword, truststore, random, null), algorithm, keystore, keystorePassword != null ? keystorePassword.toCharArray() : null,
nameResolver); truststore, random, null), nameResolver);
}
/**
* @since 4.1
*/
public SSLSocketFactory(
final String algorithm,
final KeyStore keystore,
final String keystorePassword,
final KeyStore truststore,
final SecureRandom random,
final X509HostnameVerifier hostnameVerifier)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(createSSLContext(
algorithm, keystore, keystorePassword, truststore, random, null),
hostnameVerifier);
} }
/** /**
* @since 4.1 * @since 4.1
*
* @deprecated (4.3) Use {@link SSLSocketFactory#SSLSocketFactory(String, KeyStore, char[],
* KeyStore, SecureRandom, TrustStrategy, X509HostnameVerifier)}
*/ */
@Deprecated
public SSLSocketFactory( public SSLSocketFactory(
final String algorithm, final String algorithm,
final KeyStore keystore, final KeyStore keystore,
@ -268,10 +272,49 @@ public class SSLSocketFactory implements LayeredConnectionSocketFactory, SchemeL
final X509HostnameVerifier hostnameVerifier) final X509HostnameVerifier hostnameVerifier)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException { throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(createSSLContext( this(createSSLContext(
algorithm, keystore, keystorePassword, truststore, random, trustStrategy), algorithm, keystore, keystorePassword != null ? keystorePassword.toCharArray() : null,
truststore, random, trustStrategy), hostnameVerifier);
}
/**
* @since 4.1
*
* @deprecated (4.3) Use {@link SSLSocketFactory#SSLSocketFactory(String, KeyStore, char[],
* KeyStore, SecureRandom, X509HostnameVerifier)}
*/
@Deprecated
public SSLSocketFactory(
final String algorithm,
final KeyStore keystore,
final String keystorePassword,
final KeyStore truststore,
final SecureRandom random,
final X509HostnameVerifier hostnameVerifier)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(createSSLContext(
algorithm, keystore, keystorePassword != null ? keystorePassword.toCharArray() : null,
truststore, random, null), hostnameVerifier);
}
/**
* @since 4.3
*/
public SSLSocketFactory(
final String algorithm,
final KeyStore keystore,
final char[] keystorePassword,
final KeyStore truststore,
final SecureRandom random,
final X509HostnameVerifier hostnameVerifier)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(createSSLContext(algorithm, keystore, keystorePassword, truststore, random, null),
hostnameVerifier); hostnameVerifier);
} }
/**
* @deprecated (4.3) Use {@link SSLSocketFactory#SSLSocketFactory(KeyStore, char[], KeyStore)}
*/
@Deprecated
public SSLSocketFactory( public SSLSocketFactory(
final KeyStore keystore, final KeyStore keystore,
final String keystorePassword, final String keystorePassword,
@ -280,17 +323,47 @@ public class SSLSocketFactory implements LayeredConnectionSocketFactory, SchemeL
this(TLS, keystore, keystorePassword, truststore, null, null, BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); this(TLS, keystore, keystorePassword, truststore, null, null, BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
} }
/**
* @since 4.3
*/
public SSLSocketFactory(
final KeyStore keystore,
final char[] keystorePassword,
final KeyStore truststore)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException{
this(createSSLContext(TLS, keystore, keystorePassword, truststore, null, null),
BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
}
/**
* @deprecated (4.3) Use {@link SSLSocketFactory#SSLSocketFactory(KeyStore, char[])}
*/
@Deprecated
public SSLSocketFactory( public SSLSocketFactory(
final KeyStore keystore, final KeyStore keystore,
final String keystorePassword) final String keystorePassword)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException{ throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException{
this(TLS, keystore, keystorePassword, null, null, null, BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); this(createSSLContext(TLS, keystore, keystorePassword != null ? keystorePassword.toCharArray() : null,
null, null, null),
BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
}
/**
* @since 4.3
*/
public SSLSocketFactory(
final KeyStore keystore,
final char[] keystorePassword)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException{
this(createSSLContext(TLS, keystore, keystorePassword, null, null, null),
BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
} }
public SSLSocketFactory( public SSLSocketFactory(
final KeyStore truststore) final KeyStore truststore)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException { throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(TLS, null, null, truststore, null, null, BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); this(createSSLContext(TLS, null, null, truststore, null, null),
BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
} }
/** /**
@ -300,7 +373,7 @@ public class SSLSocketFactory implements LayeredConnectionSocketFactory, SchemeL
final TrustStrategy trustStrategy, final TrustStrategy trustStrategy,
final X509HostnameVerifier hostnameVerifier) final X509HostnameVerifier hostnameVerifier)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException { throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(TLS, null, null, null, null, trustStrategy, hostnameVerifier); this(createSSLContext(TLS, null, null, null, null, trustStrategy), hostnameVerifier);
} }
/** /**
@ -309,7 +382,7 @@ public class SSLSocketFactory implements LayeredConnectionSocketFactory, SchemeL
public SSLSocketFactory( public SSLSocketFactory(
final TrustStrategy trustStrategy) final TrustStrategy trustStrategy)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException { throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(TLS, null, null, null, null, trustStrategy, BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); this(createSSLContext(TLS, null, null, null, null, trustStrategy), BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
} }
public SSLSocketFactory(final SSLContext sslContext) { public SSLSocketFactory(final SSLContext sslContext) {