qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject [3/8] qpid-proton-j git commit: NO-JIRA: update test ssl certs/keystores to use RSA as some newer envs disable now disable DSA. Remove some unused files.
Date Fri, 13 Jul 2018 18:36:34 GMT
NO-JIRA: update test ssl certs/keystores to use RSA as some newer envs disable now disable DSA. Remove some unused files.

(cherry picked from commit 311af5e39f68c8c72cfd23c2e713460be9b60c63)


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/commit/d5201c8b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/d5201c8b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/d5201c8b

Branch: refs/heads/0.27.x
Commit: d5201c8b5c69316830cda47c11bdabbdaf11d945
Parents: 0cd77be
Author: Robbie Gemmell <robbie@apache.org>
Authored: Tue May 15 14:02:05 2018 +0100
Committer: Robbie Gemmell <robbie@apache.org>
Committed: Fri Jul 13 19:16:47 2018 +0100

----------------------------------------------------------------------
 proton-j/src/test/resources/README.txt          |  10 +-
 proton-j/src/test/resources/ca-certs.crt        |  60 +++++-----
 proton-j/src/test/resources/ca-jks.keystore     | Bin 1184 -> 2132 bytes
 proton-j/src/test/resources/ca.crt              |  30 ++---
 proton-j/src/test/resources/ca2-jks.keystore    | Bin 1198 -> 2148 bytes
 proton-j/src/test/resources/ca2.crt             |  30 ++---
 proton-j/src/test/resources/client-jks.keystore | Bin 2697 -> 3778 bytes
 .../src/test/resources/client-jks.truststore    | Bin 777 -> 843 bytes
 proton-j/src/test/resources/client.crt          |  32 +++---
 proton-j/src/test/resources/client.csr          |  25 ++--
 proton-j/src/test/resources/server-jks.keystore | Bin 2702 -> 3782 bytes
 .../src/test/resources/server-jks.truststore    | Bin 777 -> 843 bytes
 proton-j/src/test/resources/server.crt          |  32 +++---
 proton-j/src/test/resources/server.csr          |  25 ++--
 .../src/test/resources/server2-jks.keystore     | Bin 2737 -> 3820 bytes
 proton-j/src/test/resources/server2.crt         |  32 +++---
 proton-j/src/test/resources/server2.csr         |  25 ++--
 tests/python/proton_tests/ssl_db/README.txt     | 113 ++++++++++---------
 .../ssl_db/bad-server-certificate.p12           | Bin 1490 -> 0 bytes
 .../ssl_db/bad-server-certificate.pem           |  34 +++---
 .../ssl_db/bad-server-private-key.pem           |  45 +++++---
 .../proton_tests/ssl_db/bad-server.pkcs12       | Bin 1524 -> 2476 bytes
 .../proton_tests/ssl_db/ca-certificate.p12      | Bin 920 -> 0 bytes
 .../proton_tests/ssl_db/ca-certificate.pem      |  34 +++---
 tests/python/proton_tests/ssl_db/ca.pkcs12      | Bin 1500 -> 2452 bytes
 .../proton_tests/ssl_db/client-certificate.p12  | Bin 1554 -> 0 bytes
 .../proton_tests/ssl_db/client-certificate.pem  |  30 ++---
 .../proton_tests/ssl_db/client-certificate1.p12 | Bin 1612 -> 0 bytes
 .../proton_tests/ssl_db/client-certificate1.pem |  16 ---
 .../proton_tests/ssl_db/client-private-key.pem  |  45 +++++---
 .../proton_tests/ssl_db/client-private-key1.pem |  30 -----
 .../proton_tests/ssl_db/client-request.pem      |  25 ++--
 .../proton_tests/ssl_db/client-request1.pem     |  14 ---
 tests/python/proton_tests/ssl_db/client.pkcs12  | Bin 2975 -> 2492 bytes
 .../proton_tests/ssl_db/server-certificate.p12  | Bin 1562 -> 0 bytes
 .../proton_tests/ssl_db/server-certificate.pem  |  31 ++---
 .../proton_tests/ssl_db/server-private-key.pem  |  45 +++++---
 .../proton_tests/ssl_db/server-request.pem      |  26 +++--
 .../ssl_db/server-wc-certificate.p12            | Bin 1632 -> 0 bytes
 .../ssl_db/server-wc-certificate.pem            |  32 +++---
 .../ssl_db/server-wc-private-key.pem            |  64 +++++------
 .../proton_tests/ssl_db/server-wc-request.pem   |  28 +++--
 tests/python/proton_tests/ssl_db/server.pkcs12  | Bin 2979 -> 4883 bytes
 43 files changed, 472 insertions(+), 441 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/README.txt
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/README.txt b/proton-j/src/test/resources/README.txt
index 2cf3d9a..c06dc35 100644
--- a/proton-j/src/test/resources/README.txt
+++ b/proton-j/src/test/resources/README.txt
@@ -26,12 +26,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 server, and sign it with the CA:
 # ----------------------------------------------------------
-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 jks -keystore server-jks.keystore -storepass password -keypass password -alias server -genkey -keyalg "RSA" -keysize 2048 -dname "O=Server,CN=localhost" -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
@@ -45,7 +45,7 @@ keytool -storetype jks -keystore server-jks.truststore -storepass password -keyp
 
 # Create a key pair for a client, and sign it with the 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 jks -keystore client-jks.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 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
@@ -61,12 +61,12 @@ keytool -storetype jks -keystore client-jks.truststore -storepass password -keyp
 # Create a key and self-signed certificate for a second CA, to sign certificate requests and use for trust:
 # ---------------------------------------------------------------------------------------------------------
 
-keytool -storetype jks -keystore ca2-jks.keystore -storepass password -keypass password -alias ca2 -genkey -dname "O=My Other Trusted Inc.,CN=my-ca2.org" -validity 9999 -ext bc:c=ca:true
+keytool -storetype jks -keystore ca2-jks.keystore -storepass password -keypass password -alias ca2 -genkey -keyalg "RSA" -keysize 2048 -dname "O=My Other Trusted Inc.,CN=my-ca2.org" -validity 9999 -ext bc:c=ca:true
 keytool -storetype jks -keystore ca2-jks.keystore -storepass password -alias ca2 -exportcert -rfc > ca2.crt
 
 # Create a key pair for a second server, and sign it with the second CA:
 # ----------------------------------------------------------------------
-keytool -storetype jks -keystore server2-jks.keystore -storepass password -keypass password -alias server2 -genkey -dname "O=Server2,CN=localhost" -validity 9999 -ext bc=ca:false -ext eku=sA
+keytool -storetype jks -keystore server2-jks.keystore -storepass password -keypass password -alias server2 -genkey -keyalg "RSA" -keysize 2048 -dname "O=Server2,CN=localhost" -validity 9999 -ext bc=ca:false -ext eku=sA
 
 keytool -storetype jks -keystore server2-jks.keystore -storepass password -alias server2 -certreq -file server2.csr
 keytool -storetype jks -keystore ca2-jks.keystore -storepass password -alias ca2 -gencert -rfc -infile server2.csr -outfile server2.crt -validity 9999 -ext bc=ca:false -ext eku=sA

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/ca-certs.crt
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/ca-certs.crt b/proton-j/src/test/resources/ca-certs.crt
index a421a8a..cf4952a 100644
--- a/proton-j/src/test/resources/ca-certs.crt
+++ b/proton-j/src/test/resources/ca-certs.crt
@@ -1,30 +1,38 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+zQhBfafML5H+IRLhS2RnjA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/ca-jks.keystore
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/ca-jks.keystore b/proton-j/src/test/resources/ca-jks.keystore
index bae2937..768b068 100644
Binary files a/proton-j/src/test/resources/ca-jks.keystore and b/proton-j/src/test/resources/ca-jks.keystore differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/ca.crt
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/ca.crt b/proton-j/src/test/resources/ca.crt
index d02a66a..794d7b9 100644
--- a/proton-j/src/test/resources/ca.crt
+++ b/proton-j/src/test/resources/ca.crt
@@ -1,15 +1,19 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+zQhBfafML5H+IRLhS2RnjA==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/ca2-jks.keystore
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/ca2-jks.keystore b/proton-j/src/test/resources/ca2-jks.keystore
index 4a508e4..273f7c9 100644
Binary files a/proton-j/src/test/resources/ca2-jks.keystore and b/proton-j/src/test/resources/ca2-jks.keystore differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/ca2.crt
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/ca2.crt b/proton-j/src/test/resources/ca2.crt
index ef95296..34e6e7e 100644
--- a/proton-j/src/test/resources/ca2.crt
+++ b/proton-j/src/test/resources/ca2.crt
@@ -1,15 +1,19 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/client-jks.keystore
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/client-jks.keystore b/proton-j/src/test/resources/client-jks.keystore
index 02176af..a19f7e6 100644
Binary files a/proton-j/src/test/resources/client-jks.keystore and b/proton-j/src/test/resources/client-jks.keystore differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/client-jks.truststore
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/client-jks.truststore b/proton-j/src/test/resources/client-jks.truststore
index b74cc53..9549faa 100644
Binary files a/proton-j/src/test/resources/client-jks.truststore and b/proton-j/src/test/resources/client-jks.truststore differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/client.crt
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/client.crt b/proton-j/src/test/resources/client.crt
index c26b9c7..654b1ba 100644
--- a/proton-j/src/test/resources/client.crt
+++ b/proton-j/src/test/resources/client.crt
@@ -1,16 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIC7TCCAqugAwIBAgIEWdvavzALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTcwMzA2MTI1ODExWhcNNDQwNzIxMTI1ODExWjAi
-MQ8wDQYDVQQDEwZjbGllbnQxDzANBgNVBAoTBkNsaWVudDCCAbcwggEsBgcqhkjOOAQBMIIBHwKB
-gQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeB
-O4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1
-864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4
-V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyN
-KOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kq
-A4GEAAKBgCmBhJD4mAWKphx7fIVmOYXG03z/paV62ZHmEQKcyKJv7j+p+6qKDn8LyE1Mds1q+NQ8
-1LzVjUDXhG/E4oVLejibLn661iehxkvH/nm777i/uLUw+eYcCznQR79/0AvLZi5OLrUjCNylxNbG
-O20mFGsZpijml9e/mxLrTpjPv7oBo2IwYDAfBgNVHSMEGDAWgBSVRDzStu+35rBMjy1ByUvW2M3E
-bzAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB0GA1UdDgQWBBRr2LqMrg4a2jLTnG1p
-O/9oyRnNwjALBgcqhkjOOAQDBQADLwAwLAIUFEBOYevqy1GgRKstrMmACxyGLLQCFG6QkFbPWj4+
-akJvNzUlM+/KxRMr
+MIIDMDCCAhigAwIBAgIECod0kzANBgkqhkiG9w0BAQsFADAuMRIwEAYDVQQDEwlt
+eS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjAeFw0xODA1MTUxMDE2
+MDNaFw00NTA5MjkxMDE2MDNaMCIxDzANBgNVBAMTBmNsaWVudDEPMA0GA1UEChMG
+Q2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvTqWUY6JjZfU
+y+2old6gzIEfMcCfItCL8CAyHByYDmBCrSdp/zByhQjy9w5Ouf0a4CwSzsPcp2uX
+OoeVTWZNo/e1JNikK37yBnDThW5ylMnlejj7D3UukgWWUCEZhkyluc7aIqwqINLj
+H+i5OFREVEgoH4oT0QY198NSUzg2SLTpsOrQrHtnxgJibApB9UosKSrG74QMK/Ib
+EWpBJ4kVF/ihoKjP5qfrQGCCJ7MEWJeqNwGi97BPHu73dRzsw1lGJvLRIkM2zcz9
+7QQ/fuTWlSWnXke8bL/5BtfecBeO0mSsB3IUx/4yKvFTlmHvPud4GdYV2XPbKBfU
+IxV+AjjfgQIDAQABo2IwYDAfBgNVHSMEGDAWgBQAzBN+u+yOIKKY0JaZH0VCRFWD
+wTAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB0GA1UdDgQWBBQAsPBL
+4DlRDhICswrouxF+KfA03jANBgkqhkiG9w0BAQsFAAOCAQEADLkWWpmXcx91MsdI
++0cZX0yETZwEjM8pDbZXMfB1IBLZXScGOyZgyXMjWeaLM+jMJbG30RGrZ6LFBOh+
+ZOPoN55/M/qpJyvUKYJKPFVEAP6+fAcbIUyCyUua2u5UehexHVGhooqyB5xPAlCG
+gC42aBNOO+UfanZgfDawyVXrN6eMmq/TeH0uxhcvn5GgDPKyOfzYMmpJgzEWhV4E
+tMTdWCTApn1KM2tlFWI2KMN3FM+ZXE2hKEKuIDV0nY50WoafxVystECKAS6R0AyD
+XIiGN08ykKZqS6bo4eTJlm0LbXM8RLx4LuxoEEuRtpAe8/sb6XalmFDEQ3U9DFtW
+qm0c5w==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/client.csr
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/client.csr b/proton-j/src/test/resources/client.csr
index 134ccf1..385ca4f 100644
--- a/proton-j/src/test/resources/client.csr
+++ b/proton-j/src/test/resources/client.csr
@@ -1,13 +1,16 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICVjCCAhQCAQAwIjEPMA0GA1UEAxMGY2xpZW50MQ8wDQYDVQQKEwZDbGllbnQwggG3MIIBLAYH
-KoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZPY1Y
-+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7g/bT
-xR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKBgQD3
-4aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgWE7fP
-CTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8Gkotm
-XoB7VSVkAUw7/s9JKgOBhAACgYApgYSQ+JgFiqYce3yFZjmFxtN8/6WletmR5hECnMiib+4/qfuq
-ig5/C8hNTHbNavjUPNS81Y1A14RvxOKFS3o4my5+utYnocZLx/55u++4v7i1MPnmHAs50Ee/f9AL
-y2YuTi61IwjcpcTWxjttJhRrGaYo5pfXv5sS606Yz7+6AaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYD
-VR0OBBYEFGvYuoyuDhraMtOcbWk7/2jJGc3CMAsGByqGSM44BAMFAAMvADAsAhQ+g1kk3OMxUcsh
-YQvINa8DfG17kAIUMLAYIB4oan6o7aOWntIatUzARbU=
+MIIClzCCAX8CAQAwIjEPMA0GA1UEAxMGY2xpZW50MQ8wDQYDVQQKEwZDbGllbnQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9OpZRjomNl9TL7aiV3qDM
+gR8xwJ8i0IvwIDIcHJgOYEKtJ2n/MHKFCPL3Dk65/RrgLBLOw9yna5c6h5VNZk2j
+97Uk2KQrfvIGcNOFbnKUyeV6OPsPdS6SBZZQIRmGTKW5ztoirCog0uMf6Lk4VERU
+SCgfihPRBjX3w1JTODZItOmw6tCse2fGAmJsCkH1SiwpKsbvhAwr8hsRakEniRUX
++KGgqM/mp+tAYIInswRYl6o3AaL3sE8e7vd1HOzDWUYm8tEiQzbNzP3tBD9+5NaV
+JadeR7xsv/kG195wF47SZKwHchTH/jIq8VOWYe8+53gZ1hXZc9soF9QjFX4CON+B
+AgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBQAsPBL4DlRDhICswro
+uxF+KfA03jANBgkqhkiG9w0BAQsFAAOCAQEAMYOkByeymI/0iXz1R7XHuLDSTDrO
+cfeKPEX/eKQmZmyVoexyNgKi5hDe0DWbN67O6pw6DYl8l+UZe1EcHAWgb9jmDkIE
+HpfIot2j63WDPyXKFRKesfXOVuo25XFJsQnBRpxlW8LoMLvDn5Edhojb8OfBcKsa
+tnHsWkd/V1cmURnRs8WkMHeEiC7rgrLpdXkCswnnN/Z66Cxs/QuptH4VYg1w4Z3z
+fS5nAQYWxMHRJ/bK+52aHMFCfTL0Rhqny4A17JIVLHxXDJkwZJ/bIQM3m7fTMbRN
+J+Nmuvemq1VqqnJCVZpk9PVlvdF4x8mA12ZQ/2fTfhxqwTke2Nh6fjk8LQ==
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/server-jks.keystore
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/server-jks.keystore b/proton-j/src/test/resources/server-jks.keystore
index 0ab1a11..2b195f8 100644
Binary files a/proton-j/src/test/resources/server-jks.keystore and b/proton-j/src/test/resources/server-jks.keystore differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/server-jks.truststore
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/server-jks.truststore b/proton-j/src/test/resources/server-jks.truststore
index af03f7b..6e36fed 100644
Binary files a/proton-j/src/test/resources/server-jks.truststore and b/proton-j/src/test/resources/server-jks.truststore differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/server.crt
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/server.crt b/proton-j/src/test/resources/server.crt
index c23ef60..40cfccd 100644
--- a/proton-j/src/test/resources/server.crt
+++ b/proton-j/src/test/resources/server.crt
@@ -1,16 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIC8TCCAq+gAwIBAgIEE1JMmDALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJbXktY2Eub3JnMRgw
-FgYDVQQKEw9NeSBUcnVzdGVkIEluYy4wHhcNMTcwMzA2MTI1ODExWhcNNDQwNzIxMTI1ODExWjAl
-MRIwEAYDVQQDEwlsb2NhbGhvc3QxDzANBgNVBAoTBlNlcnZlcjCCAbgwggEsBgcqhkjOOAQBMIIB
-HwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tV
-bNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQTWhaR
-MvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yr
-XDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqL
-VHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+
-z0kqA4GFAAKBgQClYhVAhYM0/tkuRsbdMbmCQFyfGIwCOQuJ1xtuW4qJvSVxXaGZKI8Hq9SgCfz6
-lDRMU43uRv+5rUY0nMdD5sZWs3Yz9Lq6ziTyfgnFoPENch39Fi4fUZ8HIZMr1EfbdOIkn3ezcY5C
-rqNcgImioYeLqBGrHlrdrCGPDcglIPnHBaNiMGAwHwYDVR0jBBgwFoAUlUQ80rbvt+awTI8tQclL
-1tjNxG8wCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQULXSZgPoFHy/H
-oa2iR2WgjlNNVWowCwYHKoZIzjgEAwUAAy8AMCwCFARddUJUvvjMMtxApYEwijqq90e4AhQ2T4Yv
-Wan5XRDpMNdjmeQUKCe2Qw==
+MIIDMzCCAhugAwIBAgIEblhVmDANBgkqhkiG9w0BAQsFADAuMRIwEAYDVQQDEwlt
+eS1jYS5vcmcxGDAWBgNVBAoTD015IFRydXN0ZWQgSW5jLjAeFw0xODA1MTUxMDE2
+MDJaFw00NTA5MjkxMDE2MDJaMCUxEjAQBgNVBAMTCWxvY2FsaG9zdDEPMA0GA1UE
+ChMGU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn8rq6Gwe
+/pPwYxUrhr4yQj7JjAOd84Xq6CCHi9FHnsoKkFG2cebWEE23QF9jmgNCJIowGO0S
+trAnuZ/y5vrSpCmezs3vA0UJC/nuCf88zkU64ZoZc9Ez0o6swn4/svTYqvzXy1p5
+lckBFkwmT+kJfBSMcBCuSb7H47PmRagus2L1hX/Mrsks541E5zzHVULxbDvpvMkv
+LcW68C84WPLqzeKBW84GFEMiEpkJ7r/s6L3I/WN5olonkScYaE+KknTUTlnWJaMQ
+F278OjsQA4aBQR8RN5bs29bx3esjOWLrfPOzsphYFkk9wMA71GO95r8mwUY2w6V0
+ueeDMAKsxJ9giQIDAQABo2IwYDAfBgNVHSMEGDAWgBQAzBN+u+yOIKKY0JaZH0VC
+RFWDwTAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBR1
+YcXM1KMXIFDrN9cfRDe4hOaUqzANBgkqhkiG9w0BAQsFAAOCAQEAgCRR3cbj8Vsy
+Brm+I5xcB/cIhIIPoBb5of4FptOZ6xpIZsH029QtIJV3R+cSHnX3B8t/gVhvtp+J
+iATRjSinCpl0j7kPcmXJFzO0E7pGYBcDrYgsDE7+KdFERG5R94EsNk45VPhGb8ZV
+mOOoiFpo5HBLmSzqe9DD+ZBpJLxwLtI0xK5XMzFHBjfPADY8K1ESteuB+IhvKrml
+n/rAqVFP2es8PLa50Zpg/Y7S+5lxymDoPsbaWBr9wlXBNoBX/WyRqvLwqQ7wnlSj
+3xO7HjZatHmnmFRZMl8QOve0+4YKFamO1EUKDet8XzTcN8HKQTfMQ7RanQTa9g9Y
+WQHX5QSnLQ==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/server.csr
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/server.csr b/proton-j/src/test/resources/server.csr
index d5627f0..8f09b66 100644
--- a/proton-j/src/test/resources/server.csr
+++ b/proton-j/src/test/resources/server.csr
@@ -1,13 +1,16 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICXDCCAhgCAQAwJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8wDQYDVQQKEwZTZXJ2ZXIwggG4MIIB
-LAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZ
-PY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7
-g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKB
-gQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgW
-E7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8G
-kotmXoB7VSVkAUw7/s9JKgOBhQACgYEApWIVQIWDNP7ZLkbG3TG5gkBcnxiMAjkLidcbbluKib0l
-cV2hmSiPB6vUoAn8+pQ0TFON7kb/ua1GNJzHQ+bGVrN2M/S6us4k8n4JxaDxDXId/RYuH1GfByGT
-K9RH23TiJJ93s3GOQq6jXICJoqGHi6gRqx5a3awhjw3IJSD5xwWgMDAuBgkqhkiG9w0BCQ4xITAf
-MB0GA1UdDgQWBBQtdJmA+gUfL8ehraJHZaCOU01VajALBgcqhkjOOAQDBQADMQAwLgIVAICByJ7y
-GCZetO5ZxVT/DvSMk8HcAhUAjcNi5WJspzZNL/M5MtSl3DNAh+k=
+MIICmjCCAYICAQAwJTESMBAGA1UEAxMJbG9jYWxob3N0MQ8wDQYDVQQKEwZTZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfyurobB7+k/BjFSuG
+vjJCPsmMA53zheroIIeL0UeeygqQUbZx5tYQTbdAX2OaA0IkijAY7RK2sCe5n/Lm
++tKkKZ7Oze8DRQkL+e4J/zzORTrhmhlz0TPSjqzCfj+y9Niq/NfLWnmVyQEWTCZP
+6Ql8FIxwEK5Jvsfjs+ZFqC6zYvWFf8yuySznjUTnPMdVQvFsO+m8yS8txbrwLzhY
+8urN4oFbzgYUQyISmQnuv+zovcj9Y3miWieRJxhoT4qSdNROWdYloxAXbvw6OxAD
+hoFBHxE3luzb1vHd6yM5Yut887OymFgWST3AwDvUY73mvybBRjbDpXS554MwAqzE
+n2CJAgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBR1YcXM1KMXIFDr
+N9cfRDe4hOaUqzANBgkqhkiG9w0BAQsFAAOCAQEAIpAECl7B62VEKbtg2acfOsl3
+Dm/zzaV8Ovf1Wt3Z+YI+8Nj9NQpBMreJROoBLyiLxQu2J/tel2o+dJ2Jsix7KUhN
+w8iT+wc4b2bmtHPJbVzAFOqyxk57P7vZC2+MzlKpZnu9kP7lWZpByBFx7Vw5rz15
+lWQGdm6YMsVR+Blaufmr2McxLl+L6PkhoJTIwka7YgysgCEXnbLxH9VEOgtzJyUV
+vxrsj0ntbvzjdJpY0Pkt8DZDpd2OUDJnlcGpcPc6TBdUxykmxBTwCWdqEe1Ng5YR
+6+4HUNUxFdE1q5K3oLM6+iLPXiLLJGtXOd7Ika3OqidGvEZiPGkqLOWXqI1vKw==
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/server2-jks.keystore
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/server2-jks.keystore b/proton-j/src/test/resources/server2-jks.keystore
index 1b2b464..98de2f1 100644
Binary files a/proton-j/src/test/resources/server2-jks.keystore and b/proton-j/src/test/resources/server2-jks.keystore differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/server2.crt
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/server2.crt b/proton-j/src/test/resources/server2.crt
index f1e048a..28435e3 100644
--- a/proton-j/src/test/resources/server2.crt
+++ b/proton-j/src/test/resources/server2.crt
@@ -1,16 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIC+TCCAregAwIBAgIENihwHDALBgcqhkjOOAQDBQAwNTETMBEGA1UEAxMKbXktY2EyLm9yZzEe
-MBwGA1UEChMVTXkgT3RoZXIgVHJ1c3RlZCBJbmMuMB4XDTE3MDUwMjExMjg1N1oXDTQ0MDkxNjEx
-Mjg1N1owJjESMBAGA1UEAxMJbG9jYWxob3N0MRAwDgYDVQQKEwdTZXJ2ZXIyMIIBuDCCASwGByqG
-SM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/
-xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208Ue
-wwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+Gg
-hdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwky
-jMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6A
-e1UlZAFMO/7PSSoDgYUAAoGBAL1XjANsZoKVbgOyThbm+ivQD5cO+MNgFy+p9R1g6nh801PZKhy9
-bTGdMVSjdkvLBEGQ/AvojP0XMtZ/Iip1kyMXLmcpIJy6fQqDN8ln9fM/3o7j03PasGL5vT2ZHHmr
-HHr/kCIzMsZtW9tlSC+bV0OieWAJTVOsatXsKOPQNOppo2IwYDAfBgNVHSMEGDAWgBRd9ahmykmo
-PeJwBuiea6bFmzk88TAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBT5
-78CwItJ6T2MOMvCzLJyxs1OuPDALBgcqhkjOOAQDBQADLwAwLAIUBXUGqb6d+k+16JJ/8+Uc5Ywg
-RcQCFEK7yMXUh/1qPleBVPD8H7exPQEu
+MIIDOzCCAiOgAwIBAgIEGE/iwTANBgkqhkiG9w0BAQsFADA1MRMwEQYDVQQDEwpt
+eS1jYTIub3JnMR4wHAYDVQQKExVNeSBPdGhlciBUcnVzdGVkIEluYy4wHhcNMTgw
+NTE1MTAxNjA1WhcNNDUwOTI5MTAxNjA1WjAmMRIwEAYDVQQDEwlsb2NhbGhvc3Qx
+EDAOBgNVBAoTB1NlcnZlcjIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCc8unnIxYNO/GOHoOwQAC12zAlYjWeMMQ+l65Mvi57KYTqDjnxvFLtpyiplcGi
+BYkR7EZwJvStpQ8fhcSTGvjcHx9GXQ98NjIOE257dLnV8VgNtSdRcxDJlZZC4388
+0O/NQi4SwIutczhzn88DX268e0yikIXRgw2/zTSN5dNYVW1l1Iuq0YqYNJ+a+pH8
+50XWLUZ1HoT2uWtZKPG+wdPHWn0P3MyMJjldz/D5UtedO85yZzwGb82sVdmUmNiz
+PVbp2vVQmc2boT3ui1vQnODqhpdnDaFCM8EzfPMlCgM/3mfSqMZhfSCCQjuOLmy5
+3jyZfM4J2BD45kpxpdnr8E4FAgMBAAGjYjBgMB8GA1UdIwQYMBaAFCEE723VT3wH
+u0i6wgSuIfR/huhrMAkGA1UdEwQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFP4y1gxiy5uQKCqBJxAvakWF6XxVMA0GCSqGSIb3DQEBCwUAA4IBAQA4
+YiM+R2Pn3TUGuFiuNKEHaLSmvtGDQopevdr9WBDpEi4tOLzXPvk2GD8S7GXOChro
+L4AXPxCKoBBukFUN/U5MKrHQiOvOglHJtYO4k1UWyMsZQ4Bbv9JNqH/qPb3UtucO
+hlXj8R5LIiD3t+862lv3fAdRuoh8v8Tf3XNebwxtxmsG6oFW9v/kMVUQ7c02Oow1
+6pfkSPwASBzclwG2r2YmyfqRI6bB8OIEcTDLwnEfNGBFLyxfWlrbuD8P1Kxyub6v
+QXNOA1ptx05sXUzHNXDMGlhP43Y+TovTKGkcCNIt2SAbErzoT7OlHXdQSZkTqkkO
+meLAR/+VBd/7UgmzeMfs
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/proton-j/src/test/resources/server2.csr
----------------------------------------------------------------------
diff --git a/proton-j/src/test/resources/server2.csr b/proton-j/src/test/resources/server2.csr
index 81b7c29..32f7538 100644
--- a/proton-j/src/test/resources/server2.csr
+++ b/proton-j/src/test/resources/server2.csr
@@ -1,13 +1,16 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICWzCCAhkCAQAwJjESMBAGA1UEAxMJbG9jYWxob3N0MRAwDgYDVQQKEwdTZXJ2ZXIyMIIBuDCC
-ASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7
-WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E
-+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUC
-gYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6Ewo
-FhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWf
-BpKLZl6Ae1UlZAFMO/7PSSoDgYUAAoGBAL1XjANsZoKVbgOyThbm+ivQD5cO+MNgFy+p9R1g6nh8
-01PZKhy9bTGdMVSjdkvLBEGQ/AvojP0XMtZ/Iip1kyMXLmcpIJy6fQqDN8ln9fM/3o7j03PasGL5
-vT2ZHHmrHHr/kCIzMsZtW9tlSC+bV0OieWAJTVOsatXsKOPQNOppoDAwLgYJKoZIhvcNAQkOMSEw
-HzAdBgNVHQ4EFgQU+e/AsCLSek9jDjLwsyycsbNTrjwwCwYHKoZIzjgEAwUAAy8AMCwCFE/v8hqM
-qfBY4v/lSu7o2L+KQlR7AhQyx/fwp2yi4fCzGaJ7JLYQDgjCyQ==
+MIICmzCCAYMCAQAwJjESMBAGA1UEAxMJbG9jYWxob3N0MRAwDgYDVQQKEwdTZXJ2
+ZXIyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnPLp5yMWDTvxjh6D
+sEAAtdswJWI1njDEPpeuTL4ueymE6g458bxS7acoqZXBogWJEexGcCb0raUPH4XE
+kxr43B8fRl0PfDYyDhNue3S51fFYDbUnUXMQyZWWQuN/PNDvzUIuEsCLrXM4c5/P
+A19uvHtMopCF0YMNv800jeXTWFVtZdSLqtGKmDSfmvqR/OdF1i1GdR6E9rlrWSjx
+vsHTx1p9D9zMjCY5Xc/w+VLXnTvOcmc8Bm/NrFXZlJjYsz1W6dr1UJnNm6E97otb
+0Jzg6oaXZw2hQjPBM3zzJQoDP95n0qjGYX0ggkI7ji5sud48mXzOCdgQ+OZKcaXZ
+6/BOBQIDAQABoDAwLgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQU/jLWDGLLm5Ao
+KoEnEC9qRYXpfFUwDQYJKoZIhvcNAQELBQADggEBAGcN7K4GLMKRThtpkIPu5M8P
+DUr6QT1cCUlerjnYu+LHqFMLQyrfeoMPLXgGA+XxRO0zwRIGGZ3yf+S/8B00+bR9
+N6l2sxfmM3WEG6g47Pu4+wzeHdYXDVx8dM/nDMOME+5eABKzt4K8g2FZse6p06TR
+uAxu6HhLn51sHT5KVKLbZJ9MOemB9Uor3rGOc8hGq69rPifrQ+zXgzR7zumSkklt
+HP8it6fZcaaR32/5wHfnM3T1qIpPQtTa9VlaTAwcRvVzaKVvhC5CPB8UCuPvOLUy
+rRqH8+0rRXb9vjlLJeawm2PdwbEUH9D0l1lF60NWuBmMJE5al9R99FL5hDEoJZo=
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/README.txt
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/README.txt b/tests/python/proton_tests/ssl_db/README.txt
index f2ce482..1ed56a9 100644
--- a/tests/python/proton_tests/ssl_db/README.txt
+++ b/tests/python/proton_tests/ssl_db/README.txt
@@ -1,79 +1,82 @@
-The following certificate files are used by the SSL unit tests (ssl.py):
-
-ca-certificate.pem - contains the public certificate identifying a "trusted" Certificate
-Authority.  This certificate is used to sign the certificates that identify the SSL
-servers and clients run by the tests.
-
-client-certificate.pem - the public certificate used to identify the client.  Signed by
-the CA.
-
-client-private-key.pem - encrypted key used to create client-certificate.pem.  Password is
-"client-password"
-
-server-certificate.pem - the public certificate used to identify the server.  Signed by
-the CA.  The CommonName is "A1.Good.Server.domain.com", and is checked by some unit tests.
-
-server-private-key.pem - encrypted key used to create server-certificate.pem. Password is
-"server-password"
-
-bad-server-certificate.pem, bad-server-private-key.pem - a certificate/key that is not trusted by the client, for negative test.
-
-server-wc-certificate.pem and server-wc-private-key.pem - similar to
-server-certificate.pem and server-private-key.pem, but contains Subject Alternate Name
-entries, and a wildcard CommonName.  Used for certificate name checking tests.
-
-These certificates have been created using the OpenSSL tool.
-
-The following bash script can be used to create these certificates (requires keytool from Java 1.7, and openssl):
-
---8<--
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# The following certificate files are used by the SSL unit tests (ssl.py):
+#
+# ca-certificate.pem - contains the public certificate identifying a "trusted" Certificate
+# Authority.  This certificate is used to sign the certificates that identify the SSL
+# servers and clients run by the tests.
+#
+# client-certificate.pem - the public certificate used to identify the client.  Signed by
+# the CA.
+#
+# client-private-key.pem - encrypted key used to create client-certificate.pem.  Password is
+# "client-password"
+#
+# server-certificate.pem - the public certificate used to identify the server.  Signed by
+# the CA.  The CommonName is "A1.Good.Server.domain.com", and is checked by some unit tests.
+#
+# server-private-key.pem - encrypted key used to create server-certificate.pem. Password is
+# "server-password"
+#
+# bad-server-certificate.pem, bad-server-private-key.pem - a certificate/key that is not trusted by the client, for negative test.
+#
+# server-wc-certificate.pem and server-wc-private-key.pem - similar to
+# server-certificate.pem and server-private-key.pem, but contains Subject Alternate Name
+# entries, and a wildcard CommonName.  Used for certificate name checking tests.
+#
+# These certificates have been created using the OpenSSL tool.
+#
+# The following bash script can be used to create these certificates (requires keytool from Java 1.7, and openssl):
+#
+# --8<--
 #!/bin/bash
 #set -x
 
 rm -f *.pem *.pkcs12
 
 # Create a self-signed certificate for the CA, and a private key to sign certificate requests:
-keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -genkey -dname "O=Trust Me Inc.,CN=Trusted.CA.com" -validity 99999
+keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -genkey -keyalg "RSA" -keysize 2048 -dname "O=Trust Me Inc.,CN=Trusted.CA.com" -validity 99999
 openssl pkcs12 -nokeys -passin pass:ca-password -in ca.pkcs12 -passout pass:ca-password -out ca-certificate.pem
 
 # Create a certificate request for the server certificate.  Use the CA's certificate to sign it:
-keytool -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-certificate -keypass server-password -genkey  -dname "O=Server,CN=A1.Good.Server.domain.com" -validity 99999
+keytool -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-certificate -keypass server-password -genkey -keyalg "RSA" -keysize 2048 -dname "O=Server,CN=A1.Good.Server.domain.com" -validity 99999
 keytool -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-certificate -keypass server-password -certreq -file server-request.pem
 keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile server-request.pem -outfile server-certificate.pem
-openssl pkcs12 -nocerts -passin pass:server-password -in server.pkcs12 -passout pass:server-password -out server-private-key.pem
+openssl pkcs12 -nocerts -passin pass:server-password -in server.pkcs12 -passout pass:server-password | openssl pkcs8 -passin pass:server-password -traditional | openssl rsa -passout pass:server-password -out server-private-key.pem -des3
 
 # Create a certificate request for the client certificate.  Use the CA's certificate to sign it:
-keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate -keypass client-password -genkey  -dname "O=Client,CN=127.0.0.1" -validity 99999
+keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate -keypass client-password -genkey -keyalg "RSA" -keysize 2048 -dname "O=Client,CN=127.0.0.1" -validity 99999
 keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate -keypass client-password -certreq -file client-request.pem
 keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile client-request.pem -outfile client-certificate.pem
-openssl pkcs12 -nocerts -passin pass:client-password -in client.pkcs12 -passout pass:client-password -out client-private-key.pem
+openssl pkcs12 -nocerts -passin pass:client-password -in client.pkcs12 -passout pass:client-password | openssl pkcs8 -passin pass:client-password -traditional | openssl rsa -passout pass:client-password -out client-private-key.pem -des3
 
-# Create another client certificate with a different subject line
-keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate1 -keypass client-password -genkey  -dname "O=Client,CN=127.0.0.1,C=US,ST=ST,L=City,OU=Dev" -validity 99999
-keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate1 -keypass client-password -certreq -file client-request1.pem
-keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile client-request1.pem -outfile client-certificate1.pem
-openssl pkcs12 -nocerts -passin pass:client-password -in client.pkcs12 -passout pass:client-password -out client-private-key1.pem
 
 # Create a "bad" certificate - not signed by a trusted authority
-keytool -storetype pkcs12 -keystore bad-server.pkcs12 -storepass server-password -alias bad-server -keypass server-password -genkey -dname "O=Not Trusted Inc,CN=127.0.0.1" -validity 99999
-openssl pkcs12 -nocerts -passin pass:server-password -in bad-server.pkcs12 -passout pass:server-password -out bad-server-private-key.pem
+keytool -storetype pkcs12 -keystore bad-server.pkcs12 -storepass server-password -alias bad-server -keypass server-password -genkey -keyalg "RSA" -keysize 2048 -dname "O=Not Trusted Inc,CN=127.0.0.1" -validity 99999
+openssl pkcs12 -nocerts -passin pass:server-password -in bad-server.pkcs12 -passout pass:server-password | openssl pkcs8 -passin pass:server-password -traditional | openssl rsa -passout pass:server-password -out bad-server-private-key.pem -des3
 openssl pkcs12 -nokeys  -passin pass:server-password -in bad-server.pkcs12 -passout pass:server-password -out bad-server-certificate.pem
 
+
 # Create a server certificate with several alternate names, including a wildcarded common name:
-keytool -ext san=dns:alternate.name.one.com,dns:another.name.com -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-wc-certificate -keypass server-password -genkeypair -dname "O=Server,CN=*.prefix*.domain.com" -validity 99999
+keytool -ext san=dns:alternate.name.one.com,dns:another.name.com -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-wc-certificate -keypass server-password -genkey -keyalg "RSA" -keysize 2048 -dname "O=Server,CN=*.prefix*.domain.com" -validity 99999
 keytool -ext san=dns:alternate.name.one.com,dns:another.name.com -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-wc-certificate -keypass server-password -certreq -file server-wc-request.pem
 keytool -ext san=dns:alternate.name.one.com,dns:another.name.com  -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile server-wc-request.pem -outfile server-wc-certificate.pem
-openssl pkcs12 -nocerts -passin pass:server-password -in server.pkcs12 -passout pass:server-password -out server-wc-private-key.pem
+openssl pkcs12 -nocerts -passin pass:server-password -in server.pkcs12 -passout pass:server-password | openssl pkcs8 -passin pass:server-password -traditional | openssl rsa -passout pass:server-password -out server-wc-private-key.pem -des3
 
-# Create pkcs12 versions of the above certificates (for Windows SChannel)
-# The CA certificate store/DB is created without public keys.
-# Give the "p12" files the same base name so the tests can just change the extension to switch between platforms.
-# These certificates might work for OpenSSL <-> SChannel interop tests, but note that the DH cypher suite
-# overlap is poor between platforms especially for older Windows versions.  RSA certificates are better for
-# interop (or PFS-friendly certificates on newer platforms).
-openssl pkcs12 -export -out ca-certificate.p12 -in ca-certificate.pem -name ca-certificate -nokeys -passout pass:
-openssl pkcs12 -export -out server-certificate.p12 -passin pass:server-password -passout pass:server-password -inkey server-private-key.pem -in server-certificate.pem -name server-certificate
-openssl pkcs12 -export -out client-certificate.p12 -passin pass:client-password -passout pass:client-password -inkey client-private-key.pem -in client-certificate.pem -name client-certificate
-openssl pkcs12 -export -out client-certificate1.p12 -passin pass:client-password -passout pass:client-password -inkey client-private-key1.pem -in client-certificate1.pem -name client-certificate1
-openssl pkcs12 -export -out bad-server-certificate.p12 -passin pass:server-password -passout pass:server-password -inkey bad-server-private-key.pem -in bad-server-certificate.pem -name bad-server
-openssl pkcs12 -export -out server-wc-certificate.p12 -passin pass:server-password -passout pass:server-password -inkey server-wc-private-key.pem -in server-wc-certificate.pem -name server-wc-certificate

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/bad-server-certificate.p12
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/bad-server-certificate.p12 b/tests/python/proton_tests/ssl_db/bad-server-certificate.p12
deleted file mode 100644
index 6044350..0000000
Binary files a/tests/python/proton_tests/ssl_db/bad-server-certificate.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/bad-server-certificate.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/bad-server-certificate.pem b/tests/python/proton_tests/ssl_db/bad-server-certificate.pem
index 40be354..5bb1012 100644
--- a/tests/python/proton_tests/ssl_db/bad-server-certificate.pem
+++ b/tests/python/proton_tests/ssl_db/bad-server-certificate.pem
@@ -1,22 +1,24 @@
 Bag Attributes
     friendlyName: bad-server
-    localKeyID: 54 69 6D 65 20 31 33 36 33 37 39 34 34 32 34 36 30 34 
+    localKeyID: 54 69 6D 65 20 31 35 32 36 33 38 39 32 30 34 36 30 32 
 subject=/CN=127.0.0.1/O=Not Trusted Inc
 issuer=/CN=127.0.0.1/O=Not Trusted Inc
 -----BEGIN CERTIFICATE-----
-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
+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
+yw==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/bad-server-private-key.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/bad-server-private-key.pem b/tests/python/proton_tests/ssl_db/bad-server-private-key.pem
index 3cd8f71..c1902b5 100644
--- a/tests/python/proton_tests/ssl_db/bad-server-private-key.pem
+++ b/tests/python/proton_tests/ssl_db/bad-server-private-key.pem
@@ -1,19 +1,30 @@
-Bag Attributes
-    friendlyName: bad-server
-    localKeyID: 54 69 6D 65 20 31 33 36 33 37 39 34 34 32 34 36 30 34 
-Key Attributes: <No Attributes>
------BEGIN DSA PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,AB078D4A74BE8031
+DEK-Info: DES-EDE3-CBC,DBE28B4814932862
 
-iEW6u5kMfaX9SIynirmIQk6EvqrGjl8uhGC5k1UHBoQRnYUy/wrz9Ufcw4JLXXmo
-8CoX1JCwo/gvlqV3KSszujgkCvCndhlLoe5PwbhMsSSiruTkt9b70bOHxG5AHp/m
-sr/0cFgs+O1USt9IVmAXj6+ALndWfOBSVH7J40BTDHCGbizB/QRnAk6+VWW2tQRZ
-mU2xL1drY7n9bvF4O9faDe5C2C0v1+asswXnJmZnQVsTnA5+kwQok6uLfJjVWt7j
-WS9ME5nIJSOi/ZkIyr2cr4m4TPbPw/UB+funT1/OKg8iyMyUvjwV3fopjo/9Sz/S
-Tpt+sjUJelL7VBBkuppiZDHjPQ/g0IAc7+HEbc1or8h15AIiSWxEg/HRUtZqbsgC
-UyW+5qvKyYrPzZYkkJIeRLwkMEAU1sdmHBVutALc9xUyVR8jXJtXNu3V82NQ7otv
-pRlLpAs4Fn6SOIKAJvL6YdxgSiZFdta/Ory2VXqopJad+EEPPprf8ndk3Mv38l7M
-gIMQdZD8hhWaPw8zhXfhfnjz7ejPhtgQznkyzJPIFtbrq2HUZKuKpOBkCFfu/E4s
-k6PC6aW9pNGQW0PqdKuHPA==
------END DSA PRIVATE KEY-----
+Kx2Fu2XTm+g5n6cbFOBWKukR2BbovXUx+r818rOBj6uF1nRdG81wpH+mtENm8tIE
+BFEqYDahNBA5BEOm54PMMXLcL6h+qiqKDWk9kGgmOcLSsTyrVGTgzlU71itbi/JP
+foXmE65SMvVfiYFPbfYKmQ6WNWuJ3u6NTlCNmJKayl6QNDOrD2GDmdQ3kBsh/2Ka
+vs0Ps9xap57BXQ+I72LQ+C/JwFgeSXLD4tZnaeZ1fQnKf+bnUITCa1uEx2V+Or8r
+U6c12QL7EL/+a+zdfVOBdhzO1fRJ91foqLcvGFM0U6N8cqsvnWQNbsUH+OcoZsHa
+Mi4Kw1RtaKSD5VhN2LAXLAqckXE/npSOaPM9dJz3qpHqQy7wgBHZM1ILRt4DMpxw
+LOcG1EItSbdaw4hNEGL9ZOaPdYQiwj6qWlmbfi60GZ8bErHo6tFCCSzKpS84CzM8
+3VfYyoO4J/TmsibnxT0ONCt4VlvRj2Nu/c7fitoRG8fV48z+2uKl3txENiRcOW8X
++dp/EpUD1KVr+xjsAEGtYp2eS9E+M8VwsCWc15QbETw1LdMncOZwUqqG3mAy2Z8o
+yDBU9ZPdqIgDKxV/xlV2VBnEf0n0Veie2a2fHs9YOr3HzcPpWVvzMtCsjHFKmpMc
++A88yYIj2NWrUSjoyF4d7isC2qPYm0Ipu4GG79u4jX4BDpSewE9Rf5E12pehH8Gb
+32b/EmJFvvDAVmEp/B1ZPp8vbm9etuFkEHtZErdE1qgRp/F16PNdWa8yQZtI4Fxz
+ig990qbcZKZNw7H6GdIyYM9J6K9i4qUXAXQq0XFhfFv+HgTQa1uhSAZAGupwiSmg
+Pc1xwDYUTl04wYchICCbRQ2UIOorjAXuWJ66fMH2Xo3vEdREnkEm0uNDeXeHVZ8I
+LWRUR4ctVA3CX9zd3lELWK6w3UHBj0AlxSe/mn4p5wcvtsfkC+MjaPIXL9SyKZWm
+Y/2U5HgiQ4KnxPFNc/0XsGeZGjtBNoY42uHEc8ga9+9DQ+JxFj8CahU5NL+Vgq63
+ABPiUolpNW32zGt7tWJTdyUM2LLBGWPhGsbRCGsS1z+0HcmJ+XfZKxEL6hAWOIwO
+v9qU7agSyLoiM3JpE74Ez5WJdW94WAyUTs6hJEh5680NKFn0iUTVzNaNoZzhyMc8
+gs3tuCEriCz+585dgDEXAO04IIVLnVRlIEiGWXMk9vn+FNq6Trsop00WWjtQp8Gq
+OvKyOHi0qNm8hzy29nWVoi2r+QIS9IJO5KL36JLoo5K7/l+7fBhltMiCM54P6z2Z
+LQ2qdq3LZlcyxEN5P48SNRp4YR0H6XvELUNQGChzWKCKwSPlBNEW19dFC6bqgU4n
+Yp188wbIO5f0ECQsq9h0Wut3wtfJl2PAQ0AsnanSs2Ondm3N3XicQpEnc0DbAPxq
+tBcJ5pJXpBradWHqgjCA8S7tCNAi9eyHADw+9J+nDFNsW3+/Dd98EkQOQIilZ7Si
+p0Y8GugVqqN+NjDh7xFPvH527vz87tpbO3o7kseCf1EPF5dLb6XEovXcKZMXd7rQ
+kdRgTijRI5pEAgSdZxao9R9LDHWxNCIgZWpjSxflMfkfspUpI8DmkQ==
+-----END RSA PRIVATE KEY-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/bad-server.pkcs12
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/bad-server.pkcs12 b/tests/python/proton_tests/ssl_db/bad-server.pkcs12
index b5e0cbc..c73d723 100644
Binary files a/tests/python/proton_tests/ssl_db/bad-server.pkcs12 and b/tests/python/proton_tests/ssl_db/bad-server.pkcs12 differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/ca-certificate.p12
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/ca-certificate.p12 b/tests/python/proton_tests/ssl_db/ca-certificate.p12
deleted file mode 100644
index 539b278..0000000
Binary files a/tests/python/proton_tests/ssl_db/ca-certificate.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/ca-certificate.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/ca-certificate.pem b/tests/python/proton_tests/ssl_db/ca-certificate.pem
index ce545d8..8112ebc 100644
--- a/tests/python/proton_tests/ssl_db/ca-certificate.pem
+++ b/tests/python/proton_tests/ssl_db/ca-certificate.pem
@@ -1,22 +1,24 @@
 Bag Attributes
     friendlyName: ca
-    localKeyID: 54 69 6D 65 20 31 33 36 33 37 39 34 34 32 31 39 32 35 
+    localKeyID: 54 69 6D 65 20 31 35 32 36 33 38 39 32 30 30 35 39 34 
 subject=/CN=Trusted.CA.com/O=Trust Me Inc.
 issuer=/CN=Trusted.CA.com/O=Trust Me Inc.
 -----BEGIN CERTIFICATE-----
-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
+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
+i4qDiWJJWQ==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/ca.pkcs12
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/ca.pkcs12 b/tests/python/proton_tests/ssl_db/ca.pkcs12
index 4f69505..6d2c7b0 100644
Binary files a/tests/python/proton_tests/ssl_db/ca.pkcs12 and b/tests/python/proton_tests/ssl_db/ca.pkcs12 differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/client-certificate.p12
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/client-certificate.p12 b/tests/python/proton_tests/ssl_db/client-certificate.p12
deleted file mode 100644
index be820ed..0000000
Binary files a/tests/python/proton_tests/ssl_db/client-certificate.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/client-certificate.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/client-certificate.pem b/tests/python/proton_tests/ssl_db/client-certificate.pem
index ab70472..bcb1bae 100644
--- a/tests/python/proton_tests/ssl_db/client-certificate.pem
+++ b/tests/python/proton_tests/ssl_db/client-certificate.pem
@@ -1,15 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIC2DCCApSgAwIBAgIETM/4+TALBgcqhkjOOAQDBQAwMTEXMBUGA1UEAxMOVHJ1c3RlZC5DQS5j
-b20xFjAUBgNVBAoTDVRydXN0IE1lIEluYy4wIBcNMTMwMzIwMTU0NzA0WhgPMjI4NzAxMDIxNTQ3
-MDRaMCUxEjAQBgNVBAMTCTEyNy4wLjAuMTEPMA0GA1UEChMGQ2xpZW50MIIBuDCCASwGByqGSM44
-BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6
-MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1
-VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+Gghdab
-Pd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim
-4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1Ul
-ZAFMO/7PSSoDgYUAAoGBAPYvFAX9tcVv9T+rsbF3pD3++ji8PD6sPFmH5RQ8RyZXDzs5jdku4AVb
-BtmLp+swmQ/NnQRvoR6lLvfB5gOzykPU/LrtEELEbp1ScXqNwTQky2OkX7+YGSKnliWZm5v72rtt
-gGL9j+c/jKcDAj7Z+v2kHugbTuZ09AxXLQ9cPxWxo0IwQDAdBgNVHQ4EFgQUaLUIuA06KCstRynf
-6L6X8+A+/ygwHwYDVR0jBBgwFoAUqxC+jvigfpiR6M3fb6XppgGxFJYwCwYHKoZIzjgEAwUAAzEA
-MC4CFQCWcpy1LVRqK+Udtq4qCpIKDZwTdwIVAJS+GitAJeY2L1ltlgi+cpRLIgGU
+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
+P6OnrbVDhJLPnuR98QoXYe06NdQ7azkczYAFCw==
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/client-certificate1.p12
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/client-certificate1.p12 b/tests/python/proton_tests/ssl_db/client-certificate1.p12
deleted file mode 100644
index bb5c567..0000000
Binary files a/tests/python/proton_tests/ssl_db/client-certificate1.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/client-certificate1.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/client-certificate1.pem b/tests/python/proton_tests/ssl_db/client-certificate1.pem
deleted file mode 100644
index 9b136ac..0000000
--- a/tests/python/proton_tests/ssl_db/client-certificate1.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDDDCCAsqgAwIBAgIEGzO0QTALBgcqhkjOOAQDBQAwMTEXMBUGA1UEAxMOVHJ1c3RlZC5DQS5j
-b20xFjAUBgNVBAoTDVRydXN0IE1lIEluYy4wIBcNMTYwMTEzMjIxOTE4WhgPMjI4OTEwMjcyMjE5
-MThaMFwxDDAKBgNVBAsTA0RldjENMAsGA1UEBxMEQ2l0eTELMAkGA1UECBMCU1QxCzAJBgNVBAYT
-AlVTMRIwEAYDVQQDEwkxMjcuMC4wLjExDzANBgNVBAoTBkNsaWVudDCCAbcwggEsBgcqhkjOOAQB
-MIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2
-y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMCNVQT
-WhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3e
-y7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8
-FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQB
-TDv+z0kqA4GEAAKBgAsLC8PBAEzv2Vl4Ji1k3mVI49YzWsz6Yh/HPCjy1s9aueNRM0ZlhQWv3TIw
-gOcbIoUp10y4Rc4fsVIrjpoC4tmZCZmkimnoa+Lp0whDUlwWrEFZ971NqkQsmagfpuXVYeE4hB1Y
-OoETBpybd+liDaikymLWFqwd9XmuQlysEhWCo0IwQDAfBgNVHSMEGDAWgBSrEL6O+KB+mJHozd9v
-pemmAbEUljAdBgNVHQ4EFgQUBlPIzSsmgK6IwNtZitN/NrQEztMwCwYHKoZIzjgEAwUAAy8AMCwC
-FGxlMH0zwjoCJMfntSRAwxM+4JK7AhR6Y/CgFBrJCgDFAYkFH8ucHoii6w==
------END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/client-private-key.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/client-private-key.pem b/tests/python/proton_tests/ssl_db/client-private-key.pem
index 6be5166..1c10797 100644
--- a/tests/python/proton_tests/ssl_db/client-private-key.pem
+++ b/tests/python/proton_tests/ssl_db/client-private-key.pem
@@ -1,19 +1,30 @@
-Bag Attributes
-    friendlyName: client-certificate
-    localKeyID: 54 69 6D 65 20 31 33 36 33 37 39 34 34 32 33 34 36 33 
-Key Attributes: <No Attributes>
------BEGIN DSA PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,357362201C460FE9
+DEK-Info: DES-EDE3-CBC,99FF012C14440F48
 
-L7ubHRpBWVYpCicB5srjF7AFpTDN/faMbz9FuvFmA/8HBhwOrlbKau0ASoDqvGbq
-Gcx4BqXvNx22gJbu4S8224elyov7beI58VQ4/k1kJROa7Gyi84RpqxmdScCaYrNE
-2beGa+AshN2vgwtRzeUDHxjKj/vPlDjdBq3cT88W7zrfm7J2E4HuNtwTwQ+EhBh9
-c5P+yxOmF93AxQzywGQPkmhXfhSHkoUWX/7NNtdhL07m4CY8nWwrGfHm828/d20Y
-eaGhyuxiC9hN5mhSct0THIyLSTz6fm7sJLZzDM1poqEKVdZQyytfUkpzCjDik3em
-y1Pjymve8QcrWEN4SLO7V7J8Zkv2N9AjJt/XiZWAdn13Gj+qLs/DI//AtlthqntJ
-qH0rZeV0DPf6tKZmj3sTegOdmvv8hAVX/DkEwC9wkxhKU7xHmBzX+uMqIauL70GH
-F4w9dVGOCSFNFP3bwoDCotJbLHx/vMpu/1AMibXUnPVQkZaWf3xlmz7ufJZh3Vhq
-buAuLw6t2ji8wnpOfOOB9hm2cGBcPlw2s3AHiM66vhLgOvtKQbGxMTni6g/kya5u
-BuWOjFk54PyY1DM54VK0FHoBxcvMmLo5
------END DSA PRIVATE KEY-----
+bvc53Bqgr/UFc7PR4dQBoAa8oTCOfGXUZCLUaBCiRD1bhN6FbPXpzmdKHfIhl/8Q
+h6D5RvOH7HZ+ecFSRmRIJ0FReYomTcWp69W/8F3kJzjJDrjeISetVP8Cx3VSecLt
+SLgKrRyvmNJklqDRNFEDQ7i0g0rLRwUwy+7l1V14xN9gDcSSqD5TWUqn93GG+VRE
+kJsIb9NgT9DjR55V+vkXH3oAZ7Thqr2in6NZsPiuutcmm2qPKu6fQevap6ISroW6
+82/Q47BV+PE9MipX7G3B48x+wTrWsUcRZK5TZX5GTU3YcU8DGTdow/bp7WMckAc+
+l2c6B6PKaFff5qMAfSesI7wHGOP3O9YCOYZX2HHQT76xSikB0JY5d8fEe3Zuxesm
+tvOEjS2zsswC6CFwHLcEQm/rEgUQAZk86I/AAkwP1GuJ22tHt8iJFORcjucR4GVa
+cspeQ7f/wQksD0Lxu+jkC3v89Sqzk8tXD8gEc8YS1/I80M4yIflpUslTyKSMxjMH
+fpIMPKLF29jAvRctPt4mFNod+0IhTmIz891q8RBCkKTl4t3I/+IfVE2czrx/9YYw
+Ok5S1p4Jim/ivWCGi0tTQJNgJusJbrBVQ6lzF8sHMTLRJljEarahkMZQY4ETACE3
+19j/eZAWuORPVuRwt90oqzl7wdNH+6DPSrOvrWWBEfftFb1FIJv6bRhSG7q2HWOX
+sMNAtuwTQqvnfQ1pyYfWgpfQbgQltkFJqn1qeIH6pUh+L2JO3q3c66f5RtHGLJC5
+nT8Em9UpKNvpIRq5s7DhM1qcIYqhinmUBlvXyxeJuKFbztjiBLqVtlSet+TIBDbi
+uGFrp2FdpO9NMHRWkW9HMUu1qSGe1GVg8w7Mj6tHW0w5Ad52oU1gRQEgm9nLPnTy
+nw5wDzOaViRTWcwXMd67PjYVUyJAVEtiIlfn/12iG2FLCdvPYB7O0OICJpyvblnw
+tzP+ga6orEMbEHGLS6IRy5QJbw7htFxNQ6tiS0h71JAr4k8zbPTxKrERi3q+7m78
+OIo6BJT3bhVac7CrygNIdWF2UyK3FlTKBrNNDuxNUgdHu4ZZtq9wMmznWFGe4QFP
++EynerggeA7g8rtxw+YSb8B0AlIOipusyciZKkSsr1lD/hxhAiT4ci7pioorNB9t
+u8RTBe0XH6P/j/Incq/DUa3fHwKwKoL3cOWsR+zLv3rp1P9OpvUSNi3nB+j9Nu3I
+WEPS0TbJqz03KokvbTyQpgZ1CjlentQ5xoxEXQozlrR3zRNbFzJWeCqgm9VWe8Oj
+mGUlwRNE6c5OhnIFWmQ39I0BD7a4Uoy16YP0s4Xn2Oob4CjSiFMsYIOCU2d6ksZa
+euOY0gVQCn/+rYpBPy6svbVtBFDGHBV/D+mq2d3MYiefuwB7ZZilmdHyOP8RRsuE
+0wsfGvWbz6UWUVIrTe5p6baXKCVv0y/LuzBpoFzOfASfaQcLvau+ZF8yAsjkDNEQ
+HFjwHFUo5H78MIHe/4zv6qlGVoIFxrAKpjSkG/3oYFIK6BQV1hewc8mceu3rkTbS
+2DBkBVdgHAx39Jf47AIVYXL+pr5MQt5eXk2v8LnFFUcsCN2K5mdIxSw2mQeJ3mBE
+-----END RSA PRIVATE KEY-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/client-private-key1.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/client-private-key1.pem b/tests/python/proton_tests/ssl_db/client-private-key1.pem
deleted file mode 100644
index b847a30..0000000
--- a/tests/python/proton_tests/ssl_db/client-private-key1.pem
+++ /dev/null
@@ -1,30 +0,0 @@
-Bag Attributes
-    friendlyName: client-certificate1
-    localKeyID: 54 69 6D 65 20 31 34 35 32 37 32 33 35 33 33 32 36 32 
-Key Attributes: <No Attributes>
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBnjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIY3SXzWdZ9g8CAggA
-MBQGCCqGSIb3DQMHBAgNjO/Glke9hgSCAVgtzKi1oXuMXuv2D7H2Mn4OQIevpn7S
-WMvJmFSNiNvIAmKhJjPyaPKYYgCMALYi+mvFWfv/EaQuiovX45GTMrCFM4MdUuo0
-YCTEOB8ehrHEoyy76U61wN+EfdEYlS3/KfnbdnhHD342jdV+yO5T5pgpacu+5Inz
-IzvcBrGFehqTI9fq3Zkl1dOEpfrfahrO/8rq+UZQzqjIaiWi6irSFihQNsvVKUkd
-TLUDmSX591+dUblMlH8g/V3pY9EAEjdxGuY2mEqEe/B2WH74s3xyOb0UljkC6AmE
-MYGGXR8XK1RYrKQp3SwUMlisz72JhrfzvUlYEMRuclNKNNjyEPBO85iXLPFmSNQ5
-4H/N/P3lO6WXny1Ea46kc5+ulC2CQkvetZhWcOtHvf4WRVt6wx2xQDhZwcUM7zDk
-uUV8pFqT1iUmx8k4Zasp1hNi0zSLnf3mKVPF3EFDTbU8qQ==
------END ENCRYPTED PRIVATE KEY-----
-Bag Attributes
-    friendlyName: client-certificate
-    localKeyID: 54 69 6D 65 20 31 33 36 33 37 39 34 34 32 33 34 36 33 
-Key Attributes: <No Attributes>
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBljBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIFcxTKG24KKICAggA
-MBQGCCqGSIb3DQMHBAh/2ViSC9U9qQSCAVCM9V+dw+CnGKguFH5LYpCtoepRaDvC
-yTsGPmmJOh+wDObU8U+4kEYdGLCJgqblXWJEt9uAVOwg3EK30mSCT33N/VIbSbgv
-LadI7WjqtMKU5xJGscb71uGUdmiJrXLtp/1TnwNZM48QGpzuj+Eegn7j3BRX7bSS
-EwrUxqSm67ahi1/R2driAuZQxdvotBQNUq7ADZQVAISKMhblJs3Z7mX4EBxveS/f
-YIwDQ+ZfBfOnEhSNFxk6/zIxWqA0/3gFY2/M1uI3TvXuuOHags6+QuHHnpgrV7J+
-1Oaq5cAD1OlGd/fqerTxRdIUQMVixFVqMYZUEnqeiWOY/CxkynHh7MUT1/LaUN2d
-7QVvpVXHvTvG4BPlApxIVV4/LoeYd4+jEkr/w7sq0msuMRP1qu1aNnl4XRtrvFOY
-hDpaYO/Lp7tv9r9geUszmWvlqkHm2nPocJo=
------END ENCRYPTED PRIVATE KEY-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/client-request.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/client-request.pem b/tests/python/proton_tests/ssl_db/client-request.pem
index 9aa3c00..6bc7bab 100644
--- a/tests/python/proton_tests/ssl_db/client-request.pem
+++ b/tests/python/proton_tests/ssl_db/client-request.pem
@@ -1,13 +1,16 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICWjCCAhgCAQAwJTESMBAGA1UEAxMJMTI3LjAuMC4xMQ8wDQYDVQQKEwZDbGllbnQwggG4MIIB
-LAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZ
-PY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7
-g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKB
-gQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgW
-E7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8G
-kotmXoB7VSVkAUw7/s9JKgOBhQACgYEA9i8UBf21xW/1P6uxsXekPf76OLw8Pqw8WYflFDxHJlcP
-OzmN2S7gBVsG2Yun6zCZD82dBG+hHqUu98HmA7PKQ9T8uu0QQsRunVJxeo3BNCTLY6Rfv5gZIqeW
-JZmbm/vau22AYv2P5z+MpwMCPtn6/aQe6BtO5nT0DFctD1w/FbGgMDAuBgkqhkiG9w0BCQ4xITAf
-MB0GA1UdDgQWBBRotQi4DTooKy1HKd/ovpfz4D7/KDALBgcqhkjOOAQDBQADLwAwLAIUWRqolXje
-1mMzoode9hn5ngboHpsCFBIGJt8s5WYcW3j4JVCaoqUypJB/
+MIICmjCCAYICAQAwJTESMBAGA1UEAxMJMTI3LjAuMC4xMQ8wDQYDVQQKEwZDbGll
+bnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDC57pCUvoxkI72krvb
+i5fzApvzlqgMM69IfUGSWUgNKZCWSEbOqNSSOm8Dkim/6VfpmnekYIDHaC6vpPvN
+Fw/0GHjeb0wEwYp3d/EE+3+8NXNgsH8y5PWiomWGamJ3BZLduL0NstR3H3lV2vWg
+h2IyniEC4yK3EaTwvdXnQuRSFY+pupL0CGEqNrg9ld0xZyfRbM8badSnAnRo2fmz
+aXB3IstLxT7E8X7nTAfwGP/Ovv+TeYuIsoL7smpUzCkvL2GmZQYFRzDv2lR01yVa
+VgG3O+NzdSKCAXm7r1tQHYFZZSYohJNzdNjZ0WyUzJQWMOV5OikqM5SI8hgF/bZg
+a/O/AgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBR3w5uIEdELrL78
+IkRd08bGSQZwyDANBgkqhkiG9w0BAQsFAAOCAQEAfUFQcUF1L9bxHEMkJFYIO8+J
+2sFme1f3egAUmGKSVbhHRmtWpxPkDE0E3s60vAVUKomHQUDb7mKYy+Z3EzHpsFfb
+bTmacESu+5YmK2jUCSEeorb9iivaTdGaliDX7EFBr3L5g9AX08+HAII8ZgwYMfox
+7N6RV6gs624LE+e6iF1uxFY3VV/3q4UT2sbmGpJNQVA9L/kD5n2xHiAPlc84zMXy
+F4jh48+w5Cz7wn4ezgUXckFbQi2dK3KkRiXnKzb8cWvRTXpyV0O1z2CCHTLkq+XX
+5TQ4tfwgBq2w6htLn3S9TaUt5phw04qp73/7Dx40BusVGKO4ccOXII4A/FT2dA==
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/client-request1.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/client-request1.pem b/tests/python/proton_tests/ssl_db/client-request1.pem
deleted file mode 100644
index 2bafb09..0000000
--- a/tests/python/proton_tests/ssl_db/client-request1.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN NEW CERTIFICATE REQUEST-----
-MIICkDCCAk4CAQAwXDEMMAoGA1UECxMDRGV2MQ0wCwYDVQQHEwRDaXR5MQswCQYDVQQIEwJTVDEL
-MAkGA1UEBhMCVVMxEjAQBgNVBAMTCTEyNy4wLjAuMTEPMA0GA1UEChMGQ2xpZW50MIIBtzCCASwG
-ByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2N
-WPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P2
-08UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA
-9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3
-zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKL
-Zl6Ae1UlZAFMO/7PSSoDgYQAAoGACwsLw8EATO/ZWXgmLWTeZUjj1jNazPpiH8c8KPLWz1q541Ez
-RmWFBa/dMjCA5xsihSnXTLhFzh+xUiuOmgLi2ZkJmaSKaehr4unTCENSXBasQVn3vU2qRCyZqB+m
-5dVh4TiEHVg6gRMGnJt36WINqKTKYtYWrB31ea5CXKwSFYKgMDAuBgkqhkiG9w0BCQ4xITAfMB0G
-A1UdDgQWBBQGU8jNKyaArojA21mK0382tATO0zALBgcqhkjOOAQDBQADLwAwLAIUIH29x1jT3akD
-Y1rLTr6o5z5c++cCFAG+rzzJYzmBAhwTQsKtoQPtVCwA
------END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/client.pkcs12
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/client.pkcs12 b/tests/python/proton_tests/ssl_db/client.pkcs12
index 87d6690..499d2a6 100644
Binary files a/tests/python/proton_tests/ssl_db/client.pkcs12 and b/tests/python/proton_tests/ssl_db/client.pkcs12 differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/server-certificate.p12
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/server-certificate.p12 b/tests/python/proton_tests/ssl_db/server-certificate.p12
deleted file mode 100644
index d470366..0000000
Binary files a/tests/python/proton_tests/ssl_db/server-certificate.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/server-certificate.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/server-certificate.pem b/tests/python/proton_tests/ssl_db/server-certificate.pem
index 512055f..90610b8 100644
--- a/tests/python/proton_tests/ssl_db/server-certificate.pem
+++ b/tests/python/proton_tests/ssl_db/server-certificate.pem
@@ -1,16 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIC5TCCAqOgAwIBAgIEGK67vDALBgcqhkjOOAQDBQAwMTEXMBUGA1UEAxMOVHJ1c3RlZC5DQS5j
-b20xFjAUBgNVBAoTDVRydXN0IE1lIEluYy4wIBcNMTMwMzIwMTU0NzAzWhgPMjI4NzAxMDIxNTQ3
-MDNaMDUxIjAgBgNVBAMTGUExLkdvb2QuU2VydmVyLmRvbWFpbi5jb20xDzANBgNVBAoTBlNlcnZl
-cjCCAbcwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEm
-aUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX
-58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLr
-hAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0
-SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJ
-qIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqA4GEAAKBgGd51fWwKIVM6wIsVk0vo86Hq3q2gxlP0STl
-/EzEBew9buSMXPCqQvQIhw/Ud6/f/Q0KxctPn8MqO++jCCSYMYH5d1ME85X9QM2mh4/xejYWQdUl
-qJKkHPo6MbLgEfQY7UxXxMq9Ekij/T6MyS1Rd9xwCCf2wJhjV6Jq35KplnWMo0IwQDAdBgNVHQ4E
-FgQUlZgov7xbp4kcuwMI7d7AAz4DH8YwHwYDVR0jBBgwFoAUqxC+jvigfpiR6M3fb6XppgGxFJYw
-CwYHKoZIzjgEAwUAAy8AMCwCFBTG8MXcRKCTW6gBKIjp23BGWJfIAhRLFMZ4oYLsdCImFOl7/Hi3
-NdK9cw==
+MIIDKDCCAhCgAwIBAgIESje6FTANBgkqhkiG9w0BAQsFADAxMRcwFQYDVQQDEw5U
+cnVzdGVkLkNBLmNvbTEWMBQGA1UEChMNVHJ1c3QgTWUgSW5jLjAgFw0xODA1MTUx
+MzAwMDJaGA8yMjkyMDIyNzEzMDAwMlowNTEiMCAGA1UEAxMZQTEuR29vZC5TZXJ2
+ZXIuZG9tYWluLmNvbTEPMA0GA1UEChMGU2VydmVyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtT6S8y4Psjgi1rOtiLWn0kV1nHwz7+KBAJZ4XDNgTPIs
+ILM28w0jdVSxjlW8bSUDx1fzn5SRlKcrfwpGu/AZUCf8BnjHk0XLygQhOG3AL5jj
+aL8jEin9OZkbhleJZKHFjlyYSB0jGYlH6pnAayHBjss9myQ6FfyDv/WNbWnd63Hc
+FFMIT5kiQkr7uP7KolmHf//HP/ub8RikZC8HM6SWCYwV3PJNccVxKCaa0XnVKQxR
+MDdjgnKsU7GLlnnZ28kizV8EfbBYUuweQVKCJcjURyUCWq1kIeEEcOCR70srMPRY
+/I6h7JvBJ09mIJLUvBCPLzRUm1bzWTSdkUCzzs2kIQIDAQABo0IwQDAfBgNVHSME
+GDAWgBT5SJSRbV1Igv3/DxLuJYqWVY4NkjAdBgNVHQ4EFgQUSjOXu76A+vNFIDuQ
+d3XJq5SIMJ0wDQYJKoZIhvcNAQELBQADggEBAB3gJAYsnqDkofIxnhCUmcFTr+Zv
+06pncMIovRrZ+Yrmt2FkOq8vvsIlQHqGIqbsV7aUuo7AFDccCn7DYeUXUxPq5lYn
+b4L6HqBlWUZLcAmDZEKhkKhhCZhYUKdScJvVe3yFlvQ2sKZCxyVpdIbK8faf4XYA
+o4inqPnAYMSiPjINF49aqiNfdwoRDaTifCM4kx7Q8uMFzopM6gn/gn1fIFFHzigF
+2cH0p5NomV9FvW1ULE3099PK6YDVZUchmxYD0YvrD3wc+3REWja805dCm31hHxBf
+YVM6TQGjx8XR9d8UpVxdyYe5h9EZxtUG9dAaUgY6j2k2JIKImEN8bV9jf0k=
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/server-private-key.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/server-private-key.pem b/tests/python/proton_tests/ssl_db/server-private-key.pem
index e4b4f5e..9f84b6e 100644
--- a/tests/python/proton_tests/ssl_db/server-private-key.pem
+++ b/tests/python/proton_tests/ssl_db/server-private-key.pem
@@ -1,19 +1,30 @@
-Bag Attributes
-    friendlyName: server-certificate
-    localKeyID: 54 69 6D 65 20 31 33 36 33 37 39 34 34 32 32 33 34 35 
-Key Attributes: <No Attributes>
------BEGIN DSA PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,58EA06E340D4B8FB
+DEK-Info: DES-EDE3-CBC,DF72D4DE94DF50AE
 
-cYo9OeXX1j8HazOZUVLCLaA5hbVd92OY5JufYXXzJsyfoBSWsH2IPIWw6oolJfD/
-Nd53xpl3gW5AuVk6gZkfV/qUQeymTJPtQUPjfgEEK50s7PCj5GKNL63/SOVVYudc
-HOczB9wb5VrVstKBdPe5SkxtOoMGka76uXDAaApezpHcwxFKyzmixevc8f7/3Q7q
-02TCaufgzAKYzO9sjY/U8nR0qvn1Cnx/AO8Lwt0K3mEExqCR0R7yyW1GwRRiMdDe
-x7QnYosHScSao7f1ToMLYPGdtMSUWBt1m10hrcPaCzvH5Zqy7w+wqQp5mG8dHp7o
-v767dWezeY1k8RpKiTZHlKZCksfqWr3TSgICOcFZrrQbxsCjIlpSW+65uhrDtUN1
-CqJmTzeUeRFBKGGdBMe+I1gUxsVohHyQzxyxUMwmu3fQQipSsvEyjq2O3CxaoPyi
-bbvbmvhdHGhjOQXeSJpZ8QsKRCUbeQQbaEzD6cGZv/VVzgYZfbEFz3xAb+nqVeKA
-JftTQeful80+cpUNalFMY7ozhbXznLwKGB4X5EnC5COLhJJdXOTEx9F0ASwvdi1p
-hvNdZ1wiRQvyvLyhvI2wQw==
------END DSA PRIVATE KEY-----
+X2sLL0bVFaIisap4RDFLdeqTPf69sSXwRyB0blEcJLIt8RdZqMWx+n8h7ETvfvYK
+Z9GHurQuHVAP1eoXVdi+Cv+stY7CbBO0pakwpLzZOeXfHIDeNlUhTRvwoubiqpdW
+pkBWwLTf5LRw3mhnxzJjTpLruEB6oMJ49ODZ07pD+sLUTZX/uPZ2k79DCN/0zZyR
+9qfRZ7mRNb1isJg7ca5YXM4hcr/zzJoN5Q/NxX7U1TT3zlRCjQhHOYdQ6GYCqElO
+jQ+spUBdbFfcL7cFAMebznkUoDoAM1jWtSnWvU05EjeeMFnOldSfVK4Or8ZAApPq
+PbcGTtUg4j9sNkms3TLY10C+cOPqeWz28hKCs6QrBVZ0SvSSFtKwlptYFoHbct0u
+BSeDSkLDizkM8xIqhjxyIPKyebsd0bQMDML5Wv9yaslb5C+/JePFANVYQBQh07nM
+wWZRsGTUh/nyPLKe97VdZ1s9qx9Bwx/kJjiFBvPVf3JtNTrvHhj8DQ5owxmPHN9b
+JclWRy1GmXojunHpKOOJo9j4WA3hPtJp9pZrbvRgwRUGZZCdo0gWVP/xU2UWKg6j
+WK3WOu2/1d/19yxAJovffuUMkFEEiZcVW2tFMJpikUzfgIB0GJbrsXdUOowsaZxZ
+Foy+JhTnv0gZxZd20tEqZKcUbK06iMkniYhemnGpYDFeni0PSp5MJIFoRcm39/pr
+5j7UiCTRKPScQymcf5KD26wINuDrstd3qPyTTHExEGrhOi0hhOom0W0ZdQi4qjVy
+0bielQfvihvjxLbg9xuqjBUdp+vM0LBYkPRRSFWVlAolJkCNmwV4+ytGTMAuSVVz
+U/wjrzaO3+jg/h+abFqL4oCGn5FzpKYT4/fH4nSMQtDbRSV4yC9gOgY55G9RU5HH
+UHdoEm/0XiYvZw4ksYMuTb6lmDtz5GoXRyVOQhCIy/skA1i0nBSVXfbSC7TELiDT
+0V1nucTciHogOHVs1GmKyLjU+h+ObsrQk/SYVUT/QQg/9NejUn8yvyyuihp56i8E
+ro6BaQc7lKi0zH/10kKCnRBKtOD65e8qo0gi2djMjHvUrOjoPAnM7/x57evhExjC
+tx3PdHXwTRVFL4jRxAWCyvkOSI+a3Jd1WrqHWmitF6Fquihb4ZQfv9/UNWwpGwwY
+HofYyIOOZsk0BhMYtIP6yPnelEbn9xthQyl/rhKX6pQKECqdPybChPMVGuzEh36+
+uJ+7UIICgFzTi87sn7Sqx/quKikJ1OjkAHAyHlp5gTAaFdFS2pmX3FGGUkgVWwoB
+VYEqs41MZDleGmQcnT6Pu3yjyc/wKQod1v9ZcLAJlHK+t0oD9h8PDoytMx+JHChz
+bneICKeJzLM331BCNj3pPgMtJ5BtmVX4SftXu0+d8kPI8MTybXY/JJK/8FdRxceu
+r/fTtN/vVtLwyDSDYEBnO11Ogb0x8g8KZrkyy2TeWHu69PHAyHaY+4wGpN0lZLxv
+McUl++zZy2NO3uxGyPME5rIEe4lGoD49oWJLGxkE/yZv85uluYSx9Ymn9dlxLJsl
+ZrTtXaZmv+762e+B/4tFmsOL15izQTR8K3RHB+/KS7fpycRl7/uJ2QnzrRycOoKs
+-----END RSA PRIVATE KEY-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/server-request.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/server-request.pem b/tests/python/proton_tests/ssl_db/server-request.pem
index 2077425..5b77c8d 100644
--- a/tests/python/proton_tests/ssl_db/server-request.pem
+++ b/tests/python/proton_tests/ssl_db/server-request.pem
@@ -1,13 +1,17 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICajCCAicCAQAwNTEiMCAGA1UEAxMZQTEuR29vZC5TZXJ2ZXIuZG9tYWluLmNvbTEPMA0GA1UE
-ChMGU2VydmVyMIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9E
-AMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up
-1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUj
-C8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZ
-T+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7
-zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAZ3nV9bAohUzrAixWTS+jzoer
-eraDGU/RJOX8TMQF7D1u5Ixc8KpC9AiHD9R3r9/9DQrFy0+fwyo776MIJJgxgfl3UwTzlf1AzaaH
-j/F6NhZB1SWokqQc+joxsuAR9BjtTFfEyr0SSKP9PozJLVF33HAIJ/bAmGNXomrfkqmWdYygMDAu
-BgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBSVmCi/vFuniRy7Awjt3sADPgMfxjALBgcqhkjOOAQD
-BQADMAAwLQIUH7G2vQMVP1JURjsKcruCMMN2Nv8CFQCL3mjZX5zQE68aBdaL6163zvWMSQ==
+MIICqjCCAZICAQAwNTEiMCAGA1UEAxMZQTEuR29vZC5TZXJ2ZXIuZG9tYWluLmNv
+bTEPMA0GA1UEChMGU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAtT6S8y4Psjgi1rOtiLWn0kV1nHwz7+KBAJZ4XDNgTPIsILM28w0jdVSxjlW8
+bSUDx1fzn5SRlKcrfwpGu/AZUCf8BnjHk0XLygQhOG3AL5jjaL8jEin9OZkbhleJ
+ZKHFjlyYSB0jGYlH6pnAayHBjss9myQ6FfyDv/WNbWnd63HcFFMIT5kiQkr7uP7K
+olmHf//HP/ub8RikZC8HM6SWCYwV3PJNccVxKCaa0XnVKQxRMDdjgnKsU7GLlnnZ
+28kizV8EfbBYUuweQVKCJcjURyUCWq1kIeEEcOCR70srMPRY/I6h7JvBJ09mIJLU
+vBCPLzRUm1bzWTSdkUCzzs2kIQIDAQABoDAwLgYJKoZIhvcNAQkOMSEwHzAdBgNV
+HQ4EFgQUSjOXu76A+vNFIDuQd3XJq5SIMJ0wDQYJKoZIhvcNAQELBQADggEBAJVJ
+ASm+owKZyT1967UGNRyyDeNYQaY/JevJpnkaR8bTP0qQsnEaRLIp/FoaSKJavCXX
+joXmp1YDtTUAzQTi5C1hoE5bau6hDu1zIbScl0P/l08TUI8qejfyqz6hRT+0WYd0
+R5gTE4RL+NAbLav8Mawp3LY6a0CEC7uDPQ82IKlPTFtTo/+lGQTbK/FzXtKALtEG
+HTll3Ja524s3jFI25mA5M+ibQcAXWZme4TeKu5TKp1rbTBHIoRLiVbFtZssP/PtR
+mLse+qtFgAptY3OlNQLNtxDOLfKIqqK2H1NCl5G7WFQIt8bMRRmOqoPwp1R5WvMS
+sR8txaYf3tL2mJ0Irgo=
 -----END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/server-wc-certificate.p12
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/server-wc-certificate.p12 b/tests/python/proton_tests/ssl_db/server-wc-certificate.p12
deleted file mode 100644
index d512f52..0000000
Binary files a/tests/python/proton_tests/ssl_db/server-wc-certificate.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/server-wc-certificate.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/server-wc-certificate.pem b/tests/python/proton_tests/ssl_db/server-wc-certificate.pem
index 46db5db..a0327d5 100644
--- a/tests/python/proton_tests/ssl_db/server-wc-certificate.pem
+++ b/tests/python/proton_tests/ssl_db/server-wc-certificate.pem
@@ -1,16 +1,20 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIDWDCCAkCgAwIBAgIEBA+xNzANBgkqhkiG9w0BAQsFADAxMRcwFQYDVQQDEw5U
+cnVzdGVkLkNBLmNvbTEWMBQGA1UEChMNVHJ1c3QgTWUgSW5jLjAgFw0xODA1MTUx
+MzAwMDZaGA8yMjkyMDIyNzEzMDAwNlowMDEdMBsGA1UEAwwUKi5wcmVmaXgqLmRv
+bWFpbi5jb20xDzANBgNVBAoTBlNlcnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKYjqr9jAHmoh81I/H1ueeEsApobx6adsctB/hL5viZDf9b7d4gg
++VkrvYjDBqVtwYLIcSNPT+N9FUnpITOXFCIblMFw4gdxa2FLr1t0iRdOY5S8Epeu
+BLng9s85Pc2A9h0xmFZoAh4MWmUfHikkp59Ymq82kDsZN10oKqqZbu3E83urJpwp
+udvcArfSKiBqvYe8SeAHgtHQyVGvo244+75eGCjSe6HketK03KnPD3DTjCOeMU7h
+pIZBqSTj8S3we0q+WUKwuUK6TRaLP9tGvBUnpsfuWq+98fv4PCgOrA6FdZJKJIDk
+8LhwWcC/VaM5wD8A8ToQgou1mLhuBlsROQECAwEAAaN3MHUwHwYDVR0jBBgwFoAU
++UiUkW1dSIL9/w8S7iWKllWODZIwMwYDVR0RBCwwKoIWYWx0ZXJuYXRlLm5hbWUu
+b25lLmNvbYIQYW5vdGhlci5uYW1lLmNvbTAdBgNVHQ4EFgQUAUUqKVf+qRvpuMR/
+pS40UNnemFcwDQYJKoZIhvcNAQELBQADggEBACu4D1eWilTTqGhZGcqbz4E8jmMl
+XoqVPck46sFWMHavCSmwiuZNQhoWIlvXjZlvbJ6Zcj7p+hm3a9X1LDPD4ax9zwFZ
+IdqacNZd7Ev7mkwzXgIOSLcvsn0DBHMv9zECzWsbLOurOc+u6hCDc87GFDiT1CIc
+84xt/9M0UAGwWOtj5QZ57CeDQ2KZ+Bq+jIIrWRBz32FFJl0k2fC8wSjNJ4nI8rJ4
+Xy04BJOCAy5bGzIUybzA/cQ9OgjM4awB3CQDFayU47c0cC/nYv6XVL6/htijk8t9
+c2ouveHhCVsdrjSioYgwfj6dajlsDuxq9iT+9ihdJYzqZial1z91ol46bXM=
 -----END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d5201c8b/tests/python/proton_tests/ssl_db/server-wc-private-key.pem
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl_db/server-wc-private-key.pem b/tests/python/proton_tests/ssl_db/server-wc-private-key.pem
index 8d2528e..24bd07b 100644
--- a/tests/python/proton_tests/ssl_db/server-wc-private-key.pem
+++ b/tests/python/proton_tests/ssl_db/server-wc-private-key.pem
@@ -1,38 +1,30 @@
-Bag Attributes
-    friendlyName: server-wc-certificate
-    localKeyID: 54 69 6D 65 20 31 33 36 33 37 39 34 34 32 35 30 32 32 
-Key Attributes: <No Attributes>
------BEGIN DSA PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,4AA7362A0A1CE3D0
+DEK-Info: DES-EDE3-CBC,F4E343EDE5747836
 
-sLqxs1MtHOj0O0sO2YUSQMrsvl19KBlabPwiLhrLKPMzyK8Xad4S8V6J9U4QZl3I
-n6vY7XvLPx+OqPE9X6vuRfErzDzzjkrL3/4+VTj+bFdetR85ysg1iOVnM2B3MhxW
-qF9TeOpxOWokN8ck5X6TYuo1V6NcYO0rZ+oTcqe7nNdmJruwHf6dgWPeLRhyT7Cj
-IoidnCiTYKCIVH+3Hu30ZhnF81hE+vXt2EtN78kUNojlsSSsxmzOXIaPGwVRYMzw
-QqhKcX08Uo+1gHfcNfvjDpWyybBo0oznEneGvxxGoACC3KIJMAf6CB0ToP4JnSO9
-GuNj51k2M47MdCOlkvWD6OvwMNU+qtfFo02cHj2ZyjSYTry0/XnBSKfdMs8Yz0Xw
-GxsWY7f2041XBqP1gXUbjLygpNzNoD4jyxoPbgPequsCnSl6x+dORc7HICJ4VXFk
-9DCk0Xu+22PMuMl3i743SjOoxGntJCzQfJABbo6txbXbLnHrByRHgZyPeIBNrQZY
-fZm1BXRexrnXMiKyVhl0rgZaIlVwxW8yq76mRv3E+srYncWaPzPvI2UoNGJI6kqv
-TfQP2IYr3QQ4FsN70rZAe1kdur8qmo10
------END DSA PRIVATE KEY-----
-Bag Attributes
-    friendlyName: server-certificate
-    localKeyID: 54 69 6D 65 20 31 33 36 33 37 39 34 34 32 32 33 34 35 
-Key Attributes: <No Attributes>
------BEGIN DSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,2EC922782CE1727C
-
-fsM0zmhcMgj70OG+cX5FFIbS1dVFZDVpqUFXASlVzYgx5t8nTISPSBA9mQup34MG
-28sv2zxLdb+bXFuzkuq3mzuj3NLZizo7o6wRuUpbpbmp6hR6K5fkfu7GsPXCl380
-EjbrUCdt2iDiDJLyNT9Pu3ngdx3tOqz8JE3oD93FAfVZDKlzigfmX1sS+qOyqrCO
-JbRqaCJOQ5F+g73QvM9cOQLw1F/n9FqtPFNSy+Q0LFBcxfznsTk4pnPFJEko/2F0
-r9fudQS0vouNgZ4i1OzrQnWTzVeqVoSaa6AywCrynpiSWBfxMIbT78zjyoUBD47H
-nlGjMdtpoo6Xmd3CjY/pHc7Gi4RiTvBR225V/djdZpIDp7Hoyp2jMSWmsamCEFMj
-aEx7VJQtAEIyrVsCbYfvY6pE0id9dQOZSZnBtn8sHqy9DMfd6bR8FFQx48yXzO8H
-sxBNOFjkNjnjm3YWTm5q6iQ0LTke+EplixN2J1wjKz16Iy/36zCd+2rks2KXIXXX
-4dHTDPvV+9WKrfmk2ZQx/j2XQfPt34a0TIERJ5zAJuHH7a9zSCX0j4k7XRCI2GOQ
-Mu7wsBLassVgVCPF3J0Flw==
------END DSA PRIVATE KEY-----
+zUTVpHk2DEo8V95tDFfyW1+K3NF2fSD2PcR37ZKO12IK2FPBX0XZfDI+nl5lzu1R
+XbAAKb1IxzjPpEEjK3MrvPyfYJmV5mh/T30r53/x6OAfpi/7LWvH7nj98aU0Wkvr
+MiIXIupWrRmGGpJseg1GgI9Z8f5BxH6r4ZwCjkyISzzNE98TY6OORmXbKWBhD+Mc
+XKkTmUIhJtf0gmyLYMhz+J2K/JAn/UvdIpnhINz5U8/j+eBa62FNcbrVaq/5YDHI
+EpUE0f8CvvaUdvK5CSJeV9OFLP0RKEIYmcdeoEHZ0QqOnDb4XHVOojxaBYvSvXpS
+XbAPZqKYJjcILK1fPFE/MdTUu5nBfOpQqw767cV8CroQ/O0hWPR1Ztb/fz3IcST5
+nb3xx3tKMF8bVDN/Av4YDvrdJzzV5B9JnSsSpry/Ms4PMh3os0zLb9nt2WkpV8M3
+wJP4PGTMd8hNESbvq0gz7wAOuVe8mh4dOsKQOm06/3o9KLOLvUo74XJsytXM74gM
+pPgBaLg62t4jXSH88uxoweMG78VMgCCiyuk1z//cuDY0N+EU0oo25UxDjYh6n2yK
+F1NejOW0ng18BY4TGXGx74i/xY8lBLRVbJGZmX7PDW14jjGTHY8y+C78KsI/IZ3h
+FoDDCQUHBJNYIHndJnny5SLu8vDVj9eJy288A+wWVvCwB4AuAWNeGQN6ywFN7zJP
+GxGxNSOsvq9R0nDdRR8wil2FGYqBEl6qbuanGBeLoB1CXHH2u+joXX5gfzoIWA/u
+oOEUN8GrM6leHDhrqU5yoZWAnrGLf2IXjtiCes3VDSPoR0KhsPk7Fp/+r/aLeDKD
+LfI+javz0BzghQFxNciZ2hlKJ358kuB7NYTbyzj9JLzoZnadAxuhan2IW5FPQJai
+Y7kz/ACh9Pepr3PFBlgDlcGHRcei3SbPuhveIFJpAUxSg2Q/DAcEu3OwyA2kocWc
+8k+n3pOK1uRm+TwVvMvDrFt1Y4NAYV10uTin+q82KM2cVAu3arQ9LYzXLur0kwWl
+LC+waJxHuYtaNnqHhQs9Gh4fBsIXMFprA9PPy+JTeqSupUHuEf6flTZKjCr/zod8
+gSERVZaJTFPBTVtGmIYuJVV4A8pGeGn2JiqG3wkFaZco3Tey+toC3WSq6xxvT15j
+ghgGQlU49y6KbXLOsQOtSHm1BDxtai8nOHateWGbOdQ3ieAGw2XvZ9Z5I2D6J0Gt
+KHZIadUnTY7Vlv82jp7CAyeLzOF0UnbgygxSVX8lTW2m/dep9Bh0JQZIJhc9my9/
+kIKzvrS+CGR7RRrIhKD6bkJKL0dgTQRDOUmMCRSomoVF6FwO58FDKqBciIdmcq91
+u4B5Stn7hZuRKR5/ZrQMFvs/axw5/aLo6r/8mwUilwL7tMlvC95yhC6/3UFQ/cQv
+sC9nRf825uNHuyr901YZei3sfxAaUiGWCrm/gSjnFjGIDTavoqNdcZXDCzAAP1ty
+FMAW1m8Mq55yatla6sJ4BGZDnrBYv7C6SoehXcc1QR4NJiCThcv7sUBNmN6AQ50D
+wbvcymwxFBt1VxInuF77RV8RPWcEAI2mUhww32RePIm3kX1GNtMhRo+Uys3n7Bqr
+-----END RSA PRIVATE KEY-----


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


Mime
View raw message