Author: rgodfrey
Date: Thu Dec 10 09:00:28 2015
New Revision: 1719033
URL: http://svn.apache.org/viewvc?rev=1719033&view=rev
Log:
QPID-6938 : Ensure the RestTestHelper can open non TLSv1 HTTPS connections on
the IBM JDK
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java?rev=1719033&r1=1719032&r2=1719033&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
(original)
+++
qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
Thu Dec 10 09:00:28 2015
@@ -41,9 +41,11 @@ import java.security.KeyStore;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.KeyManager;
@@ -179,14 +181,10 @@ public class RestTestHelper
KeyManagerFactory.getDefaultAlgorithm(),
CERT_ALIAS_APP1);
- SSLContext sslContext =
SSLContextFactory.buildClientContext(trustManagers, keyManagers);
-
if(Collections.disjoint(Arrays.asList(sslContext.getSupportedSSLParameters().getProtocols()),
-
Arrays.asList(SSLUtil.getEnabledSSlProtocols())))
- {
- sslContext =
SSLContext.getInstance(SSLUtil.getEnabledSSlProtocols()[0]);
- sslContext.init(keyManagers, trustManagers, null);
- }
+ final SSLContext sslContext =
SSLContext.getInstance(SSLUtil.getEnabledSSlProtocols()[0]);
+
+ sslContext.init(keyManagers, trustManagers, null);
SSLSocketFactory sslSocketFactory =
sslContext.getSocketFactory();
@@ -217,14 +215,9 @@ public class RestTestHelper
SSLContextFactory.getKeyManagers(null, null, null,
null, null);
- SSLContext sslContext =
SSLContextFactory.buildClientContext(trustManagers, keyManagers);
-
if(Collections.disjoint(Arrays.asList(sslContext.getSupportedSSLParameters().getProtocols()),
-
Arrays.asList(SSLUtil.getEnabledSSlProtocols())))
- {
- sslContext =
SSLContext.getInstance(SSLUtil.getEnabledSSlProtocols()[0]);
+ final SSLContext sslContext =
SSLContext.getInstance(SSLUtil.getEnabledSSlProtocols()[0]);
- sslContext.init(keyManagers, trustManagers, null);
- }
+ sslContext.init(keyManagers, trustManagers, null);
SSLSocketFactory sslSocketFactory =
sslContext.getSocketFactory();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
