PROTON-1405: convert test stores to JKS to cater for Java 7, which cant use cert-only entries in PKCS12 trust stores
diff --git a/proton-j/src/test/java/org/apache/qpid/proton/systemtests/engine/SslTest.java b/proton-j/src/test/java/org/apache/qpid/proton/systemtests/engine/SslTest.java
index b426d3f..b8cb97f 100644
--- a/proton-j/src/test/java/org/apache/qpid/proton/systemtests/engine/SslTest.java
+++ b/proton-j/src/test/java/org/apache/qpid/proton/systemtests/engine/SslTest.java
@@ -46,10 +46,10 @@
 
 public class SslTest
 {
-    private static final String SERVER_PKCS12_KEYSTORE = "src/test/resources/server-pkcs12.keystore";
-    private static final String SERVER_PKCS12_TRUSTSTORE = "src/test/resources/server-pkcs12.truststore";
-    private static final String CLIENT_PKCS12_KEYSTORE = "src/test/resources/client-pkcs12.keystore";
-    private static final String CLIENT_PKCS12_TRUSTSTORE = "src/test/resources/client-pkcs12.truststore";
+    private static final String SERVER_JKS_KEYSTORE = "src/test/resources/server-jks.keystore";
+    private static final String SERVER_JKS_TRUSTSTORE = "src/test/resources/server-jks.truststore";
+    private static final String CLIENT_JKS_KEYSTORE = "src/test/resources/client-jks.keystore";
+    private static final String CLIENT_JKS_TRUSTSTORE = "src/test/resources/client-jks.truststore";
     private static final String PASSWORD = "password";
 
     private static final String SERVER_CONTAINER = "serverContainer";
@@ -69,14 +69,14 @@
         SslDomain clientSslDomain = SslDomain.Factory.create();
         clientSslDomain.init(Mode.CLIENT);
         clientSslDomain.setPeerAuthentication(VerifyMode.VERIFY_PEER);
-        SSLContext clientSslContext = createSslContext(CLIENT_PKCS12_KEYSTORE, PASSWORD, CLIENT_PKCS12_TRUSTSTORE, PASSWORD);
+        SSLContext clientSslContext = createSslContext(CLIENT_JKS_KEYSTORE, PASSWORD, CLIENT_JKS_TRUSTSTORE, PASSWORD);
         clientSslDomain.setSslContext(clientSslContext);
         _clientTransport.ssl(clientSslDomain);
 
         SslDomain serverSslDomain = SslDomain.Factory.create();
         serverSslDomain.init(Mode.SERVER);
         serverSslDomain.setPeerAuthentication(VerifyMode.VERIFY_PEER);
-        SSLContext serverSslContext = createSslContext(SERVER_PKCS12_KEYSTORE, PASSWORD, SERVER_PKCS12_TRUSTSTORE, PASSWORD);
+        SSLContext serverSslContext = createSslContext(SERVER_JKS_KEYSTORE, PASSWORD, SERVER_JKS_TRUSTSTORE, PASSWORD);
         serverSslDomain.setSslContext(serverSslContext);
         _serverTransport.ssl(serverSslDomain);
 
@@ -145,14 +145,14 @@
         KeyManagerFactory keyFact = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
         TrustManagerFactory trustFact = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
 
-        KeyStore keyStore = KeyStore.getInstance("PKCS12");
+        KeyStore keyStore = KeyStore.getInstance("JKS");
         try (InputStream in = new FileInputStream(new File(keyStoreLocation));)
         {
             keyStore.load(in, keyStorePassword.toCharArray());
         }
         keyFact.init(keyStore, keyStorePassword.toCharArray());
 
-        KeyStore trustStore = KeyStore.getInstance("PKCS12");
+        KeyStore trustStore = KeyStore.getInstance("JKS");
         try (InputStream in = new FileInputStream(new File(trustStoreLocation));)
         {
             trustStore.load(in, trustStorePassword.toCharArray());
diff --git a/proton-j/src/test/resources/README.txt b/proton-j/src/test/resources/README.txt
index 1a4516e..91d8cf3 100644
--- a/proton-j/src/test/resources/README.txt
+++ b/proton-j/src/test/resources/README.txt
@@ -26,34 +26,34 @@
 
 # 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
+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 -alias ca -exportcert -rfc > ca.crt
 
 # Create a key pair for the server, and sign it with the CA:
 # ----------------------------------------------------------
-keytool -storetype pkcs12 -keystore server-pkcs12.keystore -storepass password -keypass password -alias server -genkey -dname "O=Server,CN=localhost" -validity 9999 -ext bc=ca:false -ext eku=sA
+keytool -storetype jks -keystore server-jks.keystore -storepass password -keypass password -alias server -genkey -dname "O=Server,CN=localhost" -validity 9999 -ext bc=ca:false -ext eku=sA
 
-keytool -storetype pkcs12 -keystore server-pkcs12.keystore -storepass password -alias server -certreq -file server.csr
-keytool -storetype pkcs12 -keystore ca-pkcs12.keystore -storepass password -alias ca -gencert -rfc -infile server.csr -outfile server.crt -validity 9999 -ext bc=ca:false -ext eku=sA
+keytool -storetype jks -keystore server-jks.keystore -storepass password -alias server -certreq -file server.csr
+keytool -storetype jks -keystore ca-jks.keystore -storepass password -alias ca -gencert -rfc -infile server.csr -outfile server.crt -validity 9999 -ext bc=ca:false -ext eku=sA
 
-keytool -storetype pkcs12 -keystore server-pkcs12.keystore -storepass password -keypass password -importcert -alias ca -file ca.crt -noprompt
-keytool -storetype pkcs12 -keystore server-pkcs12.keystore -storepass password -keypass password -importcert -alias server -file server.crt
+keytool -storetype jks -keystore server-jks.keystore -storepass password -keypass password -importcert -alias ca -file ca.crt -noprompt
+keytool -storetype jks -keystore server-jks.keystore -storepass password -keypass password -importcert -alias server -file server.crt
 
 # Create trust store for the server, import the CA cert:
 # -------------------------------------------------------
-keytool -storetype pkcs12 -keystore server-pkcs12.truststore -storepass password -keypass password -importcert -alias ca -file ca.crt -noprompt
+keytool -storetype jks -keystore server-jks.truststore -storepass password -keypass password -importcert -alias ca -file ca.crt -noprompt
 
 # Create a key pair for a 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 jks -keystore client-jks.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 -validity 9999 -ext bc=ca:false -ext eku=cA
+keytool -storetype jks -keystore client-jks.keystore -storepass password -alias client -certreq -file client.csr
+keytool -storetype jks -keystore ca-jks.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
+keytool -storetype jks -keystore client-jks.keystore -storepass password -keypass password -importcert -alias ca -file ca.crt -noprompt
+keytool -storetype jks -keystore client-jks.keystore -storepass password -keypass password -importcert -alias client -file client.crt
 
 # Create trust store 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 -storetype jks -keystore client-jks.truststore -storepass password -keypass password -importcert -alias ca -file ca.crt -noprompt
 
diff --git a/proton-j/src/test/resources/ca-jks.keystore b/proton-j/src/test/resources/ca-jks.keystore
new file mode 100644
index 0000000..bae2937
--- /dev/null
+++ b/proton-j/src/test/resources/ca-jks.keystore
Binary files differ
diff --git a/proton-j/src/test/resources/ca-pkcs12.keystore b/proton-j/src/test/resources/ca-pkcs12.keystore
deleted file mode 100644
index 8518594..0000000
--- a/proton-j/src/test/resources/ca-pkcs12.keystore
+++ /dev/null
Binary files differ
diff --git a/proton-j/src/test/resources/ca.crt b/proton-j/src/test/resources/ca.crt
index ccd8f09..d02a66a 100644
--- a/proton-j/src/test/resources/ca.crt
+++ b/proton-j/src/test/resources/ca.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICyTCCAoegAwIBAgIEaAYSUTALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw

-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTcwMjE3MTc1MjMwWhcNNDQwNzA0MTc1MjMwWjAu

-MRIwEAYDVQQDEwlteS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjCCAbcwggEsBgcq

+MIICyjCCAoigAwIBAgIEKyYwuDALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw

+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTcwMzA2MTI1ODEwWhcNNDQwNzIxMTI1ODEwWjAu

+MRIwEAYDVQQDEwlteS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjCCAbgwggEsBgcq

 hkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6

 v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPF

 HsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfh

 oIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88J

 MozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2Ze

-gHtVJWQBTDv+z0kqA4GEAAKBgDoxX28C4+6GPhU0tRIeg0aPrz/5HllZwa20GAaKynloG9eIsfHU

-YjoQNSBlkRYtrEAPnD/V1UVlSDhw4hgGbbtCfLtRW5roU/3der29/cJQgDrT6nKk0YhHlMplROpb

-QyZ0nsjtmpx47s3yTp4PDNuQ01//7xaom4/3NSTKsZtqozIwMDAPBgNVHRMBAf8EBTADAQH/MB0G

-A1UdDgQWBBRCc/g0sUmH3EsNis029c9biR3HpDALBgcqhkjOOAQDBQADLwAwLAIUEBP/U+V5dZ+4

-zHPMl4+OJrF2cP0CFCEjdq+u04mVQRjXY2depfJVFdY/
+gHtVJWQBTDv+z0kqA4GFAAKBgQCPSdkR8LppXQ3JvChf6mOcRB2MJcjqok78JW5OX9qDNS3UnB2P

++1xHX1eZ2LbVg9q5flGoPIHjqyS/523goObyHt6H1/VLzqF+4k7sWuyZUvhsgGbPrBVnbYYaMpw+

+Y4K8QXzTE2Jdwb0pkgXq8SEsokDBD2VlArklEhfp+LkXbaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd

+BgNVHQ4EFgQUlUQ80rbvt+awTI8tQclL1tjNxG8wCwYHKoZIzjgEAwUAAy8AMCwCFE0zhebu96ZY

+LRD6zSecbolRd4uUAhQhA2M1pVNYie25XDEthBdW99MlaA==
 -----END CERTIFICATE-----
diff --git a/proton-j/src/test/resources/client-jks.keystore b/proton-j/src/test/resources/client-jks.keystore
new file mode 100644
index 0000000..02176af
--- /dev/null
+++ b/proton-j/src/test/resources/client-jks.keystore
Binary files differ
diff --git a/proton-j/src/test/resources/client-jks.truststore b/proton-j/src/test/resources/client-jks.truststore
new file mode 100644
index 0000000..b74cc53
--- /dev/null
+++ b/proton-j/src/test/resources/client-jks.truststore
Binary files differ
diff --git a/proton-j/src/test/resources/client-pkcs12.keystore b/proton-j/src/test/resources/client-pkcs12.keystore
deleted file mode 100644
index ffddc8f..0000000
--- a/proton-j/src/test/resources/client-pkcs12.keystore
+++ /dev/null
Binary files differ
diff --git a/proton-j/src/test/resources/client-pkcs12.truststore b/proton-j/src/test/resources/client-pkcs12.truststore
deleted file mode 100644
index 94980f2..0000000
--- a/proton-j/src/test/resources/client-pkcs12.truststore
+++ /dev/null
Binary files differ
diff --git a/proton-j/src/test/resources/client.crt b/proton-j/src/test/resources/client.crt
index ad7c13b..c26b9c7 100644
--- a/proton-j/src/test/resources/client.crt
+++ b/proton-j/src/test/resources/client.crt
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIC7TCCAqugAwIBAgIEdIsOFTALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw

-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTcwMjE3MTc1MjMzWhcNNDQwNzA0MTc1MjMzWjAi

+MIIC7TCCAqugAwIBAgIEWdvavzALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw

+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTcwMzA2MTI1ODExWhcNNDQwNzIxMTI1ODExWjAi

 MQ8wDQYDVQQDEwZjbGllbnQxDzANBgNVBAoTBkNsaWVudDCCAbcwggEsBgcqhkjOOAQBMIIBHwKB

 gQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeB

 O4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1

 864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4

 V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyN

 KOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kq

-A4GEAAKBgARwR4H7ol+67WtN32jb3aJwf6fFo+5PirqLWFQeupLmf74yvx/YsTncDaxndBb/hUpy

-P0BdizE8NMN6qbu2j8Nbb6nBpM8SA6uve2T/07mTgFnOiEpD8nOWfgxHsDXncQDxtwi+EpfIp0pl

-HKR0JapmnJfZeMApa0pTc/RYaCXHo2IwYDAfBgNVHSMEGDAWgBRCc/g0sUmH3EsNis029c9biR3H

-pDAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB0GA1UdDgQWBBQf0HHCQbYVQI5XgCRS

-8EnbLfSRYjALBgcqhkjOOAQDBQADLwAwLAIUcNM9zzJfxoVRGsxoT5ntSCZPkbMCFD4YCU2oHD5r

-0MdlA8iNp9DUb4pi
+A4GEAAKBgCmBhJD4mAWKphx7fIVmOYXG03z/paV62ZHmEQKcyKJv7j+p+6qKDn8LyE1Mds1q+NQ8

+1LzVjUDXhG/E4oVLejibLn661iehxkvH/nm777i/uLUw+eYcCznQR79/0AvLZi5OLrUjCNylxNbG

+O20mFGsZpijml9e/mxLrTpjPv7oBo2IwYDAfBgNVHSMEGDAWgBSVRDzStu+35rBMjy1ByUvW2M3E

+bzAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB0GA1UdDgQWBBRr2LqMrg4a2jLTnG1p

+O/9oyRnNwjALBgcqhkjOOAQDBQADLwAwLAIUFEBOYevqy1GgRKstrMmACxyGLLQCFG6QkFbPWj4+

+akJvNzUlM+/KxRMr
 -----END CERTIFICATE-----
diff --git a/proton-j/src/test/resources/client.csr b/proton-j/src/test/resources/client.csr
index 5006c90..134ccf1 100644
--- a/proton-j/src/test/resources/client.csr
+++ b/proton-j/src/test/resources/client.csr
@@ -5,9 +5,9 @@
 xR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKBgQD3

 4aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgWE7fP

 CTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8Gkotm

-XoB7VSVkAUw7/s9JKgOBhAACgYAEcEeB+6Jfuu1rTd9o292icH+nxaPuT4q6i1hUHrqS5n++Mr8f

-2LE53A2sZ3QW/4VKcj9AXYsxPDTDeqm7to/DW2+pwaTPEgOrr3tk/9O5k4BZzohKQ/Jzln4MR7A1

-53EA8bcIvhKXyKdKZRykdCWqZpyX2XjAKWtKU3P0WGglx6AwMC4GCSqGSIb3DQEJDjEhMB8wHQYD

-VR0OBBYEFB/QccJBthVAjleAJFLwSdst9JFiMAsGByqGSM44BAMFAAMvADAsAhR/BRqoPI9dFwO8

-pcy+9OS9we85jgIURWkIHmeMXeQnqiLwehzPoDYrH2c=
+XoB7VSVkAUw7/s9JKgOBhAACgYApgYSQ+JgFiqYce3yFZjmFxtN8/6WletmR5hECnMiib+4/qfuq

+ig5/C8hNTHbNavjUPNS81Y1A14RvxOKFS3o4my5+utYnocZLx/55u++4v7i1MPnmHAs50Ee/f9AL

+y2YuTi61IwjcpcTWxjttJhRrGaYo5pfXv5sS606Yz7+6AaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYD

+VR0OBBYEFGvYuoyuDhraMtOcbWk7/2jJGc3CMAsGByqGSM44BAMFAAMvADAsAhQ+g1kk3OMxUcsh

+YQvINa8DfG17kAIUMLAYIB4oan6o7aOWntIatUzARbU=
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/proton-j/src/test/resources/server-jks.keystore b/proton-j/src/test/resources/server-jks.keystore
new file mode 100644
index 0000000..0ab1a11
--- /dev/null
+++ b/proton-j/src/test/resources/server-jks.keystore
Binary files differ
diff --git a/proton-j/src/test/resources/server-jks.truststore b/proton-j/src/test/resources/server-jks.truststore
new file mode 100644
index 0000000..af03f7b
--- /dev/null
+++ b/proton-j/src/test/resources/server-jks.truststore
Binary files differ
diff --git a/proton-j/src/test/resources/server-pkcs12.keystore b/proton-j/src/test/resources/server-pkcs12.keystore
deleted file mode 100644
index dd2e212..0000000
--- a/proton-j/src/test/resources/server-pkcs12.keystore
+++ /dev/null
Binary files differ
diff --git a/proton-j/src/test/resources/server-pkcs12.truststore b/proton-j/src/test/resources/server-pkcs12.truststore
deleted file mode 100644
index 04798ec..0000000
--- a/proton-j/src/test/resources/server-pkcs12.truststore
+++ /dev/null
Binary files differ
diff --git a/proton-j/src/test/resources/server.crt b/proton-j/src/test/resources/server.crt
index ed0eed6..c23ef60 100644
--- a/proton-j/src/test/resources/server.crt
+++ b/proton-j/src/test/resources/server.crt
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIC8TCCAq+gAwIBAgIELDFSBjALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw

-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTcwMjE3MTc1MjMyWhcNNDQwNzA0MTc1MjMyWjAl

+MIIC8TCCAq+gAwIBAgIEE1JMmDALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw

+FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTcwMzA2MTI1ODExWhcNNDQwNzIxMTI1ODExWjAl

 MRIwEAYDVQQDEwlsb2NhbGhvc3QxDzANBgNVBAoTBlNlcnZlcjCCAbgwggEsBgcqhkjOOAQBMIIB

 HwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tV

 bNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaR

 MvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yr

 XDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqL

 VHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+

-z0kqA4GFAAKBgQDoMxMn1KARYyWpGTEIlACWODH0Gj76WxhhpknIN7HWBrC6mgzcS+CHZ17gVrxI

-mVx2tNWzEdwi0RvYHvp23QRyw/L6FgHyJ9GCSfLuNbsYZiFnQz80LTNFNP+CT2unpV5PafT6zYQ0

-HljoBZeE8E1uHlET8EKSYLaMGnjSDIVicqNiMGAwHwYDVR0jBBgwFoAUQnP4NLFJh9xLDYrNNvXP

-W4kdx6QwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU82oygO6LZOal

-7o4zHYpvpjAYWhIwCwYHKoZIzjgEAwUAAy8AMCwCFEZFFgcMl8M5VnE7m8v9axovwkQaAhQgiRI0

-D9VhWSz+xcSb6eGnyrz1Dw==
+z0kqA4GFAAKBgQClYhVAhYM0/tkuRsbdMbmCQFyfGIwCOQuJ1xtuW4qJvSVxXaGZKI8Hq9SgCfz6

+lDRMU43uRv+5rUY0nMdD5sZWs3Yz9Lq6ziTyfgnFoPENch39Fi4fUZ8HIZMr1EfbdOIkn3ezcY5C

+rqNcgImioYeLqBGrHlrdrCGPDcglIPnHBaNiMGAwHwYDVR0jBBgwFoAUlUQ80rbvt+awTI8tQclL

+1tjNxG8wCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQULXSZgPoFHy/H

+oa2iR2WgjlNNVWowCwYHKoZIzjgEAwUAAy8AMCwCFARddUJUvvjMMtxApYEwijqq90e4AhQ2T4Yv

+Wan5XRDpMNdjmeQUKCe2Qw==
 -----END CERTIFICATE-----
diff --git a/proton-j/src/test/resources/server.csr b/proton-j/src/test/resources/server.csr
index 92e6d0b..d5627f0 100644
--- a/proton-j/src/test/resources/server.csr
+++ b/proton-j/src/test/resources/server.csr
@@ -1,13 +1,13 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICWjCCAhgCAQAwJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8wDQYDVQQKEwZTZXJ2ZXIwggG4MIIB

+MIICXDCCAhgCAQAwJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8wDQYDVQQKEwZTZXJ2ZXIwggG4MIIB

 LAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZ

 PY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7

 g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKB

 gQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgW

 E7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8G

-kotmXoB7VSVkAUw7/s9JKgOBhQACgYEA6DMTJ9SgEWMlqRkxCJQAljgx9Bo++lsYYaZJyDex1gaw

-upoM3Evgh2de4Fa8SJlcdrTVsxHcItEb2B76dt0EcsPy+hYB8ifRgkny7jW7GGYhZ0M/NC0zRTT/

-gk9rp6VeT2n0+s2ENB5Y6AWXhPBNbh5RE/BCkmC2jBp40gyFYnKgMDAuBgkqhkiG9w0BCQ4xITAf

-MB0GA1UdDgQWBBTzajKA7otk5qXujjMdim+mMBhaEjALBgcqhkjOOAQDBQADLwAwLAIUe/6CarVG

-IB2yNSH9EIso3vmJiuoCFEOFcHlZnVE6ttWis06H76IEaAtt
+kotmXoB7VSVkAUw7/s9JKgOBhQACgYEApWIVQIWDNP7ZLkbG3TG5gkBcnxiMAjkLidcbbluKib0l

+cV2hmSiPB6vUoAn8+pQ0TFON7kb/ua1GNJzHQ+bGVrN2M/S6us4k8n4JxaDxDXId/RYuH1GfByGT

+K9RH23TiJJ93s3GOQq6jXICJoqGHi6gRqx5a3awhjw3IJSD5xwWgMDAuBgkqhkiG9w0BCQ4xITAf

+MB0GA1UdDgQWBBQtdJmA+gUfL8ehraJHZaCOU01VajALBgcqhkjOOAQDBQADMQAwLgIVAICByJ7y

+GCZetO5ZxVT/DvSMk8HcAhUAjcNi5WJspzZNL/M5MtSl3DNAh+k=
 -----END NEW CERTIFICATE REQUEST-----