You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/03/13 19:51:17 UTC
[4/4] qpid-jms git commit: add a script to general our ssl test
resources, update/replace existing stores and add some new ones
add a script to general our ssl test resources, update/replace existing stores and add some new ones
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/cd8ac4f1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/cd8ac4f1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/cd8ac4f1
Branch: refs/heads/master
Commit: cd8ac4f1cf1834d3dae697f0e8184d3b77b703a6
Parents: c9be8ed
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Mar 13 18:15:00 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Mar 13 18:47:51 2015 +0000
----------------------------------------------------------------------
.../transports/netty/NettySslTransportTest.java | 6 +-
qpid-jms-client/src/test/resources/README.txt | 70 +++++++++++++++++++
.../src/test/resources/broker-jceks.keystore | Bin 2176 -> 2675 bytes
.../src/test/resources/broker-jceks.truststore | Bin 2176 -> 777 bytes
.../src/test/resources/broker-jks.keystore | Bin 2198 -> 2702 bytes
.../src/test/resources/broker-jks.truststore | Bin 2198 -> 777 bytes
.../src/test/resources/broker-pkcs12.keystore | Bin 2542 -> 3212 bytes
.../src/test/resources/broker-pkcs12.truststore | Bin 2542 -> 1000 bytes
.../resources/broker-wrong-host-jks.keystore | Bin 0 -> 3212 bytes
qpid-jms-client/src/test/resources/broker.crt | 16 +++++
qpid-jms-client/src/test/resources/broker.csr | 13 ++++
.../src/test/resources/ca-pkcs12.keystore | Bin 0 -> 1508 bytes
qpid-jms-client/src/test/resources/ca.crt | 15 ++++
.../src/test/resources/client-jceks.keystore | Bin 2176 -> 2674 bytes
.../src/test/resources/client-jceks.truststore | Bin 2176 -> 777 bytes
.../src/test/resources/client-jks.keystore | Bin 2198 -> 2701 bytes
.../src/test/resources/client-jks.truststore | Bin 2198 -> 777 bytes
.../src/test/resources/client-pkcs12.keystore | Bin 2542 -> 3212 bytes
.../src/test/resources/client-pkcs12.truststore | Bin 2542 -> 1000 bytes
qpid-jms-client/src/test/resources/client.crt | 16 +++++
qpid-jms-client/src/test/resources/client.csr | 13 ++++
.../src/test/resources/example-jks.keystore | Bin 2266 -> 0 bytes
.../src/test/resources/example-jks.truststore | Bin 2266 -> 0 bytes
.../src/test/resources/other-ca-jks.truststore | Bin 0 -> 796 bytes
qpid-jms-client/src/test/resources/other-ca.crt | 15 ++++
25 files changed, 162 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/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 f76e496..8b25e5f 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
@@ -39,8 +39,9 @@ public class NettySslTransportTest extends NettyTcpTransportTest {
private static final Logger LOG = LoggerFactory.getLogger(NettySslTransportTest.class);
public static final String PASSWORD = "password";
- public static final String SERVER_KEYSTORE = "src/test/resources/example-jks.keystore";
- public static final String CLIENT_TRUSTSTORE = "src/test/resources/example-jks.truststore";
+ public static final String SERVER_KEYSTORE = "src/test/resources/broker-jks.keystore";
+ public static final String SERVER_WRONG_HOST_KEYSTORE = "src/test/resources/broker-wrong-host-jks.keystore";
+ public static final String CLIENT_TRUSTSTORE = "src/test/resources/client-jks.truststore";
public static final String KEYSTORE_TYPE = "jks";
@Override
@@ -111,6 +112,7 @@ public class NettySslTransportTest extends NettyTcpTransportTest {
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);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/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
new file mode 100644
index 0000000..cee46ea
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/README.txt
@@ -0,0 +1,70 @@
+# The various SSL stores and certificates were created with the following commands:
+
+# Clean up existing files
+# -----------------------
+rm -f *.crt *.csr *.keystore *.truststore
+
+# Create a key and self-signed certificate for the CA, to sign certificate requests and use for trust:
+# ----------------------------------------------------------------------------------------------------
+keytool -storetype pkcs12 -keystore ca-pkcs12.keystore -storepass password -keypass password -alias ca -genkey -dname "O=My Trusted Inc.,CN=my-ca.org" -validity 9999 -ext bc:c=ca:true
+keytool -storetype pkcs12 -keystore ca-pkcs12.keystore -storepass password -alias ca -exportcert -rfc > ca.crt
+
+# Create a key pair for the broker, and sign it with the CA:
+# ----------------------------------------------------------
+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 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
+
+# Create some alternative keystore types for testing:
+# ---------------------------------------------------
+keytool -importkeystore -srckeystore broker-pkcs12.keystore -destkeystore broker-jceks.keystore -srcstoretype pkcs12 -deststoretype jceks -srcstorepass password -deststorepass password
+keytool -importkeystore -srckeystore broker-pkcs12.keystore -destkeystore broker-jks.keystore -srcstoretype pkcs12 -deststoretype jks -srcstorepass password -deststorepass password
+
+# 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 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 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
+
+# Create trust stores for the broker, import the CA cert:
+# -------------------------------------------------------
+keytool -storetype pkcs12 -keystore broker-pkcs12.truststore -storepass password -keypass password -importcert -alias ca -file ca.crt -noprompt
+keytool -importkeystore -srckeystore broker-pkcs12.truststore -destkeystore broker-jceks.truststore -srcstoretype pkcs12 -deststoretype jceks -srcstorepass password -deststorepass password
+keytool -importkeystore -srckeystore broker-pkcs12.truststore -destkeystore broker-jks.truststore -srcstoretype pkcs12 -deststoretype jks -srcstorepass password -deststorepass password
+
+# 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 -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 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
+
+# Create some alternative keystore types for testing:
+# ---------------------------------------------------
+keytool -importkeystore -srckeystore client-pkcs12.keystore -destkeystore client-jceks.keystore -srcstoretype pkcs12 -deststoretype jceks -srcstorepass password -deststorepass password
+keytool -importkeystore -srckeystore client-pkcs12.keystore -destkeystore client-jks.keystore -srcstoretype pkcs12 -deststoretype jks -srcstorepass password -deststorepass password
+
+# Create trust stores for the client, import the CA cert:
+# -------------------------------------------------------
+keytool -storetype pkcs12 -keystore client-pkcs12.truststore -storepass password -keypass password -importcert -alias ca -file ca.crt -noprompt
+keytool -importkeystore -srckeystore client-pkcs12.truststore -destkeystore client-jceks.truststore -srcstoretype pkcs12 -deststoretype jceks -srcstorepass password -deststorepass password
+keytool -importkeystore -srckeystore client-pkcs12.truststore -destkeystore client-jks.truststore -srcstoretype pkcs12 -deststoretype jks -srcstorepass password -deststorepass password
+
+# Create a truststore with self-signed certificate for an alternative CA, to
+# allow 'failure to trust' of certs signed by the original CA above:
+# ------------------------------------------------------------------
+keytool -storetype jks -keystore other-ca-jks.truststore -storepass password -keypass password -alias other-ca -genkey -dname "O=Other Trusted Inc.,CN=other-ca.org" -validity 9999 -ext bc:c=ca:true
+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
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/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 8b34ab5..1ecfb62 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/cd8ac4f1/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 5f58d80..6c3157d 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/cd8ac4f1/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 cd83384..7fd0780 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/cd8ac4f1/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 5fb869f..a5a934c 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/cd8ac4f1/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 38dfd3d..a20b3da 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/cd8ac4f1/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 9f0b2ae..c65284f 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/cd8ac4f1/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
new file mode 100644
index 0000000..e5e20fe
Binary files /dev/null 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/cd8ac4f1/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
new file mode 100644
index 0000000..97baf55
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/broker.crt
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIIC8DCCAq6gAwIBAgIEPnU0dzALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwMzEzMTgwNjA3WhcNMTUwNjExMTgwNjA3WjAl
+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
+-----END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/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
new file mode 100644
index 0000000..c538174
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/broker.csr
@@ -0,0 +1,13 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICWTCCAhcCAQAwJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8wDQYDVQQKEwZTZXJ2ZXIwggG3MIIB
+LAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZ
+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=
+-----END NEW CERTIFICATE REQUEST-----
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/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
new file mode 100644
index 0000000..7999ba1
Binary files /dev/null and b/qpid-jms-client/src/test/resources/ca-pkcs12.keystore differ
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/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
new file mode 100644
index 0000000..1b6dd0c
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/ca.crt
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICyjCCAoigAwIBAgIEPl1xqDALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwMzEzMTgwNjA0WhcNNDIwNzI4MTgwNjA0WjAu
+MRIwEAYDVQQDEwlteS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjCCAbgwggEsBgcq
+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==
+-----END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/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 80e2907..e62eb76 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/cd8ac4f1/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 016cc16..33fc8e7 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/cd8ac4f1/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 fda221d..dc08e6b 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/cd8ac4f1/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 18647cb..d884a3b 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/cd8ac4f1/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 6333905..837c4c8 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/cd8ac4f1/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 d50c399..e8b5f12 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/cd8ac4f1/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
new file mode 100644
index 0000000..c574907
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/client.crt
@@ -0,0 +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==
+-----END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/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
new file mode 100644
index 0000000..716f2bc
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/client.csr
@@ -0,0 +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
+-----END NEW CERTIFICATE REQUEST-----
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/qpid-jms-client/src/test/resources/example-jks.keystore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/example-jks.keystore b/qpid-jms-client/src/test/resources/example-jks.keystore
deleted file mode 100644
index 697a1de..0000000
Binary files a/qpid-jms-client/src/test/resources/example-jks.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/qpid-jms-client/src/test/resources/example-jks.truststore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/example-jks.truststore b/qpid-jms-client/src/test/resources/example-jks.truststore
deleted file mode 100644
index 9259c10..0000000
Binary files a/qpid-jms-client/src/test/resources/example-jks.truststore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/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
new file mode 100644
index 0000000..d26abde
Binary files /dev/null and b/qpid-jms-client/src/test/resources/other-ca-jks.truststore differ
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd8ac4f1/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
new file mode 100644
index 0000000..cbaa855
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/other-ca.crt
@@ -0,0 +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=
+-----END CERTIFICATE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org