Author: rgodfrey
Date: Thu Dec 10 08:35:26 2015
New Revision: 1719026
URL: http://svn.apache.org/viewvc?rev=1719026&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=1719026&r1=1719025&r2=1719026&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 08:35:26 2015
@@ -38,6 +38,7 @@ import java.net.URL;
import java.net.URLEncoder;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -70,6 +71,7 @@ import org.apache.qpid.server.model.Queu
import org.apache.qpid.ssl.SSLContextFactory;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
+import org.apache.qpid.transport.network.security.ssl.SSLUtil;
public class RestTestHelper
{
@@ -177,8 +179,14 @@ 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);
+ }
SSLSocketFactory sslSocketFactory =
sslContext.getSocketFactory();
@@ -210,6 +218,13 @@ public class RestTestHelper
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);
+ }
SSLSocketFactory sslSocketFactory =
sslContext.getSocketFactory();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
