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

HTTPCLIENT-1349: Removed references to deprecated methods 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1478916 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2013-05-03 18:45:57 +00:00
parent e71b14d28c
commit f08b21bdf1
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
View File

@ -41,7 +41,6 @@ import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException; import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLPeerUnverifiedException;
import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManager;
@ -182,14 +181,20 @@ public class TestSSLSocketFactory extends LocalServerTestBase {
final SSLContext defaultsslcontext = SSLContext.getInstance("TLS"); final SSLContext defaultsslcontext = SSLContext.getInstance("TLS");
defaultsslcontext.init(null, null, null); defaultsslcontext.init(null, null, null);
final SSLSocketFactory socketFactory = new SSLSocketFactory(new TrustStrategy() { final TrustStrategy trustStrategy = new TrustStrategy() {
public boolean isTrusted( public boolean isTrusted(
final X509Certificate[] chain, final String authType) throws CertificateException { final X509Certificate[] chain, final String authType) throws CertificateException {
return chain.length == 1; return chain.length == 1;
} }
}, SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); };
final SSLContext sslcontext = SSLContexts.custom()
.loadTrustMaterial(null, null, trustStrategy)
.build();
final SSLSocketFactory socketFactory = new SSLSocketFactory(
sslcontext,
SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
final SSLSocket socket = (SSLSocket) socketFactory.createSocket(context); final SSLSocket socket = (SSLSocket) socketFactory.createSocket(context);
final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); final InetSocketAddress remoteAddress = this.localServer.getServiceAddress();
@ -198,27 +203,35 @@ public class TestSSLSocketFactory extends LocalServerTestBase {
@Test @Test
public void testKeyWithAlternatePassword() throws Exception { public void testKeyWithAlternatePassword() throws Exception {
String keystorePassword = "nopassword"; final String keystorePassword = "nopassword";
String keyPassword = "password"; final String keyPassword = "password";
ClassLoader cl = getClass().getClassLoader(); final ClassLoader cl = getClass().getClassLoader();
URL url = cl.getResource("test-keypasswd.keystore"); final URL url = cl.getResource("test-keypasswd.keystore");
KeyStore keystore = KeyStore.getInstance("jks"); final KeyStore keystore = KeyStore.getInstance("jks");
keystore.load(url.openStream(), keystorePassword.toCharArray()); keystore.load(url.openStream(), keystorePassword.toCharArray());
new SSLSocketFactory(keystore, keyPassword, keystore); final SSLContext sslcontext = SSLContexts.custom()
.loadKeyMaterial(keystore, keyPassword != null ? keyPassword.toCharArray() : null)
.loadTrustMaterial(keystore)
.build();
new SSLSocketFactory(sslcontext);
} }
@Test(expected=UnrecoverableKeyException.class) @Test(expected=UnrecoverableKeyException.class)
public void testKeyWithAlternatePasswordInvalid() throws Exception { public void testKeyWithAlternatePasswordInvalid() throws Exception {
String keystorePassword = "nopassword"; final String keystorePassword = "nopassword";
String keyPassword = "!password"; final String keyPassword = "!password";
ClassLoader cl = getClass().getClassLoader(); final ClassLoader cl = getClass().getClassLoader();
URL url = cl.getResource("test-keypasswd.keystore"); final URL url = cl.getResource("test-keypasswd.keystore");
KeyStore keystore = KeyStore.getInstance("jks"); final KeyStore keystore = KeyStore.getInstance("jks");
keystore.load(url.openStream(), keystorePassword.toCharArray()); keystore.load(url.openStream(), keystorePassword.toCharArray());
new SSLSocketFactory(keystore, keyPassword, keystore); final SSLContext sslcontext = SSLContexts.custom()
.loadKeyMaterial(keystore, keyPassword != null ? keyPassword.toCharArray() : null)
.loadTrustMaterial(keystore)
.build();
new SSLSocketFactory(sslcontext);
} }
} }