Repository: qpid-jms
Updated Branches:
  refs/heads/master b57a6a4a5 -> 4904da09c


NO-JIRA Update ssl certs and keystores to use RSA 2048

Newer OS releases have disabled DSA so updating the certs to use
a stronger algorithm is needed.


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

Branch: refs/heads/master
Commit: 4904da09c9c2a3c121beea4c53db8180c1e3cfd1
Parents: b57a6a4
Author: Timothy Bish <[email protected]>
Authored: Fri May 11 15:10:13 2018 -0400
Committer: Timothy Bish <[email protected]>
Committed: Fri May 11 15:19:38 2018 -0400

----------------------------------------------------------------------
 qpid-jms-client/src/test/resources/README.txt   |  12 +++----
 .../src/test/resources/broker-jceks.keystore    | Bin 2673 -> 3762 bytes
 .../src/test/resources/broker-jceks.truststore  | Bin 777 -> 843 bytes
 .../src/test/resources/broker-jks.keystore      | Bin 2700 -> 3782 bytes
 .../src/test/resources/broker-jks.truststore    | Bin 777 -> 843 bytes
 .../src/test/resources/broker-pkcs12.keystore   | Bin 3212 -> 4303 bytes
 .../src/test/resources/broker-pkcs12.truststore | Bin 1000 -> 1074 bytes
 .../resources/broker-wrong-host-jks.keystore    | Bin 2712 -> 3791 bytes
 .../src/test/resources/broker-wrong-host.crt    |  32 +++++++++++--------
 .../src/test/resources/broker-wrong-host.csr    |  25 ++++++++-------
 qpid-jms-client/src/test/resources/broker.crt   |  32 +++++++++++--------
 qpid-jms-client/src/test/resources/broker.csr   |  25 ++++++++-------
 .../src/test/resources/ca-pkcs12.keystore       | Bin 1508 -> 2463 bytes
 qpid-jms-client/src/test/resources/ca.crt       |  30 +++++++++--------
 .../src/test/resources/client-jceks.keystore    | Bin 2679 -> 3759 bytes
 .../src/test/resources/client-jceks.truststore  | Bin 777 -> 843 bytes
 .../src/test/resources/client-jks.keystore      | Bin 2699 -> 3778 bytes
 .../src/test/resources/client-jks.truststore    | Bin 777 -> 843 bytes
 .../resources/client-multiple-keys-jks.keystore | Bin 4625 -> 6717 bytes
 .../src/test/resources/client-pkcs12.keystore   | Bin 3220 -> 4295 bytes
 .../src/test/resources/client-pkcs12.truststore | Bin 1000 -> 1074 bytes
 qpid-jms-client/src/test/resources/client.crt   |  32 +++++++++++--------
 qpid-jms-client/src/test/resources/client.csr   |  25 ++++++++-------
 .../src/test/resources/client2-jks.keystore     | Bin 2703 -> 3782 bytes
 qpid-jms-client/src/test/resources/client2.crt  |  32 +++++++++++--------
 qpid-jms-client/src/test/resources/client2.csr  |  25 ++++++++-------
 .../src/test/resources/other-ca-jks.truststore  | Bin 794 -> 861 bytes
 qpid-jms-client/src/test/resources/other-ca.crt |  30 +++++++++--------
 .../src/test/resources/README.txt               |   4 +--
 .../src/test/resources/broker-jks.keystore      | Bin 2700 -> 3780 bytes
 .../src/test/resources/broker.crt               |  32 +++++++++++--------
 .../src/test/resources/broker.csr               |  25 ++++++++-------
 .../src/test/resources/ca-jks.keystore          | Bin 1184 -> 2131 bytes
 .../src/test/resources/ca.crt                   |  30 +++++++++--------
 .../src/test/resources/client-jks.truststore    | Bin 777 -> 843 bytes
 35 files changed, 219 insertions(+), 172 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/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 5e8eacf..bdf06b4 100644
--- a/qpid-jms-client/src/test/resources/README.txt
+++ b/qpid-jms-client/src/test/resources/README.txt
@@ -7,12 +7,12 @@ 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 
-keypass password -alias ca -genkey -keyalg "RSA" -keysize 2048 -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 
-keypass password -alias broker -genkey -keyalg "RSA" -keysize 2048 -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 -validity 9999 
-ext bc=ca:false -ext eku=sA
@@ -27,7 +27,7 @@ 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 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 jks -keystore broker-wrong-host-jks.keystore -storepass 
password -keypass password -alias broker-wrong-host -genkey -keyalg "RSA" 
-keysize 2048 -dname "O=Server,CN=wronghost" -validity 9999 -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
@@ -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=client" -validity 
9999 -ext bc=ca:false -ext eku=cA
+keytool -storetype pkcs12 -keystore client-pkcs12.keystore -storepass password 
-keypass password -alias client -genkey -keyalg "RSA" -keysize 2048 -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 -validity 9999 
-ext bc=ca:false -ext eku=cA
@@ -58,7 +58,7 @@ keytool -importkeystore -srckeystore client-pkcs12.keystore 
-destkeystore client
 
 # Create a key pair for a second client, and sign it with the CA:
 # ----------------------------------------------------------
-keytool -storetype jks -keystore client2-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 client2-jks.keystore -storepass password 
-keypass password -alias client2 -genkey -keyalg "RSA" -keysize 2048 -dname 
"O=Client2,CN=client2" -validity 9999 -ext bc=ca:false -ext eku=cA
 
 keytool -storetype jks -keystore client2-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 -validity 9999 
-ext bc=ca:false -ext eku=cA
@@ -75,7 +75,7 @@ keytool -importkeystore -srckeystore client-pkcs12.truststore 
-destkeystore clie
 # 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 
-keypass password -alias other-ca -genkey -keyalg "RSA" -keysize 2048 -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/4904da09/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 e3d1941..b5a155e 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/4904da09/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 5123758..54a9fd5 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/4904da09/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 b8de3d2..a6644f0 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/4904da09/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 8a55d7f..60031b6 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/4904da09/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 fdbcc73..89f11c3 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/4904da09/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 03d3d3f..9b6d32a 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/4904da09/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 9f17aba..9bb6b06 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/4904da09/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
index 9dafa39..9df826a 100644
--- a/qpid-jms-client/src/test/resources/broker-wrong-host.crt
+++ b/qpid-jms-client/src/test/resources/broker-wrong-host.crt
@@ -1,16 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIC8TCCAq+gAwIBAgIEPTohtzALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTYxMjE1MTExMzMzWhcNNDQwNTAxMTExMzMzWjAl
-MRIwEAYDVQQDEwl3cm9uZ2hvc3QxDzANBgNVBAoTBlNlcnZlcjCCAbgwggEsBgcqhkjOOAQBMIIB
-HwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tV
-bNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaR
-MvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yr
-XDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqL
-VHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+
-z0kqA4GFAAKBgQC6zCXjqf93jujHkneBSX+50nGuFe5X15v5XROsGYYWuyEW5UEYAg0DwI7qtF7C
-hQRSOFeWWU1XEAoGPIP+w88XaS1DCkhdKS2Qp7cTefTUcyrr7dlLM/gBaPqoLU8kLFTudqciofaZ
-fGisOJkfcZB0n+vGrbR+55eLso1yv49cVKNiMGAwHwYDVR0jBBgwFoAUGZUi4UnCv/SuzPPzSr1N
-cIFyAYcwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUP9NAvS1HgNr3
-/EA/dISmU5U3KMIwCwYHKoZIzjgEAwUAAy8AMCwCFBVsWt5ZGoeiVBpwS+XjXPBawyJhAhRZLZ3P
-NTwpopT4G18r67RALRYQew==
+MIIDMzCCAhugAwIBAgIEG6o9qDANBgkqhkiG9w0BAQsFADAuMRIwEAYDVQQDEwlt
+eS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjAeFw0xODA1MTExODU5
+NDVaFw00NTA5MjUxODU5NDVaMCUxEjAQBgNVBAMTCXdyb25naG9zdDEPMA0GA1UE
+ChMGU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0jeU6oMW
+gK12M01JJjBy4edr6uU43EZDE2bNQbvRyvNtTug97d3V6vuxoYd3MXX98vd5VF6+
+IOlm8YvWBJU0HHmPS9w+mW8LHajZ3/lGVs88Yv2QezWCAch+wh/aOtqK8W4A62VY
+Z/4ju1Srv2VI+lh65+D4b3zjPqSTpFMtWD9mm3923YarmbJhTABEOEjFrKB62cif
+KZHN3I9C9nDSIcy7EVzN7JIzGoBPL2xKGRDemKy999nziTR/6Q6N6m+wHDm4ct9Q
+Cp6e3cSmsOfUs6UmXu5cAVfDwVHdN83cL6aoW4PYEIqDy301a8/+c+JZoSOnPAOe
+Xz1Ub3e5L42swQIDAQABo2IwYDAfBgNVHSMEGDAWgBS6YoKEP39UxVgaoMYECfk7
++zcevTAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBQ2
+xopwads0L3dn5OsDOpzl3t5EEjANBgkqhkiG9w0BAQsFAAOCAQEAJA7ds4Sj/pY7
+2OlQzPgMt1R/CGV9rcmunMVkcJhz1SsvkVGhIa84iL+gYf+TOPTjTU0+M8NhPkD/
+vgD1Qf3s8luijbII+gK481hEvOhYVjTE+pqZsPJNpcjDTt+Sv29Ud5fQ6gA6qXdE
+PoqhnKjZebQHtJZe2lbTUiPHTkEziRbXrwySZTJtx89Emq1xOSqimkW7Fd1TYxe/
+kvWRX9UF3GituPHnHyaTuSA2cXAR2fkfuy9v7S5uo1E5x6vS/IlMuWdVJty5dHnQ
+bTyM8jMs13TlKric9JlmV9DiSm/kII8rfLQ95P9CF9hkar6b6iDJzkvehSh6LFCL
+6HbHNb8vfA==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/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
index c7e302b..96eb0cd 100644
--- a/qpid-jms-client/src/test/resources/broker-wrong-host.csr
+++ b/qpid-jms-client/src/test/resources/broker-wrong-host.csr
@@ -1,13 +1,16 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICWjCCAhgCAQAwJTESMBAGA1UEAxMJd3Jvbmdob3N0MQ8wDQYDVQQKEwZTZXJ2ZXIwggG4MIIB
-LAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZ
-PY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7
-g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKB
-gQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgW
-E7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8G
-kotmXoB7VSVkAUw7/s9JKgOBhQACgYEAuswl46n/d47ox5J3gUl/udJxrhXuV9eb+V0TrBmGFrsh
-FuVBGAINA8CO6rRewoUEUjhXlllNVxAKBjyD/sPPF2ktQwpIXSktkKe3E3n01HMq6+3ZSzP4AWj6
-qC1PJCxU7nanIqH2mXxorDiZH3GQdJ/rxq20fueXi7KNcr+PXFSgMDAuBgkqhkiG9w0BCQ4xITAf
-MB0GA1UdDgQWBBQ/00C9LUeA2vf8QD90hKZTlTcowjALBgcqhkjOOAQDBQADLwAwLAIUefXGcrEK
-pMgHMi+EqRZA4jU1tKUCFFASkJe4LGuNz98HBp8/rJnCyMYm
+MIICmjCCAYICAQAwJTESMBAGA1UEAxMJd3Jvbmdob3N0MQ8wDQYDVQQKEwZTZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSN5TqgxaArXYzTUkm
+MHLh52vq5TjcRkMTZs1Bu9HK821O6D3t3dXq+7Ghh3cxdf3y93lUXr4g6Wbxi9YE
+lTQceY9L3D6ZbwsdqNnf+UZWzzxi/ZB7NYIByH7CH9o62orxbgDrZVhn/iO7VKu/
+ZUj6WHrn4PhvfOM+pJOkUy1YP2abf3bdhquZsmFMAEQ4SMWsoHrZyJ8pkc3cj0L2
+cNIhzLsRXM3skjMagE8vbEoZEN6YrL332fOJNH/pDo3qb7AcObhy31AKnp7dxKaw
+59SzpSZe7lwBV8PBUd03zdwvpqhbg9gQioPLfTVrz/5z4lmhI6c8A55fPVRvd7kv
+jazBAgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBQ2xopwads0L3dn
+5OsDOpzl3t5EEjANBgkqhkiG9w0BAQsFAAOCAQEAWSNkXYOUXhpsvlYi9tu7CPpZ
+v97oI7xljuYIQCdSlkGy9pfwzntt/CXkSJSAzvIs7RnbEvJOC2qW9fq49eBVPcSO
+Fqn3BtPoe8iN2lSLsg76ix7ey81Z0Nqw45DV/Fnmu8RX+PuZvT2kStf9Fbwa/g+L
+ob3IKPPx/lHb54QOm+Bui2Xs3Xx7pEIn3mtKvsth0avC2hRQqR2WBSs2rmzEsb+6
+sX/QxEp4MzFrUAjgJzS3raifR0GBMymsRIBB9xMfJ9quTIkRV8rwfADZzIGzxCWC
+KURuBqvbJNoJrdG7Z5MTQ4l5isXFXYGdKNLy18Wo8Mg4Ds5sQeGfaITeAACSqA==
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/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 558c75d..8d3779e 100644
--- a/qpid-jms-client/src/test/resources/broker.crt
+++ b/qpid-jms-client/src/test/resources/broker.crt
@@ -1,16 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIC8DCCAq6gAwIBAgIEWMSPJTALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTYxMjE1MTExMzMxWhcNNDQwNTAxMTExMzMxWjAl
-MRIwEAYDVQQDEwlsb2NhbGhvc3QxDzANBgNVBAoTBlNlcnZlcjCCAbcwggEsBgcqhkjOOAQBMIIB
-HwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tV
-bNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaR
-MvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yr
-XDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqL
-VHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+
-z0kqA4GEAAKBgBHS0KnD/TTB/NG69vI+7p533hbtv1udKR38dpKgICmqrNv5z3VZGIyuuYJ5uv7t
-SsA03xwM14gbfMTvKQS4/ZoqZV6eOZUcexjWvn9yGrfgBuf5uskhopS8wLeUUoGZS/PNP7Nq3Xwy
-SZ71Wfjem3nBKr6pXOqSqAJBfcDZ/tEDo2IwYDAfBgNVHSMEGDAWgBQZlSLhScK/9K7M8/NKvU1w
-gXIBhzAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBSkoD6xSueyPxvd
-1eUwnPlKlCPtcjALBgcqhkjOOAQDBQADLwAwLAIUQKN4RLJNhthsQSgK5E9P6H2YJwoCFCYuEuqj
-7iDJnK39WjpK2A4k9uKI
+MIIDMzCCAhugAwIBAgIEPFLHKzANBgkqhkiG9w0BAQsFADAuMRIwEAYDVQQDEwlt
+eS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjAeFw0xODA1MTExODU5
+NDNaFw00NTA5MjUxODU5NDNaMCUxEjAQBgNVBAMTCWxvY2FsaG9zdDEPMA0GA1UE
+ChMGU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi9NcODpQ
+9uVLdDAZASk4VpqjSBhP986IoJrAMj2qTGrTRPaenTaGJD0ZKlucuEc/X9fzXcwt
+eNVvPL3UWPODSnjs+DeilPwoKltjrCw1F82Pv/i2mEjXW16JJxC1S+iYfOcYWIaB
+hkuBxgnrrAaHkYGeQacqUn1l384MIUPwdObSUfBJhCUmtkBqIKj+WI+JB7hl+jWF
+irOi1bjgnNO2TAf1oYQiJdQz05WUqxpVh2t0pHNWzP2fNSkXlLKKc22244jjEoSV
+zREssbjhrOZBr7duV6bxoTCIbBvGpq9z4u8vkJAU+QRIR+NCaJVdvj36yqFiazob
+D/NYDkMwCEsc6QIDAQABo2IwYDAfBgNVHSMEGDAWgBS6YoKEP39UxVgaoMYECfk7
++zcevTAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBQE
+qoXfsB0ugdBiOHuy/ICH/X67gjANBgkqhkiG9w0BAQsFAAOCAQEAXL7k0dCkaDoE
+HMtBnVJR0+kazML5zCRGF/ESXcqyewRbq+0VBjEVFoZMx25ihGMv4Gpudu8HX8RT
+2qmctsa/jUb8UbQWHg/oD8RIn07L6/nas5M7osuSQdSqbNAdniqYpd7HN8E4zWvA
+DQ13x0cOfs3wmPXoSjAHjauApGz9hJW9wNwpBlfTfYqCfwzZ9e77ehmRHo9iQaTJ
+IxAGbRe2WR71wC3/WPyUAtqcY8f76bj7O+4EmjT00Sbxepz5fyEncsLkAUQZjmf0
+NH4VBp2OAa0daFswqMAxYt8dQDyCGjjXBsYbUmqPuiBspN7uFj6/R3+B/Ii/21QA
+r57Z0yciDA==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/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 9076b9d..8eb495f 100644
--- a/qpid-jms-client/src/test/resources/broker.csr
+++ b/qpid-jms-client/src/test/resources/broker.csr
@@ -1,13 +1,16 @@
 -----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/s9JKgOBhAACgYAR0tCpw/00wfzRuvbyPu6ed94W7b9bnSkd/HaSoCApqqzb
-+c91WRiMrrmCebr+7UrANN8cDNeIG3zE7ykEuP2aKmVenjmVHHsY1r5/chq34Abn+brJIaKUvMC3
-lFKBmUvzzT+zat18Mkme9Vn43pt5wSq+qVzqkqgCQX3A2f7RA6AwMC4GCSqGSIb3DQEJDjEhMB8w
-HQYDVR0OBBYEFKSgPrFK57I/G93V5TCc+UqUI+1yMAsGByqGSM44BAMFAAMvADAsAhRaKwmyEcZx
-N+rSzMGFwHT2bYh7YgIUSJkKx/nwbZP+Bktsv/DFs1dxgUg=
+MIICmjCCAYICAQAwJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8wDQYDVQQKEwZTZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCL01w4OlD25Ut0MBkB
+KThWmqNIGE/3zoigmsAyPapMatNE9p6dNoYkPRkqW5y4Rz9f1/NdzC141W88vdRY
+84NKeOz4N6KU/CgqW2OsLDUXzY+/+LaYSNdbXoknELVL6Jh85xhYhoGGS4HGCeus
+BoeRgZ5BpypSfWXfzgwhQ/B05tJR8EmEJSa2QGogqP5Yj4kHuGX6NYWKs6LVuOCc
+07ZMB/WhhCIl1DPTlZSrGlWHa3Skc1bM/Z81KReUsopzbbbjiOMShJXNESyxuOGs
+5kGvt25XpvGhMIhsG8amr3Pi7y+QkBT5BEhH40JolV2+PfrKoWJrOhsP81gOQzAI
+SxzpAgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBQEqoXfsB0ugdBi
+OHuy/ICH/X67gjANBgkqhkiG9w0BAQsFAAOCAQEATJtvyy+W4XEXPm9IFlDxEtQa
+KO8ByS//Cw3grzeUlZkCQ0vVLeYgogTSbFL4gz1J4U/VICHPLBf7RI9z9PEisLm2
+fBV0XlvPb78NrNj5+BmqBPBWNxDuJFOKtmWqgs9zWkELlkegxD3ywsIt6/CWHzff
+CzZeUcySaViA5AjLupcWpYUa1JQxD//uoJRxAFhVECjVzMvd/un8td3x7K0gbjHl
+GJlFOpg6DJAj88hwTQKz0y84ZqxqqRFF9h6pD6o/V1y+IAjuGRZDmwwpNAUD8JrV
+jpxbzIVZ0tipX6/DPwMP+Rk8KHOUry4gOzzqk3X7TkjTUmrp9FEA/9NQrZiIaA==
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/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 8fa1f44..aece753 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/4904da09/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 ef43af0..befbe54 100644
--- a/qpid-jms-client/src/test/resources/ca.crt
+++ b/qpid-jms-client/src/test/resources/ca.crt
@@ -1,15 +1,19 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+czqytnKLhWcMkaoOrP+8uA==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/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 4869c65..a9449d1 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/4904da09/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 45fadf3..4a40ca3 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/4904da09/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 8e7e94f..d201138 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/4904da09/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 94db7f9..a8fb225 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/4904da09/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 912e92b..2e55ed9 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/4904da09/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 35235d7..3c9efe4 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/4904da09/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 ac2d4a2..78864eb 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/4904da09/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 848c6fa..02ad220 100644
--- a/qpid-jms-client/src/test/resources/client.crt
+++ b/qpid-jms-client/src/test/resources/client.crt
@@ -1,16 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIC7jCCAqygAwIBAgIEZXk4+DALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTYxMjE1MTExMzM1WhcNNDQwNTAxMTExMzM1WjAi
-MQ8wDQYDVQQDEwZjbGllbnQxDzANBgNVBAoTBkNsaWVudDCCAbgwggEsBgcqhkjOOAQBMIIBHwKB
-gQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeB
-O4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1
-864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4
-V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyN
-KOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kq
-A4GFAAKBgQCGe7nIw7FhJRfMHyHy75Xbh7vU2Vf/6dN9ebrJ1OwBkWO4yMvaWdh29isOQ/Tlz9ch
-q1WJhKfYJ7Or229Tw+JoJitIOeGeG3QIBK8XJkLkhk0w5cCKOmzrreFR5gSztyRak2zKCl23GlO+
-UlM6P0O+n3QtaQ2Zul8QFn22bxbZsKNiMGAwHwYDVR0jBBgwFoAUGZUi4UnCv/SuzPPzSr1NcIFy
-AYcwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDAjAdBgNVHQ4EFgQU01nLqOslIVtDhO+I
-jgs1jOtscmowCwYHKoZIzjgEAwUAAy8AMCwCFCdsCfQw+svwnegIyllCRR6fkHcvAhRXOAOveZxU
-85hnPKxEMP6Bffi+uw==
+MIIDMDCCAhigAwIBAgIEHUknlzANBgkqhkiG9w0BAQsFADAuMRIwEAYDVQQDEwlt
+eS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjAeFw0xODA1MTExODU5
+NDdaFw00NTA5MjUxODU5NDdaMCIxDzANBgNVBAMTBmNsaWVudDEPMA0GA1UEChMG
+Q2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw10jxMLYCYX1
+6hLqcetHaLu2CrWUJQJseGvIRaN4ygYmhn/OMOnYggxSlKPj8N1NpRk+LtLbX6uE
+2UdTSZUtMbDZybfmITT0OVMyn0vCAOes0XJm1OLX/0aO58Hr15gKBNjcm8fR8Hrr
+ctH5fB90hCWuMW3aN3zzaWRwSwqnGLkMs2W0XQ3yyS/uaaGIOP8kPyTSw3Ew9wvx
+GmOoTFpmvyuwIiuNx643h85sFU1bzrfEC/6YeWj/sMu0xWwYSPpyPI6sjkvGs9Nv
+bdtOQ1Ll1khpaWBZhFzYrbFW4YdOdWhM/7sSNlgal0n0FxC3rqVVYml+9mdwlNlB
+cOSNfFclxwIDAQABo2IwYDAfBgNVHSMEGDAWgBS6YoKEP39UxVgaoMYECfk7+zce
+vTAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB0GA1UdDgQWBBRZ47b/
+Q1xoRGgF+tNMC4q9K3WNgDANBgkqhkiG9w0BAQsFAAOCAQEAaQhrfguZFso0OBWa
+ZkYY72OX+hN7d2Fe2BT9yjlAF67K88tUwHKgjcNekEn9yjBbra0/xKlEZNtFH1ws
+7JOvVQCf+9AxfukDnOKnM6zwh6jpsRdFL92WUllh6GBvkpCYq6uDs4zNdpML0Bcj
+34r7+EwCQrscRrGo+A9OxpdwHEVarUriiAtg9JrPXxMY2KfE7okJzntg9SJhsDAp
+Cgz8elxNhC3Fsd+xqAhGSYwQPhwotj7uG8XIMeSOpSlEXPQ5SMEXX4UVfcyNf3vb
+HS+ARu8d+i5NhpUXCBLhN5oZYik5pVH84mpKpiOug2uRzW+FsW/9oHoI7TyFakdp
+p7K1EA==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/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 39a90bd..4c782eb 100644
--- a/qpid-jms-client/src/test/resources/client.csr
+++ b/qpid-jms-client/src/test/resources/client.csr
@@ -1,13 +1,16 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICVzCCAhUCAQAwIjEPMA0GA1UEAxMGY2xpZW50MQ8wDQYDVQQKEwZDbGllbnQwggG4MIIBLAYH
-KoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZPY1Y
-+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7g/bT
-xR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKBgQD3
-4aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgWE7fP
-CTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8Gkotm
-XoB7VSVkAUw7/s9JKgOBhQACgYEAhnu5yMOxYSUXzB8h8u+V24e71NlX/+nTfXm6ydTsAZFjuMjL
-2lnYdvYrDkP05c/XIatViYSn2Cezq9tvU8PiaCYrSDnhnht0CASvFyZC5IZNMOXAijps663hUeYE
-s7ckWpNsygpdtxpTvlJTOj9Dvp90LWkNmbpfEBZ9tm8W2bCgMDAuBgkqhkiG9w0BCQ4xITAfMB0G
-A1UdDgQWBBTTWcuo6yUhW0OE74iOCzWM62xyajALBgcqhkjOOAQDBQADLwAwLAIUZiZdKXlOu7TC
-z7m8REgAPHVDEZkCFF+2Eq/OIN6ulSE9pJ9ruQC1lEk/
+MIIClzCCAX8CAQAwIjEPMA0GA1UEAxMGY2xpZW50MQ8wDQYDVQQKEwZDbGllbnQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDXSPEwtgJhfXqEupx60do
+u7YKtZQlAmx4a8hFo3jKBiaGf84w6diCDFKUo+Pw3U2lGT4u0ttfq4TZR1NJlS0x
+sNnJt+YhNPQ5UzKfS8IA56zRcmbU4tf/Ro7nwevXmAoE2Nybx9Hweuty0fl8H3SE
+Ja4xbdo3fPNpZHBLCqcYuQyzZbRdDfLJL+5poYg4/yQ/JNLDcTD3C/EaY6hMWma/
+K7AiK43HrjeHzmwVTVvOt8QL/ph5aP+wy7TFbBhI+nI8jqyOS8az029t205DUuXW
+SGlpYFmEXNitsVbhh051aEz/uxI2WBqXSfQXELeupVViaX72Z3CU2UFw5I18VyXH
+AgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBRZ47b/Q1xoRGgF+tNM
+C4q9K3WNgDANBgkqhkiG9w0BAQsFAAOCAQEAcL/z/ROInGeWXIJ6N8eafGprWYNY
+oKi+TO0U27ikYexngmQE3r4j8HF4HP33AjZG+GvcVpk7CUXxW9V1dGODsTxcTF5L
+R/dzmr79AuHMDFCTe71VWDzDK4bBiqL8LkmL+hdHCzD6IJpXor1Y7uvwDWMsIxhE
+nMvX0o347TvSLaF+/V7kCnOdWGtgKBWr8uL7Xkva3c3RvjSdzHjBocv3hlPuqLL6
++nF3FwdZSw+xzEOBwb20uhqWGSCtjkSnvehaVssHNuUCdU+RKwBuoYA+JAIFjK4m
+ofsY0UIFoyzFDDczQjzreu5GfKepHPfkcv5ASYeV9tPT1qErqzvOf3Di4g==
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/qpid-jms-client/src/test/resources/client2-jks.keystore
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/resources/client2-jks.keystore 
b/qpid-jms-client/src/test/resources/client2-jks.keystore
index 8cbacf4..95ea59f 100644
Binary files a/qpid-jms-client/src/test/resources/client2-jks.keystore and 
b/qpid-jms-client/src/test/resources/client2-jks.keystore differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/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 e1a8186..eff5f68 100644
--- a/qpid-jms-client/src/test/resources/client2.crt
+++ b/qpid-jms-client/src/test/resources/client2.crt
@@ -1,16 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIC8jCCAq6gAwIBAgIEOQTndjALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTYxMjE1MTExMzM2WhcNNDQwNTAxMTExMzM2WjAk
-MRAwDgYDVQQDEwdjbGllbnQyMRAwDgYDVQQKEwdDbGllbnQyMIIBuDCCASwGByqGSM44BAEwggEf
-AoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs
-14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy
-9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtc
-NrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotU
-fI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7P
-SSoDgYUAAoGBAOA/YVeCfzbcCw21zqXYUgZ8ts6kQhdXB63iNhR4zi5XcitVATYgs7YWzeV0QWiH
-OHBEzaAFq19p41BRcXvHR4JlDT3PuUc2zp+aAIu+dPlpk83hwodiFYrgIgl9UCKNus/kHVvpXyb2
-2CQQnwixQS6ynx9X8ir+4j5AD4xHdfJMo2IwYDAfBgNVHSMEGDAWgBQZlSLhScK/9K7M8/NKvU1w
-gXIBhzAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB0GA1UdDgQWBBSXaLM9SgiQs8Kd
-og+GRvueGMj8STALBgcqhkjOOAQDBQADMQAwLgIVAJM9d6zH/0zIEQFlbTHTCAHS8CqpAhUAj6Lv
-c5yGElTJvQ/6p9i5qGNOVm0=
+MIIDMjCCAhqgAwIBAgIEZWnrozANBgkqhkiG9w0BAQsFADAuMRIwEAYDVQQDEwlt
+eS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjAeFw0xODA1MTExODU5
+NTBaFw00NTA5MjUxODU5NTBaMCQxEDAOBgNVBAMTB2NsaWVudDIxEDAOBgNVBAoT
+B0NsaWVudDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpKBMgWQub
+gEPY13utqlX1Pjgvkh6xbw8DQHApCWVIP+axC6j2rxlwpHOWMMmnIgw2Xg4RuhJF
+pKPdi7n/ROw/o5sGWuHPb9PdOc/WF5XEyiIyWIvEZlQ4TNtAGlj2dle9CuTniDKU
+88dVIX4f8g9CVjbfGioiJrrqe+gwMd4QxHk0IwnTMV/Yjimbm2jwwK9PCQRiL5Sx
+5hUc5ldMZAzbMHmljcVhLvUp1zdVgWfOZwHxZ95gRjOyqmwwvx5LH/gM/WEYHORG
+9u3j1u9lmynn9Hd/C5JNxVW4ZicuKMcIOZdWq06rUPuaBbecJbJmyCJSjnoAn0Lq
+6ztDz0XO2jCdAgMBAAGjYjBgMB8GA1UdIwQYMBaAFLpigoQ/f1TFWBqgxgQJ+Tv7
+Nx69MAkGA1UdEwQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwHQYDVR0OBBYEFBto
+WzSMahL9EfruTziGk2PrQ7ldMA0GCSqGSIb3DQEBCwUAA4IBAQBZGmTQTedrQG6h
+A4UbCRhNh/fvUZ1jIHOM8fsDhKnzsDeYRL24CuQWhIwAn0vQ6ShwBvoQLrJtweJA
+PqKJjdYSTBESf/Mq0kkHa/T/AfhBc5EW4/k+6yL6No2OAZp9R9tBHTYq1AexDZoZ
+eT4reEW2iIX2Iv1HYJd8TkIF9lsAQ2DYBg6484h5HR0i4aHW+oCT69Tj/6ce7Gwm
+HfsCPz23aI7enlylhDzcYHt86QkHvm24c4cVhJ2rvY1/SYh0AJUpaG542EYXieNn
+wiylEgiUegXrXJ9SaT7/DFbCGz9mA505oEpSWuM7+lD6Wnwi2cYk/rXZfB83oypU
+xaSUq6ez
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/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 8c3af0e..f92e8d6 100644
--- a/qpid-jms-client/src/test/resources/client2.csr
+++ b/qpid-jms-client/src/test/resources/client2.csr
@@ -1,13 +1,16 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICWTCCAhcCAQAwJDEQMA4GA1UEAxMHY2xpZW50MjEQMA4GA1UEChMHQ2xpZW50MjCCAbgwggEs
-BgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9
-jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD
-9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGB
-APfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYT
-t88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaS
-i2ZegHtVJWQBTDv+z0kqA4GFAAKBgQDgP2FXgn823AsNtc6l2FIGfLbOpEIXVwet4jYUeM4uV3Ir
-VQE2ILO2Fs3ldEFohzhwRM2gBatfaeNQUXF7x0eCZQ09z7lHNs6fmgCLvnT5aZPN4cKHYhWK4CIJ
-fVAijbrP5B1b6V8m9tgkEJ8IsUEusp8fV/Iq/uI+QA+MR3XyTKAwMC4GCSqGSIb3DQEJDjEhMB8w
-HQYDVR0OBBYEFJdosz1KCJCzwp2iD4ZG+54YyPxJMAsGByqGSM44BAMFAAMvADAsAhRcW0+SqjSd
-jkmUoXEiB4w0qN2i9QIURo0682bre0zmABK5n9ETrNroGW8=
+MIICmTCCAYECAQAwJDEQMA4GA1UEAxMHY2xpZW50MjEQMA4GA1UEChMHQ2xpZW50
+MjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkoEyBZC5uAQ9jXe62q
+VfU+OC+SHrFvDwNAcCkJZUg/5rELqPavGXCkc5YwyaciDDZeDhG6EkWko92Luf9E
+7D+jmwZa4c9v0905z9YXlcTKIjJYi8RmVDhM20AaWPZ2V70K5OeIMpTzx1Uhfh/y
+D0JWNt8aKiImuup76DAx3hDEeTQjCdMxX9iOKZubaPDAr08JBGIvlLHmFRzmV0xk
+DNsweaWNxWEu9SnXN1WBZ85nAfFn3mBGM7KqbDC/Hksf+Az9YRgc5Eb27ePW72Wb
+Kef0d38Lkk3FVbhmJy4oxwg5l1arTqtQ+5oFt5wlsmbIIlKOegCfQurrO0PPRc7a
+MJ0CAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFBtoWzSMahL9Efru
+TziGk2PrQ7ldMA0GCSqGSIb3DQEBCwUAA4IBAQBgsuXYf1McupAYqWarWuWPaNGJ
+NkCSQCtF3KrUe9foGS/OVKxXksMeTfYUuO5RFXPT3jGtsSNNgNuVG6pg8zX82W9d
+bZq9bGAZXJeRVtnz8+9m1/1GB+q0xHYz2SyYXq2QdqNLFf9fmNQTiKr+R5yO710S
+OvmXbG7CsRBLOqASud3Pb7uAl5x+tmD/Po7E0DNY0eGK0oMDfgOe8FFPmfMN9HKT
+Pv1+KMHkjMr1sKxXogowTjqidokM53AyTRDODyT+1mWbumRhupVblGLcQQ/EbKAZ
+cU7B+o1johWoPgVC38r0aRVgqMPDNLFibtKFoAkZTDDPK2PB0vuNjIdGSRav
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/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 ad085c6..d3ce8f4 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/4904da09/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 f95856b..56c650b 100644
--- a/qpid-jms-client/src/test/resources/other-ca.crt
+++ b/qpid-jms-client/src/test/resources/other-ca.crt
@@ -1,15 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIC1TCCApOgAwIBAgIEH+tb6DALBgcqhkjOOAQDBQAwNDEVMBMGA1UEAxMMb3RoZXItY2Eub3Jn
-MRswGQYDVQQKExJPdGhlciBUcnVzdGVkIEluYy4wHhcNMTYxMjE1MTExMzM4WhcNNDQwNTAxMTEx
-MzM4WjA0MRUwEwYDVQQDEwxvdGhlci1jYS5vcmcxGzAZBgNVBAoTEk90aGVyIFRydXN0ZWQgSW5j
-LjCCAbcwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEm
-aUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX
-58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLr
-hAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0
-SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJ
-qIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqA4GEAAKBgGF8vwoJml7SF1bie3ajqzZqkgCapAD/UuHS
-oNnxlnMM0ITiYp0kZExH2OlYKRznqC//ECfF2MYtlGSYiSle8Zo6GWhR9a71/8EkjvWFfg44lVa2
-84Wo+WYs0Mkny6Z4fZP629OwhDXJPT8rFU4dRe4+DMFVD6WiZntigFND6UvKozIwMDAPBgNVHRMB
-Af8EBTADAQH/MB0GA1UdDgQWBBSjULdzLYdVyk+FxYTUKqIXKf8+kDALBgcqhkjOOAQDBQADLwAw
-LAIUWpjS79eKTrn0FFiKfgH07D5JIB8CFCcC8V6f93hHT+4ucod8ZXLCQ9sK
+MIIDGDCCAgCgAwIBAgIEUosGfTANBgkqhkiG9w0BAQsFADA0MRUwEwYDVQQDEwxv
+dGhlci1jYS5vcmcxGzAZBgNVBAoTEk90aGVyIFRydXN0ZWQgSW5jLjAeFw0xODA1
+MTExODU5NTFaFw00NTA5MjUxODU5NTFaMDQxFTATBgNVBAMTDG90aGVyLWNhLm9y
+ZzEbMBkGA1UEChMST3RoZXIgVHJ1c3RlZCBJbmMuMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA0HR4+XIBarxaYb4622xg5RbRivIQQAJqIK5Yq2r1ydXp
+lNUPCIhwOASISVnstgZmS+E+4BqwJU74Q/9Ve6xF4I6zAvkHeMiXmuH/8Nz5gLtK
+FZp4y8jBBQC0MvwMVd5P6fDZDB87k0LtR8qmBqII2xScHNDMeN89d9pCPnSqHg8L
+3DADUAx2WPg9GIQfoaKHim49IaG1EpusIbhl6Qi6n+zRaspDoYeyatmpaQRvHFfP
+c86lLLe51kzw1emgndpMiV5GjWZbLFEX7iKkuQM4MutlyqMTChsANZ8zZMJuxBVs
+vW55R+plBI9nF3bwaS+8PxziWcRyY8hmN39IzMDUTQIDAQABozIwMDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBSQaiIc4oosj4KQqUluHQsw+cIWODANBgkqhkiG
+9w0BAQsFAAOCAQEAfSpaNcDokG8BSdydHkE5Fwf7vzOobr4RSmR6zeEeAkzqMh0C
+b8X6YPXrd9xT2mTTHqbEXF7FbHVNGjuOeQStQVQc7OfYL25E1VqHbctfjsGEJxO+
+JJT0i9mpoaovSSkoAbS0I3mwJVRNVjxfaBlNTkxuMu/lbYMm3evknqUnN6g81W1W
+thXAORb/CSQFoAT52cq3aHlVj/VIwoHlMYEAC56Sbn/CvAnV8NjTwscGdzN6Hx55
+V+ONEflVr4cZHftW//T9aSn0F6zjHZTVmYeCHYOrH5pIMaCuR6a41LNVo344Y/SX
+KaUUn7wCaxg4aXAl1worNCqEwSk7+wqgmdRnKg==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/README.txt
----------------------------------------------------------------------
diff --git 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/README.txt 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/README.txt
index 4b9592f..adefe84 100644
--- 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/README.txt
+++ 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/README.txt
@@ -6,12 +6,12 @@ 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 jks -keystore ca-jks.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 jks -keystore ca-jks.keystore -storepass password -keypass 
password -alias ca -genkey -keyalg "RSA" -keysize 2048 -dname "O=My Trusted 
Inc.,CN=my-ca.org" -validity 9999 -ext bc:c=ca:true
 keytool -storetype jks -keystore ca-jks.keystore -storepass password -alias ca 
-exportcert -rfc > ca.crt
 
 # Create a key pair for the broker, and sign it with the CA:
 # ----------------------------------------------------------
-keytool -storetype jks -keystore broker-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-jks.keystore -storepass password 
-keypass password -alias broker -genkey -keyalg "RSA" -keysize 2048 -dname 
"O=Server,CN=localhost" -validity 9999 -ext bc=ca:false -ext eku=sA
 
 keytool -storetype jks -keystore broker-jks.keystore -storepass password 
-alias broker -certreq -file broker.csr
 keytool -storetype jks -keystore ca-jks.keystore -storepass password -alias ca 
-gencert -rfc -infile broker.csr -outfile broker.crt -validity 9999 -ext 
bc=ca:false -ext eku=sA

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker-jks.keystore
----------------------------------------------------------------------
diff --git 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker-jks.keystore
 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker-jks.keystore
index 7bdf58e..2abb066 100644
Binary files 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker-jks.keystore
 and 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker-jks.keystore
 differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker.crt
----------------------------------------------------------------------
diff --git 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker.crt 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker.crt
index 865ee50..2f826f3 100644
--- 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker.crt
+++ 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker.crt
@@ -1,16 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIC8DCCAq6gAwIBAgIEZLwPfTALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNzEzMTExMjQ3WhcNNDIxMTI3MTExMjQ3WjAl
-MRIwEAYDVQQDEwlsb2NhbGhvc3QxDzANBgNVBAoTBlNlcnZlcjCCAbcwggEsBgcqhkjOOAQBMIIB
-HwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tV
-bNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaR
-MvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yr
-XDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqL
-VHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+
-z0kqA4GEAAKBgBm4I6/WnxRusgL5rJBXoXhYJIZ+Fd0V6vBG8ZdWzoWS1bj+BcZ1q+hCW5Y7Mm3B
-BJV9o561WXI+gPlKwmhfNNmvzPaBgjT9koy8b2qtz2dBQ0a9Xv3dAsDwzd3reul4uRGAzIGXpqA3
-iKt+QPQSVWTGgDzltMhfvFyii2ctiBzRo2IwYDAfBgNVHSMEGDAWgBSANlm9IONHu6PmjJNWUMxL
-RE62XDAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBQMEgj6rDgHa+ke
-igVS1aCBvJarhjALBgcqhkjOOAQDBQADLwAwLAIUGuYkBW6uue5PGrfmJM9M4X2Z6h4CFESdO7HE
-DrTCowsfVQ6pc357tsSs
+MIIDMzCCAhugAwIBAgIEWNdbDzANBgkqhkiG9w0BAQsFADAuMRIwEAYDVQQDEwlt
+eS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjAeFw0xODA1MTExOTA1
+NDJaFw00NTA5MjUxOTA1NDJaMCUxEjAQBgNVBAMTCWxvY2FsaG9zdDEPMA0GA1UE
+ChMGU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0LiTouUt
+smw+dP2oiycKj2CVFFWFRBrVNXH/MX8tM+VogG66XHLe8z9PJ2bvpdzE8h5u6qjx
+WMmo4T+PEIbpBvVvuW67vRPHNX5OWFZo/P8uYs9p3BfmzO3JzVq8EjvxRcHWDGxj
+8biH6emz2v5gAYq9O30O2uw6a7B1sDTVa5WjBXPOt6AF8VKSZ4O3fsd5WSi4eYQF
+64KywOuQ4xUdQpcaBXiqqTQNmWJkaqS7DH3+HgdpP7ETaYgm6xOTZ5OTledEkpPJ
+KsyYNCO3oCqju+E3RSxF2rZHGZYNpDrmwN59I8ngj7rWeJ3fY/UA3FEKJPV/S95H
+kj6G085oG7xNwwIDAQABo2IwYDAfBgNVHSMEGDAWgBTkzwvtgJbpyXoevQHc4oZu
+abhbmzAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBTy
+Q5+sE35Sukxlibiwq14/9HTmhTANBgkqhkiG9w0BAQsFAAOCAQEAog0RBaas8KXv
+pSWx6fxBxWqeugk26RLdWc1tLHPvsXb3y+xbxOoHV9rNGax/g668/FpE6nlMGAYa
+++v1wzLtF5H3Y6o/+Shp5ArT7200TdcgqkEnewt3THT2J987oZ4StMLN4AoL95i/
+B7Wz4nJLvC8t04oCe8JMb+CXFzQ8i5H2cW9h+OxBQFZ8CTjEBbomXjqIitMfSmdJ
+WJLNpsaRUWLIAw351QyVM0GX7S9f8xxVR/OAIRPESEF1R9avi1EooxNRYAvDYBNd
+EaoUnQXEbHH/Iv+Wpv82L1pskbUSjKZVKo/XAIOngNb63mjwlspdnBKXnSHcR8wM
+DnQ9uTwqNg==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker.csr
----------------------------------------------------------------------
diff --git 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker.csr 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker.csr
index 0e1cd15..1be008e 100644
--- 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker.csr
+++ 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/broker.csr
@@ -1,13 +1,16 @@
 -----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/s9JKgOBhAACgYAZuCOv1p8UbrIC+ayQV6F4WCSGfhXdFerwRvGXVs6FktW4
-/gXGdavoQluWOzJtwQSVfaOetVlyPoD5SsJoXzTZr8z2gYI0/ZKMvG9qrc9nQUNGvV793QLA8M3d
-63rpeLkRgMyBl6agN4irfkD0ElVkxoA85bTIX7xcootnLYgc0aAwMC4GCSqGSIb3DQEJDjEhMB8w
-HQYDVR0OBBYEFAwSCPqsOAdr6R6KBVLVoIG8lquGMAsGByqGSM44BAMFAAMvADAsAhQREWQmDqjx
-h91w+C4DJXZwAFM7YwIUdiNz1SsiCESumovV6kBdfZ+4d9A=
+MIICmjCCAYICAQAwJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8wDQYDVQQKEwZTZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQuJOi5S2ybD50/aiL
+JwqPYJUUVYVEGtU1cf8xfy0z5WiAbrpcct7zP08nZu+l3MTyHm7qqPFYyajhP48Q
+hukG9W+5bru9E8c1fk5YVmj8/y5iz2ncF+bM7cnNWrwSO/FFwdYMbGPxuIfp6bPa
+/mABir07fQ7a7DprsHWwNNVrlaMFc863oAXxUpJng7d+x3lZKLh5hAXrgrLA65Dj
+FR1ClxoFeKqpNA2ZYmRqpLsMff4eB2k/sRNpiCbrE5Nnk5OV50SSk8kqzJg0I7eg
+KqO74TdFLEXatkcZlg2kOubA3n0jyeCPutZ4nd9j9QDcUQok9X9L3keSPobTzmgb
+vE3DAgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBTyQ5+sE35Sukxl
+ibiwq14/9HTmhTANBgkqhkiG9w0BAQsFAAOCAQEAMx/F4qhSg0CX8/fN4UamHXm6
+4W2TjZ0gl5fUOoFf1wQIyL4i7HbodmStLXu6xlO1oVfTGR+D25I9Syzf/T7czD5t
+2CbC4njMPt73zLeLwO950q4WrJOHCNDZa53sU4LqKqNxgzu+eCIvj90msMSlIzIQ
+XoDKLgXR+Wnmzbr1PlUW0MqWrOyJfdnK3JhRAlAoCNX9HLl9jO7ah4IAnYMA2BXd
+mBUMQRNjeScz8ywuGJ6+MX0MWWCTdpRty7nAh86OldUBXlD+j2t9Ubh6b5JDYio2
+ZLiVckuIeIbQN2fH8SwAqMk9EoSLH6KL2T0MQ2Qn8QXCFkD4ZSCyTBCfDeydrQ==
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/ca-jks.keystore
----------------------------------------------------------------------
diff --git 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/ca-jks.keystore
 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/ca-jks.keystore
index 21dc08e..7a49cd4 100644
Binary files 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/ca-jks.keystore
 and 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/ca-jks.keystore
 differ

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/ca.crt
----------------------------------------------------------------------
diff --git 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/ca.crt 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/ca.crt
index 6f94aa7..fa0f8ae 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/ca.crt
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/ca.crt
@@ -1,15 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIICyjCCAoigAwIBAgIEMplghTALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTUwNzEzMTExMjQ2WhcNNDIxMTI3MTExMjQ2WjAu
-MRIwEAYDVQQDEwlteS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjCCAbgwggEsBgcq
-hkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6
-v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPF
-HsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfh
-oIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88J
-MozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2Ze
-gHtVJWQBTDv+z0kqA4GFAAKBgQDF5EbIMcPgzd62okV2Z6z+WrR9MxGQ3TZYaLe6D3leldLY5/UE
-Lj3SH6k7ndfboTujr38dUfWP9qJSmosn/R6QvBfoAgUnO8WdnXod5aLxYlSeivuZcMuiD3t+72hD
-8KYcZm72NHZw8i8+ubD7xizVvdKJOYn4O0r+sH+8CCgxfqMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUgDZZvSDjR7uj5oyTVlDMS0ROtlwwCwYHKoZIzjgEAwUAAy8AMCwCFDUOtg0V0yS/
-eqfqUaHv8VR80+WPAhQY7hn2T5zV4AltFW9wikuHEp/Tkw==
+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
+ipT6vB7Y2um0HymXBpAOVg==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4904da09/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/client-jks.truststore
----------------------------------------------------------------------
diff --git 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/client-jks.truststore
 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/client-jks.truststore
index cf7b7f1..b8c31b3 100644
Binary files 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/client-jks.truststore
 and 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/client-jks.truststore
 differ


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to