qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject [2/2] qpid-jms git commit: QPIDJMS-82: fix certificate validity when signing with CA, and various issues verifyHost option tests/keystore
Date Thu, 02 Jul 2015 12:24:50 GMT
QPIDJMS-82: fix certificate validity when signing with CA, and various issues verifyHost option
tests/keystore


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

Branch: refs/heads/master
Commit: 1039523dc84222a06e53db470daec702e4f6c55d
Parents: 359077b
Author: Robert Gemmell <robbie@apache.org>
Authored: Thu Jul 2 11:35:57 2015 +0100
Committer: Robert Gemmell <robbie@apache.org>
Committed: Thu Jul 2 11:35:57 2015 +0100

----------------------------------------------------------------------
 .../transports/netty/NettySslTransportTest.java | 107 +++++++++----------
 qpid-jms-client/src/test/resources/README.txt   |  16 +--
 .../src/test/resources/broker-jceks.keystore    | Bin 2672 -> 2671 bytes
 .../src/test/resources/broker-jceks.truststore  | Bin 776 -> 776 bytes
 .../src/test/resources/broker-jks.keystore      | Bin 2699 -> 2698 bytes
 .../src/test/resources/broker-jks.truststore    | Bin 776 -> 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 -> 2711 bytes
 .../src/test/resources/broker-wrong-host.crt    |  16 +++
 .../src/test/resources/broker-wrong-host.csr    |  13 +++
 qpid-jms-client/src/test/resources/broker.crt   |  16 +--
 qpid-jms-client/src/test/resources/broker.csr   |  12 +--
 .../src/test/resources/ca-pkcs12.keystore       | Bin 1508 -> 1508 bytes
 qpid-jms-client/src/test/resources/ca.crt       |  14 +--
 .../src/test/resources/client-jceks.keystore    | Bin 2669 -> 2668 bytes
 .../src/test/resources/client-jceks.truststore  | Bin 776 -> 776 bytes
 .../src/test/resources/client-jks.keystore      | Bin 2696 -> 2695 bytes
 .../src/test/resources/client-jks.truststore    | Bin 776 -> 776 bytes
 .../resources/client-multiple-keys-jks.keystore | Bin 4619 -> 4617 bytes
 .../src/test/resources/client-pkcs12.keystore   | Bin 3204 -> 3204 bytes
 .../src/test/resources/client-pkcs12.truststore | Bin 1000 -> 1000 bytes
 qpid-jms-client/src/test/resources/client.crt   |  18 ++--
 qpid-jms-client/src/test/resources/client.csr   |  12 +--
 qpid-jms-client/src/test/resources/client2.crt  |  16 +--
 qpid-jms-client/src/test/resources/client2.csr  |  10 +-
 .../src/test/resources/other-ca-jks.truststore  | Bin 794 -> 794 bytes
 qpid-jms-client/src/test/resources/other-ca.crt |  26 ++---
 28 files changed, 152 insertions(+), 124 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1039523d/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 be0b206..92537ef 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
@@ -152,60 +152,6 @@ public class NettySslTransportTest extends NettyTcpTransportTest {
     }
 
     @Test(timeout = 60 * 1000)
-    public void testConnectToServerVerifyHost() throws Exception {
-        try (NettyEchoServer server = new NettyEchoServer(createServerOptions())) {
-            server.start();
-
-            int port = server.getServerPort();
-            URI serverLocation = new URI("tcp://localhost:" + port);
-
-            TransportSslOptions clientOptions = createClientOptionsIsVerify(true);
-            clientOptions.setKeyStoreLocation(SERVER_WRONG_HOST_KEYSTORE);
-            assertTrue("Expected verifyHost to be true", clientOptions.isVerifyHost());
-
-            Transport transport = createTransport(serverLocation, testListener, clientOptions);
-            try {
-                transport.connect();
-                fail("Should not have connected to the server");
-            } catch (Exception e) {
-                LOG.info("Connection failed to test server as expected.");
-            }
-
-            assertFalse(transport.isConnected());
-
-            transport.close();
-        }
-    }
-
-    @Test(timeout = 60 * 1000)
-    public void testConnectToServerNoVerifyHost() throws Exception {
-        try (NettyEchoServer server = new NettyEchoServer(createServerOptions())) {
-            server.start();
-
-            int port = server.getServerPort();
-            URI serverLocation = new URI("tcp://localhost:" + port);
-
-            TransportSslOptions clientOptions = createClientOptionsIsVerify(false);
-            assertFalse("Expected verifyHost to be false", clientOptions.isVerifyHost());
-
-            Transport 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());
-
-            transport.close();
-        }
-
-        logTransportErrors();
-        assertTrue(exceptions.isEmpty());
-    }
-
-    @Test(timeout = 60 * 1000)
     public void testConnectWithNeedClientAuth() throws Exception {
         TransportSslOptions serverOptions = createServerOptions();
 
@@ -281,6 +227,59 @@ public class NettySslTransportTest extends NettyTcpTransportTest {
         assertTrue(exceptions.isEmpty());
     }
 
+    @Test(timeout = 60 * 1000)
+    public void testConnectToServerVerifyHost() throws Exception {
+        doConnectToServerVerifyHostTestImpl(true);
+    }
+
+    @Test(timeout = 60 * 1000)
+    public void testConnectToServerNoVerifyHost() throws Exception {
+        doConnectToServerVerifyHostTestImpl(false);
+    }
+
+    private void doConnectToServerVerifyHostTestImpl(boolean verifyHost) throws Exception,
URISyntaxException, IOException, InterruptedException {
+        TransportSslOptions serverOptions = createServerOptions();
+        serverOptions.setKeyStoreLocation(SERVER_WRONG_HOST_KEYSTORE);
+
+        try (NettyEchoServer server = new NettyEchoServer(serverOptions)) {
+            server.start();
+
+            int port = server.getServerPort();
+            URI serverLocation = new URI("tcp://localhost:" + port);
+
+            TransportSslOptions clientOptions = createClientOptionsIsVerify(verifyHost);
+
+            if (verifyHost) {
+                assertTrue("Expected verifyHost to be true", clientOptions.isVerifyHost());
+            } else {
+                assertFalse("Expected verifyHost to be false", clientOptions.isVerifyHost());
+            }
+
+            Transport transport = createTransport(serverLocation, testListener, clientOptions);
+            try {
+                transport.connect();
+                if (verifyHost) {
+                    fail("Should not have connected to the server");
+                }
+            } catch (Exception e) {
+                if (verifyHost) {
+                    LOG.info("Connection failed to test server as expected.");
+                } else {
+                    LOG.error("Failed to connect to test server", e);
+                    fail("Should have connected to the server, but got: " + e);
+                }
+            }
+
+            if (verifyHost) {
+                assertFalse(transport.isConnected());
+            } else {
+                assertTrue(transport.isConnected());
+            }
+
+            transport.close();
+        }
+    }
+
     @Override
     protected NettySslTransport createTransport(URI serverLocation, TransportListener listener,
TransportOptions options) {
         return new NettySslTransport(listener, serverLocation, options);

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1039523d/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 d00861f..9b8f012 100644
--- a/qpid-jms-client/src/test/resources/README.txt
+++ b/qpid-jms-client/src/test/resources/README.txt
@@ -15,7 +15,7 @@ keytool -storetype pkcs12 -keystore ca-pkcs12.keystore -storepass password
-alia
 keytool -storetype pkcs12 -keystore broker-pkcs12.keystore -storepass password -keypass password
-alias broker -genkey -dname "O=Server,CN=localhost" -validity 9999 -ext bc=ca:false -ext
eku=sA
 
 keytool -storetype pkcs12 -keystore broker-pkcs12.keystore -storepass password -alias broker
-certreq -file broker.csr
-keytool -storetype pkcs12 -keystore ca-pkcs12.keystore -storepass password -alias ca -gencert
-rfc -infile broker.csr -outfile broker.crt -ext bc=ca:false -ext eku=sA
+keytool -storetype pkcs12 -keystore ca-pkcs12.keystore -storepass password -alias ca -gencert
-rfc -infile broker.csr -outfile broker.crt -validity 9999 -ext bc=ca:false -ext eku=sA
 
 keytool -storetype pkcs12 -keystore broker-pkcs12.keystore -storepass password -keypass password
-importcert -alias ca -file ca.crt -noprompt
 keytool -storetype pkcs12 -keystore broker-pkcs12.keystore -storepass password -keypass password
-importcert -alias broker -file broker.crt
@@ -27,13 +27,13 @@ keytool -importkeystore -srckeystore broker-pkcs12.keystore -destkeystore
broker
 
 # Create a key pair for the broker with an unexpected hostname, and sign it with the CA:
 # --------------------------------------------------------------------------------------
-keytool -storetype pkcs12 -keystore broker-wrong-host-jks.keystore -storepass password -keypass
password -alias broker -genkey -dname "O=Server,CN=localhost" -validity 9999 -ext bc=ca:false
-ext eku=sA
+keytool -storetype jks -keystore broker-wrong-host-jks.keystore -storepass password -keypass
password -alias broker-wrong-host -genkey -dname "O=Server,CN=wronghost" -validity 9999 -ext
bc=ca:false -ext eku=sA
 
-keytool -storetype pkcs12 -keystore broker-wrong-host-jks.keystore -storepass password -alias
broker -certreq -file broker.csr
-keytool -storetype pkcs12 -keystore ca-pkcs12.keystore -storepass password -alias ca -gencert
-rfc -infile broker.csr -outfile broker.crt -ext bc=ca:false -ext eku=sA
+keytool -storetype jks -keystore broker-wrong-host-jks.keystore -storepass password -alias
broker-wrong-host -certreq -file broker-wrong-host.csr
+keytool -storetype pkcs12 -keystore ca-pkcs12.keystore -storepass password -alias ca -gencert
-rfc -infile broker-wrong-host.csr -outfile broker-wrong-host.crt -validity 9999 -ext bc=ca:false
-ext eku=sA
 
-keytool -storetype pkcs12 -keystore broker-wrong-host-jks.keystore -storepass password -keypass
password -importcert -alias ca -file ca.crt -noprompt
-keytool -storetype pkcs12 -keystore broker-wrong-host-jks.keystore -storepass password -keypass
password -importcert -alias broker -file broker.crt
+keytool -storetype jks -keystore broker-wrong-host-jks.keystore -storepass password -keypass
password -importcert -alias ca -file ca.crt -noprompt
+keytool -storetype jks -keystore broker-wrong-host-jks.keystore -storepass password -keypass
password -importcert -alias broker-wrong-host -file broker-wrong-host.crt
 
 # Create trust stores for the broker, import the CA cert:
 # -------------------------------------------------------
@@ -46,7 +46,7 @@ keytool -importkeystore -srckeystore broker-pkcs12.truststore -destkeystore
brok
 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
+keytool -storetype pkcs12 -keystore ca-pkcs12.keystore -storepass password -alias ca -gencert
-rfc -infile client.csr -outfile client.crt -validity 9999 -ext bc=ca:false -ext eku=cA
 
 keytool -storetype pkcs12 -keystore client-pkcs12.keystore -storepass password -keypass password
-importcert -alias ca -file ca.crt -noprompt
 keytool -storetype pkcs12 -keystore client-pkcs12.keystore -storepass password -keypass password
-importcert -alias client -file client.crt
@@ -78,5 +78,5 @@ keytool -importkeystore -srckeystore client-pkcs12.keystore -destkeystore
client
 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 pkcs12 -keystore ca-pkcs12.keystore -storepass password -alias ca -gencert
-rfc -infile client2.csr -outfile client2.crt -validity 9999 -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/1039523d/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 03971ee..1f394a1 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/1039523d/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 69e696c..2cbe908 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/1039523d/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 d648d3f..5a370d5 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/1039523d/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 8fb1273..84ca417 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/1039523d/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 2c8c8b9..4caf582 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/1039523d/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 bff121f..99a4e97 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/1039523d/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 25980f7..f681ee2 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/1039523d/qpid-jms-client/src/test/resources/broker-wrong-host.crt
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/broker-wrong-host.crt b/qpid-jms-client/src/test/resources/broker-wrong-host.crt
new file mode 100644
index 0000000..e99859e
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/broker-wrong-host.crt
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIIC8jCCAq+gAwIBAgIEGWbEljALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNzAyMTAzNDIzWhcNNDIxMTE2MTAzNDIzWjAl
+MRIwEAYDVQQDEwl3cm9uZ2hvc3QxDzANBgNVBAoTBlNlcnZlcjCCAbgwggEsBgcqhkjOOAQBMIIB
+HwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tV
+bNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaR
+MvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yr
+XDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqL
+VHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+
+z0kqA4GFAAKBgQDN2FOPJ+AJxwRIol94sRr/fVI6zKT1j47Ljigf40vhiRsgTpwqvZi+0izIUPZo
+KTkr7avupjCPeb0r9yjSL7XWRCrACOmmOwZX72R8/5nJsaTQ6/WyZj3pEAH+bxXWxriWmaWdcID9
+IJZlOuuhI7Wc9IOMwMFoEYuLREnsoZvsPaNiMGAwHwYDVR0jBBgwFoAU927SkUntv9ipgwEsprfu
+YO5m52AwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUWknWpI79Pqlp
+p1rkKaKUzfzM6BQwCwYHKoZIzjgEAwUAAzAAMC0CFQCKnegzv3y2BTvp7+tfV59/Sl+o7gIUQLxO
+P2leMhl5g1y8nCZbW8nQvZM=
+-----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1039523d/qpid-jms-client/src/test/resources/broker-wrong-host.csr
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/broker-wrong-host.csr b/qpid-jms-client/src/test/resources/broker-wrong-host.csr
new file mode 100644
index 0000000..50d3cac
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/broker-wrong-host.csr
@@ -0,0 +1,13 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICWzCCAhgCAQAwJTESMBAGA1UEAxMJd3Jvbmdob3N0MQ8wDQYDVQQKEwZTZXJ2ZXIwggG4MIIB
+LAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZ
+PY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7
+g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKB
+gQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgW
+E7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8G
+kotmXoB7VSVkAUw7/s9JKgOBhQACgYEAzdhTjyfgCccESKJfeLEa/31SOsyk9Y+Oy44oH+NL4Ykb
+IE6cKr2YvtIsyFD2aCk5K+2r7qYwj3m9K/co0i+11kQqwAjppjsGV+9kfP+ZybGk0Ov1smY96RAB
+/m8V1sa4lpmlnXCA/SCWZTrroSO1nPSDjMDBaBGLi0RJ7KGb7D2gMDAuBgkqhkiG9w0BCQ4xITAf
+MB0GA1UdDgQWBBRaSdakjv0+qWmnWuQpopTN/MzoFDALBgcqhkjOOAQDBQADMAAwLQIVAI350Lc6
+lgQw/pHmjRSfquyYibJNAhROJPe4d+FG0D67/LVIaVB7JpqZcw==
+-----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1039523d/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 b98cf8a..c232df4 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-----
-MIIC8DCCAq6gAwIBAgIEMjOrLjALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNDAyMTMyODI3WhcNMTUwNzAxMTMyODI3WjAl
+MIIC8DCCAq6gAwIBAgIERfLI0zALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNzAyMTAzNDIxWhcNNDIxMTE2MTAzNDIxWjAl
 MRIwEAYDVQQDEwlsb2NhbGhvc3QxDzANBgNVBAoTBlNlcnZlcjCCAbcwggEsBgcqhkjOOAQBMIIB
 HwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tV
 bNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaR
 MvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yr
 XDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqL
 VHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+
-z0kqA4GEAAKBgGFff/kPyZ8kAuUlKI+DBu8xVgtZMZZsbwfvNS70XWSTcmm9YSP41r8N6XsssbWk
-6UrGj9KIVGSEEvaF7kZhqo4rVQorDWGmoDIjallZMuQEtip96dOVwFyVfr8qmgSJ2GTEQVbreMVT
-EzXSW1S+42UNI+BhGXyITnmjl+Bz7a9/o2IwYDAfBgNVHSMEGDAWgBTaszmuk8JxPsBrCbw16NQ8
-cJ0W5TAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBSI49nFOSP3wD1j
-GaNaCXWYDbq/LDALBgcqhkjOOAQDBQADLwAwLAIUcicu6Mekgf0NETmXN0SD5zLQ5NMCFEA4pu8c
-azT++GJbqK5+yZf0ObWq
+z0kqA4GEAAKBgEac7ijHkbE0m7X0TYLj6wJ84lWEDM6+kzHrr6jxv+bts0ee5xCdLy8dBhBUGwK4
+MF+22U4WINqpgmKu6Xhp9XseDgsiJ/MpwRcSVOUgmwcfhShTJ4Wv1rRa1mF7qOWryiF+sWh1P/5u
+KXv65j5sNP/3v5ShuskQfLTA9/JZJgvFo2IwYDAfBgNVHSMEGDAWgBT3btKRSe2/2KmDASymt+5g
+7mbnYDAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRzYBOqwE+U0RPi
+1aQzuKxOjOCoJzALBgcqhkjOOAQDBQADLwAwLAIUOM5ASvnZ20EKaIoUIQytOXlpQCcCFHkdfIwv
+kyn+o+6aNWZ+e8YRa4RZ
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1039523d/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 50a9e8b..96ac8b1 100644
--- a/qpid-jms-client/src/test/resources/broker.csr
+++ b/qpid-jms-client/src/test/resources/broker.csr
@@ -1,13 +1,13 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICWTCCAhcCAQAwJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8wDQYDVQQKEwZTZXJ2ZXIwggG3MIIB
+MIICWjCCAhcCAQAwJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8wDQYDVQQKEwZTZXJ2ZXIwggG3MIIB
 LAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZ
 PY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7
 g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKB
 gQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgW
 E7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8G
-kotmXoB7VSVkAUw7/s9JKgOBhAACgYBhX3/5D8mfJALlJSiPgwbvMVYLWTGWbG8H7zUu9F1kk3Jp
-vWEj+Na/Del7LLG1pOlKxo/SiFRkhBL2he5GYaqOK1UKKw1hpqAyI2pZWTLkBLYqfenTlcBclX6/
-KpoEidhkxEFW63jFUxM10ltUvuNlDSPgYRl8iE55o5fgc+2vf6AwMC4GCSqGSIb3DQEJDjEhMB8w
-HQYDVR0OBBYEFIjj2cU5I/fAPWMZo1oJdZgNur8sMAsGByqGSM44BAMFAAMvADAsAhQsFAh7g/X9
-vPtR35/2pYSdbGfYHwIUAvro9mHVHhveIVBuwkqexxRAxqE=
+kotmXoB7VSVkAUw7/s9JKgOBhAACgYBGnO4ox5GxNJu19E2C4+sCfOJVhAzOvpMx66+o8b/m7bNH
+nucQnS8vHQYQVBsCuDBfttlOFiDaqYJirul4afV7Hg4LIifzKcEXElTlIJsHH4UoUyeFr9a0WtZh
+e6jlq8ohfrFodT/+bil7+uY+bDT/97+UobrJEHy0wPfyWSYLxaAwMC4GCSqGSIb3DQEJDjEhMB8w
+HQYDVR0OBBYEFHNgE6rAT5TRE+LVpDO4rE6M4KgnMAsGByqGSM44BAMFAAMwADAtAhUAjbLZ9LlF
+HC8jhW6Dr5zr0ZAhSZoCFBiGU523wTLBtwCpTZxJ87DV3f2a
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1039523d/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 1fd6bdb..dad560e 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/1039523d/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 7cee8ea..748acad 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-----
-MIICyTCCAoegAwIBAgIETVHvXjALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNDAyMTMyODIzWhcNNDIwODE3MTMyODIzWjAu
+MIICyTCCAoegAwIBAgIEeRLR+TALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNzAyMTAzNDIwWhcNNDIxMTE2MTAzNDIwWjAu
 MRIwEAYDVQQDEwlteS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjCCAbcwggEsBgcq
 hkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6
 v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPF
 HsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfh
 oIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88J
 MozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2Ze
-gHtVJWQBTDv+z0kqA4GEAAKBgGZVslEbXk0dlwls/d5VdKImrCFWawWR71wcIAGrTFfbjgHAfR4Y
-iFvJhmy+UeGjhXjfJb8U4EM5QZeX0+MWolp7s5oRyIpJfHnjEgk7vxpT/LGjaqWe8yxZSGmLGjQp
-LB9vBW5HXpdi/Wb3V98alz0VVZQW819P3sS4wyTRc4rvozIwMDAPBgNVHRMBAf8EBTADAQH/MB0G
-A1UdDgQWBBTaszmuk8JxPsBrCbw16NQ8cJ0W5TALBgcqhkjOOAQDBQADLwAwLAIUKDJHr7cYIj2s
-zMeQyqCaF/OGKEICFAGvoZSEg13hBDpZbcgDwI/ZmFI5
+gHtVJWQBTDv+z0kqA4GEAAKBgEO1CU7fLDojgEkc46FJoiaOg8L3ohqRxb2Kzbj+pVWtj8VMsxfj
+u68IZTmuTk6lXA3E0SFDCq+8Qtn2+6fsmK0jiTabYzQIfPeB8WmGihF+rq4vkQHnMuhBQHopbsXp
+INF2sl2G9dkeztD0QRW+zAEHmm+0b5Kiajt0YakxSdV8ozIwMDAPBgNVHRMBAf8EBTADAQH/MB0G
+A1UdDgQWBBT3btKRSe2/2KmDASymt+5g7mbnYDALBgcqhkjOOAQDBQADLwAwLAIULUAK3z+9OsH2
+ObgbXMLBfbksA94CFBHC95iiB9EYFceWqVzRNMm7dNws
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1039523d/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 fecfa77..e812a39 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/1039523d/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 2cad45e..2540948 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/1039523d/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 d465742..2566eca 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/1039523d/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 b4b6097..5ef6ee4 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/1039523d/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
index 312bde7..8959fdd 100644
Binary files a/qpid-jms-client/src/test/resources/client-multiple-keys-jks.keystore 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/1039523d/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 ee6b92f..e66c7c5 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/1039523d/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 6663673..00bc75b 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/1039523d/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 12acfda..0d4f9d6 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-----
-MIIC7jCCAqygAwIBAgIEJ5eAhjALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNDAyMTMyODI5WhcNMTUwNzAxMTMyODI5WjAi
-MQ8wDQYDVQQDEwZjbGllbnQxDzANBgNVBAoTBkNsaWVudDCCAbgwggEsBgcqhkjOOAQBMIIBHwKB
+MIIC7TCCAqugAwIBAgIEMJmxQDALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNzAyMTAzNDI2WhcNNDIxMTE2MTAzNDI2WjAi
+MQ8wDQYDVQQDEwZjbGllbnQxDzANBgNVBAoTBkNsaWVudDCCAbcwggEsBgcqhkjOOAQBMIIBHwKB
 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==
+A4GEAAKBgDcb7Zodr6o9Ben0xvXv+jDhoacIEHZEpj4qCboXR0RLCCOTPGH9BE5Wm1EQROfynH82
+H6KDUOZBFgesBs4IFVW2SeoAix25J/oNnoWgvnpsU7Lja/9ZhEO+y5zyn+2bADkZheLt4KgV4r5q
+Mr7eHG+83pjuPewDQteoHX1xtQmso2IwYDAfBgNVHSMEGDAWgBT3btKRSe2/2KmDASymt+5g7mbn
+YDAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB0GA1UdDgQWBBSwjzUmMi3MsSiEfYis
+jhSL4f9WPjALBgcqhkjOOAQDBQADLwAwLAIUXhICIKtRD4eHi5Gfm3oVUWg7Vu8CFFJMYiyPpm4B
+yqYSmNqkjg2Po03P
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1039523d/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 3891fbf..9cbe2b1 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-----
-MIICWDCCAhUCAQAwIjEPMA0GA1UEAxMGY2xpZW50MQ8wDQYDVQQKEwZDbGllbnQwggG4MIIBLAYH
+MIICVjCCAhQCAQAwIjEPMA0GA1UEAxMGY2xpZW50MQ8wDQYDVQQKEwZDbGllbnQwggG3MIIBLAYH
 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==
+XoB7VSVkAUw7/s9JKgOBhAACgYA3G+2aHa+qPQXp9Mb17/ow4aGnCBB2RKY+Kgm6F0dESwgjkzxh
+/QROVptREETn8px/Nh+ig1DmQRYHrAbOCBVVtknqAIsduSf6DZ6FoL56bFOy42v/WYRDvsuc8p/t
+mwA5GYXi7eCoFeK+ajK+3hxvvN6Y7j3sA0LXqB19cbUJrKAwMC4GCSqGSIb3DQEJDjEhMB8wHQYD
+VR0OBBYEFLCPNSYyLcyxKIR9iKyOFIvh/1Y+MAsGByqGSM44BAMFAAMvADAsAhQ3awY/9Rk2ap7L
+H+c+lwXzyYXUWgIUHhvcpWfXgTnlgbgYSwzi7REzcS4=
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1039523d/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
index 1de8346..a411cdf 100644
--- a/qpid-jms-client/src/test/resources/client2.crt
+++ b/qpid-jms-client/src/test/resources/client2.crt
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIC7zCCAq2gAwIBAgIEYpEawTALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNDAyMTMyODMzWhcNMTUwNzAxMTMyODMzWjAk
+MIIC7zCCAq2gAwIBAgIEFgzulzALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNzAyMTAzNDMwWhcNNDIxMTE2MTAzNDMwWjAk
 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=
+SSoDgYQAAoGAQdL+aPybgpymlLnz03VptSST88lb+qoP12YLkLa34vTCy6UwP+NDXg+9DhqcoP4R
+z/dJN7LGuJFnQVo6r0mXY/2AevFXQXrrEPVwPUsq6Q20mw3wQUcohUsVLfP6vc0yPL6xpIapzmCu
+ahLzSEyHrFbMfNg5ZUl3X49YacJWCZmjYjBgMB8GA1UdIwQYMBaAFPdu0pFJ7b/YqYMBLKa37mDu
+ZudgMAkGA1UdEwQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwHQYDVR0OBBYEFPRigMBK9W5IOjg5
+0/WvE0V9hQnPMAsGByqGSM44BAMFAAMvADAsAhQVZJJ83Z+VL1NxO775Og4zduJluwIUf4AUm9yQ
+6ukzVOLrMqf8B6gluQs=
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1039523d/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
index 7c71289..e6e1917 100644
--- a/qpid-jms-client/src/test/resources/client2.csr
+++ b/qpid-jms-client/src/test/resources/client2.csr
@@ -5,9 +5,9 @@ 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=
+i2ZegHtVJWQBTDv+z0kqA4GEAAKBgEHS/mj8m4KcppS589N1abUkk/PJW/qqD9dmC5C2t+L0wsul
+MD/jQ14PvQ4anKD+Ec/3STeyxriRZ0FaOq9Jl2P9gHrxV0F66xD1cD1LKukNtJsN8EFHKIVLFS3z
++r3NMjy+saSGqc5grmoS80hMh6xWzHzYOWVJd1+PWGnCVgmZoDAwLgYJKoZIhvcNAQkOMSEwHzAd
+BgNVHQ4EFgQU9GKAwEr1bkg6ODnT9a8TRX2FCc8wCwYHKoZIzjgEAwUAAzAAMC0CFFct52Ts8lGJ
+UUgpxzIU4gEnK3bcAhUAjf0KYpO8QlVXxfwWDxVWVe0dwOE=
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1039523d/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 10c1175..9f390f2 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/1039523d/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 83f819d..a9d3483 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-----
-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
+MIIC1TCCApOgAwIBAgIEY28QkjALBgcqhkjOOAQDBQAwNDEVMBMGA1UEAxMMb3RoZXItY2Eub3Jn
+MRswGQYDVQQKExJPdGhlciBUcnVzdGVkIEluYy4wHhcNMTUwNzAyMTAzNDI4WhcNNDIxMTE2MTAz
+NDI4WjA0MRUwEwYDVQQDEwxvdGhlci1jYS5vcmcxGzAZBgNVBAoTEk90aGVyIFRydXN0ZWQgSW5j
+LjCCAbcwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEm
+aUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX
+58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLr
+hAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0
+SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJ
+qIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqA4GEAAKBgGyh0JNp5i39LcxRIQet77oy5NlmT3d1u7TU
+zijqFyM5TWyi4fNorYTBayu8bl4aqnaLGyURoCtxKR+AJ63LBp+76wXZOgcYE5MzynJ7ZAPAPtHX
+jDr3naMGjnL2IDskBjFP16UWtXluVxZlVsOaJKhs0EzHThUwQHQb3IyvUYNCozIwMDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBRtpKZYA03H/BifDWuzMv9uNoC7bDALBgcqhkjOOAQDBQADLwAw
+LAIUe78VlIHAJ8/6bt0k5uNGRZKukDUCFDHe16PYm2mkiSA5pbGMZB8Sh6fN
 -----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