qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject [4/5] qpid-jms git commit: QPIDJMS-35: add transport tests that need client certificates and verify the aliased key selection
Date Thu, 02 Apr 2015 17:30:59 GMT
QPIDJMS-35: add transport tests that need client certificates and verify the aliased key selection


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9292dd6e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9292dd6e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9292dd6e

Branch: refs/heads/master
Commit: 9292dd6e08d01007ed240da1258b2db136c6a2c1
Parents: 14e4083
Author: Robert Gemmell <robbie@apache.org>
Authored: Thu Apr 2 14:52:38 2015 +0100
Committer: Robert Gemmell <robbie@apache.org>
Committed: Thu Apr 2 15:50:59 2015 +0100

----------------------------------------------------------------------
 .../jms/transports/netty/NettyEchoServer.java   |  17 +++-
 .../netty/NettySslTransportFactoryTest.java     |   6 +-
 .../transports/netty/NettySslTransportTest.java | 100 ++++++++++++++++++-
 qpid-jms-client/src/test/resources/README.txt   |  13 ++-
 .../src/test/resources/broker-jceks.keystore    | Bin 2675 -> 2672 bytes
 .../src/test/resources/broker-jceks.truststore  | Bin 777 -> 776 bytes
 .../src/test/resources/broker-jks.keystore      | Bin 2702 -> 2699 bytes
 .../src/test/resources/broker-jks.truststore    | Bin 777 -> 776 bytes
 .../src/test/resources/broker-pkcs12.keystore   | Bin 3212 -> 3212 bytes
 .../src/test/resources/broker-pkcs12.truststore | Bin 1000 -> 1000 bytes
 .../resources/broker-wrong-host-jks.keystore    | Bin 3212 -> 3212 bytes
 qpid-jms-client/src/test/resources/broker.crt   |  16 +--
 qpid-jms-client/src/test/resources/broker.csr   |  10 +-
 .../src/test/resources/ca-pkcs12.keystore       | Bin 1508 -> 1508 bytes
 qpid-jms-client/src/test/resources/ca.crt       |  16 +--
 .../src/test/resources/client-jceks.keystore    | Bin 2674 -> 2669 bytes
 .../src/test/resources/client-jceks.truststore  | Bin 777 -> 776 bytes
 .../src/test/resources/client-jks.keystore      | Bin 2701 -> 2696 bytes
 .../src/test/resources/client-jks.truststore    | Bin 777 -> 776 bytes
 .../resources/client-multiple-keys-jks.keystore | Bin 0 -> 4619 bytes
 .../src/test/resources/client-pkcs12.keystore   | Bin 3212 -> 3204 bytes
 .../src/test/resources/client-pkcs12.truststore | Bin 1000 -> 1000 bytes
 qpid-jms-client/src/test/resources/client.crt   |  28 +++---
 qpid-jms-client/src/test/resources/client.csr   |  22 ++--
 qpid-jms-client/src/test/resources/client2.crt  |  16 +++
 qpid-jms-client/src/test/resources/client2.csr  |  13 +++
 .../src/test/resources/other-ca-jks.truststore  | Bin 796 -> 794 bytes
 qpid-jms-client/src/test/resources/other-ca.crt |  26 ++---
 28 files changed, 215 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyEchoServer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyEchoServer.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyEchoServer.java
index fff2323..23f23fa 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyEchoServer.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyEchoServer.java
@@ -59,15 +59,18 @@ public class NettyEchoServer implements AutoCloseable {
     private Channel serverChannel;
     private final TransportOptions options;
     private int serverPort;
+    private boolean needClientAuth;
+    private volatile SslHandler sslHandler;
 
     private final AtomicBoolean started = new AtomicBoolean();
 
-    public NettyEchoServer() {
-        this.options = TransportOptions.INSTANCE;
+    public NettyEchoServer(TransportOptions options) {
+        this(options, false);
     }
 
-    public NettyEchoServer(TransportOptions options) {
+    public NettyEchoServer(TransportOptions options, boolean needClientAuth) {
         this.options = options;
+        this.needClientAuth = needClientAuth;
     }
 
     public void start() throws Exception {
@@ -84,6 +87,7 @@ public class NettyEchoServer implements AutoCloseable {
             server.option(ChannelOption.SO_BACKLOG, 100);
             server.handler(new LoggingHandler(LogLevel.INFO));
             server.childHandler(new ChannelInitializer<Channel>() {
+
                 @Override
                 public void initChannel(Channel ch) throws Exception {
                     if (options instanceof TransportSslOptions) {
@@ -91,7 +95,8 @@ public class NettyEchoServer implements AutoCloseable {
                         SSLContext context = TransportSupport.createSslContext(sslOptions);
                         SSLEngine engine = TransportSupport.createSslEngine(context, sslOptions);
                         engine.setUseClientMode(false);
-                        SslHandler sslHandler = new SslHandler(engine);
+                        engine.setNeedClientAuth(needClientAuth);
+                        sslHandler = new SslHandler(engine);
                         ch.pipeline().addLast(sslHandler);
                     }
                     ch.pipeline().addLast(new EchoServerHandler());
@@ -176,4 +181,8 @@ public class NettyEchoServer implements AutoCloseable {
             ctx.close();
         }
     }
+
+    SslHandler getSslHandler() {
+        return sslHandler;
+    }
 }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportFactoryTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportFactoryTest.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportFactoryTest.java
index 3492ba1..d40841c 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportFactoryTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportFactoryTest.java
@@ -52,7 +52,8 @@ public class NettySslTransportFactoryTest {
     public static final String CUSTOM_ENABLED_CIPHER_SUITES_STRING = "Suite-1,Suite-2";
     public static final String CUSTOM_STORE_TYPE = "jceks";
     public static final boolean CUSTOM_TRUST_ALL = true;
-    public static final boolean CUSTOM_VERIFY_HOST = true;
+    public static final boolean CUSTOM_VERIFY_HOST = false;
+    public static final String CUSTOM_KEY_ALIAS = "myTestAlias";
 
     @Test
     public void testCreateWithDefaultOptions() throws Exception {
@@ -89,6 +90,7 @@ public class NettySslTransportFactoryTest {
 
         assertEquals(TransportSslOptions.DEFAULT_STORE_TYPE, sslOptions.getStoreType());
         assertEquals(TransportSslOptions.DEFAULT_VERIFY_HOST, sslOptions.isVerifyHost());
+        assertNull(sslOptions.getKeyAlias());
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -121,6 +123,7 @@ public class NettySslTransportFactoryTest {
             "transport.verifyHost=" + CUSTOM_VERIFY_HOST + "&" +
             "transport.storeType=" + CUSTOM_STORE_TYPE + "&" +
             "transport.trustAll=" + CUSTOM_TRUST_ALL + "&" +
+            "transport.keyAlias=" + CUSTOM_KEY_ALIAS + "&" +
             "transport.enabledProtocols=" + CUSTOM_ENABLED_PROTOCOLS_STRING + "&" +
             "transport.enabledCipherSuites=" + CUSTOM_ENABLED_CIPHER_SUITES_STRING);
 
@@ -157,5 +160,6 @@ public class NettySslTransportFactoryTest {
 
         assertEquals(CUSTOM_STORE_TYPE, sslOptions.getStoreType());
         assertEquals(CUSTOM_VERIFY_HOST, sslOptions.isVerifyHost());
+        assertEquals(CUSTOM_KEY_ALIAS, sslOptions.getKeyAlias());
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
index c1542e6..d94bf6d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
@@ -18,10 +18,19 @@ package org.apache.qpid.jms.transports.netty;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import io.netty.handler.ssl.SslHandler;
 
+import java.io.IOException;
 import java.net.URI;
+import java.net.URISyntaxException;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLSession;
 
 import org.apache.qpid.jms.transports.Transport;
 import org.apache.qpid.jms.transports.TransportListener;
@@ -40,10 +49,18 @@ public class NettySslTransportTest extends NettyTcpTransportTest {
 
     public static final String PASSWORD = "password";
     public static final String SERVER_KEYSTORE = "src/test/resources/broker-jks.keystore";
+    public static final String SERVER_TRUSTSTORE = "src/test/resources/broker-jks.truststore";
     public static final String SERVER_WRONG_HOST_KEYSTORE = "src/test/resources/broker-wrong-host-jks.keystore";
+    public static final String CLIENT_KEYSTORE = "src/test/resources/client-jks.keystore";
+    public static final String CLIENT_MULTI_KEYSTORE = "src/test/resources/client-multiple-keys-jks.keystore";
     public static final String CLIENT_TRUSTSTORE = "src/test/resources/client-jks.truststore";
     public static final String OTHER_CA_TRUSTSTORE = "src/test/resources/other-ca-jks.truststore";
 
+    public static final String CLIENT_KEY_ALIAS = "client";
+    public static final String CLIENT_DN = "O=Client,CN=client";
+    public static final String CLIENT2_KEY_ALIAS = "client2";
+    public static final String CLIENT2_DN = "O=Client2,CN=client2";
+
     public static final String KEYSTORE_TYPE = "jks";
 
     @Override
@@ -186,8 +203,84 @@ public class NettySslTransportTest extends NettyTcpTransportTest {
         assertTrue(exceptions.isEmpty());
     }
 
+    @Test(timeout = 60 * 1000)
+    public void testConnectWithNeedClientAuth() throws Exception {
+        TransportSslOptions serverOptions = createServerOptions();
+
+        try (NettyEchoServer server = new NettyEchoServer(serverOptions, true)) {
+            server.start();
+
+            int port = server.getServerPort();
+            URI serverLocation = new URI("tcp://localhost:" + port);
+
+            TransportSslOptions clientOptions = createClientOptions();
+
+            NettySslTransport transport = createTransport(serverLocation, testListener, clientOptions);
+            try {
+                transport.connect();
+                LOG.info("Connection established to test server.");
+            } catch (Exception e) {
+                fail("Should have connected to the server");
+            }
+
+            assertTrue(transport.isConnected());
+
+            // Verify there was a certificate sent to the server
+            assertNotNull(server.getSslHandler().engine().getSession().getPeerCertificates());
+
+            transport.close();
+        }
+
+        logTransportErrors();
+        assertTrue(exceptions.isEmpty());
+    }
+
+    @Test(timeout = 60 * 1000)
+    public void testConnectWithSpecificClientAuthKeyAlias() throws Exception {
+        doClientAuthAliasTestImpl(CLIENT_KEY_ALIAS, CLIENT_DN);
+        doClientAuthAliasTestImpl(CLIENT2_KEY_ALIAS, CLIENT2_DN);
+    }
+
+    private void doClientAuthAliasTestImpl(String alias, String expectedDN) throws Exception,
URISyntaxException, IOException, InterruptedException {
+        TransportSslOptions serverOptions = createServerOptions();
+
+        try (NettyEchoServer server = new NettyEchoServer(serverOptions, true)) {
+            server.start();
+
+            int port = server.getServerPort();
+            URI serverLocation = new URI("tcp://localhost:" + port);
+
+            TransportSslOptions clientOptions = createClientOptions();
+            clientOptions.setKeyStoreLocation(CLIENT_MULTI_KEYSTORE);
+            clientOptions.setKeyAlias(alias);
+
+            NettySslTransport transport = createTransport(serverLocation, testListener, clientOptions);
+            try {
+                transport.connect();
+                LOG.info("Connection established to test server.");
+            } catch (Exception e) {
+                fail("Should have connected to the server");
+            }
+
+            assertTrue(transport.isConnected());
+
+            Certificate[] peerCertificates = server.getSslHandler().engine().getSession().getPeerCertificates();
+            assertNotNull(peerCertificates);
+
+            Certificate cert = peerCertificates[0];
+            assertTrue(cert instanceof X509Certificate);
+            String dn = ((X509Certificate)cert).getSubjectX500Principal().getName();
+            assertEquals("Unexpected certificate DN", expectedDN, dn);
+
+            transport.close();
+        }
+
+        logTransportErrors();
+        assertTrue(exceptions.isEmpty());
+    }
+
     @Override
-    protected Transport createTransport(URI serverLocation, TransportListener listener, TransportOptions
options) {
+    protected NettySslTransport createTransport(URI serverLocation, TransportListener listener,
TransportOptions options) {
         return new NettySslTransport(listener, serverLocation, options);
     }
 
@@ -199,7 +292,7 @@ public class NettySslTransportTest extends NettyTcpTransportTest {
     protected TransportSslOptions createClientOptionsIsVerify(boolean verifyHost) {
         TransportSslOptions options = TransportSslOptions.INSTANCE.clone();
 
-        options.setKeyStoreLocation(SERVER_KEYSTORE);
+        options.setKeyStoreLocation(CLIENT_KEYSTORE);
         options.setKeyStorePassword(PASSWORD);
         options.setTrustStoreLocation(CLIENT_TRUSTSTORE);
         options.setTrustStorePassword(PASSWORD);
@@ -215,9 +308,10 @@ public class NettySslTransportTest extends NettyTcpTransportTest {
 
         options.setKeyStoreLocation(SERVER_KEYSTORE);
         options.setKeyStorePassword(PASSWORD);
-        options.setTrustStoreLocation(CLIENT_TRUSTSTORE);
+        options.setTrustStoreLocation(SERVER_TRUSTSTORE);
         options.setTrustStorePassword(PASSWORD);
         options.setStoreType(KEYSTORE_TYPE);
+        options.setVerifyHost(false);
 
         return options;
     }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/README.txt
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/README.txt b/qpid-jms-client/src/test/resources/README.txt
index e0f4664..d00861f 100644
--- a/qpid-jms-client/src/test/resources/README.txt
+++ b/qpid-jms-client/src/test/resources/README.txt
@@ -43,7 +43,7 @@ keytool -importkeystore -srckeystore broker-pkcs12.truststore -destkeystore
brok
 
 # Create a key pair for the client, and sign it with the CA:
 # ----------------------------------------------------------
-keytool -storetype pkcs12 -keystore client-pkcs12.keystore -storepass password -keypass password
-alias client -genkey -dname "O=Client,CN=localhost" -validity 9999 -ext bc=ca:false -ext
eku=cA
+keytool -storetype pkcs12 -keystore client-pkcs12.keystore -storepass password -keypass password
-alias client -genkey -dname "O=Client,CN=client" -validity 9999 -ext bc=ca:false -ext eku=cA
 
 keytool -storetype pkcs12 -keystore client-pkcs12.keystore -storepass password -alias client
-certreq -file client.csr
 keytool -storetype pkcs12 -keystore ca-pkcs12.keystore -storepass password -alias ca -gencert
-rfc -infile client.csr -outfile client.crt -ext bc=ca:false -ext eku=cA
@@ -69,3 +69,14 @@ keytool -storetype jks -keystore other-ca-jks.truststore -storepass password
-ke
 keytool -storetype jks -keystore other-ca-jks.truststore -storepass password -alias other-ca
-exportcert -rfc > other-ca.crt
 keytool -storetype jks -keystore other-ca-jks.truststore -storepass password -alias other-ca
-delete
 keytool -storetype jks -keystore other-ca-jks.truststore -storepass password -keypass password
-importcert -alias other-ca -file other-ca.crt -noprompt
+
+
+# Create a store with multiple key pairs for the client to allow for alias selection:
+# ----------------------------------------------------------
+keytool -importkeystore -srckeystore client-pkcs12.keystore -destkeystore client-multiple-keys-jks.keystore
-srcstoretype pkcs12 -deststoretype jks -srcstorepass password -deststorepass password
+
+keytool -storetype jks -keystore client-multiple-keys-jks.keystore -storepass password -keypass
password -alias client2 -genkey -dname "O=Client2,CN=client2" -validity 9999 -ext bc=ca:false
-ext eku=cA
+
+keytool -storetype jks -keystore client-multiple-keys-jks.keystore -storepass password -alias
client2 -certreq -file client2.csr
+keytool -storetype pkcs12 -keystore ca-pkcs12.keystore -storepass password -alias ca -gencert
-rfc -infile client2.csr -outfile client2.crt -ext bc=ca:false -ext eku=cA
+keytool -storetype jks -keystore client-multiple-keys-jks.keystore -storepass password -keypass
password -importcert -alias client2 -file client2.crt

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/broker-jceks.keystore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/broker-jceks.keystore b/qpid-jms-client/src/test/resources/broker-jceks.keystore
index 1ecfb62..03971ee 100644
Binary files a/qpid-jms-client/src/test/resources/broker-jceks.keystore and b/qpid-jms-client/src/test/resources/broker-jceks.keystore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/broker-jceks.truststore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/broker-jceks.truststore b/qpid-jms-client/src/test/resources/broker-jceks.truststore
index 6c3157d..69e696c 100644
Binary files a/qpid-jms-client/src/test/resources/broker-jceks.truststore and b/qpid-jms-client/src/test/resources/broker-jceks.truststore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/broker-jks.keystore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/broker-jks.keystore b/qpid-jms-client/src/test/resources/broker-jks.keystore
index 7fd0780..d648d3f 100644
Binary files a/qpid-jms-client/src/test/resources/broker-jks.keystore and b/qpid-jms-client/src/test/resources/broker-jks.keystore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/broker-jks.truststore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/broker-jks.truststore b/qpid-jms-client/src/test/resources/broker-jks.truststore
index a5a934c..8fb1273 100644
Binary files a/qpid-jms-client/src/test/resources/broker-jks.truststore and b/qpid-jms-client/src/test/resources/broker-jks.truststore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/broker-pkcs12.keystore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/broker-pkcs12.keystore b/qpid-jms-client/src/test/resources/broker-pkcs12.keystore
index a20b3da..2c8c8b9 100644
Binary files a/qpid-jms-client/src/test/resources/broker-pkcs12.keystore and b/qpid-jms-client/src/test/resources/broker-pkcs12.keystore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/broker-pkcs12.truststore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/broker-pkcs12.truststore b/qpid-jms-client/src/test/resources/broker-pkcs12.truststore
index c65284f..bff121f 100644
Binary files a/qpid-jms-client/src/test/resources/broker-pkcs12.truststore and b/qpid-jms-client/src/test/resources/broker-pkcs12.truststore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/broker-wrong-host-jks.keystore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/broker-wrong-host-jks.keystore b/qpid-jms-client/src/test/resources/broker-wrong-host-jks.keystore
index e5e20fe..25980f7 100644
Binary files a/qpid-jms-client/src/test/resources/broker-wrong-host-jks.keystore and b/qpid-jms-client/src/test/resources/broker-wrong-host-jks.keystore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/broker.crt
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/broker.crt b/qpid-jms-client/src/test/resources/broker.crt
index 97baf55..b98cf8a 100644
--- a/qpid-jms-client/src/test/resources/broker.crt
+++ b/qpid-jms-client/src/test/resources/broker.crt
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIC8DCCAq6gAwIBAgIEPnU0dzALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwMzEzMTgwNjA3WhcNMTUwNjExMTgwNjA3WjAl
+MIIC8DCCAq6gAwIBAgIEMjOrLjALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNDAyMTMyODI3WhcNMTUwNzAxMTMyODI3WjAl
 MRIwEAYDVQQDEwlsb2NhbGhvc3QxDzANBgNVBAoTBlNlcnZlcjCCAbcwggEsBgcqhkjOOAQBMIIB
 HwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tV
 bNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaR
 MvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yr
 XDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqL
 VHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+
-z0kqA4GEAAKBgFAIwWBup6ok6MNNXw7uL4+PCodl+VYDYWM57sIRllZ1j6ZfQndE0H+v+2Y6gRlR
-smtltQ1k4ghGnJNa40lI7xVloWcaZvP1li3nwd3FgdFmCTUjA9NpOkzzPfQ+FBn4ldaEGOj52/Fc
-QZEPcFFNpSRpYP9+1KBxm7H6I+APeAS/o2IwYDAfBgNVHSMEGDAWgBR5CzHMBKSa9GM89Dag2rCr
-eZfr/zAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBQmQEaK5Qc/HEFS
-k8+fX+AOLlRUtzALBgcqhkjOOAQDBQADLwAwLAIUMXb4aiex6UcJdpiXI4+0XRRZTaUCFGnst8kj
-t2ogm+rzzajNL67nmhiD
+z0kqA4GEAAKBgGFff/kPyZ8kAuUlKI+DBu8xVgtZMZZsbwfvNS70XWSTcmm9YSP41r8N6XsssbWk
+6UrGj9KIVGSEEvaF7kZhqo4rVQorDWGmoDIjallZMuQEtip96dOVwFyVfr8qmgSJ2GTEQVbreMVT
+EzXSW1S+42UNI+BhGXyITnmjl+Bz7a9/o2IwYDAfBgNVHSMEGDAWgBTaszmuk8JxPsBrCbw16NQ8
+cJ0W5TAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBSI49nFOSP3wD1j
+GaNaCXWYDbq/LDALBgcqhkjOOAQDBQADLwAwLAIUcicu6Mekgf0NETmXN0SD5zLQ5NMCFEA4pu8c
+azT++GJbqK5+yZf0ObWq
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/broker.csr
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/broker.csr b/qpid-jms-client/src/test/resources/broker.csr
index c538174..50a9e8b 100644
--- a/qpid-jms-client/src/test/resources/broker.csr
+++ b/qpid-jms-client/src/test/resources/broker.csr
@@ -5,9 +5,9 @@ PY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7
 g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKB
 gQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgW
 E7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8G
-kotmXoB7VSVkAUw7/s9JKgOBhAACgYBQCMFgbqeqJOjDTV8O7i+PjwqHZflWA2FjOe7CEZZWdY+m
-X0J3RNB/r/tmOoEZUbJrZbUNZOIIRpyTWuNJSO8VZaFnGmbz9ZYt58HdxYHRZgk1IwPTaTpM8z30
-PhQZ+JXWhBjo+dvxXEGRD3BRTaUkaWD/ftSgcZux+iPgD3gEv6AwMC4GCSqGSIb3DQEJDjEhMB8w
-HQYDVR0OBBYEFCZARorlBz8cQVKTz59f4A4uVFS3MAsGByqGSM44BAMFAAMvADAsAhRIOZZQOP++
-Zd2gIBST4zYukwkNfQIUIUEtdjw6S5Uu3gTsAgASQKqqrmY=
+kotmXoB7VSVkAUw7/s9JKgOBhAACgYBhX3/5D8mfJALlJSiPgwbvMVYLWTGWbG8H7zUu9F1kk3Jp
+vWEj+Na/Del7LLG1pOlKxo/SiFRkhBL2he5GYaqOK1UKKw1hpqAyI2pZWTLkBLYqfenTlcBclX6/
+KpoEidhkxEFW63jFUxM10ltUvuNlDSPgYRl8iE55o5fgc+2vf6AwMC4GCSqGSIb3DQEJDjEhMB8w
+HQYDVR0OBBYEFIjj2cU5I/fAPWMZo1oJdZgNur8sMAsGByqGSM44BAMFAAMvADAsAhQsFAh7g/X9
+vPtR35/2pYSdbGfYHwIUAvro9mHVHhveIVBuwkqexxRAxqE=
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/ca-pkcs12.keystore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/ca-pkcs12.keystore b/qpid-jms-client/src/test/resources/ca-pkcs12.keystore
index 7999ba1..1fd6bdb 100644
Binary files a/qpid-jms-client/src/test/resources/ca-pkcs12.keystore and b/qpid-jms-client/src/test/resources/ca-pkcs12.keystore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/ca.crt
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/ca.crt b/qpid-jms-client/src/test/resources/ca.crt
index 1b6dd0c..7cee8ea 100644
--- a/qpid-jms-client/src/test/resources/ca.crt
+++ b/qpid-jms-client/src/test/resources/ca.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICyjCCAoigAwIBAgIEPl1xqDALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwMzEzMTgwNjA0WhcNNDIwNzI4MTgwNjA0WjAu
-MRIwEAYDVQQDEwlteS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjCCAbgwggEsBgcq
+MIICyTCCAoegAwIBAgIETVHvXjALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNDAyMTMyODIzWhcNNDIwODE3MTMyODIzWjAu
+MRIwEAYDVQQDEwlteS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjCCAbcwggEsBgcq
 hkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6
 v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPF
 HsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfh
 oIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88J
 MozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2Ze
-gHtVJWQBTDv+z0kqA4GFAAKBgQCi4OTkHAEv2IfZBnn14Voga7Exz/na249JB6jgSV9sY8JktvqG
-0ppIL+HcNoIY2MnKK6VWkaTiRzAXTAeYQ/hsdDPYFmGGeuRsAqP9reK6dJ8SHobMARD/HCIAhO2p
-yf2BuJ3Rv20ao2+b3rZznHPMvQw2tv0UDXPFk+Es7ZBu36MyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUeQsxzASkmvRjPPQ2oNqwq3mX6/8wCwYHKoZIzjgEAwUAAy8AMCwCFBA2yzo248kU
-6z/MPs55ub8r3o5XAhRl6Qsuq9ZKVaY/jqVKATtQm5s9zg==
+gHtVJWQBTDv+z0kqA4GEAAKBgGZVslEbXk0dlwls/d5VdKImrCFWawWR71wcIAGrTFfbjgHAfR4Y
+iFvJhmy+UeGjhXjfJb8U4EM5QZeX0+MWolp7s5oRyIpJfHnjEgk7vxpT/LGjaqWe8yxZSGmLGjQp
+LB9vBW5HXpdi/Wb3V98alz0VVZQW819P3sS4wyTRc4rvozIwMDAPBgNVHRMBAf8EBTADAQH/MB0G
+A1UdDgQWBBTaszmuk8JxPsBrCbw16NQ8cJ0W5TALBgcqhkjOOAQDBQADLwAwLAIUKDJHr7cYIj2s
+zMeQyqCaF/OGKEICFAGvoZSEg13hBDpZbcgDwI/ZmFI5
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/client-jceks.keystore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client-jceks.keystore b/qpid-jms-client/src/test/resources/client-jceks.keystore
index e62eb76..fecfa77 100644
Binary files a/qpid-jms-client/src/test/resources/client-jceks.keystore and b/qpid-jms-client/src/test/resources/client-jceks.keystore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/client-jceks.truststore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client-jceks.truststore b/qpid-jms-client/src/test/resources/client-jceks.truststore
index 33fc8e7..2cad45e 100644
Binary files a/qpid-jms-client/src/test/resources/client-jceks.truststore and b/qpid-jms-client/src/test/resources/client-jceks.truststore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/client-jks.keystore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client-jks.keystore b/qpid-jms-client/src/test/resources/client-jks.keystore
index dc08e6b..d465742 100644
Binary files a/qpid-jms-client/src/test/resources/client-jks.keystore and b/qpid-jms-client/src/test/resources/client-jks.keystore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/client-jks.truststore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client-jks.truststore b/qpid-jms-client/src/test/resources/client-jks.truststore
index d884a3b..b4b6097 100644
Binary files a/qpid-jms-client/src/test/resources/client-jks.truststore and b/qpid-jms-client/src/test/resources/client-jks.truststore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/client-multiple-keys-jks.keystore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client-multiple-keys-jks.keystore b/qpid-jms-client/src/test/resources/client-multiple-keys-jks.keystore
new file mode 100644
index 0000000..312bde7
Binary files /dev/null and b/qpid-jms-client/src/test/resources/client-multiple-keys-jks.keystore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/client-pkcs12.keystore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client-pkcs12.keystore b/qpid-jms-client/src/test/resources/client-pkcs12.keystore
index 837c4c8..ee6b92f 100644
Binary files a/qpid-jms-client/src/test/resources/client-pkcs12.keystore and b/qpid-jms-client/src/test/resources/client-pkcs12.keystore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/client-pkcs12.truststore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client-pkcs12.truststore b/qpid-jms-client/src/test/resources/client-pkcs12.truststore
index e8b5f12..6663673 100644
Binary files a/qpid-jms-client/src/test/resources/client-pkcs12.truststore and b/qpid-jms-client/src/test/resources/client-pkcs12.truststore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/client.crt
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client.crt b/qpid-jms-client/src/test/resources/client.crt
index c574907..12acfda 100644
--- a/qpid-jms-client/src/test/resources/client.crt
+++ b/qpid-jms-client/src/test/resources/client.crt
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIC8TCCAq+gAwIBAgIEQroAvTALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwMzEzMTgwNjEwWhcNMTUwNjExMTgwNjEwWjAl
-MRIwEAYDVQQDEwlsb2NhbGhvc3QxDzANBgNVBAoTBkNsaWVudDCCAbgwggEsBgcqhkjOOAQBMIIB
-HwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tV
-bNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaR
-MvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yr
-XDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqL
-VHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+
-z0kqA4GFAAKBgQCM8htOT23aHPlXELY0o9O2UnYKgyG2fO17eIYjI55R4Zgo/IHQ1ee3VMjLmCuU
-0y+cxKgv1iYCHaSd053vxzFOMkYRUiA6EBVUQRm99l1ANqgdx3tGIOFwGNDqG1NTD8n6kijgfSS8
-ZJ7jW59WHO97NXji1eVkDpPJGmeu2RjkqKNiMGAwHwYDVR0jBBgwFoAUeQsxzASkmvRjPPQ2oNqw
-q3mX6/8wCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDAjAdBgNVHQ4EFgQUnsJvDuvAL0nd
-qxUSOiYQU/N5yjMwCwYHKoZIzjgEAwUAAy8AMCwCFEgSsKDP6RhTVIz5jwiT+ADzk7K9AhRLbgL3
-mP2HpNn4bTa8/xyC6RSVoQ==
+MIIC7jCCAqygAwIBAgIEJ5eAhjALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNDAyMTMyODI5WhcNMTUwNzAxMTMyODI5WjAi
+MQ8wDQYDVQQDEwZjbGllbnQxDzANBgNVBAoTBkNsaWVudDCCAbgwggEsBgcqhkjOOAQBMIIBHwKB
+gQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeB
+O4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1
+864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4
+V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyN
+KOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kq
+A4GFAAKBgQD4a1xEGKQYciZNryrFh7hOtG/6jKF6+qASyiXU9+rC9BGR9YFxz9964EkdZ2HiCOlV
+Oxhk3maAX9JrRVJ9LGXZ42dHtdL4gvgldbU9juqtVDonbXSMkP5+zu8l1cF7FnP8I0SxX0oUc9kn
+X1eLsw9Z86Qqcqgh1paWTFpsa+q35aNiMGAwHwYDVR0jBBgwFoAU2rM5rpPCcT7Aawm8NejUPHCd
+FuUwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDAjAdBgNVHQ4EFgQUWA/PKEFlztOqLM/S
++7PUX4Ke46wwCwYHKoZIzjgEAwUAAy8AMCwCFG5muHyokc33We5ONWkIzm4R250aAhRM/Go6cWY2
+l3VqONRC7SxhIMpbrA==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/client.csr
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client.csr b/qpid-jms-client/src/test/resources/client.csr
index 716f2bc..3891fbf 100644
--- a/qpid-jms-client/src/test/resources/client.csr
+++ b/qpid-jms-client/src/test/resources/client.csr
@@ -1,13 +1,13 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICWjCCAhgCAQAwJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8wDQYDVQQKEwZDbGllbnQwggG4MIIB
-LAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZ
-PY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7
-g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKB
-gQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgW
-E7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8G
-kotmXoB7VSVkAUw7/s9JKgOBhQACgYEAjPIbTk9t2hz5VxC2NKPTtlJ2CoMhtnzte3iGIyOeUeGY
-KPyB0NXnt1TIy5grlNMvnMSoL9YmAh2kndOd78cxTjJGEVIgOhAVVEEZvfZdQDaoHcd7RiDhcBjQ
-6htTUw/J+pIo4H0kvGSe41ufVhzvezV44tXlZA6TyRpnrtkY5KigMDAuBgkqhkiG9w0BCQ4xITAf
-MB0GA1UdDgQWBBSewm8O68AvSd2rFRI6JhBT83nKMzALBgcqhkjOOAQDBQADLwAwLAIUaFApbZfJ
-bghL0qGMpjE1XK0mSYcCFF3HzkgX7AXK2TSlHIVDP21w0YIX
+MIICWDCCAhUCAQAwIjEPMA0GA1UEAxMGY2xpZW50MQ8wDQYDVQQKEwZDbGllbnQwggG4MIIBLAYH
+KoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZPY1Y
++r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7g/bT
+xR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKBgQD3
+4aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgWE7fP
+CTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8Gkotm
+XoB7VSVkAUw7/s9JKgOBhQACgYEA+GtcRBikGHImTa8qxYe4TrRv+oyhevqgEsol1PfqwvQRkfWB
+cc/feuBJHWdh4gjpVTsYZN5mgF/Sa0VSfSxl2eNnR7XS+IL4JXW1PY7qrVQ6J210jJD+fs7vJdXB
+exZz/CNEsV9KFHPZJ19Xi7MPWfOkKnKoIdaWlkxabGvqt+WgMDAuBgkqhkiG9w0BCQ4xITAfMB0G
+A1UdDgQWBBRYD88oQWXO06osz9L7s9Rfgp7jrDALBgcqhkjOOAQDBQADMAAwLQIUbCHUCzNHSd0Y
+IaGwgTH6GkStzzoCFQCM+AtrgzwbrEDae40E0Btm0pWg1Q==
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/client2.crt
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client2.crt b/qpid-jms-client/src/test/resources/client2.crt
new file mode 100644
index 0000000..1de8346
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/client2.crt
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIIC7zCCAq2gAwIBAgIEYpEawTALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNDAyMTMyODMzWhcNMTUwNzAxMTMyODMzWjAk
+MRAwDgYDVQQDEwdjbGllbnQyMRAwDgYDVQQKEwdDbGllbnQyMIIBtzCCASwGByqGSM44BAEwggEf
+AoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs
+14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy
+9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtc
+NrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotU
+fI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7P
+SSoDgYQAAoGARNoj5b/1hjr5X1mJWSm0Kqgpy8wWiv0/gbFg9OHEGRJ9/2/IL9EyPIOrwBryL1dy
+gBs+JUo2azBw6kmViWvRhVEKjld2TefzNk6FLrS4LuEcRkRGXbVpk82+7wNwErXrpGKAULHVuLc1
+t52bDIh8Y332sa1I87x9Vns5RJ/y0dGjYjBgMB8GA1UdIwQYMBaAFNqzOa6TwnE+wGsJvDXo1Dxw
+nRblMAkGA1UdEwQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwHQYDVR0OBBYEFB9JwDO/p4Jmj/rP
+s56EQGuaTHYfMAsGByqGSM44BAMFAAMvADAsAhRqTSiD+tB8s1K7KH/JSjGZqPknOQIUG6YPfkem
+j/dkYUE43aeiWJNCrKg=
+-----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/client2.csr
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client2.csr b/qpid-jms-client/src/test/resources/client2.csr
new file mode 100644
index 0000000..7c71289
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/client2.csr
@@ -0,0 +1,13 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICWTCCAhYCAQAwJDEQMA4GA1UEAxMHY2xpZW50MjEQMA4GA1UEChMHQ2xpZW50MjCCAbcwggEs
+BgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9
+jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD
+9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGB
+APfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYT
+t88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaS
+i2ZegHtVJWQBTDv+z0kqA4GEAAKBgETaI+W/9YY6+V9ZiVkptCqoKcvMFor9P4GxYPThxBkSff9v
+yC/RMjyDq8Aa8i9XcoAbPiVKNmswcOpJlYlr0YVRCo5Xdk3n8zZOhS60uC7hHEZERl21aZPNvu8D
+cBK166RigFCx1bi3NbedmwyIfGN99rGtSPO8fVZ7OUSf8tHRoDAwLgYJKoZIhvcNAQkOMSEwHzAd
+BgNVHQ4EFgQUH0nAM7+ngmaP+s+znoRAa5pMdh8wCwYHKoZIzjgEAwUAAzAAMC0CFQCWQUQD3G9L
+1uS2Bd8Go99uk2K5fQIUcg0cz2s1uRNhN7GtixwlqwzeToo=
+-----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/other-ca-jks.truststore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/other-ca-jks.truststore b/qpid-jms-client/src/test/resources/other-ca-jks.truststore
index d26abde..10c1175 100644
Binary files a/qpid-jms-client/src/test/resources/other-ca-jks.truststore and b/qpid-jms-client/src/test/resources/other-ca-jks.truststore
differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9292dd6e/qpid-jms-client/src/test/resources/other-ca.crt
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/other-ca.crt b/qpid-jms-client/src/test/resources/other-ca.crt
index cbaa855..83f819d 100644
--- a/qpid-jms-client/src/test/resources/other-ca.crt
+++ b/qpid-jms-client/src/test/resources/other-ca.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIIC1zCCApSgAwIBAgIEANE4MjALBgcqhkjOOAQDBQAwNDEVMBMGA1UEAxMMb3RoZXItY2Eub3Jn
-MRswGQYDVQQKExJPdGhlciBUcnVzdGVkIEluYy4wHhcNMTUwMzEzMTgwNjEyWhcNNDIwNzI4MTgw
-NjEyWjA0MRUwEwYDVQQDEwxvdGhlci1jYS5vcmcxGzAZBgNVBAoTEk90aGVyIFRydXN0ZWQgSW5j
-LjCCAbgwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEm
-aUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX
-58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLr
-hAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0
-SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJ
-qIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqA4GFAAKBgQDwqdE+xLs5RRk0TV2dHL6LPdtHfxmk2q22
-2/82l2PAMBfSDSlp8IaC1WskFWJltHKrQ914PRfjetBorGq/E/YWHztPWQdih8YeK7dXEHjDjLO4
-lCSnuYC6Vbx1nBwYOyTth8vRHJMYcy+COljwgd51iY90kPG54pwAyp7W3CgOYaMyMDAwDwYDVR0T
-AQH/BAUwAwEB/zAdBgNVHQ4EFgQUJt+NFXEVCvRvofQ5kjEjaa9uyOwwCwYHKoZIzjgEAwUAAzAA
-MC0CFFnhuYV7EIFliaJbwgRsxwM4yGIhAhUAlLT+lf0ey7wIelO5Fz4oieoKYFw=
+MIIC1TCCApKgAwIBAgIDQDzOMAsGByqGSM44BAMFADA0MRUwEwYDVQQDEwxvdGhlci1jYS5vcmcx
+GzAZBgNVBAoTEk90aGVyIFRydXN0ZWQgSW5jLjAeFw0xNTA0MDIxMzI4MzJaFw00MjA4MTcxMzI4
+MzJaMDQxFTATBgNVBAMTDG90aGVyLWNhLm9yZzEbMBkGA1UEChMST3RoZXIgVHJ1c3RlZCBJbmMu
+MIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZp
+RV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fn
+xqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuE
+C/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJ
+FnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImo
+g9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAUR88/399fjPlPy/+k1HBeuFsAcjWGtxL1YHH
+uW2r3l1x88Pf2DTwUwGzDl+Oqh/tQdLqrHq7bUktDOAL3pF6EwdMwkvQ702XSfpAjY7Db+p+1JEG
+dbXarzx9iuSCldK9Yivbq5GmSAdawx7yJbI4tCyrQl6qbz7010WweufiL1yjMjAwMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFFv2ba691+a2lZOVnekE/AsgCty7MAsGByqGSM44BAMFAAMwADAt
+AhUAh8HyIs8Tz/S9J8MfwgYxejobMycCFC3Q1fnrxyMWk6PuWsLVdOLjJSnc
 -----END CERTIFICATE-----


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message