summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2022-07-20 12:30:53 +0200
committerJose <jose@zeroc.com>2022-07-20 12:30:53 +0200
commit06b812ece908019d5f7a980dbe7d4b6649a6ecdb (patch)
tree3da69fd77dc57734088ec60a0cd1fa3c0bf5763c /cpp/test
parentUpdate changelog (diff)
downloadice-06b812ece908019d5f7a980dbe7d4b6649a6ecdb.tar.bz2
ice-06b812ece908019d5f7a980dbe7d4b6649a6ecdb.tar.xz
ice-06b812ece908019d5f7a980dbe7d4b6649a6ecdb.zip
Update IceSSL/configuration test certificates
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/IceSSL/certs/c_dsa_ca1.p12bin2832 -> 2880 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_dsa_ca1_priv.pem39
-rw-r--r--cpp/test/IceSSL/certs/c_dsa_ca1_pub.pem59
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca1.p12bin2916 -> 2916 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca1_exp.p12bin2908 -> 2908 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca1_exp_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca1_exp_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca1_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca1_pub.pem34
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca2.p12bin2924 -> 2916 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca2_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca2_pub.pem54
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca3.p12bin2972 -> 2972 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca3_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca3_pub.pem40
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca3_revoked.p12bin3020 -> 3012 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca3_revoked_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca3_revoked_pub.pem56
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca4.p12bin3028 -> 3020 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca4_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca4_pub.pem44
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca4_revoked.p12bin3060 -> 3060 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca4_revoked_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca4_revoked_pub.pem50
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca4_unknown.p12bin3028 -> 3060 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca4_unknown_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca4_unknown_pub.pem43
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai2.p12bin5438 -> 5470 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai2_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai2_pub.pem116
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai3.p12bin4302 -> 4302 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai3_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai3_pub.pem72
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai3_revoked.p12bin4342 -> 4342 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai3_revoked_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai3_revoked_pub.pem93
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai4.p12bin4390 -> 4390 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai4_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai4_pub.pem96
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai4_revoked.p12bin4430 -> 4430 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai4_revoked_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai4_revoked_pub.pem96
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_pass_ca1.p12bin2916 -> 2916 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_pass_ca1_priv.pem56
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem34
-rw-r--r--cpp/test/IceSSL/certs/ca.crl.pem41
-rw-r--r--cpp/test/IceSSL/certs/ca3.crl.pem20
-rw-r--r--cpp/test/IceSSL/certs/ca4.crl.pem22
-rw-r--r--cpp/test/IceSSL/certs/cacert1.derbin1015 -> 1028 bytes
-rw-r--r--cpp/test/IceSSL/certs/cacert1.pem34
-rw-r--r--cpp/test/IceSSL/certs/cacert2.derbin1027 -> 1048 bytes
-rw-r--r--cpp/test/IceSSL/certs/cacert2.p12bin2678 -> 2686 bytes
-rw-r--r--cpp/test/IceSSL/certs/cacert2.pem44
-rw-r--r--cpp/test/IceSSL/certs/cacert2_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/cacert2_pub.pem44
-rw-r--r--cpp/test/IceSSL/certs/cacert3.derbin1028 -> 1027 bytes
-rw-r--r--cpp/test/IceSSL/certs/cacert3.pem44
-rw-r--r--cpp/test/IceSSL/certs/cacert4.derbin1028 -> 1027 bytes
-rw-r--r--cpp/test/IceSSL/certs/cacert4.pem44
-rw-r--r--cpp/test/IceSSL/certs/cacerts.pem166
-rw-r--r--cpp/test/IceSSL/certs/cai3.crl.pem20
-rw-r--r--cpp/test/IceSSL/certs/cai3.derbin1295 -> 1294 bytes
-rw-r--r--cpp/test/IceSSL/certs/cai3.pem76
-rw-r--r--cpp/test/IceSSL/certs/cai4.crl.pem20
-rw-r--r--cpp/test/IceSSL/certs/cai4.derbin1343 -> 1341 bytes
-rw-r--r--cpp/test/IceSSL/certs/cai4.pem112
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1.pem59
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1_key.pem43
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1.pem34
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/ca.pem34
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/ca.settings.json2
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/ca_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/dsaparams.pem14
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.pem84
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.settings.json2
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/ca_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2.pem116
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.pem122
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.settings.json2
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2.pem134
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1.pem76
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection.pem52
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none.pem52
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping.pem52
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1.pem59
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1_key.pem43
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.pem34
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1.pem54
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10.pem38
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11.pem54
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4.pem52
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5.pem54
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp.pem36
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2.pem54
-rw-r--r--cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca2/ca.pem44
-rw-r--r--cpp/test/IceSSL/certs/db/ca2/ca.settings.json2
-rw-r--r--cpp/test/IceSSL/certs/db/ca2/ca_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2.pem40
-rw-r--r--cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3.pem40
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/ca.pem44
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/ca.settings.json2
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/ca_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/crlnumber.old2
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/index.txt6
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/index.txt.old4
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3.pem72
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked.pem93
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.pem76
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.settings.json2
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/ca_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/crlnumber.old2
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt4
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt.old2
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3.pem92
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked.pem72
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3.pem52
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked.pem50
-rw-r--r--cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4.pem44
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked.pem50
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown.pem43
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/ca.pem44
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/ca.settings.json2
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/ca_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/crlnumber.old2
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/index.txt6
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/index.txt.old4
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4.pem96
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked.pem96
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.pem112
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.settings.json2
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/ca_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/crlnumber.old2
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt4
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt.old2
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4.pem106
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked.pem112
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4.pem52
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked.pem50
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown.pem57
-rw-r--r--cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/dh_params1024.derbin138 -> 138 bytes
-rw-r--r--cpp/test/IceSSL/certs/dh_params512.derbin72 -> 72 bytes
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage.p12bin2976 -> 2976 bytes
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_clientAuth.p12bin2934 -> 2934 bytes
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_clientAuth_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_clientAuth_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_codeSigning.p12bin2944 -> 2944 bytes
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_codeSigning_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_codeSigning_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_emailProtection.p12bin2960 -> 2960 bytes
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_emailProtection_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_emailProtection_pub.pem52
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_none.p12bin2882 -> 2882 bytes
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_none_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_none_pub.pem52
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_ocspSigning.p12bin2944 -> 2944 bytes
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_serverAuth.p12bin2934 -> 2934 bytes
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_serverAuth_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_serverAuth_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_timeStamping.p12bin2946 -> 2946 bytes
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_timeStamping_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/rsa_ca1_timeStamping_pub.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_dsa_ca1.p12bin2832 -> 2888 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_dsa_ca1_priv.pem39
-rw-r--r--cpp/test/IceSSL/certs/s_dsa_ca1_pub.pem59
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1.p12bin2916 -> 2908 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn1.p12bin2932 -> 2932 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn10.p12bin2942 -> 2942 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn10_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn10_pub.pem38
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn11.p12bin2958 -> 2958 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn11_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn11_pub.pem54
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn1_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn1_pub.pem54
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn2.p12bin2932 -> 2932 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn2_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn2_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn3.p12bin2916 -> 2916 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn3_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn3_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn4.p12bin2916 -> 2916 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn4_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn4_pub.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn5.p12bin2940 -> 2940 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn5_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn5_pub.pem54
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn6.p12bin2932 -> 2932 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn6_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn6_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn7.p12bin2932 -> 2932 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn7_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn7_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn8.p12bin2916 -> 2916 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn8_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn8_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn9.p12bin2948 -> 2948 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn9_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn9_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_exp.p12bin2908 -> 2908 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_exp_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_exp_pub.pem36
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_pub.pem34
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca2.p12bin2924 -> 2916 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca2_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca2_pub.pem40
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca3.p12bin2972 -> 2972 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca3_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca3_pub.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca3_revoked.p12bin3020 -> 3020 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca3_revoked_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca3_revoked_pub.pem50
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca4.p12bin3020 -> 3020 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca4_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca4_pub.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca4_revoked.p12bin3060 -> 3060 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca4_revoked_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca4_revoked_pub.pem50
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca4_unknown.p12bin3028 -> 3060 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca4_unknown_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca4_unknown_pub.pem57
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai1.p12bin4174 -> 4190 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai1_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai1_pub.pem76
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai2.p12bin5438 -> 5470 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai2_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai2_pub.pem134
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai3.p12bin4302 -> 4302 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai3_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai3_pub.pem92
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai3_revoked.p12bin4342 -> 4342 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai3_revoked_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai3_revoked_pub.pem72
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai4.p12bin4390 -> 4390 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai4_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai4_pub.pem106
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai4_revoked.p12bin4430 -> 4430 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai4_revoked_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai4_revoked_pub.pem112
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_pass_ca1.p12bin2916 -> 2908 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_pass_ca1_priv.pem56
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem34
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_wroot_ca1.p12bin3972 -> 3980 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_wroot_ca1_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_wroot_ca1_pub.pem34
-rw-r--r--cpp/test/IceSSL/configuration/AllTests.cpp27
310 files changed, 6338 insertions, 6334 deletions
diff --git a/cpp/test/IceSSL/certs/c_dsa_ca1.p12 b/cpp/test/IceSSL/certs/c_dsa_ca1.p12
index 87f77c54869..4399e57415b 100644
--- a/cpp/test/IceSSL/certs/c_dsa_ca1.p12
+++ b/cpp/test/IceSSL/certs/c_dsa_ca1.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_dsa_ca1_priv.pem b/cpp/test/IceSSL/certs/c_dsa_ca1_priv.pem
index a80a5562c38..a5a6d5b9667 100644
--- a/cpp/test/IceSSL/certs/c_dsa_ca1_priv.pem
+++ b/cpp/test/IceSSL/certs/c_dsa_ca1_priv.pem
@@ -1,15 +1,28 @@
-----BEGIN PRIVATE KEY-----
-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
+MIIEugIBADANBgkqhkiG9w0BAQEFAASCBKQwggSgAgEAAoIBAQCnzt67PnmX17/p
+UgOe7j0V4VkQRPapuDrkBYxS3EGlmQJmLudbBX8vvOrdVEL0dZ3/4kouw4Z3id7K
+ipO1SbZ+udACKDYJzE6eKgG1oao7sa4WKdlhuwyuRoTltzuxN1VeMoQWfdKMWxt3
++sTTQzd+bgoJOccA9zPnvWAuGOCmXP2rPYJJFJq+82CE5WHGGO3mEaq00xcSYmrS
+xXB4GgJP8JY0AJ3IuykqMvxDG5/8wPbEVcm+kOdpnCcm9Jpo9oEPxtfeEoWPzVXt
+wKMF+W3/4mVA5L3DCWMQf15pdyGzokpSqgekWmX8fp2GVAhpmRs38o6QuZq5SJ4Z
+3Uh8CMHXAgMBAAECgf84YRsWNFf2+0wgOXvZpBlGdMwU9qqqqyH9h2TKqBjw9GP4
+rs40UzPSWH2nsmHlmwur+ivvjft3nO5ItjeGsEiX5qwc50Bz1EvOevCHzhSMylBz
+uoR7XnQ0SctSlfAzW/NIYqgpKWDl/TtaO0wYFw2TnD7LV3Uudor1OA3VdJygQV4W
+l+ZMS7ezRjFw0mRoE6CRd7FLqoTexEDTWrUcW5CuvH/ySJTqm0zU7WEYZntPgQDk
+tNbiXO65Eq7H4HVBOGSd/uz2UCVONIx+DnIfTi/t0PS2byp5qtFp0ef7tz4ll7Cx
+G+I4M2zeKPd/MQpdhTdalv0/HY2rLR75HGCOlpkCgYEA0pFR5zJXqE+PllM++/gd
+fsm322AczBKPc3/IwZTfqO/s46DCq03oD0rMDZAYL2gOlUitdbKnicazkT4g/3XW
+8CY2qC5uXN8ZORge8eoIPrRpkZYGp4PWVkrjmW/0f07JFcAmnC0VifyWjlxdHU7s
+NfWn1ncaYnJlEZWtWAbSkoUCgYEAzAO68BIemeRN6KTRYDYMIYxb5BdcEi72ufrl
+hqi1RNfDRAe3Xp0wueXTRZXUe00fc9uihYO6Pv02Hdb9zu5uW2ZB688x0OGCpAnv
+Zuo0FNaMzXuRNBtRv4Ow0mLD1NEKMyFyTjfdPvIxrDj7LKXN7bqd1kv2dGHEOZw6
+ZtsmR6sCgYA07VQR8eR4qO7lkS0etoHrcZamLKVwYiXumSsEBYCmfRAlMy5bUqzG
+0z0xF4wMtnIb8fWvxOU5y1ktY9l1fNA28tQAOBODgoxbfoWgtvu1jzGN55DqoEfK
+zu4gjjR9n3cJ4Y+S5/4m/fd19x9sk37qHUI/tRZLsodXATFeE/Dv5QKBgBH4niX5
+oqJxvv8oTZ1JBYaLA6ky+ZRMeMVnOYLEJ7uZugSrHVcDR8CIYzT0/tOhtoyRI17Z
+fLWBvpugTZlF3YjFmDb6eGvrAYQLsAADz3SqdZrAMMlDQs84/YF6279KbriUUKpd
+N2sNEJ0YI+AJ9vri/nZbGKml1xAwF+DpmxSjAoGAE23jIPXo5y4LGXgmnSrt+YhE
+8h19FV/VHX5QWfJ3MNavzDYD3RT43xG0BS0XfMms6+H397/SO44IhOGlb3sTiEH4
+pJkGGfOArihzXWcYpIjWsb3qvkEFTez59Z/EMoWY6cJcGY020H/qrjIFMCOGKfhm
+jFYdtPtGtOXVSoBrTxg=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_dsa_ca1_pub.pem b/cpp/test/IceSSL/certs/c_dsa_ca1_pub.pem
index 23ac54d4c1a..33fde3343c8 100644
--- a/cpp/test/IceSSL/certs/c_dsa_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/c_dsa_ca1_pub.pem
@@ -1,39 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+MIIEvTCCA6WgAwIBAgIIISBb3DvYomswDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-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
+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
+MWjf6N1f3fmiPq/zfAayHwE=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca1.p12 b/cpp/test/IceSSL/certs/c_rsa_ca1.p12
index 5e345e2e663..532009e9a3b 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca1.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_ca1.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca1_exp.p12 b/cpp/test/IceSSL/certs/c_rsa_ca1_exp.p12
index 37f5cb44740..b34fa7dcb1e 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca1_exp.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_ca1_exp.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca1_exp_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca1_exp_priv.pem
index 6c93376085a..eda39edb216 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca1_exp_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca1_exp_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDSW+kbGXSi1l8F
-mCV2Up5LomiuEh2buFV6E6OyckSt8/0GtLnGt4J0BFIoSWKqAtpN12EuK3R76hO9
-sPBwYTeVJ5PI+XTOEJxw9D5Xdgx7joWYrnK3Fm1rnU39Uemu+k/VeEH269JOUlIC
-DP7ZGg0e3gnHzx/HMO2tmrTrS3EFVdmCFBg0uSBm89PPn4rqYC6TorB7V1YGyMs3
-Rcdz7jmnDtN3mmqm/mXh050xLOvFqnQwi3bZNyisL3TnN+TDZHBRM+LC0EaFUxUl
-WepSchEDknQbpRPho2NlTyiRp6riaV0nVkrIlAwOWt3YUYdJedvEQ+8WA9LeR7XC
-IMjdau+pAgMBAAECggEBAIDMc9L66BZYCYBEYxOqjG+k9lE2mFhjKjr/0WgOXQzh
-alhzyZfpfn+IscEnBbkw2/dzW3ZIdx7z+LhZoS496Cl0PSF9083kD9V9RrqIdiYk
-4pnUnjqKCd8tRrZHNDzF2KHM6x7Dz1XTQ5Er4dKOB+CRdQ2ZPUzaIXz9T68N1xq7
-E5tJKtgZJSy7idfHOkXMH3KqhtN66Q87MlimvzJtdQOCX3ckJ/IohlhxPNZ7HXGd
-uXHl0CVM0EsdXUARXhWoNpa2JYAfjMtHnn0QDb2wOg93X9DqN19kPEgpaGuAvfKZ
-35N/hqK75xBb6dbkMeH4TavfneG2ZYnHvRjD1F9sdD0CgYEA/TgxM0h0WoeO4rCp
-hm2uQqOVevRiamtdYC5uPEvhI7jnF6UjRyXfBTbE2Z7vZkVdo1i2RyyWWGBHdaQ9
-CcvNkVFMezYmwMsWegRQuLkfNaAH4tIUtlwQ6a0GePRIHTPcEs05QO3EWds0bwwf
-wN4CWuaepDTxdviZvSMipPIhCxMCgYEA1Ks8e/FKIVO5cb2upaIFNslE8HxMP8y4
-e1Kv2YsSxgl25MohJUNgW8TNdymweoRX/8S+L91wmsIWOPAquLoWMktGojJc69sD
-YzTMAcJE4W0QPzQnPpN9KAzbFawNUM993pU/Iyr7bJUV8j9EAoQUJCKVVpwD/X0U
-93AGiQEo1dMCgYAVV+stu2mzR8HPcbyYTB5oF4m992NkPPB97uvzwSGU9TzlTVIP
-6S1HLzqgbTkYkbg20H9suGFjyZm8XL+YV8lX+lZL/GB/155pYnu7Vj8/MeH4SGTe
-ihwS1ja5cz2w2HIwU4QD6Qan3EYrJgZ3Jz9jkhTFGoFP2dx7iL6e0JngaQKBgHqE
-3CebbtWcYm3AlWke2lohwfG56kOnMXD6xgxSLtKgiTptqILLOiwkSSqpfd5XeEsF
-kXwJ2uGNhzfuRO5/ZmI7M8olsZq/Zkg1FoK85Onp5z5CUYmfdq8oGN93a4RuxVkC
-KomcLZT0ntwczpWUefYHZnmrEDFtajLS+zDa1ie5AoGBAJjPt4l6vDKE2aiWjztR
-L9jDP/2SHZWyFjhFoXrrjkQZBP4N/nRfIM5wjjhIhAJm9avVOBxNL1FAORZT3x4P
-uNlWDtBzMBSTV7jeR6j3BTzogIL8ZuDmMsbbA7Mb8bdhQo8SN2KXaQk/SRxnWncO
-9lei3a790sFwn5ysM6mqhdoV
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDz64PMKNJZ28pp
+rzayjourgUAfXbCpS3eeRvPf2UgXaDRW6YGQuTrAdr1HH7N1/2AlTDJXsdAXTc4n
+DcXso/AHd+Hc6ZeZSCG0z4rQnodgevl75MvJc62XqrS31XMxnIxPEy8cAjSn7IhU
+Rz86GaiaLsCjjPw2CVoJ30UTXVfSmV/gR0vlDhBWSRDPSlDkg7yov2/TPIMdi5vH
+QKHkhZzps9ZyS9ujLzu7dmhxnxecKUPUHq+UoWACtyEs+V1fWbISdPa5s390Sq03
+dkzYw4CUBRis/R1stBLm+VjXHd76X4Ab7I0GF6QnjMXPd/oBEAr6bVqeNSiU2pJs
+d9zD0eLVAgMBAAECggEAJcB3lV9jESfQp/NHoLKpwNlgEoq2ZzloMd3S7HwtaXwG
+D8aTuFHG21d1W573MGXeXF9y8jox1g2DgO1jiwjjg1Bla4LW5REyMFEn77p9guv9
+lZSXit4lybHQxxwY+F59o9Z5Bdl8i1nzTrH5QfWLMBPY2mddeMKRRjJhd0oM5+nq
+P9qPh9U5pe6bZiPGt82uzl1TU7xqDtUuPge4Z6y9ONZ5ptHwMBbt+1DMOrdCjdwZ
+fYwAL6Jc50i5jW99+CYfW4bEUyYEfBTLBM3k2auKQHdjz8b+rBIsei/4QRvXwkmK
+dIyYH9aSd5gHTfrJbyUepXIwLqFsg22fxFAd6uNBSQKBgQD7CfNLZQHj+qllm7Td
+QWIWb2b6vnjZSIIokyFVz6ImWup3389W7WeXjx1a7bPDfYBEs6yGntcGqpZfb0Iv
+2EeY35c/GldGhP409LIrCEYMgOUEWpneBnm9eM48fKOE/NzBMzX6I4qDHTfTu92U
+7f0X31MtFNwIhjnerTiP96Ok3QKBgQD4vYx7c7fqR5cuJr1DPY/P+tbT6b7d8x15
+jvGcZJz5hkUbiAquHPIFbGb+887T2tpnl2Hk7SuV5Nd8xEHqgnf6yFgSHfxOfGTD
+/IElM3jEcKsHbVQMj6RKM+aDm7kkT6RIEkxxES/fHp+nbWSWrrMGBTsi1WuliNKU
+vkJ0jem6WQKBgEIhLOX/ha/4qAcMLWjbgGtIjWggJNWYNDFcELv6JkzURk+ttYDA
+qTlTifgaBfDJbrCqZBhSX3JyHYqmVFkmMDYlMEJ/Pd5lylFI5GZRl6JTkgDDnSTP
+r+IpoKpuauTtd3mtc9qg4iwH1l0AcC57QuC3A8IsbIoSUcxG9U93fLRBAoGAPjrN
+xqTwwkAe5oDyoLvqGtJapLG5+rU0DpFgiQvy6cpZx8WFRoIfWpQAQJCmkgIS2g/Z
+gfiECwAxmRlQlGcHtUoiHoY59TjRzOaDONdjw2GcqEMF4A6fv6C0bwCqlRcHtrA9
+R5xRKbTzpGON4tTaHQt5/AEA6W0NogDnh1lpvCECgYAf6lRiRHFWemLNUlggP8NY
+LzGCkRFxNiZnZrkRGlHQc8x1ZOMVZz8Csx6Y2y6TCZedr92tZ7mLa8XzgR3mAIbL
+vJTg2mYF02H6u5ljt+XRkA2rWFbg2ouDj1U8LfmlNY3U1ETH3KzUpCVObEWqe2rc
+yF8iRmDSF/28HETrPazCiw==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca1_exp_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca1_exp_pub.pem
index 5afc54b6738..972fb3766fd 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca1_exp_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca1_exp_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-2uiPJmIjiMYXrjQJV+aiTL0qQJ30oy6iq+RYxg==
+9w0BAQsFAAOCAQEAW6XL6QFHkrDfqJ0X9SpoDqzxfHImq9h40A2pkQGWKPclIalS
+6mx5izlFs0p2t51EJGyMhoFWajbNTUNBk//18JEJAV3RHldMSqTSU/MUVmaM971d
+38vgmcNngw+Fnlmj3904cYNvzzE3iHwjN150TdYgSIWXeBvrK4Ai13zY/8hTr2c9
+LjzjuMlhtF3GvegjCBchFX1Ux7ss9Bb7iqi0+6yViqjM6Kt6B+wPOfz5kUjLdKkV
+TKVRL8XmYGs6uaql6lRzXZiAhC9YMpI10v0PtxesLOgNAVsLxo7zizd7e3KTzMVL
+2l2xdPOP008A4fJloXj37y/Z8a+QS4rmmB0W2g==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca1_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca1_priv.pem
index 6b283c2f0aa..ee3ae6fca58 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca1_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca1_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDizfZvVfj1ujM+
-F6PIreymdX/SLXXc9uXwrHu+594o9FHdx1XWJaP2/EnkhdU82MG+s7Wn/ETzJXnk
-Lk7uJDXBcCMZYZj3DUI+6QRknErZqX9b1V/dZQGUc1zjwJGT2vsA5VoVwFAOWpqD
-cD9/cCDpVoZsbI1wi9/kMekBmM5Rpnqt1m5B26lyXrn8hmRpNtJidxayt/aL33qC
-o1GBhg3LIqz1zhQrvdKTISiTcWHQLn5AMUe3C5MYa88tMsHtXxKQnDki7l4Z0Z75
-BHv/+/3VIJLC3vVjt0lYXRQcgWbAExt/+aZLJHg5lP+SvDEfM8YHuzLsfj9Wmy0d
-BzN2xajtAgMBAAECggEAVErh7Q0RwxnZ05jrmTjyvAbtY4rbxCzK1sD0GMaKLcRn
-7LoZ78X7g17Og60tzDhvAVY/DFjYs1lZTPHdCerRQ7xOfy9jr2XxGfp2VII122GA
-YPwTbfANP0QE4Ox/7mizYujaqzzXRA5uYK1GHDHrOW2b9g3+HzcNFf1qsNo+y98V
-ZcG0UGiBVTBs32Q5cnUAWdJtExUHjmgUHnWrTo/DRwyx6c8of/JtsXuGK+dXFSLY
-UkIW09OM5/+b10WssB2h0tHLHiXLJkeJIphl06OriERxxYgXNbJi+gOGpUx/POFO
-po3tbQOFPa31FDUpyU+Uw/g3NOnieffNiCjYA0DZgQKBgQD822Ikwa2/A83Do6bp
-oEnvXb/oU9R3wKbck196ImEvRuSG2U9f8PrKwtReTWNOt52W5N4H2PlNeYdYMruc
-HhSdO3Zpb9bHAJVpmAygi3dKp2nxT0VTcGdAnrC10f0v6zuO0jHCJHWKorDQpoOI
-6nzIHV5WkzJSrJ3Wmoc0OuIPzQKBgQDln62D3QTayQVKOLMoxrFDg/zIFt7tVjwM
-XGgNRCRrQHZDjlIt1TjrCY7UhEf/RLsulYmeVc0QdCQ7izKcO1VpJXoVclwoDmRP
-wiFr0GeoeB3B8HF3Aepsds0koh5XrBZ1cSQDsXZTyitMdy0ATGlnYXypwuHhtrxW
-OfQqc42doQKBgQCS4wKtZZGAED6c8tmIiCPLGIPd+6zGcDS+mCHzujsIkr84ks6o
-Zj3aQbnKmlwhI0s5l/RfTKzuU7XLB5WyyEqjWCKed2imK/Gf6MMVFE+VH5HMq4cT
-RI3GnSj8RmM1TgpIGlTrefCKO55JZyGsDMO2IFFoK5QlML90Jkp6jeY61QKBgERy
-5PZ53AicA8esPzvYft7xaVj7+FgnbJ8CrMHHnlOaU6avti+Tb/QgVUNka1Hc2y93
-xB4+1XIiLOrTA7MuvLcrRMk/3djS8XQVGoFZDo1ZwQUe97PSDl9myqAw83qPAeLg
-ZyvyqqMvkNiqbe+413LJzK+OOGdgYaQSgoZlC8IBAoGAW0AQ5C25GoesrQCEbv+Z
-uT7Lhyp0eIDDi4vnEOdApjbfQGbwHWrO5QbSgIg5kB8Wc4bEMoxWaOaKYRa5IBQk
-bML6q3Y5eb7gttNA17LoIXlpIOnIXS5YuRTpZpnr+c1No6f8+QyDEEkqHQvbCk+O
-JACaT63dBXbJkznflnRHpHw=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCtjM9H7oMbiev6
+kJpUowLkXvm6zOMr0DHyOL/++Py+yON8rwHSLBxdtHfW2TOWVNw4lDNPhuChch4i
+oVDo/lK+UM1m5/4wfBYtF17ZBllW7T8dwld4H1Yw4Npagae2Deq7gsSVEukAEMaT
+AHoTMl7zDXnHx9oKpupQO5ScUtQB/Uznl4KLvTTfP/J+AYF5ZAONrf4+AD3rgGNS
+uew33pAKYYnq+fsDJl1lGAZAsqYhqcU2xgMNMDVkKqY7b+CipO+BQ7K4uoA3eruc
+s9D++bGq09KEdgMY5l4uAtL9deiispdRhSwpp29+oB9FWC4sr6zxZLoZaTTSD4Ts
+A3rAxu6VAgMBAAECggEAHLcwgeanV1poCwa7nnb1bst/NycZDIIPjZRRwlK44Sl0
+qIf9fWTSkbefX5ODO2PRp2PwJH+88cGj1leKP277SmWswtLuhl+1vKLCDRdFl4I8
+YARsvCG1PXOq9XBAC3m8heeidscQ+fOMo7yftkbumnk3lfSNsZcCLKHbGk2DKkvV
+DASqMrlye4gP1sBdX+EOSX08gsMIlRHnkqTy9Vk6np92yb5qfiol7o7oczBjxy3j
+aN6pDRh869EaZER8U2B6Zv3FgcCDLUXQG5OwQRRPwXqO/i9hTPeuhZbIw0wYPKMv
+eFOVcjmt1QCr6sFG4ujOUL1M7fLSAR8O/dc/jvqPwQKBgQDKrRMrVZXU02/jUZXA
+xWPYAUOT7qMu6bEJeovmrnZ88O2++fMx9U86ToEmzrNsiUKKCBkZU9gGibQNT3Zh
+xuLXL0Y8eNX/RYEhrum8DPgIcIc/n5dADaKGZVuyU0581XTlCDJBTDixiGJEVvHV
+o0iNE6NculOR3n5HA6hdB74yVQKBgQDbNf81rEj//0mgTXkqQURgNIo9K+KsEzQZ
+1f7Zq/zplQzmKaDAaV8WdwCpD9OcHzmZwApciq0hXzL2EgojFFPnVZGJpJ8yrwLO
+K5OWKecnMAizhsP3kdTYCwIFrD2ir1xlbJZRZLc2KHe7dqMrL+fvxQXsqqFeLrjG
+2sIGq4iLQQKBgQDG5NYc/p5M/zmcAOJPDOaQgZ0JvXRSg28C+En2lVsd/WmysqNg
+cXXQqF3B8bLOXlz4DD5lRoyGzfft3/8ysPTHa1Mn4QVQv6qbnYUu0CNQVO3FGB5b
+84V9ElbMR0iM5QUUBdkbj2tLfaXBnvkwSE7Yc18rjoaYbZnKouJEeWbDCQKBgDs5
+SWwM0eQn6pJem/+ohnqfd0Gzm5f10DuyrxnL95Z76HI+iOmzDjeZixoh5n/lh8Bc
+O/BonwHHIJOOqCJ2GX0Ehz9ytHgTBGUDLOqDA6p4tcEbBdLbGXAM+UzjDfvn+MSG
+I851sXH2WPLSyJ6gYL9MsZ8RMmupn85Jx+XZbhiBAoGBALw4bL1n9m4sHFceeyGg
+s9mdGLoRpkaKGfB+A/QI0U5TB/hEd1KYYwaqVXFQXeKM8zxCOc/9kxWZQGjOe/Cq
+a0zkFsfokEdSBN3tZUIVaQ0XQeOaZbqMf0VA6M9h7xXT1SDBR/ePnScy5vGaphVF
+r47YlUl8VzHYE8E36XH6bLGp
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca1_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca1_pub.pem
index edae554810e..97b53fdba13 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca1_pub.pem
@@ -2,27 +2,27 @@
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
-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
+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
-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
+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
-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
+ggkAv96HBRg/RI0wCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVu
dDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca2.p12 b/cpp/test/IceSSL/certs/c_rsa_ca2.p12
index 44f66e55751..ce37aefbe41 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca2.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_ca2.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca2_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca2_priv.pem
index a5526e27b7c..0b191569027 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca2_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca2_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDAUoGRKR8Y1o1t
-gMTCSvmVYZlffTyJlRttpYHgjOOTck+OZDdFO2bmpyyB17cPdexFQby8K0MdnEwO
-PJbR5YYS5nH4Gm/X7DFsqYTHxYXLmz4hn5twGSMEGDFVk6BPXtfPOzAryNqMBdeJ
-D6Rny0Ee53leH4X8LUZV9kJ0xRV8p4LmrdlhXx5eoSD0fEHfoSfbYNnOVkfINWNT
-ACx+Ty1hHkHv5Foq+WuzQAUR17QvJ65Wv4l1LkZ7c+3CX6V3mNlpS3rtZlquGMZi
-2VrMi4kTk7ivYaU+w5OK85eRkM8+9JCmZy7vccM63Yhct4wq7l38zShD27JC8Cbs
-MeBf5NwdAgMBAAECggEAeAqHiN2L5Wr1t6WqKkO16QGUQ7/dq1qAVj36BPiri3rM
-IWp3/SSIo+swopLMVkAai1fuv9yY9cB60GANG1ISD3X7KQsHSFTKvLJKiI7HZkCt
-1TrUQHHQI1weXvXYF/Jw7Y5aENo7Xy6+S3SR/58kNG/yl0dB0BdKUZl1/YCOWtD0
-gTCnS38NXar26J7uTiEvLSSeGJmh1Y7GXHCfcE5PI8P7ev6nTOcI2HqX0aU2j6os
-2BckC3JunCuKPItOnODvNl1rb9Zf0LlunpfOAhShl3MgtwsbUrF6IewHc/Xwr7WI
-7wsgrroLy2EFPKeZIIYMWdLa+0vcV4jruVjZXjOmmQKBgQD7Z3eSOaW9iMNshckW
-KQn8IM2wD6vRRINcEZbymbeAbhwjm2s2quWAVBvXPxJDlHHcUbbQ2kQokME5XK86
-tVANQhSp8S4jTj0QpDBIAkEiDKGyc0LuPIlw0X8AAyFs7jWTsIh9HMf43sgUJ9QA
-kHG1C1wyXb/zd0yyGI9veCRrewKBgQDD1ot/8QzFM2Mjvof4c5fGpLwfL43MJReG
-cMrX1TYWgBy+7E9eh+k6KoNQp77eDj7V2Rnq/i4OWuHtSMD7TF6GinDk51SrIfgG
-wFwrEqtoSnFA6T/UzJn08V2aZc9xs0yyKH+u/r3mtpKwsDiiRSRgJeC6VPY16AFo
-6/zxgXkXRwKBgA/JEF3zFrAO7U5cHCMzEnhtStz6Luyl46WdSSAUfMwoncWylYnK
-MzzaiyD5ydjKclfGHbeBbPQrGqbSZgJGri8W7hs5lI8M85Ke7JUo5xQPPPvqdtJk
-pLCbxuCmUav4TQ7n77oDW58JxgBV+97JMwqOGwzijBHqdLteBWuXXJoPAoGAZXuD
-FIysKnCDml08hqIX74ckOSDiYPyDoVZHtuq0uZovyzwXsQvK7ypim+QhQ16sbxKu
-nJiU8zljRBvkbRTZEu0grW228WuL5Ku/1044ZrXU1GdKfZJ84XJGKCFEC053mwbj
-i6JUc/7+KvNWlbgwrmZSexxV7f9I478Od3O5dTcCgYEAxPus/ptfByqCKrx9lpC7
-mC+Tbm8E/Cbm/Cbv/LAu01EpXRe0C3G3L/Fb40mLyCJHnAH3bJSO7/cViVAcel6S
-TWoUlb4I6yVERL2qwu2frmD4y+EiV4W010kuf/cuyocXjQD7buew+f13Vp6DOF2i
-D0ixvSu3lfjtQhA95X741rY=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCQ0ZbliASJBzaW
+vGSM6LTQCj1/jPSHLR9Tbu3dQEKwMlIFUlstw+oOaO4SGbExwFNZ6yc3s+DqFJD7
+qJs1+izvnZG3ZfGEy0AMD5sQXC4qppWkw6AyQ7DtzT497VG0DmX7XhU3pDCUBh+/
+aeUEi4UWBLKunP4JMkab60nZnOP20P75Z/MSUrGQfqQvmMC6ywap9L27FAdqZXZH
+wBbB39PMlWjQXys/9Ih8eqQYdA/3Q4LRraW+dJ2CauStacv1cASrD9h3qhnYgc2J
+qSJ6TRPqlFhdT3NkTco7jhK0mJxLeOxJHJoCsQpAxCHkL5lIaUZiNmE/WbpteoSf
+R1etMwJzAgMBAAECggEABuw19JKhdjQa5xlqDGsCsF/k8QgkbPfPuQsi92zJzfwX
+JqZOsdaH2u4nf0RXekOG2H62DmLHZs6FNbp+x5WbeKLazd5jgrpn5+EGbmxG+rFM
+PabqWAIbXurCRcSRSh8BagLlLGvpXzzBtMKTo47QgFfI0Nxer8La/uYVpCpB+CY9
+XeLSy68+RTUyLPQ1cO8eP1f6vlQZNQKIFLbggQad/td3K5+RkPLzXLGHNPW1nDQB
+Wk/tBEb1g1qv+6MGTvF7fWZYSX5Hp/+9grFTioXx8vp0y+zAMYVx7h+4ayCgC6ih
+wdFtVJLVPRNanC3r0M4ZsdvRk6hD6tOeqqlVmjtL/QKBgQDKtG1AOnl0BvC74Ss3
+eE4PKRk4/4bvo4scv9SfV78VpqlPwtMljm/JuP87MMEGLkgco2sFnuTvDPP4UsqL
+u51IL5I8YV8XdlDMJ+NU2tKRRRNQZMQdkvQ9J+pzpltdlWvnzI7ynFkoxNDECNbD
+wY6vBRgRZqc4yPs79yLY22QqHQKBgQC25P1B/m24dF2YmDZmj1mcNBFLJxnpldFk
+/egEPrawOBRv2rpTXLzYLcnyOnhVcmU3OReMX1sFAq3gWzGGh+DWbEclGIVlbUI4
+IvXtjwOaeQSR8Wrl9GhtXZe6cVC4SzGbBgmlALQZHMkowLuIZXrnHwAKrTJl7wE5
+oB7qzP65zwKBgQC3EtmRJr7GkfYeWbEkeh1WB/JlzjLagESGBKNN/nvwXAOSrAzz
+YH+KGvE5TkEnCenLI7Tm8KknVfWKk4unRB07MuvKaM7va8ZxfJ0O6EtBNLfK5hdR
+9oVsLn7LULY4AVnhkpiQebD05zz9sFX3mvr5C4q/PI1O9gYiFIR+gzcl6QKBgCX5
+1jxlwBKU1vpgYKtbCJhOl2irbc36tcfqkMqQ2w4sFtJC8H1uvCeHGm+ZhHL5ldqp
+mCIlipi3vbLgPKBahmz/fqZNOSWeUiml2LrC/1SL3E8RecjVvvk2fdLQxJn/wwUV
+c9s3Ei5Es+AqZMYljCeBYFjXLafMwMxeWw0WE64xAoGAQyssyhQH+pmoqfBbffUk
+xsKvfw8DnU4clgVzXJy1BbAP3JKtdG4UHemzK6A9TR8STLcY6YKGNJNEcJpj5Sdf
+4aD7kZF9+hHFo6X6fNP2VT/GUZ582bUBYsF+t3JQgC9YFnxBl4NHclGhsf7BfdjH
+sB2idyE+WNyGfsYMwGiS+EA=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca2_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca2_pub.pem
index 4f4fa65d183..c1560e10e67 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca2_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca2_pub.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE4TCCA8mgAwIBAgIJALkY60ii/GB/MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
-MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGFMQ8wDQYDVQQDDAZDbGllbnQxDDAK
-BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
-ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
-Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMBSgZEpHxjWjW2AxMJK+ZVhmV99PImVG22lgeCM45NyT45kN0U7ZuanLIHXtw91
-7EVBvLwrQx2cTA48ltHlhhLmcfgab9fsMWyphMfFhcubPiGfm3AZIwQYMVWToE9e
-1887MCvI2owF14kPpGfLQR7neV4fhfwtRlX2QnTFFXynguat2WFfHl6hIPR8Qd+h
-J9tg2c5WR8g1Y1MALH5PLWEeQe/kWir5a7NABRHXtC8nrla/iXUuRntz7cJfpXeY
-2WlLeu1mWq4YxmLZWsyLiROTuK9hpT7Dk4rzl5GQzz70kKZnLu9xwzrdiFy3jCru
-XfzNKEPbskLwJuwx4F/k3B0CAwEAAaOCAUcwggFDMB0GA1UdDgQWBBSQvAfw1mU/
-D8+JpR//KW4HisdUlDCBwwYDVR0jBIG7MIG4gBRB4vOofiWBsF6LBwljh9AiQK/U
-naGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAyMQwwCgYDVQQLDANJ
-Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
-VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-ZXJvYy5jb22CCQDpq178G9UgPjALBgNVHQ8EBAMCBeAwFwYDVR0RBBAwDocEfwAA
-AYIGY2xpZW50MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wEwYD
-VR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAE98Nr9laV5W4rDD
-MvBFf37gwTOJ03qHe6MhQWMctlK/lO56xusBq+pVwkS4B0HGFI9fjIQb98NutuKO
-Zqbv70Y7mC2xIgk/r0d0KmVocxoEtl/dVhh2kabd6dOMDPpUYtg/SaWJo+JKDR6h
-r+eRej/GrFU6e1VmC+PK3LrsXL2Tzu3NR2fTrNLn4Bi4pIIfNiXlmGZ77tG8uYuG
-9Fyx3a2Y4ffIPHp82zVoZbBGSvWhGYhEKnWSvt0x7iqBcNiYOK8mSCIoEJ2pJuyB
-KImthyRYnNqinPiM7on7fApyVOJNQU0b5ZI1LbEEDwhhRmU1lFdIl03ydWLV56g0
-hCwSW/0=
+MIIE3zCCA8egAwIBAgIILGB9+Ed7ULgwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU1MloXDTI0MTAyMTIwMjU1MlowgYUxDzANBgNVBAMMBkNsaWVudDEMMAoG
+A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
+cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+kNGW5YgEiQc2lrxkjOi00Ao9f4z0hy0fU27t3UBCsDJSBVJbLcPqDmjuEhmxMcBT
+WesnN7Pg6hSQ+6ibNfos752Rt2XxhMtADA+bEFwuKqaVpMOgMkOw7c0+Pe1RtA5l
++14VN6QwlAYfv2nlBIuFFgSyrpz+CTJGm+tJ2Zzj9tD++WfzElKxkH6kL5jAussG
+qfS9uxQHamV2R8AWwd/TzJVo0F8rP/SIfHqkGHQP90OC0a2lvnSdgmrkrWnL9XAE
+qw/Yd6oZ2IHNiakiek0T6pRYXU9zZE3KO44StJicS3jsSRyaArEKQMQh5C+ZSGlG
+YjZhP1m6bXqEn0dXrTMCcwIDAQABo4IBRjCCAUIwHQYDVR0OBBYEFN/f8xeagPAI
+czKwNinrv1hUBXW+MIHCBgNVHSMEgbowgbeAFPlCcsRvtabDvmXBjPdOWlsOMBgp
+oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDIxDDAKBgNVBAsMA0lj
+ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
+BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
+cm9jLmNvbYIIJfNaIO8KiQUwCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGC
+BmNsaWVudDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQCjh3XBKIP18RXealWE
+SKvpKwZ8DebdAB2BtGK4pGlWqB5hJ87lyHvG3U/wUGTj2LDKhhdXgS1hGm3U3QFm
+MGmGmygUUpDcu9EfFatysHriaZOM1nwqVTQu0C18zLaTX3yscUEeamipPuGPG1yJ
+CLDtc3EUbFtCAK25lbUlalQFiQzlCIBrCLbglPnv9OGDZkI7z1S0Tjd8vgH348Gs
+sb3CXH+q3zq4OhXDc0/m1M0WTL1rVT9EpyYgdNQsLqMl+k+O8PTuOkq9lO3HJNZk
+ou3HHBkoJwPEkI2JSwT0LCJN4QrZ2ooRRNSXrvU8Wpt+cWDicqSAOGYlIZWN1C9B
+iRtY
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3.p12 b/cpp/test/IceSSL/certs/c_rsa_ca3.p12
index a9deb82c8f8..7bee24596fb 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca3.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_ca3.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca3_priv.pem
index 6ac07c87141..f79d7824762 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca3_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca3_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCUQpl85aRm4MBh
-wkhF78xikPM8thIDBlKQ51//3Nziwsk9HeLmGFm14ozUZ2HF3YZpwosEn2PE7dAl
-13fi2FnYSyGLgGr507Tkei6fTos78MgJKL5DVEnuYz4OPXuntZwu2fj6zTCRPXwG
-IEMIO1e3s0j72jBkKg/PzKV4IoL+dU+5pq5EMfB7BrPnAgBwgVAPPBTw1lYUz8+f
-3w2xhaxHDBqJ8xepGaLfNq3PfwqH96CyGm/CcyGTDr8Jc98Y4QpyHiJUYhQBIfB8
-XTbmyyrEY08I9aZwDu5W7eUCdtXp4DiKI7eBKyiDz34Sb7m5DtNVg6dHlfX8gMkZ
-oEsznkWxAgMBAAECggEAdSsBBBy0RX2fbGLPHT465zaolDVLnMpVXCEO1DVm92p7
-AWrqE2/xDfZB1+bv9SByBojxtrCEd3B+DDnxi/vxXSdbFlVhtZhjICGTUOEQ1kke
-vWZOnwUw/E3AEB7054B2MuyegQ7CMDZIGstKTmofk5UDu84eajp3joCr0HptzcwS
-TFDOHfzHtjadfPR6lPND/dZdCO1NtlptqrWX98P23z6KwbMXHmqXlrjzkCBPf1Yh
-om60c8x4sXvSf7cXMvTOIEacGrKSkcnmEk449OFqxNKh1J3nRNIHcJBahroyWQK6
-F5bWWG9aUdj8AHh9Ene01fRykV0EdpEaEF5JjXQFcQKBgQDC5UCmmnDvYR844569
-QLoZQzN8ul8ioHH9xoLWN0PdrvandykiF5s3Za6u+zHTXu37/spz9+EZdxFzVifq
-MyvUy1k6+ePbvFUbaoOJYXIam3NITqKsTq2sRp6BTPdOOBW2DFgeMKIGCpycN3kw
-qA22YZK+HCTCWr4f7gThtRLptQKBgQDCvkoDJDnYoUUQKbWFo8uUK4ffAF2TGTiv
-SeVBkaL5Mxdm4iShSDG5HSsUhIk9+6j7p88YzsWrzv+iOwHH+jIO49VOjTyoZfQs
-IBvTTD9T9Bo/vcK6dEsKAozuZvgVW5MBziUh2hL/x32O38egQg6srMxyD2ds/+Cj
-9BLRyul5jQKBgHkzgIUbPmhfib8jLrCa9CCJvhcu/8LU7I7ZSLxXGgleqV1zqUze
-SVSmE4AWDuJYAr/Xr6d227Guble/mIr4z6VB4Hfgt2cLNBIcpzhkNUV+rq6k2F03
-gKHGOQRIDPPDxRy1iIcdz2TabJJpnSA5Im3tOAiqD+Id9GZ+6uJCbUSRAoGBAI/d
-gdHGTlGh+eJR3b7HXVqtueddXsOPq1ebcJi63TnZq50ezU60hb8qNCwpKTY4FwMq
-Wg0Km+8rsaAIlW1FgPuNBoTMRBZnkzWR1tyHBHWh7E5Qgm26AcF4VuK8AOPOTdDU
-mIvkjYqVtkT5PoE+q5aW5UYR6ScV9L9KTSjdDRP1AoGAUqxt3cef6SN6wMmmisFo
-C0FL3ZQvdS5wo3bFHYDkCivvz0mftxLh1jO8oLBAP6xWvVrhN57CTGxMRCcjqxlM
-y67SXdG6ka/x9HxqEM2e1Ht0rC27b8pyzx4Nhj4nR5brxtTXvbTVYm0HY84oZXC/
-NYd5c1hpJc/nTXHZApN7eYA=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCnJcqoYaq589Mt
+0gyelqTdrH7FJ1bP2M/FrvQp96cxedB8L2gvLoIl/xQHe/l2MD+dPnIQhDBf/PsI
++aMErbuN90xVu/dWbvGiNpkob1lJd6DEHPbFRrYWnqgOTObd9T98PH332pc+lOlD
+5hbQjio3/0n0q4ou9INbmIyytf6ewMx/i8SLyDtYx0+IqALq67HHZq36Uq+h7NEx
+h/4WhYvsFHUKLVz9EgdgrQkrqJKv02hWhc+AP4UZKhjd63uxB1d5338UHDfeeOSf
+pe72PdO+d/gEY7ddi+B9OZm6Hpnp+ztrP9b8Ma7+6WoWm0+DmDSCH/sRlYUC5TWw
+NJr9J4VxAgMBAAECggEABrdwjNKb4ywGlOVHZ4oDJvs6/t4lUWXTd4yfuB4BBG5y
+L8NR6u9yAGffHKvhKtwmekGboMlHDlxilApAADyg+EPzN9C9UCZWJGAQSH0s99RM
+TAUj72p3f7Ixa52we0PTIMFniHGquTOPqhBRY2ELFkP2a1QHUfq2WpRnNvk0OZnS
+GxCYVRg72M7UtNgSjOgj7XCJaLxuPVVzXpBTqW5XEjeLnCsnzMq4OC4O3aLf73db
+6EnwezaBlAUSfSoBfP6TgRTtwich3UUKZLzD00tAlJXIebT0Wv2vWCI2prRujVvr
+I4tLTXp9oZCP3fB39WYGCRGsj9NXpAbEOo8WE2oPFwKBgQDWn0npoBTQB/EKMnmM
+IUS2iAU0p2FIqChxucO+Fg2OWV4EYrqwxRUbyGrh0ndhm8C5nT7EyvHVi5g+yUxD
+i6iV5E6YoXGA+eahQpMwGPYRgiy8jYNE2fVbEthtpX49zG5UyKJItA0BSiefQEHg
+FGvSorrQvZVNNQAwanHiqQY9JwKBgQDHX2McUu4wEBQYKoHtoLVu3rW4Ytor8a4k
+ElvG5yVD8mdUJqsz7Xmv3pxb99zOq3KK/CwWst/cHu5k30E0ECwcQ9HZ8tj7+CsP
+VGf95hH3OvI7RVsFmLodnSpqcrd4eOGR+ENcVqXC8NytYgGReGjzMO7l2Cp1ZiIL
+BlmG2WP3pwKBgQCTMzsJfl7n85pxqP7Oin7LRm1zmJ1TrOnYXlWPiSaRDGA8V869
+sN5yaLpN2gFBNAcyB1Rmut603QJ1hbDF3wKok6cIbiogEMYKslOrOGOEzKiMRe7T
+iT4L0dgZE9mK3yyI//a2MK9+w/J6+iJ0Yu000aGZy32cL47KpicoE0+RHwKBgBTJ
+dDryxpTKSF4QqIVPGTubCtVTsS2dwCtQorMFTJReBLn4YidC3kog6qqIGESQCZxG
+GI6xTbfUncR0poa4HPFBfPK9aDQ1NsAda85EG6FsSu81Fv1pZBZMWazJkymDaPlg
+Kh3JhvThShDlxAYXyNF6S545QIwG/wupONJffhXHAoGAeZ7TTa6JXj9POjpisP17
+2S+m4zJ+iiqXHby9QWnv9fsuMHsqyMt4RkJa5EhSFuUmaOoF13QfgZZ88r3nKiV2
+XvrPElq86Z+d8Esg90mluz6qf2dOGcvFs9fTnkiM7S/PfrYUKgX2idRLUHPjpobH
+vQ11mH0QR5uv/t0Rgcs/3Uo=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca3_pub.pem
index e9e35f714ce..94680231209 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca3_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca3_pub.pem
@@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
-P2bkRL3mU/Ba
+cm9jLmNvbYIIMzs7dCK159swCwYDVR0PBAQDAgXgMDMGA1UdHwQsMCowKKAmoCSG
+Imh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2EzLmNybC5wZW0wFwYDVR0RBBAwDocE
+fwAAAYIGY2xpZW50MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20w
+EwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAAR5+UHnX78J
+dOG4MbqV2TIb4oNtaTTC6e86xQ57bFSG4ioxMD0sTmhl8/bvbzFhIKCC6oxUh9SL
+PaWbWeI4UOr6YEFGfsHmmx9nJ8cKoG6pTHNWrAkoaJYjuEf8OhATk9tfH4D1J1br
+s2vpPOJXQFsVZ51GK1PQGO6X3qP+BotUqEKn+MquuJwOYdtkxqkrKvkC9/0BG0Fk
+f7YpQls9r4M5Lg08ZNqBhu6fWixrH99j8HgsT6qnxRoTaguOd9dSYwLmHQOC05gB
+M9aIjI3IkcWGPy+XIbnTkwh5Evj51jfMZMLS/0+tYsLOYG5GY8iEVn/RiQaM93i+
+lG08H+4bASM=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked.p12 b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked.p12
index a97b9286d62..61f38fc2744 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_priv.pem
index c634d852c87..02ffadf87c3 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDWsate12k+zvxC
-pDtPnql+P/PDjS7cPiSo+dEfqFBTpc/s6RucW5Tb4ibbkSt8hnUyrNJ4lKnxCxBv
-AUJFB/LXTjGt78v7hPGXhdNAOvSG4fgN3nXf9US4VNKsAQWBL/VC6dHuRG+J2B9P
-CRwYLJl9SZ1xrDLOfKrnMTP7GebZjwOGOW2+vwUIUB5m9gTeEyMwZYoPo6r+8i+l
-8INo7YX/lvX6tWHsQuO0xnQL/Vss2vcP4+wOVW2xAOYR/U06qI6HPau/az72WRk5
-6MwEkQ4Fqlv6Ttrk9S60VQg2hHibidoWlriMunvxjNHI9vFIXY8G4HHF0qanD7V0
-fQlBSsfHAgMBAAECggEAIRVh1gyVwEL/JnnOVfeaIMVUF/dCmFfPKGbOrfUu46Ty
-hIxrX83RA4029bDKJbdGiheNm101TtqonqJwBtkxt7Hp/+aq5UhYPkQ2CHjNQ5fA
-tMpqGafe/hS8HhtOMNkmDziey/upwHEYagJ6XNNKl77nTyP89ErLvzKa0v/rzexu
-ak1qWH9AB0jkCnUShqnkWpSHr1oQqVHNLaLTr0EPMZ7Ntlh91ld+OVtSf7N5gm2f
-2AAozHrGfoaya57fkzyx0R4HWikpbVcSmoAa9U8E64wISyvNXgzCCl18sovDLvJs
-EzrZYL2eOKMTsCfgBSQVV4WDtoOyB8qXFrL/4thUeQKBgQD8Bw/qtjk7imk1o0A3
-NDia92HEZ3CPXSQKqsKkzsURchKkLQ/DqGPFzihHB8O8ir3Yvek4oegxLKsHlgxa
-fcALBZANiQh3vehlVY5F1KbGUA03jcwWIEohVJsq6q2QkA3H7RCZaGbhYdawS3Al
-nVHWKfUuFzATQrqIVhPZp0OJOwKBgQDaE/cgenoP/9FhMGDvaOYXQWIDXA601Pkm
-L9Q6KS8PXhbApqEtcNUW7wUYvJbfmvZAX530LJVQW4tBadWkbpKntbLG/odkhh9V
-bUvpV5ZEgEfYxvQqplj4QUs22oSA6C71Zl0Q7nW/+FhBTChdraD3Dd8kP6WHHFNh
-Jy3uLgKy5QKBgQCFPNqOVE3Hi3H5mFe/l40BaB04rxLTyALg3MvQQzvt8CeoweXe
-o2wzy7yBaLpzN8oMBsKAXSAatymn9gyL3oUjjopMjZB7dVuiDuwLQNP2baW/I+is
-Hd/y5P6vXqfpkC6o7kxjPc1+A7JzOz6LtDLqjP4AouOYmyNwJkmSPJo4twKBgQC5
-jfFhRjUj9eRfEL36F0RoFy7hcuvke64/CsVGc5JiPgmYBG/x7Say689nW9f4DK9o
-2LLadzDY/fuAPiAVWCwa3SRv41SqeOCiXGwR8H+ga5I2ZhqNS5s6KLxpwQardGO4
-VE/tvyibniDh9n4GL11duQTbn/gk/ToI2UBgf++17QKBgQDdFWCJWaZwUyfhmwLO
-M+QSOHi1PsgLy36ani63HgOhZ+c+sXy08U8tmc+DYSfGd3r47OfhYnQmvsa8eb4A
-SaT2rDepP3kNavvwBvOC7jZQihHBr5LHHT17ZGMfCZYlWM6+3odGZFZVJoqtnh5r
-1uL0AsIAvWiGOYkVBRqVBBemKQ==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDy/fDTheRgoP2R
+SJ7DY1u/5E6xEwpeX02/vImD/RzBdRpDBgkSsR1Y4QA9G87OUlaFOh4OLyyve9gE
+ci5MHASM6vn40ms8bgjxJbTUWzy0v6PT36eMGTmVASFZB2OJzIVkgz+rrU+GxeFz
+kyhygopiv8VJtQgkBieZLjQgJ+wX3E2t5ybBS3uFHWiH2HuSkkXs+t8OlE+KKNKo
+/1ZFmaeCFfyA7JcPF7sfmh84zdOcJTyejwfIlAVb98aBl2Krf+E0ciQVB/gHH5l8
+L3daOvYIjvLvmuupArofgYqXSK003KZsULjSwhQ4n6mC5s9GbY5Pdwwxh6Rs3/yF
+wncEgOhpAgMBAAECggEAB9a9wSUg0L+aaBuh1SD/oblTLI7PsJ5+DjRrDBExr0ma
+A+JOKQZofiiFogyjZ3zsG51cJ0FjikAb7OP+FSh5bef0RNzZs5GQXXv46tM/dxlD
+k+wAJk3eBK3y2ttl9tkPm8ZI9It0jritfqJkFXJoPBB+fdOgPc4RBikIBEC/DHOL
+DWJKiRnhjaO+h6vyBc0TSzp8vJ9DVJI4Xdo45u67vYCgp04C09cS2sYmSS5Dkaoy
+ymDWvAyyTuZ/aMWPS8rG60gwQR9CW6RGm7Xf3e+PagXogu1iZXZfhL8v8fBitWRp
+GsRtHqZ+4nGpN7L2lQO/HOP3BRNcuc/HqJmHd7k2bQKBgQD209Dd4vu4hivgAnb1
+k3eSZL2IVMaV252bDjZgQd2YU4pcB5BK0fZwnwsTDuTHb3nnHPY3KFLGa6UN+Cf9
+V4eNiKEaMCiFNNpXxLPbPD2c77hpU1oTH1b+3s6D+YNKLzAD3yrDkEYLjTvA1bRD
+ixT/hRswka7BM4hK0sboYBqxVwKBgQD8BaLsdN4tLHXDS1K9UKfsrBVWDwYiB5J9
+af0bK1NPpMcV3O8P7ohx36KPL+wa4gkrQANhlFYT57mt2UI/KuOI91AQyFTLnRXh
+vuIfvIMbDflSRQ9OhK+PYYA1AEuFJZo32mKixEM6az7ZYEk0C0V1jTmmXanuJiyH
+1IAvxuxcPwKBgQCNvu5/vk5YlZS0vDWcqedNBtVhaW3xuYE0/mBzvt+HDtKyLxXK
+IfGok21EsJTpgzc6ZgNvgZSnpkHPV+d/MbkCqqf55hYfCU8qgCfZiyrG6VO6CMf9
+m03WaBWo7K1c+ORWFN72F/BhyeW6w/8VmtWgN8x5g/Abu4BVl93qrOYnWQKBgHle
+GYT4DxsAI0JGnvTux7/Ra4EDQTfYH7Ln/O09oyRivUGJIVOx0uHMChQcxv53RmUe
+scInVoDFgoT3cNDMzcDjIRrD7xoTbztE2s7f0N+RjjURbvqoKYfKM5zSpIvdfPRS
+5lduXtXeWekDVp2KpAulVFMLHk/C8IUFUCoyCRevAoGBAIRz6ePhSrCLxv3PMJAj
+gqasGO+/nmeZaURLl3Hv3r+Br7rF1PMiz0AWSuh3l5q8WUY2AfTVP55Y03q0iG3w
+xk6p49dpoF5wqP+uG2aondh4gWA7BVTFh6sZN34tVbX/tx3Nd0o+scPuQepD0xER
+WsZibhh3Ovp1SQKrfs+NwDEn
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_pub.pem
index de6b964d21a..0d103be1b6b 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_pub.pem
@@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
-MIIFIjCCBAqgAwIBAgIJAKAoXFyhnxKnMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMTA5
-MTYxNjMyMzJaFw0yMzEyMjAxNjMyMzJaMIGRMRswGQYDVQQDDBJDbGllbnQgY2Ez
-IHJldm9rZWQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAO
-BgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0w
-GwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANaxq17XaT7O/EKkO0+eqX4/88ONLtw+JKj50R+oUFOlz+zp
-G5xblNviJtuRK3yGdTKs0niUqfELEG8BQkUH8tdOMa3vy/uE8ZeF00A69Ibh+A3e
-dd/1RLhU0qwBBYEv9ULp0e5Eb4nYH08JHBgsmX1JnXGsMs58qucxM/sZ5tmPA4Y5
-bb6/BQhQHmb2BN4TIzBlig+jqv7yL6Xwg2jthf+W9fq1YexC47TGdAv9Wyza9w/j
-7A5VbbEA5hH9TTqojoc9q79rPvZZGTnozASRDgWqW/pO2uT1LrRVCDaEeJuJ2haW
-uIy6e/GM0cj28UhdjwbgccXSpqcPtXR9CUFKx8cCAwEAAaOCAXwwggF4MB0GA1Ud
-DgQWBBR1ETpFd2k9ytvwkaxU36+D/riDQTCBwwYDVR0jBIG7MIG4gBSeyMtKvfMz
-iahOoc870KwneEI9DaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAz
-MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdK
-dXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3
-DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDhmDhJRMw01jALBgNVHQ8EBAMCBeAwMwYD
-VR0fBCwwKjAooCagJIYiaHR0cDovLzEyNy4wLjAuMToyMDAwMS9jYTMuY3JsLnBl
-bTAXBgNVHREEEDAOhwR/AAABggZjbGllbnQwIQYDVR0SBBowGIcEfwAAAYEQaXNz
-dWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsF
-AAOCAQEASfYjRkHSx96/vPRNb521SLcF8NF7MjtNWLTMz7rSlhpKyXYTfe84tIn+
-AYquDTTxuYCN1I0wQRFvDyN2Al2R63craAjDTmmzG78s5JG6QCx1WRyRsE/XjHpD
-U9OwiC7hBp1EdarXPaRstutTG+DYULzvoQ69EaSJh9enjdfYihqNw6XpkYhQGvlr
-p59rBLbrx7dmmUbAKbWlzfj91MURJbGALXstCP126a09qZdWlR1RiB+KGv2iKr2x
-Az9/6AiUyYIIM5OttrmF/ebhbrE7/lGlTzJqtR3E4Tc25c+5MBeWtT/G83qDIzE9
-2OmR/GcVOL+mPvZ+pdza/4FsIxJing==
+MIIFIDCCBAigAwIBAgIIDWOdbRTyI9swDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU1NFoXDTI0MTAyMTIwMjU1NFowgZExGzAZBgNVBAMMEkNsaWVudCBjYTMg
+cmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
+A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
+BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA8v3w04XkYKD9kUiew2Nbv+ROsRMKXl9Nv7yJg/0cwXUaQwYJ
+ErEdWOEAPRvOzlJWhToeDi8sr3vYBHIuTBwEjOr5+NJrPG4I8SW01Fs8tL+j09+n
+jBk5lQEhWQdjicyFZIM/q61PhsXhc5MocoKKYr/FSbUIJAYnmS40ICfsF9xNrecm
+wUt7hR1oh9h7kpJF7PrfDpRPiijSqP9WRZmnghX8gOyXDxe7H5ofOM3TnCU8no8H
+yJQFW/fGgZdiq3/hNHIkFQf4Bx+ZfC93Wjr2CI7y75rrqQK6H4GKl0itNNymbFC4
+0sIUOJ+pgubPRm2OT3cMMYekbN/8hcJ3BIDoaQIDAQABo4IBezCCAXcwHQYDVR0O
+BBYEFMD7rGoH8CoJuZn2X772BEWAMJhtMIHCBgNVHSMEgbowgbeAFHe0egLdUvhu
+GR+r42ytSFEH5G64oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbYIIMzs7dCK159swCwYDVR0PBAQDAgXgMDMGA1Ud
+HwQsMCowKKAmoCSGImh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2EzLmNybC5wZW0w
+FwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
+ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQAD
+ggEBADgGhqe+LXYXPBHRn3E6VkPWQvsE/b51fFyytoTcke6a6WvXHLb5KuLhdzMU
+jotmb4NAQDqfslq+MJUXcHHFLi/3dS2p1/mZBm797BEGbSvwBm2N5O+FYRjbKgLN
+l3aPncpqIfQ1EfU+gy+ggPBmb0Ssjyvz0lxn4fBjA6m4FwA4ged4S2dfcLlpKr9x
+wZfaYMovPVgs/AwHIrBB0veClDiynrvBlIc9OYYbB3RO/8TnkhtKyBGCLqcCEejF
+ddtSvTH1aHA9NW0tnTVwGtUP9NJjKLohcAxacYJ+dQeXfrD401XRClEHE3NNLGjC
+wzFUrCwDtHy1FXmp3GeKL/pOW2c=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4.p12 b/cpp/test/IceSSL/certs/c_rsa_ca4.p12
index 713084f84f7..bf3369e9777 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_priv.pem
index 65286a9f8ca..423ed32b2b5 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCv/YpTtjjzMEtx
-QGR3XStEngq7rWJcT4FdvSpJMFPhe1VWRycBYUnfReZ0NpULgOvWnufaXaFA9V3T
-eRtWQP39lXIr1yx0bLjK7NHOWDZ6cRkvI0nfMW7aejOcwC5UlE9BLiymhkKIu9iY
-onoNba2GTy+4Kpj9byopKroYrq2lF0/aLw+Vr+227Nd1+0ujKIjwWE+/ujzVCumQ
-YHhQWb8tQapNhS6ggXnrnvSBuQE56VAM7mmUYV2IAtiBhmaMm0SdwJ3jsoOAwosb
-/88YpdJThjTU1+zzFFk3NyNxAV1cu+TT3tbNWGvckMDWZjjoq+U2BwnJyH0xTW5S
-BCf94V4ZAgMBAAECggEAI8xsHdkcPoOdZP0XMpyWF5AaWNDNCD/37axz9I1LEru2
-wSUaDxLOJwed+Be+O6fO0UpjmSygh4khu8mPwPzZbYK/xaEwXsJa2JRRnSqeckud
-NtRzy13P0cs3wnPpOLUuZfDRjlITKKMlTO8H6sFboc1rxIeNtUeuiM8zKaAmnEUK
-JlB+tJDuXeqCBplXralqIwg1/dO/gL1ziuww439vUKsBHrOo8v30fEk9w/snLXnn
-2rzmTSHeJGmxj6KUjTpvR7FD6aadm0/XSIkit2TNnrSeD8pNJEWN1W6Y7YP0NPtI
-YHGWrdfglvAAl/gWv/+Hi+m4cHNUV70NKo6ZiFyLAQKBgQDiU1lWiav7lqalvRFy
-LWHV1grBftUntxomcXBQ5RLi6Eg6hh2NIELOaPLCRk1Bu9vvdEu5prsdm2v0dwRO
-NOz4SEqrdgYRNpVn2H29HyI9woEr1K7wRo97q/enPeeAI0OooiZKajFYJ/SoLxHa
-aa/8EYHxxeduBC6ljZI1mCHXOQKBgQDHEK7zbInaJN2/jmjMK9dpELHQ42/lscm8
-S+X16zQQXb2VdijcnZbhi0fvOjGFN6HGSO1UdkwalmOAyrFU7srYBEIpwUF1ptfY
-HRzOWXaUU4akotMmOA50mQwDY5xp95e9sA96yesYuJykm7e2qDBm+Um6vbvT86f+
-fJczHQ/d4QKBgE4aJUJP0CHKI0gert6P+qsoah3L/xLthQCvNOs1ogbb0dEgZyJE
-d8lzPhL837xHb+Z6Y4d1mizlbaO3Tq0OZphnmh0BZaabB4QGmZ2iGNbnQFw30Qbp
-0qoC9juoiTMW+EpBaqVTcCPT5gID/E07G5gJEqa0fODiYJaQ/FuyXDtBAoGAK/bJ
-TMWp5F3EA6xmBMGh/3hKbUHt0qLjVQzGKvvZMcwiNMI14BOF4SYrqvAFQ9C3j91H
-XSILSMvyCd26MHHUpsS6ABLIbD1+6iHz3Lbxc2zHDdFQJN64gpPSjWUQhG7EOoaJ
-xKqXm4waPFiPyG140yU3XWDN/M+RSKknk4hVmsECgYBTHkUcfo5uFmYi1yokQdYO
-DCbFJVTaJICFayGUeBhoKjeQa9GN6Lng1SuMvRjLjSobiMEtCU2AsTRl7bQcjnGI
-1MJwJ4ZGlU3FMy9lfxSCwdR7jDSA+pUZiiuPIYnEV0JTp1F8Use8yUd3cE2hAmlF
-sw+//1EuXFf33aXIIgU2hQ==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQqbH/vtIkYgV/
+Sh4lO62sbQtRni+QI0YI2j6hCp+lUgcz+S3sa+Hs2gw9IKzDIYNh+CmYBaAbGN4e
+Q/EGNYWyzK3CBwIVLmcgfyJGS7yX2ywEV1XuAvaNrHQpOfKwXKTclSZrqJ3Kw4s0
+NIcmpAaZ/2/dzcm7fCWQnIU1XxDilYJc/hbZFaCE0X5rik0z8anSZpj3w9qiZ90/
+SP67Di/YjWGFuoWnpsVuTDvvL7KeEQm3HnSZ0YJ69Il9BHcXPFf43W4xXXe9typ3
+/tUQ4trA9ocw8E1tcDTu0pr+49QYE3KuHl9hWlSu5jWvq8f+I6A+F5gfiDBWMNMi
+k0lko0L5AgMBAAECggEAAOwP0fq/tdjhDAG4gtwWdye/QbmOSEDhLR04RH27brBD
+6+I17IFzQj1dNHtg9ckhLSA69a7WA7lnK8od1hV5UwU93vQ1WwFGKInwbwbnOivP
+NkYUh/3I4nsDYe0poa7X46svWql9hrzpuT0NPDqTPglDzZP8eRh9i4gOr8mZMQcj
++cq+BHJpCuvfWSg2FpGWWxsVpSLvXqzQVxjhcJ9ayCZujkkYMO0RQven0BiULprO
+FSRX5tO1h2NDWS8Jo2dgeN9iO3ULXYmuHx5CoI5uMA5j6p3c6L5b7aULxHhqP0M2
+PXn71DyRHOx0nDfonK09Y9dvDf3Bfhv6CpjjCYUMoQKBgQDxAO6JjG3aGycnCCwC
+1zFPQHmtBiBf29TF/zSCgNCzYml1YyUB5EqOXnv2FzMHE4DJNKJ0RcxfilTwqury
+0+InAO2fozAeBY0RDdK3tfaAA3/l1VlzWR2NsSDyQjnRb2uxYCRq6BVBmFMP0C/h
+P/sEdH9Q9Y6NdEwbIRhTw6/i1QKBgQDdpZdWys3bH4iDmaJ45kGZWNbKlJvgZGxl
+MrXPVZIcgolphc7XwmqHV2ZwUrdPaMaIHKrlB1Y6C/TQEhL7Pn+YClTxrIh3grXO
+oM5kRd5lVoCA+7tNIFWYVlcXx94TG16ebwfepN0Cnidij/pIjQrqziuQPN+TLN1C
+/UrgpP/JlQKBgFR5+yMDsk3NTsADwUmNnJ8m/n+Dsj1nlQGCHynPdVgrmsOm6QXs
+u6WDwPfV0fEdCPt+E6OmA6lJl9R0VL6hPphlXuWiEe+0Cmp76eyzP6BHmcE6M4yX
+JCDSgbXpONMMtzcJeDpw92JyvkrAssfF4XsCSs5aBInYxgSMaTaTVUexAoGBANN/
+V1HyY0xcYp9w0qAa1y3En/DerX8JVIWcRfB57tpVlVmj3SP02EIdHBrCUzjq+caX
+1FqHDbiGAC0rkgE8OfSSp0uVHwMrLuDkgQ0dvoFkcWqiyq9l00dx29lNVpNU4oy7
+1f6Vwm7lCx/50xG3xFsaMGeKLqz5eoiZugFycMGhAoGBAMQLUto/zb3in1qevK6U
+d8lIXN1bwpywlpIIAW1MVRUbpeiaZ6Io+odsCk/piVF6JoO9R7HlLr6u763dICaG
+W4T8CncJO4iRVRCIl7xsUU5EiBk5fuCYCMMlrHVExhnr9I0cvSHFmwbVTsASLJdJ
+62g2n7xxvqsR7l9/AB+JomY1
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_pub.pem
index bb7f1888fcb..7b99c7eda0c 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_pub.pem
@@ -1,31 +1,31 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-Zm9AemVyb2MuY29tggkAgSvhMIVd41wwCwYDVR0PBAQDAgXgMGIGCCsGAQUFBwEB
-BFYwVDAiBggrBgEFBQcwAYYWaHR0cDovLzEyNy4wLjAuMToyMDAwMjAuBggrBgEF
-BQcwAoYiaHR0cDovLzEyNy4wLjAuMToyMDAwMS9jYWNlcnQ0LmRlcjAXBgNVHREE
-EDAOhwR/AAABggZjbGllbnQwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9j
-LmNvbTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAEjSd
-E3TMx6c7dHBQ6+2hSeE4WvwOjClomYCSk/RPZi/Uw6uFgJO6mh/WgdaXm4HHHU4k
-GZ6hQxSephZgZJZ2Wram5Gpne6DaXG2XvQLwYtL0RgWCx01lFnaUSExNEOqzjGAN
-ZQ6WE0FUF3eqkQJKLXHuvJBJ19iABADE+jNGlO2b9XlyaJUYLffHeW8ESVZd0Npb
-FNsWpquHWW2nZr9OFYuoka8rA8aWMmN974d4hOD8JKU3nSTMJ767oz29n2DIO+3y
-YWOh49JsZdSMgzmy/xmLVY2SGvtNIwvzTTsJO6KZNkuFcvwYWiP05IWM4S365MP5
-RsBWAQukVHG4KkN+TA==
+Zm9AemVyb2MuY29tgghHBPovLA7xMzALBgNVHQ8EBAMCBeAwYgYIKwYBBQUHAQEE
+VjBUMCIGCCsGAQUFBzABhhZodHRwOi8vMTI3LjAuMC4xOjIwMDAyMC4GCCsGAQUF
+BzAChiJodHRwOi8vMTI3LjAuMC4xOjIwMDAxL2NhY2VydDQuZGVyMBcGA1UdEQQQ
+MA6HBH8AAAGCBmNsaWVudDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2Mu
+Y29tMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQBBRXny
+4ICB8gASz7S9e2rgu7BlWHqdHDlT2io+WFH9oT5SroIcFT/d/Kix0ic/u59dnWSB
+4hVATMePhzixMic2Ln0Hw7KDfo1Z45jMcfQkHuf9PSpxY6GLat0dp24Wtb9NfSG8
+AAPL7NlvadBozvjciAcZJ5isqLq2TjWbG/y8DsPMLdlZaJpD0VSGwa1ZTFpWErAv
+A0vpkBgR6QkA87dkgQ3PlKsFzo/lNW9v/CL8SoH5OHGzcaDfDIYM+8bQEXAWX8NQ
+LufC2qHMThV93eQ5u+FsaijYzX2KHLweLm2eL4OhvtXwp2NXQb7OQHYgTZbqdda7
+neiaFu0fBCKELwEW
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked.p12 b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked.p12
index 8d08b89ff6d..2ba036c9974 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_priv.pem
index 2a6eaa18726..f60f4c210da 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC+vvoERUzTjMAt
-Sp69A4BM9rXKmop93ThpuimG0tCkm5ataoR1tGn8EiITqGRosD1UGB6FPuF5QZ8W
-z7m6CVhkYMDCrDEL3C+I1DTU7KfuocQdur6zQn5nvkm9SLb18lWSVsMkGKe1fUPR
-CSrEw5VwOAl4DFFtVB9csvYjSz8MpJfUKiIyFJGKikn1mlslkRRfq6MCFDomzq+P
-ll3b2Rh4q+1qMPl9r5aMnMy5EEbhIJm2Mi0cUdbsB7Zpb2liDoiAYdm1gYq6bmsL
-AsTS9/hC2P4Z5BnRB+OzZ2sx9yo121+/VYYYIeVTkEiryn9lgO1VpPOYwS8Dc42Y
-PpN1r62XAgMBAAECggEAHudeJnb73YJ+WFgwo7r/fHi0N2EWcxH2Y9rPg5KAT0sN
-/Ia3c0KJsVdWwgyUSAnVxdwqhbgMW9Lv7Yg2NRfyhEDQujmfsKY55VdMP/sfsh/v
-YEmzP+PUCwbfd5ViXzKl/pGkCCMeeN8Ur7dmgH6XpZjOn+6O+sGYWzJ7gnhcfLWe
-ZNHblus7wU3XvBaP4MaPtrREREbO5rvSyYeszfC+MuGIn+dQ+Bxcen20j6oDPxwV
-UEfr3v5+KTMzzrz2tZHNLOhO7NTGcel6/SgQxy6MVJLbDYCPDyLYv6p6/AKJrkZS
-HJ6kpSCrbr3RO+J/quN71TMN64wBPda/fJWZHM7o4QKBgQDlKp5dlJCivqhZPLh+
-frvz0shxdZ3hctO9xoqMeWBSFrrijXQ1IwzP5ykt8MSIPWlGHr4/K9Um1ZFP+oWY
-VKUhBxzFndCC0etMmKh7wDAWATyYIxo2bCHFHNmvIcdNKccMC5SxE2HINz2cQSNQ
-MJC2vzWNZOvOSlmOYR6m9j6u/wKBgQDVFK9L2orDh7WNiQp2x17U6S5YWkmeP1GP
-JI58bibk3d+ZRP2NvA5v4MIAJ180H+YW+GS8ikB7PvuPOpN3yMhIf9cXutO38WLv
-OVTKOYSIQC8Xsb831bARULOSV1Kvjl6sQndcz8XvUNpEzIvOZVLORXPO+FTy7gwg
-NsLRfB0ZaQKBgQChvuLnyeQL+eV4lpLhNTITdcJj0lAMv68TUv6XB1QknEZrgMt0
-dbilRNKbykPspOuYwjok/BsFvddCS9/fFF84YHy+PhTdQKyC83x3W76UyWqrNptZ
-rhhnt2UtZvn0THhg2Auqr7NkTRj/IDp8bsq1MV/q3EBS6ccr5wBrd4HmoQKBgQC7
-CNsOJBilpRuxztbGiB4vmTa7CxWPuFio4xfHFRFC15aLfMlrfeTWQ11GsUiaAl3/
-T61s6ZXMGO7LPElxXWagbMaq560rytBi19obX/17c4tiqv0Dz6gqqsHU9J15x+hG
-IFmRuDcv57KPrVQSqVHUCZar18MJMfam2CqNovoP8QKBgQCkcM4/CxnqLL73Ejc+
-0iYTVjzQSYsRTj8ah1Ulx13+Z/AMs6Rp9VOCeO5GYaynw+wz+NI4ohr39zIy6Qxy
-ize3zVBBgp5K8MGHMxBS1JAW9rXBf5MPGIeQ1aCUFVwHYZ1Wj8HHOZmPYTITI+/l
-yGOqX8Jz0yovInddhzdyt2R8AQ==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCBF2s0aWJn1A/
+2u3KYh6VXydKgJAvO82/BwH+aC0n9onam/w55av+r0zUrlAznqKOUW9moif47E+q
+EPdOBHdMUmmGPVkG41167vO/ytMA7kfR6QoE1L/LPR8fwZNxGozQoFtS+XXRlJV2
+7QGgXhSSAHfGo1otqNxZTP+wCy2S0BwYNMz7jbTKabUa4AJ0wjHOSlHkPJT/iLDl
+rZlpHZy4h5Eo1Tsd7Hx406x0XkndvcMcW4QK+k6XnxyVH/UM/F+QxDWi960utXtv
+eGw7/RpNojRf1wtt0EHeMhwDWysC5/lKDqTdh755T+Aq4iRfg+P3hfhUtrjD7066
+k8eNBvEzAgMBAAECggEAWIquh2JrpdlHQcTzNSO/KlLw9u6iHnQv6qhTkBtR1EWO
+Vu5N1sxKSGIO8ZaVcmFIdSOT7+Y70L1jg8zXV8rw+Ks5jjIsEVksvaAULChvUCLu
+Ms0jrd27o5BCxnbMh1bjAYjU9JJ04s7owQvbbKjSwWimQMgmrOS9nqFlpJ0NUMyN
+GmF+rjPjwqbP3QV+XnU57Vn3Fhj1evHTmfeQsSrz6FrWzZrxHzilx40QRdTzmOeK
+RhFEFsiMPD9Iby9Lp2/3BUYgw8pZbKNRQpG0GMsTjyrwIB9nxen4U1bwgsO7FPR3
+XrqPuTMWPVPNHrDtGtUMwUMOdgQ3GkOYxfCRBT27pQKBgQD39790cw3DZjCn8xWN
+pjpdwfQyZtomVnJBweGr1bZSFMSn4tUHnWXbn34DpUDDaGaP+iSRgx7djSCi/1ce
+LyVtHSg/vZS7Xt9pspeNDrhvyMGJuc+JD53LcNpmBCd0198bnzLrZkheM4AuQsGy
+7cwBfunNaejVmsqrHf+OjnCUXQKBgQDITTx7DT5FXQ/wtaXNKXgzI3yBCorH4opN
+iYhc2/6uhX0iIUdYZWhDga7Zq+d249VQILmWudsiHbxKJzqVM2lfr2Qv2BntKyEO
+HSWQa+RSgkEQlRgepuuZ6osmcMQ+SqPT1dGXK5EOFwiba9FN5ziRB5jabYokhDjw
+AALXRMtCzwKBgQDI41eiGcver51fkxm1BiRm7MjPRHAbexFZoJ8ZPSxV1yly8duw
+LZ3ljZLjlS+gn6XnormZgWayCrGUG9USSRPDEEoZSZeDLNtGoD8TMgfN2BCjaXtv
+CM3HkYf9+gOVL4Y6tIDmIJkkaAjCcabHNMt/srfriI/u7Vafxs/RSCiAqQKBgC5w
+0fQJ1wVIFXkO9LlDwy3ALY7RvemoWb6ug6JcE4mtQ50VMDCLmogEWmD3nXwQSRYB
+8GXFA8y+LjjXLZsIR4c66DS7mw9FL63RDjOVAGQs9R7+IpCAzSFrowWvoaB7t85W
+xfiRzlkA+Cro7adtU800gLksKppa2cSzi/UTazk7AoGAO6DAT7Cp0sucuhBWZbw0
+x3gyqxyJnIjrRf2A65ur6WpgN+OneG+V3mdze9SO9yzfCahqR8yfYJNt0bgH+Gvt
+UY1J2r5NezsiZtCP/tWee1kJN4ZZBm3t+urXm0+fZNTvo+3J4s17jfaPDAneQjC/
+d2C0rSRDhGPMHU0LiKiWM4A=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_pub.pem
index 1273ab0ae52..6a9abb70397 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_pub.pem
@@ -1,31 +1,31 @@
-----BEGIN CERTIFICATE-----
-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
+MIIFUDCCBDigAwIBAgIJAJFLSHzG3e+0MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NTVaFw0yNDEwMjEyMDI1NTVaMIGRMRswGQYDVQQDDBJDbGllbnQgY2E0
+IHJldm9rZWQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAO
+BgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0w
+GwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMIEXazRpYmfUD/a7cpiHpVfJ0qAkC87zb8HAf5oLSf2idqb
+/Dnlq/6vTNSuUDOeoo5Rb2aiJ/jsT6oQ904Ed0xSaYY9WQbjXXru87/K0wDuR9Hp
+CgTUv8s9Hx/Bk3EajNCgW1L5ddGUlXbtAaBeFJIAd8ajWi2o3FlM/7ALLZLQHBg0
+zPuNtMpptRrgAnTCMc5KUeQ8lP+IsOWtmWkdnLiHkSjVOx3sfHjTrHReSd29wxxb
+hAr6TpefHJUf9Qz8X5DENaL3rS61e294bDv9Gk2iNF/XC23QQd4yHANbKwLn+UoO
+pN2HvnlP4CriJF+D4/eF+FS2uMPvTrqTx40G8TMCAwEAAaOCAaowggGmMB0GA1Ud
+DgQWBBQFtvX4gYeSTDgDz6m2npgZOGpOhzCBwgYDVR0jBIG6MIG3gBQUiznE73EG
+hCA1WDjrJZOvZumR6qGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSA0
+MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdK
+dXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3
+DQEJARYOaW5mb0B6ZXJvYy5jb22CCEcE+i8sDvEzMAsGA1UdDwQEAwIF4DBiBggr
BgEFBQcBAQRWMFQwIgYIKwYBBQUHMAGGFmh0dHA6Ly8xMjcuMC4wLjE6MjAwMDIw
LgYIKwYBBQUHMAKGImh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2FjZXJ0NC5kZXIw
FwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQAD
-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
-DBcGlsbhFRqHDgz7POzM5waQsq0=
+ggEBALCZy0O52uOqxbFpaulWQeGfI1vg7fpyvSSYNvzofwZ7tgIuj88xhS8lYHY9
+vrtNI5vVZ0vaFjrlIHY7Ovp1I/bU9M4UtBVpHK20Iw65Du7BnVutWSdNWViVxlVb
+c8mF/uNvYnt3zhtZ3T2vNxK9IPhrisE7eFBxNDWePfYbmolsF7k/hKOZJIuGunlK
+5jczgz+vAxlx2vz190yhWaZm7rXJY5PA3MFOfZl5pXT/qivhRex2yRlm2QlKrgsy
+W9myY4gW3hB3AhRhSjbULiFBmeujhijVi9dYluv/4QDNaP8OkMuyop50pJu7FlMM
+oFThpoDp8Gpexkh64Xub7UkkSNQ=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown.p12 b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown.p12
index 3af24e48470..6031bbb4a8d 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_priv.pem
index 8a1c31cbd1e..07d5c2d1818 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDUJr9NpNuMmJ4d
-vuWce6Cyp460JXg9dE/iC9HPU0/+HVwMLAuqCrEGJcGSuAiFW2QY0mremFIf3ziG
-G2vc6eNVlwwRQ3AD3802ds9WNa5nKXx/5dSvKNIahc0OAIU2gyJDuANVy92r0tYL
-NteRYF0q5vhgbUUkUDCh0xxzmtQUJMDEMEXQT/WN1iG2jjOD1uxyKsM1co924bgb
-0W01t4rrTz3C+gx17yRWFbmMaPy+wzm+Okt+Pzs75t2BZy5RvFkVR0WZvLn/+du/
-J8XQgAmBuptWuLYZswend8IpiGHBH5RiyMl3ll3DTvcEyLVsF+wYRPDxRCJDNEBL
-jpSs+W51AgMBAAECggEBAKZl2ciBlL5a+jGkiB3LjchyyegcN4okD3/h+2ddFjHf
-P1JAvclaZ2zF8mUsuWo3u3QInlAHMurSv1fYbCqyvF9mgM2Nkm9He4LLf2ZD5o39
-qSv7zWyxXNH2vlXMLLAL/LUWwG7r3uslDENxeXUKGylKTef77K5Fw0858WfvOYat
-uxt1HIfP/UmE7VvuVgT/JOULP4ogCwMnrDFRbi3cNVToKoh2Xnetp1IkXmEFBYAJ
-6DqXefokg44gtaGeTm81ckdwcuD6076NeYZh0Lz/vLtyV50hBAxeupaDAfjxKW96
-4pPZkBMwsbYeVYhb+Cy9EMyQIE6JH1GExifRfJhoe2ECgYEA8+IMEXTEwnyqSr0M
-9bzN+L5dNMY962Ujzb9lFWHwyb0h0RB/s3LbMf51O5EYle4zWElq5fm2ulpow/+t
-Cac4q33rXC0rHKW/yiH+PsZQajlMgwqTRfsd8D1EcLZWVMZU9C+H4Htd8BsnUCWV
-6xmYs7N0e6W5vT8BWVtHMmx4iDkCgYEA3rEa0Rn8b12OrGoBXROj8q4zD57N0qdT
-Sp6SpMuueZQlSiaoY/flimfIz0W/ODqmPZ5OnUN6i5hbMbld6J3YXq9Gi4Eb3OdQ
-+4mDb3gbmli5nsMPxeHrRR4QeVEx1GaY89Mxl1mi3ehhSPsM6vWVigMWTpC5Yk8W
-If8YzSniAB0CgYATnmOKI/KQEqdAS+T2/7EyCV5GGIxymzg+HN9s0OwlzmkiAEnF
-jb/ETcvwdsObjAXlXEKVLXldlFhJLBAnbqRIZ2C/kYKeU1cSU5m4QwvE/8b/46Hl
-R0YpRUR0LLbVKv86hXhQvpvX7NdEw0FEIFMAYbdFGxfN+XuKTKV1kPRBQQKBgQDH
-znxTNU+r1HPY+tvyWVb2vZoO39uosH0pLJJCzoXjjCrRF1JrL9eCkZA5eUkS+HyE
-OPAsZokjizX3rWw29LlYa0eOj+8iC2I77qxBbbDGkekqK7aRRB1GTK1XTKS7ALsn
-ukx6kfBxzrjLNIXooyTjSdXP9EaBkJg5NJtaKcQfeQKBgQDF6NyeB6U2Yhxi+uo6
-Jso7suuqxiJIPZt/XkjCR4y+YowK1GssT3BznuEUBAAN1OiBmFDXa9mh9xyHlttB
-JUvRjljSMdk0y+vXZikL5viTQC5KzHR2gb3OdBCRjZMeWWfP3Fcg0uK3H7rXh1vp
-casCG8NCs+oBo+FLnHyE1Ayb3A==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCzeDarjt7f4OOM
+MsWhPGb92JCENWhfhrHfAoy3L5HqzRhNQlc062KkZemdDnmUpQyV4NxqDRO6fsZX
+tu6Cif90+UZ42kB62w+j/tSjwM6IvLCLR2qX4Jw1i15N2OB9gV129+6D+5OFGjZZ
+JYcpfWdU8K5M87vwshZFD4s+eKWjtbGcHVuSLfJL5EOub3dSL+PTSvzBHs+TrYLX
+Qqlqv+lxzOvzE0d3RjEcKJbzia3nUHXw8oQ+2TYHA+uQlYnJUq5C5gyYGD5+0JHU
+K2rHvERAxCxLXeMhbEEt6LVL8/8OrTWGPL0PD1/QqYZN48d2alkk+s/BHLmmixB1
+zNw4Gk5zAgMBAAECggEALvNfEgihY95YiR/rNeAwbW5PeFbkhEEfnWD0YSQPv2aC
+Wgvl9pEx0CJdOFpGEk4PedJGt3POWna5+s5/nSTu8LIZ7pniToGqmNOc224gWgNL
+CFTZnPwEwblBJYp8SDkks2/vNRYGpMaTu0SnFIKbGsyQPM9ytmhQjSag3eoAI1B/
+Izwe8fZw2lXKNWVsFNR//i3LXlC37AtaBDjLZ7t0oeuMGpXK6kxZtDWl8l1ZqGkT
+stl1txlB52YJw+WWBMHT60qIdvO+FPzJWiB9n/FZaPFJEAlw9Ag/JDd0ak9fmYLd
+JVHTs+1NTBd4AQgpe3mQIDbSBRFJx31jpmqyUiKawQKBgQDzfYJJPXWtzPqk9qN5
+bdvgS7UGveG1udcgwVo4Fd8VRx3q+TLlOxhMdf6sORbEoUK0/uSGpPHWutoJKeKX
+7g5PoPXkxRgnH4PjwOol1ZFwKrfuk3Kjw4a4URR7FlcG6pzUVbyH5cmPOo3sxoKD
+T0sPtditreBoNly1P8CP7Y95YQKBgQC8sK0qdX0U/LcsYosunAlI0QHJscVzm4Y6
+6Wo/XO2qFZFdT29zF2JY7U6SQlnELCqhKFQCwlavsZQ5TaOFlVSTO/6F9bpUus0w
+pvWZsMSSj/9mYw5Oh7OlX/LAtzELxwi1wjACqqsyM9FE+rkZsXJXdUVeLQwqmtKl
+J5bWCVZ0UwKBgQDsJ//UHyrirZsvohL9dAK8sVDbQBEJGzy+hSmGmhfq4DXxL08g
+q0cu6YZe7WPaw/kZ6NomiRYRyNot5xThfD8fFiNHha2eTF+z5uhyV4gevR/14cZf
+dQVWATWXCBzSFXyUKK+ZMtJh+02ppwLwbliD3UBRewHasVcLZ9DRB3yPIQKBgGwi
+fDrW9gXvBjKDjuv5NEDstq+WF2g3eueMGP2TDgjpL1NgUKiOgCgiZ2Leb39DKHMP
+H4YtRWyOwjlMyyek+sEeIrE2r8AbBbiaFior6ZtstptArVRH5KYjpITY91yehdlU
+HhuJH283zvhPD4Ev9i004bok6tIHxCwt0f17gHZNAoGBAMeJXCDS5875SrXecbIE
+8B/xb0W5iVoGn1mU5vrGaHLg5XYbjZviCC/h5Ax0wEfnRTWhVeDhmPnS91ZoFuYz
+sxGvLn/IziRgNNg2kljO55gs6CpzdyWQfNjNNiv4RrDRYqvhNVuQEZVL3qcFvPgc
+pmv31qhZnU0PbFK/8sDF//VE
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_pub.pem
index 062775b7cbc..f6bf288e5a5 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_pub.pem
@@ -1,30 +1,31 @@
-----BEGIN CERTIFICATE-----
-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
+MIIFUDCCBDigAwIBAgIJAPanjHuLfOUVMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-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
+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
-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
+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
-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
+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
+nHLIk2q/09Gn63MKk9SZ6gQRn1o=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai2.p12 b/cpp/test/IceSSL/certs/c_rsa_cai2.p12
index be84f99a011..589cc2ad4a0 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai2.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_cai2.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai2_priv.pem b/cpp/test/IceSSL/certs/c_rsa_cai2_priv.pem
index 34dd7033f69..44ae1425600 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai2_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai2_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDSTD2FjAf1PFYR
-Sl2+zAzaY93t/GlVSQ+vjZb1vku8jsnhPDX997H+ui1SzakS/OCkY7AFy/z6vbB6
-+v1EC4wbsg0hhvpwdrfot9Fxfp/X1T2VLNuP4XyFs7LN0CL4aGidzjEg9umLYD1w
-wt9hZDcX+Ld1j40id/9kRSYpYaUXNZtM/clPwaDwU1WY46ibD/+dk2r7e/QjnZtp
-dNZam2cggYNaUoiED0NdOsZPOP9utulOESfm4rYhAZmAYhSi+/iltdXWp8OaPmrS
-gbsN4dRybMCu9ApTRKpM4a1XlLpoPqzLbSgdfFiKUDKX/sVqw9h3IQPo/F7AOLBo
-5Gn7Q/z9AgMBAAECggEAPlg14PKbpVtm1KdsVVUe9lum/pfXDl6jlNLwDxiEUXkv
-ZmO4Sft1vGOrbiHkXumzG2kmVQGdlSRJPpxMGzElL0zA0dC3TEIV0Zs1L2Vvs8fX
-AvOSf/xEM0sL1jI/O8+QPEBVlkU9BYHZlSVgnfncz3F/yg1ttOtIPoy1fI0jKVbE
-LlJMFuHmflfVgG/KI41hzmLSuXBnR0AuNx6Fe+oUt5gZyX766/nZUEl00vMm4URQ
-TWlv3lTCYgeeX/gZmopHJfhGod7iPUr9KAk7znqVF6zZ/QiWsNFfF4J1r+24QaWE
-HLi/Qx5rCf9mpF96Os/UzB/a8bG29LG9UHEraLA6YQKBgQD5WRWBZmOh0lXZO0mD
-wBwHaxQUDn5jjA5zuOoYdIY7uYMMch9bg8SMCQd3qYswHA+BLl7O3seTBXqHZihJ
-YDdnHIzE2WVaMi3XHerML4QP4kbMHnTamaNJWHudm/IWeaFhce4vSs+QISnh+F7w
-0CXI+9P557h9LdT8VnG7+bjc+QKBgQDX6HbQvm0XbIrQyCdwD3dlrmJ+1TtuQmv+
-rm/u+Wr6SSpgK5YBOv6ozpV0gpqxhqhjL7WLv/VJJmKAYRt7MaPvaa1LaRmC7Sri
-RlAgWVWeDxM8hWUWikLd/4nYagsFBcSaIHipKVogaLIlMqSABbMOJsRjVQs3ClK0
-vd0bDdC1JQKBgQCQNYxxhVUUDwDlnRtcXmwXgj9fhi5kxmjJVuXU9Pd5bUY0mYA3
-PlMbJlGyTFUaou/4p2ffvwqvphiCXHvqTAJe2S004AJ1EtZeNohIRSbcxOJrRSYS
-E49TaSA9PCbcBsZmBC1cHqlC01tUvH+0SL3BqpujSffyNeKbeidXLwtSiQKBgQCn
-ug+TWlulNs0gJF1+0IUQmMgrf7sLjM4Yq6qJG3nftbcVvsZpbksnGFVCjbNe9h0Z
-8JY4WodSrF8ZHFcc/RM9ifr1+k+3RkdqQPU+LCg3Ab8P5REC0aXgkAOl+7tTy4dP
-tKoHv/gj9TFvdEgWrFbNR5CJGif8OijGADkkKzdXgQKBgHv/PBHBTdHeH/czRZ1W
-yHZro6qmIUcCSnGhuVIIwuNx3Dgc++MoB/pfce71SINDBPnWMzxZcv1/ixSkWU0R
-a904rPsMzo2unYhnfsUpxT0xwEU7Sd0mXFmNK5qG+zw5eo/BCJfFejxSnuhfh3dG
-7LPXBMWpXSW4GqoLWHOXF9hD
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCRHjS/sz64gjW2
+Fa99PuctpduLByAFiE+4EHet7nLt4qkctEMQrYKHglP3y5HAwBNcKVlNI5oZRbO0
+2Mo65vPy6KQb7Ir6dvqgKxXaTYFcbeWK06O5/1aQGzB6vzOeAZjJ68pbZLm/2hKr
+7UkjGjwJeivZhBRoz2ZvEyvWGEXm0mBimg96Xm7XLUcMovgX/f8oMWDDjlxuKNao
+QGMXiTF5ziF+PJq2z3Z4Q5u2K/Vu8zaAMyFflTEmGn8ee4MaD7l/6NeA31sVkv8t
+5zysIaHpjzIJzmCkMSgYebACVdcjwiiycwt828WigixuJexKcJEdxGN310yDCT+n
+K99G5dttAgMBAAECggEAIKqUhCyUq1MARTc3dDGTN4bU10Ro1GX9T/lA/4GkFGGH
+4OLBEAGG1vsi7K5B5oo2MXJLXF5tw0+Z5tVAHKc9dcohmvmRxVTAEQrx1dzJiGVi
+nPAMNIPCWBkOvirJM0G3w4hU2mLfn0y3FEWLR6ARsK50LXgaYgeBzvIZVY3MOmt9
+GHTv7f8NZMJM56SD18EiaffaxpPaIsIEvflm/PLKM9wsc97VJnjdfQDVV2hRID9V
+iDv3L8oEP1Kfo/N0mfhy/vWpqM5KPODN1LM4zSkaIxkFX/m4gtU9nsnU18ANnfPy
+2ToudCclrAPv3luBOLmWDFucIa2aIqyvCD2ocad/cQKBgQC5XBNIPwG2dbr1Zero
+WNEJR3m9i0Fy4lGJMOhWeTnJOiAebpCXlLlHM7GAqjmEMnpNdOMCFi5BQ9ecTQew
+DnGPn+2xsOHd0gdwNORtoIRvKY+U4PMQBKfTPb3UE5UUhQe6lSDHDzzr5hrxTuTA
+XwmM1HTSkkt+TQhABrZq19GLdQKBgQDIbBoFNZEM0tYYhrRAtlWtJBXt86ZYjSp1
+SGJdxbJXueGzesl39PW+cOSzLRjg7Xk3w80kqWdsG6Zc19YwXMSpaY2Eo2/wsWo2
+Cd5VL5+JJaZKNCSmHtVoZLVSzJhs7kybQ5NURjx0FE2M77NuU1DBvRZTzOsM9pct
+KY+9zAOpGQKBgELATs1Yq1Q6534SGttbiMPPsp64tHQb3oMKUtE5TL8TqJds97Mu
+wt5KVmTgaGAcEYEtU8bfl/624MGP1/Hl8a1oSaAQ8/X++eDFm3GDOc4SaHuT2tRs
+6Mcg1+i0uJ4wHg1qQOiOq0DEl/VIlQZV80l9BSkDuB4evZbZE/48BGE1AoGBAK4x
+RmxAolEC7hFjAkc8MjrJokWt/mX4S26j+tqFePvGEuRrU69uuCdM93jDOVxFCZXu
+F95FXh4X6f/Hl+Fwv3x+wQEHC8OmbymIajSfr4kDsAPOTgwTwGd7IB1WtSP3+Zz4
+npQgd2psOvrDWrAIuaepMD6lW6VorPwTo1rSdlwBAoGBAIfBImFKMmXqU3n30uq4
+FfWlMH8tJpaMYzCM8Ey+E58uM0OELq8FtmhxcymYlA8VfqKaohDEMPMrmfR15n9B
+w1lFXDBxTGpQfXk5FM+mOQ4qptNIFy2FwJfINH6P9h2zhyX0wxlGKzDq/BSI2P8K
+1ZdES3BogwD4So48PEbF8NIy
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai2_pub.pem b/cpp/test/IceSSL/certs/c_rsa_cai2_pub.pem
index c4202d9aa8f..19d6b41e57e 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai2_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai2_pub.pem
@@ -1,84 +1,84 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIFbuD57VpAFgwCwYD
VR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVudDATBgNVHSUEDDAKBggr
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTtmIyxuBS1X9dJJ+X
-7zEAab8mnxlUHx3x3hIAPh1PjinU6D6mWxWVViza579x3uslQvlCW9jstA9aNlLI
-vSK+rAKtNOxRRnXp8V8Xfl32c9vYuCOVmFNWrgPHKYU2+GbUhX0ctgZqtzRX/gUP
-MYJ13FgusJIsMq321I/4aEHxoHLue6YPIpr7WLa94YLN7y9ozmEOAepamerOIXEg
-Yn+Wrgxy/Hr8FpXEEurlrq1sY8tl7/eSWAx7g3I6yNSPAiKK0nrNhuUdoWqt6Err
-9JWCWBoBXcVxuF0iy7Etl4+pkpA/l/cImcHezKwE2OwX6fDXkbTZk2Yx/K3R9U1s
-WbsBAgMBAAGjgfYwgfMwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUDKx165nTbrdm
-p02LANSqPK3Vxr4wgcMGA1UdIwSBuzCBuIAUiabmA9ex8CyisO3ov7b+kThXhbeh
-gZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNl
-MRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UE
-CAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVy
-b2MuY29tggkAhdKR/g/NercwDQYJKoZIhvcNAQELBQADggEBABAptCiBTme6gKgw
-JVLQAF3iK2MHX2oEVvIxVdpFcBKgYs7dobspHWnf5B2Jcff53p1BxPv9XKL4pbkT
-F4c2E22v16Flv8jXf3MNu033bNhL0jt8LhhqUCWWpRCLZbFnp3cXHQysAWqmOrRG
-NXLTIBikIhiBjBynmtOVWe0qdJme/P4dHXc8Shkhz9OY1hwAbxvrDFsmmSstcsNe
-Ld1cnNttffgAgzXv7/jwbo66iEH8N3uMa82icZy/4OabudPtFFqdjHzx06zpeKsr
-+L0sNa6A7vyJekM9sLctzRbVFmDxa5bkcoerqYu30YJm5+bFAate4yiK379mqbVO
-rtgun+Q=
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
+CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
+OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
+dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
+Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
+6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
+e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
+WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
+Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
+MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
+SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
+9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
+ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
+1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
+1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
+g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
+92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
+JZSn6IpfkLAH4tM8WHSDALCJZAQ=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3.p12 b/cpp/test/IceSSL/certs/c_rsa_cai3.p12
index b318744849a..80ca4bbe141 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai3.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_cai3.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3_priv.pem b/cpp/test/IceSSL/certs/c_rsa_cai3_priv.pem
index b4e7d56aba7..4851de80bf5 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai3_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai3_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDe2l5XfO5aGv75
-DsO7PSntVtBexfygd2GJ+Pw27k3JTSjX5l2C9J8pYlkF31OrWBtjQT+Fl8l22/ss
-AlvUy7pz5RnlkzAiCEa2Mnl9XOb3MeAaA7HmNY538hgOly/XnR+hRsYJrSAgp3fE
-79Sg9xl1IeMp+PLA95CFInVSep0R/I1+y/qu/ax2JjUV2PQ5ZTeBxo+k8gULKsnG
-cZ8Kdp4FKDaCA23tOMh0n9fPsL1MVCwYCp0QM0ZLxHud0ZAjlM65zD8YYkQkuNkd
-qCD913wkuE2Td/lUNjCWVDUk2ENvkia0C0sncwdpMFrKUtJvNlnvZae62TvwqbJF
-TSwfndGhAgMBAAECggEBAIBgOQKbFE9Rx9m/WJ+u/00aupQt53ak7splZR1br/Gr
-gkDFEs9SjbFwVyob2X4WFkjaGHaj1smitZFHlpEB/1mt+3oVjR+9tsZUU0oVT3PN
-BnTV9hBQf8625obZLxU9DTCBral7UsuczVDke49yaPbh25OdNnJU6qrXC9DEk2D9
-EWP6Ndy6tje9DX1DEll7ugATKa/musbq3Od7uVGyp28Pi/cAdOv8m9SgVzH4VQY7
-5O8bXGPNjO2bqdFGDr08UnZyBwbdB5ElE3VnkUQWV8h2Gdpj3ly8g536YKWfzkTT
-QLn0x2VstQYrp7Sla0MuQUl31XWgaPmRawyTdwnGqzECgYEA84pQta5uvb0yR7Oo
-bAb4h6eMtkFYw68RcH02x4ITOyteB8fPg22PTfUziIJKtF2OHsirq6btI+evegkT
-aZU19XlbHLvZ6nw1ukVd4K6wcrrtnTZpi5SeIe8oSVlATSg8hip6X09JDTQlIgXS
-vPjpZ5zIlI/KLIZ6mpMCcmWXHU0CgYEA6kEbzVU8Cv0zcU3ewbxvoiLQiU5Us9E4
-srsVgDESDg6q4bL96BFvQj+ZlJS0AH5QCuOlr1m0k7SuzSGMpJ5B/biYspsbRrfM
-fiJFCfZklon+wCxbkfKYFrgOW9tSf8AuMvhJzPS3vHe/+YiR2bfZI43WWNUM8MPi
-1IZT5Vp8K6UCgYBLq59WRCOeismzo6viHOxd4f6Dppw4+Q13IUDDDrSA/wGRc1ET
-6hfLxjND6A/kKOl+wSUuCYjHTjakuWsxtC323sUjkW6tP/jFrsXziPPEQjaQUZbL
-ytqzeobO+49SKf1cRpiNQqpVEu2yu5J2KvUCv6FHH8JWwVYY7zKkbtJcRQKBgDwu
-j/r3q95S4JV6YQE67R8lfJfZ9O7hkIRyhfqSIMZVxFcJyiuF1ySY/FbswTXjPaMe
-iyF6lWbhI4t11BEyy1doxmoUaTSI4dOB8GS31W3LdBRhEQF05tfnX2D//rjtYbEc
-krFCKbYUudBc4sOhdPqqZOgbjCCK4sqg3ArvbTk1AoGBAKv0kYPQf6adU7tKB4Dw
-VW7VEytk99ec2N5nxEzsEpObX5+4PUwZESNRP5pYqL6yF88dsmNtSwW/7O+8kySP
-13imIaCgP+R5C7duR4o86qKr1ads/taxwxTJGSslx+DAtLucbHMcgCBxY1ngfXGZ
-DckMnT5w8evtM+u7ZDgokKH4
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDBxAMhgg9kMPnx
+Qw474Ndg7r0qxjUkdJH9QAhe/Nud0snTFcZXvh9YZCsEpY6IDovsP9PJV+MFR5t+
+fNmjOU5IY2z0M5JoOmT74iLx4BbDmrx4aJQBZg5ecu7G4JF/v5a37nW5wXVoeUe4
+0KlbjweolaE7z6/5DyMxOWD1TmnpmctFaP45iQP0AJ5vAWFYOhqdlPkyRIqLqDRC
+RkWLA0jhjSykrNWsq9GUfBDK5YbVt0hipcrom7Hn0wYGzWdbgDTphSUSB+d7cB9B
+cp8KPbWsSJK2SMaYk25KdJoYrwC8GH8kuaQLIZyZevRuPIEzb6RkeskCzzk+FTuB
+jnYmakMJAgMBAAECggEAIV7HVkI+sdfgd80/Wo8csLA1CnSTyuk7ikS4nFlKXloi
+0ZRusgZHgjLQGM8FZsewj9mnOQYGjk54iFZqqfpw0bUz2rO2C3bBFQMrVwIrkXjo
+7AjAsqP3pgr/tecPj9N4Wsl542metYUrlbfz7tWJcV6Bo9ofGZLikfPqj5y3T1hV
+MSc5CddDeOdkuVCKc3S/pvx2Jj8A+yL4NXVTcwfEB0E+fDCpsOKY34JoYFGbYVay
+vgakDRAR9cfaImuPQ/U+SoxwKfgjwz0BQS54C0H9isxedvRRmVX5ONTsxDps9rl3
+y88XUpL9IhxpB5LNeqLhwP4I+dED4LYUiBVgO1kdbQKBgQDqjz/1SrKV3rjeW2+n
+RRRGKrdKBriLqsRUA81RghAHtQh13sXKI8WQYuu4haqDg/RFecvXG19H0sn6WsE2
+0hKmCleYSTQNfT/cv3mxf960ZWAwi4KrzFbt2mnIy0Eq0FcwaCq2ESGaTstS2MpC
+SHOyEUL9Hnn71tCU+kgY0Tid3QKBgQDTeizouU1xonhB45pxHUDl0rK+w7r2uhsg
+NotlN/4LQQFDhjzrdktJ/00QFlNc2CdAEKeBzNBKlLx5kxf2deYmV+Oe3Rv2RKR1
+A90x1zFERX9yh7RoAIKBuTzYUaNE0BdH+4fA6/hcT+yrY2F4vXFkyMT45qcAizx6
+y3rpDo5VHQKBgBMiMFNwDnVPP8FTsB3y8p5uqZjuR2uNOIqp7LuzYl9ekxwaWgQN
+OvZ2O0hIDwq/XtO0Bb68St9vAG7drFkudbr5qP+RKR/YkbcOH30tMxuAEYKkPrqI
+5qZsZKiue9hkOliGhsVnTFhsCQXvDUCu7FEgO1iufcDfWxBsAimUF4w5AoGAKRWH
+O/8j6Huj2Ukaa/c+8Gcqip0D6YLmWi++jP9/vzf1wuSFWUk1/z41/nYX4+WqWmvh
+3vmnTZXvt7633Q2ylKhmdCqIkCNtv73sbw5bZ+QIinuKtNnEgOc3xt61VV0H6NgY
+24X8ThLI69L20LodGXNXsPM+ZoCmU0TMsBI/3JECgYEAhY6vc7Slsc2NX7oiT7xX
+pk/hoUG2l6G78EJyODBNBMRHPJYFXfjHyOYfH6EvWZ3/NemHSA3zD3XirOvJeufJ
+meWZ/7kxNW4M2IfmSs3oSjaGBTdvKhjxmAmIs9yKaR/qWqE7lXzk6pdyGIuTKxRd
+BYBeMMOSGdpV5FTKL8rmW6E=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3_pub.pem b/cpp/test/IceSSL/certs/c_rsa_cai3_pub.pem
index f890e690de0..8001f0a560a 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai3_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai3_pub.pem
@@ -1,58 +1,58 @@
-----BEGIN CERTIFICATE-----
-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
+MIIFBTCCA+2gAwIBAgIJAK9tRVXvcTL3MA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAzMQwwCgYDVQQLDANJY2Ux
FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-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
+Yy5jb20wHhcNMjIwNzE5MjAyNTU0WhcNMjQxMDIxMjAyNTU0WjCBijEUMBIGA1UE
AwwLQ2xpZW50IGNhaTMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIElu
Yy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYT
AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcN
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMDkx
-NjE2MzIzMFoXDTIzMTIyMDE2MzIzMFowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked.p12 b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked.p12
index c2d8aa0f0cb..931d7664bbf 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_priv.pem b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_priv.pem
index ff8683e93b9..e02718144c8 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC/VakNnxmJUtpu
-zBS0QDQrr4mRXajRTPfWzPU2jy+HoxxlGNc0RUO4xbFSSU4mobVMbmaS4HLC1/Ca
-6dcTYtl0HQqOCv2eOnN03r8bIdciXpBPnjK1vnKz0V8ljOK16UQs/Mb5kMKGIlFW
-BUlF26/YNLUPb8++111xHbNagxC1EnOb7m9ZVy8aO/IoljSGHRewsZpmxLsoVKIs
-eqeUuiPDRPkKtkclcBFoEA0AYuNK9SVPTaKy9Ke/IoHr0Y+iJotMEfkCQEw6mCAL
-HIaEhs/iOTQOvKrMNwhnYSqBERBnrl7vXEuW0eYuhYrU7sWqSg/XMZ8sropHsfb+
-xus6DziBAgMBAAECggEBALtNg/zNrxX7gdHM/selwmyxnp4rbcPW8RfZ9ILAkOrb
-BkUBmEqXM8CB5yCCmnq++tgji05lYnLTKbq9B8r2jaFZfKeoorZuye+yzqok6pG+
-uM74MvQvx+G4KMh9rsId5JuVqMNOrt7YYX8wFZbJhM7Gaij+cASGl/bP+G+2tnhK
-Mg8S64bVnpbvnaFW97vPd2BY5raZ0x9XhD91FkRRAU5rE0XdHBy4Qh7FM9A4tAah
-Jo5R1moHJF/pOqr5z7Wu2h23cXeEw5DU1uC64vYG/DGNZOCreGPNjJYTWoQnVVeY
-G10YLpvmlSBTAK0xKfthGtiiwXv9qetVd8k3K4PVGTECgYEA5/noRsUmJjagulHX
-eekY6N3mHaLgPTKd7D7iJW5kzsV8TXJsieESG3CzFW/dWhrh5R9IQlALrxQ8qlew
-WF56KU6G8wzq+YtaSbn4cxCQoWOEaSX/g+u2gX8UaOZ8kVu3jmHqQt913S76/Wvo
-LP+901zpM5MoSTITM6gdLoX3+hsCgYEA0yZGFpmEmfD5ES1hJRARLbDgXkP6ams1
-cYHKB18T8umnyJ/WC6D0s7czxvD9CR5eoVhKDd44IPkd4x4goWxxmU8thsS9IznQ
-bM7PwTe/plAPwttELbH70yvImJX1vcMcpYhW9xhJVzIrVyhgQMxXUPsRCvXUsgVs
-DuM8j3EZgZMCgYAN0ZVEofnjzN1GPBnZ6UjSlmVe3pT9EEbYC+bs0+atapY9BtPw
-YrfxaoVAgalt9KwAOhzT1nDbvRjgDNk0amxciZEAaYSV2PdH7QwfzpzPAF6i5OCT
-uzbj/+33UcOZ5RzKHosV8LnUszfAYO0zwQhNzvsVV27O7Wy3ZwxV+SUMgQKBgCCd
-Wdgl0Gii4yX3F3lNGQowtwd4gparhq7IuHcZBZDQ7Jy9q6dSLloQI0xIbx1Ydo9/
-frjTqWHWePpa7flhMc7XfxXBD+IADSSxcT/MJ6s91KFpkwdn5ZkBu1NuXm34VFVx
-UNWMB9ATLMSitPNtXNNiZIiH3lm9IqrOCM2zT5hHAoGBAOHVs9BgXdsyC8wlkLGg
-RFASnBmkgNCMnNc9/3THmAkJBiKreilWHczm17oTQgDo5jvdRGhrncj/Rv/3cKux
-NCxvcB7kmNTG4zfbMt4M6HIyhG2Y5POxNxVA1OOcZdO9EGgyIAFH/Kz4fZlc0Z1s
-P6N7y6OgnKP8Gy7jF9z0x+io
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDKW4vYEMMFlGAz
++i4iigCRwPyF1DORRYlqpeXu9wINcihN0OnQd88wKzcwmvl9t6qrl8Wp54HTIvwk
+WQx+39xYuYyIQJpTo2X/9zQhrgaxBhs/q97c0rCmDbsK43ZrEPa9g4FrYEbjvWiy
+rzx7VfAjPN1XchgHfCFqPI/S9uSTOkvfaAX52vA8vNlQWu5Xn93UjdpN9Cqby8yR
+qYet1LhT0B5aQye+oHL8Ku248xgIqGUH+w+kLSJPZMw+KbBX1mz5lNP47pBf+kWc
+uQZXFyHw7JViEXTMQ4Xwxs85bGSNHTsszz45Oh+qirq6BrXH4pc7gownqRO5ZGkL
+aclsatEjAgMBAAECggEAFzw/c1NVZAjJ/8iMee3OVpjKG38mtARqh3g+IzFx/GOX
+yiZLZWMPGMZVjiYKsMtL9Gu3HXprjKKvQL3dh/H3e1Pu6t7peYzBE7eUYQD6XA2f
+R7EvTrwoiXX5J1e/9gJFerRPbNS/abtgJWhRXGNym/E2BH+hemE1SwgM3Fn6HAd4
+zMyVTBQfK6ueAiC2ck+iqid9rHXQYeWPyxVFN2apQcrPXeLqCw+oreYmQ6JOWodE
+eet76kadEAu3A09TRzfIqYI0DX/RxkMxu4bAkxgAAuyF5X6H3GPuoOgV28rwN4tg
+LxsgP6gaXZICK0lRErqHwPMZ3YpsboaCJf8veOAF7QKBgQDr/pqHoF83vkopdv6l
+NKCi23HS94NzE5YdzXinJ0/u88Pm2l1U0z6eJyF6+nf4jQNkt9L6dPJ/uTI1xu9U
+RhfMgBxIxZ5paSDkR7zgIhsDPov54s3pG7SNl8ahVBUxJ91RCmM/bVPpVgusb/Zs
+jtLs3SYK6Hk12G4YJ+HD+T6ktwKBgQDbgvnio2SIpy0ZqzHSUXhW54FDpk/kze8U
+q+v3eKMqgdfvbFx2Z7cjO6rRfTrSTJG3xa1bxttzAtnheLUnkJ33g5LPZXYy8pM7
+mlVlJ0LgUFmVOFG/eDUC6/kpjRz1qC3jU1kQGkXuG2wNurOceNIqQ68U1Y8WW6YR
+9XQpKwBC9QKBgAhiCus2bytzvv6qE3Ga5PnkAa8Uy76Su4pjeh2178j1L8hLiXUx
+68+CZFYR/6D8oVo6jWwIK3UOBxKR9n5v3viMtHSBUJc9/MUfJz5u97atyhseS2I0
+cb113sBsVDRiziHK1Ku0Hn7zZ4bAk2hXynZPhMJub5/SCFcjU4m6mNcRAoGBAIY+
+w7PnWUR5eQuJtx541K/RRSyqOZIkn2J1AgqGrMMCRZ0XGDURmN7jTsRvYdnbGgLZ
+0fue0fa0d6t8ts1LlFAbF13fHzppP8Hj0PXb3PpyKVco6lW+niz7Q5Y1xtA12lp8
+TquaZcoI2zxKQi4fdeiDHEARm0CBLD8vbar/sVlBAoGAewu5KYDJjNZCr2S8nS5/
+qGgu3BMTLnp0Uu0531JX51UjrE8kO4pp6gIA/tP7KHACToLGMApI86Sc1mQHoB/z
+mK5ZfrfSaZAqTHf6V82MekUQl9MiWDi2rQBq56cufxjA6SwMJdzb1KH29NmRnUjT
+I+4aEy743WQKBzB535ImpKw=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_pub.pem b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_pub.pem
index f3c521da6a7..acd39d3ac93 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_pub.pem
@@ -1,58 +1,59 @@
-----BEGIN CERTIFICATE-----
-MIIFDDCCA/SgAwIBAgIIRKjFm3MTxW4wDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
-BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDMxDDAKBgNVBAsMA0ljZTEU
-MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
-B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMTA5MTYxNjMyMzJaFw0yMzEyMjAxNjMyMzJaMIGSMRwwGgYDVQQD
-DBNDbGllbnQgY2FpMyByZXZva2VkMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1pl
-cm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQsw
-CQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/VakNnxmJUtpuzBS0QDQrr4mRXajR
-TPfWzPU2jy+HoxxlGNc0RUO4xbFSSU4mobVMbmaS4HLC1/Ca6dcTYtl0HQqOCv2e
-OnN03r8bIdciXpBPnjK1vnKz0V8ljOK16UQs/Mb5kMKGIlFWBUlF26/YNLUPb8++
-111xHbNagxC1EnOb7m9ZVy8aO/IoljSGHRewsZpmxLsoVKIseqeUuiPDRPkKtkcl
-cBFoEA0AYuNK9SVPTaKy9Ke/IoHr0Y+iJotMEfkCQEw6mCALHIaEhs/iOTQOvKrM
-NwhnYSqBERBnrl7vXEuW0eYuhYrU7sWqSg/XMZ8sropHsfb+xus6DziBAgMBAAGj
-ggFZMIIBVTAdBgNVHQ4EFgQU39cc5usSDwzOwlFeY/8i7ShcoukwgcIGA1UdIwSB
-ujCBt4AU2amOV7SSbtif1SgroCifQgGe8kChgZSkgZEwgY4xGDAWBgNVBAMMD1pl
-cm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5j
-LjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMC
-VVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tggguC3yQT+FGMTALBgNV
-HQ8EBAMCBeAwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovLzEyNy4wLjAuMToyMDAw
-MS9jYWkzLmNybC5wZW0wFwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MBMGA1UdJQQM
-MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQButQ2CYqcI5ZB+r8tp6etL
-6lFwn9PPJd8DBI58xx1nDYnhmldY4+4tK+sM98M15mt7KRmds8yG7Yonw1rjMpYW
-OfObQsG3NWmEBYF2NZJ5nLMGfGqc1D4A3wvENkcBfGC71WRvnIylHh+bQbNdSpJD
-ig+oNCfrXUltVxcZa/0NqwNVAhJWzeyBYZofl9CJZusaFGnt2NXE1Ur0fnkEtz5m
-iw4Bw2k5uiPGgoqIlfQWsfN1BJy16Dnp8PoI4fPl83EjfMpQutN/t1WK7X1jwpu+
-CQycGkW2wFuA9ZRKbVY7Nft0QdnYsMkg1mbbVxAL5KOcSmkBt/W+WcbF6EaNvrcY
+MIIFDTCCA/WgAwIBAgIJALkeLFO6BF7kMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
+VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAzMQwwCgYDVQQLDANJY2Ux
+FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
+DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
+Yy5jb20wHhcNMjIwNzE5MjAyNTU1WhcNMjQxMDIxMjAyNTU1WjCBkjEcMBoGA1UE
+AwwTQ2xpZW50IGNhaTMgcmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAta
+ZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTEL
+MAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyluL2BDDBZRgM/ouIooAkcD8hdQz
+kUWJaqXl7vcCDXIoTdDp0HfPMCs3MJr5fbeqq5fFqeeB0yL8JFkMft/cWLmMiECa
+U6Nl//c0Ia4GsQYbP6ve3NKwpg27CuN2axD2vYOBa2BG471osq88e1XwIzzdV3IY
+B3whajyP0vbkkzpL32gF+drwPLzZUFruV5/d1I3aTfQqm8vMkamHrdS4U9AeWkMn
+vqBy/CrtuPMYCKhlB/sPpC0iT2TMPimwV9Zs+ZTT+O6QX/pFnLkGVxch8OyVYhF0
+zEOF8MbPOWxkjR07LM8+OTofqoq6uga1x+KXO4KMJ6kTuWRpC2nJbGrRIwIDAQAB
+o4IBWTCCAVUwHQYDVR0OBBYEFAq6zWECzJ9c7abmyffPKMpFQ+bXMIHCBgNVHSME
+gbowgbeAFAJWd3z26jD3uzXjbmbbmGnQ4n2xoYGUpIGRMIGOMRgwFgYDVQQDDA9a
+ZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIElu
+Yy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYT
+AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIRh5KNnNRZPMwCwYD
+VR0PBAQDAgXgMDQGA1UdHwQtMCswKaAnoCWGI2h0dHA6Ly8xMjcuMC4wLjE6MjAw
+MDEvY2FpMy5jcmwucGVtMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVudDATBgNVHSUE
+DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAbXTH5lMYq4YlTt5AOXZN
+9L7OQvBwJdF8lilwjHq2akhqkHIgqMBCBZBvQ/rWUSu1kXFAhx5f1MR6X+Od2Wb2
+p0C0BqtnN1Krdv0ySEsa9hGnVGN3a99VwDBs8lfisJA4NCGWWMmQgSZ7rKNOlyzC
+w1BhhK5v2EfRqfOYTX8EA16myKUK9u24ys0uXRmZNoTIM3QajkQeHWR3wGZAeiid
+W9xWIDS+/SDEl9H4J3BjcUDvuM/bmmZflwKeHVzYAsu6Hku97a9Gc+wpbpu6dSr1
+5FlFoMr7V5UeRNTGlspUvhn+swVSUr3geKSOgG3/NWAjuKCVk2xw7fd423Yy7d9S
+GA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMDkx
-NjE2MzIzMFoXDTIzMTIyMDE2MzIzMFowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4.p12 b/cpp/test/IceSSL/certs/c_rsa_cai4.p12
index 375756e8224..9b4b6258cac 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai4.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_cai4.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4_priv.pem b/cpp/test/IceSSL/certs/c_rsa_cai4_priv.pem
index 000a6c414e7..f5c156d6b3a 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai4_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai4_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCwbzqRi5m5i4dH
-ITI54a78v7k1HIdekJGxwzfL3gtQpnnm/joO1mHA1COt3yeP8nVs+1cvCOnPNtWN
-JZxE1HQPRIT679N9HUWsxqBdEgPf5Md8fqLvYGdzz1O14T+fPwlYAKFVi6JLpNt0
-LvDkErIawqFI/dZOe7V7q/gqQVSZRYh0x0+qKsvaU1lfaCG4w9/h8wn/vN6iGEUN
-Xmgeugt6Yyg45DQ1hKaJPv2Oq200wtPLj+SnJ0TOyIfs7CzhZb/Z8Tdh8arjn3SM
-7EXE8//ZSI8Dj6T/T6FWkPI7h9c9YFw+erTz/eqS40QKK+qfoWfAqpSPoTM8M0sd
-ev3R1Ff/AgMBAAECggEALjoGW2n7Lf0bxYwyD65M3dYR3ZOK+EDim3Oto9Gan1fu
-6pHDfm23EQHEE2M7h2CcWaCE2EL6l5sjWqb3CaWsfu+R8/lwLQDFZ55nF9uHflr/
-1WOMpzFYCaTRpv7MX5nxhcgsfTBnpnAcO5Ws8eTgG1jRT0GKq+eHxk5paBDT7JA2
-6zau9zLQtoAEBPIeSH2VYsqrcAvQQW74bRyxDSe3yFeK0tHhsfFRnHsGv+g5UGG1
-wFsUKM5jSE5qenF3867quBK5Pf3nnlcwLtCK++eAyJPN+0N9MqQOdEmuPTcO2rXR
-6dZFsU/xMksUybwEtZVbfCu5STa2JizadL0eQugEGQKBgQDZBj1NVi5WHonrQcFY
-sOgRvyntEivx1Di8POiu1eWewvIj66z3o2rnta7/NU6sdEmwyPIZDisudikpt1k6
-mebPoD+TDg5HiWq4AjGHaelgWq5YLPj1p3QYPnpYMEaDgA+iuSUYj/HFhDbFcqa5
-IUF10h7/B1oftKSHZGQ+OnLYpQKBgQDQHttwSFxLnH9H2Gmn0dDkzoFHWRH06TKf
-o3aSNe3FSgkR3QBOAHSqkXoWySJpSZbwBVy14IoA3fjLZ2KixKC7E0/Zme2ILHBN
-8q2Y0sg9EKfcxdbFb6nIguDglE7Rjw7ZGlh+zYxHX755LsYGfM7wwtRRT3Hy4Xzk
-8i5k02oo0wKBgQDI2eJwKZtWroq8BK4ZFBijHAWEV7X96Ifdho1eCa2qQgdxQRNi
-WIZ/DYF4xfAa4MC2cTLGB3vlUwwDhKF6/6ZCb6+GvJJwmHgA9l66UUXgm+wQxQZf
-62shaOk3pu4Lk8Bku+7eDZIXV6aNE+/DFEkN7rorErXQ9BD1EO9JPDS/1QKBgEbK
-eDHVKy+85750alvfDoMFiwvNzEHWIJYUb/yDw4DcEgG1fqkJlqV+Hl0pxT6y/Vhf
-Oo3S9p4c4setPuvGnjWD+CE4LoenNfwNk+brq5i51Z9O3CMEPGgrvHoneDfnxVEr
-mPZozFJqystFka4bPfi/DKEruMK42Fa32fgJwY5pAoGAXPJxUKm2UnnrYkrYVJWz
-dL0tLhFf97U/7ZP7CR158ZzBtumOXkps/uWzyxZCVIy3KhjfP9D2zG8NstV4Ml20
-ifMFXLikUYOhue5n3S8BSriIGGCVPd5vyEKfBgTIx3HLhhf50mZ0/CSYAlpZLOBi
-6K6zNOdkUIqMJ286EANVMdQ=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDBqX6tsD6jXIW2
+QftuiZRmsNeqyGhUjmsU7Mcp0UVH/+MzzPkJUoG1ZWbDhguhxWzxWVXJ4f1/LsTO
+FLT0RtIxwKCfCDL6ey5MVRHsn0iIoh6aECDt0RSO+hQTpr34b4LA83TLAKR3Jqxo
+G7FQOTVmK1DFYg8xFJe3btjjru5tkYwuBgfpnexLojEcDf8kSEZKqO3bBZ8t0FGY
+36zqEDQTp6Ui62hDpCyTUx+tpzLgev4Tu+4yg9b5+mftpiJdjLyYfI5Un03NcAHO
+vF0PUT/U+8kmcjhNldRE307rmxAMfkLdDMIHWyIq3oxMoNGtZfoRa8oDNb68jbCv
+dQl9tEnTAgMBAAECggEAASA4IVBd/Nsj19xoVssr9rDegBqsKJmvW67ItaCG05VU
+P8/YPsqhAGn3f/l+hdE9AeYwDn1m2N9vu3b5WlYzEKD7DhGhIj2nFkCEWyjN5iVz
+Ihgn6NoHUZF4nmigwBn925tOuYNmcV7jL7PBgyLiAZcM4Cjix7lD7IgTcLdqoW5t
+l06om21EaCkf022LI7kbim4Fk4tEOAu6heYgI76lFRV8ACzSSoWOiM9NcmB8vNn3
+6kFYhBn+FdxVZBMQcuXGyxLA4PzSyUkgxwrQ+kxIOIgW586HuPuf0eZVJNZ9ABD8
+vsiV0srZRUWCDvlpWFkeKq8ycsJklFo/1BIvaXPjkQKBgQDsDDpwLbG440n1vXPZ
+xITFt89dXJwIISrMzxc62bMaNQZ1WXwGslXAjziomMRtZaBGW/FycKps6Wj+uWL2
+04386vufFa/6Hw7XEWKIhPxNm/VD2FvW18ieGGHoRYyBRpHWTMjmCOGs3a164lf+
++vVBz5ws9F9bYjE8H67a4DpTiQKBgQDSCBg/p9l/t/IcFyF940sNUJ/GifDN78oX
+hCPM3Blajkpz4RJX7iIJq4UgnqxE6pcC0n4J5yKHDkVQvbMHR/703CuiJkYn7vDq
+Hw036Dm4kCqCr+T5o+5EmpTjgrFFKWAexnfcaYeGsMizBdpqCiZ2is4uOJpcIgkE
+IuokG5gvewKBgEruRs69cqFCZYQAs/n5DDzHcKguccmS3cdOJg2kddpn4rj1ww1N
+JzONQ2shs5kWnZ44KZkucqtIHPBfYS8BUR1sapvBgq9flJJpDmJP9NeeHml/EQhO
+T30AOHRHP6b6A+mHTm7XeuwpIpzTpSNn/tr5UJZkrLCRpxdy50rLyzghAoGAbEbU
+CW0Eyb0Qyb56+6VDudeIpxfR1rj53Gm48xG82FxmsZqklEQltAqClTB36wdtVn0h
+kQVhXXLT9S32r5hELgObUvqcTFX4SRo8/EdyCl34LGt1heUnHqL6gteLf/Y2oWb7
+v9t/jMZykShBU01sSsyAQn/XxAufzkwZnQfEyyUCgYBDvLIQPZGQJfiOOaabSpCY
+lytUrg+zA6w04hTn4UYYXXVWv9mJg08fAN2iOKazL6WgEI9VKT7zy8mNyu+/w5B5
+OA+4lLPnHrN1yr5eF9nhe4qrzr5hEwVREvlTazvw9vMofVYnUG54e02JO/xlsg+Y
+ae9tt4rR58u2SDBSJFHNbA==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4_pub.pem b/cpp/test/IceSSL/certs/c_rsa_cai4_pub.pem
index 4ba6f5721c1..5db169a13c6 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai4_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai4_pub.pem
@@ -1,60 +1,60 @@
-----BEGIN CERTIFICATE-----
-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
+MIIFMDCCBBigAwIBAgIJAPvchdYpXrSGMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSA0MQwwCgYDVQQLDANJY2Ux
FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-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
+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
-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
+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
-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
+CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCAKPlQVxnEHVMAsGA1UdDwQEAwIF
+4DBfBggrBgEFBQcBAQRTMFEwIgYIKwYBBQUHMAGGFmh0dHA6Ly8xMjcuMC4wLjE6
+MjAwMDIwKwYIKwYBBQUHMAKGH2h0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2FpNC5k
+ZXIwFwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MBMGA1UdJQQMMAoGCCsGAQUFBwMC
+MA0GCSqGSIb3DQEBCwUAA4IBAQA9s61kdmUSwMG7ctegFhzPJTFEeZapiF1fgAMf
+euRtyCOTF+/2lws8sNgpWdGGKYNTcH1wo5gzwnyYwjpiozRfMWX2jYSP/VPNHET3
+W6umsrYtqmVkJwwWxXq4dM56MGGEsJBDenzBZHDL7adiARj4lYeOR5wGImA+8J6e
+fgHAv4QAkn+PpxMygnXOKUo7xsRg8oR2EHRicgxazYTCl9XBpE2gcmZEroXBD4No
+nxF2kHSU7cRXLtkpqsvInIUnlVFSyLvYyhWtlFbJ477HacjAnpKe2OJe35bcVFXO
+l0CDGBt0X3+KDKBB2muqkPQwcri62M7EUGWJfcKvbVhwv6rt
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked.p12 b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked.p12
index 003028f92c7..5e8d3f49e77 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_priv.pem b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_priv.pem
index b3f51ba2c8d..0ab821e80a6 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOEsY8MuD7IwZc
-lAFDM5AgCy+4gpLPh92PycUI7K4kyaWENsPmLmzBf3F/lzWTJMqXW/wj8omfK94M
-Htk6qAocJcCPQ7vU3QvUJLqfEdDtTS4UT3RebCFcLPiqeS7U0aI3BuUBDQR3wd/2
-M1C1RkaKTq7IDiruydDjdd4oMolEgz1+BG+nuUB8qSnlBaSBumMFDgugaHgCUKV9
-OOoLrRVsnb9xLetRqLYaRC8rxAbzGkxhjWAY9CazmJK/NMIRvrRO/faWEIogkZxF
-nzmHbzMbZkfK9zI/bB/H8GzZRM1AM9xbcZcokKgJDjahCJ5y7aRY94cMh207/M72
-0y0w4eKpAgMBAAECggEBAMAnNX2wm6TRdf8ha0P0crHOfIL6DldBg1GufPHjcEaR
-WKs+PdEG/RY49eZZYvV/2wDkHuqOH9GyH+0BXuGZC0RP14w/RogoTf1U+keVX1HH
-I+6AYCwje7/tlzmuogKEL1RMM4GVV9MrjuCN3PYLP397+vJEc7gRq5xNrgehh+m/
-IU7ZzzQP7jvgGi023tUJOH5Och0YQKeCG+5VQdFVCnRpmNXwZWp/ZEsFCUUa1jjm
-lIn+UtwtvnQbvotjNLLRGniMyIL3tttoTsULD7hDAXTAX2mab1ofZqtYynnwMSAL
-PxNAFJTYkDe/6CDit7pg46ChWoBCh/WEetlQ4u8aGuECgYEA9obr5DyNKpcJaPE8
-L9qZkIM8CelUP482BC7S85m9ieyuQ0zvtLEbHbA+0Ybira8XAbu2PjRbyYnSgj5h
-i+/KkTeilAyOfx6n2VkQrxri4gRdaBCjBiSJLr1C6+qb4shgVapQvT2r/G+6HnPf
-9VuqyFA/tolxLXCWNLudrfQ1qDUCgYEA1f3pQc6gbQQE7ADHACkvU8DWln/hiFrU
-K7B4WBeSYPT0mU75ykzIe73kEa98nmnFSTAFRtS3N/sScEm4xwcGykySJk5sSyfa
-jdMr0MvmHe7RwrSU92C5ohB8d0tL2Eti0xEUnpygXZyyMShDKJrBrIfp7dAN6W4y
-x+tQdRuOpyUCgYBRlhtRQHzTgIK7uUJa7/RscBIZkZ+xHTsaLUjhF5sznyGY4khe
-O1KnA6H2g7ZXFp/9kdrhQUCzNSp2siBkSGp4nrnuVy19gm64LpKn8LTvadRj0UWy
-jbrcvgP8wXrvlbLUBvaLenKFq5Aj7eNLdxfRDUXYqinLiPwc3Y50eGKdlQKBgQCS
-+F/C3bobBX6n5GTIvICPwkrfdJcegltkYkBVKGNVigeQX8h5Y8DyE9pXNzKczkI8
-YOnO2vu3TA4+5rMspqvIN0zNWGFSQN3/OEDIl7HFbyfL1SDWwizcnPwPJrzBog0O
-r5V81k/h22QbFO8DLT7FU1ecCJ/1acUgv4Iz3CherQKBgBp5hYVbT2GUhaySMNlC
-BBRqM9aDMN8Sgp2GmSXtK6tS2GMvcbqC9N/USO9KCw2R5Qnmk1wKiPFuiDexi1rj
-qP5VSxG4/9ZMpbHtNWmoynWHVO+vbTF0tfUcbjr3+1BR8uohinlecyRTzVf9LsbP
-LeHEDuCHU1IS6ddDAOzTIkUL
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCn5yS4xInouqzJ
+KdadQXgBI/zfH7p4Fc1lAx+6l0Sm5qCznfI4xr6BUqK7J16w1BDZTIm3jC6s7UjK
+jiTGCZOzFS7QKSHlJ5EOlYzSSJSdGN2P8Z8l0s18FJSb6lF2pW98sqP7cixG53Ug
+pS85qVI2P3nPW4y1V5K5RMy0UAaU5S2fgUaAbLjugAFC+F9uc2UfPBT1z2kl/1Qp
+pXuFyUR1e0y6iXbLvlJqyy2UQFkULCniyr81t3PhqynV9ctpDxCM7579Ub6pQbfS
+5sp+yh5+AlG1A6I0j3yD3MH7IYd/j8vvOp7m0op1ZBFfy8NvD9w5uNHONgXrYBP0
+OiC99f6zAgMBAAECggEAN7ZY1v5QDGs0viMl1VRN74Lze03Z39LMLoJU2uMqon7Q
+QAlewDwiJmM3IAa2QtJ7LL9ayw62xiaOCrgTt6qh2cBjoiqj1pfEaCRzb6sptN71
+VbgE6NYD3PIvRXUAxu+qCKR2CQ8fZf+TO9vTybxHTTzOvGFSVTHTu6n6irIrHOhN
+E6lqPYsxho7rGL6UA9M8CPWqabSy9k+noGgsnUldbNsrc7KT8KVxiQlCLje8gLPm
+I37i0Ji/eZKPkQxxjzScmpCUuBf1Xf9tSAmzqHlCXNfMNyn40Ny6KJ5U7ig/SO9m
+/Vvy41jZOu4G9LYzUpAfwg6lbb4PVJmhxcK4ojXc0QKBgQDUmpEL+OyTJKM3s9rh
+P3Q3nkx8DsuGxdlMqQC8Ar4DyacTl1Y+pbIxtUNyFpZJxDyhny/QKfkffNXl8WrP
+abdHEnpwZTHSgMzziyDbH8KWdKRn8d2HKtdqSxDIn3V0RA2QEelCggWuHcLrHRH2
+70ztIWmGFuctS2IT6eflO9MC7QKBgQDKLMUepCk1YMEaXjGFN/nhwi5x8YzPw3PG
+MG34rza7JbxYawK4yByhX92h1V5nFMl5cCm6VfACAfgS/suDSeIK/S/N+6O7NZux
+wdENOUDOMruVoFMBXVTFkYfLWKUEsQj68XX+S2AN9At0WWi8CE2JeXkwBeffig+V
+Y/8jmYK0HwKBgQCnaHJwX/lBQCc5lGj01vdXWFHXmfrPS/l4sNdANFSVPPNPrOof
+eG/hTl8mdfyvZ1Nq3KNUochl7/GqF7hITHEiCL3axQQ/QmagG1yqzs51lLFknAIZ
+DjYDn8o+f7mH7JJVcJUhZqq8WPkEE6byr6n+S0IBcQVmGCbJkXSlf77/XQKBgQCj
+Bw0BE2FDcLzmNVR7V1MBsCLhsOVaWAKQq1bSdP+OU/SX29q7BGrJ2lMO/857EvEQ
+ItkTL980zz+qmZmkSbykHdwhnqw99xGQenjH0AYpABHxqvGkJQ2JrzuwRs/yg4t5
+R6JdJ4zSU5u0+7AQCCX2GGUXy3tZ76t3TMZdf5k9AwKBgCW29LBNmMFg6hdJqyaN
+v+0fqcgErRuPcmfCaTi4F/rRj08U7OvAroGaspJnXS/t/Haqo+vKD5OZ03pTlYUP
+fzgR2xt03x5mNDxa2oVPuj8Zxbd3m9sBmYacKFkmzPGVRtBn2UtKx4xpJ3lRDuJa
+BvQY0lc6KUSgKjLIfkMy0fg5
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_pub.pem b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_pub.pem
index 51e153c5c32..054b105367a 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_pub.pem
@@ -1,60 +1,60 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_pass_ca1.p12 b/cpp/test/IceSSL/certs/c_rsa_pass_ca1.p12
index d8089faf8df..5db1aba9a07 100644
--- a/cpp/test/IceSSL/certs/c_rsa_pass_ca1.p12
+++ b/cpp/test/IceSSL/certs/c_rsa_pass_ca1.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_pass_ca1_priv.pem b/cpp/test/IceSSL/certs/c_rsa_pass_ca1_priv.pem
index e9afa657d32..35049957313 100644
--- a/cpp/test/IceSSL/certs/c_rsa_pass_ca1_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_pass_ca1_priv.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIrS7+VaaWBpcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECP/HWk8ju2dyBIIEyCe2xB+EvID6
-P6ZSJrg2myyykM9R8dTl2X+0LSLxfmAO970ogr69RSQq53VcPdV+1I9nAXNxHpQM
-Kksay8jHsVp/ADBgddkyIheBwbGs8JT8r8aWHexWmZJckuvNjArtGTdi5+Dy4bIV
-wsifGfJVluYsWK617eA1nAYi7Ow/hrBuTndaoE4gWB52z4g+x3tDMICO6zit8arb
-fsQhS+mwWONBTMPLdkykKTNLQ8IJwINp9this+VYXFY2RkPv5S9M81eGVldb3O1Y
-ruZXi5WftH04qZyP1e+/zHU0uYMI2KRmxEgOQDo88r9nhG+ZngkJ7RfbY+EWSn5j
-eLRoDel6gKG1h4gayvsEgxfdO/D52gmraAp78PCupxDn4aAimsYBDa+MKakDvaV9
-rkf3otCNra9vGCVCfY6S+C5JnfvEdokxmK8mZITf1VKtVI0SPtyQjU269F9FV9i4
-t8NIFhs2sav2U1iju4Lzr6plEMmA4ujpEA5o0cqnuF1ibdw4VZpKcImgO8ZBqhXf
-NnJx3qi567AMCzwgmAQKywNHvxemUgMZq+Ck7SWKM2xvCe4160IH9OmfTUnw/7wc
-WiccBVsZYRpNnMvWhXvtbCUBCp70+FcGpF0vgYXcSL6PLj0Nklkodb1z+kexoC6m
-EeS9cRjob3vZJ7i6w1hPufenr+Q6/8pl2T1K7sR7c4jbSkH4Eh4Mk/MSpAER5lmY
-QOv888M1ZFVQGCekCGBS3MzNKOhGAmwtDfvtHeGbjjq6zmno1sTypvQPWIVB0S3C
-AGHhiVyZwpeOCZXQbGlRgHh+nhBvA8kob5bsuFOXyXnUfVcq1SeolfPZlgr+re7U
-zZ+GVnMmfBKfHhnBNo0GJ4ov+YouSYFacbcxVJKOwte7SuUlBZypPBYn6tuODwZo
-QybeTjIBE/S8FVwQ574lw+YDxso18S/ulM6DdmXsstkmaysbe9o6MOSose+ml1wV
-oGH8omZwX6mvkrsea5g/EDq5gJOAq0r2ve9VBaM7GX4KN9nJ+79XpT4I+oAB8NOy
-zI7H+/1JUQj9f5TR+7AuLCMToEjmKrRQ3Ifet+XkLpmSD9CByOH0FGDS1HjWki9x
-U4CGN6BKobOnjA7iozH8mNvBjLim2Y4pCprNWVJkiJ6iXpylYwwhRe/hlSR5oWYy
-krGl4pdznmxRT5n3WBMuGiNrPUmyfPFNhQiSjoqFosl3dyx8XGdmFcDj1AN0qYMe
-0yQHYJKGOrltqHz2n3IImyyvFCiwR453qYQarZ9XNnow1eEyV3tGopa6x63Rdc6G
-Crz5Ds2yNXACS7PlRnQJ3cfm3dN1nVaVM8RYDDiMY7Ebb6QUTZG1MQxCjisJuA1H
-h5aQAm6b+oBujMNuuXFyfJuZSXhHftxsHc1xsTe6TuGDx09JfPNLQp97B20BhHlZ
-qwwnHhaGJpOazcTim/nypImTyEvgn+iGtBOj4/mjXTo4W4tNYL6aoRGvBirFvgt3
-Mp0WNVbyis1nYhGI/9L8rTnQWx1JwkRohPKzMK6eT8xr+vL7cmG0yY177EHUQIxR
-4JrJXXsC9ErhmcD89mgFl8Hvwe1vEgle9yx5jWQw7S+DFatqI/nHDOHpPD5IIL9A
-KBzBCeMyArYaFlGhwaGAOA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIlQpVxcRQ+ZECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJNu0k+VDPNLBIIEyIJOSZr/q/VQ
+acsny6H0/3cwaQHPKZlHtMFS+hn+eki25QXV/yytCyxKkOBlpqQSBylV/2bMufE0
+oSvI9dyG9xklpnvN243T+hHOop0pgtotHa4qCyyb/xmD+dhJNMsfHV4X/5KlUKgT
+CEQNp8vEKedLgwKYd7pQYnBjDAk+zJTxEhtneTHomvKgwftAjefyLNx/ODklEPBX
+gU2Av42WVgFxdn26w2oEzK+S1PDHD9Y+mW4KKHPcx7TwYMl1FOJGuO55GqRS7pwL
+EpqFG4l6i+j7DEuNJK1SXplRVIQqrSMbuLBRQe0IvJIGsHgcHoh49zVgyiUsyi2K
+F1gqKxJnpdpCy7r7Uh4ai+Gtp1CRtOa5d3D3tzMC9++QrOA03G1xBmRnw9atRblV
+aNk8eWPvCje2Pv5YDryat1gKhX47TeBZ1bhmh3SDOxClTTxajAK7+f9H5qF8wPJZ
+owJ80H6NsdOYG8NfwXTmQGUOi8fWPxQNJSb4kyqJkYT+8vUd5laPrEj++2HQEPlg
+QjWQPAyqNwOwvsXNm2PjtFgvOT0C4odiasI2+upnDbrtB4Q/OAFK8VBuTAcsyhWw
+nvSc1F4cXgJ/pSiTIGQIVm0HXOI00LvVQGqzpjLzEiMtzPeFcxdmk1ahHElhDkY3
+KqKlTukYZSmN0PaL6lRTO9x2W108izCMOyzBNwU3Ku19vfrt0o/p1zOF1OzBfWPa
+D5t5Cujxey9ah/5ysZ2vogpEuV3y61CiCZdVR12uae5yLYpRQa14PId6NxtwgxZa
+536EL9Wgr2m6BITVf4gNs6bQejGIqRKEv5ANUXxKqd1XMwzsc5u09QbAjIRrfA1/
+ax/+oGbsd7A5GpC62nFjSPVUVt2O+/RHeVf1N8vTncDMRefvkVMZUZDdWUvfyvK5
+ZdYeepeDl031AG+uZv2d+Or2mYaPPMU5d2+BIaRRiKHhS3hd39KlnY+yk0TM4Fx0
+wEOTWrmel+19IpmR9itGh+v5J9Mra0e7p9YADcIDUUOzvSn/aNZELc5N58ejzpxA
+/UyQd0RkYmX39LNwwyTJ8DSE+Udvcx18DylC+Vz/eNi+s/OLxazg07Ccu5Xje+QC
+lPHdi0OfY6GN5OkKxTtcn10oQoX7ZC9n1hNYAjQtysdMMBbFc6ljAGFYP5xwWM+t
+79L4tg27hJGlE5f5PUKVC8rJcOMt0Vx5MM8JFcy4nJP4j8d0hVvLoqVtJgBuMU9N
+WmKhdwxU16N/Hqf1X0otaFn0ebgaWLCpbIlAjVviqh3Z4cqPg2D4ugXgRl65U5Yo
+3sTQXxDG4Gweh4x/pmLrRm+vDxv5KfNuHQuidQp6eEU+wuQhiXsbJPUHpXQYHf2W
+3zgeQv4jh2/bMlRGixJIa1cIVIdTOYefXiYpbeXfOTMGBI/146HnBT5E3FC/O1hH
+ateI0DDQRCVHuSv2JBojWBVkOYywaKsZHN324BWd24cc7uCziYSsRlv4Cb7Yn7RH
+y6m7yCPYJrQzsq5HKKQkCkZa4xle7qzgqEGictN5rtxaUd8vfzaoz2J1GCheZpf9
+iiG/Icuz4tVKHU5tAcg+WjKhW3k+DdvGsqMglCmPfPnN/Ugy/spbnDRsn6DOL2Wt
+z9NodHbVXGdtnfwJZQd6Yw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem b/cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem
index edae554810e..97b53fdba13 100644
--- a/cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem
@@ -2,27 +2,27 @@
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
-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
+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
-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
+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
-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
+ggkAv96HBRg/RI0wCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVu
dDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/ca.crl.pem b/cpp/test/IceSSL/certs/ca.crl.pem
index 939b65b091e..4525bd653a2 100644
--- a/cpp/test/IceSSL/certs/ca.crl.pem
+++ b/cpp/test/IceSSL/certs/ca.crl.pem
@@ -2,29 +2,30 @@
MIICPTCCASUCAQEwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNVBAMMD1plcm9DIFRl
c3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
-BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yMTA5MTYxNjMyMzNaFw0yMzEy
-MjAxNjMyMzNaMFIwGQIILgt8kE/hRjEXDTIxMDkxNjE2MzIzM1owGQIIV6Idou+0
-+kIXDTIxMDkxNjE2MzIzM1owGgIJAKAoXFyhnxKnFw0yMTA5MTYxNjMyMzNaoA4w
-DDAKBgNVHRQEAwIBADANBgkqhkiG9w0BAQsFAAOCAQEAy0yfUxVynGHewTxZ8tMk
-oVL4BNqgXY72zWbl3Gu8y1sunDl3X8fkTQmZod80ke5MbNWCIaqQllZ9tFfK07SQ
-ATQMp6z8PdNhrNq6L3JR0axSfWAEp/AYjLgZ6tF9NUCWsJU+hvpwU5hD0rh9blJE
-KZJcx3bA7DzWIsJ05EkFpUSe7M+D74pVp8XZdpR2Jrh/Nl3BOpU2Ghosab80ZkNb
-mk4YS2POV1tqjNq1XnwQcZ2iE22nvtbe16BQ6+JDgE6/nnNCwyKtRgkVfjbnsmB7
-S+Od5tk/PInrBPqbggjg7WJBN4wVlTnmGA1ZnrMoMNH8IOab2Fap8o1iTXk6PwWN
-jQ==
+BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yMjA3MTkyMDI1NThaFw0yNDEw
+MjEyMDI1NThaMFIwGQIIDWOdbRTyI9sXDTIyMDcxOTIwMjU1OFowGQIIRh5KNnNR
+ZPMXDTIyMDcxOTIwMjU1OFowGgIJAMhPhesMBkMaFw0yMjA3MTkyMDI1NThaoA4w
+DDAKBgNVHRQEAwIBADANBgkqhkiG9w0BAQsFAAOCAQEAErQy5/1a2sZBCD5PcLzJ
+3mP7a07gszXf4YfwB7AwWAWMVIm8kvJDcRE+EAMCtwdhbS86YlCMfhDB+Hq8hlAQ
+zDzPqwcYlWSCy44ZuaYOrmxDwk8PDye0fVNQLdcdcUm0HdopTpO8VtB9c/oFmLdo
+nFKUpR+CWSgMqgc3h+RPJQOVO7NtVST4rAWaEdJ0NC3Lt39nfVI9Kgb/aARZMWjq
+7ND3BqiltjXP9GJA3fYaptOEK9XS+nBDmzoYzP1Q4IwioJlOKN+2n6m/AoRXaYnn
+R1LnKVxNGgGFdxTegv4tjlBhVeKw2lEXA+zTAo8aUGMYmafQW4KNDL6dOz4KOcyv
+wQ==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
-MIICLjCCARYCAQEwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNVBAMMHFplcm9DIFRl
+MIICLzCCARcCAQEwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNVBAMMHFplcm9DIFRl
c3QgSW50ZXJtZWRpYXRlIENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjEwOTE2
-MTYzMjMzWhcNMjMxMjIwMTYzMjMzWjA2MBkCCESoxZtzE8VuFw0yMTA5MTYxNjMy
-MzNaMBkCCFKuYXN2qRPYFw0yMTA5MTYxNjMyMzNaoA4wDDAKBgNVHRQEAwIBADAN
-BgkqhkiG9w0BAQsFAAOCAQEADmxcIAS0P13nGAXuSvEA7ZR+2975M1bP0FrJbeEW
-o0dTpA5sv6qB+BYFtYneGYBskjd0FxlTJaU355YUSwSKumEs9W9pPsNuUUD2BTwU
-Iue0K0BDfkzqoLVfuFJBWtcgQPJdQYis6gSPAh4Yc3NtMpbl5mDO47ES+FZLa3v3
-IPTPfETJBG9aVlDRwr85zCXI13Xf1po4APVKqJhu92MU2nCT0RnfRMYORiOfJKB6
-lCUe0/IkEU3MlMK7tJVdbww10UFPy/z0MkD9S5XRompuT7aUS7gNRVV8KzOd1tXh
-0xqhC9KO+1kCTLmycISjk1jL3JagmIvPuJvcZk2NdvqHjQ==
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjIwNzE5
+MjAyNTU4WhcNMjQxMDIxMjAyNTU4WjA3MBkCCGItOxHiE3EZFw0yMjA3MTkyMDI1
+NThaMBoCCQC5HixTugRe5BcNMjIwNzE5MjAyNTU4WqAOMAwwCgYDVR0UBAMCAQAw
+DQYJKoZIhvcNAQELBQADggEBAG24O7X+D8sBOCJUN2UtCbKoHtra5F4WIGKE0LxU
+Yd564KgTEvywhlPoIRdewR8mnL2n1Mp8O6TVNS8gRF3UcCPIraw1h5wAr3y8XbXV
+cuRYxC04NmEeAaLDoNDYaFQUcc1Y80XqXhEdQhLAjZX45m26zcTHNgnuzIFWl+IH
+5sR9Kz5N2P8ytDB8VczVcTMJ3I7aHUTD8kHj2dA07BEgPpV7BusVg3zNb2f36fgj
+Hdc+qc3B379K7phWfugzXEk+IT0V58tUQjly1TzcltC5UhS2OMRs5eWgTKki3hnt
++Vqf5naZDZdjMB8nbcl2Qh6NmUz0oxNC3g1L4Bex7/qAaiA=
-----END X509 CRL-----
+
diff --git a/cpp/test/IceSSL/certs/ca3.crl.pem b/cpp/test/IceSSL/certs/ca3.crl.pem
index f72abfa840c..e7b6b8c3e79 100644
--- a/cpp/test/IceSSL/certs/ca3.crl.pem
+++ b/cpp/test/IceSSL/certs/ca3.crl.pem
@@ -2,14 +2,14 @@
MIICPTCCASUCAQEwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNVBAMMD1plcm9DIFRl
c3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
-BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yMTA5MTYxNjMyMzNaFw0yMzEy
-MjAxNjMyMzNaMFIwGQIILgt8kE/hRjEXDTIxMDkxNjE2MzIzM1owGQIIV6Idou+0
-+kIXDTIxMDkxNjE2MzIzM1owGgIJAKAoXFyhnxKnFw0yMTA5MTYxNjMyMzNaoA4w
-DDAKBgNVHRQEAwIBADANBgkqhkiG9w0BAQsFAAOCAQEAy0yfUxVynGHewTxZ8tMk
-oVL4BNqgXY72zWbl3Gu8y1sunDl3X8fkTQmZod80ke5MbNWCIaqQllZ9tFfK07SQ
-ATQMp6z8PdNhrNq6L3JR0axSfWAEp/AYjLgZ6tF9NUCWsJU+hvpwU5hD0rh9blJE
-KZJcx3bA7DzWIsJ05EkFpUSe7M+D74pVp8XZdpR2Jrh/Nl3BOpU2Ghosab80ZkNb
-mk4YS2POV1tqjNq1XnwQcZ2iE22nvtbe16BQ6+JDgE6/nnNCwyKtRgkVfjbnsmB7
-S+Od5tk/PInrBPqbggjg7WJBN4wVlTnmGA1ZnrMoMNH8IOab2Fap8o1iTXk6PwWN
-jQ==
+BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yMjA3MTkyMDI1NThaFw0yNDEw
+MjEyMDI1NThaMFIwGQIIDWOdbRTyI9sXDTIyMDcxOTIwMjU1OFowGQIIRh5KNnNR
+ZPMXDTIyMDcxOTIwMjU1OFowGgIJAMhPhesMBkMaFw0yMjA3MTkyMDI1NThaoA4w
+DDAKBgNVHRQEAwIBADANBgkqhkiG9w0BAQsFAAOCAQEAErQy5/1a2sZBCD5PcLzJ
+3mP7a07gszXf4YfwB7AwWAWMVIm8kvJDcRE+EAMCtwdhbS86YlCMfhDB+Hq8hlAQ
+zDzPqwcYlWSCy44ZuaYOrmxDwk8PDye0fVNQLdcdcUm0HdopTpO8VtB9c/oFmLdo
+nFKUpR+CWSgMqgc3h+RPJQOVO7NtVST4rAWaEdJ0NC3Lt39nfVI9Kgb/aARZMWjq
+7ND3BqiltjXP9GJA3fYaptOEK9XS+nBDmzoYzP1Q4IwioJlOKN+2n6m/AoRXaYnn
+R1LnKVxNGgGFdxTegv4tjlBhVeKw2lEXA+zTAo8aUGMYmafQW4KNDL6dOz4KOcyv
+wQ==
-----END X509 CRL-----
diff --git a/cpp/test/IceSSL/certs/ca4.crl.pem b/cpp/test/IceSSL/certs/ca4.crl.pem
index de0b88b0106..4bc36921783 100644
--- a/cpp/test/IceSSL/certs/ca4.crl.pem
+++ b/cpp/test/IceSSL/certs/ca4.crl.pem
@@ -1,15 +1,15 @@
-----BEGIN X509 CRL-----
-MIICPTCCASUCAQEwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNVBAMMD1plcm9DIFRl
+MIICPjCCASYCAQEwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNVBAMMD1plcm9DIFRl
c3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
-BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yMTA5MTYxNjMyMzNaFw0yMzEy
-MjAxNjMyMzNaMFIwGQIIBrDobNhhmFkXDTIxMDkxNjE2MzIzM1owGQIIUo/NVk10
-uIIXDTIxMDkxNjE2MzIzM1owGgIJAKu/jI7f+3joFw0yMTA5MTYxNjMyMzNaoA4w
-DDAKBgNVHRQEAwIBADANBgkqhkiG9w0BAQsFAAOCAQEAC8kOu53AtrU+8dribp+i
-gVxASZkT4G3boo1B2oqqT9JdkE8rq1lWtBs/tFfUsaA9OY+BzRVFCzLz8lToVerT
-QN31gACtzgVUXkBvZrPsgmhH7/885ja+rRIs5WhcoFpnL7HrQ+EAZvf7n07WnhmF
-KnM/Ap4lwBfd2oNOxjq/ut1jK8T813E4aC2kGM4ZhED/tNWqW6Qu/Mg6X48QqYbo
-RojrNuGyt4Lv7pEKAE1fusrPr3sY/jMxj2mWgKMa5AqOoWHvJQ2NC2hxum+N/qoO
-TkEesylVi1nY6iTtpitEccu/vIDrYTT5xXbBTQkuL6fVD6AtuJCOAhR05GdPM/g3
-8w==
+BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yMjA3MTkyMDI1NThaFw0yNDEw
+MjEyMDI1NThaMFMwGQIIAo+VBXGcQdUXDTIyMDcxOTIwMjU1OFowGgIJAJFLSHzG
+3e+0Fw0yMjA3MTkyMDI1NThaMBoCCQDpVZScbqc+/RcNMjIwNzE5MjAyNTU4WqAO
+MAwwCgYDVR0UBAMCAQAwDQYJKoZIhvcNAQELBQADggEBAKO7GHkGdrh+tnVdgShn
+ecnvX9SHMRFndCeXFg+l1mqwSUSzgIxHFMUIlvnoSarcxzB7SuhO/aJbuZ32BR7P
+/J3c0lquN6Y6qoWvYr7MbRORrELLIMfgtTbdARgUU7rSYe8lqS8PhoFjRc3SskX6
+cLJPbYSmfF0DDElR8JYppFDAecs31aKMLwmnneckPCzwv3x6ztbg0AsmG3kqC1eS
+9Eb1CHTn2H0NUtVDoqxyXl4go91ziZ0ft1NX1SC3rZFk2sQhHT3tLASNHTIQIs2Z
+gwzpmCpWa85bSDT4A8RgAfWobvy74vlXRUsBUwpX4q/RWe43Fekh9zAMixEKfSv/
+4lU=
-----END X509 CRL-----
diff --git a/cpp/test/IceSSL/certs/cacert1.der b/cpp/test/IceSSL/certs/cacert1.der
index 8afebf04da6..ab5fda48f8f 100644
--- a/cpp/test/IceSSL/certs/cacert1.der
+++ b/cpp/test/IceSSL/certs/cacert1.der
Binary files differ
diff --git a/cpp/test/IceSSL/certs/cacert1.pem b/cpp/test/IceSSL/certs/cacert1.pem
index c59d7238aa1..d60022cbf81 100644
--- a/cpp/test/IceSSL/certs/cacert1.pem
+++ b/cpp/test/IceSSL/certs/cacert1.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIID8zCCAtugAwIBAgIJANCpYBrCeVqJMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+MIIEADCCAuigAwIBAgIJAL/ehwUYP0SNMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
-MTUxNjE3MjhaFw0yMjA3MTkxNjE3MjhaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NDdaFw0yNDEwMjEyMDI1NDdaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAPKw0AD7Xxd+fwXK7Bm6W2jWF74Mm5PZmeHft5mYyr1a71bZxqWQ
-wFtv54U/U+Xsy66PoB3GxhkJXMCD1K0P1736DSvTxYTd2eVuHGI/NCv4vyT8PtvX
-rG4UewVrsMQ9W4Mt+29R/QBMHWd16Wqjy2ATp2SiPaOQGnypc5vd+7fp6KPg+CdV
-25xZCv+jnA3VUii8lKpX6LuMwncsUVaakGwWsRkAhYHlDXEDGbePjTRdWic4OECZ
-B/cOXwQkJiJAzfaAADIMnmqu6iUHToadVlp3m2QNKuchDgNPshO62tJIYFy5F+Qh
-MCcmmh+bYCDkX2E56Lq31mWB9xv8KyUVFTcCAwEAAaNSMFAwDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQU/ysXYfGAXBGwhwBTQL326lLOt1gwIQYDVR0RBBowGIcEfwAA
-AYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAWDRKsZa/kOmC
-Vi6XzP/Rh+na4Ckn9/mEJ6I3vXIK6Fc51tOts6cdbE/hhu6DZyTqmsc86ZKkX+kz
-LRe+klU8RVAx2pYHoQW4QF69dfEVmosAQJvMju3yTr/RQI4M6eFUu9/yXj0IzaSt
-+T5O3fVHhJgQ4w2WFEKpmUp2NVda6pkngpL2+Piz0w0wueH0XfNG6lv9F3vwsSVt
-O0UoEqSpINYELn37siBAmyNxWMaas6yjIv5lI2TlmHKF9IA0m9zDXhh8LtIRtonc
-Y6Uk1sw6WYRLDh6KJPp5u6ewvto21PEj+1nj6wFuUVyao8tPfzm7uJ8Wb38HL6NN
-rnXaNL4XbQ==
+ADCCAQoCggEBAPJye36yynPKN0wQkNFCy0hX5CKC4Xe4tgJJVtAhsJhvI7ZdIvop
+IrwQg9+YjS6darXk4OqxGDYS9q1w0X1EpECu2QoMBxLRh8oCD2Y6t9kIr01ptXJf
+tkswubbry+pRNtPCgn0DR7vmngtjVpkDSssOd81e6dNcMJKupFn69zEqXEWMX5Qh
+M6lbwLQkaA3U5IfRStnOp/CmMw179vHaLfPiByHMZks5XhpjT/sRLvrGvDdXB4AX
+7g192Rmzv1giVA5gO3usWLpwpfiT4q9qxOfCylgGQUAnRoPL3+Q9dqWBNOJ2cu4L
+Lwtj14nw7MjYeVhfrlbwUxDOnS5iaUlQ+WkCAwEAAaNfMF0wDAYDVR0TBAUwAwEB
+/zAdBgNVHQ4EFgQUAv0b6W9Olo8MDplhj0VIaysUPDEwCwYDVR0PBAQDAgGGMCEG
+A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
+ggEBAE9Fz0UghHUd/rTs4ugKo+F4ICQoK8b9ALoXsN0zTt0/MDxIocg6jMu/F7We
+C8xuVQjLRQL4pXeevQxg//eEG32Qk0+CaClkZkHvG1AX06fHkXsIm52Gu9QD+18t
+nyr4RbyOWArYcZZZacZV9tqmsqf59aE2UNPqv1Kg1ypt/LrefAS7aA48tYzJ6J73
+HtYsyy5b3w7Nf9hxFemGehkzQ8eouSJytCmUcG9sxgcZMOsOy6BEB2hVgAI24Pj2
+uda53Q5u/5CFiHvbJb2R48dVTKlVOcT6fXAknuXu7bLmS/++f4bwzmtgOiCwFWnL
+CqVhexCqbwVNhXvKB8r/cOOC0Hk=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert2.der b/cpp/test/IceSSL/certs/cacert2.der
index 4eb02277da2..5746375c6b5 100644
--- a/cpp/test/IceSSL/certs/cacert2.der
+++ b/cpp/test/IceSSL/certs/cacert2.der
Binary files differ
diff --git a/cpp/test/IceSSL/certs/cacert2.p12 b/cpp/test/IceSSL/certs/cacert2.p12
index bb01d28c68f..12f17219d6d 100644
--- a/cpp/test/IceSSL/certs/cacert2.p12
+++ b/cpp/test/IceSSL/certs/cacert2.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/cacert2.pem b/cpp/test/IceSSL/certs/cacert2.pem
index 844ce57b1fc..10397ca11dc 100644
--- a/cpp/test/IceSSL/certs/cacert2.pem
+++ b/cpp/test/IceSSL/certs/cacert2.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIIECDCCAvCgAwIBAgIJAOmrXvwb1SA+MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
-MTUxNjE3MjhaFw0yMjA3MTkxNjE3MjhaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
-IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
-BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALkPaeIsfhZYMosRtpHouaLsMMicZvmQCYEdTo6nraRCXPk5Cbcy
-zoV7rsVDdGDHNwtCbLXI0Y9I0hkFnzZjCFUUwFLttD93S2gwMUiRfcac1lV4VbrA
-qQvsdblzQcHWDd/VBYT6cv+7UHjWcFa5ta9RNHP6nDIeP3A20nSafdiEilF4PVCt
-NmIJ9inLH41U/9x4M2BYeKPoKatgthg06I+XPIq1jEP9ptHCDKsNUjQPXsKzuG5x
-NkPYRIwVCTBgFbaY1k6gOKaDnKan6UwrfvK1iIlI6KBa5VyCrFXjWGTMi4NTjeEN
-ZS9jh0wPIoN2VCBh2imH5D0z34r014WoTBMCAwEAAaNnMGUwDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQUQeLzqH4lgbBeiwcJY4fQIkCv1J0wEwYDVR0lBAwwCgYIKwYB
-BQUHAwEwIQYDVR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAVgl2eem3sjO98VifAxLijtUSUq0WL3ljjRmazdoM4zFfo5Pw
-9atFGFWXdXlhFYfYFA8FJ9M4SbFnKsKYPUknO0WF4uWW4MjTZV6rc66aXiXcTW7Z
-SlMPLWc7V3jNWWipLEBZNpGJdyY+/K3ICxyRCm7oi5hrmvb6aNWllA+jK4ki88zv
-2kvMrPJdo7N6Sa6G0Rfu33fPIymHyXPHOVV/mDZ2vUiXjO/BG9q7Cs/J+P11dLc3
-nmxv6tEBfklqemGMaRbEAzZLKPJ8XD975qKsgA1pX8kL9SsFSgHGkSNf24dym30I
-c1ap2D2imLtqOYXRjEw3ek7ITUU/TQRvq1sxdQ==
+MIIEFDCCAvygAwIBAgIIJfNaIO8KiQUwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA6gbOkX2Gg0H6ZzJE53hchgN8e83BM04G9gtpSjpIDsoBds7RiA78
+u8GjcNjFdKCCTYwFPP7oKM0dz8wDb48nwlvi7dd9CK17kXqFku90hcH4fPxTI8Is
+DHNUO+E3kqUbVPER9esS8JlvyKqUXv0KKveyGsf6BVBQqIdfSdGBX67N0lQeEmTm
+5nx23ZpsyoIXppgOhpjcQNodOgtuaggRe0t6gWu7TNxDZDlB3vakvvBUUaHwxkP5
+P/gpiGYd246DyVVrzCh8AhNp5X8QMDRC1SuP0+lhssm3x9BBa9uHtBwlBuxTmrOr
+/kP3Y2ioVFo0uAr3Inq19fB/rQrphtbyFwIDAQABo3QwcjAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBT5QnLEb7Wmw75lwYz3TlpbDjAYKTALBgNVHQ8EBAMCAYYwEwYD
+VR0lBAwwCgYIKwYBBQUHAwEwIQYDVR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9j
+LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAfLi/0Fwd+6uAYPUblTcqycDLf4Qk+L62
+pTaE3YbRse0Ujbm9A6mhnYDVm4I5VCOpQNfLpp94JSe4KrfnE10D1buWbIESmgXo
+7NMjPQryhEZn8LKY8qfFyEheQKrfQ4e+/6jNp3OyGIY/wHTH1mkUsX0LcQX56Fa6
+PQJY5bnR+LZluIb2s3PlNFdleN3Igu7zcF7za0Ow/ayAPOEKiKLs+ttjVD00q+6T
+Q7u0Z/FCqaQgMrDYKn9AMBZlGIIX8Q95XkWkM7+lXZdPmMwyzpaVUtN5/2Qr9GKS
+2WeVc7OPiRzbB3qCsa9Ysswhrm2awMfkR9EZcVJJohJ/k9Bm6PQW/Q==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert2_priv.pem b/cpp/test/IceSSL/certs/cacert2_priv.pem
index 4b40728c9a8..8815fd59466 100644
--- a/cpp/test/IceSSL/certs/cacert2_priv.pem
+++ b/cpp/test/IceSSL/certs/cacert2_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC5D2niLH4WWDKL
-EbaR6Lmi7DDInGb5kAmBHU6Op62kQlz5OQm3Ms6Fe67FQ3RgxzcLQmy1yNGPSNIZ
-BZ82YwhVFMBS7bQ/d0toMDFIkX3GnNZVeFW6wKkL7HW5c0HB1g3f1QWE+nL/u1B4
-1nBWubWvUTRz+pwyHj9wNtJ0mn3YhIpReD1QrTZiCfYpyx+NVP/ceDNgWHij6Cmr
-YLYYNOiPlzyKtYxD/abRwgyrDVI0D17Cs7hucTZD2ESMFQkwYBW2mNZOoDimg5ym
-p+lMK37ytYiJSOigWuVcgqxV41hkzIuDU43hDWUvY4dMDyKDdlQgYdoph+Q9M9+K
-9NeFqEwTAgMBAAECggEBAIWTIpImGzx1nMXUmzrmCFgYs32Zppor5TBUvwco8KTH
-YeRhzyl0eqzOgW/RKIdSQ+DUqTLtKJWLslptPGY9RR5kRA2XlarZqIwjfO8sVOSu
-/+XhXb/WoC4DF1YsYyJOJuWRFNLPE4KS6ZrO7XcrxIAu1PWBxoxGWPPeHjob6QoG
-JiSKpF01AiDcfgR2wOUziZHSfO3HHbPTwCBPkvtZE57NnzeijNEM0bJ1e+N2bqQI
-fqVpjf9gxQlP8bDev+/Zpdm0DwyS7hu243UzkPANlVCCI5Q6HQztWkEhbP9Bf3Ie
-dIR1oVBrc5guS5DQwTNBZqGF4j8ngKh4Wg/jesPy8kECgYEA51UmW4ZVUw5VBsor
-Xajx8Mhj0TCrPNXBR3IWxgUiUY/8Pnpmizq1j/BxW7p6/qMEZyrA6CWBiz//Z6AC
-7LBUwMxlm/aa2ij+vkM5Iglo7IVWLVlp1Zr9jK6Ccm547aDD8AvPzndyS56lxf/0
-OcMRlvNYfBgY7t5Ifcbfh/Pn6N0CgYEAzMsiFH0vaUqfVlKRDTP7PtizdD0Teeq3
-5g4VJOC+Fa26m6uYn7DdkfhaLn0MqkWg7LHWZN3KBXIiZ2qpSoecuhNn9NpTlm8e
-Q+9dmb0ePZSZptTK2VCN1zG51u3f7NiRCRKVbIOksINwinKzS3DvJB1Aw5D4KNkX
-RMz4zwgAQa8CgYB2KBXZdbmrHIztVOHlit9YvuHM/XDZN8zq8ykSp5ip1ENgniA2
-SRxnksYztgIQga9ECqBRcqbCO0P259HWlxITD9NuX/0kJQBIqglKi0feVxR3QU4/
-XlTXQGM8k5SMuyqZN09DA9uLKFM/2MYjorEfStgNOjmx+DNKmwOda0UuuQKBgQC3
-1C+HTMfeL8nPZtYlj9+bjlGnqZtt+K+Spll8fPCj7Qpw6htaXRzHBrOMv1s7DL1j
-Ok9Ew4GwWb9gLXJBIHIi5YCPXdtiUeRM/vR6KDSY+mbiRmi/oXtxC4XR1D0JEW0/
-Q5s1iQWwHIxM+qDOu1UuicO0yNC5egVVENjWnkv8qQKBgGscnWfrA44LO/HyjCvH
-drUxwfZ+WEJm3dVEQGHVoTnKzVwGSiNIW6/jNfD3N7TNpTCmbTQx2dImeK764ROb
-EtMO47juv7XwN14b9gVlqtrYkrOQSxOPmLQgIcORYrc0fUsyX0VtMeU0OKi1gRrM
-EIjA3eRlNac4nlTR5pakrSgM
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDqBs6RfYaDQfpn
+MkTneFyGA3x7zcEzTgb2C2lKOkgOygF2ztGIDvy7waNw2MV0oIJNjAU8/ugozR3P
+zANvjyfCW+Lt130IrXuReoWS73SFwfh8/FMjwiwMc1Q74TeSpRtU8RH16xLwmW/I
+qpRe/Qoq97Iax/oFUFCoh19J0YFfrs3SVB4SZObmfHbdmmzKghemmA6GmNxA2h06
+C25qCBF7S3qBa7tM3ENkOUHe9qS+8FRRofDGQ/k/+CmIZh3bjoPJVWvMKHwCE2nl
+fxAwNELVK4/T6WGyybfH0EFr24e0HCUG7FOas6v+Q/djaKhUWjS4CvcierX18H+t
+CumG1vIXAgMBAAECggEAGJAmVkxKi179cp9qxAYfZUwwYKjel7f02xZPiCRIiTot
+Sn8NVwPbsF6ep6rY7r4kxGbnQIOwx7eKYtO9oz6Z+bholSDXqsrVUWupYXFoqtwK
+bMk/ILMHVIyLps1OEUJAdXs9W1u/sn59pnOLpydVTd/kUxNHlrnbUr+tV14kqhoc
+x817ixPsoXD6GCN2NDencSpXleqK9uO/9HJilNEB1B3kGBHITwFgmy7b5fqxU0T2
+ZVNTYyyuiGnYLB7V0TGftnUtyOGc59YNOxI7CyCbiHb35xWpcy5a1viShPsh7r/2
+AEAFO0E34O+bv9bIKzOxAK15WmqvE4NlqaPH+4wQYQKBgQD6+wQH3tgAVftJgaHT
+gh49ID4UdnbhGSOorVjX/OSFAO0SOM7o5r9oKrD1YE1Te4qQyafQF8JkrvHp9AJt
+79X9kN4WbuPommPLfMvrN4umfKIg+9EHeQjhh1Gw5eefUxUJi3ARbZR03FWa3Eb4
+YDE0cKSduivFJgtbHZEfiFrYIwKBgQDutP1KuvBnVRjKLEaqkCxwQOnaS5mWRRZR
+gla5Sms0KJok+QxbrHavyNxX07di58J+uDH5vAznsTcN+9awRF3UxOm0BB6ZG3St
+gH0gZ7nHuac9/UDfrW3xS9SBCHJik96WfMywtiLrbaxjZXF6r2Oljl3Jzi5VQ7hX
+CX3/A/EDfQKBgBgkTR70sJJXsvQ/I/HUclQu5cnSG11LrcJr6j/cc57Xl/ZIwJ5m
+k8LRWHRB7y44k/uZair6HhjROzPl5NXuXAcoCDTgNcwKDc9lEbhuf2BkXLQPhOvT
+GKeY/KKnesA4na1tXDpQ8BbNmu5qgekiV5lTvIHvhoZQQodhMLR3yUVBAoGAaI56
+S9tqJbjObO/L3DXeYSTtyaJHmdyVFArFNc/0+Rm3uu4jjZwTOJgAe6/OqdHeDWdc
+7IiEFpA3Dzb6KKcpemLuAt2zEVlHWB/pruIALA2TxcFCQzdR6tlOMV6jy639V2k+
+t0BwNzMIyVjLxfNA8GlVh2l6Pfq1qdoMiEEPtnkCgYEA7yyve+oQZp2OQcL/5qnq
+gtpNVnK8E/aFXY16Ctj+sj9PTNYmvcknAal6edwnUIeXMGtgrdut5GCHxFiGm8SV
+RzG7vGJ6QWUvW7/83GWtAw7AOMLoZcbsc4sXm3YHNINnAxf5fGNgPm0Qro6a7sFu
+B/QQysq9BMtL+XjrOwIjBoY=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/cacert2_pub.pem b/cpp/test/IceSSL/certs/cacert2_pub.pem
index 844ce57b1fc..10397ca11dc 100644
--- a/cpp/test/IceSSL/certs/cacert2_pub.pem
+++ b/cpp/test/IceSSL/certs/cacert2_pub.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIIECDCCAvCgAwIBAgIJAOmrXvwb1SA+MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
-MTUxNjE3MjhaFw0yMjA3MTkxNjE3MjhaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
-IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
-BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALkPaeIsfhZYMosRtpHouaLsMMicZvmQCYEdTo6nraRCXPk5Cbcy
-zoV7rsVDdGDHNwtCbLXI0Y9I0hkFnzZjCFUUwFLttD93S2gwMUiRfcac1lV4VbrA
-qQvsdblzQcHWDd/VBYT6cv+7UHjWcFa5ta9RNHP6nDIeP3A20nSafdiEilF4PVCt
-NmIJ9inLH41U/9x4M2BYeKPoKatgthg06I+XPIq1jEP9ptHCDKsNUjQPXsKzuG5x
-NkPYRIwVCTBgFbaY1k6gOKaDnKan6UwrfvK1iIlI6KBa5VyCrFXjWGTMi4NTjeEN
-ZS9jh0wPIoN2VCBh2imH5D0z34r014WoTBMCAwEAAaNnMGUwDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQUQeLzqH4lgbBeiwcJY4fQIkCv1J0wEwYDVR0lBAwwCgYIKwYB
-BQUHAwEwIQYDVR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAVgl2eem3sjO98VifAxLijtUSUq0WL3ljjRmazdoM4zFfo5Pw
-9atFGFWXdXlhFYfYFA8FJ9M4SbFnKsKYPUknO0WF4uWW4MjTZV6rc66aXiXcTW7Z
-SlMPLWc7V3jNWWipLEBZNpGJdyY+/K3ICxyRCm7oi5hrmvb6aNWllA+jK4ki88zv
-2kvMrPJdo7N6Sa6G0Rfu33fPIymHyXPHOVV/mDZ2vUiXjO/BG9q7Cs/J+P11dLc3
-nmxv6tEBfklqemGMaRbEAzZLKPJ8XD975qKsgA1pX8kL9SsFSgHGkSNf24dym30I
-c1ap2D2imLtqOYXRjEw3ek7ITUU/TQRvq1sxdQ==
+MIIEFDCCAvygAwIBAgIIJfNaIO8KiQUwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA6gbOkX2Gg0H6ZzJE53hchgN8e83BM04G9gtpSjpIDsoBds7RiA78
+u8GjcNjFdKCCTYwFPP7oKM0dz8wDb48nwlvi7dd9CK17kXqFku90hcH4fPxTI8Is
+DHNUO+E3kqUbVPER9esS8JlvyKqUXv0KKveyGsf6BVBQqIdfSdGBX67N0lQeEmTm
+5nx23ZpsyoIXppgOhpjcQNodOgtuaggRe0t6gWu7TNxDZDlB3vakvvBUUaHwxkP5
+P/gpiGYd246DyVVrzCh8AhNp5X8QMDRC1SuP0+lhssm3x9BBa9uHtBwlBuxTmrOr
+/kP3Y2ioVFo0uAr3Inq19fB/rQrphtbyFwIDAQABo3QwcjAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBT5QnLEb7Wmw75lwYz3TlpbDjAYKTALBgNVHQ8EBAMCAYYwEwYD
+VR0lBAwwCgYIKwYBBQUHAwEwIQYDVR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9j
+LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAfLi/0Fwd+6uAYPUblTcqycDLf4Qk+L62
+pTaE3YbRse0Ujbm9A6mhnYDVm4I5VCOpQNfLpp94JSe4KrfnE10D1buWbIESmgXo
+7NMjPQryhEZn8LKY8qfFyEheQKrfQ4e+/6jNp3OyGIY/wHTH1mkUsX0LcQX56Fa6
+PQJY5bnR+LZluIb2s3PlNFdleN3Igu7zcF7za0Ow/ayAPOEKiKLs+ttjVD00q+6T
+Q7u0Z/FCqaQgMrDYKn9AMBZlGIIX8Q95XkWkM7+lXZdPmMwyzpaVUtN5/2Qr9GKS
+2WeVc7OPiRzbB3qCsa9Ysswhrm2awMfkR9EZcVJJohJ/k9Bm6PQW/Q==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert3.der b/cpp/test/IceSSL/certs/cacert3.der
index 726a5cd3c9e..ab16670f5f9 100644
--- a/cpp/test/IceSSL/certs/cacert3.der
+++ b/cpp/test/IceSSL/certs/cacert3.der
Binary files differ
diff --git a/cpp/test/IceSSL/certs/cacert3.pem b/cpp/test/IceSSL/certs/cacert3.pem
index 5075a1e6c53..93473c321f2 100644
--- a/cpp/test/IceSSL/certs/cacert3.pem
+++ b/cpp/test/IceSSL/certs/cacert3.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIJAOGYOElEzDTWMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMTA5
-MTYxNjMyMzBaFw0yMzEyMjAxNjMyMzBaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
-IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
-BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAOFPAXV9VFU6FVrFIlm8PPX+dA6rrOu8RljQBT/JYVsohTEDN9mY
-9Lz4iiZf9wSvAPvuHXrvtKcYl558/9KgzqIse19aKs+77qno0LPyHf5JRxQud/+P
-imPK3WnmCHwZHi8yHKl1h9GP+vPn2MkAm6le5t37oTtKbnhmAA7f4IdY4Csk3te4
-KcgeNeFAlaIB4mNifz7Vm/SCeR2oest8yW9r7Wb3bcHRXEKL5tc1WNb21BmLEg3V
-PnPh778RxF0vodUrQUciM4+kXDrvuIHP+k+/u7xg+Kj10Cy0KJKRhk1N1+6EVVqz
-j1RBw8sDtLKyROOgK7U+3UjifsG0dG9eSj8CAwEAAaNfMF0wDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQUnsjLSr3zM4moTqHPO9CsJ3hCPQ0wCwYDVR0PBAQDAgGGMCEG
-A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
-ggEBAHhnDnxvq4i5ypGxIh89g9G2PiFUJ5YmoVldQ1QQkq1R1skzG7ROeKlHh/cC
-rs8R9pFSnNFTQC3TGecV0qk73alzGjav59czP4R2I4OZhABv/zvImmmQnaZBAk9g
-5JwYZ+Kzbwy8hxl76L0rHK4z9w/zpGEM+vrH4gZRGQdCPZ+5XzgeAOkaC+rPOkcw
-RtwPAvUS62fLZi+T+n7PLtoRwlzLPONX6RVPhxYwMg3Di7N4MM06isgaI91a7BUa
-iB/Uf/3ygmHd1rrbiNh3DCGKSVepwH1UTCu1Rjy58EpdIp9G/OGintjDc8XajQS4
-bhvlbfthknBKY96MwibqxDRme9A=
+MIID/zCCAuegAwIBAgIIMzs7dCK159swDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAjjBH//K6wisingdPFFjFan6pK85DLs1CyqpOhlyMhsp7WzgkGx6E
+uvYUWdU+f89uaXI13n8SiyxJ590KidkR+pdLOb0r5vKH8o/P3xoJIy76c3fHV7Mm
+iVAEaTgdX0+qIR1gM3CxtxH848Bas6DOiVJe7drwza3qs7HNmQvPmUpdDDXLII4k
+swsV2a29d6/oF/oy9J0FQgvDuopsCEjMVQ1xhTcbFDNa9uS9fHv75KTXpJZ3uKjY
+V2dZeM3oakIx0eAaVXZrRAgcFZ0sJtWzaaNn4S2Em79XpjTbbcq8Yg30o/G1xVDj
+3f4yS9NheeCkLM/b1ri+8TXxqHePPjGBEwIDAQABo18wXTAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBR3tHoC3VL4bhkfq+NsrUhRB+RuuDALBgNVHQ8EBAMCAYYwIQYD
+VR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOC
+AQEAeHV0PulB78ocqeJrQvAVl2Xvai3H8CqAqAm0PAmpZbGxdGDkJ+p07gE2afEi
+lidSLmkesyGbM8B7VJC67e9cpLTHnF+JfGh8TRefjvOHWV1atmO4zPWcpGqVcQbs
+rclJR6J93pgSdhR+6tlHTHf+fNaZuoi6DrIUGonrcNazbKzAjZhSkNl19qbOSAq2
+kjfWjzRlOSHkME3Jd2nVlT7PVmXKGavnOdpQy2oHuWpLeTDBq8tZNC1S14rOqEhv
+5wL4kEzb4kHc5zm/MKDHcZ9egimtEhHAARyNPQjwgfDWEaEFRNEujI7eMTO46hPE
+B3XK931kxKvtnJOWp1zFXOVdbA==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert4.der b/cpp/test/IceSSL/certs/cacert4.der
index 5bce345a92e..7d7e790a172 100644
--- a/cpp/test/IceSSL/certs/cacert4.der
+++ b/cpp/test/IceSSL/certs/cacert4.der
Binary files differ
diff --git a/cpp/test/IceSSL/certs/cacert4.pem b/cpp/test/IceSSL/certs/cacert4.pem
index 96f069257b6..52956d05bf9 100644
--- a/cpp/test/IceSSL/certs/cacert4.pem
+++ b/cpp/test/IceSSL/certs/cacert4.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIJAIEr4TCFXeNcMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMTA5
-MTYxNjMyMzBaFw0yMzEyMjAxNjMyMzBaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
-IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
-BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAME+gjpbcHfR85ROm4hsT94XBQQgCcT7ZOqG1HvzDRyZYs5jCxpY
-9BeKLd0JjacuXpp/uiFiy3F2MSkEp1KyviV10+uqv3myGd+phCRtRFpDRX2y7ocn
-+WUTWi0koqfs2KLqzqBhgfSLHeLHECKOH3u1NUGZSjfR7+hEu04Ru65non7SyQ3U
-Csa1psXsWMKlo1YfdPTzGJ5IQ2cJXHQFylpgLk8yrVDImMHPymsajXFsq34jpkpu
-QDZeKHCaKEgl20S3xrmALCHpXNdkjqtc2gNoVI+C//oZpk9ms2EOlsKwzxB8/d9W
-eunK4h0IB3H2mZ6QWAm0SSyAVSAdaNBDxxECAwEAAaNfMF0wDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQU/it+ysGyPKGv41bKHJBfIpNzzLswCwYDVR0PBAQDAgGGMCEG
-A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
-ggEBALq8P+lJ+nvK7LegSDKT5WamOzO4YThObANCsP/zLQRsIbHjWGDkGT57ndwc
-1Wp0GkhoTWOraocAnEHTSFnMC6j+xABspMxz6ob5T5mIFLmyiTf2psVlmsPDmbR8
-RIOMkW0WFBQKO+zFSE8Mwwnw+QKGL7Xj396ZxGC9SfNiOrW0UBJUBsML3Ck/hM/H
-+GVqFN15/WK/LOzCzTWVUlrFFAKtii9r9PUgJfX+XySULcFwvu+rPsgxxMGn2CNa
-iuAAumzTVRJTVM7VSGEImz0VM2F32jKhsjQwbNI2KqlYCTZlklecHT6Fk1Dd8SQi
-pBJgYgVfzEcgm5pNMFakDUzOcw8=
+MIID/zCCAuegAwIBAgIIRwT6LywO8TMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsb2Zd7YfAoQe0yqQf9Jln4GgXw/MTwIJtNSsXlzCgKFez4sNvZTO
+zZDXEGsVERnrndwDO5/Fh3za7HhAXHwd9cmYiTTkMgQZy1dHyCx/LkYrLx+sLGnx
+BnhEMh1h79EdU3pKq6WRFbxpsJ5mWG0yaSZoVUzhz0WUDo1YmAisOoYFEtOwg6PR
+VUX/mWOHo5jlnCsLK6Ez5Uw99CVctNgfbHFTdVIowj6YKMtiFccWH6q39qg2Zvzv
+RLvYcT6ZsN9fnhDo8XdK9L7BPrUaCkBxTUbiljwIkErcbwlQODzADUuSYEQGsPjn
+R+eg/AD05uqBQfX8eXxtX21Yujb9ooy1+wIDAQABo18wXTAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBQUiznE73EGhCA1WDjrJZOvZumR6jALBgNVHQ8EBAMCAYYwIQYD
+VR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOC
+AQEANU8ZhUyK4zjCGZoea5zYtk8BLot8POj9c+kCQHVmyeH6fjyuxICudX0dY69n
+myHvI0jhtxiHd7YGEYE6OeWeCOUHn/8v1unqbDWFjBmYLOgoNVQ6UhfcF9gVn6cp
+356nTTcGmz7ZvhloqQb//6rKk1mfq+6KrCrMO2qVRmYtcV2blrhHZj+4flmFbn2e
+ldsDqOwLHinFpvQFnr7xnBYyGMISOl/MM89PQRq22Ob313qExLe2G7VFMJ7SAEET
+qeqcGKHRlF01EniJ9OV9cnJH+uzzsmA1GRZltqpdrqcDF3z7pmiePFO+zFdSqDtv
+zagOFOzlR8lNDB0MiKhXWZx61w==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacerts.pem b/cpp/test/IceSSL/certs/cacerts.pem
index df75a533d77..98c04684e28 100644
--- a/cpp/test/IceSSL/certs/cacerts.pem
+++ b/cpp/test/IceSSL/certs/cacerts.pem
@@ -1,96 +1,96 @@
-----BEGIN CERTIFICATE-----
-MIID8zCCAtugAwIBAgIJANCpYBrCeVqJMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+MIIEADCCAuigAwIBAgIJAL/ehwUYP0SNMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
-MTUxNjE3MjhaFw0yMjA3MTkxNjE3MjhaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NDdaFw0yNDEwMjEyMDI1NDdaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAPKw0AD7Xxd+fwXK7Bm6W2jWF74Mm5PZmeHft5mYyr1a71bZxqWQ
-wFtv54U/U+Xsy66PoB3GxhkJXMCD1K0P1736DSvTxYTd2eVuHGI/NCv4vyT8PtvX
-rG4UewVrsMQ9W4Mt+29R/QBMHWd16Wqjy2ATp2SiPaOQGnypc5vd+7fp6KPg+CdV
-25xZCv+jnA3VUii8lKpX6LuMwncsUVaakGwWsRkAhYHlDXEDGbePjTRdWic4OECZ
-B/cOXwQkJiJAzfaAADIMnmqu6iUHToadVlp3m2QNKuchDgNPshO62tJIYFy5F+Qh
-MCcmmh+bYCDkX2E56Lq31mWB9xv8KyUVFTcCAwEAAaNSMFAwDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQU/ysXYfGAXBGwhwBTQL326lLOt1gwIQYDVR0RBBowGIcEfwAA
-AYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAWDRKsZa/kOmC
-Vi6XzP/Rh+na4Ckn9/mEJ6I3vXIK6Fc51tOts6cdbE/hhu6DZyTqmsc86ZKkX+kz
-LRe+klU8RVAx2pYHoQW4QF69dfEVmosAQJvMju3yTr/RQI4M6eFUu9/yXj0IzaSt
-+T5O3fVHhJgQ4w2WFEKpmUp2NVda6pkngpL2+Piz0w0wueH0XfNG6lv9F3vwsSVt
-O0UoEqSpINYELn37siBAmyNxWMaas6yjIv5lI2TlmHKF9IA0m9zDXhh8LtIRtonc
-Y6Uk1sw6WYRLDh6KJPp5u6ewvto21PEj+1nj6wFuUVyao8tPfzm7uJ8Wb38HL6NN
-rnXaNL4XbQ==
+ADCCAQoCggEBAPJye36yynPKN0wQkNFCy0hX5CKC4Xe4tgJJVtAhsJhvI7ZdIvop
+IrwQg9+YjS6darXk4OqxGDYS9q1w0X1EpECu2QoMBxLRh8oCD2Y6t9kIr01ptXJf
+tkswubbry+pRNtPCgn0DR7vmngtjVpkDSssOd81e6dNcMJKupFn69zEqXEWMX5Qh
+M6lbwLQkaA3U5IfRStnOp/CmMw179vHaLfPiByHMZks5XhpjT/sRLvrGvDdXB4AX
+7g192Rmzv1giVA5gO3usWLpwpfiT4q9qxOfCylgGQUAnRoPL3+Q9dqWBNOJ2cu4L
+Lwtj14nw7MjYeVhfrlbwUxDOnS5iaUlQ+WkCAwEAAaNfMF0wDAYDVR0TBAUwAwEB
+/zAdBgNVHQ4EFgQUAv0b6W9Olo8MDplhj0VIaysUPDEwCwYDVR0PBAQDAgGGMCEG
+A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
+ggEBAE9Fz0UghHUd/rTs4ugKo+F4ICQoK8b9ALoXsN0zTt0/MDxIocg6jMu/F7We
+C8xuVQjLRQL4pXeevQxg//eEG32Qk0+CaClkZkHvG1AX06fHkXsIm52Gu9QD+18t
+nyr4RbyOWArYcZZZacZV9tqmsqf59aE2UNPqv1Kg1ypt/LrefAS7aA48tYzJ6J73
+HtYsyy5b3w7Nf9hxFemGehkzQ8eouSJytCmUcG9sxgcZMOsOy6BEB2hVgAI24Pj2
+uda53Q5u/5CFiHvbJb2R48dVTKlVOcT6fXAknuXu7bLmS/++f4bwzmtgOiCwFWnL
+CqVhexCqbwVNhXvKB8r/cOOC0Hk=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIECDCCAvCgAwIBAgIJAOmrXvwb1SA+MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
-MTUxNjE3MjhaFw0yMjA3MTkxNjE3MjhaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
-IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
-BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALkPaeIsfhZYMosRtpHouaLsMMicZvmQCYEdTo6nraRCXPk5Cbcy
-zoV7rsVDdGDHNwtCbLXI0Y9I0hkFnzZjCFUUwFLttD93S2gwMUiRfcac1lV4VbrA
-qQvsdblzQcHWDd/VBYT6cv+7UHjWcFa5ta9RNHP6nDIeP3A20nSafdiEilF4PVCt
-NmIJ9inLH41U/9x4M2BYeKPoKatgthg06I+XPIq1jEP9ptHCDKsNUjQPXsKzuG5x
-NkPYRIwVCTBgFbaY1k6gOKaDnKan6UwrfvK1iIlI6KBa5VyCrFXjWGTMi4NTjeEN
-ZS9jh0wPIoN2VCBh2imH5D0z34r014WoTBMCAwEAAaNnMGUwDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQUQeLzqH4lgbBeiwcJY4fQIkCv1J0wEwYDVR0lBAwwCgYIKwYB
-BQUHAwEwIQYDVR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAVgl2eem3sjO98VifAxLijtUSUq0WL3ljjRmazdoM4zFfo5Pw
-9atFGFWXdXlhFYfYFA8FJ9M4SbFnKsKYPUknO0WF4uWW4MjTZV6rc66aXiXcTW7Z
-SlMPLWc7V3jNWWipLEBZNpGJdyY+/K3ICxyRCm7oi5hrmvb6aNWllA+jK4ki88zv
-2kvMrPJdo7N6Sa6G0Rfu33fPIymHyXPHOVV/mDZ2vUiXjO/BG9q7Cs/J+P11dLc3
-nmxv6tEBfklqemGMaRbEAzZLKPJ8XD975qKsgA1pX8kL9SsFSgHGkSNf24dym30I
-c1ap2D2imLtqOYXRjEw3ek7ITUU/TQRvq1sxdQ==
+MIIEFDCCAvygAwIBAgIIJfNaIO8KiQUwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA6gbOkX2Gg0H6ZzJE53hchgN8e83BM04G9gtpSjpIDsoBds7RiA78
+u8GjcNjFdKCCTYwFPP7oKM0dz8wDb48nwlvi7dd9CK17kXqFku90hcH4fPxTI8Is
+DHNUO+E3kqUbVPER9esS8JlvyKqUXv0KKveyGsf6BVBQqIdfSdGBX67N0lQeEmTm
+5nx23ZpsyoIXppgOhpjcQNodOgtuaggRe0t6gWu7TNxDZDlB3vakvvBUUaHwxkP5
+P/gpiGYd246DyVVrzCh8AhNp5X8QMDRC1SuP0+lhssm3x9BBa9uHtBwlBuxTmrOr
+/kP3Y2ioVFo0uAr3Inq19fB/rQrphtbyFwIDAQABo3QwcjAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBT5QnLEb7Wmw75lwYz3TlpbDjAYKTALBgNVHQ8EBAMCAYYwEwYD
+VR0lBAwwCgYIKwYBBQUHAwEwIQYDVR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9j
+LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAfLi/0Fwd+6uAYPUblTcqycDLf4Qk+L62
+pTaE3YbRse0Ujbm9A6mhnYDVm4I5VCOpQNfLpp94JSe4KrfnE10D1buWbIESmgXo
+7NMjPQryhEZn8LKY8qfFyEheQKrfQ4e+/6jNp3OyGIY/wHTH1mkUsX0LcQX56Fa6
+PQJY5bnR+LZluIb2s3PlNFdleN3Igu7zcF7za0Ow/ayAPOEKiKLs+ttjVD00q+6T
+Q7u0Z/FCqaQgMrDYKn9AMBZlGIIX8Q95XkWkM7+lXZdPmMwyzpaVUtN5/2Qr9GKS
+2WeVc7OPiRzbB3qCsa9Ysswhrm2awMfkR9EZcVJJohJ/k9Bm6PQW/Q==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIJAOGYOElEzDTWMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMTA5
-MTYxNjMyMzBaFw0yMzEyMjAxNjMyMzBaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
-IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
-BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAOFPAXV9VFU6FVrFIlm8PPX+dA6rrOu8RljQBT/JYVsohTEDN9mY
-9Lz4iiZf9wSvAPvuHXrvtKcYl558/9KgzqIse19aKs+77qno0LPyHf5JRxQud/+P
-imPK3WnmCHwZHi8yHKl1h9GP+vPn2MkAm6le5t37oTtKbnhmAA7f4IdY4Csk3te4
-KcgeNeFAlaIB4mNifz7Vm/SCeR2oest8yW9r7Wb3bcHRXEKL5tc1WNb21BmLEg3V
-PnPh778RxF0vodUrQUciM4+kXDrvuIHP+k+/u7xg+Kj10Cy0KJKRhk1N1+6EVVqz
-j1RBw8sDtLKyROOgK7U+3UjifsG0dG9eSj8CAwEAAaNfMF0wDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQUnsjLSr3zM4moTqHPO9CsJ3hCPQ0wCwYDVR0PBAQDAgGGMCEG
-A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
-ggEBAHhnDnxvq4i5ypGxIh89g9G2PiFUJ5YmoVldQ1QQkq1R1skzG7ROeKlHh/cC
-rs8R9pFSnNFTQC3TGecV0qk73alzGjav59czP4R2I4OZhABv/zvImmmQnaZBAk9g
-5JwYZ+Kzbwy8hxl76L0rHK4z9w/zpGEM+vrH4gZRGQdCPZ+5XzgeAOkaC+rPOkcw
-RtwPAvUS62fLZi+T+n7PLtoRwlzLPONX6RVPhxYwMg3Di7N4MM06isgaI91a7BUa
-iB/Uf/3ygmHd1rrbiNh3DCGKSVepwH1UTCu1Rjy58EpdIp9G/OGintjDc8XajQS4
-bhvlbfthknBKY96MwibqxDRme9A=
+MIID/zCCAuegAwIBAgIIMzs7dCK159swDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAjjBH//K6wisingdPFFjFan6pK85DLs1CyqpOhlyMhsp7WzgkGx6E
+uvYUWdU+f89uaXI13n8SiyxJ590KidkR+pdLOb0r5vKH8o/P3xoJIy76c3fHV7Mm
+iVAEaTgdX0+qIR1gM3CxtxH848Bas6DOiVJe7drwza3qs7HNmQvPmUpdDDXLII4k
+swsV2a29d6/oF/oy9J0FQgvDuopsCEjMVQ1xhTcbFDNa9uS9fHv75KTXpJZ3uKjY
+V2dZeM3oakIx0eAaVXZrRAgcFZ0sJtWzaaNn4S2Em79XpjTbbcq8Yg30o/G1xVDj
+3f4yS9NheeCkLM/b1ri+8TXxqHePPjGBEwIDAQABo18wXTAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBR3tHoC3VL4bhkfq+NsrUhRB+RuuDALBgNVHQ8EBAMCAYYwIQYD
+VR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOC
+AQEAeHV0PulB78ocqeJrQvAVl2Xvai3H8CqAqAm0PAmpZbGxdGDkJ+p07gE2afEi
+lidSLmkesyGbM8B7VJC67e9cpLTHnF+JfGh8TRefjvOHWV1atmO4zPWcpGqVcQbs
+rclJR6J93pgSdhR+6tlHTHf+fNaZuoi6DrIUGonrcNazbKzAjZhSkNl19qbOSAq2
+kjfWjzRlOSHkME3Jd2nVlT7PVmXKGavnOdpQy2oHuWpLeTDBq8tZNC1S14rOqEhv
+5wL4kEzb4kHc5zm/MKDHcZ9egimtEhHAARyNPQjwgfDWEaEFRNEujI7eMTO46hPE
+B3XK931kxKvtnJOWp1zFXOVdbA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIJAIEr4TCFXeNcMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMTA5
-MTYxNjMyMzBaFw0yMzEyMjAxNjMyMzBaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
-IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
-BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAME+gjpbcHfR85ROm4hsT94XBQQgCcT7ZOqG1HvzDRyZYs5jCxpY
-9BeKLd0JjacuXpp/uiFiy3F2MSkEp1KyviV10+uqv3myGd+phCRtRFpDRX2y7ocn
-+WUTWi0koqfs2KLqzqBhgfSLHeLHECKOH3u1NUGZSjfR7+hEu04Ru65non7SyQ3U
-Csa1psXsWMKlo1YfdPTzGJ5IQ2cJXHQFylpgLk8yrVDImMHPymsajXFsq34jpkpu
-QDZeKHCaKEgl20S3xrmALCHpXNdkjqtc2gNoVI+C//oZpk9ms2EOlsKwzxB8/d9W
-eunK4h0IB3H2mZ6QWAm0SSyAVSAdaNBDxxECAwEAAaNfMF0wDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQU/it+ysGyPKGv41bKHJBfIpNzzLswCwYDVR0PBAQDAgGGMCEG
-A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
-ggEBALq8P+lJ+nvK7LegSDKT5WamOzO4YThObANCsP/zLQRsIbHjWGDkGT57ndwc
-1Wp0GkhoTWOraocAnEHTSFnMC6j+xABspMxz6ob5T5mIFLmyiTf2psVlmsPDmbR8
-RIOMkW0WFBQKO+zFSE8Mwwnw+QKGL7Xj396ZxGC9SfNiOrW0UBJUBsML3Ck/hM/H
-+GVqFN15/WK/LOzCzTWVUlrFFAKtii9r9PUgJfX+XySULcFwvu+rPsgxxMGn2CNa
-iuAAumzTVRJTVM7VSGEImz0VM2F32jKhsjQwbNI2KqlYCTZlklecHT6Fk1Dd8SQi
-pBJgYgVfzEcgm5pNMFakDUzOcw8=
+MIID/zCCAuegAwIBAgIIRwT6LywO8TMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsb2Zd7YfAoQe0yqQf9Jln4GgXw/MTwIJtNSsXlzCgKFez4sNvZTO
+zZDXEGsVERnrndwDO5/Fh3za7HhAXHwd9cmYiTTkMgQZy1dHyCx/LkYrLx+sLGnx
+BnhEMh1h79EdU3pKq6WRFbxpsJ5mWG0yaSZoVUzhz0WUDo1YmAisOoYFEtOwg6PR
+VUX/mWOHo5jlnCsLK6Ez5Uw99CVctNgfbHFTdVIowj6YKMtiFccWH6q39qg2Zvzv
+RLvYcT6ZsN9fnhDo8XdK9L7BPrUaCkBxTUbiljwIkErcbwlQODzADUuSYEQGsPjn
+R+eg/AD05uqBQfX8eXxtX21Yujb9ooy1+wIDAQABo18wXTAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBQUiznE73EGhCA1WDjrJZOvZumR6jALBgNVHQ8EBAMCAYYwIQYD
+VR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOC
+AQEANU8ZhUyK4zjCGZoea5zYtk8BLot8POj9c+kCQHVmyeH6fjyuxICudX0dY69n
+myHvI0jhtxiHd7YGEYE6OeWeCOUHn/8v1unqbDWFjBmYLOgoNVQ6UhfcF9gVn6cp
+356nTTcGmz7ZvhloqQb//6rKk1mfq+6KrCrMO2qVRmYtcV2blrhHZj+4flmFbn2e
+ldsDqOwLHinFpvQFnr7xnBYyGMISOl/MM89PQRq22Ob313qExLe2G7VFMJ7SAEET
+qeqcGKHRlF01EniJ9OV9cnJH+uzzsmA1GRZltqpdrqcDF3z7pmiePFO+zFdSqDtv
+zagOFOzlR8lNDB0MiKhXWZx61w==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cai3.crl.pem b/cpp/test/IceSSL/certs/cai3.crl.pem
index d3629369f0c..c6eb562a2ee 100644
--- a/cpp/test/IceSSL/certs/cai3.crl.pem
+++ b/cpp/test/IceSSL/certs/cai3.crl.pem
@@ -1,14 +1,14 @@
-----BEGIN X509 CRL-----
-MIICLjCCARYCAQEwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNVBAMMHFplcm9DIFRl
+MIICLzCCARcCAQEwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNVBAMMHFplcm9DIFRl
c3QgSW50ZXJtZWRpYXRlIENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjEwOTE2
-MTYzMjMzWhcNMjMxMjIwMTYzMjMzWjA2MBkCCESoxZtzE8VuFw0yMTA5MTYxNjMy
-MzNaMBkCCFKuYXN2qRPYFw0yMTA5MTYxNjMyMzNaoA4wDDAKBgNVHRQEAwIBADAN
-BgkqhkiG9w0BAQsFAAOCAQEADmxcIAS0P13nGAXuSvEA7ZR+2975M1bP0FrJbeEW
-o0dTpA5sv6qB+BYFtYneGYBskjd0FxlTJaU355YUSwSKumEs9W9pPsNuUUD2BTwU
-Iue0K0BDfkzqoLVfuFJBWtcgQPJdQYis6gSPAh4Yc3NtMpbl5mDO47ES+FZLa3v3
-IPTPfETJBG9aVlDRwr85zCXI13Xf1po4APVKqJhu92MU2nCT0RnfRMYORiOfJKB6
-lCUe0/IkEU3MlMK7tJVdbww10UFPy/z0MkD9S5XRompuT7aUS7gNRVV8KzOd1tXh
-0xqhC9KO+1kCTLmycISjk1jL3JagmIvPuJvcZk2NdvqHjQ==
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjIwNzE5
+MjAyNTU4WhcNMjQxMDIxMjAyNTU4WjA3MBkCCGItOxHiE3EZFw0yMjA3MTkyMDI1
+NThaMBoCCQC5HixTugRe5BcNMjIwNzE5MjAyNTU4WqAOMAwwCgYDVR0UBAMCAQAw
+DQYJKoZIhvcNAQELBQADggEBAG24O7X+D8sBOCJUN2UtCbKoHtra5F4WIGKE0LxU
+Yd564KgTEvywhlPoIRdewR8mnL2n1Mp8O6TVNS8gRF3UcCPIraw1h5wAr3y8XbXV
+cuRYxC04NmEeAaLDoNDYaFQUcc1Y80XqXhEdQhLAjZX45m26zcTHNgnuzIFWl+IH
+5sR9Kz5N2P8ytDB8VczVcTMJ3I7aHUTD8kHj2dA07BEgPpV7BusVg3zNb2f36fgj
+Hdc+qc3B379K7phWfugzXEk+IT0V58tUQjly1TzcltC5UhS2OMRs5eWgTKki3hnt
++Vqf5naZDZdjMB8nbcl2Qh6NmUz0oxNC3g1L4Bex7/qAaiA=
-----END X509 CRL-----
diff --git a/cpp/test/IceSSL/certs/cai3.der b/cpp/test/IceSSL/certs/cai3.der
index 0d57beced66..27f0fab5474 100644
--- a/cpp/test/IceSSL/certs/cai3.der
+++ b/cpp/test/IceSSL/certs/cai3.der
Binary files differ
diff --git a/cpp/test/IceSSL/certs/cai3.pem b/cpp/test/IceSSL/certs/cai3.pem
index d5f1fcf6a32..7ca6e994d35 100644
--- a/cpp/test/IceSSL/certs/cai3.pem
+++ b/cpp/test/IceSSL/certs/cai3.pem
@@ -1,58 +1,58 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+hvcNAQEBBQADggEPADCCAQoCggEBALq4O6hgv6RbTKaq9+UTV6nqz0k7zcOOmBuR
+1iHmR5/vCMgyVhtjbcWHEMcaevw9u0eEIstktLjzkT1eZ0otD2NHX1J2xc+eU+2G
+fTNUybxTJ0W/ASwRT1msbx03bTI8DhGRKK2NaJC5Kkm8Scnl/5Es7QgUEPk2ZFv7
+8W11ddB7dewR74/uclWIKS3IRE85rkFacKGbUiYxGcKBpjRNyV8m2yV39B22TUXG
+KzRBokACeyE4IIpDTV3A0zemdvgj/IAegXaHvVTsbGQDxF08tKOWFwb7cKJd7YwL
+c9lLwA8q365BxdoA+cEw2C3lUN52jdPqGdG/btHnM3fXhPcmWHMCAwEAAaOCAVsw
+ggFXMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFAJWd3z26jD3uzXjbmbbmGnQ4n2x
MAsGA1UdDwQEAwIBhjAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vMTI3LjAuMC4x
-OjIwMDAxL2NhMy5jcmwucGVtMIHDBgNVHSMEgbswgbiAFJ7Iy0q98zOJqE6hzzvQ
-rCd4Qj0NoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNV
+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
-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
+bmZvQHplcm9jLmNvbYIIMzs7dCK159swIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVy
+QHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAMQRv+Z+CLcfQEs/LVpbieqB8
+kLp1US1z1jAE2j3f7zd9qZDhaB76dVh4ei66HNAVB0Uyd0zMJUNFv34qZawIkeNa
+7DrbJ9hTETH14kLt247MtDwzqB42avPUasmyzGDub2Ij6yLipaswtkmX1jOFjjXq
+p6E/8+/iAu4FcvjKnBOsytA58ZqUAou164cdvFYzcl7pz1MeQ3vOFHxzGU7VbOjp
+DI3LWznKgzvvOTOvLbRQ4O+5gxaskxKjE+A14cDM69XTejlMcNQim6eEjI6dufHl
+5ANdUXRpfVU5EMlhgLA/RZ5PAP/R44ocCAd6jP5AjPr52cbtQJ4UVtAVSCkvZw==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cai4.crl.pem b/cpp/test/IceSSL/certs/cai4.crl.pem
index 15f1c5d5c64..842972c91e6 100644
--- a/cpp/test/IceSSL/certs/cai4.crl.pem
+++ b/cpp/test/IceSSL/certs/cai4.crl.pem
@@ -1,14 +1,14 @@
-----BEGIN X509 CRL-----
-MIICMDCCARgCAQEwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNVBAMMHFplcm9DIFRl
+MIICLzCCARcCAQEwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNVBAMMHFplcm9DIFRl
c3QgSW50ZXJtZWRpYXRlIENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjEwOTE2
-MTYzMjMzWhcNMjMxMjIwMTYzMjMzWjA4MBoCCQCoBM030K4oJBcNMjEwOTE2MTYz
-MjMzWjAaAgkAtwvSCvluPKUXDTIxMDkxNjE2MzIzM1qgDjAMMAoGA1UdFAQDAgEA
-MA0GCSqGSIb3DQEBCwUAA4IBAQBVH8XYHjiuxSIOcU+YO7oEXs51MDLC9f7Jj5Lv
-cS8W05FKbCZxqA59fKveJplApIifUfnZVAFlYRQpytj4quj1m28sUJc2Rfqf3gKO
-MvlChT/4y5JAGt4gyDq2/iswfHH0oDDcRpPB7KW/4HKZcTWtu6nHqBgGSpezKyfI
-A7vDlvb0VQqHPXXf5CWOQ9u/oy6OucP1zJoG1/86XAvN7NiUNUP2Csa32dxp4ksz
-egZNyOAdw2f9e6VxjCQfq9+0HfWFztA57yO0D8ycDW4E/EGaOErFaEUz8KlDJ/x9
-udCgl6Ea8ZcVKkgG0LbGN6xOMJeoLk0InkIByos4tchbHR35
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjIwNzE5
+MjAyNTU4WhcNMjQxMDIxMjAyNTU4WjA3MBkCCFB2+gaZg/DmFw0yMjA3MTkyMDI1
+NThaMBoCCQDWiHgDH/6TdBcNMjIwNzE5MjAyNTU4WqAOMAwwCgYDVR0UBAMCAQAw
+DQYJKoZIhvcNAQELBQADggEBACF8WBamBXVjflktbZ9P8zyB6Cc8IXbA1sMKviD6
+fJ0yTWDZJdjvzyKJN8edZi1FrIML14ADqYXJqX/2W3puKswtsLoFnkb+MU0s+DBV
+Pk6QY7d0fQGoQS/CDJAYqqHisLJzM/4mpv6T41DNuzyUQwSYbi2bAbxGThh7uIdI
+A2y2cKK+DZK05hvVVwKkLP8it8JfHYmTGPDxNfSwUhOh12e2KKxg2KwJrAnAO0hp
+G4vNF9g0qT2zhQ7TxfJDqN3sKnqjpbuVXJeiUqxA6CBDOwN7D7fbFwZY1ee1/5t7
+MDJhfm7xNGv0G/uQq16q80whh1P/WzXM8BK5KS5Ltk+vHLg=
-----END X509 CRL-----
diff --git a/cpp/test/IceSSL/certs/cai4.der b/cpp/test/IceSSL/certs/cai4.der
index 9f5effd07d1..67be15d8924 100644
--- a/cpp/test/IceSSL/certs/cai4.der
+++ b/cpp/test/IceSSL/certs/cai4.der
Binary files differ
diff --git a/cpp/test/IceSSL/certs/cai4.pem b/cpp/test/IceSSL/certs/cai4.pem
index dcde1a9df19..42082a50202 100644
--- a/cpp/test/IceSSL/certs/cai4.pem
+++ b/cpp/test/IceSSL/certs/cai4.pem
@@ -1,60 +1,60 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1.pem b/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1.pem
index 23ac54d4c1a..33fde3343c8 100644
--- a/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1.pem
@@ -1,39 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU1M1oXDTI0MTAyMTIwMjU1M1owgYUxCzAJBgNVBAYTAlVTMQwwCgYDVQQL
+DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
+DgYDVQQIDAdGbG9yaWRhMQ8wDQYDVQQDDAZDbGllbnQxHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+p87euz55l9e/6VIDnu49FeFZEET2qbg65AWMUtxBpZkCZi7nWwV/L7zq3VRC9HWd
+/+JKLsOGd4neyoqTtUm2frnQAig2CcxOnioBtaGqO7GuFinZYbsMrkaE5bc7sTdV
+XjKEFn3SjFsbd/rE00M3fm4KCTnHAPcz571gLhjgplz9qz2CSRSavvNghOVhxhjt
+5hGqtNMXEmJq0sVweBoCT/CWNACdyLspKjL8Qxuf/MD2xFXJvpDnaZwnJvSaaPaB
+D8bX3hKFj81V7cCjBflt/+JlQOS9wwljEH9eaXchs6JKUqoHpFpl/H6dhlQIaZkb
+N/KOkLmauUieGd1IfAjB1wIDAQABo4IBJDCCASAwHQYDVR0OBBYEFJnjTTWRb+Es
+7hy4vpnCMZmhD3hvMIHDBgNVHSMEgbswgbiAFAL9G+lvTpaPDA6ZYY9FSGsrFDwx
+oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
+ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
+BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
+cm9jLmNvbYIJAL/ehwUYP0SNMAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEF
+BQcDAjAXBgNVHREEEDAOhwR/AAABggZjbGllbnQwDQYJKoZIhvcNAQELBQADggEB
+ABpQKIVJTdTdPAkAgn8OTdddzC3mL3rU5EEkyV38oZRbSDGI8Y0Yj97uyLKbN4Jd
+/Dt8Qyi5dZ5UWtWjSyOSZh7/lFWOxp6tR8DWO7Q79d7LNI2gwVPmsJQGCt2zAVwn
+Lw//01uUaWN8SkbJLpFnyirt9HYKL8ElcZFJCNQfCRkL4EBjXGCZ97QEXtlScKVi
+qnggs1DtsE62Ys8VN4WZ+3ptljc/+7pvLzpBxLz2vTRvG2wE6/Vm9DbDkaJouvyd
+rFJ9e0HI44jHhr5GJZKJs+j60lLWN/lp8zv9dHCX5aRg6W1cCRquj4SjQHGacG8U
+MWjf6N1f3fmiPq/zfAayHwE=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1_key.pem b/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1_key.pem
index 9aee3316fa7..b8e49a2eb27 100644
--- a/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1_key.pem
@@ -1,17 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
+DoxYTSN3tzg=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1.pem b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1.pem
index edae554810e..97b53fdba13 100644
--- a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1.pem
@@ -2,27 +2,27 @@
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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp.pem b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp.pem
index 5afc54b6738..972fb3766fd 100644
--- a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-2uiPJmIjiMYXrjQJV+aiTL0qQJ30oy6iq+RYxg==
+9w0BAQsFAAOCAQEAW6XL6QFHkrDfqJ0X9SpoDqzxfHImq9h40A2pkQGWKPclIalS
+6mx5izlFs0p2t51EJGyMhoFWajbNTUNBk//18JEJAV3RHldMSqTSU/MUVmaM971d
+38vgmcNngw+Fnlmj3904cYNvzzE3iHwjN150TdYgSIWXeBvrK4Ai13zY/8hTr2c9
+LjzjuMlhtF3GvegjCBchFX1Ux7ss9Bb7iqi0+6yViqjM6Kt6B+wPOfz5kUjLdKkV
+TKVRL8XmYGs6uaql6lRzXZiAhC9YMpI10v0PtxesLOgNAVsLxo7zizd7e3KTzMVL
+2l2xdPOP008A4fJloXj37y/Z8a+QS4rmmB0W2g==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp_key.pem b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp_key.pem
index bc748d1cbfb..28ded7ab324 100644
--- a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIfddbVK4jaGYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCN8FB9ZqToKBIIEyC04795MgUQe
-8fGYyMMjjnFaLWpVfB/lrGES/1WtLihYIHm6SjqiqR+owvUPBxt4wuhCpPB/m+eO
-Y1Ht1RTA6ZQn8Me71uKDDDjPaKhoRVjmaJ6upz9h3QCPa/qQdpQtExItLa6nKlrj
-KUgM//HmWlwvvbD7KVjNTMKX+1F5Mry5tLfy6orcoFNXH2VQFdvaHzsTMVGVE14W
-gpPdnxYlHTlOlW02UhkOpLoQnPvGmJc4KPlN/EWxDUIcRG6mIXFRHaDesQKN0BGP
-fz2+LauwEMz2GTDJishcIRbwot++7x10I9FHZavsNfIW65KOaZ5mAsORUrd3v/bA
-360IuUKSeXPqbMWuk5fvhPpFb6FKLigJeHKTxbozG7NuiZWYRyUv2/a9x4lcSJIn
-pwpRxBMQWjZhR/sWbx75pa3HIF1xEwVG9rmM0qni6oAibqyPwhkhnzI2rX5VUmbX
-Av0F6LzJHzS6A/Py1MP6OtYGROFZIjaMlM0NENMfnHK4M77WfYmJuC3i6AnVsiWv
-YemG/zzb8+Z74puNLtHphDHyOu4G8JWkSEXdOpdDOMWvzgFcc/kLKYXUPbLxmKv6
-N9X0KRyKmeBonKb6L6a6ZwFSe40UO9V7IS+pvSQ+zp3b6QFI7WHjMzMay6CaQok6
-3xbw27TWWBfltUR5qpWcUBmD9H84ywXTbCbLlIu53S/OiXi6J9RjWxVC02Su033S
-kbspC/YLC3l21iAB9W0jGWvTGxnJSJp3o7jI32bze1TXX3gcEFzW+Aa5D9S1Ee75
-WE6jMafstKxn/1Puy4gSZ7YmISk6RMvT2r+mcqXlvGTGOZdk3xbgrtYA7SINyexd
-LdjgOzlP6FtQE7+TjxEK/UsYVPmC+cKoXdQXLACRrz1XFgPmSrR+xoUFob7WtZm3
-ZK34FNUaXPBdUWplhrEY3dK6tD1zCyQ80U+oYvGJlAKnAI0hYEObdCXGsc+LIhSi
-+rntkh3vYMDiZL/4/pT8Pq3XaeCvc0Wvq9ZktA46av847DT0/TFZNKezlDi55OT1
-q83VFNKsQGGhFZqroI7MC0vUywXz69FlbGNUr4ODL+YYG29IC6GC3sOgvQdne2Qc
-mJRLt8aX5tGQ0/kIgvzZwYNNVohrF6qTCiy6gVo863vb5JFZF/2455nf9DNR8zfK
-s4Rg/DNjfM5ACzMFUiIMjCn3SUNm++dPvA7fY01VqVgOcx+ywX6Hlpzt7F7nfJXy
-wuCqYpilUCyoX1C0K+XCm7MX3/c22lGuvOWHomewAIa54Q3Y8jCfivKCbJ1gtPhF
-8HJB1mlMGg4iduZ6TMNn/X2ezqp75VINuRBhD5T45MHkJBjcK1FFDeenRkbzxfUw
-9qNsip6EM+PumVO7Er+kBdCB/QVKaKhRnqq9jsAei0m6e11sImure5O9a1bXTISF
-ahDXQxGK3u7CjNbzOSu/91uIwwzRtCFVd//pQ5ngLqG8xidzahtpTEAWbrsYlKie
-UOC8DCEoX6JpFWwzsTM4BdX7C8mosTA+mTmxvuwZt/a7oM8oVEd51pzL8PS38/3C
-f7dKtpPm/DyLksFYpiU4sQ0AZZd3U+EtyqSdcQ4tFxTQBzpzGssuPdDjIh1ys/wx
-0YP5osWf3m5lR0W/cd8b+A==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI2KEIUAdYpDECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHLBpmDb+AEwBIIEyFQc4gxif/Lh
+TzIW9cQma5pAPGbIgIjb6R0WSqseoonLct53ioNv98qngtotHjfyLDKPTKmSlhj1
+LpjamTV7iD0hPDymWol2H6BET0ulWaR4WRym6BcnqK259jfknN5tzB14vb6sumcF
+QgvpLJjNHyi82AmtCFDPrsB4n72jzAXXWeToESlrubk2tYhDRNRD4c3RMaUg/h/J
+cnKblMEcoQQe7dDmbqSfHX0orn/JBUzQ94XpfJmpTBuNXWpHUDG3/ACfg2GhgCV5
+8Le4+xLP0fCJRxK5HE60uSO+1Pqe+bLBK7/0zADeaRsQT6nnw3hBbCwzSrMFcVwv
+bjW07JEeiFHX/QXDhJF/FeR7ofJZ1q/wypCq/8u3Pmy3bTtKzoXWioVgzDCoye8M
+mF8f4pqbrwhLl1pWc6cqX76UcSpW70u3ceqooTvybsP2mAV203g2VdXUVxsAVVxE
+xvriP6cfErD+DzQpDYaoyPePwuH8MzdbpO+zibsHUnu7hHX8aXNkIK+1UkAGSliQ
+KB9D8cVB4Qqm0X8e75mTQYI/Z726FxaxUBP1S4ydW03TAriAnObQQMBp554i1Vrz
+A1LfFuqp3mVFheGNZ4yI/mEkduu6LMHbrhfsgBwdkJj6CKWVnB+NpfHzuqFl/VSM
+/GC1E8qksxlvIFvLPq7UY+iy+ycwlzmZuPE8NSTcuA6/h7R+igKEgJSQGnMZ8sSp
+7j4I4ET/sAcY6iUHGytg6cfr7eeoAfgWr8rJozuNKd2Lmkv9cBW0IAqUTLVcqmGN
+9+Gh6X4fF0vkFakaLec6Srsh+fB+TvoQ/JJ5BeHlDdmkHgd5flUYFgsbtDBvT4Ud
+biyPvamnYBbJopDG144/pCtnVOoOos3qDz20TUMAyca80wVDD9sX3t4VgoUhbKqe
+rwfFOjwSjVF+Apxj0xAFJYhIVydmXldPa9fTvYBZW06BSk6iGI7xWj5ScKvgO3Jv
+XiS8gkTIfF9gBUUbk8sM4oUk3UIL0QvmoH8N0sejo+DXHTDJer0Z/fR/JnDzJZfH
+kQgZUZAxhMG8B645NIDzarxm/IGkc1/dAU09W/2kotS25TJm0QnsyfCBUEsmy359
+s15+7WjSaXbKHqgmtX8YY411a10BquhZT9uV0V8/DbfO/hD+2TcN+Si1/0ULPlSu
+GG0GwobjbGjmSMgsxnuFQYOxQ5t4k0WmvMI2mlX2n4/zlQ1gDB9cnBOS/DTtna2E
+nU5tU/lh11G0UVieVg53I0cdixuOBfS3EG1yafysD816W8R9WzCz3tYCh/ELsaeL
+Xhe5UxgoMn/jnsUviyVDigHgTv9nLO+9Nn9q8fOOVktrANmfK68Hk8KY1vDqRVCo
+gA6MP59OJmI0k0ztqQN9A3qzizWrMi+iMfWQWLdf1RwlMA/yONHmCCaM5xeuPuRi
+jtYe+n2qgLSr0vlSCMIfwE3E3dkf9mmdIydSOALvacFJo6eH7Ea/VDfn8F0X7M6F
+54kc1cgU3r3t1b5jFvk0uSPpX33ynOPfFqLnWeFwozFbJHhZA7jKU+NTDWaIrkGf
+oNPezxP1eFMPU2qM2x+UPCqPnhOIP6iHBeFe2fEjeRxmGMADk/i0mpBnGNskRQwq
+z6Ojvi5e/qg8P47Ii4UmUQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_key.pem b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_key.pem
index a1e6ca5b362..b8ace2ad612 100644
--- a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIrZw+rPFmwGACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMccJH5DjU3bBIIEyEs7Ldd/5dUU
-lPOaWNGYfoToEPV4bpz0FG8LjBMd7ig/PWvRFud6SZZHP9QTZrlibj7Go6X68ERZ
-2sNVmQhT6Kr+1vgq7pk43GAhMfCjAqtK8FRYzYSuUkFtGJIwoP4QoAFqOlq8UJOx
-5vdKv8I9amJIlFONcO7HyWR7GWLhE20Kdd9fBbLQ3utjESD5ULpmqa0rV5AmeWHD
-yArzLjuD/ba5gHKpn9T+nFI/zLWS0y4KBkFHX7Lhsug917SBmB/SL+QVeho2ZYQb
-iMNnmZbbib/LA/9PHsZg5m0dMdWI1O9GDHRXTTctC72Rurx02Ok361Im2VKe32Zq
-QkBTrq4DF/OguAwDG9V4na9AXSHUefg+kvkj0dewAocykEQf3AtFTF5a9TGFEahR
-01IH2lssR82tMmsN1oGsUyGhXNNDoKwx/DK7Ds3S9Ns2adGiXgcGWd5ugnv2ufd0
-T176SmK/rHgPTqaKrEjT7nJWsU4UKgD+/hm7RrF6GqSR6c6aAfVXF8/lPE5SaI7y
-ktZTptrCHLAcuSnQIBVl0hHLpKb67tCzqkj4McqoV1UbDTHgbZ0GbwCJDDU4Tjd6
-P6h3EmoZH7s/IKQ/Rfwp0C11AMPSvFE4sGgecXCc17j9O1zTwusPOvsZTBE5V0vW
-WnezK060kNNogvfdbAZdYC6R0PbGJeaVAgccBdgBc4viQ18ZxPwZgGnL27q7PvKD
-Stc5qekPosvrA3Vk42AEFmUpKyXlRsGCei5DeX7NiKXX9wjFRrkhTs3+GGNvkxNw
-51djncxtlGrv5AriUaQ6mxrLMnhVFyr37Oxa1uklt5eXnU6c2OlaF7oqdZLN49IY
-jOVzGTgrh/YqgVVFGP3x4lMbAnwb69wOdzNdSbSIdxWaM9e4/VS3P3KwRnXaBthD
-2v5BqNBVqYDcPuL9nKCgZj0ZS0LCJBgfz69PQUg/0GFbwqlmViFp8la3dGjmVS3z
-6jFl1Mh5TQvWV3bXTeUf8sriApVyMrwhhMyhVTesimqJUa6aJv4OvtiN3VhxNs2d
-H/epPvwwIzqZc3HZqf1oOdbsSqo0+Us1n5wim9SXjZG0I8Soja1xy7Qx1GT4lRDd
-meoKhBr0op8swIolMmLSvmMt7xj+1RE8VYPLJrD0piixdS3JynyqAtw5Bi+hSIFC
-bRsJ0qhJ0xrZTcaXVEN1y9mauA5cgVz5Uez89dQBE147TCDpsA1wtWHpGx2GphsV
-O4yWYmfXN5NK8sTBfHIQSDpltaA/ifaUf7s7KNts7Pkr5CAauioMRY9KBGuNAWAt
-R5DGZR9FTd9LbWbtlI0Amxg78MjRhCvYQQLqFSL0/FigX/hQdd4icFnPJn0l+QmP
-0pZahtFnBNrnysRcq4xUNq8yaffiArsbBdz7srj+laCTYqMHTzBi7uDoYwE+kLCa
-qIlGeNSerjZTSYgSwbi7ROelhvXdG9j1voDsK2szcMU+xcWsDIWQFii/FQ6OcHE/
-7BBw18KcKD44QXL8OYHIq57exHC1nQDaWdvBecaM7FYTL6W9RgP+VnqurAGyCH33
-Ie7Ng1r4KS3YGzvugyDlVlI4IfuQ5MRWlCWt5JJYY2XLheOeKh+xpy1nOnJseyAJ
-oiZ/MDLabY75qQdnaRcXag==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqWU4HDpvKycCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECG38he6x6tfUBIIEyF8+7Jjy4aMY
+aWedjqd3Xz9FUk608R6x6ykyKYXzDpS9EYSq3IBLkjAo3UgGlBGnvLdM/mYZPyyL
+E2QNNUBTPxzyf0y3bJl+FKSbARefxDabxommtS4rvHuCl/CSszV9QXr80MH5MKEx
+Ti4lAvI6YbZGSKem89r8WzX+JLrpw2tUHml4Asj0g/zui3+OrGid0iAwUiOFRDPD
+LHVFMIZmdhNSmoVWYw9FGwderAGe+XeCEr3Sj2YRnGKi3kXSoGHb6OqPyh2T5KUz
+mAt4ssK9Jmw2rn0gW777BnDA5TMGZC+2X4U8Bp1vgBnDX5gF2+MaHQAmfir3ZnQJ
+cksSk4EibQMUCBjiDfakLZc1jOL8O81zZOBPrSEqjNheom173+Z6HGPoxYbJw4i2
+WXf7PDUaxUH51QDp+wGP/yIiviyj1cLpBJCgEfpHTrIEL1/8w8USR3d7Krz43179
+zj3WrjiFtmzcYdtUD4UT+2JCtT/DobfgKBvFnOuCKNIzhhU/ebEDDp2ROlHn9vIz
+cCDdAWgl35kCkIXbiYDs4HaRxT/r+dJMWag/VwfbKYOsNp9bEsLgcm3D5lLIIw9j
+OEwLTxSML3KF7+P4a/Vf0d4ual7iV2hZrTpBWDWyDBK7rN6yxxg5dNXLcM0Xumyq
+iltoYeoNrGR+6mAvo/+HIsfyeNjS1ky8cQsQx6mu38m72F9jwcCtWREsg6j9RLKl
+p3kLlkriBglAibHW/ionwla4PoVHj5ehHSGSwmWIW6oVVrSdiwdfweU1cjZF0JKu
+ziwhLCK7CFjbDRPw8Y4qsSXYFLzMhD540mkOVPbmD6hZpKP91uZHKRy5HQ7UH/P4
+IpjU6ZTYO0l8Vf47/g21HK3h8r5WcdkNIeMRrv78AoVeah9r+l9Gb+Bzga0rWTIC
+GzegEsgH3bz/T01T6T4rLE53qhO1+4Z6DeqFVahcC8rXRC+bJ7g7h+z5zljLsRfQ
+qpSf1Cmg295Jhw5F2LSxFQCrbyTnhPmyIsl8kd2dpxRvByZAgnCDSqKYv0uo/idR
+N5KaPGOY+hQxcXfD2qV7id6VFfL9ucdDfs92n6kvUaf0kObGN9/L2I7Mg7QRdMW4
+2vyIZ1RU0VCs02xZFWvRHzoylfnIXwSCmFppDbyLEh48vyuRelDdt3MtMb9etWst
+tROeFFLm4T582gY6BurSTbLRcsCE+z0gxQ9GMowzVrzM2/xzwfOO3VE73wsYOU/K
+00177tKA5OhmqG9MrUZOcN6fx1nTIjtR1FSUqPe1C5DD7VMNE4K4wyg4qNGg9wio
+UOzGsMpaVB3tW5csfJm7HSNl4OOnaa95kZZqIEwqi59TdGG0ok9/6cV1VR3vZohK
+oCVbDfHllA83N0W+TMnRorH0n2ON9XpaDLP67pASn3gTzSpSE2INuB+a1k1rb5l/
+ucgVdwZebIpOLPbYeaBM5qWd2C8XyhZK/uzSvm1wFCaUVh1di+RWSpKsy3/iiINr
+vkgHRxEnbTi/9b0GvA4uxFRPbF41AxZD8dgPTZtA1hYGDZykowuv5n2YHCdcyKHe
+5hHpKnkijTK/5TondamR3Kl4DnXvmqj9X9CSDarv9rBTyJwBnxmAgTB+0A5ODPge
+YwlNVIc3F6v+OVPLOdroyQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/ca.pem b/cpp/test/IceSSL/certs/db/ca1/ca.pem
index c59d7238aa1..d60022cbf81 100644
--- a/cpp/test/IceSSL/certs/db/ca1/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/ca.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIID8zCCAtugAwIBAgIJANCpYBrCeVqJMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+MIIEADCCAuigAwIBAgIJAL/ehwUYP0SNMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
-MTUxNjE3MjhaFw0yMjA3MTkxNjE3MjhaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NDdaFw0yNDEwMjEyMDI1NDdaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAPKw0AD7Xxd+fwXK7Bm6W2jWF74Mm5PZmeHft5mYyr1a71bZxqWQ
-wFtv54U/U+Xsy66PoB3GxhkJXMCD1K0P1736DSvTxYTd2eVuHGI/NCv4vyT8PtvX
-rG4UewVrsMQ9W4Mt+29R/QBMHWd16Wqjy2ATp2SiPaOQGnypc5vd+7fp6KPg+CdV
-25xZCv+jnA3VUii8lKpX6LuMwncsUVaakGwWsRkAhYHlDXEDGbePjTRdWic4OECZ
-B/cOXwQkJiJAzfaAADIMnmqu6iUHToadVlp3m2QNKuchDgNPshO62tJIYFy5F+Qh
-MCcmmh+bYCDkX2E56Lq31mWB9xv8KyUVFTcCAwEAAaNSMFAwDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQU/ysXYfGAXBGwhwBTQL326lLOt1gwIQYDVR0RBBowGIcEfwAA
-AYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAWDRKsZa/kOmC
-Vi6XzP/Rh+na4Ckn9/mEJ6I3vXIK6Fc51tOts6cdbE/hhu6DZyTqmsc86ZKkX+kz
-LRe+klU8RVAx2pYHoQW4QF69dfEVmosAQJvMju3yTr/RQI4M6eFUu9/yXj0IzaSt
-+T5O3fVHhJgQ4w2WFEKpmUp2NVda6pkngpL2+Piz0w0wueH0XfNG6lv9F3vwsSVt
-O0UoEqSpINYELn37siBAmyNxWMaas6yjIv5lI2TlmHKF9IA0m9zDXhh8LtIRtonc
-Y6Uk1sw6WYRLDh6KJPp5u6ewvto21PEj+1nj6wFuUVyao8tPfzm7uJ8Wb38HL6NN
-rnXaNL4XbQ==
+ADCCAQoCggEBAPJye36yynPKN0wQkNFCy0hX5CKC4Xe4tgJJVtAhsJhvI7ZdIvop
+IrwQg9+YjS6darXk4OqxGDYS9q1w0X1EpECu2QoMBxLRh8oCD2Y6t9kIr01ptXJf
+tkswubbry+pRNtPCgn0DR7vmngtjVpkDSssOd81e6dNcMJKupFn69zEqXEWMX5Qh
+M6lbwLQkaA3U5IfRStnOp/CmMw179vHaLfPiByHMZks5XhpjT/sRLvrGvDdXB4AX
+7g192Rmzv1giVA5gO3usWLpwpfiT4q9qxOfCylgGQUAnRoPL3+Q9dqWBNOJ2cu4L
+Lwtj14nw7MjYeVhfrlbwUxDOnS5iaUlQ+WkCAwEAAaNfMF0wDAYDVR0TBAUwAwEB
+/zAdBgNVHQ4EFgQUAv0b6W9Olo8MDplhj0VIaysUPDEwCwYDVR0PBAQDAgGGMCEG
+A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
+ggEBAE9Fz0UghHUd/rTs4ugKo+F4ICQoK8b9ALoXsN0zTt0/MDxIocg6jMu/F7We
+C8xuVQjLRQL4pXeevQxg//eEG32Qk0+CaClkZkHvG1AX06fHkXsIm52Gu9QD+18t
+nyr4RbyOWArYcZZZacZV9tqmsqf59aE2UNPqv1Kg1ypt/LrefAS7aA48tYzJ6J73
+HtYsyy5b3w7Nf9hxFemGehkzQ8eouSJytCmUcG9sxgcZMOsOy6BEB2hVgAI24Pj2
+uda53Q5u/5CFiHvbJb2R48dVTKlVOcT6fXAknuXu7bLmS/++f4bwzmtgOiCwFWnL
+CqVhexCqbwVNhXvKB8r/cOOC0Hk=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/ca.settings.json b/cpp/test/IceSSL/certs/db/ca1/ca.settings.json
index de830f971aa..dc596334179 100644
--- a/cpp/test/IceSSL/certs/db/ca1/ca.settings.json
+++ b/cpp/test/IceSSL/certs/db/ca1/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256"}
+{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256"} \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca1/ca_key.pem b/cpp/test/IceSSL/certs/db/ca1/ca_key.pem
index 406d9b0e516..e9eea92bd72 100644
--- a/cpp/test/IceSSL/certs/db/ca1/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/ca_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI5DJ4oKEgfEwCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIrwUvAW1o6dBIIEyN8eoZ/WwzXJ
-n8GPtEkyWtXW7LR1k8mO18qlx4iUjERkS378L402jpGTME60USjUBm9oyaq3/Led
-UMjBnUKX6ybwhNTh5lxMktYQ3TYx+bkIj0eXA8ehvAEFA8vnrZk7yjnhHza2uwXb
-ozORkI6FmjJHa10N9xXzbUSCQPS5e2ojrOm2WOerNMozYkEiDXJgj2v0PmpLINzM
-CPctRtIkk5Jie9NluZRAOCG1FF6/1KoyUUC+OU6XW5Q86nJh05kcJooOnwlV9Ou3
-GPAKzGv7uvMoJNoyOyuJvLr4TXl2Gi1lvo8eE7x1JLHSo9183FUz22F8eWeExL61
-dYna5y+ffudp6KcMMudpBBQz8f/xeTXJTRJGfWNlTVg895nH1kD4QGKNeIWRbzS0
-D9tLyJb7GOv3r/+HOVb77Ev/tjbAQFTlVc8V3b1GXS/j5mRYHZm1oHoctZtwRoSd
-cV7H36/mtFdOLq5rd8ps+3Blc8U57yIupRdbL9/sgdm0jykI55dZM5Waqx8lZn3U
-7tDGjHenL6Tc6MPcVWUNIik13AQM3iISEMHJ3jKwTLittlXYLWXhj0rz/gxTsQX1
-D8436BIVVGCoBqQnTwQK2D+9qjMVc29FxSJhyeQZ/vfKRhsNiWuHB6X69sm0IMgt
-5LhnTc9OrKjVsNeNkcAT/Uzf0r1eY2KLcVR4TgW6gxpxjWB6zSQdc/TX4t0iGkgR
-zMD0z5jJaYA9hwksfZw+lxGyUQq5+LzitPkxGkByWzYA4duCyHmZShj8sdYrfZgG
-oipiOiiLe1b0w2YZDGF9Ki6rSqb9kSaNRqNfchbW1rQGG3XTruZ/1Ylw64T7/JU2
-zcSZAOCbrSbxflnRCICVTckSZRV08SF/3cGKnxVh53qie+PS5H8qrgZuaIfcFv8v
-5K7p5qFX/zz+RKmKQ53/XPJvtkKgjokbv+3y+A0leEVFISYN14Er3iZPY8D5Eyzc
-+kYzEaiY3SXv0Kz42hH5JAsZsKBtI3VS9cuPyBPB5QYNtg+7mjb5HGXzbqKnNHeo
-V5jnI+Vr2hsv71X4ujpO1VfYoWRR0bfKCeyIkBapuew6lv9/nArAsCNwTSGHOfar
-GHJQoYGD7TiDpkaoue4QhGbKcqIU0SzdNmJj5eUGcKxVzO6JzzAthJ3b5671KyFR
-0LzGpCoe43otH6QukqU8aZSs6HUow6C1ldhwX26Y/Cn6uyIaVOfzHiq7TJ9vTSWC
-C8hwMPjNVnKy3ZoR5w/wydnkxocNU5Dh0k8JClrp8lBXL/K8Dyxsfuv8gUYRu0xB
-DJChBXGa2QzD91PAya112zBIwbdPNGh145Cdc0wdR9zO22P+VrGSWD653/Lvg6Ii
-6dDidmN3SwRVLh37NxlFosu6fYiHeAAa+RaGD/+Pl7Mzt8a/smUsER+bP0sTzao2
-rEDexH6l1FjSbCsN6QxTLrYivG2DyBUOMl0xh9073zm+1Z4E4x+oNuo+LA6vpGSf
-DBSFp5jtC4e27zE8U19jcCJdy4JPIn9WVxvro7PwF6No+OrwHbxTU7RpTm3nagz8
-WU2wYqsS/PKv0sZUmQB/gTiqFeXmo3TGv/hgbI+bdDCllUwAtXS+Z8RzqN0e4gHB
-BMA7lYfsj8ySIvORVXtj9Q==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsPerEDeZCFECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNUfBwahsuPOBIIEyN/fT5gtNh52
+xYDmEQmTHY0xXzddN8jrrFyPcSZcvcICk65QyvlZny/Nu5tc85DlMjg7KKRQ8rcY
+ARsrrR/dD+8Xr3E8z5YeFHxuoE4KopdjNnvFx1bFd1MSOur9ge3CdRm7NU44JBiF
+3kfg8JnGrFSIkqwMjOzLoE35utuW9kIDPJoX6mWxOsQAgIQAHsORjYiCnPL9N3/I
+YgPZcyIgvFnNQ7WdylLroHgCu3KBkxhgY3rmVCY5vxYA0pMpZynuxSYhZZtmOV3Q
+VvxHBhe66kJFAw0G94iCXGWHSTh9oZSabr8uaIsQI30shpW/713wBdxbgnQ+5IGN
+JjWyvTcL3gPcxfV7InaPK3GftzJgYygHIc7awtqBAq9O+mv0OoLLeGQaPau/XZrx
+Kn3AclZpyaDFSYWrXlWtIiDQTB0KEeyA8uAvzJJDabb4ZJEvJ+V0lKZjaevqgvLu
+VA87pzuNunnyTrod9XAllZyhKvoJKh8vM/QBPSQ4ESnKWcIX+oPCGz8pNmrjSJOf
+NssrvrnaGgkAtLLlXOkzBQpc4USL0bb6XvwXKGKn3v9Qikh+J5ufewaGN3cOKb5b
+xvFahIIhwN/aw1DfXEEPVzFtwlAoyposS5kmcewdrZbxVE9UnWRVuuqI3ztyGicl
+cIJ9Y8L3bhSHUvP/YJfs0Pr75jjfckMEMZAyClHgRhhMyHt/0vqgsxWE71UKoPPw
+FrsUN97tbFeOPgPGh96RddMD9zo361n2O0yRh/uuM/Uk6JPS7iCvINDR0A/9igDo
+IS5KCCkrxY3KwO3PbEaavhHE7LK/nF5XrIofUgRASZvXEKflAtQf1mdaRWYIAyQP
+uYOw82uR+vDNAUI5OQXGyfwQA5Qzy7ADcqKtOtD0G07wMb3SG5yL3HWqV2LyhJ5w
+e/X5k2m6BXGAVO5U7Z4f+kdKIfIPsJUFnq0mT+uFm3T7U+NrrNvLVkRehHIPHKOP
+p1eGGfQ1UgabisPl4Y5xl5ya0il9HeUiGH15LWDXAo9mH74155Gdvej1XH6nveyE
+cDc/GDP6yHa1t86t6mL35hEKqstrz9Bb3JAlxTi65zM9RXKMg3w5WcJYQLiRUqUL
+D7IUVhho+wqIBCK4YDoXKNu0+dagRxmGjg4jfdrCHFrg+hN410OhEDyhxD/81KSE
+R8/8gsJr7sFhU123BH7mGFOjDrX9cy2qhfZVzkoEfXXGzRR9BDrnxCw23P0NX5BX
+FSy7cBBHtBsEHyZRobOLHPGzsx5YpabE1f93mkhktSYerDBeKKhwnyyXJizqB7a+
+BsuWKhDcjN9srQ02l3UQ4UPLh1mc2H7RoU4uTdOP9btcmpamgraWzzKBvU3l5zNC
+S0Vy4Db0s/4ha/0aUSqAYzBmrZuf/KCHbAeGOTkRUqpvKS/XJcTrz/co57Vqvsre
+HzX+GUQSpCub8C9JAn9UHMopNVPvJ3RhlM87YJJQH+I09/TZ3kVVcJuRlSyZBOMd
+NM/OndUcY3CW0kflodh0GwIvOIMUu922uM5Bezc7yFxaMMeUY6CygLOw0ngIVGDw
+ZRAIvgid5dyQLODe3mzENwBIh5hwZCM+ZkjluZz3dzm/1Fpy3JrqJy5EQsOma2bI
+wKl7lRpo1Jg4i3YaAZ1soA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/dsaparams.pem b/cpp/test/IceSSL/certs/db/ca1/dsaparams.pem
deleted file mode 100644
index 4c97d949180..00000000000
--- a/cpp/test/IceSSL/certs/db/ca1/dsaparams.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN DSA PARAMETERS-----
-MIICLAKCAQEApqAHiJhLYBG4ptuE37JnSNe6gX4SMlWWPiWGDcbXGUTHX2UcIxkF
-WGPK7I8ZNKwU9sVns5NfogNK6h3Ycle5ABY0ZRBboqEmZ40ksdh5mc6TFV9jdpsr
-XFRS7/4fvv0Ya5k3SBITSAFO0krFQWG8bKxAyKlrGxTJA4R9DCkb95UXzH3j2u+/
-A25LJkHvopm22FkaOGy1PYBuC6IfcbJjI882YERWdRFTOBhmAnRbZ/7mySjt4QT6
-GIXG1CWcAUgnDvrK+JC31XP4zag52WtkTifWr9sGBa65Du1lmRNRxAhTzrIe3zmW
-5bb6C73c/nyh3mM+81PNAXrGA9/X0V8FKQIhALgpB5/WOM1rCOfZI9JELBiKKGNw
-ktTJLv8si96+Kg8vAoIBAHOBeYfP12FoI2mE/AudvdRJOzaRz31rXVNIRIgX5UtU
-j2BaD1zR6vypHgx0ChO8GxzlF0RFHSKHpQRNHX7jtwtJpI2Z7zx1M99u2haA8pos
-AqUXMSghgS2s3k1c1iQ+qePRYIaRLAjnuk/7dRsLEnsSHxx3C6ctnnMUAacNhrgT
-vciYaLgvkJR8ZaEgMfOa3W99fyo9UsZmtnvUhKx4UosFq+f0i6STcfokxbo77lzo
-711QZrfdspltN9rKXE9MPPfzeF84Y1Z/KTWs6EGSCgzX7TM/Gke9uRbPxx6kiKhm
-Eaa9l/QqwR9FdFx6tbi3Ga8aZ7tlj28i3uX+45VoiFo=
------END DSA PARAMETERS-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.pem
index 21c7cb59faa..86da0a8abf4 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.pem
@@ -1,56 +1,56 @@
-----BEGIN CERTIFICATE-----
-MIIEyjCCA7KgAwIBAgIJAIXSkf4PzXq3MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.settings.json b/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.settings.json
index 94867ff10ef..cfc4043d1f3 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.settings.json
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256"}
+{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256"} \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca_key.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca_key.pem
index 781af2b71d6..e75f03e4a88 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI6Rr2KyezX3gCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFiFRyh1Xj1bBIIEyMSOSgsm7dzE
-9eEkMkAFQlUs4/LDvw+qAJiS4O3Z46Yx9sPE78Nzg7TVFgbPw7eMDO7kgod+N33W
-fKhP78krXZh1Yy89D2EAn1glGz57i657ga9whTZOfQgbEH0WLavauXsMleBwlfHV
-0etqk9Ctx8IreddXlv+6fKG7btn0vmsR4fg3h4FVzYHkLL0Vs65onDFCZQ1iPOxr
-Z1JT6wKd15k29q9k/9o8VSKlw6vs2+y8c4RLYnu6Q1Utyr19XNX42rMAiEqizGgt
-bJCy2HW0nderMTJuZr25L5bTr4wQWJ77HYuE6xAkZCTZb4R34P64XFNlrbMb/2Hv
-Lxq5LkTvIz9ldqQdga6je0IjHLJRsFWsdDa8alWQuH2OcnmqrtGe7SVwvna0yc0s
-p67+vmTvVYHGOrZDwBJpCsCqsYD/qj6/X3v3htsUqqW7YtzbKAqvaNrdTV/DmStG
-Glebv/MPL1YGZcJRG4/bOrprlbJg1bmfjo+PuMNQBo6BsherGlBF9LUnpBwBgI7m
-XD/m5vnG3biUvrbucfiS1GsxOF5/HmmZExiZlQu1zjGy+oqAUv2PFG0Tn1kmGdO6
-D6AiWBL5zfzUE93sPmm24UiXUapld6HmE0/HnNPSMu5lr5ASFr50umVyXm3Q/ofN
-7IiG9TTvdrY2JtcXg9nJr8JTj0zmbqLYVFx5AiJ+vFSN9jKxpf+wmacZPVRB/dVi
-7y5NJbV9ikZ9uujlDpDtVAIXca3nBLhoxyGSkQbYxdQXxGakZh70zfFr0pK0vD5y
-Rc1l9Gul8KQGb/flJ6Gy5BjUkUS8ngeiFG+AvcCKIDyh4Oh/WC0MO6661J1tyhrO
-5KJ5Uppf33lDLPtl8cGXavHvjtxkReH5Gt8aBMQZ1B5EUHdbvhepGQyROQRLkOW6
-zq2So3FBIpHOHhR5o6HA/F9r/mScuxYAaMTydei0rodaKouEVtLCC1Bkk4KeSMFz
-aj7zW8F3yiMd/VIsFeHTxaqo39X/bmF7RYvSH9cwUubeqsrcDw3hcE4ecrfa6466
-miZXmqMPTTp0onxPAsoO4BTC4RLKYZmNm/xZp136gltsvlt1bO2BI71RdZKT/qO6
-I/7e8hC+ZtoGhSSDbRhip6OltR4jSA0dXFLFhss8pdwqawVzD5piuW7ezZhlWNUJ
-QlFsy9uMZYnZCyvDTkmllssUpZalV4cuqPHZVQZ0aZvhe3xiGNj2YSwaQxvHyZ+K
-+Ywa545qSI7Srp7eBTo6XO5XDHzLjfgSLnaFfNHi3Fodh4gfXZPIDWrcNHTfLHSO
-wROzBHuYA3gNW+ONWnxe/dj3D9tgaZrd97qaMnqteiDf53f7TX+wdVcvFXR5bUMK
-zBqvlTZJDlWJc1VkqHw7H10RrO8hVnuoL0yhyn8+4fro2j4Sz7xxAAAR9wCGf/et
-EmdQ3sim4zP78eHCqGHGkUVxMvX4DSWNvQAAi0/rITSYrdwCu6u2rt5m3dJJZuVd
-ldPuXFhzriwg/GAXvtAf9aUzMdoWHQvWIdh9g60N9kHGAC3VdVSAY5aLL4M2vXGe
-t5bE4x0HAZAUwxj2Fv0wgBDFlpUgN0XFV82wRbjDnL/xAD+l5qhFq8O1fhRzSSBp
-V2DyoGMmb9ZKMU3boB2fXw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI7CvqltD264cCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDT1u3O/WXX2BIIEyGBeDVCwV+sa
+w3KQvLBLz1+UkU3ri6RIZ+5LUxYzFOiGLZE4UuXzAgy1VBKuOjEDH070o32f5Ard
+o1EfwB+z1R0dHyzxvS5hX2kYREELERnei+DLjqTK3cBFM/fXKi+Hgk4w7TrhCQS2
+12qcv0FyKsx4Xq/pev+HBUrlNo4iNdLXxSoZw5fo+tOszmf0wpAuNXp4g0XhaO83
+YbAL5NNrGBmKbnWIj96u2wxu5s6Of+hmcP2O9zRcyeiJexoEq+Pmtwuc54maYH/1
+FKeCzYnDfPw9j/shmSLi45ov86nQrezcjH01s5h99HgI7oGizK9ptRzLc34dvTY0
+UHTC7ro03DrJOULBkfPxj6gTlPZABF3Khgv+amq6mtBA1ucJ5ck9tqG8N9HawOn0
+PRsemSzUuL4lZGa3EntVFrBJ7xh5R+cUeblOMPxAmrVETNNFOHbO7bmwpCWD+6Rt
+Tbhqhwe+d1h9cpbTkdwcjZO1fPoa30ZRAYLlbxs9TutODSDv8PIepvLy0A4oeQeq
+xPZomKjWPOViwiheXtfEyG95X9eVJm5R9X4S1N8P0NPLAm3HZEkJAz063IaeT3FM
+1J0yk7eYe8t0pLI5IOH/wA55vPvgM3jAyjwl9DwS5ArgCZ0jy3gDiUD4BhdICV1g
+He/GDt5OQ2rbHDBp48k0pEPmNXxu59vgBGhBym5omk3oo/vWPvIo84OkeS8ecuax
+654bSwKxE9GgIykqF5b/bKskC/nKmkWDVR3MFT7DoubbtveG/8XW7yY2aHSbZMi/
+F9CjsywwnX9LjhM12JPUvA5CrbFNMP2HxZrHGs8+WZDYPJzVOENbjbNe4nQo0NWM
+qbKS5nDGOKupAGqlqTTdTuaWW5xYM4Pb390v31eDhQBMiJu30KzGPJi5T7Lyyb/H
+Kph7aI1eXCWlEvYiOBtkJkjompZp6l9hbURswYyiTRpdVURYUnXpEoP++C+3TVAi
+93HqJoE4NHGktAaLpy7l+q8zkvpHtnxJYqTADTvslMxiop8FEzT/QkQ3yyT3stJ2
+4OLASGa9H9OdQm0aTw78IqifCOiq3QFCbpHqTd2RjEQ1QukmKceVZVTyqOAecDGU
+Be71vkK9CgB03FtdpHW1QD3IqaAlv5X9mVIC+rK9oTZ8Ue+ZPjjiHoGit/SwoFJJ
+3vyMLScXHhrZjOFjuJW0NcbxffHC4IOPyuIMLSp7x8zS7ViZiRjNzM7LnQ3ktpQQ
+bMUIQzLZ0HSIoE+u5skpIgcjaw4kKf1xA2K3QXDusMj8prxGFnjvx8U9N6mag5xd
+ClbEJa8K0nJlLDu300rO4ZOS7V60sHDMII7n1HoYxwcyDMjiBNb2/lOmdnCQCkt0
+cS2vwaqrtwbosYhQKBv8yndLk0Ik1mnAK5cot78vy0oUfxhIlSZN6I/1KtjC+a2Q
+XvaPY59IhMCrSVCM2pUEAnmkRNqMBKNLtWg+fxoc4LK7i7Uph440s8BHJqv5puCm
+Y0CJlIjrZtjWAI6OTG4kfQ3676pNEqHdf0Xu70NMW/HkeUPuPM1tw87t/hssyZDn
+NRW7IMuaAFODfQIr5iAz75UnrKyuqbfhgyM1hYKQvoLuYOGI/2O7Byuh9s082yQf
+RbpfhUfS6kD5Zq4g5sB63Q==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2.pem
index c4202d9aa8f..19d6b41e57e 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2.pem
@@ -1,84 +1,84 @@
-----BEGIN CERTIFICATE-----
-MIIE1zCCA7+gAwIBAgIJAK6Uw74L2w8xMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
+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
-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
+Yy5jb20wHhcNMjIwNzE5MjAyNTUzWhcNMjQxMDIxMjAyNTUzWjCBhTEPMA0GA1UE
AwwGQ2xpZW50MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAw
DgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEd
MBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTtmIyxuBS1X9dJJ+X
-7zEAab8mnxlUHx3x3hIAPh1PjinU6D6mWxWVViza579x3uslQvlCW9jstA9aNlLI
-vSK+rAKtNOxRRnXp8V8Xfl32c9vYuCOVmFNWrgPHKYU2+GbUhX0ctgZqtzRX/gUP
-MYJ13FgusJIsMq321I/4aEHxoHLue6YPIpr7WLa94YLN7y9ozmEOAepamerOIXEg
-Yn+Wrgxy/Hr8FpXEEurlrq1sY8tl7/eSWAx7g3I6yNSPAiKK0nrNhuUdoWqt6Err
-9JWCWBoBXcVxuF0iy7Etl4+pkpA/l/cImcHezKwE2OwX6fDXkbTZk2Yx/K3R9U1s
-WbsBAgMBAAGjgfYwgfMwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUDKx165nTbrdm
-p02LANSqPK3Vxr4wgcMGA1UdIwSBuzCBuIAUiabmA9ex8CyisO3ov7b+kThXhbeh
-gZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNl
-MRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UE
-CAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVy
-b2MuY29tggkAhdKR/g/NercwDQYJKoZIhvcNAQELBQADggEBABAptCiBTme6gKgw
-JVLQAF3iK2MHX2oEVvIxVdpFcBKgYs7dobspHWnf5B2Jcff53p1BxPv9XKL4pbkT
-F4c2E22v16Flv8jXf3MNu033bNhL0jt8LhhqUCWWpRCLZbFnp3cXHQysAWqmOrRG
-NXLTIBikIhiBjBynmtOVWe0qdJme/P4dHXc8Shkhz9OY1hwAbxvrDFsmmSstcsNe
-Ld1cnNttffgAgzXv7/jwbo66iEH8N3uMa82icZy/4OabudPtFFqdjHzx06zpeKsr
-+L0sNa6A7vyJekM9sLctzRbVFmDxa5bkcoerqYu30YJm5+bFAate4yiK379mqbVO
-rtgun+Q=
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
+CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
+OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
+dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
+Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
+6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
+e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
+WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
+Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
+MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
+SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
+9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
+ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
+1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
+1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
+g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
+92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
+JZSn6IpfkLAH4tM8WHSDALCJZAQ=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEyjCCA7KgAwIBAgIJAIXSkf4PzXq3MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2_key.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2_key.pem
index c2db58a6015..42f0b8bbc4c 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIDNf5YUL1R1kCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNUT7yEk+eGEBIIEyPtQeG/rgSva
-D0QMVr1m1SLR4B9VUoHw+0Fc68Ou/oHF6+e8GEgthF3ZAI9tschYXjSyyx3sO4cc
-iTYtC1TymYhfzzaUbr7qWLhURBN+qQlGe6MMIj36fwoT2hN+zzpwg0w6bvjbTXiI
-mM0e6chEmaPNvCW7KM3G8UEGVHIbxvX9n0SiHMSPPcZjxLHsc2ZqDTqtmZYtNjFx
-8rWo+vpQqrx1hYETS33x6ktJXxqQB1YKhrC6pqFSqALWHAdcbaRjsbzsMWwy3gF0
-FOXhmlXt0SYbkzSBxAGN8fAuEO6UBoVYwjocWV/s3oF9esstpHUJcIAuzTsUZbB4
-iv6cvvPci2v36TecI6pCQkjs8B41ZDsO5Nb4+OJZSkoom8lC6L5dwnxjd6q0x41p
-pVr+xzQFTmhNWFWCa8vP1lB0GjH6+kEVnWGMMxmNXna1c5tn2Nkb79ZhKthiQ0uM
-ulYV/sRdmAjZwH9ehmLA4phjqMuZ5OfE8xmjQTxRCs1R/peXezH5pFGKZ1QD2v7p
-YLwaDdhkHk09KqejWjO7yDkb9RzW+NqVmuGx/c42M4vCz61nb5x8V6i0FawXJeGP
-d3b9EmfsKxUMOWODiViol0hnAN4XDXR7zPbcgvG+UR6CKrsVg5Di1wZ94ya2wA3C
-XdA3hfL6VDEjj8Eqz60EVuq6D5rZHNH92J7dvB8fjWxl/cEqduwEh3dobSDoD1jH
-3e/oAxXiRY5mwqKzOvVnswjl2/MHESKRgoiCoSWBbGGr31Ct9ic/44GgbdUMQxj3
-JdUjaYWGm7fOx03WWEV43oytxpZiEZbzJwuxsxzSaj0CD6DSCQMCWH8Rj4I+c/gy
-YSTle44TRtO/U+iJ1oXcP9MLD471Az+7Nu5sPypZ3EeLxkQ6qn7ZwU5FV834kJu6
-SKcs7TGZ7b7UzdZSwtmf8s1yBmZo0ZeGUagLB7SbJkvBl5nipXYxXTXplFII3xel
-BT4EfA4tifiKhe0VWKtxqlQTvv/6CdrBLd4q6XQiavH3IkfIQ7pVeUw1/Jld21pR
-j3wZbXQ044ziA0kWEHaZ8yQR6y/2RgUf7F0uCxFjQR93Phg3znWUPEVqOHqy7ONj
-PnXNFb6aUBAu44zABQ6mAYtOn8rPV8jwqGovkHO8l+/yDBv1oowIKq3Jrc9q7t1J
-XL0IQV28ry+grsc238uBkbT03Tzoazi/8aCHnmV0sZl1WLf34wI9sKGDbFaq4CDm
-E56LJ1Iwk2YpTm7qQzrfCbm8x/NdhZKOC9Vs5riqAAMS25qaNBY8BdP91O9Hx/jX
-4vj4yOO8xHs5dzlFK/mM/IVp94rS4vAA1PO9dvQ8Fh8zpzPADama9oXgHft7oytJ
-EElYVlJOnxvdzzKfjFLqid8rEx4MZxOddRL7fmP4PIjZbR5KxQuRlKOPdV3zcqUh
-h4tbrAVIusREbhoi7da6MeraFa9qZqa74PWT8N/gI47w8dDWE4SLbVRq4lRhqM9K
-ID6ebWPAbD2BlBD2KT+kMx0wSMevHS4UaK93r2yR9kQjCSHB6UaUnLmz0vLqe883
-IV3nEK/FXE+zfC8Yo/u6ZKw/2n8JzSKmUDkyuVq2C/So/AcHyVZhiaDiYGvBVlk9
-5wvJZwUE8qvlNyUiAxEx6A==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIQFiBlybXb9YCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHJ33WPApMM7BIIEyDEtZBzdiJN6
+AMWKjalvZFjCLyHHn7NXWofuyvAZgmbBrsIKvP+gltEcEdzcYvL/MSp29ysBT3ez
+szvBTeJ30Ht6b9BohfYo6bNq5b5R2cnwcwJBMFnSHl7J+hq4E5OLwX4QygUOEL7+
+K3I+AvkwdzCieKHxt0nT0FEf0m9ld6k+vVb9pd9Gh69+WDbGKv+729+70qmcDpo0
+QzuwxFoToh8LyPpuHUm++FonDYPy19KzIqtsuLQ63vzlwCsVRFmVKnhIQz5nk/rW
+i0JnUDeLIV4Adtu5wkPU+/0dMj8Eq5nBMWyB7ZEvD00/FT9yq1oz6C6ZLCXuoExi
+erK7lLVPnFeUgMjCKgyUXaV/Qx2Oqm6m4MGk0v3rJrYvAb1UlU3PslaLbl3HT3pd
+vNPRrhpBSrYM9jFV6LPf1DWrDOjVDz62p2zlZRsf76bwKUC66QR6APV7vJG2nBwk
+8tk1DN8t6SpGLYQ2+GiBkQ/436X61pNLeuxoQ6rXMvVtpwL/l02LLRYi0o8Kq+Fy
+y7Tx3Hm7MUujpx4fSCeFaWyE1czBl/xxoOC9pU/uUtfzDBw2rThX3wSpB4QPMZfn
+Qb9nXee9OEzJVRKFI6JJwP3b4H5Hhr66Os8GHrfK7l/npmhaP/3C6Jahx3JKAq7r
+fFmoL7RWtg7h9rtpXB8XeM/vGHHaaauZ4KOIxH+hlofQwiGemTS1Iu/VQBx+UQ/N
+eR2T/7ckEy1Am0L3YraEOpLb0wBQ4PNlCBfNt44LfmwG/apG5tbYVGB+RLMMDyEN
+jN7Wlp3Fq8ZlUeh53vgvUCo+HlH5OytKEA4fRTWDKZedDphcEWnpvBfmlgZ8S1ZN
+vpOyLma9T/V62kfqDvU25sbWVndyHITh1d3hUG8HUac818Kxg49l0p2Ie/Sb9zoT
+PdzT8petdtZOwy2Xr6dv3TuaqEWg+gglZe0lDKd78VhkHMqvvGDUmhk+lrBWYA/W
+Z3NVzPqfii1RxvoUHmAGKE6smXNjEFyel9agL+zFKAeqpfHQveGxVDTSH5TSXGJd
+X4L1SHLyo6W7YBAYPUl153Crqctiu6hziAEC6AdpJ7yTTnXY56atvyDAZXjBS+DI
+LD3BzBWhQnPuSalEecHhRtNJDSM92OSaOkEjTpJM1rRrZCfBM5l9fmjKkQzeThP5
+GGOrphDiIJuqXRdauMqBKcxfr5IqYWGLEra9oI6WIU+07AqAolA9JmCMdhvLgxFj
+DLg5dE4Sa6vlPNBvEblZ8qhxN4nAotp8l9uSvpgw9jhHoDSq2799VTnW+UmEmrCh
+HbvYdKTzDGEy3cxDvMBkDVCy9pfjTPu03mLQKz1cSggyxgb4Rmrb/VR6UPWcVSv1
+5hiMkXXQPI5RodhNKs0LI0Jl0WgarjomsEsE9bFv/gwmsyhqh2K7lwGE+ctvxrEz
+qY3kmYEYSDaYWFLyUzy1pBpcbwsdH/2HKWKlKKaR3tQrM58xq6ItSw2MyyB+gF3u
+mvHAOv98bAhpVhOpg3onqY0m8j1uHSK+v4muyDg9PWM/2KVx0qybxubNCapMf+kn
+73fbgQyajVAm4wHLWHC6NvQZxqEse6/u5RkFV7KjoqP2easkz9dkBkGzFE3OTOBl
+zu2MmAP11DnQRLeul4pviQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.pem
index a4a6eb8d5b3..42e6531c89b 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.pem
@@ -1,84 +1,84 @@
-----BEGIN CERTIFICATE-----
-MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTtmIyxuBS1X9dJJ+X
-7zEAab8mnxlUHx3x3hIAPh1PjinU6D6mWxWVViza579x3uslQvlCW9jstA9aNlLI
-vSK+rAKtNOxRRnXp8V8Xfl32c9vYuCOVmFNWrgPHKYU2+GbUhX0ctgZqtzRX/gUP
-MYJ13FgusJIsMq321I/4aEHxoHLue6YPIpr7WLa94YLN7y9ozmEOAepamerOIXEg
-Yn+Wrgxy/Hr8FpXEEurlrq1sY8tl7/eSWAx7g3I6yNSPAiKK0nrNhuUdoWqt6Err
-9JWCWBoBXcVxuF0iy7Etl4+pkpA/l/cImcHezKwE2OwX6fDXkbTZk2Yx/K3R9U1s
-WbsBAgMBAAGjgfYwgfMwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUDKx165nTbrdm
-p02LANSqPK3Vxr4wgcMGA1UdIwSBuzCBuIAUiabmA9ex8CyisO3ov7b+kThXhbeh
-gZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNl
-MRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UE
-CAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVy
-b2MuY29tggkAhdKR/g/NercwDQYJKoZIhvcNAQELBQADggEBABAptCiBTme6gKgw
-JVLQAF3iK2MHX2oEVvIxVdpFcBKgYs7dobspHWnf5B2Jcff53p1BxPv9XKL4pbkT
-F4c2E22v16Flv8jXf3MNu033bNhL0jt8LhhqUCWWpRCLZbFnp3cXHQysAWqmOrRG
-NXLTIBikIhiBjBynmtOVWe0qdJme/P4dHXc8Shkhz9OY1hwAbxvrDFsmmSstcsNe
-Ld1cnNttffgAgzXv7/jwbo66iEH8N3uMa82icZy/4OabudPtFFqdjHzx06zpeKsr
-+L0sNa6A7vyJekM9sLctzRbVFmDxa5bkcoerqYu30YJm5+bFAate4yiK379mqbVO
-rtgun+Q=
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
+CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
+OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
+dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
+Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
+6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
+e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
+WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
+Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
+MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
+SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
+9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
+ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
+1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
+1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
+g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
+92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
+JZSn6IpfkLAH4tM8WHSDALCJZAQ=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTtmIyxuBS1X9dJJ+X
-7zEAab8mnxlUHx3x3hIAPh1PjinU6D6mWxWVViza579x3uslQvlCW9jstA9aNlLI
-vSK+rAKtNOxRRnXp8V8Xfl32c9vYuCOVmFNWrgPHKYU2+GbUhX0ctgZqtzRX/gUP
-MYJ13FgusJIsMq321I/4aEHxoHLue6YPIpr7WLa94YLN7y9ozmEOAepamerOIXEg
-Yn+Wrgxy/Hr8FpXEEurlrq1sY8tl7/eSWAx7g3I6yNSPAiKK0nrNhuUdoWqt6Err
-9JWCWBoBXcVxuF0iy7Etl4+pkpA/l/cImcHezKwE2OwX6fDXkbTZk2Yx/K3R9U1s
-WbsBAgMBAAGjgfYwgfMwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUDKx165nTbrdm
-p02LANSqPK3Vxr4wgcMGA1UdIwSBuzCBuIAUiabmA9ex8CyisO3ov7b+kThXhbeh
-gZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNl
-MRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UE
-CAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVy
-b2MuY29tggkAhdKR/g/NercwDQYJKoZIhvcNAQELBQADggEBABAptCiBTme6gKgw
-JVLQAF3iK2MHX2oEVvIxVdpFcBKgYs7dobspHWnf5B2Jcff53p1BxPv9XKL4pbkT
-F4c2E22v16Flv8jXf3MNu033bNhL0jt8LhhqUCWWpRCLZbFnp3cXHQysAWqmOrRG
-NXLTIBikIhiBjBynmtOVWe0qdJme/P4dHXc8Shkhz9OY1hwAbxvrDFsmmSstcsNe
-Ld1cnNttffgAgzXv7/jwbo66iEH8N3uMa82icZy/4OabudPtFFqdjHzx06zpeKsr
-+L0sNa6A7vyJekM9sLctzRbVFmDxa5bkcoerqYu30YJm5+bFAate4yiK379mqbVO
-rtgun+Q=
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
+CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
+OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
+dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
+Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
+6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
+e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
+WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
+Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
+MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
+SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
+9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
+ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
+1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
+1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
+g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
+92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
+JZSn6IpfkLAH4tM8WHSDALCJZAQ=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.settings.json b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.settings.json
index 94867ff10ef..cfc4043d1f3 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.settings.json
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256"}
+{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256"} \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca_key.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca_key.pem
index d384199fb82..6eb92cc83cd 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/ca_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIcHU6w5qc6EACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAl5ggMbUtHYBIIEyGo+skLOMP3D
-IeRZ8ZLY7bglu7PoKm1syD3fXZzheRMMEH/WIFLi6JyllDjrN/lecOPP32e/O1q2
-AdZNNlTVwYEbOJHw5KjIXslWUxMXhjuwdBsx7yZPZb21ulRGBuCV91y+WY1SYyND
-orbtN7tGFEqkWFMt0fyNUuoM909iGsGtK2I0ojw9J69xeEeNyhbHT/1Vg7jiXNml
-VKFHqEr2JN4rRQ7I1qC7MCr+mAFfh0+M0c23+M2/8DXAn8/NblfSfTxvUyKgESzB
-R89snPcTxcRGIX1KK4DkQ51LBJ7pjMVf/6EGoAIw+va+wJMOk5eOq0kckU7upeNB
-XaKt71C/g+yjeRqlNr3gKHzscKq0d4Ht81qgXz6huDrrKH19P7T8FcoaQmIJ/oW/
-6bq5lIL02oAr586jxn4U+z/IgmIhC3ca9TrR7Ym/9/hlNIjcRdl3cwq1xlt72hfP
-ws+EiKbPSNBC8yCSQIRmBnd0SdOh6+VyHR8SSn3AoQs3/G/+iOyN9tzS1/Kb2okn
-Oz3DtCTNOCXhahm92v4J/z8pHidn9OTdPW+KNxqsvGtIVfRunSd9fB2r/Q4wk9zR
-K0mvM+QRQ1Hx1XWswSEN4Nlg3Fw8xoYOAcBVAvLouFxiVSM4mNrCTN0M0U4GC0rY
-y8ILars2fgiMZ4uxWV36IrIr1bzTi6HzHLT70gvUJ8t6VEY0VjJPp3s5yetIzvc2
-UNx8RCOEPIg2VOdEPceiLE3HhKp9y/rRKTKEgzHllwJQqgGR6rtBrKSbwhRxSTh0
-WJ5pWFeQDJJS3ZyhLz7CaAhnLZALW68X1hZYzDVA408U6cEFS3JiUccTwzmpPfUm
-/S5kpyBpROJbqHEL3ZV7stREkDh8v00ZbIB8zqPTJ0rKptr5VinQp1xEyWRXLPNx
-+vvNybzFMVKwKSlmuVh/8c2nnVWafbQPYKyCP+yxddsLbGr2pVXWcwJWn9z86fxe
-/u1KgvafJpqkRWNQjQDGLR6UW1d8+LEwmjYCG/ycgw9DRtwE4zmKTSqk7fvCT5U6
-ybTxDjxctg4iXEC1WgNBxR3KNAkr863JknFK0kXOKiGZKaJL+UOjNrLbaORXS2+S
-0TjzMjfrSeGHuBcN2oDk9sA9wlU1R6uezVWe257kwHPFQugU4uLv3aaiRW1B0oEa
-9jx2DKLIGQyvEjaE+tL17nXdzHTos4hF5E+gsPgGaXp+ArqcX1SWygqotFcS085u
-nip1Se4cjTSR9zIgkAMusOAiKxJUBrEJA520I22Gj1CyTA4EKHzpiVzg3Zcp0MIh
-PzhVRwveFfxjAlX0YuHaTs0HbgD3t2ULTKqL2+Nqhky1VrW7IxS74SY3P7rX+uOb
-GRtzQQcNuhVRexRYy5B4rHHY3Qh7VVSbZMEuX93B8RzqHtmgKF4k1v3r3ZViMRKC
-pXoTLey8Kx4Hu8L1nrIbMXJ/p5brX3llPGfNXbjc0nPI1K8Px0N6RQtqV7nfxTqS
-sGuBmkw2+ftThmv2c9H3ESw6oqARzvdjbfPl71s+hIZ7m84ckgozG/gxmmG4E/Fy
-hl5yzXsvJ/+ns2Oq8/HEUOSybXyJzdkIuzCYHd0a0kM0Vrc6R+rH9SdrHWG9VapK
-elWpkj8qH8l6jkzsuvxJcw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIrjk8sikRDiYCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNaRYzIXuyYDBIIEyD5VQQ23kWko
+SDHoG3i1/a4ASv2XWsLaWmT/mpesk7YjwJcp8d+loy2CvsCRWpG9EenovV/xWUTU
+4m1T2VqNNRHwA+PUO/+l3Q7gSqWYNL6P3VWWH1NDv1g9mvHKfY3kwCtRczUWACyk
+DkMtyJgB/ioEWguOaohANgh83xZb5/lEJwcWo5XRG8NCwm6AVZmf96Zz6sYFO6OF
+zwj/zucVQmWB8Mcy4PKOYcN7ytiwjmrM6MsStGDeoJDLOgXZeIdgRaVwHeLiCFSu
+Jw3HCGsjzJS2zGxBetaEVzANyEirTTxKvW52gYHK4JAVi3oonvyu0y653jZ2NnUw
+xUvX4VZpT9gmYFsj8vw4Lhz6oa+VpdHO2/JP9UxfkqGzZNUgGnjS+KVkGMZMsdxt
+2XMi6ykg21DtjKBDv4cwTDZXWG/bsJmHeLibVnbkm8bJ9ZoH+lDFiyjGRNwt06Li
+hqN2EfqhbdsfyFjZ61y4G529O1fg0MDW2d6mFXi15jdmPTHhGmYRY2M1Nmzlvlkh
+QIPKdqunEb3wWic/Je/wFv5eQBttZuMKLTm7AVxjZVNnL6G26co5QkngV5cYA8Am
+BHKImxgEdzQNjJw5KNcMQqWflwv0QESBHaThxotfhL2zvOsaTG/1L9MQ4ztUS5GO
+cw2xJHmVc5xOZpVR9OlztHMjbn8MxqJt5gJ071eLZMKNaMQ3h0k+Q4VozSbQ0U9y
+mS8OyqqZ5uSug17RWTWmmP4UPF0s47aKBTb5DYZD0VRykxBV2OtYWQ/bi9oftsq9
+gpFiHgluqewb7N+uHNLaxlBOcsQYO6R5WoAOzTSGRZR3q56qT41qLNnykzG3JmHJ
+QFfYdpiiKu9AbXiIB24v9S6UtBZL2jQTmZ0cS0DpCnyN1JyjIC1YS7/KeIIOMIWZ
+uc6R0++c2Vqr5iSwfiBUPRpv5B2MEA+h2x2Tsvg8MSjLAX4hQyDXyFt5DeUsSSQz
+yd3+tHqg1pfLWI7OIzZPCZ6MYMaw9t747OHPwg+lVhLmmX/Ca70M8AUiclBFc2bB
++GtP/xguSKBaokX2xLoiiQxSIfDwJ+3WjVO36RAbKAwNZwM2rzfpCom4axPgyHLg
+RLr6dk1W23FmPLIWmr8ovZ39qr8JClmOgpIMtzr64i7C8EWZsPKMyN+L2x9AdMaL
+qJ2rWL/mraqcRB1Zllk4Ibmuu9SxJZGKXfvxvqX7BbJUDSA+AjfzBK2dMzriKyRm
+lekw+DAthibY3MmXRNi6f3s4HxXX6rtG5WpvfXKX7nxA6HEHGa8y8RCDPfibgVbr
+uwbnMCYc6HC1Fj81dazQ3tMv14lYJd97mbu9AIuBuUds1k+7sXce0FNXGD2Oi1Bn
+KTF4XASx8I4pAWzM06w7xRraXc5hHYZ7tE9fjFxAzLlIZltDHA4AMkE/nar7OtT/
+fDlsVJiTr3D4NJkSPCe52BdgiijZlYKl9Tsy+iVpXiKdREptm2kEiK+g12ZzmT8q
+Vh53dO9ui1049K34FQoiA20viHYerrvrrK23hdVROVdqGdGWnXsSSrtz6j0GhTJq
+mLw8I+NZbjh5h0ROdq2/uGvnvezkiUZa4MWbbe5ilSY/YgC7pAdPwmwMeU2YyrWK
+gDPCWUGkZyp1nx3VXFH/Cw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2.pem
index 883197b2f51..7479ecd8126 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2.pem
@@ -1,84 +1,84 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTtmIyxuBS1X9dJJ+X
-7zEAab8mnxlUHx3x3hIAPh1PjinU6D6mWxWVViza579x3uslQvlCW9jstA9aNlLI
-vSK+rAKtNOxRRnXp8V8Xfl32c9vYuCOVmFNWrgPHKYU2+GbUhX0ctgZqtzRX/gUP
-MYJ13FgusJIsMq321I/4aEHxoHLue6YPIpr7WLa94YLN7y9ozmEOAepamerOIXEg
-Yn+Wrgxy/Hr8FpXEEurlrq1sY8tl7/eSWAx7g3I6yNSPAiKK0nrNhuUdoWqt6Err
-9JWCWBoBXcVxuF0iy7Etl4+pkpA/l/cImcHezKwE2OwX6fDXkbTZk2Yx/K3R9U1s
-WbsBAgMBAAGjgfYwgfMwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUDKx165nTbrdm
-p02LANSqPK3Vxr4wgcMGA1UdIwSBuzCBuIAUiabmA9ex8CyisO3ov7b+kThXhbeh
-gZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNl
-MRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UE
-CAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVy
-b2MuY29tggkAhdKR/g/NercwDQYJKoZIhvcNAQELBQADggEBABAptCiBTme6gKgw
-JVLQAF3iK2MHX2oEVvIxVdpFcBKgYs7dobspHWnf5B2Jcff53p1BxPv9XKL4pbkT
-F4c2E22v16Flv8jXf3MNu033bNhL0jt8LhhqUCWWpRCLZbFnp3cXHQysAWqmOrRG
-NXLTIBikIhiBjBynmtOVWe0qdJme/P4dHXc8Shkhz9OY1hwAbxvrDFsmmSstcsNe
-Ld1cnNttffgAgzXv7/jwbo66iEH8N3uMa82icZy/4OabudPtFFqdjHzx06zpeKsr
-+L0sNa6A7vyJekM9sLctzRbVFmDxa5bkcoerqYu30YJm5+bFAate4yiK379mqbVO
-rtgun+Q=
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
+CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
+OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
+dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
+Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
+6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
+e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
+WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
+Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
+MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
+SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
+9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
+ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
+1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
+1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
+g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
+92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
+JZSn6IpfkLAH4tM8WHSDALCJZAQ=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2_key.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2_key.pem
index f7c0735543a..7b68904cb27 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIuwUcdEZ7/EsCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECD7JZvNUI0xqBIIEyC2NNcwUmb1M
-rIRUprekzywgDj6GEwdIjTaia4A7VgoCqivSEFQfgj0yFnzGfBE8llcS5Wn6LyOw
-mp5BnWTEt3ihLHDX4JGO6B6gsphEhqueTdAdqNJj8UYwrveOyjyRBrYl8eBdvZif
-ZvkzmehtdUxsj2OeNKTtAgOaNZwBPI1f+fS94S8yl2io0oq/QV6CVxOZnRuKI8xI
-/8CG/a/MRDn8Jr5eGWMSUVaxN1xkwgoWB9xTtMBCJ6SvArv8SLBHOMyCf4jdgLQr
-JpBqrHBD3kZM8+xdvgE81o/UWkQSc2HhYYycJP9XBdNTHV/6Nf6Ut5MeAkhgR0sA
-oOHr4kDD3fv4ehb3GAZ8lHrAOm880tIIKzPg1mDWj6Tjje+1nnjfSEw2ftISFrzs
-KVkLsPjTT3LoLDMZt4nl+HBn83uOU3qzfbxSrLS3vRgppBVXC6bdZ5Gwv+mhRSnI
-MDLaH5W276yGzttZdEw5NP6NXpXsJBDSAopyox1mBiNma1ug8YcuMKoVUQdf3GyO
-NhG7So3CGE43GrbwmQW3Onpd3V/mZn8uqVFQ+EIlMqKB+5QfFGf9+7nX/g9R2T6+
-T1U/yzIGMBnaggnYHpOEdzbu3pQWUvsEVsJZvUcUWrHu0CLF9B6z2EpCZvQQ0Zif
-EVdBkAmsKW71P+P1P8RVLgUzKvYR3PuFcFnuiCAmraz16KcrBPknMeAIx2ww6TQE
-Hn0WyuRPVuklKs5W2TN2r4hQaZTRJGYUh+IG+rJ4PQsalYV57qAii9+cgllFj8is
-UQGvtaF9F13aERA87s1kURFrtTrqd+cnHMRlDdxQWn7qiCaAjKA35PK4+Q4ydEVk
-RGoKUKO2QA1ORLOvGOrc5N0UpH3kC6h08ybGc0CKTrxdoGWmDEIitFIvPDoH2G9S
-7YVFqxviHbPlRj1WZ40K2GcWF6AEMz7G1LUZX23XzLZesCT7UH4lut1mwQTi0EIT
-Er6rpjPj3oGArvprpMvHgUo1pyLRBVIfuCgyE2eRhsq9ZlJXor8+MBPxNDF5qHd8
-2nFw6ylfYPSQIzd5hAvfJGtyMkMSCPzqx8bjOLuT3vm8/j+in64dIu1xI7A2vI8G
-6fDgyPgjbnL9P7CbMCAxTeBLCiJL4iqEZhAl3pNwHHFT7UK9Qi5K0d6y1E8pdBli
-4oTUy1Hvf+26aVZpz1Zx/mRck70fgxr8Hk08nbPmUjXp366ydWAEIfRzy8gG6/+8
-jbICPJ3QZh9GIZIhHfL1aUi2xP+MaNDO7dhVLWbWgerWu0aBGOCT8YKQNykEYSRQ
-qh2vLawkdl51PLNJ97dzhxAkYR+sI1+cv+C0ohGKKPu3fIhPR36YmxjLVKojqbFa
-H3ZRiVFsoQpgxqZFEiM0HlNgNRSl6YHVyN29CCNyMjKz7iXEDfKh1ZKdWzFNaxue
-w3OvhmRTrHZoYWdspesLbgpZPRREuh1Gt4LS1KxS9YSLWuP3fdbn5yOnwKjhJ4R/
-MbMD7JRGVO/7LLl71E8VX1RpzNA2n7bWj0M6K/K+xK+WqxqqwPbbuP9Z8jPt2R16
-Oi9VXJbGN+ooT+gz6bUsofKgVw3TlfbXFS8JF2ctrK81UqnlPqr/vsUM1q78DhdA
-fTLPZanOXdgugFAq6Wg80g==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIpsQXF6x5FAgCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJNOGri6uoajBIIEyPCSnk0ZQWcV
+q18M29Lm09LOGbMjPDu4iu+0gYXD1reZOtKkxokj+WOPVj/WUxz5ZFbE23WU0Rnc
+INPsQKKfsqptY21/vUNylWT7m5FNKBl6ZkuiC2G+fyJsykpnY+G3Cyl+QticXfSu
+2cUdBoJaVWQallWOrvGls23DO5m5P1UFHmlloig16sBhSbDgpLnDUqPYz2TdmhQH
+8gKYL23XQUGpidS0+VASrNA+AMkFU919cN3U6RnEv1JfUIB2R4vxLVhI5jqzRGDW
+K6XqxsYdRWJ0CVRHhF8dfOJFGyEEhi5pHxuTQ0kysepafU3ZYNNurhjuJSdiPhFG
+zJmGduz4/HL1zFqrjjztry4mok+QThADS/41GDt3Ta1jIHdtifIkU+2xLwys15Dv
+sErr7QNkr1ylFpli0iadAb5U3kRlIs6mFmiiHCRhDw8f2+XOFv6iZ2DfzI1ax8Nw
+rye6zXuQIbHiozI6/p1Bew31kK+Q7IsC4ucz1OmBx3od6/NlW+VQ9jO5AiVCqVFp
+LWdqpOBXFcubKdzuxPGPT8Ci8iySpWLRaQ1TToqJOGoxzXyhxZ+9JXj4E4nxmA0N
+xJJZzdypiYsot0zDsGRO9aLiiqx80qiIaHUkPck3R4uS+VAxiWqKPY+340W/vEem
+mQHBpAiWQuSk35yUUFP4YT9043Z8H3iB4yslZMMH7I5likfSAwOBedqFbf8hBcyO
+b+QQ1zou3SRRIuxua4aFKqFHwopw/btjOd/xaGhcW2rkQ/xcsAcLlOmmCK2N6/Zk
+08dRm2bQrMNzcSh/5YGiJFPWZgP1CuBfdeida5KjixbsIXyD1tWwbxZmtZdma+iO
+lEXv3iiNpzoEuqD2luv281/mH0JiEd+y6mrGw45k14I1tK4unMbozoZshwPKTnl2
+yubGNH5Vao3/XZmqjGyOo/5HAgAHXHDHWQlt1MNM+NUbM6JF6e0T0lDnBGxTDswh
+N9kerNnoiVNwkr1UR83l0RclH9Sv9f8gfdqcdnTtY+sRGp+Qddu7OR3fxmH2TQpE
+Sw/wXg62b0FiOYZLCLwzsCbsc8gUuZDoCXhohxNUJoraQnBYWuO9z47ptOaIpoxJ
+NgEHEY0ptwP/FGd+iMUcK6bYrn+etRQvD4G0mqT0Dy4ubcsNOQM8Xz1S0HK+3wjO
+VL7tJgDcwJscW1DbB3jxHGVfaTBxk+qKps4kiaXiwyNK9KorKfoXpmhv93rPtgfT
+A/I+eVAttCjsCcpkotBglX8O8Xe+HfxJJXuWrAQBG2wLa0SzfxaOpOXoqfPxR9uW
+hGIR/mktTKtt/E3QKFpKhivCrulBKMLSQ5hALUtjmXWH/+vt3dUZSXFVya+5lmfE
+RMqJ5e7dcihS6ibqj0e8BMzDvtskgUe/UkwdAoZiLcVL7TVPnewdpKvL+y+73Tb0
+CRDCU3I4f1jhWxOB1a3XmVyZxP0y1wSAicSiN67cNRWn7orACpj1tk0CWxGdVxQY
+e8D5jV5Fq1bXKJWDiVm1SCNO9nYXZkPWAU1QrHBJpMIw/KvGINSx223Y8Z7ugCdM
+HumcHk/679R6wEv8V8IFHAM8JsUZC6dG/MuyUDvPQF/HSu8e6W5d6WnZtDdqEOSe
+O84zQ1zibd0PRhI9Ax5+ag==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1.pem
index 0e61054312d..9720c8635db 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1.pem
@@ -1,56 +1,56 @@
-----BEGIN CERTIFICATE-----
-MIIEyjCCA7KgAwIBAgIIdroStNk2jn0wDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+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
-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
+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
-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
+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
-DQEJARYOaW5mb0B6ZXJvYy5jb22CCQCF0pH+D816tzALBgNVHQ8EBAMCBeAwFwYD
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1_key.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1_key.pem
index 5b7519ccff3..fd6529f2b39 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI3kiNdXhWgUcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCJjJXlUJVzvBIIEyFC322xJ6cNi
-af53i70BjnhjJ0f3pAWCpoM6Y4W08Hk9/LnEHtIvDEswe5OO8slqTaS1kH5mvwyF
-IyeH084oh4D8APib0GvmyI5tYrgHbDuEKYdQAwEsnLXYAlCUGtfKUlO73BdwQ1BB
-cUqrXOvnDV6tbvACAY5BExY7+Ajq9ySy3/c835AhMR2f1A9fcCiSGIoOlKCniJCG
-GLb55kTl0A4tbqEMMnFMUhdnAyNqzAzOdqqBry7uAjOvGjiErSa98M+vZdPL1BJC
-fzYaF0n6WVnvm9aPN03kTr10wbsxrNxGOPl15FYh//F7eZoxbLCNIJJP1gqRUxzD
-e3478MGfCpjqiFPf9lnA+YhDiSlGywJng3uzDKi0GLn6TftIvPAjTZnoF/USA/4o
-c24277XRrxWYHu0ymkmS26X7FP/t/IZ84b7rlQruvkf2kSAFWpg9oTqylxDFeSYe
-4QzhhngCwDxEDBU1quGsK1LRPnK8eVjZRgmtxfq+GyyfPK4Pztj2PLeFoDZlA6Sj
-pcLnF5s5UNmbgkiMFxLjMGAmWScMUQVU1OONi6XiU5kplbNsptsE5q4sanGD096P
-sT5hCvOeFc5xKcBDUjf5Eag9cQfdZyyF9opotpHFaM8voxUyiJUxq5km7SwyoLWb
-ZIXZDWNVgm32t2IZUX7OhxE/aHFw9hBHQWCHvYT1ix3N0zGefeOWAVz/4cc2syjd
-W1LIqYijrxOD7hIa8YIaZqrkdLOkJJqf7rs7ORqixmW27WVNtE8WZQcrRxw6pgVI
-i4YGjxP5VtWWwM82A8UT5BU+aqhqSPl0yT99AYhP4nZdrjjw7ec4EaGAOPMsgUMo
-kD4euk3TewOQYJTdkCNxGVeiyBcKxtDZHtIS5f9q7rsNcPRkMa+66C4CqZpBEevK
-fBoiLyn3F/lBa87LMOA6NqaCa9hxfD3kgyYe/KbgQwOGK+VO8YW6B+OJFbtkueFI
-ZfgqvMjyQXri2ty71AB+45tfzHcZ5yMRXsorAC9abTL8nO20tWuPX6GS/oFRmKtQ
-3F/P9Sfzh96oGEDhTAblqdme+SRt8egDriZMuKrOwlgvjqaVMV04q1VRMxl/E3k7
-jDEQ3uL8+GRM/R75pQikMm8U/rBZoQR7TnQy93lzRA6TjP6wScrkEk7imFw2y0r6
-xeMbKuPaxXR7ou1+c5+trV+mJIGEoU/fAZstaKe/VUnc74R14QABEXEtas+0iLEO
-Z7zeUKzWitlmqndBTbC4S7lptQAwp76L7pc8TjHA/cpSOdpr1d4b7OmetxvFtjMI
-5XtHRUjH206WIElJDS3Ihyff7Sg+jp/+FJuHbc6TbLr/IMNztHfX2/YuttB06+ws
-tnAmlpxDJrEb0OSTnneE+nmusxCgVwgMGDTaUpLk/XdJy/7Jg8j6Y/EYQfofZ/9o
-gixkbckshzNN6W973zvnW2i7shLka6llYwTL7MuneccRjFN4UFSobaeGSTcehHgt
-K1rbOo/ePaaXqYpQYDWkGYx4IwobeIKbCRaHhb77z80sdc4cJ8sxlMI4Sa7BEJsK
-NpAYEqdQoJbzFHzP1DMYzEs83M83OOAb+sAaB1o6qh0SICv7P6E/XKRSTg/gOpv0
-K0ywWyObo1uaTw+5BKWqSg==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI0Y/XnG6EmfkCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJBN+9lRyrQmBIIEyNG8smJ7umfn
+j7FieSSbLb1I+KplJFODWzFJkNbSQ6t8WDKOVBbob4mnxvQuiSqA82frYBE46Z3j
+awiqfI3BMEgLL9fa7HRZiyoyQl0xx6iPrQIALEFZk+6FUecRdT3PMvARyiG276gL
+JvFxtHqTUu+hSWL9xesbtI+MAQch0uJCKb062yo8esFRSUk6KpsuMa5BiriKtqq0
+VMR65zS0rr9sqXKtMSqW3pU7+COhOc79xuEfLIPNJAP3b3HLpcaPV9IpH2w+SLwM
+M9TlJgHjuiP6AolodGCALoaP2nBurycAC8XqBoFXno+JP/qwsXTXnlfeo/7hQGGp
+XkVpoKfjuvLJhENmJw+ppbMMYVHutX11bOW/i2RWlaQuf4BZipZffNYBKiWKb6KF
+tr9uGmHdp3CX2p7CHHD7ibd4h5erpcryOme1Y22XMGlJCCle/yl9YgRe7T7HWAbn
+FhphJeSkMyTR7H6fSXbQzYTa+H1Bh/HXGnJ1ZBR6kUgXq7q6CxUyoikTtF+Usbdq
+o6xmnaEAEjrGgkmOgLUBoZLNKmE6tplaI4Ao0KkGDtgIQaw+PoA9Bd901kyboUT3
+m6gAr4FWWmTHt75Ek+Zl/eSX6w3dACteNE2gPF46TcIWdnVg/euZ5At2HsYWd4Nx
+U8w3RhvM+hEBK1Wi4FnrJQ/Z8BMoNxaeyCfQgJcEzDcmxhEOWVdgqS0UF8PYVNzY
+2eC37Y4jTTZ8Mg+4lGbZlvSG9w5gskCXHCmBDQl6k91ytNmfX1I2T91ZI/wmZ96q
+YMSLFS3WQ6gj2+a+s6HBRk/YA7LM4wy0L46mzlizKr+4Izfxu/l9XcxigDWniFsl
+/Zir7gdLnHPEveJkdmBiN1dTCYUiiGOxWKZ5dl1njXLGyBCkF3KHUKyX5/BOtgcB
+sbue+8cgE4dDOzLAH8Nt7eC/emeNJ2t4gQ1HazKg8iIj7J6zSp5QKrRINQd26rGp
+s9IdR3R+PCdlYpPqxW2DR8dOzJ9GrfQU+EYcKyeh/9oPibHEjbgs9G4WhyIUOaBC
+b4Eoepfmlp44L35bpedNAx4VptYv5HZxj5fnXM2X53nW3FwjF19BPbE5AhRiTcbh
+q1aRpBwm6pvkIP88y0MxY+lOf69OGuXeMJhzB6zr5PA8S5WTkHgHgxTYPwF8hd+d
+NCkQ4xH+S3XRkl1jJctqMwt0xdpYzrEdLVd9WR+7klMTV7igL9qAvoVy0gtPYEdm
+JOokC8P3m11M2dI0WlqgKOA16+Oe9sZBi9hFX/WFtq1s5ceAlhAQj/whEhC41mex
+ki0+kQHe8ZBymOMsuOrVbYsBmUiCbecG1AlDExm/BJsadipvH+YmlLpYpcxCqUw4
+Hy8dckRp7veXIr3sSz1efi0Ob2NlOCkuoNfcAuaZTh9QH0y4AB6lbueeUQXid/yO
+IdNofZi8Tp5hvxzs5KyQ5HEv7+x27bk37ef9DYDh/mBLt5P39O4cgRud291SWx98
+xlI7T+je84Hj1F8vxs7HNVMtAeff+unzbKrJQZg0UJNfIZ10OJJvj13IteJokxCP
+Wz0D068aTeeDzTHy0DUuBypqRju2Xe//da+0Dce5JzEScDCPy9MVXRSDEVTMyaoj
+56vrMKK9lgd0HnhP3SLfag==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage.pem
index b5c4521d4f6..bd9fc76d4fd 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIIO9b2w4puICIwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage_key.pem
index 571ac0cb746..16005d73941 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQII9sHPDnAmAoCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMjXGE9WwvPVBIIEyERDOoW+1xq/
-SlvVQxGaFQ4C92AYUBrVFNSfwfIFurCC8aLT6yH6uWEHC/dezgl7z1YzoE3yH0J6
-w6OgWqax+sVzyaISt+cRLpn4MSo/yKvghlVrL/3lBQYDzN3iOW6yV+ofjc2dFtVN
-vAefRBR6UmLH+vL4vAjjfocEaQlNXeNa4d9DBhSVQeAS+VyuMb2zbRR2lyisjEcl
-X2c0c+By0XWRfjbAbHYjE7GJP5TKg9GI+Bo8ZvYntkhqwlMNKvJ35pXsxkqWV45r
-YvR79Kd/APX/N4qaiNCBOEAaB3ffbEq6l44MAfKYYjKZKu6QZ1cksUcEtNfoi5nr
-NLltbYIYFAOn1H7Kz/HeVQJhGrq4wrqt+VP8JEZ4I/i1v+LxT69pQhcKNIKT/V6J
-js87UAdt+76/M7M9GwJjcjeJe+yhf85KNv4AG/30tnPVo5F5bhY5O83dzTZhgg0O
-bVgWhM51v3jmjVipd4Mqm09etkcG/w9OcUHvA2JywwHJ7gH2+37V2Ke7SykLGv5k
-S/Mi/RhPXXlaioXQxVkc9klRIPww3wkCyh0OwC213McdfAhzmuj/xpT/oGc35r2D
-t6kgxG1HncaAYrsFYsPmZOiOObFeQYvn21pLqjuI4nXob14O9JfGbCmM4dqnfwpx
-QTLE3g3nPRWjoJmy3Ml11Cu5ztf1nvpMkNq5EweCIJ+BXdl+HA2w8tCobuiggB0/
-/dhXrNwkJpE+nGJV+/rEuJPlL6fkUgvxmGYXWOxd6HnQqdidOjUlcQGX5wlH22km
-RscjWOZm7MXdDZ5P7O7vd4Fie/Z3yrU7WTy7b6E1t0jN5CZUPPvYd4X05E7ey+yu
-Aew/ajt++Aqv2B+rs4i3ytOq6dydH5ON5Ic1O/ZmZz2JDkabujXsRxv+/tZJUAMx
-CIuXZ5GIy90fb6lZLM5IwEzK/W6Tn8J5Qir6HnYYU1XPHfQpZrNXWXaSSvk0dmLQ
-VVeAgZM+Gt3iXhvksNFthYEbtmNbxd2kTbQ5MWO/TM9NQ4gXxTWZ0epaVVmvtR7K
-fT0jvSOXqs9eMrd2bsBCnS+iV0J5XYvftvhJnjJe8EiGXUvHcyPo/vSO8YILV4T3
-Y5U6nEGfPwTcxNS7H59m4XfPZ49F6ww8fQ3UFLzsdw3S60OsmyLHVwg24PJSE0Zd
-e9jlnSQ140i5XpkfPsTXBLFeE9zRbV0LQV/6aBSuZXgVo/mNBWyaZ4fVjmL1J6n4
-MzF2bIOuTbmweqhIoL153sQi8Gndtni/MAYkdDeqcE+EUtU9yc4ZpiTy66dQsN+A
-NIdDpt0WNlzsnwJbTyo2FeWzpazn2L2i+zOSMofVHWoJwPOY73vG1gkRG0uZdt62
-lSeS9Nzse6qb38prgd7Ze7+kE2o44HSfWwkLbJVB6fbF5tryV7Suo4pkr8FNKd9V
-chrGwuSgdxsfp/+9qj+sqblTeE9Gwv54o7cLPOzzu1GYvLDixwwoiGBWCJrbykUx
-TeQAXnH0NtfhAild0PggufVmbE3y/wZ3h1+uMDbNiPrxRlhlYQsFu/GNtt89iLmC
-Phdmw9p+v0qAhL8GvXeIOLsBtbrUr9G6oFJNHpi1hZoD68LF2hbiRWwSY2ltzPun
-rSpbz3M3PVb/wjghmqQ5qw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIb/xKqM98QaYCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNpZsAXGWBF6BIIEyMcphzW7OZVJ
+z48cUbyxHZ2s+RjtJW1x/kHjVtBQMPNuybEv3cXgPNxlAARY9r7w15AFJaEd8jDK
+pf3GkmVRpitc6L6WeDOPRZEf+Fqnl65UUJvkckhkuk5Am2nfMidNwOx4PuZOVbsL
+qqSxMZC3n6RrEIs+RW6v9Uf3PUyk6pAAuA1dwqzQu8LK9gEV4AuiGmYHZv2Y0KHW
+Flym0Ya/ykM7SXrZpRe7yw8AjCEeiZa4AU01XKPDnc2TF69DH2jx8xwR+fIb0qps
+u/jjhMNAPY2rdYJWtlAWN8RPuwc9rV7sBua/wRmGb47Fzkh3ZBMwMG6oIu+E5t5g
+zLBCMbG1jCisZyTDAFoYCF7AO6HvXI7n6E25w9lw//uWBDZfGTHejSIYVPOf6DvO
+HiReMp2DUUm3T8I5Fm/AjMFYTzEw8U3XO+tO3jX+LGKM6u+achESNx2NlW6zgQ+J
+bhTBRlXFTji3af9PugPWEkiHclh2sRcbjhn8mgNb3q0R94BYBaq1I7CSkXZWMM8+
+ltauDS+8zsny+HQKE3zmojagk3pXl5tQMTxOBsyA7dhwtEyz+gl8o05/lHs0lMjx
+YDyWKHaHyY4+rrJMn+w9JCknqnT4csDR5NhAq8bNO43Hcajj9/WEjqiz84jczknS
+1I1T5A3IvYjb0lMicCeNd/KWTG9vt5lRKhYG0PbBPogyJAdGJG2608hj1R7MAiAX
+ZJCcj58Xoo15W7g7LlKR+CIPoViNtrfV15jLFNlb06ufTxr2Gtc/WyWTh/4Zjqr0
+iulLBy7E13+ybqm/BJt+0rhZ9SJBZZqunyM0GqPx1x6p7jNYZk6t8LxvyBrjQb8K
+j3kuTsYsM0BK+4LyrnZ6YeJc/gXxzRUY3VxcldhGGEXuJE6k8YU3mqYOFw76E7Ov
+vIz00xG2eYS/TzXiMkO95sQaC6MKeN1pXH1aeAPcGJ/i110d0O3r95q4oHirj65H
+TvKDxFYxPlTZfezrN7uGzmOtD+I3cnuBn+RU8WVxRxCIBfvCyS4UkBfpmHsqaOBy
+szlEVf3Al6PupCiQsgOQnNoHT+98czn+w2qLN/Ihxm+2tUh8RC+o4GyRd99Yoc/Y
+bteEWj2LDXtTjYQ2zPjMKJnl/VeVBr1CsgrRitgrIl7GMSEC/amC3y8KJm4jJAKE
+T7+5fuM0TXjvusFo3IpEfiX71DghGsn/S57j3TOOtbUCeooStYPcOf4Th1IF2+MC
+odjNidUczqIxICPv+zGS72iHiXr9NuM12z5BJUijUojCD/t76sT/VVCAI/2Nah1l
+ccI+mGWBFcDu+VMoX+J1q+duGB05yZ9G/a8rJ7hED2AicHm/iXsl52DYmTGFakbf
+CGF9zDRF4URCLwWAKNdPtNx56WfC/Y9H2K0Wlafwe2YSPOz6BbshTCq8Bjgxa/cC
+ux5VryCg+X82Dp2jWt7QpxFbeJtmED5qX9ZkO5KLhhAF2vOP7NWVB9s16kV2wKdK
+IIqMUeMslE/7TcnHNQTnKWLOvcXqqUBpf0tqMOsvzWRmJ5M1imo2dA00zWC08ws/
+Dxo7dyMKXLFpGsvgGhLS80WmTopGuOwuURUV25O0vresLlDsmL3mJeCxBCQu28Rt
+7gUwIBxT1FrQ9AIZ2qwf0g==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth.pem
index 27dbf134d07..45e70486abd 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+MIIEzDCCA7SgAwIBAgIIG6MhZFm8G8AwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-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
+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
-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
+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
-Zm9AemVyb2MuY29tggkA0KlgGsJ5WokwCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiH
+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
-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
+KoZIhvcNAQELBQADggEBAMYgrpLIzz0cfXNSRAXdgFd083bvK9LWMPEh2CvkFOZf
+Rh2eMxtRoWTfi7gV59aaT60tu1DWGQc985mVpY8NVOnwZPBmwIbGvsE7EyCI1Uug
+bbj4gjMmbun9tdK3+D5uDuSWxMFQsrBfEDNlyCPEUk0OXq6pFebpAoDstfXBsM29
+C+L9VDxmpv/G2dZxNlIqNtbyaSZt/CFDTQeIRPQe8JjN38HWPGBUVM59xw+CDZEB
+QcOVUTwRuQtoAw0Uz1D4jjEo9LXdK9FNbl4KqU+uXe2eNEtSbetkO5F/qnrPFOTb
+SZKxmpO86axYFtrRCAH0OThYszzFGUoSRLP4ibVjJkw=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth_key.pem
index fc4b57a001e..d13220b4ac1 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIxXggki1OGt4CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCH0MrvOdUydBIIEyDCdl3d56ZI3
-MQpuvhk6mHuL7RwrTgfqj+lNMCEkabtTNM8YCcuUHOpEbKM+eEFaTax7IsZ0JAvX
-wUZ52THc1ksQnhn1Thnicbf8E5egreHD+wiTircWJBaN4Ev1Ql0710D1bJdLS5I+
-S+ZvbcpQnjT96qYSzFiFNj6UohGwsSx+xseqbfAzNtq0uvwF49n2dxuCjja2CBd+
-8647nuFdwMqe9qz/Bfp3LQrkWQkHBOIvHpbEAmc59DspL8jdJnlABxhqv6nUUIlt
-Lzb04jE4X92AH1usT7DHHnLQnlq7deOk4fiRuylUlfYwxx4fhL0/o38UyFzciv7D
-9owsuV0NyUX1IX5BH+g4Qk9ZumCsn59gXQL3R5twasJLqEubdmoBqnWe8kXXX+zL
-Z/VF7YXqpqvuWhSyLZz3uaPNs+hU6NgIwYfDnq/dh6+tzoj27KVFvcY0UNOYszQv
-AXibzGQ7okz2ffdw607gWUnJDI10F3dQUqdbX71qmRZ7oYPgvVt/oz2WofJ5YHxW
-gIgz4yONrTAOqOLh5ToD9PwGMsjcwdxqegU2TdYJqWojeBObt7FqZAMiiO9r4ioA
-gPZXHfNqlYhXroBvYAWZdLpL+rmBLdM5qzL6R1HuWZgIdmwXIFC7JB/9yyh96t+r
-OQj+sxbb8fXuOpjK6IoLovRwvJYKVWzoRMbamrWHjAxe0CII10gJpDxKY3oSMqq5
-j/K83gEQBpS9wvHpQazK/g40h7sFpcFaCXIZQ1KszX677AhpnxGTALGqaQ9S+2+o
-5XFogoNSmEkBU88b7Eb/yhshlW9JwxysGvMdzwAbzmLgfFQZe6NhfsPb0vfsvACZ
-8J7gO0+y5NDhXxTT/Pj3MXq1RSELbYaYcZ2zHsIwTuO99MRMhkFG8QxxdKpponmW
-NyCk3bpbGMwKKCcB6wf9iw+GLk58UmteOQkJRv3DOo8MLvSsrj1UChnJzB4I/TGP
-bK3ga3tLR9QZmdPRUUjaF9z6leN1eybdP+Rs+plyirqbOzi/HSPSZqD98Qb172C9
-QBV2cWwDKdNWmRUjIoQYJZY0ysVJc5JDTw7OG0M67o0hwVJvGxJMJ/Y4Lpw/dhIc
-QcfUwyzqN8vRqqN6w8hTpkbmVIfTYAYKqFYnyp8XU4G/obuVvblE5iVKj/vMHXgw
-Q+QtUI3Az0JjtZ1QPcrPr1Ewt91uxxxvgVNziERuwDcRd2fyjY0AB3G2eqeTCNMZ
-oArNia8JR7Ud7Hcf4Zj1D+HYM2lZX7uB9Qivam/U5w5zIxy6i6UHjbTzZWrRlcC6
-lcozIrZT2g0W6gQpRWnCPEQnYHfnrc3Cf9Yew5wl1ViR5oq9ouwIxcX3Vgx2jUlh
-hCbO9sHRzPC9p1XPGpy9LxqTKWRhOKhOko65IAXkjl0x86mIevHYnrEMMZ0BLWzz
-RowJwA+OGNR6ivNJL9+npvXiBqbba+x2bLm7geqxAIWxpUP+fU1iq+/+TN4bX4p7
-zHefpkoGmRohuCfNg6IdC58kpmA8P7PlCfTJbvRzEMpJ2Xvu2hQNDqZ5hSlQaSnd
-UWBPfnEVjxiXpnWehBqhGwy3K/lWD/TCmCrccSNUv1yiBfbLZQQh4SEvCga8crdK
-C6QCKu+y1yitjg6MPQqELA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQINeb7qFTwQzkCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNffniNugxRMBIIEyCj4OdLnMo1u
+PT/K2auE1FHLdd0k1tlX4uTrqBF5HxTvPzNFerhChW9JYP7OIo9CJMBRtX/sxmCY
+sy+kFOM/pXoZhlEeuw+v4XzhPU6WDQ1W+1uCtVhmhUEGXuQFNJCfFv9IhCfQs2of
+SICtlZvVxm7qIgHvd4leHj6FvgHGf3CyCyTKO9TsFb4RCxFND7bURvjeLN7cwiBy
+erBJycb0j45iG2mwI/FSgi4qaRKZ5Ad+Yh7TaKzWama/g46nQ/TYcjfEZSoKwULg
+wc8wcJpUCzd9ovQ5yoLhjLUZVFwjMIpGbOy5DGXQ94t3hPkQDSfNjSchX6lah75D
+awp8iM0FVhGJww+QcAbKBaD1NX8qdyDCd5vHhejG3BkLfWQrw1BZLdRbUNF9+ALS
+O91IEAwCP59a4e5UmIHCu0WLTZ47D36eput/vU08RnDRjWPekH5udCVJoigbje2P
+Yf+YV9LBDtY+eaThKvmqv3scoEwYhgkLv2buW337AA3QuNlAc/wz1RdRIYB6hF89
+/x1sKdX0fUrMYX2p37MKw7edJT+WYBG9eEX+DhKIeUxEorgetIV1qj2lYWlzSxbk
+xC1Eru9DnYdhSC0GllTlPgsck+jgdL+hNIV1lydFQ8KsFlpY8hMySavCVza+LNMi
+c7htp+dHRYqvMG+7ZZFsZU96/e4Wic2O1NVYLEarzAUdfN6BvSphnIP9PMFCFmW3
+xw7HVp3NX0wedcLaw/uGDz2nJeOrG8amemhbMlORRN0dsTe5zgxwcq8iJj/T14BZ
+BhtrpYQvny+FPXoizFYiVpW6c1npXHQS2lvHzvS8KqslCdshbNHP4Pm96mE7wWnj
+4QakcBZDvoJjb3vLbn5VCkcNjBPVW0QvvYmy9LfEAStFG2oxFy8Jr6JHPvOXWnfl
+hJI/4ENSFTmq/mRf0oz85QtERgpohnEsyNq7P9XOulP4IKJXrV+VO3KGbTuuBPgH
+dwsB/tshf2c9i6BOhjlHovg0UKbAUYPF4cQnfcBhdhSBq1UkNf4B7FJF0AlXE8s8
+SbMumWR94S+kfujEEez38boNBTeh48d9/+T+ah356x6bbkRZLAlsG23MSVbRv9NS
+h/02A6ifuAIiiSG8OIz+jqM6PfLxIAFNZM6T5WPe3LGKk7ER+NdeBpxG1cDPHsFc
+fju4NHO95L2f6qjmMgeTlwXYpZITtbKw07RQPgNG0Pm/WbWqphHfikzK7LkXwPAK
+oB+h7u0I+xwyh+u+EDWSkFv+CSPck/z3r16KzZjyiYPXQ/IYyJcxT5Ut0PucxtQz
+v+EE/+iRG6qbhcYx+qc0fkaPGwsiDVAEOJuHbVa4/XOZtgdxsRyjFVztPwFvsimL
+WGi2I6y9Jwccex6xDnae0usdLwUMCVcRa2xpTCllxC0E8kc5PUkHmZQ4ekjYKwkE
+xfUR2RtpJk0Lw22gp90WIrzOPeDxmpxIT/f/YYnbMWegxJaVS2U0k4yOVY73TEI6
+/qkrLW2HnQqeQxkiK3n0psh4+hL0VaFQ1X5hFalQr+KjPzI6e1DxewufYxPKCpWo
+XTQ18QkJSuQ2brL7pcJB+Wu6MQVowtukvkcPXnzRaz4Da/9Rk/bgwSAU+FdVJT/4
+U5EV3oVpppFfewU95KBZUQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning.pem
index 658648fb83b..d4d3eb9f5b8 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning_key.pem
index a8c1256a346..2a9f5263b60 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIxutQYHoFK6cCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBi8vLgxgqdABIIEyCFUtnrxrkXv
-r0bZ4aNKplMC+jM2yivMO2cqFLRICfF3lFIulqzyNTmX4jMdHDup1ZzTMVYTs8g9
-wJajJQk4TMz4KWNTIE8YpE0H1R4f0vunFdyrpKT4DAOCYS1gM/vZ12lrr3rZHfWS
-lj1u+wp+sDapO8wTbSFe60eV/0muC7y76kzbOX6muzOXsv6WR8wXxeilvZ0I8PAO
-3vT0Gqhl8J1qcwnmOD+Cy6G6XcJq9Xnh6J2bfUk5FeBHOZPM3xBpoHCerae4RSmF
-e3jOQEHdlg6ID79O0mq5bKF9T77ZxghBl6QEWrsnFK74nQGOWmRl92zU27jU1rfW
-wydYHuij3b1mWq1gfNlpvyf0xh6BGyCBqFmeHFv3XcR+4d/sJoFMs4y3ddt8ah5s
-xDHZlKYUB47AwQ5TZZB0s+DpiUmEyxT4hppbgy0VECbLc6b/td5v77Mj8yHQewJ9
-8K88saGxuhEXn12aQy4g+M8gIa+m+6jx6RSfdcZsHOlIsdEbrnUggRP5GIyRFu2I
-qJqGBJvaKygRDW1TwbqynNV941GlXpPYmP7uq4WRZOLsOGRvHBljlggr8CWeUN1M
-90tV/pncXNEP3kAC18ZADXG5MqVzUZb5fa6AUskNpzci/N4Qv17H+tEFpTYD48T6
-omRWJMr+WzzC8U/4llFcJNYLy65GSbVv4uxmEXifKp2IZThKO97Df6KdLmSmC8+R
-GqCkp6dcBFItV95cP+Wh4yzwPkSFewIEEZ3I7JiMzxw1Opc7ceYBw4IhWHRasmoI
-Xu40X0S+8p0cp5ZZt+84g74YDRKokm4kMv56+v+OxkAGZulSKmtfMT+453ALzwt/
-6hoNULvoFSPu11C/Uevthf2fWI+tRSynYaW3Gu0FqSoLCywkWs52e/m4n5nPQKQY
-lBEBGlmWKMgecnJIjc3AcqDq6xeT7CQvdu3f1Irqeh5J5PZpV8+YDril+VoBcfEG
-zcIyeHAj2Bt3P5FihOsXqydqYyqr+/bZ7J4WY4TKEAx8pclVk18lvQsEyqBV54i0
-x5R8CXryr8vMBtMuHZhpFRj7EFHK8fx68YiHbPJx7x/V/rsccN/TO5lOAtNnGRJN
-V135s2dUw1l/TumwMhsPHIzBhZmtkIjdFQtbOb/Yj6NLnnn1ae1SBHXqqNdLUlhI
-33fkYu+T0L7pbQeTMgbvoPQw9KG0C+VxJxtdFRlZTEBJguDzTOIZAS/DG15Ye+1e
-lA4CJOPVFrBITDOH7R3Rcooeo+Uo6Y8svjrqVUG8sC4mykc4FwRNFA2LSod57Hpp
-N/8Ar0pckfLwoEMlZqaYzyun4TAnwfrkvu26laBNPHsTMBwmSKzFVSepC46Hqj75
-tVzQH+iCyzH7a3ItWm7n8+Za0EavMUBIIzP119DDezXh0Tsi5aofQGG3BHEoZs2h
-mqbRU8zJV+3eUFj8bDEOasjkJhuaAD8KYyPHWgP+qdAjGyhjEpc980JvU6Qt1k/o
-ZWicZJMu4PzbPyy/fQINZsPZatYCFbdArtdv5rTNa4yYetc/ixGRpVSNe1W1+0wt
-IO0BG+oPbmElOphWH0CDrpIlOx4W0EKHgeOsQ1VP+0w5zszVa/RT0DnGTu4Fis9D
-6rD6Pwz7QH7rQLNtBecG+g==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqhkf3X3uSqcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFtwmECyP7JbBIIEyBw0oPIo+n6a
+UwKqsdABDOUEhq8fxwQHuzrJDNbqNshlOnCway1pAqsDIHHBjw7Xl4rNOFWwYjUl
+wQTs73qj0DFda77qS3s9PvJeUctip9uTI6jS5BNgmpdbh+9bs/hl0YaAIw7NNi10
+fNEQCODHIKkB1/RKF8IOHjpSbl4F+pye52P4Oi3QHz0sa5KslPpuePg5wBjTh7dl
+tENXPXZViOKYcQfmTioaZ0bksKblWRTopHn/gThPt8/vsxlQddPdI031CrTSiq6+
+WeSCSVQxiGiy5dzCtziZwtbV7fXpwcrcnMHn8iZdreQWjuGfPPj8dOR4qcNfugTT
+/xEImAmcS8I7Kd2O84MsMIWv9Kj4muKw7oJ90RcnG0Gcwf9/fu5mYOm4Me6/z7Fz
+QBo6X/zVky1gB8Pd2ADkcABwHxVxXrKrvdz8rmB2XiookrjJjAH0EYGEb3ADLLsI
+TMB7i2pQnu0/Tivy/tq6tAzQfkf1jXwDL0yaX3TPcmtB+SmWxnfq+tGflNVKZnRy
+iXdygwpvH3JoJyc10BDhBCaOKe6ihT7Hjt72uvSOOxcBuSryd2/2+76ByBn6jTSY
+PuCgXQqQprAel5xTq3rNxgM2LgSGs2ChB6eKF9d1dg7NtEYiAMDqLngwb6n4Os71
+Oj1V1SQolUgMrH3JnkQ/Fx75o8LBStEPxyuWh/SXCiwJ0E2xZmlu+bNJDuuymFh7
+UUUbcjcDdPe2gzzrIjH4bK5uYIUZtN4A8T/hNNOrdJaxf/EFJqbUBoCmnKI3SwqD
+eK7uTmNTBjizp0v1OXxjJDgYmrq4SkUFxh+cp7xRP0v5sBn6ujWQcZT+d0kIZEmm
+K+CRdOegdd11ZGRJJ3mEbxQJ+xhD7Uf7EDqAX0d/yAOM2byHbpF8lb5/3SaCGDFg
+tTwbthblaWq+4RQYR0svF+nqYF4cl2gBFmaKzgnC8BJVgR/akE5nkm3+9kKtOIGd
+8bPCepcnlTnfpA87gLP7xj5kzHYE/I352u1Ug06N6kdO6284+IAEJDDgEd5bUhR3
+I1+ZXcfVp7Sd4EuSEL5FbKqF81rM+MZmdB1drSO5ldrf4/xQnGCcwuKTjjPckC2E
+VOA1GrFplt/waRT3ITUNTBD3K5f17wNvQkhdJ/M0QLlPekaGoywMqVaTzSeoPkw0
+j+FAuw2lc0AIxwQ0VO6YlaesE4huB2ln98G2zKfhRW8RtCDVlDQ6p1FNmdep4qQs
+VWIUkkqZK0uI6fTUcnjFMgOLeOw9eQYYhsocEeyKr4brXwNvfnLyLMrRuCwPSKgL
+5RRxNrK+3IObSyjq5A191qdid1tjnqRbD7sruun4gPKuLVwva+56xyGsIZFuVPbg
+TcKdlUsGpR0ZcC/5zIyhsQioWrLckLbEXWv0UnznUQ3rOrPTObcYpxaEXnon8soa
+mFOXiuuu43E6uwN67Vt9+K9vQPT+H9QjIUwALQu1N2VIaXq3ZFBFfs9r7DtkTU6J
+K0P4oBivV176Y82Mv+UEoUU2ckxXBn1297pK64xafnJg+EisucDqQxOfeeuC1UEN
+/sZV/A7nnJdRNh3PVaxI9WG/eepu22TVlXCzU91iVTNl02EXiLI48XqWqlK+jdRL
+TAj6YTSwu3Glte9RrWEAnA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection.pem
index fd5761b74b9..fdfccc387d2 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection_key.pem
index 803a03ba239..d8268f6de76 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIVHdGRdTJohgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPnnJCnRfAQIBIIEyNyrbffBP2i8
-2JtIUJ/4sY8uWJjluLIXguhZeI/i9twRTG2IECRR0hLByU99cI7jWX2HHLXaHbJm
-QiRosCiRs/iyUiF9NtxZjgdT67tBzb82Rm1GakrW997lgFmzXhhOUrDM/sceeQDQ
-HupCjkh0tQY4+XERVCO4Ww3IsXwbRvYzNkwjJmHOvqe2+KilnWucY6ZNlzIe6WXt
-7IppaXpd4X+XZ6wuLCOx1PqVXXIIgYw8nT8tBozcP/oT86G105JcrdR4O2AHqNx3
-/aqX7Dv13rotK5mqQXESvC2bYpKVNr0Z3wZte9k7ZyLTnxX868b9e0XrWqWM3+J4
-zACzXZs0m4U+ykowfJgu374N2mzNMEfTGxePo+TCE7r8E0jaJZmgCVOQ9yyWgYfO
-WoIVn6UMZ34mG0rKzeWo4wnwokFbuvrcn9ZxeBVuhGx1wcEs4Vw5qO/t++HVbAB2
-5kZ0j7SPBvI3wUC787YQ28stcZFY8zQEkB5kbxcdiGNjv9FUNsf5c7CDnMWcviQ/
-EtK7qghcFIeCPyElMJDeUGi2WLLQHLyRgKD4qfg71P2+3B56ygkfuRQr5h5+6IX/
-Fl89ZPmKFEF9N/LEec0NLP3ao0/yY9P9Q3aL756FJXp2IJe8FvQTxMl9QsEA6Nau
-DTYnCNX/60zVCxN2Mp5c1X2SyTqXLxf0rpIx1bLNkLfriWJh9RWJqR4/MnhVj6Tt
-XXbvxsH2zJj7DbmLZknpHjys7Ts48r3FC9xo1UbndijCIK0Cc3V55TynmH57hLZm
-2C9Fn/JBjrnLESQXlvV7jCdWjdaqDp9adAk9BYtwJw3PWKHmvv6V8DweKtz9yw2+
-cL6rIFePimjS2aHeaPuljPfSeJmYthOfaqNOZ+i1g9VpupBlXZejuzABaUj8KGAR
-DA+mJrthcjugaWNo9AiJG7kEfUQDFd4qb9J74T3Y8s+lqXmyaaR5LDZRcsl6iJXs
-uLUPhe5VI237f8dK1BSdA2xMhrLuFv6JaJHYcOVbu0/8zv3JZQKSghLOatoqn9BP
-APPdXKqW7SRq4CejFVWRMtmuIbB9KY1jG9vSAod3SqJPXx64fqbNC9ebe33B09Zi
-dx7H2rD8COSvMy/gog2gQs6vLhgsOzYm/SkPR6SIumbVyG89A9SIEVc67C8mSC37
-U0PaHr6dZ45FGt2TcIJXpgW06Tv2OS+xJBN5W/GZVsht6d8bglS1kCbF7SagH9uj
-B07NxRLWnHrOa07+9j2AU6kX3uBuBjtyANKI6tDSxFqsmLNy9LTE2nkkQGWyOsWj
-t5qSOQwIG2IyoQ7BWzhEulC6bEvjOqs9JJpVi7Wj2xdGRRlVslplv5F/n5IkpGzY
-jYAZRttRdSbKXE9aWEhIRd3W+ryEKtehH+sEZkGV0CC/ANrEZGeobWoW1FBh97BL
-MZ88WfBEhw1imUh+S2K1auIEYrHCZ0ykqxBS9s7Zvp4JyiEV3V7QrpRO9F25k5S6
-BTHXjviyGnxo1zmRZ4aCUBONAzkI6J/az1omfheEWFYq2rZfzFaILaR2vTUFf/TD
-ZF8wp+5KUbMn4KElJEgODjS41xQo8wsVg/cGqGevc2WPyZzjbD1wBNBPEJKbT/Jt
-xADWx0aoMmU1Ayph/BX6MQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIpYTWE926fJgCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHwfyWmQHBrHBIIEyCzeoK9JJazq
+Z/+l49SB9WNN+Ltk7PQCW8klt5FtR2nkVPK2fKdltMHf2uFgb/TXKx5nEvh6r0NB
+BVtFD+E7giw7VXqdTERDgPxUzo0BCQPt6ce82WufvPy8GF4xT5xuPkK9kdwzrTJ4
+Yeuv7l6w6OJQDxTVycHAK2ixtzUrIcwch+s91nZ/uFFiAKjk9jSlvwhlvaI91EpK
+fE9GLZRRuBECPi3UNtA1TmxUg+Z3YvLeRPWdqdOjICam+gM3+L5jOpEFHmARXLbG
+dsUZ1+5vmhOwHbmtZc5ztOucf/B/qEuC51i4tmriDHdobTeE14nFzY2pYk/t7ezo
+4t2fSEy+yUyBVQ2VC9t7WQV1doNfogZmFfLI2PtTnbn2EHi1NiiOzf82HQ4xAcav
+VNSsx+ScOPBILMwNOXryIvzBwLRFdVnuqvpUPLmTJhM/IeAiP8GaxaLbWeCoof67
+4RXKcR2IiYn41kq0WtbdA2HwHMtt43J3FPvb53cAZqOkETJaQPCzKEBRl2UUZEok
+9zLpgoIOmUMxxnGcjRh8pcLpRC9B6TupUOVncw6KoZiIjbpTLcwVIsJ4mP9UuBLJ
+1pqYvTJn/j9T5Ae2I3nU8KZLJwKikUXTcUcSR+kqVBiVpqZPalzDB/harP2sjCYD
+T+z2TBSMjtOhtnCAIOMuAV2G2m5iknFSbdB4I6c/3Bi2+2nytXYNL0ZMCMo4ms81
+FXlQBS3JVK3mjKCGIW9VVF37MbAbn/vagsZ45qpllUwygEHi8Dovvl6o+aHa5fTw
+AzNtFykLnsmVU74NEdAlyumw8iuVjghWwVIzoRetlXxL7WWYD2Z/nC5LsbwqqH45
+PjgeQTUXcvHezCu6C/6s3hcdInYIptMN5GM31W6psUSGWmG6UH107m+QdNblA+cv
+1wRAyDYRCPhR+DU4KV06O5uYvI4u+Nz36azEQC/cRVCgLZGDYmehQRW/ZAScOoLI
+1bbA4TZWcWlZoAgj/kBkuaTw7XKoAbQecERPTsHPopmKFxWEBeoiRdGatjOuzHw2
+R5KxGU9HU1WUgu9FzDyLS6MLHYBRmwUuW5/7Y3uzqN98QJmMxBVmzZmXvoM9aGm5
+LmxB0A5c4i3bIu4lTovyYJTGD1vouHjyhA7xI95jV2Fle/ohFvz5bEwTGN7jZYmI
+FBXpbTTm4CKNQKg4ST+hq6EHIO3qXB34QYAFdGYqGnbYBQgCAi78coIIJbmcb9O5
+X+SovSNNbezF9jWxdpsdP+V57GkqbP6n2xa5BaB1BgCBW5BwKZAMcKs/xPqnKkv7
+9At+lEZtxQzlECdsRDp9dpQXLejoxFaPyWeOEWY403D+D5FJndmBEt4ba1m2VlUp
+Ohf4L+K6m3PZOsI3XZCJ7vaEoPGCQ336Dritzdsr+DYUZciHTqsnJ37EcZezgnGR
+J39e4+dYQHN3VgJzjbyA3xGMFQTJ4JmlpaqHTSCKm8WLFVQqG1MTwjWo7/il8cw6
+Konm2VeRYYvobjZO7INcUZFXO/FFRE9AIrxn1Cgcq+Ekw4JYv3uQeVYiercMol3j
+kD2QFd58Pmwxvx2gkGmQNfw2ubra4KGpenH9GPl8tb8A3D2E6wttQQ2Eej2ffeWf
+8NAD/ooG0KhnCDQsYDv9kw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none.pem
index ff505b65957..36010f5ed77 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-MIIEsDCCA5igAwIBAgIICBK30V13vlYwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMDky
-MTE2MDMzN1oXDTIzMTIyNTE2MDMzN1owgYMxDTALBgNVBAMMBE5vbmUxDDAKBgNV
-BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
-EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
-bmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJs
-vdQmlzPXyS7E8dX+L9s6gvXJPUeu63BBcC2JQhQ1b4X3qerYHDEmtx77V56WBXkd
-A/eplCdv8LWWw6GwVrx/KDtTGB3elpVCVlSYbHZMnpzma8iKcnKSYn0nW/Qqd9pZ
-suJJjtpUVqJzQnoJkKr6PJ5YQUknaV+uJJECI9lLz4vfu907xUDbDbm7RCr3KJXo
-2q9bPEDP73v+FAGKziDLVCk0FwN9AxV1t/iiH9yzSaMUa4av+xh4H3+7kZU+42f+
-OnQf7qfxdzjTv6xveLp6vfw8udXeTSy+sVjni1KnNtOgcIG7SZAZrgv4Gvl+k9LI
-vmTWsiawiiFVgsVcu20CAwEAAaOCARkwggEVMB0GA1UdDgQWBBSjJPeDsqtV4wI6
-5Ln/SUPaDe5R0jCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63WKGB
-lKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcEfwAAAYEQ
-aXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAr6Kj6PYMYxjxzshi
-dT0hqvKsAZd+jxF7LHX4OqkMDlHaPeM8MaYVfG9EBsxTgSJqVMo+GKg6K6Sjg4eK
-BwyNjAluSsDro8iWfj3Bv/xhYvZ32Uqp9bdpbBd8X08XLyRFm4tzHqkoN05d9Cdo
-gGsPVEfc7bkPpunByU7euQxj/oQnGXrqL/jcQgAFUX3SN3c44r3WF8O0XiHlKGJA
-aoImg7KSGS7fF3pZ93CGwj19tD/IMKIu/wSV1r21XI7EfGcIcKU/+yRpc5UmRSIx
-ypxNg2yJHL1iP+cid/qv02b5h/ZXE9AgS1MrKft8xC7srBlj49fw0wr/ZPDQYRjJ
-L3+Ebw==
+MIIEsTCCA5mgAwIBAgIJAKxHMXmgvyIMMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NTZaFw0yNDEwMjEyMDI1NTZaMIGDMQ0wCwYDVQQDDAROb25lMQwwCgYD
+VQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVy
+MRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYO
+aW5mb0B6ZXJvYy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDV
+6Fi2WJsyfAxX7azfll5SsBYQuK1fL4QjfcqX3WpMAY9qI7QKHDK6UEetbCUgYJf5
+43yD9lJSEWTnwk4KyQIaSKAmziAqUGUBs5UmwCsGg+4HlcpYHl6bAvaMyTEpfPKS
+SvcOw/T1UIuHwXnYbPhzIXRdXPeRbBGfweqTaMpa3YmRbuPwvoopP1ZLjzIxNk9j
+n1B26ln6sOfJMfDfVgYRNoIo7H3pQ5MHY5Eo91cUikMDmvbjiSoYkXTnL/h0Cr0W
+TMEIKm6n3ioPdNB79e5UvgbcRU+w5HuvlP+ETw+b3V7vp2W45a/jnfvAcBv/nbu/
+9nN3XnUFmzghjjlj2MpxAgMBAAGjggEZMIIBFTAdBgNVHQ4EFgQUvVJyej9UgaBB
+BWI+VFXxoQm9BAEwgcMGA1UdIwSBuzCBuIAUAv0b6W9Olo8MDplhj0VIaysUPDGh
+gZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNl
+MRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UE
+CAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVy
+b2MuY29tggkAv96HBRg/RI0wCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiHBH8AAAGB
+EGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAKbX0uaIGaziBnxz
+aEtuuQjSIFv6mHAbJHbv1IY6kIFiNvwh/RY4DeXnsDGd2k8SpTNcfVld9LI3WrS8
+6yhSvkxm3xt2e43Y96rT3nlC7jN+RoaDjPrXGedfK4i2wkIURMvgBJs8I37xveRA
+rhqvWQjTqPTS+FBhL8kfvykAOY/TsTnC7DNsaf+eLlq+sTfkm03qwDrZXYXVoErC
+btQMNhZAqxX2avk7PTYO8go2MPRhid2D5/WaGLFTbLk7/8F502jvnpZmegklQ50z
+cixa+K8JSE5jRxnrDsvL9Fp5fyZQ0gQ0seHsWkJk1UMfspLd63smtAB61eR6xqDZ
+/HM8tJ0=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none_key.pem
index 3e679669102..c2df053999d 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIPpauhQWNz74CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBzMkMCXWtfzBIIEyF1lCFHZ7WVA
-4rGyaFDKT6H6xy6RcQJFlrQuWAFoDtBhGx6VnxNUvK8Dx0jOzHZlNp7oy1B1lOzh
-gP3lsfTaGIZs8k3S1fIwsPFu6SZSFC/bcL/854Lk1zSI+/a+NaCwRevWFLp3QVFW
-HHfcfU7mGrGk2ThR5AGyvUTNKg/qqesJ1MJ6wLOdnSxZtrUhbeb2Zn6et/q/CiAm
-gmbF9KvAVoOlc8BV+96uDfhkeoZcLWZdLYph8p/50Kw969ZFM9e1XV58yF0o85+R
-AIgvbKLCPATKhW+jLnVEGXPRB1YnCjR4tFVmIkAvGefHiAuZerqcC0WQvGJLJyAE
-h8g75QPzAMR/rvzsAp85GPduPfGS4Q2ebjP0gZ23m7+xBkvSs1CouaUAJZDSGD7U
-hcMiFTYzZw4BTYr36JIihSxzA6e8qBe3aOuhXUC8pn8cy44rvSoOHL3Y1wAUuPyI
-UKVgUxnZL8PuGptUnMVFr11848R5NXetJyhxQbnbDrXRRir6bKEf9dM8cT9upE/J
-GZWUZ+Jmyzws/EG9Zy0JPZbdaziLUC8fzBc8grE2XHlGDPK7t51Qot+uIlv1lKqn
-k7+xOXneb3HuSvCzdZen6qBSOgETIVWNz5MuaFuHHyM4m1k+A0myp2+cOBMRMo37
-WyEBKNYJKwX2V5g3vBYmxwDsyjlaP5kKa74l4CaNeZQvfSmj9QZszKzHDifOntNZ
-CRUjUvzqFqFdqcNcdH+/ILwxr1QTer2aMuLvhlPSJZr4JyLvLwPKlZ+LRen7/fTZ
-4Ma73Xg/dOqWmsp9L2vCkPe0vpXeSqEC3s645amyQo/pzzHEUAbp8nd5eW45EQkA
-6Uz6JZuISl0oQLY1afTy4KfTOnjnJyT/rg4eTxCNrZpwgglSb05x9WbkWPdazcEZ
-qTNd0ixCAEPdvQia249n4WMdRRoS1pPwlT6iOMv6uyA9O4Q8AaCB73L+KhxvTaks
-ZyG5/RLmiQkcl65lU77qLTkuvtot6XN1XUulYtLp6EBoXRz27t1cCuFvLilpMEjV
-Z/ZbdjVpCaOw9UKcf2JLXZQx/gGnxPQ2m0B2jg+lXZyM6zGBs5oCq0h3k9Tjtzu6
-ZhsEVqt94UyTAJ+ZWLOLDaVHQUrN/sl9rOSLP/nlH5XssMbyXtoJK/ane+BJ386z
-4HQ8RK108tLPRxHSqFV5e2bXaBVKxiq8X/j1tBrGU1EVUumRZmDxR6m33GZMqbWj
-qZR735yf1QyVkXwt4kkNs9ZtO7ahGACaPW32nhN4JtqX8Vw3NspUJD1dnNgdZTA4
-lFkb0erqDVS/TAbne00v0Bm2zI9V8CLS9Je10EDaUbNEf/+A8QcTA4RFQX3caNvJ
-rS6bqZOdtlDyYtm7lOBPyHM3E04QhRQuoO3dxrtneWs/eI5+I0kmz+nQYjpUf8x7
-b9Pb9ghkR4KEas5axnidsLeEHEExA8wC1BqI+Wbpk1xOC+XSGS6jDUL8mAvQcnDS
-UglDRO1O5lkaSiywvZBhPe7aEutYrr5If4p447N0LTv1aQnKIAmnO3gXfNFk9PzV
-rcSY/Kbs+WCmqyh5ZY1YPP2PlDME6qUM0sWDvGjZa4lVeRHYv4Ov+X/0oH2XIMZx
-FK6SxFIinvVNrRPlHqGXuw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIbTAdBrGVpYoCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOIC/nWETqCcBIIEyG/0ynPGPKJs
+oq0Cz5M+rfb0fsDQf1fyf6Dg8UuGsMt1Aeadu3VWttHBRPvcmKZsFsNOAScnYBwd
+7W5uHoHvjbMfwF32U7acq4a7vLFqZXQfzPwYXvv1/MHgtDzplZwVcDpiKtXCfBJn
+PyKug4eZX1cOfQ6pL7Fz+HHVJyiFg/QXTBVgfEi4BGdmfi/DuCOAQscAicVn6Ej3
+3WcfbGd0UHDSa/Je96yBcluLe/kIwjOjQ9UFE8Mk/A0MC/4rTe3Tz1fBZVISmZTy
+9KOkQv+yjuFUB3+Hsv0Eig4EGpuzYnlxKoX0Grz73D9f/Dsv/lv1d/92NmvIzg5c
+3kEiB0S7w47NVBFH5NZQ7ajAymzr8K99+tvWElTAvpBgSzqJqK+a3WWuEB749Zti
+8sEp14SbM+byASPIG0AdORGxuVNWbCb6ZSQxjfZaLPpApPHtG4NzCLTNg3PPQVQp
+a+eDE4N+4xEw9gNpQyVzRevcCHkJWoY+w/heQIzP2thGzyKLGqn92LfJvPYmZzQ2
+IClmrVHVmZ8ZM0dPiXiCJrW9/zrJ4E5M1kuNTmYODxGH1eayEIIVtr6bB/QLLDlx
+Jp5xBcHKF286p4VX9NkiSk0VsY+pheiIdvJKKvrLF6ZncAiKTyoqEDSHSQdbZBFE
++YX6rd1jXTuXDpywpQ9VfQALA9VZyCCdndlV0NujFITJxzGXXE6RM8nCaPSAzuod
+HJa70KufU7g+ic2vipMrmKVrpBiLM0rWYFxmrn5ucI7VzIAnS+9frnw3zk/av18a
+QNO/5lcAT5s8poZFWrQTFRXDxTeHSz4YJAQJQkL3HHtuPszgFV/d9tKJjVJgxcYi
+YZv41hXHTDwhDJFhU1ZF933KWuC7QHHeCI5gP7tRDze5pq0n4yNfjNUjE8XhWXdW
+j/W0sZRmJ3NTn9zJ7FlAlZTD8zkhU1Syb2CjsCGjBqnjkdib+PIXyombj/c4FwlO
+4NM9KR8t+gqcC/OdQGVgAx9Z3G/2ZTz2rIIq2A7dYbB2NyVcEbk/Hlc+9pAEcZzt
+Pq3fAZ4gHS7ms81GWIrJcaSEeefKfjiMFiQfEI9EAvT/T4bqK5m7Br/GFAZVJ899
+Hksn5PEzvVmTHTbzeKllGpTdxpeaFW753x98LjgGrP08c9pHlq7WMPCasgyUZbYk
+A99OBfdRyR1I/lGIM4zN72H+2+EfMlHhQPfvBB7w2wmM/smjQk6PgbW3WYlquq37
+BvH9Ww9ihpXLnoLdueuU1F9DW11f9M7X6/h/W1kqDqJRwS++r5N2zcFp9wv9rs/u
+vCcTLZPCkAbsvpbwc8Ry1cStu/Ifvg22NTLUidCKn7GpOilRAWrtaDngHcnsmpG0
+JtJz6ZxVh7c51hL0dNWlaIYUfw+S4sZfpuF5BpzRegNKhtCR+EF7nVkdojQwND6p
+8zwhoe6og6yY6KNPu1T6NBgXOlBACapYmEuoMXuSW1squM4bSrBnCX0BEZ9mrwix
+nJ7zQyoc3X7H3smlgtvIvvIIC6RLRZGXBUVRYaU5A5PsV1eWd/NSB2EDXUY/T7Z8
+XgusDcBWVJPw+M2qURRZWlVN/leheeHbSbtFSzxNVTMvepjK0FoCuuVc2Je5+sh/
+i9C8jMeOCw+EsxKRNzTViQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning.pem
index 806864d7400..c7385ed836b 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+CgKCAQEAvYUvozq1Y0OoWqurbDD59iZPtfQ3LFerB+ZqWsjn+oJVO38dCb5miOA1
+9VDsrbwfSszmHPG9hLcBLAMbR42aGqYVhSrtZaDYFVz31ZO2AlVd19Lg66Te5Sjl
+2Kr/Z4gDwoUo4LLXwsmKs9EXG41nFjWJGMK7DaSiciKS8K/OwXWBYz8L6moonU7p
+TG8q8QNQHT2++cPH/zO9Jda05M+dX7jctf3UoD4hc/oj73S6pWImMk9UDki1/aFf
+bB6nm739yaK9qZbfrgGHsLsb5YS4lEOrzZs633VsPhBX04jiZcIvCiLaBhU/2Ilq
+EYkSNxYuK0Ubs8QVs2UEo70BxBAlmQIDAQABo4IBLjCCASowHQYDVR0OBBYEFLJh
+P4S8XzEq0aEBmnKvyLx438G9MIHDBgNVHSMEgbswgbiAFAL9G+lvTpaPDA6ZYY9F
+SGsrFDwxoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNV
BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning_key.pem
index 539a2ec23a2..e339a65700a 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIorSIPUc9r3YCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPXHQoaB7G3yBIIEyHbg6MiD606V
-mcqarEV3DDl1T29EGG6liIGaDfDTUqN+yb8Bdeh5XkOMNV1nyqzvP6LfY+telzr8
-l1enAodlxUOj8/mzvMR/6L++y5mSpyF3D8Awj6T2ngn2p46/OmOiXAnlb6udbf55
-F44CP5Di0OMJfyog+TlFja3sTANJxLAMg6gAqybwFUJgtukQ6ACtLoVyY1SLG54K
-1lao2wMjRC013ATZG4e30uIb0iP+xlGHQ65xMSFPJwBlmTwJxHgf25zm7mwSwcFx
-cAbr8pMikboT0F8wWIEpTU/DCJVN47z658nWL9D6qpO6FKd2cSKOw+9FpZLHoX4B
-MFdrhtZtp2skx6y46VJqxRiFrseenQiKBis1mRx841/jEaxaVZnSnc5LDll9ZNvH
-5gEec+RMoCK83/qKJzA+jl5j6i7xyXE6V/Iw6eHv81nwp/8MqjSuyeV5X4w+PFuw
-RXNG7R/Y5ulG53Igb/o8md+X0yxSjxP5SLM/AWWhZk4tmhpPuKuUDEgbEmDlPvBo
-KbZY4SPo6W5SJ8Wd6WSgT5CwHGcB9AulgHsDp/8H8hAr4x8e9HFXzNcu1w2HyLmW
-Cy842kKBwaJPwVdf7oxR/fN7awt1YdBE8pyDy2vlrk/sU4S+WLlBIIobE6HAjmyU
-7TdQ4PYbLgZS56UkZYiIPkzDQcX7dI2cQJHJTI6aZ9Ebq/8yUTmfXJeUw4QoiqGG
-FlVZvcRfzHD9G9wFo6ik0SD5I5tEaOe+h5yqtwrYqnkCZsHBpzjjcHOv3poQ3w9g
-UzI+nMQyNCao+d1knL6BpOuxgISeQFxjhhheP0NFu5TyR2U8JDBS2zBZaWaJTNJT
-VHjXgwi3YKESEiFY6eMFhCZplJLsc6Nr3mxQphVYTpRRWdF6C8oL64isPdpGfgtx
-NVuyL0fx1ctQ09+4+NidkTkMnHeacq4K23OQUSRwPK3/tYAWLawFZ/cPfUG9iMT0
-PvBv4GX9SbrMqUNnwm8KRchJD8DyzBpN68oM+lqcR0+cJQR2J82jostql3hIVSKK
-3j1rjYkheA6lqDaqHg6nBD+m2G+esfWGCum5zz8v8rt+uwjjgxF/dt9eBAxsPvfW
-GVJi3zoFUDsSF1V620BsI4mmCa8YahS7yiZHsyJpfo8dXxMK01LyQYUphDlPGFwM
-Ic/73r4lG38exUSUwjUwW8uTW+J2t2YJahd0ENUBhtWqiAUCb+ZRgsg+mHypTFHM
-rP8Z/jrUvcEEflRJYq8AySnuhT4BlTGGg7GGjixEYDN2I9CjBizw/caIiXMW90Ie
-REwhIPso3xEYjQgj2KOTQXPKeTWxpgfFmAtpzIKmTPfYeBlPhYjB+GnOQG5YhRHN
-24EUIUf3BRQFUXfT6WG3uGZld/0Vh6UdT/7MNF/+aIyh4RRAPAQTPdzE9PBx+4au
-IUHNFRHj8fZoSoxJTD0By0di3+aKQEXrRlpE6suAPF29XqoG7Epg0Bh0AcOjXu/a
-T1u7HzoprJARt6/sHs6yFodKMfrvtfNyBM+j26MgAyfzsk4xj7jAezoQ80WaH9py
-JB7TLo2vfvoJzUUsLdC8dbvrdxz/7sP1/hxeN8SRbYkTg13mzmjMlpjwzZKFmZO4
-Zj0M4+LETPpV+SS34p/uZA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIByN45ND97Y4CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDWwNADEMPXBBIIEyIhWZZXALVCA
+d9AKKBK4oXDvRKBKnhFGaKm7uZNeFI4hSO80O18L96BYl/GOSEKiNaxSydvxqVX8
++KxCAz7XRF7wldKYdB3JjhteSYxgSJO68jH1E5hmK4sSCfLxuj/ieDXpo4IsjsgO
+bq2OxyCVfj/qxDFJCjpwbm2i2FeBy7xVBz8uM2kUeDwXS39aDzoEgcMjVh/al0ra
+Ow5Fb4GoaK+y0fm7nfcdckSTZZ0oUVF6jIsbB38S7U2Ctlns45Xk2u+Ji1oNEV0b
+74B478KUqSaxeh1dBcwBql9J3VCXVVxRDuxMTHvmsiIOurs4o/SqT6rvWN6Rm3lK
+pXX+qY+IAjpKDSQ3rRF7gaJip+2bpWni08d1ETl/9NGh1Yeih7yoxT2/gfIW7W/n
+1fwE6em+JXatHpm+b/KKUyEhAvDpDOW7cWxpWZMm1XGM7hC0kQ6kSUMQH/zRc7kb
+qudLD/VnhOIvtWQUHevFtTO0b6c0+ds4uz5UEffiJyiMFNVCz3E6U3YGlVR+wBxM
+tOm5Rut/w5FGsGdQ2QoqwEKobpXVuO7t4S9JIcaqF4HXFARSEUDCjL95+Jn1Acal
+bGV5Sc5esqfkJ4iUKN/TRm8txvFN3RjyPyARykuaWP2yvEXPZupL5stlJAX3432A
+HDs+Nv1VEgIVCKgatibh3Z1w6xt1P6r88O+4+etXCfZpsJvCA67cZZyOCVNT+Nu/
+NBCHq0SnkGCwhnVRf3BZdpbnRF1OWWuD6WDEmtpvD144LJu9tvohvTwCckoat2cd
+Gl4Slm0KT9IZj81J/rjLwqedl8gQQ/lMGQqXfBpeIiirSu8oCMR9dLEYUMwr06OQ
+xXR+JK2rsRgBt2n7b41apkfQNpSHzuzZQ1NVZZwqcSVFi5PeRL3kXHYM92+6OYNr
+O4lT+/s7iCBnF+iUXg5PHxtBuuRt/EuTDGgqWz9KEOvbFvS07K5FsFAK82186Slt
+9QzOZBCPyoEdWLFQl0QDgolf5ATQ2bNc1EhpQt11w/jxVuuuCdkZdHm80efx3N9x
+hbShhXfYMrcqzCikfwJyNxyXXBg+8eZS9V0TylfjWigSaI1bTqzOdWztcVhgFdUP
+W8iqPs95SyALeAGlgGDvQqlZ2mJtL0hw3Au1qtPxLxe684ruxJH1v9KfiInOCbRd
+ILoRrtjuIuYgr51w8GVL8mC1bbmBgsuJguKTZ1isCTD/+YhEJW6RCBZ3wFtCC2h5
+auQZYDpTC65RpIJnCB1EPEePGGo1ol/bGu0UMnDlr3woaKm8hmWYB5+QdclQIR5G
+fZgxjRlu+vOB1FL65LIZpwd4dWdbmdTPLxHSEFvTvDYqcK1c7mg8O/jgTJa5SU1o
+KXm18eEgHeuqTvskieIiv1vm59rGmNlFJZq5mgQwCDcLZDbJcWMj/LmfbgaHOaHE
+48QGsPx+fEeIN48z68KVtsX0AVv3z1bg6StHJ7bnMidoCMr4wAHccIgsimLBN5PT
+BVoOOpAevxa8QTK6fBsN4hRy87x1tbf0AYggGL4M1tSB3/n7e4yNpwPJfsnkJ0ri
+wkm1IzOQm2v1QJuM3xp9Bdp/JRb2dH2JXyEMo9VtpPUBjOG6yovJrbOyxcLq1kyM
+Bwb8C0V968nHOS3W4YIfnQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth.pem
index 9ea113ba10c..fe4e4457618 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMDky
-MTE0MzQzNFoXDTIzMTIyNTE0MzQzNFowgYoxFDASBgNVBAMMC1NlcnZlciBBdXRo
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth_key.pem
index 32dee17ddee..1e65804635e 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIVm1skcmo1rECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECI6ADIKALXSlBIIEyK5/Bx9ap1lR
-8iobb70UEfoHHWRj5PsoQTDtqogdv11ErVbaResA/Aqykr5Smo7V/9O1HlmVsPP9
-y5xDosITRE4bHGUj/oCfACm8aMK29yf0Buj+1VqaSmMIumgqzw56ZVgQY7wnNyPm
-41EdcW5+YxreY60ywwOErVlj/79uurFZUIq8u5oRIzjcqIQLE52d2yK8XNvocIdf
-9BP9dEMEhyCA/2gBreAqV2glCwm0zZdck9icSXwS4zCFenj2p7Ov+OIyAccGqm7F
-/qQAqfnsxVYaObI3twN9dUZXqhY2eqfGXGoYh1MT9QEcJsD8KVUNRsSN4VRsd+Fw
-rgsNYJBDF/TsmyDiwyXmTAtxoEkDpn22G0dEEWAbovCW76wc6OEOgYZDzvOzG5c/
-gA9E3bQRDHpToIUwWQObPwLkdmqGLLpoO2g9MBAkhusn/BYdjtW3Js1lLCKwEWD/
-7EpXSm5oGGEJPgdoVXS216/cYrNNyfd0rtPhF+GzG2FU/68ZYt28htOdgfHmSAdJ
-Dmm8j4F5j8N4v5/PkVn3QCuuW+ScWptWnE6ULuaELw8oKnd9Il8TyQfc6WgbX/QC
-bMn7DRmgxq10ygczYdccsAD/H74K8Ej5+qhFXxJl6tp+6K9oM0JP3rq+pcAqzE5a
-JBN41AUG+RTNQ5GhCLIzFjDYoquzTYgEOgshtkmcD4rE8+R8fWTCRFq6hlTqEoCZ
-mQmGVZUAUVTbhzv9SWA6FlodlOOORa3OmFYnUj4jVGZ/ce4YqqheVokvYkYKqDK5
-CU3Qef5HiElXMVvVWZz2XW01dwkupeaUdwiUP54XeJH1fakgTKGilL+JAHv29BA7
-DyoVkB9MW/GsYjL+CkthuN3l7ueH/P0eaZm7mGQRyvx22gkVDZKy+1yaPIPD+F8p
-iAbmSlEeFJBvke3V+wwQxE5wpMeZHl9xHqydpwL8DyCK50qj0FKl2P/vgr5zco7R
-AVXrJeBCMu7UsVD7BGALKbVv24TJ1m0OcwULSr/QedLFOcPNReqDUr6HpXpZuYgU
-BvhiGWLhxj18Br0h7RbrpMGZ4zsyj0Lvp1uY3Zf7yzJTfqkHYPYvVw5Zlpd9yGAM
-w99Lj14UdkM3UPjLhh4W/bf0nBrYa+BEFzgIJgDmdlvz6wx6U10kdp0n51WFbpRq
-LRCoTFTuf46amhv4L8dA3QhcPMEZ1rPUtiKF0754pHFSSYbwnqnsodPUf7JCccHY
-lJzNCPpmZEdvKYto4gqLvpu/CVfbrOyaAsq7/RD9Yi9Nm1uGjVkO7mwc2zTnSmf2
-DQ0VSdwu0hfr9NEMQBkcWP06hsfZYl5laphXbafySgFxgj59XxK1CTCf1+5oz1qV
-iOZNXppnkIGQdO8P+2yBWjGufH4pvIMOa8lAi0U2XVrI0D+DxxByNo0uibvi0nac
-5ZV+8eV8fgctfmfVJEAng87w2eANIaik44v51/gQ/uMUY7omDrGDeXVDaVEekFJ9
-QUjgZXSwYghyo9aiUM+2HQjuakAsMB+4fVd7cidBiYfo4LomiBCBQLTz0FJ9HZZe
-fnzvTyJNKE7BkNN59hYW188FktaxXfXWn+y3DKN96rgMCE8TcBESzjIW6J8mAvoe
-JYZVeYN0W1s1Csjh/BYM7w==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQItOJurCaeswoCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHlHI7grA3FmBIIEyOxdYobmWHrf
+miRwa6+CDXCoeuez6FMjAzh/rRe9e+6DM1ZeKl1QJB2j9pvNOZvtYJoNUhPbw37j
+vIEGZHkhjbPaA63Mu6AmQo2D8N0VO+UL23WHmAwe5OTEL/HCbqW9nEbuEvw5Rec7
+LMpb+C7sIkQQu9lJYOPrPca9WkjKgX9YH9tlZw+gW8BhUuLSQzw9cgu31LNohSci
+i+RIFO74J2W7nRrP1hq6/Pp600xwwWhEEebf/71CPz9Wfq1tRycyv9YASGK8DkPA
+FXJbJtuSW8hBYgL8lAq3XMi37ATnmnalSLuUzkIhCin7mF/NCw1OVu25jYEOgFOn
+FOY1lFa17jLmKrq8Kki22fh2jBR4x7wdb484i+LprVzg/WVygmDqCHaiYrRKkllL
+e/WaYDLyE0Do5grSHFt1mb63XUbfO7H8hUf/K92D4Zd+qDzXzCqdHh+q8EJ2AOwh
+bmmfVhunL6vN05LkpaU/1w2Lw9gQ99qgNDy9p2mG8HGAFqp+FuKCGo5CQb+TSs5i
+lNZV6qDSO4hMLV2/f9g625I9dv2y84xLtw8ITDPGL3Cq0MwyTEG+xc1GRX3snuVa
+ZfqbC76yNqZhT7GSEImz16jEbTQ+Ucw8IHaew0Ynf4hquCeUT++uuQ4qyV05x+Fd
+F+vosRA5mF6J3BUW8ymJnl4wiQqmRF5+2dODTEaQl5Vl99owcCGcqM1d7PO3L9LT
+YOSqinXM4dXQSOCM1eDw2jYZ/GgRc6a5SyXwac7B3x7R9tbZ9izw9VrT535QnN3g
+pUjWHKxsa0u4zj2Y5o7cq0+AUbpDckeiZrfu3IC0OgBSBzDH+n+GM3k9+/nytJ7n
+0hvDHFmnKMN1CXCdS3MqsECOwFAE7CfS1L3Gw7VUqSJe51tx71oFsUp54VEI+P8e
+r+qpTtWdZHI/PwA+0Dx4kYErUHQqkXKIrRuRX5opLXbTdK5sX/stbix1XlA7kU6i
+E5vrteLirnxg0O7iqvWoIdN+ArPO5hW5NAxR1H9UTCNlnVAC+A1XmfO4u2tMfuAV
+73IPOX0TIOWIoS4PC2NnflD9NmzYi2HxoBJWAhHtmYkhVD0dAbSLP+V/smareUwX
+W/Oj3RpLAELi+MmAd4LkeZnB/nGh/qX4//nCrdBWvkiyxvmzLQD8e80GNG/g4I8h
+4aZhdvzkB0zjdc6EtMGE0pSb6OaH5uiCQ24UB2fcSMGSqxUqpEMLVdbwYRSJc8fb
+a9n6BmwTAWBia9dy5wlXP7uUvdrXHDcDkrlAVEc4er4egow/91XTF6kv/rTJQ5NI
+/mvdQVoa5C9yQF/n4BwsseU1/oGaWm+n4biXxTXqpChv0vBX7KsmlR3/lRC5rZ7J
+pgTcUbpdpwpHTf4V2/2Frsu/Ok06VShJCt/CI1/R3BP6ptmHzwzc3ss2LaXKIdRS
+M5mcu/6fmBRdtd41jchyKvKaAslJbLeM6mQkjgVRhTg+zg3UaoGUKIHNkuZ8B1JK
+aQn+Sd6DsqM8BMSSzJ2VHwLZFvJot9cvRDF8WlLNfl/cFGgWQg3cnwlvO5ekEdvI
+UqOHSM+FH8ETcv0VnAkqmQ1VrJ0I6vjR/7bNSag07N5Wc8ExQz+pKSrDBfFKkLnN
+4BxGH2gGsYTHS5tPVSpRuA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping.pem
index bc0c167dacf..74ba332d449 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping_key.pem
index 088c0d88f98..669d4b9f7c4 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIT4PFFk4eitICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECP91McRZNnOABIIEyMFR+etrTWqs
-K5mPxwyDQIuX3fYrIkGEv0Oy8smwqhrqB4LebeQxvdEs2AY4KkLSVTah3WB/Nkmm
-4UlLfMqALyAoDuvAxU07rLUKl32CdnIbE1n45lvUTcnH+SdAN9a57AKXcruO/u0Z
-AlfEcGoPQLjkQmCekvbLonZnTkoh2iCl496ALnsyYl9+zCLxgDyo1Two3D5MZqQp
-gVzKVef5Rw1+hWhBNqIQt7FZgLDSSMO0jmIYXRNKyMF9VIh7GfnDWWX99Nq/GZrH
-WHy9IdXQH0+X+PQrFU1qa5lNG5ID3heK7HhbYYj6NFL6KklhHE4ssatFV7w/74fz
-F9UFf6aCuFRieskKZBouZ9g/WCGKW4IEOBpJONfoZrMAAfc0Oh9/ZfDAq7oazn+Q
-MTuJZOMD1/C2XZgIP/h1P3h/96TOWZi6LYQoBW5wpaBFDHGlMEHEOIzDlfTK7xzX
-ym7pYzE8WbdIrcz8pby6Q2vkrn+8KNGixrluwgSd4/keYvvVZ2zbhhh2q0A8YY5M
-vAg9P0uqzdLN04Auq/5IVfOtDfCxcN3X3R2R6WhOcDEe7LuQtxJMYmp+HZfoIDEx
-rd+RZYoBkfLrHm/M171gBaq6BUzY/8+oGq3zn0a4ZGY0o2wBs30AiKsEP9WU3jbE
-O38vw/GmjTckR6Bc94Z6dn2XFy/iJ6YgMijDdKMKb97C4iis3vlU8FnE2WsdDp7h
-GqTNfPDab1F5YhZouzbq3QexBwU57xpON2tVyGE30QYOJ3NzXw6U7lY8z0/DJy32
-WRC2RjK77CTfa5bm0ny/H/sT10QcLJp3aGpSVYHkOsG/nSRYKpgYyvSMfwPdRUBZ
-/M2wLHj59cJMPhlCy1vP5CR3U72Adc9AYk8hK9YOz1/L9b9jOJQ/l7Xjr4jkWGHW
-amPKbt6rkOkv/BWSHbrqWVVdeZIf5sVMegkRjHlMYZf7k8vrg6hS3o9EMRQl+VJy
-Iv9ioHIkncK8kwCvQkThgqCX+rs1Rg+7X6iTGJ5u8R5//3ql27wHXeZx/LM/RCZG
-8RCxXW4bOoMXLZGsdG3HnqKSyutgEBJa9WPfaZWcWQWrfMiLkdVUwuqtXdWuTexb
-6FxMy7xcvujaBKZ7+na2RRG3UMdcj4isLShrT52Lc3BTlzKVMJ3Rmez7LMI/lAp/
-R5sknlGbK582+eyxY8fge6fAkkcx72Ttg6q6wjxwRjWsaFpSpQcSBYXaQDG76Mjj
-tM6h9uEp4kzZaYRqjkH9lq5Mff2Ec5fxYcWsh+4W/oxkCGX/n/T6CY7J1J9lFdZn
-kxjdZtvdwqNnKMHcDOO6XIgy/f3ANrNmWfhf0v5/bdQjT5j+wg2O+UTLBYOjvDJ/
-qLT4DLJmWeC+1lOUmyTAEtNHOdtJHigUrb7OxbqYM9zL/g7M++FNn1L2lwi8SzGA
-GCsK5/r+ftg5HnLfKlJ5jGkH4XNMQyfKDl9yxS22QBeSbc52OWZS/ZEjVZENVtC1
-PD3rhKajtasfxQhaAaG6dV7yuOqQffSapkT4MNgkjfAqomEtlE2mt6JmXy7RZttY
-GDZ9MlHaacMkmxgxhb8Xfu+5lg1QTG8vbkmby+7ra6rKatCUlgwYUn4UJmCcjLAa
-1NlXurdssI26SR34zNeZFQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI2yT4cvxloAUCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLXwSHQ5mfMqBIIEyEv5qmN7+436
+ScLwpzLyAMUk3+hNbkqwa/muUBrCF/fKdDwEUBX293ARny+1ysK6/yoMenhitJhp
+pbWpDBDPAezv7SkTisuJocOfvaDTcMbHBznQM5DqzBHoHH19jqtzEddxmaEjOEfc
+1qdLcAlq6eb1IU7qG0w7To/4P2bEUo3iVbMh/ath1PQ4AQ2u2pxoiq+XmvmlCIds
+T04iDDP+fFVu4aZKDSHQynWTorbdkjOAX6wkM1XBtQqS1l7XVNsQhHbRMBmyMNHN
+CCPUDc4ulbUpSYoGZkFkRIUMdyqRCNEUubqptgI61FQizlIP3QDVxEP0C/68NhdO
+tkKbKhDs+0AZ1sJUvfvuviQdHnwcAkvnUZmRQOc1woc174RgSbs1lshqTE+93p80
+L0z/oq0lRI+OQV5rZ2k7KYrkESrZpOyirZKufcEhQPjkh2wILft593r6DQBVelGF
+ghN+GloDtJI7R+Zo5iU7EX2aYGVgOGzs+C347vyzORikb9GOzbyNk44IpQ4SAvo7
+ftgnQ6inj7YJ0K/oLWBenPtrAELRkJjN/DtU8nUAbVtaIdBCvEmuGcQQX5iHHAgO
+wICF1n9Gbzv3la02F0iiRn8494waLP/EOl6MunCvAD7wPNjkZA93Fm9NePvVbSFZ
+qd0COOKmzy+iVjTbDUYuODFG4PfsGzqmpjCZoSe3pSU7JEq6u940bDv4thNQgsuV
+gsaOlOH8FMKW3X/d1WVWVXy+3RLNViwtWXsDVp58xbcylO99KwF9XzO+SMIeKvEc
+yS4dxtka95y5qU9lhdmGPITELQRDEnREXSuZCAD5c9ipAI9YTPkK+T/ZjuYW73Qr
+MCARjjnw0OPX3rg4z4WctcfHg0u1fIqFb7OhCrh6WQC1WgGu9P2CJrXBeFgbEg4h
+MURtSVQzp/JOvCshMaBJNG7dQMmf8oXAbuu1EjJ3dxa6ujXrfvIqvUKptwjpR8G9
+e/PQ7UkkyqTHx7JJ+vLUa6jopvExBBy9TpiBYTuyqWLlT8AwW4LuPICnI5zF2w0m
+JJtcLPTo3M4nnjbuLJ/PsO+wugvFmSG3ffOW5WOYCPtNwsFhrdEVAGi4VIeXLZ3+
+2auoOdbwFZg4RA/eF3/znZe8jKIwa0z0GgcnoxVDDvH0CagXmAOvQPD9/WpGWu+Q
+vB+7GHDigOrkWhMM9/Qz+8y7AsUoKDC5t7lomE6oQ+TSNmel2iIkwE/yCSszUXor
+FwM9GIYqp3fuXIfdA7SaLjGLb6yQk0QZiictxUVo3+bKhkji/vlZnM7Gy5D0bWha
+8cidpCqFvHL3CoNFMdoE9lCDxFZp2MlHko+sd7lyE+fb/q0YHh74IdVwQyCl1KAL
+4k3CeNEfGy5/twfrKDa/ZN710g+cyk1YotD1ieI7Ew61teQdbayZu3K44Gu8Sxlf
+ujq3daxL4Z4L8q73URfuVGOlUf7MSBWhEAuls7oTEb9p5hz8wiLb2KjVMM4KQcn/
+K0LK5OQbepqEg+pgVwRaUNelK5Jk/g3819wy0TTIU4F4nT0dR97B9i+8qhovBecW
+WhPjUia2+5I/wMVNLPqltlysWdGccgx9qNpZYKcudmhoQ4i62LdYHUddn/YxpMlk
+0+nDpfp+fj/vH5CarsUVAA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1.pem b/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1.pem
index 80dd141b962..225476631e6 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1.pem
@@ -1,39 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
+2c2DEk+QRiSNYapb5OVU0UA=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1_key.pem
index 9036f2cc089..21d8e0e364a 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1_key.pem
@@ -1,17 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
+tR71ClCavSswLN9AHAzPAw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.pem
index ee6a9a654b7..2d0f4276151 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.pem
@@ -2,27 +2,27 @@
MIIE2TCCA8GgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBjjEYMBYGA1UEAwwPWmVy
b0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMu
MRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJV
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1.pem
index 6bac456140c..c02a05b0ac5 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE3jCCA8agAwIBAgIJAMBQ5e7UppGEMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
-MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
-BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
-ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
-Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AOZ46adTymDJipe110ZhgfQrnlted5r3rjhhp8gjEDjyMWB3lOiTFyRSASeWql4L
-NKgjH78Q3M3dPVhUBUf/DnDpLqfjOS7RthLTg50SJK8lUtDEH6t+KbOxpo/H1UI7
-O3f81ZK30ecgOdMt3LxD4ViXcEW+Q7MT/nLdpw1VePuieyl//nIHaIhj+eVhMEy4
-KM2PPiR9IqeJaWnUx2NQuxyqeyhA58xbGWh2pr7/rAMqJhazbB/tBzXEMDkbPR5x
-4QJS2IMu9ccMl2l47uUi2DGklFnoA6+agtBi+72hVx5QvmptUN+qEkQPAvqHENiD
-rW+Y/saLERfY6FmcJOkXQg0CAwEAAaOCAUQwggFAMB0GA1UdDgQWBBRn91Ayd4RJ
-wIe07HIGto7xuax++DCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63
-WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
-Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
-VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwFAYDVR0RBA0wC4IJbG9j
-YWxob3N0MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wEwYDVR0l
-BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAI/3U6EQCWzBuIc0xSOB
-SdZarvT+Zoht8Hj3PY0iNapaq1zjCVbxnUgPDo2gHK24ss+lO989LBf8krYG4xn8
-79Rm9UfP+K1ug5UmBQyfw2GtQAPR+B3HIl2Dr11m7pnNLv2CpWQqmOV9gsP5NiCT
-m5aXwj1flGVrM4iYEn7AnWxYiKBqOkfvVHTVUlM6UFkSYVxvD5F/esWGo0OS7dWV
-AH37edTB3H3Wg0r5K9QbXCuYW1gS/4gFSiI5h+Kn1aHezQZyRGRoT8EdBMmJ9flX
-M1GvvLoLJBvxX5ia5aILBUa2EtzlLDxpAEKMnprip/QZYbDtrAF14ZwlKGKPpNYB
-XA8=
+MIIE3TCCA8WgAwIBAgIIXF/CDa4u5zMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU1MFoXDTI0MTAyMTIwMjU1MFowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
+A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
+cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+0+nqvbB2bn8iQt4Jp62kg4tr32RLTCKYKAABfRRyt+sQhpafOFy6XcRg2cXYa4lU
+EjqCjbRcoIeYv9PTJg3pYKsl9KdFJIhloWS/OqmBrzzVyOzaucN6EsjJIZw/b8Ky
+b7eq0ibLIW8SlaeEn2/uTN/MXN2MmCu9a3ZHL2pj9QXC/bhnA4nBj5Q7UiHdF3tj
+pWFcEJV7+v87r8XUly16nCqwMgmkdKEsa2ArHPaSrRbrwyekPg47XY2I3wj87BeC
+1AYkh93wJV5bQbjxAydfFgYb6JYAM+I5Yozk4kYji4EY590yQlwSl8h02ddZzpUy
+mUc8TNgYVNvpNUS5kP15FQIDAQABo4IBRDCCAUAwHQYDVR0OBBYEFC5o/2LaU2hx
+RKOxw4RYYyti/YXzMIHDBgNVHSMEgbswgbiAFAL9G+lvTpaPDA6ZYY9FSGsrFDwx
+oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
+ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
+BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
+cm9jLmNvbYIJAL/ehwUYP0SNMAsGA1UdDwQEAwIF4DAUBgNVHREEDTALgglsb2Nh
+bGhvc3QwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUE
+DDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEADfkCHhuKjdAGA+3BhLF1
+5kWi2w3gssdYAW0ZDsFIT/KnUqAaYDpmORG3zClAuUI6Ak8rzYa0Mq5XTHRvwKln
+dvaCksq/hrQUD/uuhxlvHpUt1eXjg9QfsMwsUDIwxFbzes62tu11Nt3u3qPyVd4R
+S3OAqzFgf3FX9FaEnB7WBdL62LjoUdCFv3rygpwVIJcnPD8+TkekrsJn53deDicP
+c12LlLMW35VFCh44qbs7n6hN0Le2V8GPO2fFxZ1ZJn1UuNqQ1XjVXmOK2FW/8f7w
+7PbVD6tvYl2lM2/D+QIAfp6nsaC+ommLsYllz6K9VANMikmwDHF0ZBjH6g8QXqMc
++Q==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10.pem
index 77fbe9f72ef..d1f5c52184c 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NTJaFw0yNDEwMjEyMDI1NTJaMIGIMRIwEAYDVQQDDAkxMjcuMC4wLjEx
DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-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
+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
-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
+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
-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
-nDVS8dCEhfM=
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBACawYllsXX6S
+o1pCGbAFPukkVFySAZl3V87i9ZxYyd94VIhrQRWaXFV07Nig2nC1KrVFOdBIUmXq
+ID+t/z+//+fwaBHBFt3/0Eyffxs0jleZ7mx+e0f7O6NqlcTCfcEFnwSSCqG1eCcT
+hgFW4EPKITpa7vpA8r/UUpiucadDG9YnRUwlFsgYLjzC1p6VC+SzR3Ep6Rp62KN2
+LJEcM+B+xJFjea2fTTOy+e8/4iz6iPeILCAe+xIbILiRD1vYrdMXLrECeJ/2pBEF
+toixEHgnujWB2ksbMTaLMpdLofY+nGqpCUhoAD0nLm9vuavHSEgRQIrhO1l/kcej
+BNVR0NxbzV0=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10_key.pem
index 5dab67020f3..bffbdf405f2 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIs62a78cmmzsCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECI3BTJxof359BIIEyKrPC9Z+Ry0O
-M4YT8UBvMVCvlmC9pTkcqb9QB7e+fdM2+kp4iYZ/1VQyopAR5rG3Mb0e7MT7BAnp
-4gNdoh/MCTMWThONEFp+/syqInEftTopjQcDREqr6YQq18L6S0yy05BsKPXhJRtA
-pCAoIuu0QitKNRTe7Gj39HV7fDs22pXq8MxvAgkLH+U4ARDYUFDz4jv74mKndfR6
-niERFzawjlZMbkMiQFWVyHwqEr3FNduTAdUAuki5oOEFHUia4XQ2KRfpD7vM64tW
-HFjvamFpgtihcLSDBr5c2QpvsdM6m2e9Dzsw4DHtWdV4h/yuZMqbnheEAR1QQir3
-QTKhREx7jrI1a7dBhP36cBDvYMTy0YbX0CustrHA/W5v9CISeQ3eJfOs+GdcVB09
-xXS0ZEMFdZF7evz3EKRvkEmRLCrKJmRZ/+1mwHg6rjK8Sq83Ef4ezlEnjgK1/hnp
-4BmQUiTD5jGHNYX8hiuXYhBUOyB4geidhy1i/jpcbcGJL9Q+KbrYCu5gxeDivkzw
-VOnw+YXsHwl0PUdVrutkPP0Abtv2RLEB4/fhxAgFS8tF1J/Cn50pHvRZKAlFP1HT
-dRI7b32zd7Y/6CkL7wfbTvzfAqS7Ktr/BsqLEY8igigys/mCaE6w98lPZrwbOTug
-M2yJ7Jydzb/0+CEaTcvHQ4Q/gJ/oXID5X469OmqJS207i03vWYLtxtocHy08qr2K
-BZADhQSTdl+Fgq9LJb5RCloQAGTPpaeUDEVqosQoVW6MhfXs+Ua0A653z5fd4Yqt
-y+Zpi5sIhH1KO5o1TFa2QvMTlkKpfSXmB5sq0zrgtOcTu7ZS4JzG9qiLnrg+dFHh
-av4Sb8oZq3qMYykKTf2GSJPSs3PtPNOrVQOQAVTpIp7eD99JXydWQDuKkHsw2ZoN
-k1XX6ucqxn8k+NfQuIPvuc/jVK95YKqLwh7XiG7lN2BIYamMUHY6O+6SclFZ9TX9
-U9EBQtEvo4yKZyy5AjehElTgTV6W+b2ruz7HhEXkzNrgczQvHOrkbtWCCr7RYQ/l
-gQ7ss3f1OG8rgjWHF2Lse0tBNCMynippmz09SSgJXdO7mn/v+KjgaYYEmrh95NGZ
-8dHsnOVaCfN5DtSC2GhiGJ+1WEac84H2S9ivOFj9kGXb7gLGtbs6XOgyXCp6uCMx
-shije8AIshM86CZawNx7AjmY7AqavdhMWhZ5TSng7jOaif+BewIaeBi0x8RbocNk
-Sz9HyBY3b9lvysf1q/DgFRilNB1b2/h4LvUtBG5Ptb2n9ZezN2IEM5uFyhD+RC/s
-+/+OC4o1zyVljrZqNhKc3f4EMI1CJH4MyeBo3YO5KbYI2NveCJcgMtH6HKm0jOCJ
-NFx04stynYdSU1HHxMJgbrn4eWbuDJuPzXQDCk0xP/O0IUeHiw6IU15EZ0DxNOOc
-LXgupZlHCLzq30IAhxZQYHhOeXbcmrZswKI8saOT6PevfcmpEvaHvxFmxsdcAtTU
-fLzdhUm5f2Zl/tWfF5z9BOlTo3BiRieInq5cyywr1m4tiHT7vGH+JaZnOsGII+6r
-Sp1zU65Oi5WZ7yjxY3a1yXGfLYKdHqjGP44tt5At5JhHXDFI4A8UX3FA12lfxj6/
-cSaxa08uYxy19DwjhjAorQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI6xRMxdaYQFUCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECD0YNqG/kLTkBIIEyJpRse/9SBiG
+dGbLwx63Ppvs5cbYLPRR8PTQtmpO3o69CbPaWgTEN0q0yiHfDCpsiA+6Ng8Bz1xh
+TN040U62qKhH/ua3I2C3Io8zThTFg4HXzBYQSKqgtxBGotbTKgl/oy8LwFLqZiAL
+lhfAWIMmcrusAHswE817/QIje3+xEwOJpJmsCRc7T5OqbfJ5KsS65JsUyRwslg4N
+M9Es7FJhVqKcbWzbeZlQ1xoZp8GSvy2YAhmdIISvbLGcX4EbPpkmWv8ejeycNFpu
+u18dZcRNnpP0ebeCrVXVmi3kBCn+fb7F9KVBXJrbvEbUooComHzRavrxUxhqZYjr
+Mu0oA6NNpf9GicG9Mx1YtYYtmCvKJxCWVq/508t7UIpqySLq79k4knY3u1tyl1Jq
+w2GCvQx8t1zKIG6r6RlANmBLh4A4gfNssAg2ZLjTq3rae4etMqR9t07R5w0By/cV
+lBWBE5eOISffFy65sLGKDQMbY1UVbwUZu1XiwJI6sDgUyd2cGetn5BFuJ+MAElZr
+p5y/fOG+8hOBOuUXp0oZZCf2clWl6kfXCuA4h6KsW1cReXezkc09LNFJDjkToWHM
+t1Q8BNOO8ou0+Pq9YKkP8OMwJFZAlscqXmGrMp23jcMZNugngKd7Ivi5jiRKJ1Ly
+WqBSnG6mXEuW0Ln4XirAZFMMjH2KwCosuJ2SpNDlvxx7m0oJIM9x7E2x+YDSKhdO
+K8gSz3hZD+IsWEq/PGYZA3/pUkdqrVhumP3uYMB4+lzrEUH5aa3tpUHoY+tj1yuZ
+sXBqFYtfUY27Fpps63KeDnrRVno20QdySzjucUSAk/vrJ9MRoUVE03bsTWrGOdmf
+eX8grw6WAHFPoqPEDi9LBqUCfbMEL3YFryQYkgwiUofuQWtb4iwf/wsa9uyi9AiG
+UmL/4dD/dAKESq5tgrTcr4C1hqmb9GhKWwtCtqw9KfLvaGaQoLKDFQr7tQgeFkFz
+pSyHnMsMABN9bjq9ngZPkRs2XV1gn+jjzJIsqq/GsMWBBFZN1rj/bDZKwyV+AWQV
+TtIcNRD/0Jdej+u6bBprj8V6xYK4q5PRxPNw38Mm/lr+Dq4fsHCJLJ/NuXGG2b7W
+39ND3eCAFXvDEOHa0q/ZMiH5ZZAEKKLGBME55qrmLWnivnsyoyRGQIX9GPtyR3xP
+9ymp/txylvggHuzTsooJZ3oxYS5D//jZyLG4J8MD3KUVmajBIvIdub5+rOOZrGis
+3dsyK8cgqTPWaASQI4K57dvBqWGs62BRCWR4XezGNj/TjoULVVZkqNgQwcXI78x9
+aQO4P4EGvgIKfXHP6Egw1xlIphm5bOsFLATwfnZc2Ccb8dsvL5E96lxLHJtg4Sop
+qIfZbFHmfny4zOWp363XPFbGPaFjy/myQYP5gr0eoSsZ5YmAI/yH2lsfK7B9DIcx
+shyITi0nNPKM8ly8aAe0QBS5TjKHoKztsvY80Xt3clyzzKkIJ2VasWqfUhiytokX
+INtyK8kaaBuqfUfYTKBSFq7OBLyYD8VMgUmxNIjWNozvvi5RapsaNC9YBiWDZrxJ
+vo1v7HJowN4eR4Fg3Ja/7H2G5FCpb/K37lm7qxTVDaWMEARVokpZzJ+mvebl8Zbu
+cuW5e8NEw+l1SHorqzihxg==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11.pem
index 2e82f8b6377..9f8c84357e2 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE7zCCA9egAwIBAgIIG8AZlL3rEOMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMDMy
-NjExMjI1MVoXDTIzMDYyOTExMjI1MVowgYgxEjAQBgNVBAMMCTEyNy4wLjAuMTEM
-MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
-aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
-CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA4Y+WFMFvNYhm5R6zUY+TT8IoLr5BG63gazZFdJebuS/McruYerluc7IYA6S4
-UoU5260raz/TV/zDigbx6qi481mm07iZ0ZiH/Eq3lVxL9HFw6RwX8SXAelKJl1tG
-de6EEeWzVRHXJ8dUHLLoqh/ljZuA5Aa2zNvd6EyTeE3zsKw2ldnJdo3WoyeVFkbf
-DrzvjUtfRz7RmVGALVaH6AOunCH9T8wPlrYgaRfHDzKawt88sEO56c5K0k4xjD6J
-n6Xs8OOlITDLjjdZoae16GvVcNDC1GzjIx7DyZvVyheX0aJr/GkuM5gBmP5X4+hF
-JYT/VKOpgsYvSE3ZBtj//5b99wIDAQABo4IBUzCCAU8wHQYDVR0OBBYEFJCJwfuC
-jXL3FZ+2pu4hu0kmMABsMIHDBgNVHSMEgbswgbiAFP8rF2HxgFwRsIcAU0C99upS
-zrdYoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
-A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
-BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
-QHplcm9jLmNvbYIJANCpYBrCeVqJMAsGA1UdDwQEAwIF4DAjBgNVHREEHDAahwR/
-AAABhwR/AAACggVob3N0MYIFaG9zdDIwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVy
-QHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOC
-AQEAVQS8doIS59J3wWIgLAixohcghU9PtN8eVE8AirlyyeEaLfkJBq5UZaox/Na8
-H3fTumkuwxOGS3L6pV48A7JWZJYLrdqcd3v/4rywTgSBuzcr5aGeHKuxPM6UWSVe
-5bV7iUwMC+CjRT2XRwIPQFxKbgAf3tMWylxXSuDqVZFXe6kqJlN4tmq7yudLABeq
-G2IR9Wy4GP4Ki4UG0cu0THZnqrB7jeR8Or2kNCEihpE8bzXE2RPUOgm/POevo1h5
-L9xOc0De9YOqgw6Lhalp6n3M0zQzzTi6OckmgqmbDS2yl1peIL3IBVqhGwnEe9Zt
-6/lX1mC+wmN49m+LhRvALuNhoQ==
+MIIE8DCCA9igAwIBAgIJAN9yWOwaa559MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NTJaFw0yNDEwMjEyMDI1NTJaMIGIMRIwEAYDVQQDDAkxMjcuMC4wLjEx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAPTbuatApcb0+VqUdDypjTqF4Eoxot/OKmCC5ewP0Hg+TnbEuQf36btEP2DE
+dBucMgOeD+u39n6cfbYx/Cbz2FTG4Sz9DuoVGtn9o4FpZDEEWq1YIwl8SirWunKw
+1nnpK2mB6HdjI7MTjpB/shJ7qfCjbhkgMGOjzSeT63VrjSCDEmgwymN6OQF2mUjE
+oDJmmEtyPpQVd7HtvPDrd2XyFYXcXHNfO31ii1fXRJR/Yo3uWxWtkilTrBj7+R49
+IPT5g7vF1S+BtnNYB/ciWm1hRvMbhBBwjIwtN1VSiLyuRP6jg83Pd529j8XY41N3
+n5L+XtGYR9dPDMFxLB2E2lOmZF0CAwEAAaOCAVMwggFPMB0GA1UdDgQWBBTXXnkH
+ZZ9Y8golGVkPgCpJ+eHYwzCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhr
+KxQ8MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
+DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
+DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
+b0B6ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwIwYDVR0RBBwwGocE
+fwAAAYcEfwAAAoIFaG9zdDGCBWhvc3QyMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
+ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQAD
+ggEBAKXO5CCXKlb9/nLaL/q42P27EdMqq0m9pnMDYPeFeUWs24/LRyMTCjwib7VI
+IFI1fYmzpu6YUNf3hcrAyqLd/9UTPOh7v246T3dyyG7grLLvpceMOlnntmUOvKRf
+q3f6/uLUZoFV7E2lKBDfTmSlx4YAOw/qFzVbEcJtXXGOOMWM7Z4nQfY6Utn973hU
+wOh7k38qt5El4E7mGztJDZweOtPAF3/lCMsYwgDVetsR3l3MCBwU3Kj4q9gBwyoU
+KsYRJkt2i8CbjSF5UDiFezXvIrgC715kzAqvsvLePkhbAV/fhRnSWNUe/SwM8S80
+UkWErlegn01vn6z8oORY3JcWnwY=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11_key.pem
index ce446c943d2..c074e83d47e 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIwmk1XNQVAbwCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCtlk9YOurHDBIIEyJ/UoHJzm8bd
-2ACz6h9/w8uIRfdf8IXwt7tj98kL2BfHThONSQk6RZoNZ2z1sXHZPSRT0AWOo/GC
-WiT5Eet6LR2vDSzrnxhHK888U2iAh4PUGvma78v7+3uRQ9PBaKj1DUHAtpLs2YlV
-OKsww+UK5XQcwK7OyL2GlACzvgRhjRBxprSbcJhXa6XKMjsSnjipcvaRYx9TUenL
-/2vsgVZO3aKf1we6YoYDPBE4k+eg8dg3ZvKqNv5T/xnrk8SrA04uHyjlE7pdm/b+
-pmA0zFn/1xF0nKvnDJk4qSiaThGLpwquXcSnVoFuHbBiwt0EXNwcaR35j6PiJcJK
-Gjprr6Wvc7yXe6Gda9jr4tE+E39TV5DSvLZW64VxCd3+xgfklRcycRpygOVPa10h
-a+5XljzP7amv4bRnHomnkkROLFtq2LD/+t9/bzgg0EoHI9a4XtaT8ea3EuBvomzt
-nTklF8v8xGwBPLSHzqTzxtFI+GKsgnM4iZ/Eko246YhjmpLyEAS5pz9b+LeQVdoQ
-mp+FZXwZBij16MWHoZda0sHVo+3rlQymKp8iFvxywQ+RAoj1h9+wvJpEBqs3W3ao
-zLuaGqnBH5yHBQU56InwBpuIiTfrOGV1//sB1MtSjayoZacEJRnw2J2ELrEHfIBT
-EFpDIqwSONStxobHJEx+bvvXUrKKLDlC4G/c5+5aQfIkEeny5dOKvwTrpRKVJktX
-ct3fD41LSe99Y4FlBYcb3mlGnyCV3UX44PAe2QcWP2Mtsd2bkJxbluKmTXcBnb/u
-tRO8uPooEmWyYRCC9uFgmwTV+Gh2MT5xQQfSha5bCkDxzQLyUeKbDwHRGsAlqZIG
-U6+fNNIoJ0HHU/kRbDDwypdp16qqDQ4JF8iIQE5QDvlrT4RrFIXWrdEbIrqCzpFo
-KkSmVZtQEkb1YneVNQ2GOIFttClOs1JxjiIJqYKJeuSqczpgzU7QMudEkAL4OhCX
-jBm2l+pZ89qfsVhUw42CSX+w0rirF4rKUSq6ZPfNLrLFFMpzb42Jxx6jouW6QPGA
-z9kNn104sEqMkHRcJzZecUjeIyqcXm97o6ahNbALVxXcPZ+4ZibnQPWMjnZvjug3
-P8Q/PMYzS7LRSU7dx4Oef66cCzcogdDySpaRmn7WARCMBJ1WT4VFMxWFevyQP7JB
-yIObkoj9U06FHk1pFedpggJxS1vSao/VXCqWnMcYEMgq3/6XFbV3djRT2jJcGa4X
-belg/9AE6gj9MPGki7fx3e/NAAc9LwHCYZtTvzjOtJXR9sGP3w5LOh/LnKYUiuTe
-2JCs8W8R14ZjPmwIFj1TsDF6mnucofR0sB9leh+FHt9WZyDMv9PSAE/e5u4KIbFw
-BDnGdKfwSdZbz55OFSQ/zhdEcz+fIjcS96wb9xqtuObj8UB8sbDQgZy0NHy/0DEK
-L2g6TRNUHZtYcXXw5k8GK36ubh5Rev7C64QzV93GBnsbwXD/nnGIISs0MRV3Wmd3
-3+vLR/9IQQdta088SgYrdrJT2q3lSBJRyns/gpqQ87syeTghiMK0ywp6GYsowjKI
-zVMiuTzo65OwhmplzEu9Rxx9qF9m6z9TarMZNLOVraP3Jl/t7JzD203CdrGcn88x
-mVEakqz43AToIthikKSxyA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI2F4b2Nab6cACAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOeUwJF0XM5EBIIEyBM+trAqE3c4
+q7vqwQ1qaqFRUzERqNcZn5tzfhv/aEjrqSVRAI8+SMdKlOXoxm4rKYp7olfdWzxZ
+iiz133L7qweXK536d3tPQ+4I8KrvhIN7OFdrf14nPWBVmoVhsXpOMAbNZRj1Z9L4
+rpEOKmvM1eKC36vJPN3z4DYxhEynLRyGjW93TbCSmDCFCwpfBvQW5VIxkJkZC3zn
+IuACW0wunZG6nUjUBuU8PlPCZfQKUxu75Wqx0X9pI4hOc83hjELBKWEZHhEM7Ko3
+2ZEksLrH6H6mc/42H2NCYz0XRkx6zNk0bhJO5vUeIJdCej6FZjk0YsncxheYtaUA
+QNp+GOisWOgsJLjwu538ppZB5gSG9+LfATdkrcA4o0lYHfnGQJcKtE0cX0HTmUXJ
+LGgAx7OCtjeNZcpZhLW0WF/NDZF5lNxc4RbA5W9n92qip6B1zQgfo94WG4qcCC/Y
+Q0ntWISVKJQ7o1UuIfXTNdc3GJ8USFbo3L+2MPeAf61pGj51BzsJY/YuYQOCJVRz
+5yTgStKHoEdoDjhusv/IoBKcEWvyfpBUv19CcQLy6j2CHhiJMUj8de3wRWI0uVkY
+jt7nrfvM/iNC3lWPQ/WoMpFEofZ3h78ZtWwerXWQw1Ej0wyb8G4Xt6jzbPxnHrOs
+PLEHxJ6N2c3mFmOvvIuuYvPIMaY2VpdDI3vDhm9YA0qiiw8ymII89noclOUE3rsW
+S9MWZA/t5n6vba3OfOGT4gpvjh7N+51UHWDZpf7cmQXFLnfefCcSu+Y8mPtGdWVK
+QDrzblQxzRS772TeoPia0dRnbrQxOZ2vI/+h5Z1Z5tbNtYcnVU7SLr4R+wNusr1g
+E9g/62aOxUS4AR0cODYJS49t4lDZg/JHYD6XGGCOv+A74IPSA5CEuZnZrDC5t+ab
+Z4awMc/IGg15njyB00E6SdVaQFcHfOjaov/M3S778vAOD0wruPgmTR8XBGpj9QMU
+GhT5FVgv80anYb+FKB6KG29UWdBjVd+HhD6Gd//hZV8s+HVPLqsk2YVzYc86eSVI
+KAETrFefuEGJqMocm4Ex9ZPRqT1YdgGUcY3CchAIxWrVGGrmMhnZcfWdqSrTRrZb
+kRImlhKsrRkmbD4otONVp+ZTbA1cccH+NEmiqxRUUk3PqjvLm5252nvqShkTyPql
+ygJ1wEd3HHM+KY0TTjqzGz95M1JtzqkG6R8rx4UDvUwlWL7SJioAtS/lE3//AaEB
+WZa8eYIpgjZsR8Fgf5YBchVVnHkR6gOraKbGJlbvd4LfnAxa3qrWi3HW2DkaN4Ho
+vOIV1yacP13TSGzDYD2zM8FKb+C2GHsQgdmBjoDntNvlU7R21RbnfAKA6qFesJTS
+VV9JIT8GgmPEohRDkIk9aGzy0b2JgI2Z76Uum4njFRpHdx0rEuz7Gx0WfSCZaILl
+IZv28ylW/UjZsuUzAAHdYQg3dqaYtYxiCmL42c7Fef2D/1RUs2H8sY7qDow3URfr
+7SUtVTMZgIq+gAuG5qJ35rTcQqlIX5yS//3hXg0maxIyfeEqhzXIsAapfVNa2FXp
+zmZD28DqMg46M8QGDOl4jP86bnzDmyy2CmG06Uubt1FejLWzMhgnzzUSsAfZL2Qn
+dutq4zeBM6zYzf+LbhC6kQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1_key.pem
index 16d74208270..0798551ef53 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQITNVXV1KWxlkCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMf5gQVMDyYGBIIEyIw98OGUREPX
-hL/DklBAQjVsvQZqQvgQBVvdL+cqQikWISpPUODVdrGdQbqdFO9ALH1NSELLiVdR
-OB94bbRrzqFpsm5ZXAHwsphAl6epueHHVRGmq7PQh6LfxuPm2V7e2/0X6bN+2N+t
-wFrOxykPFOYwuelzfQk/Bz7abwsTN2zo6+X8EiVOYKWDSAr95ierbBGe7Q/Sredt
-ahr/CQv0P0FaVa6HO34eYLX6UtbrOYy8ydluZ+OHqIi5fpFPzzjyAdQM76YNtWyY
-3hK30TJenLu1DE0BkS7FcH94avR3wg4NH4jkSxCjQ12fWDritqOfldWcVbAgb0xy
-gDMqeeGpcwTmzF9naW/ha631guMs0hWzIlBEiNakTUyE8L3Qy/K1x469Ex7agbUT
-L6x9ZS1L1ymmi1tUFHyGAYJJVOL3SO/tsfmq6D9Spe8MmjThiUJEWFMI4Q+DGPDW
-hKOIZiPEQd1A2JaW9myhAktEfKSLoCtDMnKsumUqHujOuS9WQzSnw0+Nw+o9wHZf
-JY4oF2KhhdAFIquyODz3A0PTsr21tGLdpePumDU0SACrycG4vawvGvJWUcVBQgax
-io9mvWF9q0DHj9QTJgjrvP/4VcXsUAR6w5eeD44cxLm3AF6OsreX1EIPJoQzCxn3
-V5CaTbAhXvLynfAVNKbHl+AuycSEzMoB7G9rLh2VjIhr05wMuAb2lQIhWWttRs99
-YfgJOi7XAWabrziSHsOaXzoSBhR/5WTpjd6QKq6qe8EjAylaIVVyzqV9Pg8ZoSIn
-O0Yk7JoTpsDuUV4e3CSk3utCBMUzKSRdMJZW5PZctz7xitAM5Yl7XoaXXPtXFzzu
-FW2FaylH42mgbzn7/wBLu60N6v5NmaQebGR/NjSVopMlCFxqi0O4aG8TZfm6VQs0
-ZN7u0qTcJldPLysDyatdYJXIfx8heb9K3v1gEMlaTCNifgVAd9AjI3dGQt+0fF/9
-jVZetq0qoBK4BhFimETgNlvuYQqF/iz56VJrbGLWkYM9noLxY6euTMPAPr8ejpoA
-+9GEl2yvamgULm/R+3Fz1qG229Z81ZKgrpkjPWzGHctEZNGoLCLEfsayzg1a0VSn
-JRM70Ek48OrSDzprPwpUCF1aW2WLBF/EjC2I0BOwAG84gAzb2JTSnwqmbbgHU0lk
-e96esV2dLAIgRvqPNHMuzGsvwP1T+gnNvFCc6ygF81bVrWPKRdRTh9Za5tuqdEVi
-19capw3532/djlhCeCfULfAVP2KEOnkvFzeR4Il0jnS9WqG4aT6AFlwHhqqYBgkF
-cjOPjzn+e4Mg+EIKGTzfRHn3NVTcczvScJnNpVz1dZBRB261zrrPXJreLQrNE0wv
-+/90HyiQleBeUvTBZt4ZpSL+57adfKWWF69FddLUChPrvySpDHpnZN5M1hQ/7mDN
-pz53q2tj6rhBQ9gZ5SNlkkgytUCRa6yOMvRFv0LVuEoVcOT0J5QWBH/zegEMv0NF
-79JV7XXCKTCQnX+m+kpSI63t21w+1ix4yd5AubQCzR0a4sBgEIeFM7QC7zQl0k+V
-uGCT0HAMpQ/Wr4EZ4gKxB4SFcqLUYdNPshJGqlcPodZzNbKi3K/2ehbTNFNv68by
-GsqEkZdH4/wsSZLyQRNkfQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIwxyMH9gviJECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECK3/cZ/KDamQBIIEyPMkLOtBUx3j
+3rQIppE8WQub3UlyOIimLuxTURmeW/88ypfOgQnsao1FExH6DdjV777Y61vw4FSm
+EXYYlAx2DvyQO+n9JfJmnmyvvpFArEXITkqeAOqR4O0tVQRpXMcsyIahTe2kDm7R
+3LuQgpgn0WJVQLMk6fAkdrtySh+AtZMHuR1FCzStbl8UThqL22L1CsBOek0iE0BX
+Vp3OuV/WAyKNUfZaVHldv0gE/R5HRA04mCM0BwM5bHhgSBpAWHn09fp5XKLz9Rj3
+TbGM6WLzUjo4OtckIZCeLx8MEiw5jhINVE7oa/SBH5CGDi6J0IYDYx7/NH2zF9d8
+57z/TlzyACWb2pNV1dLq+G3SyM0YraFrqrpBtmzL5iGXiaNvSLQuCUGV8reMxy00
+Shjo2XhAfBj3tKrAz8CUcn7io7plVpCyViKsqXgpoKZN6K0+xUteV2AJrVlF85W2
+Ksxo80zAUecmjjIkjR8HoA+Ak7iy98TeU8oSAA57zQ00/Q3P//pIuP6Yd+OGJmc9
+yF8T0V/xBgnXQ7xumkTHYRWUt+E30f/Y8Qf8d3wx7H51tHTL0/MkPrNzyg1706zO
+JG9qzacGC3WAwMR6j3Yk1B9nWLi1F74eXmtbz9O2YDCdjyG0tWhiXi2jnrLyBeHa
+QQU4G8qTG2O4vPf5Xk+61s7eeGqrUrdiQgwriq21Y1Lkogwy3zNcIbaxE/JGSIcd
+sgkOKhLn6FjjMG1gfeQWgvUcdaKl4XiZN8+EI2TFXIhMiqwPKU78cJa5G30euhZ0
+kHA7ezwQIaQ+YGMt3W30FNsJXafrmzduGuQGzEKuzC/iH0c6ddJEsuSU5ipRlWhR
+pZ37GellID8w9n1pgnPn72IyqWtm/xgJo9DU1gC5dMm1XkQM6pLQMRbnORDq0hP8
+pCRFwZlgk6LNWMkV3y8pndFSdni2imGamFdGcqayGDYWj0+XkiGwO5JCCt69oFFc
+qmZKK1Cc2BYVl8nF4W7FC0K5kcVZBA9cpcHXKMayI9xVTkmC96ErO5YiH5x7JYTu
+AiJLM6+UH/nOE/sur+hZc4pBmiNnQ/Bi/5vvnQ0k7HJ25ncshzUbGVn9zmC8BF5s
+vEVkhbsQZH6HTEoM38fi2sM5Hx8T8lC72pZnlC5O/gPRBE5pJBnuec4Inh+5iIR9
+1tf+/074Z0B8v+IJarU4Q8WwN8IVk/4dPrRsROmYih84GFA1SPaVu7U6syrXxK6R
+oRiDiDy+gD3XgF1Ts74hLzq1ippzVRGkHL2ArV2sFHeZrtNlOU1WI/VFEwKcdo0H
+6dqNeH4wI6vOZefRYf9/9vvZv/9w8a5TshjbyEGgSya1mPkVsiP5/79E2AaYas3W
+Vcq2w0EkZZneqJLt6FK9h4xxdI42GJuSMt6SIJQ6qFp0gWrV+WCmU5hC4S1346GK
+sXC2nIAuFjiPvbs5dVo0PUp6zf1XEMKo51d0Czyd8c7ZIjh+SFAugzJkqp/h4zph
+uxPjOqkJ3wlGUkxUYIz0UgZFBqxiJJNEvaR3N7ipTYVUyGMkFGRRzZa++tP1deKy
+jCH9Z+u+9o62yZOCbfEKbb6GKayXinbiV7tF3fC6sP3JOqcMGWbQ66ukO64UpwFK
+rX1YnU2QLvPo8zZPm9o2dw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2.pem
index c0439353cce..25dc126d0a4 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE3zCCA8egAwIBAgIICWFfaq0Q/zswDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+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
-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
+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
-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
+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
-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
+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
-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
-Wxcx
+JQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQDWRG8LYL3mNmfOC5y2
+trb99nuG70mfyd3rPB+BgD1cYoJa1Rferso3mcjbZ7PPw3KfjC+Ouf5NFiV4xuII
+QKYh0IcLp+EnFyia1jd5xmRwS+K1nErtXoRNI9YUBQgf2HQ0XMuSvPZey61shkAI
+13vnqMqAhFR+FZUvJ/RrGLmeNmVWSz8D0h7p1ZD+CYtwsASOijovybgfdWLR+JLX
+kis/H7ytpXqVCo7POetdgCiDhBUx+bFwWx2rLSHqUlzpmebSW+kiW+P2rhFPeZbu
+pGM6au04iJFKpvmYAUAzgAJ7ZoHdP9KPs7uX1I+JSZXq985a+gEsdXxum2SyvRf+
+9juO
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2_key.pem
index e58b27b1d3f..51515b8455f 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI9wTT/AxE0wMCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECClXBshhDpAVBIIEyLdSeL1+9Z4R
-3U257Gy2RZq86Itccv8M1ZlNXDSzntvWVJoCb41zS7qOGdv4sv5vktEtBpJ0j7x2
-1NmTMhIzVvGIRJ1pjU2Z6Ej8annYyajxUSFoAUrj0WIt3qpHGN3PkAPYqdddloRe
-DHDAVZrtNLiGn4/q5cZ6gmJyfi8kLtXkIrzYePhWKGskbr804HWlljDJmDMkStqY
-c62rA6lKWRPIiWwQxQAFFjPQaQCg9ylM7ZTqPAPSm/F/Lk30nRBPs6usrPbrQNk9
-cG5denLAdvFLVnlFfoK29+iONpJ7T9tHpqrtevuCfDBLITPxQIC90VzqfFH7ntCO
-THWRQRP2nHsgpRK3BWUIWDoDUpmuOpSXcXotx5romXuHZ0fwPEdqujwOcEmNGf/p
-l5QJ3KW20KoBynoXwE790QtHsdqJVB2JCMANJV948XNT0wUeGaUGiD1QumjNBESL
-3N0ie3aJIs7QD+WSHkGOc+wInGbP1rU5QWYkBqzWGmEMfahbJDTgRHyLvo0Q8KjP
-xMdy5xOrkpFJYnN0fDjSjLsITmmQGtbWByv6xa2mZfaLbkAP6x/jrJv0wi6U/drS
-8I8OqQKB2yzoi3pryB5FSkt3oslvjRRCxZhp/jtrXwPupJeeEy0WVQ+R+GbrtDf9
-0DpsptbnIAr9ttzffJBJvKod7O/qapfwJlxRDiTIf0NW9IfDCzd9YLhkwKt11xsc
-KkBuvp3g5+VK7WT9AqpbJooN1QaVP1ipqqqI44fVCO8EjzZO8CPoqZqkBW4O1rEt
-lu7Vp5fFlYIO/MW/y9n072QPHkxWhMw6esfouc3iSIA2OVcIq1OT6nBgZc4ioCiE
-jzs528VEqdGEu1/N+QJ2rnEoQmuP5oC2Ys4bUKcn+UgImfA5Gr5yvZXuJNsJkMkn
-AnYmjLz5P9xHDAgyJYCPg/Z0SyioBHZtPyBYMl+d6ziucEO7rDOF3IWfXkGx3VBZ
-CgPPUKk25lc4qcXofpfFCr5OZeIbyisSGtNaeq6yhRHl/VicVDrwzjayiMykrHOD
-ErIxzG+Tr/dvz/d62IJ9q/v6j+BZmUCSxF3/1u+YHfNFlyxMFrprQ2XzsvzVfCzo
-mcXFEdaLeowcJK5Lwe6JU+TzSzSq8V1DYxFlOOqWLu0xnYYLoKLMMpD4WyaR4Q4T
-jFpcMb1ssb929GVqxbkTK/cgDtnwyA1rAXRWuM/V7P/OvioOYQYUjTIv7U+Iu0m8
-7w2cKUJbnJ4zXPm8fabdx7rvRhhXFQPI80C/RtmBdd2bYWCW6uctB5xJxjRaA6kE
-kNFK63GBmxgm8oyTml+J7K4YwqYWV8351ufBCegIUYZXqYulx1M3T2DPpNENl6Wv
-7icaqnba2yaIOMmyjuvA0VS3agvjfEqCYbPUYEsMItsFLp+MxcHapyJRBsMSS+rH
-NCJ34X0UTmXMZiFU4XfpBrajEOMFKNgPm6dtc6vpWFAaQnswdaBH7dkB19zRXqF5
-m/g+LHO9XTzukRpBMkiZNVgGUIhs3C9lkzF4NLey3AcYgAuVKmeQOeJ9ILOLUDlg
-aEhXuo1r83K7nxto0hypkZFoJcvNomxXIq8GQg+EoeyK60EkDwBF8N3Zm/SnLLlS
-TQejSUX67lOxvlftS8L+GA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIfQu3d0VTJigCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECElCQD83DmULBIIEyCBRHq8U3Uym
+LbucIS/ZCTVNAiowba3tIOGbfab1NG3l2hv2iqckoYCPLelPIQ4QTHUZXkBWVAsY
+uZxGRkFZ/yhRJZqRYHZSt5XJy8bsObGnif54Hic/if5jcQdOdp+IioZxht+R0+Dz
+sQN7Kro0u/qwQSsVAQkUWIAmDIMd0s/RE359H+WwOqS+Losq6uXb5IosiJMmX7E/
+Rhzs+ufZ/WGwChatZ2EmthC77U8TOXKHt4hU880GkUmrsLPGY0E5ZkiTCi2yEM6v
+v6Q4iOpa0SLomePn8248RlAdA81/LYIQJJ8CGXL0u/VWEA82CDbcG3LY994TfO9+
+Pb/0MQJmRejSkaWeTbfqZqPFx/WPVkNgbbGqkPif/naTm+ZQWCZjUG6Fa2gcCf8+
+WKZGRokDdSgJWb0gt7Bj+UO9+Wo0aVPKxCOL80+ocH004Y/lXi+z/qJY1/pOkhob
+sV8HHm6w2ek8Pg8bmIfiiSzJw4U8f4QIskD4NpAyKznoE1unkhH2zK3QCrbw1HRW
+yWjeOSabox2m4VqUXSE8n1ODrImuBHEHq+2aiT3Wbd0CCHFI2HqWJ3+xJ/I8kAA5
+Ef61vQWGdHvcgHYuV+bLq92+pbpY6lYJDKIETdKOXqQcA3OjfgOzWFJXAPOJlCxR
+OmVqxFtXzLNNMku9XlT5LphgHz9HW0sDEpmqb4ycsYYa97VAhNdvRbwOHsjnlkIH
+CmOw6mfwcmfzvJdsu/40M1h9GT3iJdEwYV679WLNFphyM8n1XEhWtUPxqr7iTcZ9
+Nh3z69AnSeqfeNRKxRa0LH2n5FJCcXLt530qimcPCpEJYs8tnb7ROxJUXxCsJOZy
+l5rPxeJoVBLaow7O5fpq+mZ+SQBwZTsUcm6x7sDWf4Or/CuY+U59GpfhA+MiMHdt
+KJvEk1dt5DlcUR+ed4Zs8oLm21m9ci8EWZfQgPxhETBBJqYRlzCBf6bEEcESZs/8
+aCRzKyEJbrQX4DcLQvADO2hD4vLWaw8hKyhwhk9b9qsRM2gOdrQ4SnH02QBRodhw
+iFM2tDs+7/J8tHD7/ejWNpELg46UI99v0RVSei694FafAcMMUk8EpwXU5aX/pz6y
+uHVCYf+qM8SR/+kfgDfZhzGauJAdzDnFwRYLLPsXkh12fRB9SfPG1gXYaUsnamQi
+DVtcdtoYRYPcVjOb6KDezF7rm8Drloqj3AHZGJ7kjfYJYX/pubQHkHce851IKnCE
+vYemMhRYIZ/DlHpyDTQfr3p/DtG3TCZNNK192hG6/MW+J7rXVD+5EKYxRHMFSWDp
+psTMo2M527ZqzDSchBSouG1QTpJVqZvDMo2t49FaNSrNaSSKdAXe6hwhlTn2f54b
+XcuZr8TAsMxZx3KwI4eb+vxNJ8w8rCXsjLiNI28tHAMBoL7BQCAP0YUjE9lRbV02
+mCWVjnZfefbFoadLs06theKsjDhgTsVR8bgfpgtjNSTtWY0ChrMoyoGFqJCkJjkd
+HNz9WhkAj3DJBf2B5PykDfL440i4mRYKH4QdUv5DjWJoQpc+WytXgd9jd6BRK67g
+Q12mryicaHIoWjxJH9ycxv3FXNr9KnnfWEmUJM+GWTtRJBrE5t/JpAbNc/BM8KnC
+hJT5/+UF5SrEohqbGzVoyA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3.pem
index 3f7ba8cf6ef..8acdb5b42e4 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NTFaFw0yNDEwMjEyMDI1NTFaMIGIMRIwEAYDVQQDDAlsb2NhbGhvc3Qx
DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3_key.pem
index 75033a4f6c5..69f4045847b 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIoanqtQQatSACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPWdSuQXcMSGBIIEyLzaDh61V9I9
-JlreMQO3UgIp/l7+i0N5qhU6DfPZvZ1K4ujKFzUUAjyfIS1AaUWT/4lAMnAuUlro
-j0VTrE+kfFkZ26N+8L3x25KuYb3jEfr0r4sX2LQK+7IA8aiPeiQTk/1tVR77R6Cl
-LwcER28fnHIO+FZhYjq9+jgiLyuxOkkv3RGZHcLDlpiPG7Dd+bxnGHcIM/sjzlWN
-2vzH8fNfv5s9GgFoY6jSZdQ13hyUe3J9XOjYRoBU3W3ght9WuWr2J/jYAuobePeS
-A4wkkceOD52k5twnvNFqFFN+WMQKsWpDdd7hh+VrUDSrvKYj+RVa2D9XHxPvk3bY
-Ln3tYc4a/YcI6vFbjCcTerayTDYHzyqY4XB3YeANSjiYtjr7qAdw7gR+KIXE/GUl
-5O0eEFuxdsmB/0df2o4eykK5SaIQkESY7v/oJF719TwtN3H0Aiq/OnpFklgW+vJI
-uIdSutjcBJ8/gb6y2Hpj+Q7U81G9Ckr7P5oEy0LbkNcK19tpzvOidts/IBRfZjrj
-6QJo3OP/S5mYq20w9J9gHBHO0m8Z0k1Kv9RBDHvPJKU/4/6sN4OE8a3Dw+CUAjP9
-tWMA2EdIJ+QTqmYpf2JjiN2xpzpNR8vOWrvx/bcO8rI4NPD6MC8B/Hozrc58MSv6
-bzQRN71mrV/qmIQ0MTr2CMifNsbTJ/yRTPh4iacfZlcdO8rrqw8GFCXO+GW1P2ho
-Y0pUpZpWEan9ulZvMX2Qf4OlizVdSXZL+N7ESSstGnoJmi0SAFv3JlC9Tn3Psgp8
-aAiAjKcrpR1Ziyp1aN5OMR6EeQDiiRx7TDvI+SHTNOf4YkGVkRRqR9GdiXu9CMrB
-MNC28pO+8YWN1LD89EzNidzCLReeT1dLi2DL27ni9CygQQLpFZenfeJLrRiKgUbG
-xnFtOvYkBAZ4AQYH48bugNVJGwlkkcSbO3bYaDV12rCdvI1H6MQrcohVtXoEv5M7
-UhhB6rSUaa56euX5vZneNWC4uwACWQKfiavjmTiK4UGeKFonkt3ur/SjJRcmWJ7d
-EpYPt+sbAtg+BXC0GXOCx5dtEPaQvkreJEAxO3z3L9azQCBpa8Ve7xe093Eu9bKZ
-m3vFm3ok638inlyjP4bN1fLRSO+9oj9S1FCDK2g5St3piAMD2hIxnxm2urnmzp5f
-eeQkJdBGqMwj2CXWyruRtV90fVkHw7/QSZe0JenVhCC+jqqqHAknnmq+sZLn6fB9
-sBb2Oxl1DQwXIYQP4Tw6ntmKRorrbX7ueevyqyevr2ZN3KSyHXvE5FGAxiR+YVMK
-5dEAx4v0LOcnWBchixFeUB9II/y6yuj5u9xTRbi5W8n8nH2nzbR4d4O1JRWXOn/V
-lXSpL9HNclZSxvbzoW2D8vlf6K9nTL3JRnKPAPIcYPioky2JkjpIUbNLOjpPg8i6
-hl00bpa4kjrKw4Snl9H9/iXu/S3I17QDI2BFzWN71b+F0wHAiQ8kmER7vcGgTvM7
-jQIzTX4xOC+MO95fuDLu/LfrEZLgYMOY9QFxReilg6xKBhx3V/BSc6jsG/RNYSXb
-O9la2tjuDco2zyGktcSyL9FBFiiphSeJkGuIKW55sR2p7EemwjACap+hk6wK+tyG
-3hP6AqdrJiQJAgM/R5ZeeQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIe+efLvwITtoCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLEmQwJL2KeLBIIEyF8BFJ58fYDL
+geoaW2jRwGt+/JB7L1Tq7zH1rnkzCZRPSNqTikmLWn2HFnnTTzffNYCszksL0/Si
+T8A6Jbd/i3WWjt1peDJsLwZOlSMcUzpyuD3Nah7DgumDb+gvrttgXOvnwamXeupe
+jG2bAHCUQ6d/FMdqEla/BIqpSO7t5xhjP1KnY5gkl0+y9qXlecFlkm5132ryak6N
+eXw/8bUsilHduQ1IQ7lr06GI1O3vBlGMxjUTmCQ+9IR35qj/T7cV2TBnbHx73ESD
+ior9QAShFFRoM4dHc6oec7EwEsxAY4IF2YzhfqEXLoOgMxkkzrMuX3xr+wDJ1E8O
+zxnF33ahr/FodKUirXRoazsjrGzvAV4njt/EXB2Fg3cVB7o9Incn5QkIpOjj0NCf
+X2NysoN9xH0yXatv5/VkRgU0nupSz/YBz68qE0P/K6b3QAq71OigQwdUcqUWDN0g
+81SIUfGY2Tzbo4NvsepY3oYmi4cCxqXbl5/s3AGO5pAalVn9KYppIZtcpp1R/hks
+6c6IiNDnDpp6fg3kzF7PY9tI1+MhHWsEF2dzt9qHRTjKpiyMjq9RXsPl8/drRit8
+KA0IxHxPTBc8mZL5th1mWauwETzWuvz6aAFaWfeQU3HNXm92eeDAdZKRwjDUbTpe
+i7DY6ZsRE5WK0clO97iKyMpMtU3Om5zvKUk5dy1w9R1z3tqSlkbuEPtBzXOFnqzn
+A3Vs5v23eX3yuGWhpNKOe0py0med8mMJq8VpoFzuPqShrLsuaRJpBhC2vgaFdhdT
+8OJ3O62Gvn9WlSvKWcCnS/x7ZZXDVgs+SEnd282WbT+rqnqezcJa1z9qzqmpXGD1
+KIbas4ZXxeoTfi2Ter9/mSR0Q/ItwaCQT0/PzfLJTdTZyK3pk4GXN2GtovGc7OKA
+f0ti/1O6hW64TwqhsOkRteWDfSAbAxkh4CwYy8KXrgmkzPn8FWiwCa+HkudhkSmK
+7ILp7678UjvP2gjaX7FdcGxZDgwk+6Y4gVpxHb9137Qbw30GJHBQDhE/y2OiCvUO
+pJljOE9L1+jJ0P3n5Xgxs4XFg2LLzBul7Ia7KZ1T9qtR1eKvN+MuuxFf0CORbxZ0
+hXqFF62qBx1bxwrFu6pvKvM/4XqhYfTDWdq/LnNN6luia7L9AnylErvzgS8MoAqV
+H8SPhxIoIbg6PnWurl9ShVVBJmyByB9PssiUNmzI67vAc3eRMPNdLM5htCq6WGIZ
+1/LVWoOunTOJLELAc79TBiYh79Y4hSwvfErquB1yrGYGkl0O345vcnTdnrPaknGC
+oIBGHKr8PRsE0Q+7UGdRvm5oqOHI0BvtnyHmdxCl/lhNoAPc5Za5u7ELr/OBPcCx
+s4y5Lo4JVbAn/5eR8cmAF8DmcqN4tO8YgR5HI3vNYkbdnFVhTGW3LijymAUFMkR9
+4BidzMxJ+DLHgqT9ccAMVIDd35ZqkyIdYAVuooT6kujmQCLO81Aw0ROCnF9JgCtz
+xgdkAbprPC0moFEA2Ngp9YwGljcq0ERno0zILRwEZOqSZ6Tk4i3IAQyx9LP29Uyd
+RbjEsqljFZREA8uH8r/0wwWYM612ygC56UbhBHZQBJkAxx/YRbxEZl5v9uRfAQMN
+o6BlVXgVUxt3IEEnAsmIhA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4.pem
index b90fbe86a36..b7004a8c6fd 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4_key.pem
index 0c6a5782d68..b6a675689b6 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyMqOfjCiPhMCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLXOdKpYUEo8BIIEyFmPYriuizG1
-+l+U9qbSOTHDpuCOIiXDEPy11bInbSg6kAWT8IC0KWv/D69D2nnJSishu1hnqond
-0Y3Aw9amn8RS9CWBBaN9tB9Cvsb5FP+q2myTGECI8K05wUPZiYzBbo3/SgePI0Sr
-KJjlyp+GphS67bw8FgtzcdD1JRttRJOYXYgirfn+HmQ5bZ1QGrUWwZyAzYCPxP4D
-1c5mDlZhL8V5Z69z8zrcNaJp6UtANFJmIRdWQ+qXtcEZwxcfRDplIjUFEn9OYYLo
-Z0/Sx8JeVCr5IKUwFDZ6wnEB81QVgcdnVh1RfQFtxVFHGtIN2s8xOV1ZnQAaEwJC
-1X9xuk3RFAWRsKMP0EkbNQF98DZ9gQWCa7A1Uzy1BiiJ4Y+WQ9Fts0NnFNO5zaYk
-70Z3sj+5UIfBPEjGsh7wFmW+77UVIvocP1VOGV6/Fn5Ioep0ycuhlbGQmvYlQIRw
-WzqOn4LQSAhb7A/hqOBFuh+qSZA04LGXfXcFy/HRaDXgXXXuUEmGFSSzUZzNmBQq
-ChaHJ3ScekRjmJAsyCUoq2xOooMaVt8ZrkFx5VK9IorosGwpJ3VcbTwu5G2oi1pQ
-+9H2iNT3GKjeou3dCyQPoKl9zJuZ84uFCOIRmF9wuK5jz6nsjOc+SHNqOnaOP/hg
-xClOKDBAdMrK6Q3aUVpEhgfklJ+KYDDS3JNhfSLGQRYFiGFXqi0ijl9xXuMeJzDT
-w/oF+OIJXltt0ybmZ5m6DYmdUV+TephjGWOavBl8Y9LPZ8SpIFUFAdbTcNx1ngMG
-OY3ARpGYlv3s0xDn65kjyvT/KljxXcXOSEHH0MHpm/hclmhQqEPHKRgJF1dVA8el
-WZhLM4f3RBHHdL1MiAogj7856EQQYF3e7dD4B0+OeL+2tCvcZdKqFgMWtodx0UcE
-yGiCGZjrdOJXaCaXABIThcCmDr90TKjjKo2R23igbJFg0mZrgPEcxCfc6B9lKyyV
-ycWZOB5RKlXdrNELHwCyNlBURZF7AKR4ahy9Nq7pgWlUDMaHrrjVGBGtPrg2V7p1
-AFgeajHku1CDnFk7SpsohsCK3/jsC5Jt2tewu9sGOwOkHZujYThOgweeybN2Tbj1
-H89jNKtNoTVQLUgVKI6B72pzSFsL2QKmpYlxnDXlV/tv+/KeMa194EA5APLZanSi
-v0bg7pNggWvUwNKHEzm6nNxV/kv3JwE9Pr7sC2E82WzuTO24lujBhlzXRsGJIVOW
-ZcqPHEqNuJQBdXn+4Nj7iOJY7h5TLtF8xSIx1rRFr11FyVDprhxQTv9VIa5ZSAsV
-T3fGr51lYuRlC8rzmbaBHYX3O3smNcvZWJMWPejT+CXBI4rq8sAFO6daq6QjpBjd
-dqhH9K5wKPWkYL7QlmSs1r9DYe7f4iPREHGHIsefRUsFfxMTaX1lMtfHhH7ZKxpO
-ev4ORI67s1eLFNyqQk9UvutKdW85L5nuOjJ8lJhWE2xehv1MxwjJWOxEetB+aXpb
-jp+Cx81V3TMtlltAgNLUnNK/Mg9QMik0ppNYsLPgnp8ZwnH329sQIB8Yj0TaGQoJ
-/LZwpAFWFba5am5j6job2KEtV6LdGRBUnPhBoLONZKhtrMQVhAcOSBTXEn+0dK4o
-6Lwt/N3dV9taTo2ppNqVkg==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIEe6TV0kkdaMCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKlS2mtxQHjUBIIEyGBMceOnl+Cn
+HFhSvHobHXn6FQWVeCvG5y3Sle6X3JdyOWxKyOSTGLRQ6Zjdg3l4k8LD79LOsRrl
+2k8jbqqaHmGlpuRGqYKnqwtR6HV8iaZp7mTCmB9hQLH6U5SGURpqlL1rQAHc0r2f
+7NeyGlSIYR/tawJo5in7xpDJsqpnxHgWLEX4LQJvBB0wOmwkNe1XWZgh0EzOtJJn
+mOboj5yugelcV+/Lp6iRrt4Dz3SAW7YVIu3ZZunWbPqGioiVHb+oTZ1BD1iDbJkp
+yiEmDoJRzasxl0seJoyAUaZRwNuvEEYHFXYJ4QfrTAEEjxkdEfZUjm/r5JYNl49q
+kEPuSRJUp3Pea0YjYTs6Vg1W1sFoUS9CufK1UjTS+3HGYE8HGOk1A9jD6yUGegOS
+txTBcXcEIKBubSk06mQKbxpcrf4iaqpSsA96iELERNuxA/In2z5j33gHS/nOdNYI
++mdNaFznvPbjGYXFMJQWlNguoIdkYEUtp1NW4+sB3QgP+LB7QW3uBADqlz3Q526x
+KKrsYfjDT50kDYay2dNQ68FmXW+AN0h3+yJbU5SA3zEmnh5UXerCqlutO0scXvO5
+J1/YENlhzHctKYr8uUpZAbnai0Wi6TSUmNf1uNanE+r80nBe/PAdj3rpPmHjVo71
+B4p16NF5CfNo2vazHI0mM+t/Do5yXuIkTBw1acdmVhn7wJCix+ND2HZfG1lRsLqN
+JZq82GlSaUU4Ae5BRpI5p36k9JFi/kIXXP0eOsf6c+D3nnpu0XUXZDX7TZgHL/Du
+ehrlwx2t+02Rkd693J8KIsEj3Y0SqXXT9bpO4kMq4popUudvNiRoa3++XKJKPJDL
+omBtup9JZl4nTSJWaW9xufOWHamlN2ZRMibIKjWITBfWJjzVZRn2H2dORCVH7H8j
+HKAJNSczNZGudGhp2KNs9mO3XJpayWlNFZrfy7+YlFVyRAAg28y6wiKfzb75J/6i
+hMcD38phn7sBgMyFR9LcwV+IcX40SZUIp0FwMxlOkuXTLrdHkgCwmiPSaE7lty5t
+IB//ssL5H8+aMInDZreA5G+w5M0gihtgayUxSsaE0cBaB2l8QPGFMhuMnWINzHxG
+TIX/Mn9fltxvrjJdbWPmRxvZHu1xb2Wz+cnQYIVT+6/sJYYLwN2ZMj63zxvS22im
+HL2jnfrCpay1V3AonPI5ExAd9B3mT+5Msv3jaC4USBKye3z/asneZH+khedSy3V1
+9Yh7lv54LZhgGWypOM0wugtmGA00z1uS3DMsL7IxNLz0P83tuNSqOXwqzNh57KTj
+MlDRZhIaeEGYp3/adwffO9QTFg0v+ZoThP6e8h2UETNyquE+tgr+WFO9SZ9aTiAv
+EQdtdJscpjPqwzFiDBwKXFUfJdEfbnzcPtU9fLXbLIWEeC2DEx8djCrgJ5rTMba1
+bBwsa9LaKgPoezWjTM90oA1qk5J4u8BURvZtu12dDQI8cxqXASrUMY1JB5RTgx9K
+6TynoVJHGHluJKedu3zSTNTkRDTJAkWbeTHg/gvbv+mV6rNpMG7v1oAhvLd3oLt3
+JqPKjn8WnPShoM0CJfprJ8romK2F6zYis3we6XaK1bAj8123H2yVVObRAig9S+fe
++XRNxrxYCoQR8mi34Xn4eg==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5.pem
index 975a9bc14e7..2ec6f75ca6e 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE4jCCA8qgAwIBAgIIfI4uKJZzFJ0wDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIwMDQx
-NTE2MTczMFoXDTIyMDcxOTE2MTczMFowgYgxEjAQBgNVBAMMCWxvY2FsaG9zdDEM
-MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
-aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
-CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAzgJv/+0AFm5wVyTxIGJ2ii3uTcfpa3xHfZ8Xp3EFFtV4+6A9fAkFkzMhNhjc
-8Bmn0n/UY6WOW2T/VwCPqbsyBMkOiQpUKPFL9eW7b1WZ0p36PnPWkkimAZftphPw
-nh2LniUJPMo6TBWNrvhtTOOKXLHkFD5scf71gDCx+Zwe8YoHyRyALdXvUI8l/XED
-NMb6PIi0V5KOnvq4GznXK14kACj0UiQ0ij2OplFXSufNBKyA6fRW+80l6j8V2Eio
-rm30x0rbjXNgzSaRIOu8ZM5v3kqmnSobv+8fslvyD7HVnUe6DSNouFrOp42BQ1Du
-GvGlcwuyPd73K+zKoMsgrg/A+wIDAQABo4IBRjCCAUIwHQYDVR0OBBYEFNuOZCVJ
-I/I7npLF893cmUOCFYA9MIHDBgNVHSMEgbswgbiAFP8rF2HxgFwRsIcAU0C99upS
-zrdYoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
-A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
-BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
-QHplcm9jLmNvbYIJANCpYBrCeVqJMAsGA1UdDwQEAwIF4DAWBgNVHREEDzANggts
-b2NhbGhvc3RYWDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMG
-A1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBalJ4zgdkaRhEb
-YwWD9CDfSeutOXDuyu8hcAnPS2sZBfqyw40vJ9ZQ+rSyK6x1CAhT7rYuep0rjGdT
-bBtyyad2lwbZWgqbHDKy1BYQlm/ZjzEHEORnruZxqh1xtxA+qtIZxHbWKj2QiDqQ
-5Z/IPw4qWRrIhc8qK2VjRY+s9NbxQ7IaCF+SJVZ1EpKGaC12kHGav+/CSxiDdmep
-gxTFcqmXITZBl4/1JYk4/8jxmSBMWHpwkALXG589fjH75l76uffDV8FJSNDbI2cI
-D7qxkvF/3NVZFfSp5V2M1MsfhOGaXeZyrk+23ySsDILcAYu8THYhxfbSjqbSOXdH
-ABCryWoM
+MIIE4zCCA8ugAwIBAgIJAI5ESrgpzLqUMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NTFaFw0yNDEwMjEyMDI1NTFaMIGIMRIwEAYDVQQDDAlsb2NhbGhvc3Qx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMHzWMn2O/UuyZVPXU30wjFysEJRaxh/1we4/wc0PWJ+j55UozztyDWP4ldA
+/QK1uJThkfOIjOHfyOC0fGhUad6suLCyfTqKo8Qhr7ZfUXdpVvfFOUofFOuIhASc
+6jr2qSqBqTvNEaUdJmDNoDLJJLKv4E/3yTzFfUAs+dsZYyOYHu+e8P/JzSCE49/p
+ESuh7Dz7V5kHJKpAwLFo5+yIYjXO4pUpqkLhLtC1wnwpFY4qdc4r597kLyonbbB4
+H2vafwjV5+fvQxl3uvajRLMa5l5wLssGSp0cZ15wqt7tKZt36I7X1nS7wxRkm3QB
+Oi38dDKr26zk0wogaGh8pnsp2pcCAwEAAaOCAUYwggFCMB0GA1UdDgQWBBSOVYMH
+MJ98UjtqBEEtuCShGV05HzCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhr
+KxQ8MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
+DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
+DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
+b0B6ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwFgYDVR0RBA8wDYIL
+bG9jYWxob3N0WFgwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTAT
+BgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAegVzsrawU1JJ
+0qBh1A4DliBR7zliSG/gL5+5R3kztVWMm31LJETni3g88yZytuDUZsPdsoKavt/2
+JDg4svSTLYN+nmK7g9JzjlP0ReYqWz9Ibxrq8tiDy92Z9ikvLi6xO0lN6MXcZmyX
+kpkPayGo3Rllx3BUM9G9wXX8tLTWg3LRl/EEZ+LJTFRpkN3teR4jy0mKFBA5NdDd
+jSa+CSwGPQO8Jyyo1T+Fj0baLtATL+92Ja6RZwzJnEMTwaVcL85oqQLM67jZiEb7
+xYRUd98+qY+qn+6S7Yn0jcVl5sF4n4m9+4UMHMlgECmsSvDTdH1xJwSZT5LNYjct
+1pETtVHB7Q==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5_key.pem
index 206299907ae..c78876837a2 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIeZKKTn8s11sCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNrEb10brFAKBIIEyBxzsWNkrfqg
-B+G8oKiqVVEJgcKpqaQzQYQAOQ6zaW7ZWGua7/wOmI9GB//Lk3uUOOYkcbA93Asa
-WMSxLY7KwKuk3aBoTQEMG4iBcO+YV9i3GNU0UhEZj5hafF/sbUdiKdzDTjvmFP4O
-qOLiBneIMa7iQCGD/S4aFoaoEH/1fVEWAulU1GyRAXckkCXhHskxY3rKPfWmqk4g
-Cfile6fRbYU+mfmd0cPZZPYwZcTK0lfDaWQvrDYBoetQPvD5QFXSoMrhGdy4IwqQ
-DbEGw0QxT75ErS1fFm55zC15OjOOT7183mxzvDcvUPnCpFyxDF+h640r67BYUFuD
-ksjrvYH0iX4B0Tz03RsFLOXlRmbe0yDqT4xSbUjmU8XdAwEA7NaKCMkp7dqLRGFm
-xpUFQp8lxTRdT1owHnjHw1NtUh6BtOwpsdTokJZawo7c9kvD9pN8RWkJnoQZo2FL
-w/ufu2TfBeMh93pvmx96VdZ9DhRf0IuR31F7XNysHBVJQzQJCWPAC7Xrm1dv9+TT
-h2Ton1hDPDqhivnTO/SfhWLNDcMgG3T/CxVPEmbgrESj8PyhYFR2fGjEjGUbvOdo
-zuynbDLaAGLcYbRM/YISl5aA8JTyT99WXqjgC7yzFGZIrG5a6Zz7S5jOSVOUY4Ll
-gXh6XkfYlvTd3KHVQ/jRt7hgZeAWQwpW5IUqGJqV+FQFr3iL1cVuz0G2hhPmDGWr
-6yQ5zKMMfnc6Omty1yC8h15eewlUmdqDKd6XrknpMkmBwOO3PxeoO5my2dfV5PmH
-sO7T6H7uLIcjQd6byjHc2th4LBgvxwtdUjyqZnFG/9pxVQamTY0+hbJfjVN4LX6y
-wYSOS/jhhhQdhDE6W18vL7K8pNDQOC+9Wka8NVn96Q1/7M4JaXF0+qyiZFbXscfp
-PjfeUD0SsQN5I5M7uc9lJYNaItWF1Te3oMOh6oPQ89NlLxOPUYgY2E/daQsQLeZ8
-Jes4JMGtuMlBX2gGwAH84R6KEy02sxXKQdhjEm7veilqkUYC19NO9wx6QTUzvgfr
-enAtzwLM7KB/jZowLT2XZ2GidmN8UVXgyCvzMhmw/SRmjOI66gSG1W04Cm9V80z+
-CbZdYXZDAu4exIzF0BQdVJWr/2WTwGm4nGh1ponAFieujC/TeGSNNOmWSCqe5o5s
-Ln1XYmD2FfmNRGV69lNUAXoPF5vkQGm1dfpTKtfynu8XuOnIkOBM7wTPI8JBdM9U
-pzfQIM2ItlpDAL3cqsZsWUY0D4ZaXwiiWSalvWnX3hAUE51vzCqdJ57TIbYVTlH0
-7bOGEd+IYfhO9fW3W4tzEN4JGLmPZNRg7+sttH4WKO1NLoc/dZhcU99SPiHK0nK5
-e1CdBWQR5YWjdeB+ntpnK+16CTctA+WkQY2A44VDotvjfmAavy4KAMIogUmqxxVa
-s7pJW4UsxOufj4wrLQxUeGBNDntVs1rQy1dy3oX+tduivYR36flInMbLy/HIVKCR
-eWyeQBwDdtvyzgGSGYSo/JmytMCaZry0YqMk6lNzCukS3+CZMTDlx9GmKGt9JzK0
-pMRvJkRdhUky7A3qTgZjSo0B2QwYLxk3tbas3svWxe+LqSmhC3B6HTPsjOWP53Z4
-N8/aTZlsB8MKyiBfooKjfg==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIvVOMe+Wn8IECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBdv6TLSAEBTBIIEyIgFltlyI9xN
+w/FsnChz5hX8XwP1Rhdpgo7PmWgnqlomZnxgc1qaLXjMwJXKvzTiIUy4dW0gaijF
+P/HdsZIsSrvy5F/nD6V2w4jxZfioTYiY/QFgvOmAarlwaQkyjTVocKxpEQAU7UHf
+KGrkqMwJ6W2nE6E6V5uw0lrxvTrs5FVcPDPhl/J0zziiDwTWAnO2TyLe6ew126b9
+BRWA8EpP21LuoH8KSamu7spXa1t54WUbgga0O4Zl1x1/G5qcXq7dtlA4v4Le2XhL
+2yapERsGWGsHI3uxXnMgkGqcPm0dU46Xi7wVEwrpOy4X+7SKj0/UDXORhN4KrH+u
+LrI28ASNpGuAr5XFNvoQjCZla1N6zjXsKbsi8zlpFJ6auwIeek7tYnE+RKAu+WAm
+4LvEU/UNg71EiGP9uVYUNlXRgCbE8pgmgs2AffO7qG6C18Z8V9ycAYT/DWCgZ8vt
+d9WW/i6NuyR6t+GhqOECOZRxqAv0JBmu4oxCVzaz4X6z8d414VqRvhN3K46Qr36v
+6B5S9RWICkBN3Fb0Y3F+wyYidESa2nf35mwofGjw7MRlHbtLkIaats77CzaRvwFs
+NRaNYhQb2MILkAIrHMBzxjQy3LjcM012ucE5ilab3wh2LMheBxjd90oF1oIE2796
+pWCNMjKMkXsTdUKf41f5Hytq7FW34eWC8jOCEkECQ0sQx2cTVxGQSXUGPH3POBeD
+6mJASfojNZG70ssgDjeeY36S/5cXlZe0Rmc46uAFyxRMowPLPDKTrWGZ8hZP06N0
+UcBSEfpgQgX7Duot2ErqhCLbWRF2oM5AdoIlVTh6L0DxN0vnnag/xI4XKJVhsOxD
+YkptLnPD4Iqe03RFVWaFEpmPHi4Ln/ub1Q8aB++nloPlyIEHuKWLcVz7aO5O48RA
+r9SZ2SNvdg/OYPbwERW3jLKjU/t+KT2Dug/Sn2CCUGrGHXdpnBdtR/99hVnFUStX
+3etwMpFftfP7vTn/X/6PapAK8BNtsAZyN6J3LPVhqVdJOAr9IvK61WAV2ka/6LJa
+d846aW8cPYCoq1bnB+8Gyas+h6vHT2d24ybMZN/sLsG/HJNNjcigWnzv/Wayegcy
+OEMM/SHLCAHVXVUYLBmyA8yzKor7cmkIQ+sDrXfhlDG10ZBq/BjjQ6sTm/eerCiF
+AketPskFNMNpktd+epZrUdYBfgVnqsTzzBuTb73N2qxRp3QHcoAE1VZEmVwhImGb
+2CFonJoQxKQG+aozq9QzoQseDzfyOyELaVDLJ5M++JRU9f65nA6XjRjFf9kiomCJ
+Igy3hwwWKlokdZKYFyVK7Zl/AN0qHwRpzuBG+KGJBeECBXMPv50SWYpI6qzXpPaC
+/TgTWGT82g6ACGDrUejDjIcO49pQioFG6JyANWdXi0gs5++r6AwfWV7k+p3Um8nb
+uLM10aUCSIiy1QsHYxzn4u9Cf7xb3hrEW5/qE9idfvHPzoGUq/Kw8tDqTkFWlXXX
+A5uwdB9jr6/wVnBgnkpCynNU/WshO6jPNCm8KB62eM90uLbYRXJxYvIboNmX4fB/
+ippxEmBcGWm9VOtRgNEGk3aGURZ4QQ07tUZRnZuVqfR4caGib2YY2BaC2Tv6dbfj
+5rfvJ4hq8CeV95jTOedhHQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6.pem
index 66fad67e682..9a747bc617b 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6_key.pem
index 7fb41e2af12..84cee57a310 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQImh58jaPTzyACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECH1WhXqZETU0BIIEyG8U1gvmc1R5
-X/eQWQyTyBwNteDd0ZMObzvBvBcNCRZM0i1Av7o3ZA979GNRUCVvaovu0agmQcM3
-MA7zycyYf+wVoAUlq8l2h57xEhBMbwG0cxI+O/4veAWGx29J9j11Zg0/0JBwCPpX
-dp9afOP0gUp72yz8XE3oyRr49pW32rkcUcpI6ctP6V6XJ6PIUCaK+em+pnGaN2z2
-GTX28/PmwXgb/SdIf76y2mbt3y5yxmNnv66EXb86HKObpgqAF6PiRVJthzI9mzMo
-mwPh5qqqVMDbkF2LrTK1P/+0FhVcCsoSzRBG+jMFjsBuL6XqmqHp3LMdMkmFIzN6
-2NbQ9l1HmCujx4PxSPUOSyHomLpwVnT8dpcO/G5WFblOYyUSMoZetuKPCSpHJjHh
-iBLXFXbSipRHyF7iW/IVrHA8FranVBDQGtoaRm8zmrtf1NS+kuVGVLiQBLzvDRRm
-o3bdV4GU87rdUwstoPeKJa8qQIsynMc6iVbEwioxLV4v8tBc4AYACdDpJG99SfXo
-vW87dpkvgJYk0wGq9ReprPuw8YEHHrh7OccdBSw86IDvmt0AHlPg7taJDovnHI2G
-xb3KEglLvuzmqVg/ihluPSE0abGqlkWYSxVQ0u0m+mlrtxJUbCIZZOyKo7oaITTw
-ByBKBoCirNfMOP9VE+15EtLz0YnantAPKE6+OtzQ58Qlc50ypNfJRYoztb0st8a8
-zD+5RldBedSbXu4U5SZJSHI4vcT2adJw5A03o97+JqOpFcLrZh9v2aOcOkS6gJI0
-CVx+qxDE7NC2dJCbiQ0/C9gEc3jcwSoDi9brHGq259Q5tCNBDm+WcnsJ3PoOZj9a
-ikJdpIQ5vA8Ku8QE9wWxJovLF59Vc0ndb6XzlL+Nj60bVQyWI4KOaz5m1Ry6jIPd
-nkXef1TaaGo2l6GBQuT6AbKIIy2htX0Zpe3XTm9PPtFpj1lJI5D6YXCfyjxtCyiK
-OmsNYn4NGK9ltvA4X8M+ZiBHdG0XXHv3fbrP+rQIJOvvIDzX6jcIdb9eYY3N1bP3
-NaQpTcEvNdsJDyuAieYd5QwY1H7zqjKVI3VfgV2ydqFokZmVOaj/714sfLNcsWGA
-Lt3OyWVOgaJluvEZOJhB6R7hH5bLuAr9A5UX4zZ7Axh0MoRRCnm1BNsXnr8GlQc1
-dekryIbGE19ZaK2pxJXwUF72fi2etMC7mRU/iz+0T2Zk5jQHrEYKTv2C4wdckzaQ
-xWMrxSaO9TxBrgwWNM8EmNL0IGxZ45sKf6wCx61gNDu2MFs8NPjZdGO05lcjV7sG
-Epga+T6Vmh19SGI5YM1N1d1sL61Z05DTEP4y43L1rFxPG3cYtzs6eNFibUwy1QVB
-VrMWODpYQynMbsVbtCMxdXLwkPnq/6YfIsid6Ml8uqF4jGoJMO8PixQryLS08lL/
-j8yFf/LqvucFQGAAibr2oWL6t4DV9auOH4Ao5t3d+OUwUPRVGVir2eGhsr6BPR4E
-huOcFfJAkvHcaN9nTbhQbdwsYjOF449hI9Fyn8CXQ3tycnYlgdo6hpQRA27g/CiV
-eXUfG/4mcIsppl6zncS13aZqlWqHy4Qym2nPQAf2NTfXWkGJ19fQKwLAkxpQ98sP
-bCNi385tgirtlohtwOCjCw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIhrnsoh7nVY8CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOhfa8h7gdMsBIIEyBjE6canJVl4
+iHoGgvyW1C0zikvH5+9IWSCDbe9bVOMj1CxNgsbAPSHQ1RyIAuN9/mNzN6jMlbgZ
+0/WuziVGs4KS1PK9bcaYuKCs62oFP0ECsapG6MmXww995xj0fpTf+HBGKq1b/uW9
+07lLxQ9XK4Ki7ByrvitgdX5nsGXjrfAGAuoR9uPaXrI8Ufi2araQLRkhto/cx3ne
+1Jm/Vae7qD3V1ji/AbbjoVLooY5HKg/uNeUcEak66wmX/qUM1bsFVXkFlpHqOHd6
+WUSdLbS5h+OH1mFoCYGf543aYrck1lva8D4TpsJFRGKjCaqPGSHBDfqv2zHKtCOU
+3i9X+A8Kz+DlOKcqI4VPEMMCSd1rPvBhBa06CUH+mEFwqh0NtRLJclDY8xc/bB2D
+GRaQ/CO5IYlOAa2/cgy9YXB+umlCZWXQMsOhAR8NYNZxLLWlkK5awMDVvF5Ppj/E
+xfvGTQtTGE00zAjvTxk0vUmrJbfSdsidIU4C9HIP4ztgrbvHo6Vk8SoCDHF5qi8i
+aTWkNqII6VhT7kcsmWXF1vsAnw8J0o43ELiZuFhey+GXNyepKzes+0ty+Hls6MWy
+eX4myEAGBoCltWExUyFBAkcwUJRpkcGlqm13qanWGK1pVxzfJn8V6oFlGARTxn5d
+X01Ru1x/59mnl59QKiKph/GTgtmCS0BH8UGL4nex+DbI/JLZGvB57UVTTy+QZOna
+ysUTphy5u3PKAyy9K+K6jBnYVKfn/b2a4u1BnhWjnuT1vuWHqGSK0gkIilHZaTyk
+cwh4/IFfX0Aoci+w6P6BT6yUE4d45hU/g8jRQh4S5wndZ4jwEMQF8CuDlOyrp3le
+gnVgnTrd6Umo5PrkeYnOw9dGvWQMQpyOfIyj++ABuMmQoIGKEAHRCajW4BUQgwet
+WhGpi6qvrnPQt4ZUBt0OEoVJetbPfvDCn97wNcfbbkoZEn1Jp6WNlORjQppVbGhk
+/djKyFqPCx3l4UvESnUmdN3xQkdIRFzpq9L1jRHgQ6JfhbpOfZuyNP85JAqhOVgs
+GwQe7UnQ3LSQmNcbBHy4Kc3thjYCKoWDb7w+LylA+xtAPhdjoDcQf9Y+w6wRDbka
+FBgnwaxcydSCQgUjlC5Ok8mDjy7YJVQtEbnGJEULxoZzZVCodRwJYRCC8uREpMy7
+JSPhf2ye0h+nmyciosIw378AEZokZQfnJtUks3CEmHYzsjkmICehSpeA7Cxx8F9d
+NBAZnVTGvr/Jx5Ji+cWwz7RPIRxU5tz6nHAmI1mx1gSDYfKVDG4GbtBdUMSrQCBT
+e1006F8YVG1Lzs96qHyOtCCw4Z4IFWY/u0MCFGVxgwYGz2+LuID/mQA75WSU/wsI
+XtcubtpYQB3JCS7xm8fdQAynKpYMF9Y+YMmWz3S0EvgUGiOoP8nOopNtYaau+ck3
+u7/Tq1eQ+dfZdaxvoeyE5mI57T16eOZOnCgRbZaVzMZgOSDo7MWJdAgSAvKWlfIM
+bbSxEpd5VGtV8op1flNNhpOARgAYdbohfBHT7IOLnzpdH9GvvGUOsW89BDX/mTu/
+eYP/VBUzhXVDcptP6kGphoiIOTxhII65FaRKIgTtVqFh9F6XcuOLQse/sQJY0gpb
+wTMArjA4Irq/5SRxMpBHzQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7.pem
index c83e1b1a1c4..9f7c9741f93 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwDwYDVR0RBAgwBocEfwAA
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7_key.pem
index ecd51083c63..6ed59d4384a 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIpqaBhMm+ZGcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOgoJT+/Qj3UBIIEyD7m7Lx6pO7t
-spHv+/7Rk6yMGYyboROG8HMfl0Rc50EZ5zazGFC1nJT742yXQ8t6kwuTYBOfSYW3
-RFkO8Bj4z8pHg+6c0dItGf38d7anXD1JrYMZRzOSro6CYKqCfpLBo0hXF1ZFhjl7
-dacSDMQnaOvZyAkKXWmKlo9WwZlUSpUlCShNf9t9UK1IoAtQD6Be5gCJqKOCv97O
-1jP43lvhAPGflukJsvvrl3hwuSTWKKidczSV+5WSgxWJIe4ep6d8Gle0EMSroSpt
-HJT5kiYRyMxPuX4BMvxW7xCnp61f69D3y5RRsk0eN3pS3NranvEDmR68O/bhgDyg
-+c8xh7TVBkiMDwyPEqN8kmmEBH+MS36DFPcCXce3YNYDMc6xCCBOOrjJo/hyZL96
-jejepl1AmTMDsdomIBN3ti0esnRdZkgMcuyNdd5hZvpKaoMkunAhNZN6Wo+WiujP
-/kQN3bP5W6vXO7ew7WlfHy93SvVFmcdi/U9Kb2R16fUGq+Q2FfLJaiQlS56zwSGM
-ZyO2fCR9wxSmEdJVWcUica0lWpjo03h7LjJj2t9jJXNQN6aLhuU0oMDQO+1gWWua
-lBefxZrmsuVGt66P8ATn/+M5tp3jwPbpw8xYJTSKXwCsss7KECrg2aZLpzZFhmmi
-a8JmD6j+2Djjd8QpXrDrcxUXjrctl2N9Zhhh6bQBefaMWjTiVYOb2mA13ebj6kS5
-sLfSXTDtiuoO9AvLyy+09rR4jlp/TF/QXcdDoWp4HAGO7IDZ/qadOE3P1hv159cE
-+FX3IfMsQtnK9fGgek/wJwcZMYfbRUDZkmc4fEbKyD/Pg1UDzd05yoG9aGlsnamC
-wg/1b/+6a+s7Ee+2VwnjqOfHuBkCZP5PSa3xoF+DxvG6bn3LwzBTf1CM3j3Ir5Ub
-YwG0tnte0rvMQNF0wkAYGxQKOf+0m8Y0QCXkuUvKAZNPw2VY+PRn0AOa6h/EUx8S
-8Uk7Tzi6jkdtJvyms3WhPSapeg2Z6wS5T76x/yc6YOHuGOLyX94njx5J/EdA0ne8
-+FMD4cB1W1gXynbZDeTVEtpD7mKYq3GBdAljgDAK3C6aQkKSP92IHmlSgasIYr5G
-byz27y/+8FvZwpncDuuBfiQa3aSgn+EGKTbW/pfDOMJy4ETcwaS84Oyup6Rib7MA
-wbXSSQpWwK8VMiUACaszG6qDfsDOzaNXPQGYV/dDYgLoE+ueiJVTxi/2Bip6KKQf
-lPDBLlqe9eIf3mHjTF5mTSb55i9ZsO4Qwki6F9L5hpRfpMrsKHZukv9L3aCoYWac
-7DtbZXY9MCYxyRa4XjLLQ2MKg02+F7wkzlsRGQstO/GqMVjQtp4CmQzOdYbOt7tp
-LApT80IbA6mXlebn04c9Ip9z+0uuSG38rc/Hza6aObgFPtyOIXvE+C4AJiBif33w
-yaaned+m1QWFNzDVofnaNJ3PtgKWRQn5IQ2hLmrG4aEwwfQRN+IMnoiCfBiGMUSg
-jm0zceXcDgY7AQkPy2j771cl4HiAG56c1+ATXZ9q0kXtuYWtSUm1SGbC1lmcPIjH
-mILR6E3zMBqiG6fAA1QV0afl7NUrHoH7oWKG0K1q8yQSLorafF2PKFKyBAB3ogZV
-HZ4dUxJRhoarNxL3MVMa5A==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIkHrrhxnTMqoCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKjDko07mmAyBIIEyOzaokoNyQ6r
+c88Q3ebYTvNjHHV9R1wETGeAilb9U95MphNu1OAg20T+IzNHCB6zJClUL6pAOkus
+XeRydYx4FFtGprKM3a8oP3t5jgD4IKi7msM6N0ezRfRqJvesQI2J/wlKuVZeV+RX
+rSbav3FeGQKRsHioP5B7Zpo06X44F36acxg3lj91jaeFADTRXH7pp/4TZMRhGE0f
+E+0YOvcOuHyOACMGzWXUmi3eWzvsfMG5q0ZIMZ76Scz64pK17JbQiBOycPefmVNC
+p713E53hp7xSbD+QztzOKeHy1iOeClU4h0DKnWAJXG4fNFZRTutvZkwrm7g9IHRy
+TVvkwkbmhPnA7UstUQPEwjX3M14Y61fX2r/1XhCV8sDDZ8Oicev911V/QaFqACEY
+VUHoWe9EfWkJ428JgrJq5TXhpDwBJ5KmOUi76iOMZ5iVlIVazALRNtGsnx2GP4a5
+hzSr0ZpeRqabt2EIg6Ts8B61ptNdy8ZSeBSfdVwkBBUlhU6wV4D3owKUWAEuDrkw
+9aYkXNQiOplK9xHkFclJp3Ew12Z6KcIEdRKuIufnrj5HjCeLV/qrcoLduluji6si
+dBImKrmRfobeZ359Si6kn3iU1JKaXT0d8B11nl9cxNrshH9XNa+oWf1xutUTzx3+
+GRHM7KEx6SJJZ35ZBycaqJdWIMNZymBzNkfzFqAzYiGAodRifpi8g37LXfU17MQT
+8H9Kc0A1c8MAoU60wYBq1abIjRA/mBR4z8JvFHMDSsplhF7/PmJ60izy9avGHcfg
+nwhOb7VQWQYj1Ujv2JOh7u9barIVw7dOTMVIulEMU8Mzdzlr/3MU1GB4lvVBKn0G
+dTObwr5R34wUt7epJUQ86hxKuMSUjQrMG6jy2zj+dVgb3g14YBzzY3EBtMHH8L4b
+vODxfh5XUmwKiCR47PNaxPu/ChB6+VESUJIoi972Qa89d21r8woaebwNeOQg4gyr
+EJqQ/DZKUv4NWo4xvJb3iQYC/8FWy1oJ2ZF3XpsuUzyw8dvrfdEAgMDP/ty0J4Ro
+3bMNE/bKopHh6j9ReVc4iCglzxRLGk/7SPjLWIj+IUY84YmMDslNpggi4jW1hxZn
+joHPIoWrwiCpRxcpyF+SOVfqXnu31LQSdvtWWi8cR0Viu70NDbWyNWQaRqiO9vjM
+r57IBE4pgWfxVQrEJ+TOmIJHE/TO/Q4HrwxcjBTVphV0yK9/3Q3m0VVeBP5svuE+
+cfBjIVAkA9TyQoTzgmdrnXcm4uRQmymGZDx43ojC0Pzcu1vPQy/LDTbQJN+noeIj
+9DpzcjSuddK3z+o8HjV6pvB56tm3SjBBOUQr90Woxyznb29zofTqFtK//4c4+ob7
+mHIgE1bjn7wNzkR2UhWXXYQQvo+Uqq38u1ji9akpy1/bWdkdB86izSkiLiEzbiqj
+SCHbWIAP4RIwHQ2Fb5zDrKAtfV+RYOlBdlM0ghobvdlwZ39H92BXwLgyvxpqUejo
+JlXRHQJmIHck8V3dJbt4UPnjrhiP9gqwZhuHUmzMopGDDNQzeOD3/mZY/xyGdJVD
+a3HhN0CISG2FrDGuvKXfsQonaLCkiMdtQbOUafrQRbVgsA0ZffxSomeFGRBSr2sV
+4m1TJk4KyusjLtSp4JrnIQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8.pem
index e2446c7b513..24dbd726fc7 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-MIIEyjCCA7KgAwIBAgIIJwm1PF8sj8gwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+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
-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
+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
-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
+AQEAjHbODz60b97s1rwjvmhw/JUVuY8IwkMelLXr+xZwZfsULJsv0iL/eqe5xPdU
+nQwNTMef7UHi+nbqvzUnb30Gd3mIYm/smjukbZVhnANsHd3OEl39EyOz1BvL29IR
+hTaHEc5YsZoMS7YzDY1Uu3fFHIJVyXxb+jJwmsetILH+H8RwJEDV6NT7EyCGlRtu
+asKpO2HQEWU0XKAJ/Hz7w7eJqKYJxVSm6OujFbypkD/V9r+R17UM/yCShhuakHfk
+SbvNBErF9wAr1tX1RP4LBOwuYXwoeR3LOYUgNEa3C231VhGHyUIbVERJqFJzYB1l
+z20FMd0QTIQCWZA/J7Ns5MXA8QIDAQABo4IBLjCCASowHQYDVR0OBBYEFKRX6KU+
+9QvrUrtrL6PxcpbgEcDrMIHDBgNVHSMEgbswgbiAFAL9G+lvTpaPDA6ZYY9FSGsr
+FDwxoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8_key.pem
index 01f591cdaf1..2d2cb8233c7 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIrWgG47KzpnUCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJmCQ4+m6obTBIIEyF9IMbeiNkmx
-GX2t6FZWjLsZmpQvj8qrmsrEQ0RtVmrLbfgv/4V416wvLKy9BH01xP/xSXK6yiNL
-fHJ3M2Vruwp7ARUOqvN++PQ9sgFnpl0Eluvi2YRXeQjycqoE5vjMKk33R/jhqug4
-AMhvHAyKPdOrOJtgdKcSoM2cN7rp4LmXY7e3P6Ym78cnZGAohtFcR0phehi86TH5
-+/exNDOiPOWvB1r47Jl0Zw+0jbU0wV2uapzaRrebBNQfWZgipyUskCtj/AopwX0q
-y2G3mQvOR0jaK0cVzsjY7T3DBRe1zN74K3xeMvl3wvviOiBpgZLZzjEqArgs3lBv
-slKGgQ+MW9q1LMooVfmeeTzEXI5Wh86VxHo00gpopToo0/lFOraGsLsDwEvqGZTG
-epYAgvlSoKBQZuhlvOf1pYeWsxPv5Y5xWF+oUsZQ/TpF+OrEaEzIlyq5lhtoSFmh
-4kZ12utdZYUchk939vudikKMqP6JUQSaijSkXCf/+medy6NiEXCNU5o3CXZ/RjdV
-zdqCy2gFoj3QABMyo0lr+ZMbqTfwCVtcCwBs6gIOZFXZvr2kj+efF4q7X75fVeKn
-9fGInRpuecSmXi0DWzfHlMREX1yLglDRM4RKVkJCVrevkRkBOpvVMB8ZT49C+NA0
-/zQ2oTzgoYODonNjpsjFGq6uLKNBRKbC9PaQHkkvJpc/O9nY1JE7F4JuNX55ALw0
-+DdtHZZaljMY8hCeXP6QQ4b4rLVXbRmY55ZoyjTF5Jk2NRPP4m7wz2n0n0nfbG6c
-Ae9mr8N0PfuyXcMxlt10LmivNncDYCjgdxNOeI4JYltWdNAfKu98MXjs5pyJ9K4l
-sleE+muX4wvbI4CQgM41wCq4nSdkfUBDQ+G9+oNwbCgXe6jLpBJtLVEChQXSc5EL
-pmOcPnWFK/DizjgcvluWhy8qiCPwP8kWkR+dvJ9KQc0ykbUYQSG6hrUisQ3krwDV
-PX+XeAP9L9MmkSQBsQmuoVwc9fjy9gPn7y9e87pCXw79TTxKX/msCtH5oxSxZY3t
-BJnNTEE9LzBH3REwtjmDQzEh8tCMMDuA0WEUDLuk72QNwLHvBHOkaPQvJwN4HpPP
-o3Zh5P9t31fBmH+2LE58RfC/hwGm12wFybP6epq0Rjk5tyPISAS6VLuAZ41Pyog9
-793oHYDP1yn0qGzPRRXKmVWLG4hnFvTWhbhn1XAyvKmamKVPBmyEQCqC8JzB4tFe
-vHgwJszR5JCP5e7Jb/KPrulH2ELuYsQYVb/i0H/g0fiZdf4ecK0qHWEYQKmhkdnx
-wAc9q3IQGqBZD4aus/3G8N8+7RsQZndftYAUYL/qJcDf8bAEFh60B6WOOSvWhgZ5
-NLJceAcUL+9PXzYw2lc3sMWP8ZL2KdGJc6W8s6aTVkaErTFeAswR/9yxz61aNUR8
-vPiXysg/ccELVcqsVReeBRXYRmnwzAt9eHfwv8nBpLUJ1aAKQaKeJli6IWAvCLdq
-f7GgJxQAy2Qki8l7JSBvx8OUYD7BeGJCXIBOacLK6yMugBNppmIXOl+ZFfPK+4gq
-40XjUMDR0BeK06u6KFIldS1uV8NPWpeVPT+9D0Z7rbPr3I9XIv0Gh0eBP3zYrmjK
-BXbHfb5sKjCapewIYdP4CQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI8mbGXpT0v/gCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECN0dm/rZy/qIBIIEyMprTfhd/qOW
+RR1OI42uq5ZX2XedU6r+fNUwDP/IZ6b5DDhRt6xtozboNXMbc5RxCOgY1VUoOdi4
+y9KU1zM8wKu8CaosWEzoxqr3x8dFoKQ61UYBAnGOHpvq68tVaZ7gGb9l1pwgPDww
+6P2btkvW75KKtyefgtyh8OQ0FY9QWkWf2IIOIjapX/8Q9dRpORhLfXTxItv0ek9y
+bv2PcD9ENOVawyTuytIOK555hJSnOclbSfkOmc02POCtkOxNnGSnsQAJARrBXEu6
+PdUj//EGKp58h6V62l1u5NkhetXiY8iryCqQNYW0YGL0VZy8XQsPmdfOkdBqROJf
+decQCtwo6qS/eIdAbsF07P+elSbzGIAGnU2FVgRuTS4GlBSa0jrftXM2msupIm9f
+bmcgUY7RkM7zOWfLQHGt078KwwgWCXTcVtnyPXs3VnV8xS2kyinvfk7e5ifOiIVk
+aGTDMbCLp8y8xvManL8/sZVEGKE/VLbi9igFzFMYKeVvogY4GqwfBvC81gK9+VwT
+hqSX5rqhcsQhFneSjf3fSjD7RS8NrG6i+jlZJi9WGfUdGQhkghnsqDpZr2NQDvIJ
+TlW/ss1IfKxSiHzvPvNOYcC+LLT7+VUHZMs3bGeZt+aw5HEgdyLHHB2NzOxPfsMb
+xK8/wgLRqFEa7d4S8eqUduxDyh2nw1VEWtjYLzGiJRAjDUFDAEqrXBGhe/2XdYv4
+VQT9Vl45evExVg7/3Qd4kytg0DGwIL8DLVBPVZU9OziHk2iO8rYHL5nIGdknnjMu
+3fWONLWcEF5nR37NLw4GZhYR2zFnQa42uSrnpxEmC/9b0iHPNwcjEuavwC6ZleEQ
+iz2nhbb4ahwps1/XClaegxriut8X3pV8bajKy6HkfM0PV4aeMSN2x/+yr1r2O338
+BOEEK/G7ZO9Ncc7Yu0ZqYF/UNe4cHkZASUjwkn43CCvea4Ee3ekrK33DICtzl+Z7
+cLnRMFd3yX2XddrOlJaUfRCZiH5su8FJfAoc3iar9YIPG0csH7ELHx1W66JYs1Dy
+TEXKT6JH1rQOqdAiPLpnovCH4bx3Ik/I1LPVuEulGnWT0wMph7feZ8yoYU3AXEZK
+qwwEi8rVi6F9jIcjXWblnO/p+xRVySeHjGmfBU7XszvUBvkrr6SbpKmWwLDoJt+5
+Oy0wVCnb2uPMRdhDI12B+d3Tmjb0Y+PSX9ke3S+FJ1Dk133AT5+4nOIPftRmKv0s
+wL0+nEku6IBcCwobJq/Q+QQppwUQ0F7uBSRSzBthe3z7B3i6YCIyMKmKA8Vmm8l8
+b0LlL4BkDy8jlxGCSktlIyTRqYsyIaXDps0qmDh7TtLEGLYNU1OU/rznVqd0mxtt
+VZE58w0NDeHskt/e98f8DFfB+b0JGRbWaEdkPGA+68SnXZ67OUiFP6OcVceQwp1W
+aFMkpANR5Y5FOkLp1UHXpbkuzIZ2KUKSInroGt3XWcFxLedM2UnXcjVmmP+gROyr
+XQjU8nXIcBSI9gGJ4h/rXNv2bcQqMxgdcXL6xLljsT/u6wDidknvwxvQpgtFw2Md
+E/3SPPUWBX4dKQxEBGcn/O6mQkzlIgl1mbA0XObxrCeNAW+xR5SaSAXflgdBw3kO
+WgQJEEgq+eCQMRmydqPybQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9.pem
index 0f42f6c44b9..ce1908c69af 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-OrRGyD1V5lKreZE96f/ZH/sQ
+AQB5c7rBRsJjaRUJwb86V+JPTdlwmjQyjO6WbTq76wtsmv02UaMShu03f15sYQSa
+72OMOXOpeYr0SvMQXjlcn2nI5HbK1tRNNXFaCQ3qLIehrdV5Vv6Ow7t9DO/DSC/j
+LxLSkObaB+XiCPJB4JUU0kzvDBkRHWG4im8jUXrg3rbCQpZGBdc3wdlC6+vs01CY
+Lhalstt2wQEm6qfhY8xQyWvzrw1NdVdB2KXSJD0sc5m3g7ii4sOY1EK6aEmIFtC6
+ccnbNGwA+cOTdmvmowZS67vb19jc8E8lXAwH7ZBmAMxDybFM21ZlalXMfAXr1Ft3
+UdgNaqo6TH6ZBo/5huB2Yqso
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9_key.pem
index 1cd8c43c7e7..ec648ef5a42 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQICgw6A64Q7KgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIXOfhcmmuvCBIIEyE3nLsvg2liU
-sCOa/CZy1TLJSn4qzr2hFJFliAKB6By6dqjjXWcWYRofz12DLvFcqU7Tr62S/OBZ
-rWymlGXTR0/00mUFEXbYIymbrnlFrbDVrrGlQiNtOQJqZQ6jZA5CZXnvdB2GJ5Ar
-aH4+CB7pc6eKTAAkGZh2Kgbg3qHI4Utwxij5mU+4HZUXs3OyjepzFqDQn5xBqMDt
-Fm2dZvEB9PzMJLARAuLruvDGfFaso+Gke7l7gNwQoNIT5tjmtNrzq9rscFfFmJJa
-ZplXHgXi35sbbRUVeUVVmUx5EluHUGDaVMx5ZSmb9PFvUcBRHekn+6q9+sqL2ZwU
-4WmPgxxVqlXLmvNjjbuUS71q6znqf7fSc/T5lLQZeYC08PDOCWAStP+wEGYuWaVI
-a89nTVZyCjD276BND/PCTLgALpLLR/PyLu9jYFzGxup3qnX+qENK9SF8t/6tJVo/
-tVN77OXaLZ4o1zXcAKoLH4iMU7HZ7qvkCaNrsCV7CfWZaGTc/9sqy11Cic3zWqfI
-KcrWDuJ2J9KAHj+q6VhzY3CiAc5Z7pttqQjIPAoQE26vw70IRF219Z30kyBlx7qk
-7rQhI5FXLZOzm/bWSCfgI0jR9ZHyxelCA7Dd2/UYRJ4/i/2dbqt8bup0epsqi2gL
-2GlZjkJ8fYlwCzDM6egKOyS4TIWeoXN9zx6tbgrfEU3ADGj3/+UlISznI8ct4DAr
-wT/wPhbTR74OZ6cCv2HovHw/+dTBW1W3OV+d2KfAR1v8h8sW/BfbTMgNFHYYFJnM
-O1ZPOGjIqysgEN2Nlz6uCjedJCesii1ANr+jXXCw2K2YvthVr9KxtdmJnt7JZNlV
-XSGok2yHiH201ap34+ujzNorxy+CcOChkj6FPm4Mg7cAKuaWgcWpKngD6LNsemsW
-ZCzdUHOODQTbr7gMpo615Ry5qLr1U7akqh9uzzjwHJkspXnv/ZMoWMNmDfhngCEe
-5LhK3bWxYN9JziIFy4BhoPRrFY7vx/0/RbcR/WgukH+5yH3V+SQGz9b9A4rk/gL3
-1lLZ6Lnz7tPzwEtx8P19BM2wYi9LkrodpVrAm+H5AZ6k4h0sTFfhzA33vHzoZA8c
-wFQJW6h5LITxwd07amGiSiDxEoRTMEK+hMfa5x/JbiEceKaN9NtLezfMTSNsXBZe
-j7uwO0RgWaazEI2dVStU28iuGyX1cmm03m8T6LsW0XaVDCLMqCFUrDAozxl+2mhH
-1TGMJE9yDBrskemQL4fXOx7RpZnz55/r5g4riCOOmAZaaTM5QFeZUpFZV2QnbhiL
-KFTIrZ93dWeitE1Bs1ifZqPREAEKS8rZ/VGCUGzaP72Q/+G7uDfxoqLqCspk49qV
-o1++Orre2BEIoyrYAniId2m4/8pc/fN+f+T/AA8PWtEqZJzbNC/OUjBZ7VRmWP9L
-aYl7EQVf8x41oWbJu1uDKD+5zCp/c00+ESKUDhiguBGFb7MEV5uNXcUuNoIx0qUh
-+U/QA9AEekUccamHNk/mGiU/ZJwDuxbPOpifQVnoGhtx0c9Dovco09E3kV9I4WVx
-pdiSgm9MIHosoDvjwAsRHs4M168hXxLxhaX6Hplw4zMyK6um7DQ8J2WZSqkb+HXl
-hLHBUfdHj6mnBbOPLXC2AA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIQOdQaqqqaEUCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLzPYulCZtmaBIIEyN+NT9i0IUhM
+x5Wv4Gu1uozVPNdi9zJQH/QhRhYokESvVNslz/7kyqQMq+Jbphwhac+++QfoIxcI
+ZXuuGcr74nu7uNAeZTWcqU2DPUKl6aLWUF7N0tD9j4aE1yL7mWDSImdaKFPItxJx
+qZK6GsXIpnaLh4DNNfsk3smcfcIsrl81xwZ9U9/7+Atw+qF4kiC+u4GDPjyxVIod
+9C72ToxLQFrZSxBEuNWOjnuh4iEPGcVk8xAeT7qbNYZKADNJWmEzR6XhP7I3R0a0
+uvrFa7B48/UTZOE3W9UoDc0hfjTkBp6RJaQ0YFlOTm04NHt0F2JGz3eYE308xWRh
+EgnE0Oj6k7EP9V9dTtDcWXVb9tFnJlDmP/oDosDsGAf4X6T8oHjiPqr1cDc8DQnr
+/xlzcKSrhXNIbQt1AQS1KFvWG5YZ6+b2rrdLXMZJYG7wNrY1FGPWUEodFzLVmFYj
+jXKTwixQKS5wZZKkRiit/fqf3uYtHgc/EbZ3EyBFinOBRdzvFb7u2QZKIEiBBe9K
+DyVYvXFW74HhMAeWY4jJm+sj3rCkTIReW1sMsL09s6oMejigTngt2L9Ri4c+Cr8t
+BxClqdXvdCGaYxzhwoUmKFnV5JyOcPCQsXWovzqN5ZNagcI7TKUOQog7r6nxnqSC
+whsdfC93qAoUSCB33ubJxURiIUnS1YFb18pLbzfTS3DqkFJfqckSfxUMlMkQhWpN
+wnC2FwxPBrVfNe7i4+muU0g52MIjD+TYdkCblF2oWtDzIBBUqtA4CMYVjY2qYEC4
+le5ToIhQWR+TsbBYFapbmeOu86D2mem45/SWLtrAgqLOmUasX9d/B5u23aGyObPg
+F8giscpKdMiF6D7AXVa7fsewwx5mq4z5VYxr4mCh392h3w0WSEpbfcTe9HPD1XS0
+7NIjk0tjATv/t7pTgxzx3yY0uvURP2K8wrDytJwI09cOX6kuiWQzcbm7splrkRyE
+0jIK4E7nam/SHg6AzsMmSeMpgfwlmjIfcyHmKtszS0/jH9QOTR7Sn+ocJHa/BaFn
+s4mlwywjuNSpDzqb520Qk+vYQg6MUoyhXDJKRbEAcJEp8B91gAOqZvThVWpYMdia
+Ky94JVky6yyoPc8fEJxBFrk8khHd49IBiLIFl2MKrJpqPienHOq4Ex/SGv4jMBFy
+/EORFQOJaVpvHxhDJCOxmkZ0QGK1XhWwFO5cfR/uKXPrTPypQgRy/9n22OsIztdl
+39w+yY4i8QUgrx9sfoLvFuFLMq9hF/LGPv1eXs98i6/jLh5e8zUAI5uku6o6eS96
+HeTfxKYFXhMlOBuROD7r75uFgtsBxXjvj7AAlVq+gWA8PGSKdaFQM4HhndXiY7zU
+abXk2jZCiybHRL8m7ig/wBvvDldZEH86Y2zD0xnqSlaIN9rxl4w2jmc06TilB7c9
+dKB3Px9kNC/aLw3DpuBq81Cc6QvO9nQk81X68FHtFOrN/rTWHJsyyN5+pCxoEMa/
+/15FkFWzm0H/pUYIrZb2DpHk5zoIkE78eCs7Cr/dDVte0Er6SnWiicJV/4H4homj
+6b8qeXAd0NTXUE7Z51YI4+XRM+scJFg0V1yt03fBdwN+lf6dZahsuN0h6N9pN+CT
+F7jXktH1SXJfwV+t8VpNxg==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp.pem
index 941a58fb5ba..38e425462c8 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-9w0BAQsFAAOCAQEApzceaQ88XiwSVoxn80e3CdYiZONWJ9TONX3JRV5Jmka+KTMp
-PIm15/c1RCRlcaDDNpqGWNia+PEHWn/zfDoFUVPRUun7x/qZGbISLFfevEb1H4yB
-q3M60ULxhJlyGYMKUW/jhrgOI+V/41HnqeQA8ohwgas8JLE34HjtyNJfeThXZY0D
-FlAxkRzkXVBdsV99lrM4fA3gFc8HHuPJlPWYBrfKdQYWa1TB9NxV1X5Idb0UmR1D
-3uBEMDyo5nyX0lH7wi+7/0W0sMdX7yrrY129t/7Z0Ne9Dm4ueHJr4IyV+ES4GYDn
-QDpZwX+kHXqXUt5fZa6UQNJkvhV4HYRfmGBnNA==
+9w0BAQsFAAOCAQEAEzkThPh7m1H/fNuEvsJ4q82IOWfE8oFfbABd/QPdw/kvI7xL
+bztQONjHobj0BDk9eFj97whj9eUufhOetYT0nRK5CCzZYq5PtUa2hzQIIQYG20IN
+CqInMxMQjCwmnxRYptBg3orvGAwrkNvwvlvW/b0OOJFyVdeF3XbOTclHFzVSga08
+xws2nH8CcNkL4ZN+MkScaSO06Se7pZTQosIxngQHWhfZrMcDHjSu0woKceGeelUt
+drjgeVm+NIBz7RyR9LeU7sdBNXsJQk0W8motZcfvLMnYHVDbtkZ6zx3n/v9UeZ81
+XDhHjM/CWJCaxceZgxp+TuvawcMSxUpaTSz3uw==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp_key.pem
index b4588584be0..2be0024dfd1 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIDUG9dt5P/RACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOWh8Apeatn9BIIEyPHrsPhN8NOR
-UxD8S+GofW7nszGQ2mnlkux18QShC9L/rv7x9ZclenTGEHNE/JxSJDqADQ2F5mS4
-4FEa2j/9/C2Wmf2hOT+RaNzI4Kc3dpaE+dGWlj65qAeqRp849hfU1qkyZIH+P/HT
-fXGrCTGNuwczdKpeSF4/eHutwv771Mba++NVChXKICYAl+fGBV41g+Lei9FDCnL0
-R2Zu5Fsat7k2zSjUSaSX+mMNiVaO+MOwfzgXA2Y16B5kL2EyAAq0EUeDDYc9nvwS
-qN/kpWGZ7JFr1gxcPNDRMZKon2yy9WlQfTxBZVbvzRHo0ZfM5oISrpDdF0LoDU7u
-4hBoX4Tqj07rOY3vixPzgdTLe5+nFvWstHhK8SXci4+TtWrkIk5pJd95jXQgs7Ac
-mW6iJ3acKPdFLo8F4YA5JOdNaIP39VSKpIBFr/0x617l907oq8nRnIG6RGQFqaIx
-uy4kaOwVr/k2iqB2ugAb7yvCahucUinmQWSvT9rAdXO16/kfr0PjEarHng5qEbib
-ooPNjq/h9W7fLIGi4jP1bHbARvW95eF5AYDS6PzNIwRLRIJPldyOoK/Q6JXeYcmU
-Vt4+VkH4a5toD2mg41s+TA53fl/ilXtZ/aGXdpQjR6j4+Jd0YeuwuNlKl2mIlQ4F
-N9I7WFTZaT348KLMIh2y66CizUadfTXtx3zKxmZh/5wKoRcOdh41B5h7L4lsbdzt
-7Dtm6BiG3as7jJHa3STYmre9s3dwcbh0ZB9AOXTiAGPOF4Gek6qM21iikTZ13gUM
-yAfk6Hx6jmp1iToBRxyhwxaGcyxJa2tXKwOQdtXdSsEY7DtaXHAAZ3pkS2STmETQ
-bF73uMbroyuOaJoF8xde61l/tJziYOtN5qVSnWmB21r7uwO7q0TDcimlZ5aErfIE
-qqmJFWRc4aLCExMiwveZnUfD+JL7B7Ffz1DvcXCc87mjgc+J/y5Mo0srkHq2LbWV
-cgv8wDphZNi2x7VmwBnviqC4LguiZwUFS2Whgl5RiW9Vswi/l7pcCYBdTBDbJmbr
-DZWyTBSuRbrdwdJWPlJSfWyotD4k5Vinj9AIkL03fzlfew0GyP37GL3pGyd5553L
-e1ezv2Hkmv5LxTLwmrDRhZCx3hctB4Rqur+dhPpQCv4uFTOksIUqOQlVLlFN/ufj
-LGdxEqkxGbnZ0Daq3dz+RsfvpxZi0eoeJCjUf1Fq3RuVH6M5HNsFHQ5rFtaqyuh/
-57QfHpkWIHdqxSXmsD4/r4479+s/bR+eLIRvBHgmPb9srORmu2mkSN/1ntgks8lF
-FWVm6p44NV7Ow/2uRv4l2km72aSMB1///sprefu8epI0g4b9ryPjtBJgngzQ0lxx
-0CBZAI8G/+myo9MQvGVeBnBThsckSUbd+yOtzPfEQQvTGaPSM2V00V/8rl9V/acp
-bMuVeh5E0JTBtutSAr1WZgsaxtJPyK+NQbhGMe1I5WSMh4HGGrNniPy/w6FRrt43
-5sp2nFbGVuHZ7jml3FEyt2dJSjpC6auOpfI1s2PfJHcDHg6ydUXygXtSVtnuP5fK
-6bFJ9tmZFn/Msq45mQtE+EFwAKyfe3ftG8WMo+iv/MFuSCLNWexSD2z8jGF2JnsR
-KN6ox20MpGYzPJ0TJ28yjA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIObZP91BhbcgCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOulXaosJAz7BIIEyLh49DvfZK4l
+c78I22HUPJ3tYxiQCvFtb5HQWqTntp4ltrimSYN5K0+WCdhdEanM4gVnEm4WBuY0
+eXCbw3GV6e8qAPuiQstFHO04RCJ98orS5pkIhW+j9NNX+mbt4kJfSYIuDw2kyXHy
+Wyot8cV8QRj7xR6XT9jiTzRk9k70+E0uqG8ewGMoMIeD3vY080/p5+VzlfAQerOe
+M+RFFrwXQ6fNPI9OC430FQ5gK+dNeknbvGDoOUopl9pSKCO4ylYcf9PZEMOUodxs
+bNtw5iljO7D+gua+tedUjxgXmpMbbuGrQbP/E02hchVoaha1pABn45mb10HTVljX
+eBGG/knQLyVh1jF2RXQH2/nHkbZvlKOH3721vjExqfMBdmb9nperJ+A8pPQBCAle
+eU7n+TvmE5bYYzeiJ82h3AUP6DDofUtNrtVEhpNkCd1++uB/K4ThzMYhWLcU+kza
+o4njN0jXDhOJkvYGfvKW+WMQdhUj2HT70SiRO03jzbcxmpcmNoCs7kG/AjorQk6w
+kn9uDGYueZdm894HP2zieVPuNxZWiebwxNHIwUmu8dXFM4Eemn0nTlbz2eILd7os
+2IowoGR5HsBHP37bA77wFpKa+bmbcyih9vrES0grE/CzeRSuy4zK8H/ustFmWsQV
+5He/fMBduJcKFm8a384HVUPe7F69CDwU0S241cNcoS6UgGkbz2mxMrwoEh1tF/Hf
+P5rmj+6xZwElULJsiuyZlTo7KuttDKGdzw+hZxaZo7W+GjrgUNilnIZXFWp8Ogl/
+omEk/c/7FQjU5AdBfeABkXCA/dEAzyjCrL0aZVqSN9d1/nTclFzPFGFNW4/JQR6s
+gzp0lTw3N9ZDJxOy8ruYxFG8m1gPtDSJW/bIXzXi7HlgnAjhwMkOfcSciI/JJSh4
+6y6HNNVxgDHSP/iqrCf2SO5Q7lwp8rU1I1zYQHKJr0PAEkJLFF7OUO4ccbBWHDoh
+G60R23mIFL4bA3iEHcL7CDPfYoZqlNlduLq6ilb9/bCw8ZvM1XxsYJIAOw3OvZyx
+CjZ+GcG374dSUW1ibnAp90jw7g0obMuoNwvRDu6MnBZQVi6XMnYzHokCKGTNQ+ru
+UShOgABfcjE7ITfM3Iq3yrBG1DyZ/L3vSXq+6HoDOCrKG1xJydpn5H14K449cdRU
+uzbpTPQ1yLb4w3iJy3JPlX1RbGkfe8lqmD0l8LBWp7zBeDWaqVigF9ocZ1OYSoHZ
+2aR7srhfGt0uMHviXDlIi5RttNJ2UfWHhvFeKh/bHx4hHpIw5bN6bSdr9wmz6MdF
+lSIgju8UdzDk+h9c2V0UdnmT+VAvqwL99AIH1wPRrJ2Ez1/BicygrvGhK8Q/BxgQ
+Qd3w7lNUuPOrtn5tRDqjmOribhxb/LiPyNfsOFyBiP7cO04aO0joZQqwZrQqrJO+
+lItF9mCEwooebgBxIbc+1z/vfAPbTv8V+o50Yyiu6/xFKv1ObrUW3JfBKrK8a1u6
+uu5wBb+wFaAKbBdRYxRxQwuJyDYKrTRQ7gyWtPo2WAmvmcW29EEuIBqvQMW2u9wO
+XKOcQeKYBpGN8El0a1eoZ8Kok3vIzpjelyEHfOd8RkIq+qwC+Jw3/iNjpSrSqkzS
+gpCglhiIdzhDgKPVW6q5Bg==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_key.pem
index 9887bb60f6d..820ca8f6d2b 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIceAW0LtnVAACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCoTaTK1AHUmBIIEyB1ahwSp1Jjp
-Mjq/ePJhuauxJiY/2S7lva/9ifr0jnHTRadD42oeboWAUouHqe+Uu+xrEtkQO1lQ
-SGqIECkIXKgc5n+fAGxNL7bvyJWPvFmtdZpiCGHbDVpxHZvVck8IVuJ8dtVmpHLx
-0CdHAuUUlxXAJTCcBIjsZ/pMQdetWDSDWEF3PYIsf/M+iLTA89xN190rtwjQPGCU
-BoWLnZs7OQDuSAIaHMtonaRygbaLrcaUAFgnhx2qH5R/IA7chofUW/y/w2kfBuRB
-CzwzAflJL9cFbTaOBa4wTqs4yZLhTgNwoS6sNbK+oIAnVL2rbvvwl+fEXC2lUtVm
-aUbbG+ScPzHVwOJWDfC2Md7+wCwGbnakdBB+Xo97nxK9EdO6znJIQYHBgOrq+IlD
-XeODWBcZozb29T85xLv/oU9YjRyLjixSFM/pS1JJv9pt+g6CJHWD3F/v3EPt0Bzu
-nwj2XY5UhXmrnF6iU5h67qGgdxAWHhKHPp3Ki/vofKE27eAQZXHneMfzSH+17U+O
-fs8Jj30HUJlNfbbJiUvOaaHDxR7TV5B+UCt5aJDLA8RzeUfY3YUAnWad1kI2xNJo
-BzJQfCyANDKy9ZvafPLuqRA9vTJV2pZtNG93K8n/Aprx8rIOStzoNZ9kEyw5SCWh
-OrxmXO42butXrX+el08x0bBpz9Yvt7RLji49womMKyFjghMlDN6ho9zknZUX4HyF
-vPgWHA0xf7BEtrlSGgmpjIR9XWYoMcabk45Mj9IQJPZjit9u2mqpe0TGqLyGvce1
-7a21imlxAFZKbH11JFtXERZWm7ixW7N94Bve9wCGae5x2mYS1KSvKiib0tsErN5d
-vEprws3muhT64sXgFO1H3z/PeBBS/ovuI4CG5+ztghv78HGvp7vd6fucXvR1X80k
-ntNuShPpJ/Sujjnms7opXl4W8CIytHoGlasmGRdOExBDFUHdVsUGVjcsQZtYClzh
-P8HZt79LJbTibYyp2P6to85RmqZLhjvrbbm4QdZfZvJaehQ0BGxXHk4/lHBgPSHC
-vKB/864RKAMvdSKdYi6qYJO/J2IcOSGIzYF1gi3cPb76zdfFgZ6aZVa3D/UXLKN8
-WDFp9npcu0sOn4tDnzKpbXWhwTOQOseRFtNlvD70MWHnBZ/sju33aeroJ+S2TgCv
-R/rkTM/PUxCO02+GFXYLGjSQbDOZu3+gTy5kU76jaEgMN86xupwpVAAAqLg4hb4Q
-TfCFBdtmIi4lVc3G+4R8yNrOxJgX71c21hLGzsKT/W17AOWblP8XguuP+F9iVce3
-BzGklOwXG+j1UPx6S+n/GkBhaOvAyVVCoRemvFoa9h/7sOF0/GInipB7ND2lUuRa
-Rxx4oScPHK7S5I8/jDoFWMUucoIprGUK6wpv+mGkl4dHEFFPXV4S8jkq7AWmsPEl
-A8XZHfTvnHeqdj2ozISjq1rs12mCLlVujCkCkwrpwp4aEjGwFhBynRgPwi68w/Tf
-SN0kiRSZnZXeBj0cjNA6mDYD3O22MrUeKhUEHhd2Hd/1PdoDdB/4+JMh0QEhAZL9
-pBT3NzRiS5MJ8QhoSyUBHnVNNdLXS8Se7cMW3ebmw4qpcDSMQZ95v1zA1jvQyZu8
-zLLMixP5VuxAoXPrObtIlw==
+MIIFFDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIK12saaqccf0CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBwzlDkdlvT9BIIEwBwc6ZDZ5K5V
+c9CHZgy/OWRjUvZirqvH2CeoIUXFbqZ4TftBcatSs65hn1LEFp2tGur9yIDH0O68
+gIhpC5AT1MYahqTlfzydeSFtqLE/0BwrWq9qSYrOhrG09/fA++PHpzbcPaRBPROE
+3n8nJMy1IUTi0gIXkHB5JA3u8yC6YR57eNJibMBQ+/iuQDAav3Adkrw03bnE0lyq
+8bQEhXHQJAdbYBJ6/NR1KAwa7PxarOEk1Bdf9yL1tXrCq4IoLfz6GyhKDdnr5CXZ
+T4aKgLWbQnZTAf2sEDExvopdCOysmgXeTVwIW4Dk9RVWBkwAFyvqkLB/4LP7c9cm
+v9PCnRGXHpD+Jh5RFg/QI/v9tJIHLkUFNqQR0WLrRBA96QJzD40xI8oz2v0FMfiU
+mR9+7p+V5MLhyvHrO/85kacdAuIbMB1Q69SX4E5x/pXNH86bEdX9j1e2UbDbGy0q
+aLz+ejqWknQPNFxHnOQs/gQ7zVB2Ib5y29EGEVdjns68JBSBd7qWI/9lyYXXK4Jv
+eAoXd2QFR3NS4znJ4MxpSg8GCgl0JNWBDvwEUGpgb8+2PPtgOqb2W+XY6b0BWzeA
+wokCCIZ/AePLcaIgqGFK1RBMxWzvuMjdgL4lnA0y9TEE+IHgT30F+OP5L2JJ6Zdr
+Mj5OndtxjKzIbjM4cYmN1DZxD7fvwaPwXD3GE00qWzuwlXj0F7RSFl09VvE4eq45
+oK20OvvR5AIk8Mv07umCxbhGZSHPNmcppEGMHOt7PRENQRD0EzSxF/xGbelstH7T
+bBCoAfOeQnvZ63ZCbWPFtyxRVIvnyincdwmEVzx2YWmlUCXLNQHHWft10RWUZJ2z
+j+KACFwQmvKA0YkRYMdPxzhikBKEmJ2cy+n8GxxXPSJGWKTkc6DpgqafKEFz5ICU
+n7cNOLYqIYn0JTZrWpKFbMwaB8I9nu4peWNYBowBrAFqJ+nA3qblrZoIhHNRLcMk
+PhQruL8PZMQz1R2sVmlAcuXlzuL36U+kRpxPgs/9Kx4kQ2ymsBtDD+17T/deil+L
+rZzFHeCg+w1NgMNtYhK1sXXjyo5ThCiqt8w/XytCNeztM95Mz4TjVGk6mMDB8D8q
+gFGuyyOprT8f2CdGdKP3vkfIDA+hPz3kOd+QQXQzG8AABuroltqRQzUEr9L7byfy
+9sp9vYLrnQ8IrujPqld/OgZpKkUmSNYle2u616sEzGRrRLdWIedNiVziB7Q2EaXN
+qmonjYcfbzIbZghL9ccN4v193MFqVoI0sZCcLTCtF/YQBjge1JFglboNjty5lv2q
+6Tjya3XWRmo/Hq8LyOVtgJZ5dCE0r9lkqRwT5NtkiR32Yd8aQWXNRNeMf7BvXyIP
+TP2UiSmZvWbA2pLt6tkr9Qas0frOxUteoSuqKhBQkbqsBOa9cX4cf1eUhgYGg8sJ
+I44HggINahfnTNIw+8P2MiGmAT4CrT4bUXkOIBHfVkyPfgTpZZsswPmyOewI5T22
+93q3Lsd77sB7ebWwSMdAk/KlFoFKLjsidsJ37exFM3oRPvDjOeLCEe7jN09/08nz
+B35D+bGuX/wfizHfxZzsgJLbrvvnLc30Ghlxgxvg0OoCmgwuyILnKcZoFW7gr5Ea
+XfeJ6Fy6iv8=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2.pem b/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2.pem
index 4f4fa65d183..c1560e10e67 100644
--- a/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2.pem
+++ b/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE4TCCA8mgAwIBAgIJALkY60ii/GB/MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
-MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGFMQ8wDQYDVQQDDAZDbGllbnQxDDAK
-BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
-ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
-Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMBSgZEpHxjWjW2AxMJK+ZVhmV99PImVG22lgeCM45NyT45kN0U7ZuanLIHXtw91
-7EVBvLwrQx2cTA48ltHlhhLmcfgab9fsMWyphMfFhcubPiGfm3AZIwQYMVWToE9e
-1887MCvI2owF14kPpGfLQR7neV4fhfwtRlX2QnTFFXynguat2WFfHl6hIPR8Qd+h
-J9tg2c5WR8g1Y1MALH5PLWEeQe/kWir5a7NABRHXtC8nrla/iXUuRntz7cJfpXeY
-2WlLeu1mWq4YxmLZWsyLiROTuK9hpT7Dk4rzl5GQzz70kKZnLu9xwzrdiFy3jCru
-XfzNKEPbskLwJuwx4F/k3B0CAwEAAaOCAUcwggFDMB0GA1UdDgQWBBSQvAfw1mU/
-D8+JpR//KW4HisdUlDCBwwYDVR0jBIG7MIG4gBRB4vOofiWBsF6LBwljh9AiQK/U
-naGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAyMQwwCgYDVQQLDANJ
-Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
-VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-ZXJvYy5jb22CCQDpq178G9UgPjALBgNVHQ8EBAMCBeAwFwYDVR0RBBAwDocEfwAA
-AYIGY2xpZW50MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wEwYD
-VR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAE98Nr9laV5W4rDD
-MvBFf37gwTOJ03qHe6MhQWMctlK/lO56xusBq+pVwkS4B0HGFI9fjIQb98NutuKO
-Zqbv70Y7mC2xIgk/r0d0KmVocxoEtl/dVhh2kabd6dOMDPpUYtg/SaWJo+JKDR6h
-r+eRej/GrFU6e1VmC+PK3LrsXL2Tzu3NR2fTrNLn4Bi4pIIfNiXlmGZ77tG8uYuG
-9Fyx3a2Y4ffIPHp82zVoZbBGSvWhGYhEKnWSvt0x7iqBcNiYOK8mSCIoEJ2pJuyB
-KImthyRYnNqinPiM7on7fApyVOJNQU0b5ZI1LbEEDwhhRmU1lFdIl03ydWLV56g0
-hCwSW/0=
+MIIE3zCCA8egAwIBAgIILGB9+Ed7ULgwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU1MloXDTI0MTAyMTIwMjU1MlowgYUxDzANBgNVBAMMBkNsaWVudDEMMAoG
+A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
+cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+kNGW5YgEiQc2lrxkjOi00Ao9f4z0hy0fU27t3UBCsDJSBVJbLcPqDmjuEhmxMcBT
+WesnN7Pg6hSQ+6ibNfos752Rt2XxhMtADA+bEFwuKqaVpMOgMkOw7c0+Pe1RtA5l
++14VN6QwlAYfv2nlBIuFFgSyrpz+CTJGm+tJ2Zzj9tD++WfzElKxkH6kL5jAussG
+qfS9uxQHamV2R8AWwd/TzJVo0F8rP/SIfHqkGHQP90OC0a2lvnSdgmrkrWnL9XAE
+qw/Yd6oZ2IHNiakiek0T6pRYXU9zZE3KO44StJicS3jsSRyaArEKQMQh5C+ZSGlG
+YjZhP1m6bXqEn0dXrTMCcwIDAQABo4IBRjCCAUIwHQYDVR0OBBYEFN/f8xeagPAI
+czKwNinrv1hUBXW+MIHCBgNVHSMEgbowgbeAFPlCcsRvtabDvmXBjPdOWlsOMBgp
+oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDIxDDAKBgNVBAsMA0lj
+ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
+BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
+cm9jLmNvbYIIJfNaIO8KiQUwCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGC
+BmNsaWVudDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQCjh3XBKIP18RXealWE
+SKvpKwZ8DebdAB2BtGK4pGlWqB5hJ87lyHvG3U/wUGTj2LDKhhdXgS1hGm3U3QFm
+MGmGmygUUpDcu9EfFatysHriaZOM1nwqVTQu0C18zLaTX3yscUEeamipPuGPG1yJ
+CLDtc3EUbFtCAK25lbUlalQFiQzlCIBrCLbglPnv9OGDZkI7z1S0Tjd8vgH348Gs
+sb3CXH+q3zq4OhXDc0/m1M0WTL1rVT9EpyYgdNQsLqMl+k+O8PTuOkq9lO3HJNZk
+ou3HHBkoJwPEkI2JSwT0LCJN4QrZ2ooRRNSXrvU8Wpt+cWDicqSAOGYlIZWN1C9B
+iRtY
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2_key.pem b/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2_key.pem
index 06339769e38..38358e26fbd 100644
--- a/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInx7OzmcSiM0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECButPON8n7PMBIIEyHP4v8HOACoz
-8U6WFuEWTrD/r+Uw2ib/t48MWs52ZrZG+2r95kGKHusH2OhiVYmRAdqTLZPaQpFo
-DC5BC50ob3G52z+T39svTG1WACG4tZ6TH8ei+ZrmRehW7gUPJYqMW3gUE+mvLDfJ
-eJLMSG45DzHDnz//brA7veufH+CJLp3HXqoLPQeVLJ/y5wyAzyadTPp9dL8jAnPv
-CAECsHQuE8pqKas+OeiQOV/cdIl+BmVT234D2e7Inx12ULyD3QDZ1AVxYQKqwZzM
-KvBYAQoce4cdOXLsmRxFBB8TG/ZSu8s9cRjE+HCNZoIyGNZWPiocR7PAhn/VQaOQ
-OEwITDMNRybJ0mXczaFUuHYnqmMTkz84i4rO5dbXlUDIsHh9svvHChs0Ji//5RRa
-f4PspCPIJZ4nJzZ23l++gVcTQ00QTa9EqDxgWNlOY9TLvjbwFZT6rZEgPn/6LpCA
-8456+39fsiyjozmuyAC3dSpj7rU7WBorECTh19rOhGJQrUyIOwQJ4o4gxDLMVV7m
-WDGlYo6Z5qqzYVO7NrxvewVBcfmULupIgnpIKdX6I6H4DqvlXsR2ZUgs8Iw+ZSej
-/PQY8VFo68BmCqpLQEa5gI6Q5M+lbRbEzfYc8jbuFYBn1SGLdUhCOWkH/4qQATHA
-jFp0HRS6LQChkqe4oD7DeEmjjjPiyG+m437mS1tAdAFjATcXPnmqcAASQCpj2sAt
-dJwuL6X8p3IN4TfCGsYxVVQz5lcESbk5QpQimFryPjvDjMBMrRii2vMXmknaS2Wt
-TA72oWGcBNYAPOWrJfbvoISmwEjR0XOeHnM7QIbEVc+24zq5x71hDpDSLytCW2+0
-Kn0zKAOst5K/sDWHH3mipl6ewTUQAptKE7AgM54aQRKcI1FzCM/mFEMAvC6VVhhz
-vzvwdsi4MvYAO1MtOWjSAt0dOTeCt2eZXBdqTrHFXh+NXyz1YQHMT1q10Gy+Rdkr
-ilSq+5hfY9mQ/DU3i/WiDFThimHO/C8gwQrX6AO3Za/WW/H2jvWWnTPoUwhG3zPF
-cuz/C5OykRmS469hgGYfLZ//ooLYySESjtJdvI/U0bQfgJHHQBPN7kgS23rABnJV
-RzWFpDlC57l0ToQoMrOMThAs/Rd+/TdRW+D8rvM47YIpYSkILA5UjakiPDnkuR9x
-92WgZK4DoxauUaeEjrX14GdDWLSmlQql/gO1ANMQexSH3HxG7EirmbM5ZWdy3PAF
-q7LqNI5bcTFW8yhdNiNRKS/E8ud5bltL2YFZbkjcp56WlLBLaH8q1i7+krC3UIM0
-Cl00padrm5u8SiA20BAJeG8WKqat0XJC/41hKZ8YJXMjaGRwhmQxoDuwwC5gKCls
-LJl/kOrmOjlfuatkzp46YtMy2llt/0+uvWSDFv5PieEsMfBvk1c4CemP7iTBV/ut
-T47JQ05ldTyO26lPXX8Xt2hXk/DxqJKudPf4WoYwAxiEm6B9NNhfpI6vRCmUzjxV
-WVI/J5mkc7WcZDo5tcu85Xtk0EI2rYQRuW2niv+9/0Gi8HcMphONK4mQa4L4qSXx
-iBfLPz8iJP7vOrFV5/XicWcWSFizxyBSNjVfj/d3QEOMhgrK3/kewhP3bkk9oV4L
-IZ7SCi9Rc91YW3HK4k4Uow==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIL4fuaw2D2AICAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHg2ZJzx8GjpBIIEyIFlHctM3esM
+ozXAisZLkZroCRDi3OgR4hUpomfDh5g5mzqcFWSE7jljEQnlfrAaHI49Ym3wHPKl
+xWUua+n2PMqnty8VKC5yPrN/q9QYtrwKagEtWFF8TbALc8TGPewc2Z0sQjn5wrDy
+K5EuT+VjaySyCiaal/F+0iWhh56AZmRacuBpq6Fd5gg1mMZr3ZPbMxrUZF1F/RM8
+fvwFEYgRBngprw4lg+/ioCe8b4RyUoTihY6GY4Zl0rrgOYa/sk7rrL9TfD3HK7Cu
+HSRC3b8oEyEVgBBkbrRZHUD5ZzZGOzAijkEsmJ3v7q9+iIbGdtukK0L4AQWqNbSn
+SkyRLUTVg85qYFWXHuzlU3gEQ/3PFUSiX6k8CcQZkPgOswju7FqXO014x/HYivYK
+m9R7ptP/GO+79xEsZBdZE5MePmNBTBcQBEcknExRRytN1NI7APdxPTCfOGv4bsv1
+1/Y7tvSUitYAHi9RCZMNPwPcodrG8kR4dF4/vz7Th4MoNOovSZ6QjUGy13hS64iU
+lWw5gLVkHZkcAEjycPQpdPNtyXWmyGgxxUyWUC8HoyerXRjvfKD7zsRRQkRsOUeh
+P3RbYP7tNlF/pfPZkZMZSP1vPrprBYEL+oVY+0Mfd2SqLGRwITgX0xIctPpNKFbj
+SIeuVwJ43O3N91QB1GK39jg98GNZVCTpwpQlkLq0UeCcjTlogzhwmGDAxBc3F+4L
+iObuHfdFi5egznHDpdHeV1XdVt1c4aFZqCxuqd5vQoaejAzXvv+R84597ENyb4Kc
+pz+Q66O6ph6gcoyJGRnm0YCaB9bM7QbD9Dn1wGL9bOyIL3hnl/UKoN28L0XwF1nb
+RL7AMELsAuFZbNscChVuIDgY1blwIHcYJUwYQ34JrYZgpwLdnCWwIX9KzwhGTp3b
+SMqNHxperQAoecy31KAlcNN9S1MuxSMmV+VXswVWJK1XcFmC6k9RDzuF/zdh0WAV
+ZDUSOvqCDfQGy0z+lWRNYLJMsGnGfmVrWK1YjGn4x7D1i2ZMlcn9Gn9T6cQAU9QZ
+89l3FXoDRWKqkc9gjjYWUGmO+xpDcGGbBJseUq1m314p5H1GHpPbYsAou7FuFA+B
+IsioOsPeWTxxmPfJwSzCsUbXDcm7ZgpIeyFee86BiVe3INtQh7liHOeOToJz0Xwl
+L8miU5EVoH2vrJCigqM1IsuqA6SmgAaxHjzY70Go9bmR9QqyIy0tDPua+yV7JMMS
+QPZeMEXuBNusE0TVniNQc8gUtADPqJQ6Ax49QGGYrEU4r07/gyLCcHUZ+KfgEabj
+6i3tVvGeggG3KVv1/QrEJ5rNrRC5pNlteV7EWG7zTxsA75puZotgp4tKw2qhyq15
+ZmCeOrvn4w8aCNUqABDxIuGJ8y5FTJYLxPZB3X98w0xwrp/FFjnVupMSYEs8yu9T
+DTrmEQtDK6pF9CXOrbSUFPvA4o5mygIQDykUxoc5aibueBHy4F5Dme+7AqfzbTyK
+ryp8NvXboi3KHuE05lsn0woMC1SLksqjDp7as8XBBaXMAisCV8CtIEvTYK4cA2J2
+KRC64NO2c+pTJ1dV6F+TRJR9FTWBUaXsXxCh7uk/eMBdsLmnb53zIwGZaDWrLhVf
+Q4EhhMNDtZLFUlDwhM8ARA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca2/ca.pem b/cpp/test/IceSSL/certs/db/ca2/ca.pem
index 844ce57b1fc..10397ca11dc 100644
--- a/cpp/test/IceSSL/certs/db/ca2/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca2/ca.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIIECDCCAvCgAwIBAgIJAOmrXvwb1SA+MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
-MTUxNjE3MjhaFw0yMjA3MTkxNjE3MjhaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
-IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
-BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALkPaeIsfhZYMosRtpHouaLsMMicZvmQCYEdTo6nraRCXPk5Cbcy
-zoV7rsVDdGDHNwtCbLXI0Y9I0hkFnzZjCFUUwFLttD93S2gwMUiRfcac1lV4VbrA
-qQvsdblzQcHWDd/VBYT6cv+7UHjWcFa5ta9RNHP6nDIeP3A20nSafdiEilF4PVCt
-NmIJ9inLH41U/9x4M2BYeKPoKatgthg06I+XPIq1jEP9ptHCDKsNUjQPXsKzuG5x
-NkPYRIwVCTBgFbaY1k6gOKaDnKan6UwrfvK1iIlI6KBa5VyCrFXjWGTMi4NTjeEN
-ZS9jh0wPIoN2VCBh2imH5D0z34r014WoTBMCAwEAAaNnMGUwDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQUQeLzqH4lgbBeiwcJY4fQIkCv1J0wEwYDVR0lBAwwCgYIKwYB
-BQUHAwEwIQYDVR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAVgl2eem3sjO98VifAxLijtUSUq0WL3ljjRmazdoM4zFfo5Pw
-9atFGFWXdXlhFYfYFA8FJ9M4SbFnKsKYPUknO0WF4uWW4MjTZV6rc66aXiXcTW7Z
-SlMPLWc7V3jNWWipLEBZNpGJdyY+/K3ICxyRCm7oi5hrmvb6aNWllA+jK4ki88zv
-2kvMrPJdo7N6Sa6G0Rfu33fPIymHyXPHOVV/mDZ2vUiXjO/BG9q7Cs/J+P11dLc3
-nmxv6tEBfklqemGMaRbEAzZLKPJ8XD975qKsgA1pX8kL9SsFSgHGkSNf24dym30I
-c1ap2D2imLtqOYXRjEw3ek7ITUU/TQRvq1sxdQ==
+MIIEFDCCAvygAwIBAgIIJfNaIO8KiQUwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA6gbOkX2Gg0H6ZzJE53hchgN8e83BM04G9gtpSjpIDsoBds7RiA78
+u8GjcNjFdKCCTYwFPP7oKM0dz8wDb48nwlvi7dd9CK17kXqFku90hcH4fPxTI8Is
+DHNUO+E3kqUbVPER9esS8JlvyKqUXv0KKveyGsf6BVBQqIdfSdGBX67N0lQeEmTm
+5nx23ZpsyoIXppgOhpjcQNodOgtuaggRe0t6gWu7TNxDZDlB3vakvvBUUaHwxkP5
+P/gpiGYd246DyVVrzCh8AhNp5X8QMDRC1SuP0+lhssm3x9BBa9uHtBwlBuxTmrOr
+/kP3Y2ioVFo0uAr3Inq19fB/rQrphtbyFwIDAQABo3QwcjAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBT5QnLEb7Wmw75lwYz3TlpbDjAYKTALBgNVHQ8EBAMCAYYwEwYD
+VR0lBAwwCgYIKwYBBQUHAwEwIQYDVR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9j
+LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAfLi/0Fwd+6uAYPUblTcqycDLf4Qk+L62
+pTaE3YbRse0Ujbm9A6mhnYDVm4I5VCOpQNfLpp94JSe4KrfnE10D1buWbIESmgXo
+7NMjPQryhEZn8LKY8qfFyEheQKrfQ4e+/6jNp3OyGIY/wHTH1mkUsX0LcQX56Fa6
+PQJY5bnR+LZluIb2s3PlNFdleN3Igu7zcF7za0Ow/ayAPOEKiKLs+ttjVD00q+6T
+Q7u0Z/FCqaQgMrDYKn9AMBZlGIIX8Q95XkWkM7+lXZdPmMwyzpaVUtN5/2Qr9GKS
+2WeVc7OPiRzbB3qCsa9Ysswhrm2awMfkR9EZcVJJohJ/k9Bm6PQW/Q==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca2/ca.settings.json b/cpp/test/IceSSL/certs/db/ca2/ca.settings.json
index de830f971aa..dc596334179 100644
--- a/cpp/test/IceSSL/certs/db/ca2/ca.settings.json
+++ b/cpp/test/IceSSL/certs/db/ca2/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256"}
+{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256"} \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca2/ca_key.pem b/cpp/test/IceSSL/certs/db/ca2/ca_key.pem
index a8bc35bcc78..91d451d21cd 100644
--- a/cpp/test/IceSSL/certs/db/ca2/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca2/ca_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI3cyWRNz4Ob0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAOTdFMiYadyBIIEyLks0GMt2mNV
-vs5vsE05T+v9FZQapxM3mx0o3ifihB2YArc5AnRUPnkHHc5QzCTZk7/XuulKVHgM
-/2HJQakkV2AuET0gCNDJoWhRxFMfwfyNU79b2NztXJKYjuK7pVItZ3I7vP6y17yr
-FH7+dkCI3E+GRfBLd7fwseihgeO1X6E5odzx+zg4rYFFKnJrGjXjnc0FSCS82J7i
-ETffI/W546FRcAYbN/zo50nC5ZIDtyVGFnCzhbQo2qGJ3DR5VnF8Ig80HqYWnNf2
-kd6FOSeS0Mhe3eNhAHBYIU9XVxSuP0dYeyIR6JcUm/2RhHbOuhqCZudrnKgRXJ1/
-6y2xHYD+COJs5a6dkZfl+0YVRGlJHpd2wj46q1KopMkR6IzdllVnRVE1tDO5IdPx
-QWNLu2UX+gvicnB5LsC8RRjsf0Y8NnxduZoAMQ0cI/hWswyX0VahRgZ9n8I+FPOt
-bBmzdkl5pTGnyuX0W0GpfvB9cpVB1lxd7F8RMYQPP10X+goGLc9N4iMlGQl0cdQW
-iwsGOUyUvu1TO0oVJ4+uEqHjbgggCnNSQrWhZMZkrUuKe7IQejqZUXTg/cQ0tYOA
-f0FpIU2tJgAhCjpIxTNATNJDquSClsILq/8aSYQHBjrA7lN9pKeHatUTS7v+JOdL
-4iLWp/EP+5EzMtpz0GkXmJqfAgNYZi9rjxu4WHO8nbNpSrq3DBlyuqjRmvlSx0RH
-kack9blZS/L3jKfVp+vQPOegdR5xOsLYZLTNKh38sEJXH2ShvN1K2v6sM1AWKK7u
-V1GA7UIm34w9rUHCQCN8VmDm9M7z9vxGC5wlmw5klXwTm8qCYUqBkoKaO1W09C3F
-EhAJPljbzbfOgDVMef4hbFtQN6WWFent262zE5UVDNLhghYKI+rqIIZW8Sc7IPJX
-Cj7tCwX5ikFduGbYhRNyV+kMFh330RdHo2O9/eo2RbHnI5BGOS94iaNucC/GH+Uc
-/cJuOyVIRFCTNIqvLdVl3OEN5gszXINqH1UF13mVE++fbKWhOvFcPvAcLWYtnJ1A
-Mk7iGT7b50hpyK5Byw1F+zE5qX0lcb4byxLZPZQ7i1/Ubn/twOFBUMAuSyafsuFU
-QrJVBf5NG5jtRHk/HHpC5fmAqz4QpPA0rH/He/STDzxqkjSRc8e/fVmDHC5zFHUd
-SiJieJcmrGWVxc7w7tOWhf9vRFZxNRUUNI8ie0Yc0IHuoWY2jJGQirLlp8JeyKKi
-8TLQbqnIkanXFBK2QP4L/7kWnVW+dpEC00+MZSAiiOgqs2KG0cb0p7axa8VtsgfC
-MTEw5lSUPbi6hzEnNF6CZ1tIcvqOvK4/dzh/U+nQWTwq6t0HhtH7CFK+xSHMwdYf
-x0ud3TpCIN4gidhbE3PwqoYIqlwjuh8xosvui13noRaxXecggv09j+VysoQ2nsWt
-vd+TScsb2VoXS64glgjdvQOjgytvMdUvfOHQxsjMgRyKF5PttfVP8gnYPLhNwDmZ
-S1nRxUe/Vswy5FpqCFx4Qy1YDz+RjwVJBHQc37gEY5EmkNALZweoctJMHh0S3MI1
-3FbXtYh39SHy/YlFlLKyoONyRPLcSAijarWgIKepI0zi4kNwoJZNwjgSTcSJn15h
-mUMjJ5PtPnApe3EPY8LXDg==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIC0YQXeFX0mkCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECArzt7patIjVBIIEyCQA/f3lrKNf
+ygm8w/5khrPikG9JAtT1UedoSQEqmkQTb4KYHsSMTpicawNfPsxvj0YtUeIEPkew
+rCtPOdV6G6CTLURWIkCPWiTOu6o3G23M52QQ0zFa6Il7iKiONE33N5QF6znN8Fzv
+NZ987Be56dic25rxfPqdNYIsWVZRvTV2blHMppzremmVDNAlJKYHAp2jQI0hp4BK
+czrr3+gKObhj9CRL3dKX2iRfjU/m0p1zz/5qtgQJeTnOF8imWNKfpnMUPROBUefi
+OJ1iKu5FdGCpyA0CqCFKkhPcLxpIZnXfT7YfGPcpXx+NnxXevKIUT+r21YplP/0U
+v6sVy122YfxFhoRNrWYp/AhGYy2xIvZN8YV3IdIvG6YM1stvrE9HG/Z5vwwN3JnR
+gEZdWmFg7f8gT0ugIVve62dfYCfFp5SNgCna+TZazAYVN98uOo8klLn6DAl8sNFU
+dejdhVqbk+sCnImjrzD3GTg5YhMLnuJErQsXtMekfmqXwGT/dwbmez1pJAud/rmZ
+10Z9q7K+rjibTSwK0/M2A3E33Jz0+2fEgUluosaI3bhLKk/hdFhiDROyH/TTK/FX
+CZJvTUvqY+HVOrpCI8O0S69lWPIQWF4tmE5qj8wImRgIvoX5LlRd004S44P9ohX8
+sbwET1LJcvFlAU15g1cBdhgNy49El5cBnIkPx1v6ynqBdNOqNncm4eUuYInE228E
+NaPF02xLQmkD2tBGdEW60Ch98BgGB98Sj/ygW16Pq7bOp1toFjzyx5j2r6olSBwd
+2qUhOACC2OJNUr6DwkvQuo+piSRrprV7T/tsQITWAoH7yyKfeb2zQiIqO+pQVDmr
+zCP2QqOL+R4wroi4VaBu+9D+OBksYB5TK/wt08Y2Q7RrBTItx3Xf5c+ACSBdOVv2
+6Uzflf+a73GGCsDt7czhxhIbfR6N95JILKvuo9mlLTQ8jzjFaZlRBIT+NSRvk3c+
+rmy/rrhIJ6hiUUCFWO/wlT9aueJEF13Km5O4VpaM9s95pfz5hBpxvUGZ/MOfXINY
+10XI6+zVTvBmcoctR4PhX1kvHkkkVHAHj5aWbFeoDwCcRd+SCSqdEUIuLKqxrnL3
+E1blMACbmk2RxFSZK5vA2G8pR4PNhPVJnwcJJb583StHZdLZoKJnA1soT9mNlOHP
+PsJgKU1/AEJMoxKtODuRKhYdXt46gQ1P8KqpI114zqQUAhoiu+j+hR1d5rnW8G2N
+Bwd6BXACeUOEeR9a6WFyizw+/g71PZZDn717z6mKgBParPw7bOnrubllGNYgV+da
+WMhAJYPdXSQE6O6wWUvm/bFl7FgTx9RsK0FsIqTqZ2NPfWTpwXYomgq2XrXxgbQW
+CyL5lqJkM6WOyZ6/TLUtQLELGgefXdUVGnr2WjYhF5XRYwn+2RwcbirCvqqM9Mkc
+Kp2bcdqBpQA18wHiCpEz9q1EIcSCsEDUbGOS5R0boXOpc3EBzf0MuC4ByQpRw47G
+aQ6i3QJiHih26TWEJpCIZ2uUyFveyQ9Kl+vMuPGYexxArlJ2BlKUvP4NOdRHsGox
+r+JnvrcIjpd+32N/B68h8TThZN6ckUqrsDhGXinsogGlZ7zgzMb6pkHGynp7xBa+
+OMC6c0pggqJJMLXkZFUXMw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2.pem b/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2.pem
index a16fe079d78..5d5f629d669 100644
--- a/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2.pem
+++ b/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
-s7BIMkk=
+ZXJvYy5jb22CCCXzWiDvCokFMAsGA1UdDwQEAwIF4DAXBgNVHREEEDAOhwR/AAAB
+ggZzZXJ2ZXIwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTATBgNV
+HSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAQRSpgDQ5877+uxhW
+q79KlolBJj9TTFr0ZRfAnIF+tebmHYH4bEk5jG6t6kB/MCYctpJSwid0pYOjNHx+
+oVV+YgxAB8xzuuxJ/vgkXjbVBIH2iYf7yHB+H0G8WkSUC9I7twPfyaZJZPwzf4nk
+S7j8EepJWSmZTa4jxrr42nywwROgn75J0QldHqBGZ3MhK2ee+s7uHDt9kfSSdDuu
+IqMv6yULobSyEqRJNNUJ7gnFyAvN+ZrvcX3AFhVMMZbs+dq9CLplxzOjCj3R5a8A
+56c7ZHjqnhgiccSSdiEIPmpngBwTrRg/zGMFp/4MCqM6eskXAhKEhNuUYancgShQ
+wAy7uQ==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2_key.pem b/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2_key.pem
index d4032328da8..67b2a3bec10 100644
--- a/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIXGYV3HnsXl0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFox1Yy1G8gRBIIEyC+JskIBMBTF
-n3BnnGb9Pp+qBEli/NtSpOtpyUXkBPiTdq/lITU0mGP9zY/DNAswH000/bAdWQcb
-HcoFWCl1hAWkhrt1B3nmuH0wAfM/QG4v+9mrGYZ7+F27SVsB9mBrjGtPthDAnzg7
-gS2XJiz7yvO0dip15oggtIMXpZJajZvCPZ1GsTUh4N5D1/r13mZ3bDs2ZBOLQ0BE
-lra5fj+PJiGIVwmCykb+usdb6aRR/Nr2laxLntkZNdIWbP8BuskuP8EmJseQCc2G
-nUwNgGgojhiRSoEB6yiBznDx4JZc7l005EBe7J2ADJNFCuIzJ7iy1UOFLIfT+H/x
-3Wt/HwBOzc7bez26ETYsFJtDzTintKvCOsNnHb+FpdwcbuKfWVoWaequZnrWlyPB
-mNM1dxvJnmPUhEr3VYLxBIH0zgIqzbXz69JdjJGHkxljtdqs67ES6d6Fc87fMB/o
-BPUOlcaqL2kd0kAlG6ZG2oy3VurbsYROWWGWr6/0P6wrpQhfYTeHAeXCLCR+8hL8
-avMUmTkUn+Db8EX9C5GjrKDaBwjlz/YXaLaCBrU0gXUEjgAHrdptEDhxKN24b64L
-zmODHmedXTPiNqLcBZqPHRppiuCUFQCtYuMwotcVeiOQJFaz8EgZAdwSeUq4SRP3
-XJMLAXxiaCEfouPO+lJHEavb/JYec053cpc7RQDi9tgeYBc5SYCkiksxQMmwyeXt
-3V5YzpNI8SUP3bcC24M1Lh/Jo5q/k8aTFNy6+eqnccPEq+/AZJuue+T40RDa22gD
-Bcg5kG36H0Qa/aA9QWESpNIF3N6deiTzwaQklC2rmIGPCeVh5QdCOoi45J2KXQVV
-v2cdHZashwtsJxnC1TYGCsXoUtv3gqMTBnfcIl247BIU3rvAc8EvzHk4hJ/dfE1F
-s5/ENkNCSZbdNH1f/0vYlohbOb7IiGJ/OlMHguRsLMQ+UNU1y6d5YMQIDj0TVh1I
-7RdkgJsqZuLTtPV6vcEzUfwUtsPblJo1cPbX2Ezv4oGMEgBvO033dZNK/km55ETi
-KldIaer8yREMtdLrakiQ6vVAhv+Y1+xlLmR1bfjMBAFxiKy42xQ07YYSMPBX4SiR
-5E8LRHJy7zDpLA7ofSKmX1F/8KToeVs75gPH2JmWA4v4V3RFWt1HPwkiAv++RiRZ
-bxa1RZo/vIVYYRGj/7uaqM7GJow0oJvrLuDCQrhAJROY4DnpxD/7PoJgTmZyo7OI
-LF7HPUBjdvn5mFc2ANIQyrNeGFdsFzzij56fomx7SNafGTSKfE3B/fIT/5VxTycH
-l/ygJDhxIle4kAY6NostzL/1PLzD7p9QmC6pD6ApMmNU2gts4czoxIuRBekz0tn/
-65REnt6LKN/jMPKiSwUJHDXMUs1WQd1N/qzHMYWY59bb36x6UPwxUBeYYkE4WY9d
-xUaJBzT2nIxHBEh52dD0w+9mQpJt3tcu7r4yOYB5TAXO0vQLfQtnu5Vv0asiE5GT
-faApio826WK+Yw40eOUBMg+1I5FmC+QrBJf4LgYzlAvuEtDbzrtHnsLXfhwJI1dn
-n3qEKEUOyQivMgdL4l3Btw58Iivp4cKnHmLfK5irPp0ury1IPRBXY2iYE1+eliKC
-Wlc5nYVc05vbz30h4+82rQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIarDwmohpY4MCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHpAvz9aiEeVBIIEyLM03UDReo66
+g18PT8/thB31zNGRbUFqDJIKqQNuhbzO77+4u105Hjxxj0K/kOeyaeIezsd3HZIS
++5dLrU58lpaN9OlIaaD8kpb1Vpa0jwuZZAZgDwUBTMAvmNoXZu16gKkr0VUJiP8G
+zMsskXCruPPFqTpXHisiLEob4VkBlMMC7fkF5tv/6K6xN1R/aBohZnreJoMoTz4X
+dW2w9RoQ/DdrBx9uF4buuy454Pc+I2Rg+r+Nh6xcsp1zYq1E6JNvdollbkCXNmq2
+5OYzac1MbNGU53eWTrrLeoHduw3pgWtV10qyqSBdUT+myKfOx586I09FDtQhEOGi
+zeLZeOk8IRJi5Qs/f76+o4T4nLzazWkb1wzQC7SZ5dzT3+GzbN7FKW+iiBuP9yNU
+qlThk7dT1ZvgVzx/GHyX4Kiigm3ws6mK5wzqyoSlQQLQ49Ra4rrcOxOGz/aTNsK1
+NIgiNl/7o8RDo6LhMcU9Uc1rosqeF2PA7CBOuNMdkMz2bHgYaP6U3pDOPkwJ/I2x
+fnuHcERSX7P3COvNu0ZoY0fj/mfAGWL3tjhp0W1A/Dop0rkZsOBrYMxgwYmdJSHn
+IlZgKG4eYwmAm1DC2WgoDFArTTfzo5hv8EwNWTLMI19m9gp5mizf04n3XrKj2Vor
+5yzp5KaoAH8gST8YRP3zA201YlzOoLfMHvg1hNb/kYj2xm8iKkUTo1Xf4u1k/EsM
+a4VU7OldbrYCJzNQb2sgdBUIQ8iHXJ80DBM0uuRD488xe8eiSh2mvCVwsIc3MzBx
+ztzlV4eCPto4/eiBJe7qdtHejOd5jaZ2xAd4CCsNQyyjhccZoAXGx5ODVtXG/QM2
+rBakw3Cf3Ol/IL8iWMv5NXLVSNi2RyTLZzWFwO7KQzdytaWrCcp+2qi/atlCKTNO
+p6Ozp4pmY0hmpiMOReW7afZGegSBYpnIgJLiDC3/epz3Mojocr6ZvjpQBI+hDGQU
+wwL1o/8Jt6ckhm8tpP0cVnDBvE+oOrH+wrf2JeafzKCIG9YgyKWavyEecGvmv/HC
+tk+lWlZAxe6D7dsQUvpy1SfeJUl47ffeWscExzl9GHcGmLM6YGnDU53R5JSRhl/p
+N1v70qkZkBC2DMEcDeeF9XLbLD3qPtYFdu/1ORIZe8E2ySE+4qIE7g2iC4PUVsV0
+wlPemyw7o9+cn+KMkviD4pIHjvQOIV1BPfpAkeTDGgumGW82ly3B3XAJpPOAfaiQ
+8yfGDRFx+rNguDjgrWCToLntXiW8BTB0GSK/FMFrCNNQtf8paWzHNw7ED+5czcC+
+lce0jECdJjta/43nC69Bl7sWb92X6AknA708JiCnJBY2kNsDH8M7gzR0yUlSipJG
+qNksMnQLhB56zA/pmJHPjNsKCLZq5rjbbm/XMDEx+Gy7fx+zJIAm1u+GqxCx9KY5
+jhtPNd+tFx7nZVbaszTIX0QA+WE4zOTvBQz3ur/E/ktzkNGF5xaPKpfdtCs3ktPG
+Yp+2xmnXfJ7HUmaTPkwr3Rxq5W2E5HgNnYYNAX5DlsiyRZ53laEVQDsYptnk3SIW
+gj0EXOK0b+E/brut8tTvEXyQn8ChRvoi5xHIqG9g873P6MaCV8HHl4eMwYfUq/R9
+503YGnMwm5MQFW58hpMH7A==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3.pem b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3.pem
index e9e35f714ce..94680231209 100644
--- a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3.pem
@@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+pyXKqGGqufPTLdIMnpak3ax+xSdWz9jPxa70KfenMXnQfC9oLy6CJf8UB3v5djA/
+nT5yEIQwX/z7CPmjBK27jfdMVbv3Vm7xojaZKG9ZSXegxBz2xUa2Fp6oDkzm3fU/
+fDx999qXPpTpQ+YW0I4qN/9J9KuKLvSDW5iMsrX+nsDMf4vEi8g7WMdPiKgC6uux
+x2at+lKvoezRMYf+FoWL7BR1Ci1c/RIHYK0JK6iSr9NoVoXPgD+FGSoY3et7sQdX
+ed9/FBw33njkn6Xu9j3Tvnf4BGO3XYvgfTmZuh6Z6fs7az/W/DGu/ulqFptPg5g0
+gh/7EZWFAuU1sDSa/SeFcQIDAQABo4IBezCCAXcwHQYDVR0OBBYEFKbsJIlUcuN/
+mSTSiyUndfx+xoriMIHCBgNVHSMEgbowgbeAFHe0egLdUvhuGR+r42ytSFEH5G64
oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0lj
ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-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
-P2bkRL3mU/Ba
+cm9jLmNvbYIIMzs7dCK159swCwYDVR0PBAQDAgXgMDMGA1UdHwQsMCowKKAmoCSG
+Imh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2EzLmNybC5wZW0wFwYDVR0RBBAwDocE
+fwAAAYIGY2xpZW50MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20w
+EwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAAR5+UHnX78J
+dOG4MbqV2TIb4oNtaTTC6e86xQ57bFSG4ioxMD0sTmhl8/bvbzFhIKCC6oxUh9SL
+PaWbWeI4UOr6YEFGfsHmmx9nJ8cKoG6pTHNWrAkoaJYjuEf8OhATk9tfH4D1J1br
+s2vpPOJXQFsVZ51GK1PQGO6X3qP+BotUqEKn+MquuJwOYdtkxqkrKvkC9/0BG0Fk
+f7YpQls9r4M5Lg08ZNqBhu6fWixrH99j8HgsT6qnxRoTaguOd9dSYwLmHQOC05gB
+M9aIjI3IkcWGPy+XIbnTkwh5Evj51jfMZMLS/0+tYsLOYG5GY8iEVn/RiQaM93i+
+lG08H+4bASM=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_key.pem b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_key.pem
index 866478c4524..7e0f29ad970 100644
--- a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIxBQ9QDfmtekCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECD50irqjK9o1BIIEyBYvLniQ8ys3
-WD9ZO02lHS16bVLGlozjIIeYG62UsIWczNS22IcRBOhBa6/zo0c6anrQXZ0bJ0Sd
-wyZU8Pnx7Sw/3lYdbDNwg2TqRo5Mmr20STjhBwo933hzPLsZ+IJuRWIEiMxtTxv6
-z/P/XGf0F4tXPTspd1Rg6VOH7vQVGZhH4UirITjkpzRKo5H0F8s1Z3NNpdaQyKtm
-GyRaTsASMjMGSl/275JjO4sJ2r7LInqlJiutXMSQr+QpSe4d8GV85JTGI3RHxxNe
-wb3ruUgdXqF7o3HVdVrUy8ipT1jrHORC0tqbJ/22TODHtWarGbfAhthXGpV7Vl0i
-3FTm8fNaBUBMcAZo9uqEdZlNFUYi4r/vJ2+RPy/KqqdEv3xstnxZSNww0m98+Bww
-JTsKgC16AcQQ3c7pZzFxzKDbgG6/cF8roMKrnDtesfebyQPiKoddRrw3owrN0see
-tC6sY8d4vm+W83BH/aYm1Vf/aoTVTa0f0Yd9g5Y4iE7emMktRFY9FDbkOqRMpkik
-QF9slS0zkssPBRZRk8UzFgpvuIIp5gEQa/arDUZtI6MBlzPMyWo0iOX3WvmzVJAF
-JjVvx31MVspB17E3aVWAlHF2Ov/0DiB51qXfr8sOSZLsUYWRUsmO1rXD3bBywhmd
-dD43AFNm5sULTDUTz6K7obo6x5L/XvwOWnNyHxCLRJx/ySD3ysE7ZBIqMYxdtqOz
-rwQcSbKPsjsCK2nFtq0JG3HfZebMx+/kelUDbsPIdF0sjebGCIf7pzClbrWvLUzH
-4nwQw2IDD3xram4X38ZbeAAA+ru5F60UVIrJpty9GMSKFil9MVHup63a+YaXwzjM
-F2akC9oNvyQs3YX7MEAfGThfbwF9ud26q9anFhcWqgElJ+oW4mQ85H8yLySN3HAv
-Q4e0VMF1SqPFAI4gseNuDeDh43g6uvxHRqI03UVteH7jukeKavh4jmNl7JhoFEV7
-E9FmCjLy5XKjkqudiHxA9yBozvJ7Y+8ejOYkrdppM9WWMTKYJ1HwmudTN3/NDM+D
-YVJh7NNGD0c9f2aaX3UQhs+O4SMSxVpeaGhDkD/NeOtyQ5T65ihJg0EG80daip1W
-8eWzAHd43J17yOC/bBn4J8Sy8g+zQi0JuYMVfDJ8Q4DfxQJdee5w+nMSiVxBAI+c
-O/AYU682ZDfmiG2ML8URWN6luF9Wqxz30QVER/nj9u1iDq3XJ5liwa/qvP3+WAAH
-VATf2WWRgM/WxmDGlRVCGnzC2lOpGbOtJhx6Ty/RB3k65prXT4vaFSPA+HoeYRVH
-9ko/4DKwa7btfqOP77a0XuiVurG/4wj0E8TLTlpTx+2mowY3SWO6BHFaFmfQsHdT
-g1infTrZ3eZmMkLRZ7WoAGp2LfamAtejR7u1G3snfxs5iLk27Oq5NB5s0qPMIzlO
-GF3izPEWfUKEPIyANErvTc5OA2E5oMrg5MLtQhk5yU0Tb3rakxWAAKUYaBB9REkU
-wLMtsVQ93b0AXR76H5NeKJc0eCou4Gwb+F7vpfY1ReMz8FGu+kaZbDlm2Vu/iT7y
-uwVF9Wia1+hrlpH2+/YRpcXqbW7nrRCHGSt0FWSDWIXnGAc7aRCz1693TTKoUYib
-xkIpZECWTGwTQY/DsMG63w==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIy0vQ6NBYTt8CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHYo4smud13EBIIEyPrN7EREiegG
+mNaNufrYuhUjh8FP3Jtk09HXSpDY6zSdM83TtG7szyLkx+DypBH4lIIk2hUtngQ9
+9kc8LIYYp1NhMweI/8s8F6OFlfXXWICHLkBem0fiwUqSENHxTZaAxWs8BriXaNvT
+wPKb3PYtdP0wH45pzgJ92/F4w8JCyMaFtY4362emb71LfnWmazu8Gik3AKy354/h
+3d5lLCEotLDrL50nw1A6vYORyFqVPks8hU5dkEE2uH0vI54T/woMc0ZhaSk2Sff3
+mzYg96PeYnlGVE33/FZ/pAt0KJZBph3a2M870tK8OXqRtLC8G8grySmKANOJrxp5
+u60PNrGW99PSAsjqqOLyj+RzmK8HYCcibt3UsDE+pj8ys1Y1PNzBxnGaNpGcnB7h
+5MiUd/VmJKkOHXAlLRYvHmEaIceFfCD3GV3sGe/dPD5ps+5vGJYqAR02UNZkA1lt
+jUgZhrYcnY7Zp8g1knhENdVc+Vs9Y4+jcjnr8IOQRbjmmsY2/soFPjbxCav+OzyU
+ZKOZQvGXIC5uI4FodTY5phO2VwtCVak0h4WaT09/5Joo38w3Wf6d4jYoC5O3vZdG
+8AVxCYZJeAGfIW8fpC9KgNstdQTmyFuYL8o9XgN0mAj4EBoW6V3FE2kyjuUtwaB7
+VZ+lvZqxA2LmC/RbDVh5aq12GCd2JrhJ0cD2wrBXMqsHglYYFZrQQbA4BsXicwfY
+2tY1V+IM2pObsyXXtStbgF5h2HnlZ/8C+bYfRx2ep7ZXj/89L0rEt6WhnukJ07vh
+64Q+fo9jPFkokaoKjLj1ki9P7fAcgKuyW667aORO6Sx8zqTrDg49Znh5Mu+B/7ah
+4xtfyfjemB4fl6tIMG3w2JyAGbDyFh6sOCCO2GcmmAc9L4U6UKMTu1QyqzI9UQkI
+jNwGL2IBZ7aKEz12Qp0SgKnvnHIHVj/Z24qVRDokksC86u5Brf3YzA8gzod5P3oH
+4B/o9v/XwXkF+Ze1ScTrZG04a8A1jezBf/kRrMMxR0UaRT8rdOWEYcUgrYu4D3rX
+4aRo5s5PybtuACqRbHJcnPnhbopjp+vzSIN8JczKiAy0wTAlDS3JNBxl4Ytcn5+V
+rvLsqQI6W0U9tI7I5Lp5WraDVDo5BIVoJJg4K3yUJBC66o+vursaa6nTzlJgot73
+vIHAZi15blucyrTOWeWFmbURgGL+/Gmfe03yiP8TKCHFlXldfFkBOvmGIAiL7UYy
+ezDU/TBrKYqLwP6wCckysbX2NTnS01SuC4mX4K7BF0gk7mA0K2wHuZVPP6D6MJk5
+wY1POLdywGtMaSZiK1ykO2Knsl3P43m/dmpgzv+n51ebUXYsP2zF7OhTTZMODwbM
+K+Wjp351NHWSUF7vkEP9VEXbBB+6bXZZpqmzqR3LorTxvfSm5ec7VaAchTrCjl0O
+VQOfhXSUNv2hcV+cbLChdV42PG4stOzVo0aDL/9lwsvJaL94mQDFR1Xmot6wlm/m
+F0wlRRQGguHahFmVy3K1RuLqJicol2n6whoiZEUUBAcgXFarGpBmsLSlfb2uCi+6
+MhnvpNPGlT/MqgoactCw+zP6lUzZYwyLqWao5g4rbn0R3xK9dq+KfxlkcXVaFsJJ
+AXkT6Ckoo8PxAgBf+hA5eA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked.pem b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked.pem
index de6b964d21a..0d103be1b6b 100644
--- a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked.pem
@@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
-MIIFIjCCBAqgAwIBAgIJAKAoXFyhnxKnMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMTA5
-MTYxNjMyMzJaFw0yMzEyMjAxNjMyMzJaMIGRMRswGQYDVQQDDBJDbGllbnQgY2Ez
-IHJldm9rZWQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAO
-BgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0w
-GwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANaxq17XaT7O/EKkO0+eqX4/88ONLtw+JKj50R+oUFOlz+zp
-G5xblNviJtuRK3yGdTKs0niUqfELEG8BQkUH8tdOMa3vy/uE8ZeF00A69Ibh+A3e
-dd/1RLhU0qwBBYEv9ULp0e5Eb4nYH08JHBgsmX1JnXGsMs58qucxM/sZ5tmPA4Y5
-bb6/BQhQHmb2BN4TIzBlig+jqv7yL6Xwg2jthf+W9fq1YexC47TGdAv9Wyza9w/j
-7A5VbbEA5hH9TTqojoc9q79rPvZZGTnozASRDgWqW/pO2uT1LrRVCDaEeJuJ2haW
-uIy6e/GM0cj28UhdjwbgccXSpqcPtXR9CUFKx8cCAwEAAaOCAXwwggF4MB0GA1Ud
-DgQWBBR1ETpFd2k9ytvwkaxU36+D/riDQTCBwwYDVR0jBIG7MIG4gBSeyMtKvfMz
-iahOoc870KwneEI9DaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAz
-MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdK
-dXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3
-DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDhmDhJRMw01jALBgNVHQ8EBAMCBeAwMwYD
-VR0fBCwwKjAooCagJIYiaHR0cDovLzEyNy4wLjAuMToyMDAwMS9jYTMuY3JsLnBl
-bTAXBgNVHREEEDAOhwR/AAABggZjbGllbnQwIQYDVR0SBBowGIcEfwAAAYEQaXNz
-dWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsF
-AAOCAQEASfYjRkHSx96/vPRNb521SLcF8NF7MjtNWLTMz7rSlhpKyXYTfe84tIn+
-AYquDTTxuYCN1I0wQRFvDyN2Al2R63craAjDTmmzG78s5JG6QCx1WRyRsE/XjHpD
-U9OwiC7hBp1EdarXPaRstutTG+DYULzvoQ69EaSJh9enjdfYihqNw6XpkYhQGvlr
-p59rBLbrx7dmmUbAKbWlzfj91MURJbGALXstCP126a09qZdWlR1RiB+KGv2iKr2x
-Az9/6AiUyYIIM5OttrmF/ebhbrE7/lGlTzJqtR3E4Tc25c+5MBeWtT/G83qDIzE9
-2OmR/GcVOL+mPvZ+pdza/4FsIxJing==
+MIIFIDCCBAigAwIBAgIIDWOdbRTyI9swDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU1NFoXDTI0MTAyMTIwMjU1NFowgZExGzAZBgNVBAMMEkNsaWVudCBjYTMg
+cmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
+A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
+BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA8v3w04XkYKD9kUiew2Nbv+ROsRMKXl9Nv7yJg/0cwXUaQwYJ
+ErEdWOEAPRvOzlJWhToeDi8sr3vYBHIuTBwEjOr5+NJrPG4I8SW01Fs8tL+j09+n
+jBk5lQEhWQdjicyFZIM/q61PhsXhc5MocoKKYr/FSbUIJAYnmS40ICfsF9xNrecm
+wUt7hR1oh9h7kpJF7PrfDpRPiijSqP9WRZmnghX8gOyXDxe7H5ofOM3TnCU8no8H
+yJQFW/fGgZdiq3/hNHIkFQf4Bx+ZfC93Wjr2CI7y75rrqQK6H4GKl0itNNymbFC4
+0sIUOJ+pgubPRm2OT3cMMYekbN/8hcJ3BIDoaQIDAQABo4IBezCCAXcwHQYDVR0O
+BBYEFMD7rGoH8CoJuZn2X772BEWAMJhtMIHCBgNVHSMEgbowgbeAFHe0egLdUvhu
+GR+r42ytSFEH5G64oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbYIIMzs7dCK159swCwYDVR0PBAQDAgXgMDMGA1Ud
+HwQsMCowKKAmoCSGImh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2EzLmNybC5wZW0w
+FwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
+ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQAD
+ggEBADgGhqe+LXYXPBHRn3E6VkPWQvsE/b51fFyytoTcke6a6WvXHLb5KuLhdzMU
+jotmb4NAQDqfslq+MJUXcHHFLi/3dS2p1/mZBm797BEGbSvwBm2N5O+FYRjbKgLN
+l3aPncpqIfQ1EfU+gy+ggPBmb0Ssjyvz0lxn4fBjA6m4FwA4ged4S2dfcLlpKr9x
+wZfaYMovPVgs/AwHIrBB0veClDiynrvBlIc9OYYbB3RO/8TnkhtKyBGCLqcCEejF
+ddtSvTH1aHA9NW0tnTVwGtUP9NJjKLohcAxacYJ+dQeXfrD401XRClEHE3NNLGjC
+wzFUrCwDtHy1FXmp3GeKL/pOW2c=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked_key.pem
index eb136e4eafe..fac61cb0aed 100644
--- a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIAQNELCf0rOoCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKdFzBwnEBsnBIIEyFsgkB2ooKVp
-UOtsfpwgVM89ic/61hNqDMBSXmaIkxAl9PUjCnudcmeyJ8xZDzsAWIVQfMn45ztT
-oP2OaVWJp638huOHd1wv7oZ7OAphWEVaMd/HLxenY8irNthmcXIvSm9Zti23E4lk
-zOQTcKB5deWj4urDTrdim5gSZXHs1/eGKh3dEBIrpebAVzvAJvuKwx7oIxYjxg5x
-ZDVASOGaeJm/PIPKKrVgnitfW40StfuU8ZqlzNR4WoPGN5D7r1nF6MluZNFVn4GS
-qGpAtjpanWg8LexnHU4VmbCGN8jCaGZkvZWoBzHtusKtqni+8LGhWt9e6h0bb0kp
-rnfPtLGwSR7YYj8oOiqA5fj360NviAfDMHNTp1bw02xka8MmOjcVjRewmhtwPMzF
-+3j42j+FrnXlCj/o8WxkVF7V9BuyuK7TKD2tX2e4G6te/EEH8ikt/VFydceMZwVe
-zgmXHocY1WjVTIc8WQG24mEOVxUgv6C5aGz/wLDopjH6Htgox+sAyaWzUvOW0B2U
-XpT+NKS6WBrRBcGzZBPjXoJGwKEZbJpw3RyTCPeKFsEL3Z2Pex3fMeOnipeqbfoK
-My/uPakdXV775x3TAbWW2QEy1UNzc4eQW8PzUkVhvCMfG4g76lSCIohjKNlDe8PO
-IyJzEjSaybm5CEbUUM9EnbnID3B23HD/Xv7iturMjIcu1I6I02E30bKVdYPWQgsi
-UUB1N02KIIVFE2pDP76/FTVWlqX7DDsAkdzIUJftfebTVjJpiVctq1yEPxtVi8pc
-PdtxHAC+sYyMYZmi61CRFs+enyqD10vhwhUjKk4S9QqEyN9LOH3QrqebrwDywLPW
-1Aln2IPpQilQGqXNFmrriIOjKgNgcqRPqjzQoCP4W0QA4eT8MB9DxnZwhAENUhgj
-h7AQdGc+WH3yluCvs29Z4KOxfsVlx5ewJwMtz+bfgFNAOlJEIw5HnuWNyV4JKqsY
-0sqvNvdBXesyqAYuMXxrxIq7gPEx8BB04k0Qw3SDw8U6/7Ie9ZM0lsmb1+6OJaxf
-Afcpd7ULyso2d0P2Y7lg3Kr8zF7WRLY/jW0f3Cx6QhC1liq4Z9cQNXJy5mBQ6Vve
-Nf0wliXMWPmnAvUQ9KCNftQXGdIhpNDB1nSrOJZ7iEMKxvfQ5/eTAJJYIhTv7hsf
-jvwFII301c1oaAMYKX5wmZSRaa3OFriCvgVAb50JNlaZVKSumx4fImzRIKutgyYO
-Pqzxo6u+vEtlmkjsKh71EoNiee1XRqQ70VLYWLO7MpIVqckjsWTrehJlGJS0KNol
-bX5b91GW5B7pX0VjHEFtWjGHKAoaYI6ShWRqx6CUNLOjLVSrPjTz8qRraEAbiH17
-CeucCaABXHx1tgTRC49LDhf2MTiH5mgH37cBsf60pyBM0LAmu+W87GQV4Mt54pDV
-CKVs7xPJerK4z5EBokx9YB3xANaEBpTnA9yz83tvW9cI53mAs0HEO0xtbqhWmQZr
-Xgnl2ByPrteT5jdZHdjxLhQ1xFcHW3jDeWz5ToKPklI9IPR1D5zr4P2DZQ/IuR7x
-bgB5wZVupcgQx6W/xLNTdwsBOyioosOSKlbBAGOL+HMmVrcgX0/PVR0iMF2usj1b
-Pw+vLsOMp5+rsWtGtLBhrA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIGk0jbYDJ/LYCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPvNzKt1DOm7BIIEyBi9UJ+yuce6
+G/KjiuUlnqCTq+mhviLD+9uq+QdkWgJQQuJudrsJzfEfCN/GunHPq+8CGqdX7IdX
+XAcbf8fBHCYpWuRwml9nr5FC4/MzxHJ2GHKYT4zg4E6uy7vM8794n8i1GY5HVwQY
+9A1CrvoBoxJRX0pVsGsvr+y7iiAn9Ee8HvZiV7/VpzJn0EgMD/XkaGsW3l3Jl/2L
+ihNKC77JgDudpROTdTbTOYR6FbSFoVz5Ryl/CFoOu3wPCwivBU3KkvG4CX7XVDqk
+ZMsSG/aU4FzprOOv9tYLy1NXzT3ChXx+5KcpcfxQ6ANdzNHtOeIubDpbjRCbjmZw
+7eGrOwRusbYkUY16PJTPdextpczd57y0rdTwVTyH/BBxzT0t+HXVTMr7AukEN0Nu
+vhqJEeY/rI0MXonEKJfI2Qi8bupKbAF/xO3HNHPVelmDjg/KqRMB9ueIyaUvXlRn
+B1s5Cyg0qlKLbiBlZ+ZNFP/do0jQUNVI2qPqrbCt0R6CBRS4wlLESBwmtGilobkQ
+aXj8u071wVP9eBNqP/kw1F6gRQerWddfbdhKVyLULOc9ITEPWY7yWvMddnak0GJR
+yRYpKaIMjg7mKnbtymfN9AUDVKoTJDxOHQOqPpTS83CQyh2W1eKV9fqUT3DfucpP
+XeQMYpmxpnBVpkSUsvDGy93yyVbIxmVUfvtUZl5ylP0u88e8xLGaAvgeQCudxfcq
+RBoehAufK8MqKNj/4BYwxZNqfaRLJjL8RQSD4vgOQPhYQtDeXy+Qi9V7YXF0Bpc9
+eg51oKsLw8E9IHZ6mHAQqhm2FmieoC181sfMMDXeT3VSEl+seeafvjPAZg8kKOKv
+JBJUQcTwoQMaLDpbGu33cTb0wQkqR+b6uqU8gTExzEUQKQAEHcKeZq38Za8rK3VC
+mM8uBZdw/1B+jVf0CIv/vn6p4lGLJzRnsUVJOFoPTrKCMpafiz575V8lZd65OHvj
+s9ZKnzRh6IQZbkvHuLgD8MZbq1fOvswaOnxP43vntjc0HhQF+80YjUFP2xvnWmuj
+WDO3B4IvjoJaAJP7xzgHWrI9r3OyAKlYn4Osi0YPWXTbFmQ2zjKo7vM1hgLbBoa8
+gAYmlGeDT1luyFOajU3jTkA72KrwcfZxQp1A9X4VUP+mqb/NuckgfLqv3ppmKYHx
+9N50nrrO3+5vx/K9WpPx0fySmS/Jusis75fLK0xGteKlvrNlutBa3SmWyVpYFZYd
+Zw7Yfjy8ubara7Y8fMXSXmTUj+1/uVCb7t8YlOuTxB03T52l73npfq59QINTrnZK
+TIg8RXkwKn2978Au3HWlBOv75I6+l8t7R4P6AqMfkjXZWK4Z4eEi80ygdiIxCsFL
+3xu02ClZuhDCL58x0XUyTBpC6/waQoH2vEOGHwgkvl1yhY3x1FX44adC7Q/viV7g
+exLIeHtuqjTqdpsfBOwtGfzNgyb8Vp7xeTF/mDeh9kbmQcB3DwBuo4syz5E1UIci
+IbVw70mzGtS1Utgh6cBACmtk1CBwxtK5UTI13Fq8d7c8WImZvdroMlJ2pzAHsJvs
+15+FpBPpKkd1VikhG+iYJFOLGD2duAh9cC3jhb1o+zIVX7cXcLR2biYegcBlao1g
+GTYsQ6AJ7KWFFoZXRJ7m4A==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/ca.pem b/cpp/test/IceSSL/certs/db/ca3/ca.pem
index 5075a1e6c53..93473c321f2 100644
--- a/cpp/test/IceSSL/certs/db/ca3/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/ca.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIJAOGYOElEzDTWMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMTA5
-MTYxNjMyMzBaFw0yMzEyMjAxNjMyMzBaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
-IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
-BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAOFPAXV9VFU6FVrFIlm8PPX+dA6rrOu8RljQBT/JYVsohTEDN9mY
-9Lz4iiZf9wSvAPvuHXrvtKcYl558/9KgzqIse19aKs+77qno0LPyHf5JRxQud/+P
-imPK3WnmCHwZHi8yHKl1h9GP+vPn2MkAm6le5t37oTtKbnhmAA7f4IdY4Csk3te4
-KcgeNeFAlaIB4mNifz7Vm/SCeR2oest8yW9r7Wb3bcHRXEKL5tc1WNb21BmLEg3V
-PnPh778RxF0vodUrQUciM4+kXDrvuIHP+k+/u7xg+Kj10Cy0KJKRhk1N1+6EVVqz
-j1RBw8sDtLKyROOgK7U+3UjifsG0dG9eSj8CAwEAAaNfMF0wDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQUnsjLSr3zM4moTqHPO9CsJ3hCPQ0wCwYDVR0PBAQDAgGGMCEG
-A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
-ggEBAHhnDnxvq4i5ypGxIh89g9G2PiFUJ5YmoVldQ1QQkq1R1skzG7ROeKlHh/cC
-rs8R9pFSnNFTQC3TGecV0qk73alzGjav59czP4R2I4OZhABv/zvImmmQnaZBAk9g
-5JwYZ+Kzbwy8hxl76L0rHK4z9w/zpGEM+vrH4gZRGQdCPZ+5XzgeAOkaC+rPOkcw
-RtwPAvUS62fLZi+T+n7PLtoRwlzLPONX6RVPhxYwMg3Di7N4MM06isgaI91a7BUa
-iB/Uf/3ygmHd1rrbiNh3DCGKSVepwH1UTCu1Rjy58EpdIp9G/OGintjDc8XajQS4
-bhvlbfthknBKY96MwibqxDRme9A=
+MIID/zCCAuegAwIBAgIIMzs7dCK159swDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAjjBH//K6wisingdPFFjFan6pK85DLs1CyqpOhlyMhsp7WzgkGx6E
+uvYUWdU+f89uaXI13n8SiyxJ590KidkR+pdLOb0r5vKH8o/P3xoJIy76c3fHV7Mm
+iVAEaTgdX0+qIR1gM3CxtxH848Bas6DOiVJe7drwza3qs7HNmQvPmUpdDDXLII4k
+swsV2a29d6/oF/oy9J0FQgvDuopsCEjMVQ1xhTcbFDNa9uS9fHv75KTXpJZ3uKjY
+V2dZeM3oakIx0eAaVXZrRAgcFZ0sJtWzaaNn4S2Em79XpjTbbcq8Yg30o/G1xVDj
+3f4yS9NheeCkLM/b1ri+8TXxqHePPjGBEwIDAQABo18wXTAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBR3tHoC3VL4bhkfq+NsrUhRB+RuuDALBgNVHQ8EBAMCAYYwIQYD
+VR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOC
+AQEAeHV0PulB78ocqeJrQvAVl2Xvai3H8CqAqAm0PAmpZbGxdGDkJ+p07gE2afEi
+lidSLmkesyGbM8B7VJC67e9cpLTHnF+JfGh8TRefjvOHWV1atmO4zPWcpGqVcQbs
+rclJR6J93pgSdhR+6tlHTHf+fNaZuoi6DrIUGonrcNazbKzAjZhSkNl19qbOSAq2
+kjfWjzRlOSHkME3Jd2nVlT7PVmXKGavnOdpQy2oHuWpLeTDBq8tZNC1S14rOqEhv
+5wL4kEzb4kHc5zm/MKDHcZ9egimtEhHAARyNPQjwgfDWEaEFRNEujI7eMTO46hPE
+B3XK931kxKvtnJOWp1zFXOVdbA==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/ca.settings.json b/cpp/test/IceSSL/certs/db/ca3/ca.settings.json
index 3d8a78d87b0..def2b363564 100644
--- a/cpp/test/IceSSL/certs/db/ca3/ca.settings.json
+++ b/cpp/test/IceSSL/certs/db/ca3/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256", "crlDistributionPoints": "http://127.0.0.1:20001/ca3.crl.pem"}
+{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256", "crlDistributionPoints": "http://127.0.0.1:20001/ca3.crl.pem"} \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca3/ca_key.pem b/cpp/test/IceSSL/certs/db/ca3/ca_key.pem
index b1d37a79efa..35dd9c7eb43 100644
--- a/cpp/test/IceSSL/certs/db/ca3/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/ca_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIKkDBSMy+n8sCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAR3uLLI7tdrBIIEyGDCyS80xpPH
-wtcR04l/6LOeGKs0EF4TaXJp9uhBJbgWhDTHB6wf52kk/5qguYgBDil2uJHscvQO
-cNxsUBXFrJT+TRv2lsx+KHPRE1WLHMwxJfKju7lvKjf44E7mVcvZdB3w+CG/zT+D
-XewUdeW9CX0txZU1B7TlcMEVdTNvGiTusZKPOHIPxt8vk8xivif4OrCAl6UHTdUz
-K0T2R+EQwxPtnQ5NWwci5e3eyGCWbhKlfV3stvqeHgpo7BkW6MXO9IoN+2lE8uco
-ZM7Ncmt0NUDP9Hy52og9tcwi69EyVllfujkV5rcjDBChbJ7iQ7zRSVAxZTofunfN
-s13UD7gdj4QRV7Hz0WLKEbV0Qbrk1m2Sfu0RMZkklWORk3eW3uWO+vufeq7Dxt+p
-3PXJeqOP23izmToq2AcP37l5Z4QjxWMTWEGmCgpmPvVXFlH5MLDvHMj+O5ysJGy6
-dcWWTwhfGh2/pDEi7xb21N2jiDM5hU+Egl9oArWJep9/98rB/GFw+daJo6iojGM8
-3DdWFVNiR4i+FzExd/ZYvVsqelGi2Fe1m+vwt/YLhIWFDd2ct1pWhBkT5VLUv2PA
-JgDRi1Yoz0Wqwg3J/qkKxaJ3r4yVWQ2C4eSmCc9wDs9/H7eGt6rztF2am68UAPWR
-uiyXVxbVkcQkuV4XsrnCqrv7/jQzFch1sCfkauuhQPfJxxiNHruxJGVIpTACYkYw
-Qo8j3uV1e8DKirXjokXUagBFeaf+FJTYdFyaQ1GFhIbUbJT6EgIfsXdwKuCQDa71
-iTp3v4Ed488y0gw5oaa3DN9SkUKaDIjC1y+IutI+uvEh+i09n+a8QA/AQo9wTng5
-+JHkCQUP6d4COkgo9/pSiCnvLF26q6EPCz6Y9qKyO59w76tbxx1EE1oJ8mOxpOZk
-xQVxqYYReC+ZrmMRsP/thfU/W1YxDVZlrULD1fpl+QSS359rYEbhaLqbfif/kV0/
-/ri7tsxRqx1eA1ch+z3CdiUBOW84TpF76O4utQPsUAyjc+OE32HrovdFC2HAyjPt
-9obqmKyAhjjbYI3Y8bQT9r9uiFkvIePQ45aibHMdqDGDZ48ovLJizreKBnbuEkAc
-+8fthFuY6qGkuJQ6bGdMARlNqhEu/JY3V2qFJaKbER1gihcIY0sfJFYCmObhSwfQ
-8Q38zL2VY2KKdqyLJ67vufOLJ9shhR3YDbtLW863ok1hJxmFiHRj2uOhVTrxUSgj
-C9l+n+hc/ElO1zco72wDWsDWpCwdnWBgkupbMAGYycVQEASpnVlh6eQBDUHeQapE
-Z3tK53nf1jKpi5BCXHQL3BooYoBj+VqX/4pEASmZBdbf5QtZxuLIS6/CsgFC2l68
-cRGa+Zo5u/pqhAnDnavgBNCLrlN7Axe+HN4ljfo3W+xmxjrSL/gO05s3ooYHDhwn
-wum2izzyOwdR8cOWoHvpwsiIb8wr/0u7vtZm7GKwy/CPb3eukP0DABo7dweARRYl
-xNeokB2VhODgK7ytZ2qjEzUa4qiSaLTjVeVmZ3aT1voWTDsh43YS9oCEc56+u/z7
-yzw3SNYZw9kjQ9CuLCK+vOhfkeqtH5HYnYi/JWuWUA10I/ERrHwcyv68YJzlP0Om
-dEuBmgG28PAIBIsjGzoS+w==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIh0MtIYLPicECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDTCMok55/2RBIIEyO/985FXAA76
+V7GRlpGkwW8LaDlEEgK14Y+SPJ8pliqXR7oQRAATeJbg/XMSNk4UdKKuZGXAx6lp
+FWKuvTBTm8aleWBQy3IZaviTSB1MB2qvVDblwVuKFfrAlbS5PjhMDiWstNUb45Kx
+bypZCqtxKO8NwhS8QsL3YIk7gkLGhS8AuvkGydrs0jTayOFSAmgkKQe+WgRV7wL9
+wtUvq/GDiDiFxVMlNQzZSnE/3MYAwLIiOB/orZx+r+KeqnY2UiJ7XMnmSGTQkT0q
+Paqm7Tm+1MfwYvuiUUNKt+n/iMAFsFWdVQjOvK1TBADHx5ZhjLfjjmL0ztq8ctYu
+2UxtfvNsXlRKQV2Tjb4rwuXYzIvUr6dFdKPgs19PtLhiWb+9N9BYoiACpHpcWZ1R
+gjoLRt9IAlSjbcfEqpjz+bpZums7lLi1+nhL1hx1mDQ7QVuJMmbbJ7SJzm/PPyvT
+vF5RiAh6R5Ea1V6pRJsOxVsVSQForWsqeaZrqdwmKb83QYf/YwU3DXnSUR8pzgqL
+BYUiRPBsuiH0u1R0Xl1RdRQpGJEs1y8MNC9p6upqEytNhyLHHxh6x3igv1N/5HGx
+S45/n7+k0xQLOOyqsr+WMs6RLFavE2YqXnRZk38OOppCkSlhaduBiV5ZJu68vCon
+5FrfLhkPRtR7Z1Aqp0X4U/7ULZR3q3w4K3+o4rRUt2aGqFeakv6VfekwJe5bjBbm
+lTfSKbZKOAc5ETgSK84FAseR3fXbVbfYQDj+XIv17DJvo+OMXEtLfwmllnPv9OMM
+gvPrUAV1apm6YUEz17rdgdABF+IZ40+Cf1zBqsdt4GjKGZZ3N2AE3T8GnI+Upvfl
+8Cdb6bZ1b650TvEEHy8tXQk6UkFwf2JNKnIfmnvdAlLizGV5Sa7fr2pegQwLXCx6
+6vOfM/meOERkoAvERLUiLutGDbXVNeSVqr/hni0kaWAm4zCUPyhJfn3tOizz8E4X
+2gQPP7SmnX1kS8nUOnsIusr9uU1SVfiekfHacIKFejJQv9NmWVizuHp/cVB48VJ6
+SXEHZUMZxf9ojY8S47ds7wiSlSR/1d9WrgLOH/7FhY04cV+oizh9UPORT7EEFAbY
+viXiLBTPdhg5/7zLJ1oU6jjKiWC/NyHdnahZlQAf6dgnPVHmTNlEbzNKoiypyjjV
+lvBSofITfiIyURgxODsKm5zhoAIvSY3jTV61Tmyt8QK7bWtvvyCld80I+Hr43xAM
+dOyQN133UggUD2wm7nlBwWfQzZLhbQoUWdBGp4yyT/WLQyWQUjCnYUHqTmiznxMT
+GxXlREEVkxO7P3pcv43tlvPlDL9w7OkdpR0U5scT/0/8f9EBisG9FmHw+aDnknq7
+XAxWAXgIIW3YHLoe9cen+3ixdc1yBX7yg3O5uFMmN0JH8N1y4k4owEcFTaWmJBFh
+c1nxwm8U6J3rxfoNw0T2GSyYS3bcfyJprkq0XdAqTVfwI9Z0P3TaUr1BuydvV8Vu
+QWSCjeyu1s3+saTXEXL79/JCyfva0l26Y903GyFfy58Pu5DCBPS286i1mRPEcGtn
+wTJA3zSQ+AJ0WUNTRJL2AzPKmVwGRCk3mVx9FBnsexAMzHZB53oKxtsrRI96EZbw
++OlGhix7NbY6L6Jrq8e+Nw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/crlnumber.old b/cpp/test/IceSSL/certs/db/ca3/crlnumber.old
index 4daddb72ffc..857f065e415 100644
--- a/cpp/test/IceSSL/certs/db/ca3/crlnumber.old
+++ b/cpp/test/IceSSL/certs/db/ca3/crlnumber.old
@@ -1 +1 @@
-00
+00 \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca3/index.txt b/cpp/test/IceSSL/certs/db/ca3/index.txt
index 48795a6fe40..e99582bbf5a 100644
--- a/cpp/test/IceSSL/certs/db/ca3/index.txt
+++ b/cpp/test/IceSSL/certs/db/ca3/index.txt
@@ -1,3 +1,3 @@
-R 231220163232Z 210916163233Z 57A21DA2EFB4FA42 unknown /CN=Server ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R 231220163232Z 210916163233Z A0285C5CA19F12A7 unknown /CN=Client ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R 231220163230Z 210916163233Z 2E0B7C904FE14631 unknown /CN=ZeroC Test Intermediate CA 3/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202554Z 220719202558Z C84F85EB0C06431A unknown /CN=Server ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202554Z 220719202558Z 0D639D6D14F223DB unknown /CN=Client ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202548Z 220719202558Z 461E4A36735164F3 unknown /CN=ZeroC Test Intermediate CA 3/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca3/index.txt.old b/cpp/test/IceSSL/certs/db/ca3/index.txt.old
index b4b620559a4..366d7071dc2 100644
--- a/cpp/test/IceSSL/certs/db/ca3/index.txt.old
+++ b/cpp/test/IceSSL/certs/db/ca3/index.txt.old
@@ -1,2 +1,2 @@
-R 231220163232Z 210916163233Z 57A21DA2EFB4FA42 unknown /CN=Server ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R 231220163232Z 210916163233Z A0285C5CA19F12A7 unknown /CN=Client ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202554Z 220719202558Z C84F85EB0C06431A unknown /CN=Server ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202554Z 220719202558Z 0D639D6D14F223DB unknown /CN=Client ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3.pem
index f890e690de0..8001f0a560a 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3.pem
@@ -1,58 +1,58 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+MIIFCjCCA/KgAwIBAgIIRh5KNnNRZPMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_key.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_key.pem
index 40a86839cc6..00a0c482315 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI/SXKuuy33BsCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBvS8aeIYjWRBIIEyFpJU3hZQyfm
-R86ui4pzdeLaeHcMlninQT+ktUZDTIsWPMkZAQAypn8sqWfbHySCgF8kez4RK2lh
-H3GG36oXA6D+43ScWRIPSkf23hdsH7LXJE3+rNLt17xNWR8kyE5eQ5Rj4N59UO2z
-4vrV8YT4sg5iLUVQ1HmalztPWhGICiO/uAHdcn3ipa7jUH8/7NwAERNFS28IDrtP
-Z0bCJin2O9lAJXPWQB/ZRzrms/jY9WBPRECZro04QPiSFJ8D1oCBJj5f1OyHvU4+
-1EpaSY7uCvEE/ok/mQd4KHnahpCrqiKcETDWkVscFtzjZ8YV1Z3MPBc762TGp3YQ
-wnn4GaS703oBXdVw92REuFICqiPqeou9Kv9luI8xSVLI/YqEpqDfqNYNny4b63GN
-cA20axtiWCGI6oibXmXac+WYAlLbiFHL9FrH0PZzUVe6MPwPNwkP1EK2/0z1D7mi
-4u3dConPUOwpIXjSg3vbKz5e8racAnIXWOEekGexsn0VBkOt2LFVBR7Hrh+clA7u
-/UcQ2Suwm32LrtoOR5fMohc9Ct9EFEVZ36yDEf1iR2xH+VA2aTH8B6JVKxgVoDyw
-xRGh0Rhbb/zc/ouxRrGFGClb31j1RG/BRS4o5Y8NGbC2MUXZfrlbpmbzvVtL60fO
-rLuwONHW+Mcv7j6ZnMhDsXK7rYVBARciGAEHT+AyUwmHsx6GshUe/YAVNxYuWEm5
-XRcQtNO9mVNvgofmEIiqqH0zjQuI/lMOSadjEg7iUq7oOSP0Ir9uOz4MxgspIk/j
-hV3IwtVceNVgRAIf7XoyY5JHBcYXld0lb/xeFD03GliqeL7XayL+fQaDxD7xWLzQ
-yWTsGNL/OhTp4c2AyDrjzddRN4XmiEPPaXdCQISQkwMdbHQKHWfU5jfEcdIoj4U+
-42+Q0q1vx1VGQy4hKoeF0D2z2gGyaV2SV6gjVgRfez9C6Ctqdfkruu6hSeH9cViM
-1wjOGQaNCROLXDphkDVLHxDYrx0D8ZRINhGg3rY9/kxNwPFaPbf4Ok/au2PcS5Q5
-WApDSo4arIawhOlP4c/pb70IKo2WtZpX/+k+GqfgQU0ElJFsa+hL2yE3vHwJd4d6
-ja3HVmwlFpXxXzNBCc6sA9kyLE81hM6ygIi8dabCz9xYSFAw33Z3z8kOiNDnZiAB
-ZYUCz/gqfB8amxaxxytU/uUXv5aGeJOEXnnNd5Zx/M4AIHXttJhfBlb85MNRKzlj
-o73mrsx1VmEc3a4DsB9OhsZ51prBE/ZJTo8aS8ja26a+OJv2MbFDkNH4ZuhrSlEm
-+94SwmqCYJixj+y8AW9W+msjIDPZPKcd7nSJAIkBpUyK1OmIchmDYbLzg7I+Ie7J
-DSwENMAhFxP/tQwo6vaI8e/Bnd0T0xqlscmAVI3QU4f2YSAZDlZhmZxsicDQfNGL
-PGn6qjDkK4EIi9rtFuNc1uRuoIhipSKO5OGH+wPaswA26YxQp+YVlirQ6kYLyt17
-4nY90Xnse44s05DOGP7pMkENUnMpDamV/HEZ1J65Ua72DvZijjvG08wR1/CQHMz5
-GfUjXCdo16F4ngZFzR9sNfapyiVcsEr75h2xiooEeK0hOWGa/oiU4qXo4LC05IMT
-yExU/Q7/yYRYbQc5Hpo/OA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIXVffr2udIf0CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHtR3ymxkpW1BIIEyGeAiVxyvnJ/
+2DYWclaSd6AgMNxa9Deg1JYKXmMla0B0mckkKu1VdVBXdCBNzZmTJIuIF90umuxz
+htOcH9gL0RczN+o5KGPDrKl7/jL8UO5sMUCLja8b0Kr1c5QSL6WkGVmiG/z/8TeM
+chgHviVaNLD0gAfk32EsyA3YkBPEhQGtp7G8nJil6qGI5sV5pWqekHmNkidpdLz/
+Fx8S1NRUrv6FRb/omwl+BSq2dzW6hKi6AW+eR85qntqhC7qRhU9v0AEp/rszBuPX
+1H7PiIyxjI2jcH2MHKg36yu+UjEFvplVsRMVndEbz97LcRblH7leV2SUKSimV6Us
+zWFSpSRd6qjzHrR3eaMvwGBiJFn8a2znzFFD9OHKQc3AP+N1+x+3pksFmPl5itO6
+S7hqOrkpIP0Vp/p9x9IOUma0FXa7DQD7mPM7t+t+S7H8mI8SNVoO4tS0UIaA45Ut
+gDDhqHPM/yeOt6ExT6y6pdedujpPCNH734fyOM5Flw90EPnv0ddSApVbefnETi4C
+V3hpSRemZSq9G6Sr2+DY/ePUD3UpX89gYtgnwzP7lwDFQEbp8fqe1kx8u8eNwzz0
+kUSxkSp9I/uqNeXXWsgfRZ5tSF1lxc4MnAntwZr2Gzu6W2ihiEi7D81qxOt63fiS
+H8p9gFOwe/VlTHn55ZfFtgDEZ2Cx0sGPjCKCzNb+B2BHWZClBllknDS/osteVwee
+vm3ZHyjMIrLz8YZ4EoIeUdIqJdOK4k8zW8BHWAoJS7QkNwYW7q/hn9Jwk8hezR/P
+C4qLLI8Vbp/PRPmhooqQXNmR1HxmqpKW2ViXZVgDlchxWK1eenfOO8RA7oIIIOJV
+P92o8bI7jZPoZ1zhog53EktBWliseZs0v8wLxcxHDNllJJ9h6FukhtQhx3zm1QEy
+P+nzTwvjOZOBnggtVL7gWms/Y6utg4wg+/uk7WenW+Z/CUyV/wY8dnYKQWqX8bBJ
+PvBQUZmhnz2QHbszi8Pn01tUW5fqYDc93JyK5R7EOMGQPKGn+EKibFiZ1qCA/Wmc
+yv1wvf5NmLrUsRLcoB0WT1Nnf71pnbN6Vq+IfgUmQg5n7+BTey/94wymNJfLBNIl
+/2pbFEAdQpH2BIk074Cu0+50yKpN2evk5H9quxknv1IRzICknw2KnZTI/NEIHCH0
+kK4CUv9zBbWJBgUl15asnnT0YMqxmXZ8GgwcCFqPDWQqKMVRWaFefOSWHr2EBqVV
+K/WUCjYj9zAsZDdE93OBohgHFcaEGkWUcRgsQoK5X3ZPHuBdAtrDlTAhIF52XQDr
+m2PbZGYLla6WZ5S//4qHhv/fdl/e7uLOsizxUOdnA5rgPQrmdravDLoa7tvqAkwM
+zqrIpkSiiLYtZkA/1VVRV2ifXcv0JmCVK1eF1GHaDT3YqjKIfaqTyhA3yBWmTg84
+pi/5wjNlmFpumo5CDZNxDVSUrVaraBcbS+DPb0+1F5+JPrNyApGSANhHo5jPAD3r
+nhLYEBMfTpmzWsykl7VAsktSj3zbC0tOsxF0BWxuO0zb3nRx5ezfy0EarmFfQXYj
+9iRf6jTmw61dpT8FOmCTs4CdFmCAjcuCtA8sayTi/orlCmX0xmVAHLl4044yaZZ3
+mC0NfKATKzqg3ASp6puoXw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked.pem
index f3c521da6a7..acd39d3ac93 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked.pem
@@ -1,58 +1,59 @@
-----BEGIN CERTIFICATE-----
-MIIFDDCCA/SgAwIBAgIIRKjFm3MTxW4wDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
-BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDMxDDAKBgNVBAsMA0ljZTEU
-MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
-B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMTA5MTYxNjMyMzJaFw0yMzEyMjAxNjMyMzJaMIGSMRwwGgYDVQQD
-DBNDbGllbnQgY2FpMyByZXZva2VkMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1pl
-cm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQsw
-CQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/VakNnxmJUtpuzBS0QDQrr4mRXajR
-TPfWzPU2jy+HoxxlGNc0RUO4xbFSSU4mobVMbmaS4HLC1/Ca6dcTYtl0HQqOCv2e
-OnN03r8bIdciXpBPnjK1vnKz0V8ljOK16UQs/Mb5kMKGIlFWBUlF26/YNLUPb8++
-111xHbNagxC1EnOb7m9ZVy8aO/IoljSGHRewsZpmxLsoVKIseqeUuiPDRPkKtkcl
-cBFoEA0AYuNK9SVPTaKy9Ke/IoHr0Y+iJotMEfkCQEw6mCALHIaEhs/iOTQOvKrM
-NwhnYSqBERBnrl7vXEuW0eYuhYrU7sWqSg/XMZ8sropHsfb+xus6DziBAgMBAAGj
-ggFZMIIBVTAdBgNVHQ4EFgQU39cc5usSDwzOwlFeY/8i7ShcoukwgcIGA1UdIwSB
-ujCBt4AU2amOV7SSbtif1SgroCifQgGe8kChgZSkgZEwgY4xGDAWBgNVBAMMD1pl
-cm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5j
-LjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMC
-VVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tggguC3yQT+FGMTALBgNV
-HQ8EBAMCBeAwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovLzEyNy4wLjAuMToyMDAw
-MS9jYWkzLmNybC5wZW0wFwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MBMGA1UdJQQM
-MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQButQ2CYqcI5ZB+r8tp6etL
-6lFwn9PPJd8DBI58xx1nDYnhmldY4+4tK+sM98M15mt7KRmds8yG7Yonw1rjMpYW
-OfObQsG3NWmEBYF2NZJ5nLMGfGqc1D4A3wvENkcBfGC71WRvnIylHh+bQbNdSpJD
-ig+oNCfrXUltVxcZa/0NqwNVAhJWzeyBYZofl9CJZusaFGnt2NXE1Ur0fnkEtz5m
-iw4Bw2k5uiPGgoqIlfQWsfN1BJy16Dnp8PoI4fPl83EjfMpQutN/t1WK7X1jwpu+
-CQycGkW2wFuA9ZRKbVY7Nft0QdnYsMkg1mbbVxAL5KOcSmkBt/W+WcbF6EaNvrcY
+MIIFDTCCA/WgAwIBAgIJALkeLFO6BF7kMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
+VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAzMQwwCgYDVQQLDANJY2Ux
+FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
+DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
+Yy5jb20wHhcNMjIwNzE5MjAyNTU1WhcNMjQxMDIxMjAyNTU1WjCBkjEcMBoGA1UE
+AwwTQ2xpZW50IGNhaTMgcmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAta
+ZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTEL
+MAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyluL2BDDBZRgM/ouIooAkcD8hdQz
+kUWJaqXl7vcCDXIoTdDp0HfPMCs3MJr5fbeqq5fFqeeB0yL8JFkMft/cWLmMiECa
+U6Nl//c0Ia4GsQYbP6ve3NKwpg27CuN2axD2vYOBa2BG471osq88e1XwIzzdV3IY
+B3whajyP0vbkkzpL32gF+drwPLzZUFruV5/d1I3aTfQqm8vMkamHrdS4U9AeWkMn
+vqBy/CrtuPMYCKhlB/sPpC0iT2TMPimwV9Zs+ZTT+O6QX/pFnLkGVxch8OyVYhF0
+zEOF8MbPOWxkjR07LM8+OTofqoq6uga1x+KXO4KMJ6kTuWRpC2nJbGrRIwIDAQAB
+o4IBWTCCAVUwHQYDVR0OBBYEFAq6zWECzJ9c7abmyffPKMpFQ+bXMIHCBgNVHSME
+gbowgbeAFAJWd3z26jD3uzXjbmbbmGnQ4n2xoYGUpIGRMIGOMRgwFgYDVQQDDA9a
+ZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIElu
+Yy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYT
+AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIRh5KNnNRZPMwCwYD
+VR0PBAQDAgXgMDQGA1UdHwQtMCswKaAnoCWGI2h0dHA6Ly8xMjcuMC4wLjE6MjAw
+MDEvY2FpMy5jcmwucGVtMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVudDATBgNVHSUE
+DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAbXTH5lMYq4YlTt5AOXZN
+9L7OQvBwJdF8lilwjHq2akhqkHIgqMBCBZBvQ/rWUSu1kXFAhx5f1MR6X+Od2Wb2
+p0C0BqtnN1Krdv0ySEsa9hGnVGN3a99VwDBs8lfisJA4NCGWWMmQgSZ7rKNOlyzC
+w1BhhK5v2EfRqfOYTX8EA16myKUK9u24ys0uXRmZNoTIM3QajkQeHWR3wGZAeiid
+W9xWIDS+/SDEl9H4J3BjcUDvuM/bmmZflwKeHVzYAsu6Hku97a9Gc+wpbpu6dSr1
+5FlFoMr7V5UeRNTGlspUvhn+swVSUr3geKSOgG3/NWAjuKCVk2xw7fd423Yy7d9S
+GA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+OjIwMDAxL2NhMy5jcmwucGVtMIHCBgNVHSMEgbowgbeAFHe0egLdUvhuGR+r42yt
+SFEH5G64oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNV
BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked_key.pem
index b03a1afe964..ab3c9c72d7b 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIzmsPjJOboPECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMnvufiRciRDBIIEyFx4QuA9SnUG
-n4LCQe2u8Nee9zOnLxJkWHNQoyG1yuJT9fFg2Q+sR7gD6NDBgK8lo+jABh9XQ5cB
-nwzv/8bNluE6p7ebmt7YaZMncPImovABco4LFErIyzrasU1nl/f6jfFe4lgR9Qki
-cr6Aub30vc9Of3b6/skZukndxYNoIu+u/dtKrqmPYt1C7+F+Oa266A9tFrGHvWTv
-P9FTErz3mQzt4p+YVSxFGsNTQ5IcxiTxJZPJwgePBfnI1HrRT13mT3zhBbxTQgi+
-noQe6Mpnf2YFoRS5vfHCv5jkXuQGdNqF6MJAdOmqY7iFdrfQZ//M1EKltnxGZDL6
-WMdmHRdLwBozgiFx/2VlwzTkjfcTrqEUf3AvfU7aqL17w7A0/4bA7riJpfophP9J
-gQZFqNPIzeni9V3M+oixKsmcVp/I1bygphn7YBMp69nCd3FYWATa035VdNRhCXQj
-/W4BhoP9CfHbxD4H00XOmkDQj4RR5uHGzzu9fkb2DACYUi5TA0CnC+Qo4104MsXv
-+CtqKCXfol1C8QfZrxOsM4mYiIvK1OvnIXDHaM5HuCmrTuUvBLHULlagr2GJT6wp
-2K6RM9KMGk8U4qqXXha7GgoDwe6zfsIM3k6Y8m72mbPplH+ZD2+ukEZafL3x7PeO
-SKchS3RLW5+X2iGCRnoxdbQS9Yo9I1vp+XEXVJadTyiS39uoxHS7F15GGryKXWLk
-eC2JeDq1X9o7LyDWm1JcUCCFxIfEd2Z8NkRLGxPe/evl84Htmb8BYKys9S9zpaHb
-YqePwplikpwTwU3KNJz32lHih+mPsXjXI3JfEiKmXkvkoj/9jBQpcz8jqUUFy6MI
-639hSLSv1XM1Fy9lQLEdDS7CisUTkGJJ9y4JO+BoCLWIX4Dp4WLFpyC0qx4i3sV4
-Ho8KTgC42BMOCYyb89djFugXhVbXakkjpvZ57T9hLwo92QBp6VOgFD74jbCluZaf
-+XYp/iprcbL/knqrb38jDNvJJ59xhFSzDKfm2Brnq/x+os/tX/wM8S5ElfHMrcrs
-lFdI225i5GyRNVqPTLz3j6Ml+IwUDJHoc7s05tuEWkAaJNw8xX7/C8CQO5Lg4s/P
-AO/w0Nqa1D96i8QILXsmfcPEIn2XmWSos/j7L/Tpo6DZ7kwnghOqJl558ibhwsnP
-zKys8shLVX8VZ2fmyYA9c5Eb16jg/MSejUB4giisSFQ1a5LSGJO9HCLEky9Tunrt
-rfWTJFKeLyva0KLqu7s3RJIzJQ6PH5XJWM0W1qmJX9UJyD0RZn1ujvC17l3G6+eq
-yhWddDpQ2WN0pxRPDprniVxvD1DJsdNgynBE/qBpZdf/IOmtj51WjTNMUrdPC17S
-+jecWC1WiQ69aROWYaO8RIWiDWj1ifeEbgjNRIW395dDmqU1/PKla43ktIS1GhwO
-XmkLOpHAhlgcfuNOb1d4+RdddnLsAfIg+bdJV1deKrNl8wJ5g+cYxYC8dktX1f1k
-YjkCRSd98kkvaDrj8P/KBEWhUyS7Si8tWhA5IUZ+a+o9+ZAKInx1GyiUJUP1XE0c
-lnAfgYqgkJFPTJsWLBIaRJ/niLiicfjdoLCjy7JNh1cMNZetnjTd+kkev9OeutTh
-0caitpCxTcPtFtD7RKU69g==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIrlzAhpThHxACAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLWrKGQ1Xk6XBIIEyIcyKYHTSC3Q
+vEiEWsPGvyqWDpluHnk2SiJQzBhcmVuWoo0oQWjRGkAbpHePKcMKK8KGUARFj4Gi
++jBGy6IdZrESAg0xOM3JTf1aGZ6oARAjtHs0GOAb0PmjcQBYszRCFZmuLklgihva
+Hajq+XmGQ6R67AEzvvewYf1MBJKAnr0k5xIeknFiXSlooHQyiRi3o5l0Z9NrtZpq
+s7UA2juARD5civ6SI5RBvhnAbcZh7gQSyHs+pe8kFkX31JF10KCGbiqAjI+a0yLf
+RMzMpAQGEpfsCdnMWCnLWoYv/2dqBC18P/XSq3xwxWIbYNR3xjNjyxtPzjM/vxVz
+lHekK8vNVBTuNTDyPNauSJqe18Ubnm0VGk6BeMKv80yTigVbjMpLNaefeak20NNO
+w5EQPnhX9JqcGUM00oezGnHSkAb7QL5D24/waICc4AEPKpt/a5mqM75rPz5Cxxij
+Jy/BvCwF5DHD4ER8Gt8xfy/WLblsS/3G9tUPqyRREknC7PnJBJ2ut0hRCOKtRNVX
+AYfnXGPQ9rp5BSA8q0qonrNAp6g5K4dXtkoi4K16Ht7tBImptvaJp0t6cyyr/K2R
+Dye3G78eu9o6Rr14B5qnBcgBz7Y9Zv+OnfpGXtjGaWaxJOOObvMFYQFYeWWrtljj
+zqeNpYkx4FivlJoiwIgyiEp2bc6iRq1fT2n5XszIR3ED0MwW+e5xYxcFOfSaR+79
+V+zlU74LtVdgEtcfvwM9g+q1h6CBMJfxj/bN+OhX6kUuABceB6tM+CmH8DZ5I8gR
+3PdG3qQuyFFz0lNqdE+5nhxpM4WXaiZ9zBADccpLRvvz7fBJHfFizlgz9RxfOEXR
+9IDFvij4p5vcmNO/2cceHXNLKD7/SSJPmmqNFOVqJckNeJeaLHxsZkRaXpYOwdVD
+ccmYi8H4rYiHY3kxxHdh6iHRepqfimiGLLhUiomJRYIKAXnWMeTVACzUWT0Cttky
+ihvYXHZNItHIT7PmSYnQ4P8Ul81hYq9LhqMYtQwJOtnpA1eD9PIS4FQwwERPWcmQ
+J7S6vMUAMBsRviStU5+459Fz7Ycip1LSPD5Qh/QxuGntyjwpaytXop2Xzj1KDzzn
+4ON5uFvxn2oi0DyvgP2BuVJQiZKx9LSvm090dHopbzYonQlfyYySBjLbmBrFA2Uq
+PZbzT9hBiK8MBA2jwvgbMFHRjJN2BkMJfoZurANN1SG/+a1/SXWcFO0AvU74bN6A
+zImymw/NSkUpg4WjhTtE+jyq8a1o5UuAt9GVQ2lSdxKp1qNJHULWodWg+AcueM8v
+CERECsvMV1MW/9aHNbxeggN5m9JKzBdOookzc7jW0kmDNW68j1rNz+UXiQ0vSZIL
+vNXananXi4A0BPSS7NLcxgMsAYy82vc5MUyFe+dWXQ7Jl9rMPkmzxlTX/VzgTxcx
+/Ewig1kaWePxU6+zsY/+7YshLzCfbpHaPA2piQnpegwEYZYuxrDmMhe/0eTllpFg
+feUDyvVASmpQFWYciDiPa2BnwWYvL4vJ6AULkaICMO+VIM+sAVwp8zXoZJz28oIk
+hIPyJ2C1ThaBsrHwy71qpCsu5msYXLpfit5/GQ1O+83kK3hcBrr79puSQLa96Rdf
+UhkptdH8qXFKxPtZjueLWA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.pem
index d5f1fcf6a32..7ca6e994d35 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.pem
@@ -1,58 +1,58 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-bmZvQHplcm9jLmNvbYIJAOGYOElEzDTWMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
-ckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAAsID9xkCD3L7eGkeY/J+N2U
-q07EuULqsanW0fq6dB9EpEu/u4YAmUlNc0oQm2gKGkYfSC9iXzxfpGGgdVlQKpmL
-VHC207Pl0WxKNhhSQe8JYDs+iR+n+4fZt/HnnK0Z1ONJBvHsy9bpMbzJoo0CosRb
-KNtvTr3gA3x1eTiji8qk3Vzo/N9iyeW8gcbjuHC0j3+F96cf6Zt/1m5mqDSsOKyu
-MtqTvC03CzCTrHgJjJRQ1i0hW0oCu6jRemlJxSAnpJOQN6grtJX5vui6i+kK4CKN
-dh0KWY7DWdEE2rUaqxcy0gQM83fC8pL0HhJ4HJK+BOqEhZ1cn02nz0uA+HbmZMs=
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.settings.json b/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.settings.json
index 17f2f6d08f3..df3dfd1b984 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.settings.json
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256", "crlDistributionPoints": "http://127.0.0.1:20001/cai3.crl.pem"}
+{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256", "crlDistributionPoints": "http://127.0.0.1:20001/cai3.crl.pem"} \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca_key.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca_key.pem
index 39663b0b6d2..d9dafd4f932 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIKgW3nxPNjWoCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECL9TD+V73GOBBIIEyOC1dfmJjiOy
-UVMrgr+4rEmqSvKngoBL9HMBoS07JjIMIXBWUfjSO1N7I66rHmHYCvPgCp5utvSl
-/LZfOMmkt4qtGCIVyqSRKYJxoEDnvn8n5aAJJd4rvOuVvNip2Z9NZ1A8sa3W/rPR
-25L7T2ESdghCW+2xdPakVx4T/6alDAp8FIrv128gMkoF+2Xl5g+W6B+NNakX0CM9
-fNZLGRl8Qu3Kk3NlL+AQR+svw+4X2JQ2YMVOPAev5LUFJbdvZfpqSnH6aTM6kfNi
-2yqjuCn6xJg3m/1Q6BZzk1e5oDXbwvuuCWnnDeqtNnZ2uzTIGxn4VtVeN6axKm5o
-39kqcPatG2vHguFc/5bCBHQmB7IpAuCHNnwJiOgirep1bUxFRKzGNyCUpugQTZ8v
-FChJJAjdgHJlKO+0lh6saGzP94cMH8yQ7LkP7sBifsd3CcmaLCXcz2cN2tg9Tafs
-PRS4VXW2lz6g7WvPe7B4H/fnvx48sXfXOTH6TLit0jS6+ViHAcPAar12HNQKy2CM
-7WmyJBX69M0YvqEpr+QTGvRLFcdKtd7slLFV7bzxHoeVr2pRsI6Yji3WDFDSqCdk
-VdjMo812qNTA6jjZmkP7SE5SFxxDQ+UbjEXF4JZdz+7fx5NUmFRQcYTkt2AicmEg
-BmSWxy5CDaMy97A5e2nU+Tc8JAA8DLkb76DpKiF975aSvwkWcZUuLCGzhLj1l6BQ
-fqG0zuWlgInmdyPcTYNN1lXZC5PUHqu0BmEvKcKipnuyEP7pLrbWM9bxXsCwEMDV
-73SOZPLOdAz9iCPTgoDolrRC/4KY4TsXkBOauCsIS/bRwK9xjhJ+j9uxPN8bXxWe
-wH3lPcjNEtadnT2Q9i3PZdBFRgSL5a9dDkMCfGIwoOV/X/URmDLPXWQMLS42xtne
-vCTPCeXnoAIZZt2VGTgOfvviapxf9/kPBvPBnWZ+rKXFLeulUt8Zr8RKEKOEbGFD
-3TTguup7tqe9mjMcyIKMbRrL/axOT+xEuN9gwO/ucyoluPI9uEAZBigZE02oyuME
-+2yoWkOvdsxSOXrYGGomOy4o6Fq2qd/f9r2Q79NHZr5uP2gabxnLz8htP6Jy/1X1
-u/U/2CHCc5j74+YwCH1pQglgFZbVeJpIfFiSLf7+9W9QwQqRQYpdf5In1vDv8stu
-hP9CpqjpGAXxAPrZE52rM/5kaVkPQtouxuNNOn3ZZB4n7zNxLqO/bRBi+l0OVjp5
-49LRA1+dBixbtSdVl9KcDMyHksSr86N0qpWKJOBYVbvF7+ypy14CIggj2/10tZ7U
-OeO368KEK/Lln4FFUApuirWzLrmlzYKGi5GMcacSyqZI8hqZq0PRT9Mp55KwIT6k
-5qc0LoDeOHrCFeNQ+A1Tb/0Eq9iEiyO7U8chGGDd4rqxY+8UV3v8cSsSB+gBQG+6
-bz6q19Bimq+2zt1Zc6b0Ei3eg7A7n+Z5Qv+YyKwjpgekCbRtfcKornUeDERrX0Po
-28mWVGqzmDOzHzkqrPRXKn4DaIKviH+7ldnzch1S/9mn5D69rrWNq7aUAhjlaD7d
-x28qgmFUnPfBnPUbkUVfdSijCwZx1jfaSW0zmTgCmCZyu1LW414ic8cb6YSWFcqy
-Rzl6DVEb4P22oHEngzWyKA==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIw+u5fJ9UmBQCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPXQYwxn4HSQBIIEyLXp/CM84qpU
+vyLPp4NQfYB9ew7RqRxiMzUBsz+7B9BcroJNYo8/eKj69FGTKochAuOapsbsjz1C
+jAaMYJcb+vgQMU/ldouFwxvYIm/b1Iblo4L6taaZwCfYbDLOPfz6ahhj2QFrVKX9
+GXUOSaxksmzUUq1DOHuQ39qwGQwJ4I4HJ13ZvFWxiuF1i3zRqrBFpLC2Acx29hgv
+lyfZQTIKf/Reb4W9tzCCwRB8qaFKa7XB8Vx/pYYOw3aiGr4ooMu0tPDJXZ0kQPd/
+pxFUPP1gLHJ4X0+3AoduzFRuF+BZE3sPA7TGCpZqmk+uLkjiMy0YlgCffpnoMZoA
+itOJhWPS01hhqJkRHbKoMfIM/qgYaORM/c0FgIZmZwOYF5qerbE3U7mfC3X6S/Na
+Qqwi8xK02BpmyrTQ1kDiMMTvIFGEd6p16IHz4KD0+2wOr6DjfJAcbS5dowVSPZK+
+3MjYn228MWjPteMD1neLzn56gKggUI8YFwkHA/M+cJ0sVdqD4s7gK3O1F2Zj2RQ6
+JrL+XvutrP/pR0wUvoTnnKa3D+kkadqhPSIlpzcxtRDZs3qiRYPsfwloSdBEmuI0
+vxheQSG6iG8MlzRs3vWJRouX4Wm1QMKz+v5vrPQ7JhS7Py5OxZChXqNEoB4l/+5e
+aGJpZ5nRgeUQA/kmMnPXQZegzEJyQwZvE9fltOTzpn9CgYUkqhPyjrJac5Kzvfrh
+wCSKExvQt9ye1wzhgsW+z5WUDUeEx4wd6DNOM7avAfehOIzFQ1kzmWj4qXiWH/Xr
+N1enJvgVVqI9JKkQDWoD4qVssttJpNE/TRy8UKSN5Tkb2itTRwQdbgZYzF5rXXNi
+6RUtLXGQwfPakh8qLuC0mO3XMFy8sFpB2A7IZw+lncJrEsVLv8Z6gKS3LwMygncW
+89BJLgqZQjXrYb0Z8ilNbvjxbohWzLa2yAeeqv1rRDAqFqeTIv4NI598N4GW4Kv8
+cZ78aG1L4yiJjkmDCnKcLiAydnl5V3aV+8evr8Ro5D37XOu0jNB6ObYbjuF9dJrK
+9VlT9UKqD2bXmAZCR2OxO0ffHiOI37ZjwHi3Kg/sQBy5oqsDrnHQy70a6izH6ESA
+rAJ33FS2QrbkChGwsAjaabblgEjz0tKA1JQyT9+WPWm8NVgjZcc9GQNrsMs0rk1f
+c3IQy4owir8LoWxyCsKAfpkbIug3eRulD7QyDf251lSIeJV3Jfq40bdN6H+Cw/Js
+qTmZne/zk4XAgd/nMSeRfp7khlbiLvaF22UF3HjjLpaMIEP35lEWaA80cSc5VTFS
+8+5HAYD0U2ls2yljP/IqMQJdlEoVk0I3Un0EWWcQUXlmgISIcfYZmHpJraECV8gt
+FP2aCM++VVBqS5O8/fM9A8Q0ppUlkPKn5VFFa1KIiVYgHqWSRgzszSOy0Swdo9fB
+FUpj55wxnKkC6NElJ7QvvILOXKdYf1PE04+rJ6jrA7aEVWUGv496/2nWW+KnYONI
+jHJJ4RWIF2v4prEd+glP4H0Aha/tFK9pSIB1945Q3wBf40Sov5rFZEBMdtQ841NS
+p+PzSRQVwFO8q5gYvuNWojVcvOosUn+drvL2le9qAcSfmLv7n2dR/yDgKbEew1lj
+ucbunUPPuq/9IiW3m5sfJA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/crlnumber.old b/cpp/test/IceSSL/certs/db/ca3/intermediate1/crlnumber.old
index 4daddb72ffc..857f065e415 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/crlnumber.old
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/crlnumber.old
@@ -1 +1 @@
-00
+00 \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt b/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt
index 890fd2747b4..87a5528ce1c 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt
@@ -1,2 +1,2 @@
-R 231220163232Z 210916163233Z 52AE617376A913D8 unknown /CN=Server cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R 231220163232Z 210916163233Z 44A8C59B7313C56E unknown /CN=Client cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202554Z 220719202558Z 622D3B11E2137119 unknown /CN=Server cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202555Z 220719202558Z B91E2C53BA045EE4 unknown /CN=Client cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt.old b/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt.old
index 351a41c91a1..e02564a30fc 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt.old
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt.old
@@ -1 +1 @@
-R 231220163232Z 210916163233Z 52AE617376A913D8 unknown /CN=Server cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202554Z 220719202558Z 622D3B11E2137119 unknown /CN=Server cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3.pem
index f7c1b0a9906..03d1869c77e 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3.pem
@@ -1,58 +1,58 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+MIIFCjCCA/KgAwIBAgIIRh5KNnNRZPMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_key.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_key.pem
index a45718f1a79..045050228c8 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIq3RBISDM31sCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKhL20StUckmBIIEyE0ObgjPWp7d
-J2Lnu29ijRx8OE65BmRuKO/5ffvH0HJ4GU/8cJ7ie2TwNC3T7qTaj/tldhMNJWjx
-TEtABI7avqwbaZlyAyFQZ5E/qUZ9kmLkgwdBvvtJbr8J/pV5vLxYtwgOkFlarZMo
-B3zziXeIIGyqy4306wAGYEYys3+79dwdWMtr1UCO3iata8RH/cukx8LtjEo+Lr5i
-eqxhbRsmULAvp+HBMimQdoEGblEMm3Ag8Vba1KfchTYbZnOAjwdDNoOiJtsSFUvk
-z3gvU2XS5kNl/PKkmk/DXBvgWRzRVvAdY4Y4JuJsnraGDZYuPhUcoJ9hutIpIJ/4
-BMS1vrJRELHDSaw6E2LSC3h4Bdavk9GZN1nl2VhoK9zLBgdbvHLWgX0lsl32+kxj
-xcPGJMzay+PTvLD7ZFa6odVmjRP5JBJqOPJkmwVcnDFNNCxvBvS7hdTPvar6/ZTC
-K354Q5WNoLO5aTL65iw6ZsAp/HKVkarPUCORUruvdOr+Jz9QcHVqdYrfYgs+FkXm
-cS6u33sle7Q8LT9X8MJU80OzcUGAv+rHJ5PFIWAEcu+gJ8frdinq915bymKiMN1u
-YdB19rFWrGNariJShGN1NUUiM9x5gNSclcBSzpAQlkvMB1JRVP+uDS2ZNrVcpjQu
-Qv6KjgC/roq5zr3T5ywGYBxFj1btkz+Q+jkXbeMQT3Qbhb8jqjjWgZqLEj5o4mzc
-vdIXVHiYaNBAsGzy8/xsQ/jrd8FHhbWBe7S2fR3FrrQGZp3+3I8XeWzsPXebhOO1
-k2iJbBpRz1huEG6G0nADAZLPm3ohhGDb7/1VRPONG9ReO7YOM5boFcHqpVBYMYrB
-4g0id2NjVldVq2norHKMQNoAOiN0OJDJpDZwugbVBC2yy8RsaBn8OZFSwaX8GK/T
-Ee0ZjEbScvSiFh9apo841wOpyeRap5YTLsw3BjAwVJsACI/XDuLLylpVygg3/Tzt
-roOw3DaW2qtbM6GbxenN80pswTxswcgpbEyQIDVdyOsZE729LTluZknM5oooPyx7
-+BZKhg1oxhoNq21eTDR7lUwr/gcYQs4baMsr0jG/EtzO8tJxWsfvIHQ6G6H3cyMS
-dbH6c7zEN91Sm9XVg8XMsw5eZ7qOsMxD54fQOG8p8sEpvy5ogolYtlRHyHqYGBbF
-zfPcs9HuguObf/loDKNfxSncHMX8JkMVWOmR1G/yViZyfZzts6TujTMqCw57OonZ
-3IJw/XjcGGTay5nu+pGoYPJsUesP6Dg/+gS8JRxGYxXu7sGv5YN9vJslMT8/3nd8
-BjB1DJGVG9bElFjx7mXQJGBuU4GI51BzYWzEgLLMbZTvL0GeeEuZP8P/csi4k7gM
-4OwqNAgN3LcV9cC7GV2PjsbEyudlVupcX9u8TIj2wa3bfb0n/GDJzSbwO0FiBxGv
-MJJCoyuvch9sqSe7FhO3Rb7H7dXtWcJ20uLjDRsQeY6fM9MwlmN8s3/W5zzyLkCA
-528LkQf+Xc1vk8gW28z+7HA1sJmwobOq+cLhOFMzvi3OKQFwr8CnsPyN7CVjas+S
-XNnmXvCsoZZjUPUg6dsinYZ9mWDx1arBUA7Sp/wBXHFbJFJT51bqXeM4BjT6XgiS
-CGN2ulYvV+WjPE8oDiMSvQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIZswECP3+fSMCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLsWvgyLGJPNBIIEyBLSWJkyuDNU
+ic+0/nA9SdEk2ofod9sIumDeUlTXgtwtX+An8loleEFLkBBFly8BZ89wMzZHvqt4
+6WnGas8VrJDZTjcrHfDfUFeL/wyUkHUZWY7c/tcMArg6/MpvMXg1GdrD9ihdVVr7
+Z7PJ8Ru5AIvy1aHS+vN6QlIB8h0kc9wTKZ2KLmQeQPb9i5JplXcQCdd659TzaOqJ
+WyGyWRkvErOad8latoYU1J12vxpsvEiEzQ4ldsTq5cYf56uZSv7Y1jP6JVSwT7P3
+Njj0w1EenLABqCyTSTynm3x9gjHtoZeKZNvPyJQ+TBxwelSTJGKNz7upGN446LmR
+x4YFiYQ3KWoaVCGhDGrC+30a+lAOseUtHMNKqwYI57t/kvQlpFataf+w598QM4m1
+1WSt/B5D8bplHH5v7s9okcS8dE8TyUwrX6OKju0Wa33/0nZiuhXXFdT4xCM3OMLD
+804b/byQPvwQJqB6lIHfKRqzWrKSwEvBPGS22fGelkNmKbCSjRYcZaBm2Ue2OZtw
+3OsJldIoL1niB5fx1qsUtxuSfYq80u3SRd3Sc0iL+1iX/miKD8sW1X4PCy2PF+gd
+70yNfGk5ze+8QFSZF1ZHgschHSo9RDgeTDBvXfgf5QxBvCcxpnCBgdkNBzCif5tb
+YuOmWvk/eHK9cnMBLcHfkQqc41/HDiu3AvGVlijv8BuF/Wm0YZt8W+zCOL4vseVx
+TxBKrLNMuMMk5r2LFE47c6z1iowMiPbfYL4bMEnx6QeDq1IyXzAFdaa/tTWkasC+
+/S/IFEzfdppRo2clymVYnEY9BVP7jI+TgsoQ3f/FQVEkbfxh2YylzmcEBYrxpy69
+Sif2PhSU2gXg3NWHX/vjGook7kawHexDbgevgR/7C6SkBDEZJ/O2DfaYSq9grDVl
+dYnwPIwfecvm2l6rhD6PUUM1Qtq67hLTPosUtPDq2Rd+r4f1Y2gbXhLIUpOXuMOF
+VsVhi/U+h6vt6kztDfWb2I16XiVsMmB4reTmYvLTUTARJ1DBtoRLJF0MrkJuK4Wg
+OqtBTwg0lTB90D9BSibrx2O1U6PmTsfrY0XGk7z7Ckjc3pSQA1rsYjusgO+AKX1i
+msdhy31Ekb+moetwBsBU74JJDGNtA5qIVpYpbejDfumWutMAB0ZS2fa+3yniL778
+Q5BEAdSIZTDPYrXupV/975egPxXSIzgvBD2NidI/WEMx9je/3A8nEgfyo1buNn1B
+heCJlR2zk0FTbSk/uC2fBASSCGBd6ncGb6z4clgH7ZQKSo4ttJH3siKNGkDBYOai
+WKqUnfq7F3/HXLbkKs8HlWCYlP+tbwO5L73mh7ThAZDTcUihzCSnywQ5BpDjpStn
+9hiaY5ERkFqWAsdF2BsGbZFuyDonAxjzWVHDVbH/broGVn7F76xdc0kG8ZCmoMIa
+5qe8wKGqmO+FFcAZzz5Z9Fb5KR+yROrflCo9svlO77lez+nS94OLbFVWOykNgzWH
+js2OpzGB3yRuYvvlS44L3RkeGMpjtA/99Pr0XKlkvj0ksJQgNbLHtPveHNpiSoa5
+5UKrRCJLL20i4HgZcqwBf8WHidXCOX+NpHivnAI4z/d589PNLFzsmhX4FZkZ5TrR
+PwnkfbAnAqIdKqoRytmQXw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked.pem
index cadae49e17e..f2a7d40d7f0 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked.pem
@@ -1,58 +1,58 @@
-----BEGIN CERTIFICATE-----
-MIIFDDCCA/SgAwIBAgIIUq5hc3apE9gwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMDkx
-NjE2MzIzMFoXDTIzMTIyMDE2MzIzMFowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU0OFoXDTI0MTAyMTIwMjU0OFowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
SW50ZXJtZWRpYXRlIENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked_key.pem
index f373624f8f3..63f88845527 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIFHK4JzgKnmICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECD927u2FDA4RBIIEyG80OotoUV/J
-YaFV3nBBIfMOUg0wl1WxU9arW+W+wes3Tqu+s9YjMFcyH8zmTOrbh1dRbACDDcWb
-D8QHgr0NvKYjtM5AVkTb7csDrXjthZIaKY7EWKLqO38VFOK6q+KbVklhn31cZmJf
-UaBMS9S38EQEdNRmOSf/BuElfXQTB8uTHlfm026Vs0efF7KWuHkQiC/R6KS4Oky/
-y5IL2GKDR+57c5oaug3lJ0nKNbiJfjmIFfZoN6hiqfW+U+NA99tIOykEpQPfNJj8
-qSzAv/u5yE5ucTD8N3Yks0wXLSvc9ILkcKp2UTV+5CpORrbN5MP8+B7V4QDkIKRh
-1MOvytFlbYyQskPhleiJDxlcaqjU1/SbDBAFjSUxZDBJi3735hbnO2+bhCEOCGz9
-qdrSAURmKsbew9h2Qy5I1r2cG2MDiLl9AVIIPFRYYICtH66ZKvSXgtVXPTAZCYFO
-UXKPmgtKHpExHQFNuhg8TJ2V6mRlZ9HcdACDOsjA6vJ0zOn7E7zfF78nWVvqGa24
-/nir8MEOzmj/0NxhUV87aXmq+ku2VPwpKuaBevOz6CYa7LczqQKf3lC/s76IWfes
-nG9Wxept9O+akopvtYI7DEuGMNCVrCvpUxAS0D0c/7Wi8PPPoSstbTCoEgNNUaTO
-zvMuA0BGcsRytA1GUs0QIN8iFbFvIDW+VqG+XOhKrR2BPBMFXIh/kDF4+4JkN/IY
-ujsOXWvi1tKQNqUOsyo1VPssJYhVdT8Szdj/Y3wicDzOUEIJf21OuPr8IwgYjDMV
-RsWzVX1i9mzv9+hbEgwgOr/4PXJtJCk7b4EzMRylg8yiSad60cdG7+FYBKK21qa6
-wDnaWvSoSANpSNh1g5eoHJYlt1aqKnONSOfN0NLn3Cch0E3X47zBJ8ot61lvuQdg
-c+gBN2iRNiJl0mHetQqTT6UvMeZ4OzVdyJpDhf/5dtxGbW1TYKauvCLRuvU31f3Y
-PBwHPXFDN1l7vDAPIjE5LxzfZQSWobjnXtAN5+0OjReRzAMLqgOKOUWokSOjquAz
-wFy8SIHojGbIfyeh2Xh3FsycCHR23UVQNJ2eJzEqJ5iP2m8qRSBD7JpgboE8PkPz
-CxdTodnDR8N9QYE2lJiwNRrtNXn16wHu6MCgzxW26HkOCeTzuTMUga5Dh+f8HqLP
-Q45TNKFslF6dX0bJ+diGEaBFAtJpPWzMqLv0bjqcIbqmzfvCysoKuxN0QTWCSA0u
-7x3j8HCACMndPvJY1BAHQQXgxfaEpHHrzFTbDJWKJTlJV88jaJthzMC08ZD5LaDV
-5NdDu/zlaMssnudKGR0s91cyBHLmlOsIWWmOg4lUqbt5y4q2fdJtl/z8nRJ3cMLb
-09aPPkWKfENw+6cWhevnr+Q7DtCzoCorLG5XPBVgmresCXsksBqafltSuLPyzyNk
-Ix0NXdRpYjwkxmxqzsPoD/L67mxTYVrQ2+Fcdn9xRy+BUooDb8y6eLFevv2W/cz3
-uNFlG5HykvBgK1m1pWUX+vasbD1LVs8Iup3zCZltUQBnYMZCc4QqD/KoP+IE9i3w
-VFzuHqvuNo8HI/x5VTqRs9zP4K4qcxYBrlvpkvlZj0EPkKS946L/+NG5uXCnkoii
-/2m3TkuIXEjCRV29r5eGYw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIi3T7SSFOH+UCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHEiUSdNXn9OBIIEyAZjowde0ixX
+WwGwPIoU6WTjEiaUl9GQNO0dmqIN6EKowpw3R8eRgIcbZaKAG/ywuP05frw2zt5P
+KLGPONjIhwBMbDQr0skVQBAn8MvTyKvBumZx9cWf/ZUcrX1vFmgNNn2v8TLokoVl
+yeQea1eDIKrPy8peqShUAIqGU8D6HUvCZUxHKXxgGAGXrUmDcKsFcpttUJ+L/Dh9
+T66MJiH4M7aluRgvz6q9BbqAam1gpLhbFzlu5B/lRlzjwNkAxNGd5lOX6z8xNw+0
+yxRPGXfeC6uAD34o5HuwbStb2MwjWr//g/j5LWE+s3FjmYtt4RPYdr8Cf/jGGRmz
+A/hW0RGKhQevqMJxRWgtm7S2B7xu/2fcfPp6b/2YyUKY7PW1rh4D6bRWYseFqG/q
+L64eJFbkw/ourLlBnWBiTtnzDdfOwJBsXAzBailqZhiiAijb0oR4EKv94bP/Dm4l
+3ZPTE+jzbYb9ybOTT9L5odPBYfJViv6MwZLXIj2EsdrmSM9t1Zskwqy4Nwt7ZP0a
+kBg4szPelt/xio/sX2pokJk6Imp5uTzNkFMy4GhlUfbmew+sB1H2zEG55SF2CKiX
+gzFSvWNnXbRM3P62FWBu03E0CjyXAaGG3HlTgj5HBUTHzeKvGCFSL7iECTfaYxUv
+7OXaxN9RkGZPki+SjaBATkofwiKsNnLnOMhLDszB9ho3YyYLR+2lCfQ+qLzY0YWK
+5auivaTq9s1gEoDQS3077zR1vy14ZV0uKOvhmI0j48k709j7Qh0Z1vRRSyo5EHdr
+lP1hXku98XYPVpxnSDbgHT/TfOVUoH9lwP7faRP/EQfCDgabWK2B4Tm8L5DawRKL
+A1savS/8MeLlrwuO8yxYpPeOlIpnXWXPiGhFPEoHnN9CaSt34c3siMwoEQjD7eGO
+yYfcpWW+MxCeYXvfVmDtJXBVQQh9cEAe7yiBaFWBZmcZ6y+/VgQPRWCwUe/lidC9
+mjmtlD68baRZ91WwoJZER6H7dmgrV0Ke2AP28f2rQXj63j725YalMtRFdq7zAhmm
+7ShaaMfSOTRko8x2LvQPv1R1Hc9poGxjUCMhDzsDtSoTQuRVoWsKolR/TIriLoAS
+wPE9p4l/2Fn+QxiGVGwYkZBOZg3THZqn9i/VP75flNI7/UvwhojOm11ynfqwPHrA
+XNRzTvg+d7XfvZoZDC57g2TNtA/heFUZodcS+saRQjO1f92bIVOlLYA2ZMjSgNnK
+jtb9S5J+rQJM1AFS6ejYpSWD2mtaE4eO/Yqe6QS3ThYCvOZ2c7IGjGtPKtJZRbZg
+31QRLuuVrcO4lRiYPODR4AaRiwGjHqIOZei5ZUDbBClnnr0NrDsU7v8SL9XGbllH
+5uL9QqwUUjcATE8UKFrmx/NF/1s7YzlWe95myVpzo67JwNHL3G0C1REtiET0dXTx
+L8pv9dGkG4gXfAEoxTIxusX4YGGkQpVOefouiQAbHJio8ul3lMxdEahCkb5jc6OK
+ZcvTeJXtFZBqyUfsNfUWTMcJSxdy9hrjoB2rdsdG0IcZYdm4+8c1/fg5HiOCUt/m
+IEIjCzZ5BBUNwMB0nLl/pTiq3Aa2yaJ/+PXTWEftxL2ggyJLOceAtOF+6Gak59g8
+SF6c3t1M/xeiw16XrrgEOg==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3.pem b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3.pem
index 29770144830..ca7dc31ac64 100644
--- a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3.pem
@@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
-yEauD7Avxpdg
+MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAt3nCUPeg2
+4NCplwbYeSRe4+C8KohLFWAA+1dWW9rbckOwpmEQ+mjd4xj9OaX/qy48Ygxu18ue
+W7lQsJf6z9rOxBr+kkDftvGNLHe0Y8GIC7wCtazNeKPUEq6S1NRMarxutj+xCiOb
+7MUEO6k/R+tBs+TdzFqdjPlApzrKRwhHdcFJP5kP/Txo9vtPeBv8x+XqhpC1K2c/
+dICnov3Nw+fikjhlDxjUqKbHoOk8sb21ng4gVodPKcQdOFlVidQu11nD6mNlYKr7
+kaDQCANOESFTYP8nKLVxn3MwWYVx0S92osMz0OqnzoABdW6CnSznshYknoU5AHWa
+ZuQ2CKaVV5cd
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_key.pem b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_key.pem
index c029e5024ae..7107bc46bb8 100644
--- a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsOGEAp9tgWACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHNhq/1JAjouBIIEyLsvD0zE4KOD
-XaNUfwhmfjeYHHj3AYsIQ/kTHAZEo73f3Pyyx4Ann01vHmGzrnssPSqP4mflfCgz
-A28HHTSU3PFZdLuIMKiAEuMxFChCbpcWjlFyBrCwy/nMEzEfcSVhJHIENhDn6Jrr
-uFDUtzRCY04olRM+5mgTfGegC1CPpcAdUjt7QQuaPiDJJxXbspAj+lMIQc9ZSvtm
-hFfxY1JfoIk7DeZ+KBcRotKQ+NbOAZ1zGzXV3qS5rQQTXyFPrdeY3ZWZD7i+YU9q
-u+QNilOY6687Sj/88/IZApnWJ19ir6Rif0rBDyiec6G09k4EtmHh3EtSNQ+hxMR9
-Ik78AN0yZaqzZHAB2+RcDK/Jjn/EZDc3QQRdZdXOgEWmtExoB4PlrxEV6WbccL6X
-qKfPu5UQ/I5Qf9mJe5BpSmi8EOCqb7Z+zzwlgfN9W8GBiJ/b1sqaGyWrlDGcKQvq
-yfnfaFoYP2i/Fwbsr7pVikcwkRbu0zjmJqaRYY2Dty0XvYjMnBQEQ5jW7t/U4EVL
-Ld9AHSLg2yOfZ32ogPabxmogv8Wk8pQ14j843MPzFQEl5gKfJWmP34XfPrOdizH0
-ykXBDyjgP2oTYa06U4rOgscLmJ+I6UjHn+mbpHjHhvRN9zu4XfFrN6iErkKfmyWM
-yT+iqtVbCl1Vnh/lxskTnwxb6VK4yRkU1XBUMsXhdoNro79MsaNyr0s5FYGCeYgi
-xFxpBJEfNlMuWXkzDLz0CQnFVIUihFySNDAZ+S8gn7Qb0eGU3cBephGnTi9CEtGS
-nmTue2PUwLT7XxIMn38mTBEK1COFeI3gd7u3OSUSqY8XE/mT02lx5is/sdsqJuru
-L68/QkG6qq2hRNWMFlCHbe3d/UPZS5YMvFmJocNj6c/Y+fYgrJI3K0cIGqGzjrZv
-lWF8WKg4jbyw6A89zylBqNgTPDklX1n7jmEhh5eTTUY9PhG9QCg9Omxb5SN8veqr
-JOxr7mUQUTG5TQNq4/TPjDuN29r0hBdr9UgjyxlvyHM5Ddl5+zojpe9a+LqXygPB
-eILcNfoPAXtukPfTU0ZSuSHSjPpPG95rkzRiJQ+di1M3pfD/Mxzj8hXzJJquAS72
-6Vlm+7xK7xMHgQsqdsZPghRUa/cthovlLe2rKhAFnmHaIl+mgLw8y5li78QalJO1
-26AuXlK/3isYNQ5cQPnJqgnfPGCHjKHsfOJU5kOK70GANcGy+G920MF266yHRyYU
-IGPEjmEcknhxOOxgfhtfkU4cViAM9nyYZ2uAyYHFRlV9DiFBeN8/rc6BR2pTfcr4
-wxK8Opdd4NKlSXtIeXJA10pGHi/DHRESUdfC0l2C9jgtTQOwtco1+o97MK79ugQh
-OucpkzHt+Otcv63M1m7HXAlONcQST1Bq02u078b6tcs5GkO1HgyMxSHOkzxYu1nG
-RPc6NBI+LeZ3SMJMFj0SxGx5T6ucFl/W0vafGVp3iisJwaEmYLT8LOHqpR4t28yg
-Y/S1bt3C5KsoMlryCWNuNUGpRi55NHYyoVPCXswK4xGZmYWtOO+Y7nKNTCDamA4M
-RrnTrBYOx2lZW7HGJibQishYI2lnk2qRH1e+2a5+isuWcZP85SRWrV1m+630GMwJ
-45wAFdh15CjNmIrV1Lb2uw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIvj+0k09IgAgCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNdqYN985s1MBIIEyDnOlU26MOK0
+/s2FoHUHGr66LPQ90+t2GbYjxnuHroOQtNqIImFaIcvwJcFXIINiMx70CSIFAphd
+b0m0RvvJSvYD6K/Dq2slnkY3NBbQpBr4p3knhCRaVbt5C/R5u8DFx96GlFAFitX8
+ZOdAZUhIpK7WoDHDjmazXQMag0KCDfLWvP7os4FwuJj6ai1nLJj900Lke91OYzID
+UqY/w+X6/CYACI8k36zu7x/5hH3Mb6GWOT3/N9mnMmQ1Vlm41NGVz/EgGwzA5tEx
+6mtXVt0zkwacVOLp6nX/2JZfrUR2HtTw1f9km/2ypbqcpVNHJm1ut+Ozm92MWwQ1
+Z+sB/mRvHvqXRBiRP0xYCfMyn7Q1Bm8AJMHxKgernkZrlPlpvyzuSj0zGEWllpJd
+hVuq9RIQGTLkjpilsB1AXKLx2eAOS9tB8AlUgyb1XT0ILgW/22pyuYBun6eh0Rtc
+2CQWXmxMoKutlLbF7OB/ARtO6yg70AuDvT/2edN5H3CoR6l6ihusjVgGm02aPpDE
+GlXig9deo+WvP3Otj6FDVVYUkI+phJmDBYCuNLKw8q1SM3eD8EVnBVbKCkvJ+oP2
+QYMGkQrbzIJmfsk+yfBvZYKvGcu5vo2tKXHu8T4F2cRbiuB8KR+toec1Cmt0t4vR
+5tcztvTpJ1zprPxl7c6ztjRHWvGyZVP7CTcTgcWMfAhY7e0B9a6JC1DUNxslvoe+
+rXcuysExdltLm3HQUm6dwzRvqoKH/lAPCzYCMs/WgwzqBMhrykrSstnfSExa/GhQ
+mYjcNngBlM+dsILD4wtoyU2p6KJmSjtBY36EL3ji6WMRFN5RT7DhqG2W7wdAoDKd
+A/SzkzvdhXckQauEhRbPpfeog2gA3xbwRrZA4Zrjb00Jw/bzPjQZvJtCm9elfesD
+oivrk2dZ5klDZ7+dxbr87E3Tmajrz4iqvc8wq3wFPhTTPWkPExqVaJCike/0Oauh
+eVbxVf+eSV6SXZjGqPvmVA2AyGSY1p+wNqMMHVkA6cnj0uFlFn8uA3Iyz02UlYpI
+QQhN+LFbadVi7OgjXRRTEu+it4T0j+yRfYl7HpmVQ+iZsptMTrUpb/F4jHjlQk1N
+DHWdgLx44GKOAAsQp13DjFphoNKBJOKu5r/FFSsPVwQttATgHX3paCu6myKvY1cC
+fyCMRoPFkE+zo/B03BTx0J9wSH3kDgA3y0ZiToknhG4FE/M3ibKi81YdTe5sWo8x
+MDl9m8xAdsVOn6N8xkb+iC/TWjiNPpbWiJxJz0D9SlI4u6yVjs4gXxAiBjkGTQAT
+w6NM3kU2QYhdPuWitibcIkq7QiFoyIvP6lhaXjyxe3MloKlE3RaR+LX1osCaXkfr
+dztei/mXxp8l7WK5tBHevhEIlobxfjwcsyGAtbCm64Z4cSsKWicB08/dG4klZX93
+nq/0dJK2qQjcL9JWfOE3jxOJhTOythZfte60KfJA4X6/SAbBUgHTTojY1ZkgO8sb
+xa/stGZXtKqxs1zm0ot9TChVWLuAttq7TrmJtWb8QKJNt8meAAVSvJ1egoDPS6hq
+sRZu0uXuRqsjktomm76UxF+dfGP8z1CylIF8ghBu0jOVsy1rCTNLXsEH5j6G7yMk
+yLR5pebpmjDYc9dIu6lKkA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked.pem b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked.pem
index 11fb50b167e..3515c7509d4 100644
--- a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked.pem
@@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
-gU3gLEIK4DyHbekUlnw/0FQAlQGN
+A4IBAQAAFIJLy49mWCeK6hqVf4EreoLNqst33Tjnho8z17ajnhuSHeuzA8nh6E4O
+IGRYCaRpb4KY99oZ2mX017hgj3FjgsOyyFaQxpuYQ6+vSEGEUSEVj872n3jw58qC
+7tLfzBtzLsCnmmibeLaE1QL6J7xvq9KMXgPMe9BfleiFuK4tOVe3fXd1w6oIIv5d
+hefMLpMu4xh7ZZeJz+P3Aji667Z4M/fxFENIPsAg+dbJ95s0hPfTojQIoPElc6E+
+gPyYlQfAZLi+oyK/wLqNvaQvvkZFhyxTXAtWDl8AV2x9I8Yfk8a5Eoj7WxksYnNd
+zmMjrT1Z3K2BUvW7h0DuBUTF73aX
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked_key.pem
index af7a57eb28b..cae3db25349 100644
--- a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIP5IUhar8Ij0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFW+dV+3/bHABIIEyOtantDlOOTN
-I7iIjAbAUjYbMFHbdil8f05Rs4dQuE+3IdnR79zLsxHihAXNQjKNS6ZHqcXtMgLf
-KUcScJb5KtVAaD0aFNCr3gByVQj9FB9RHGMateW6qWck+IFPXuMklstfOBBl8R6U
-pqC+nj6q9592Uw5wWwGKtDcA2DzlmUSqDKqqzEzmrtISUJhU9kqQkxdcyloL2eBd
-KSm1eMVIghakSSEWbrqBIsltTeG6B1dOzkvuKiMZMfqamNSvuCOlTbVOuq09/9y5
-pCM+RXUW/99IAlBHVpHK9d8EGGBpkeeZ2o6drkFcm+JrdTIgdIH5r9AGN/Wn8+JF
-DSt7g6vO8jGYWdKnVErSAZX1v4KYutYDsoU0xL18mddWkgpu0MgfUx6dxYnX/41N
-4GuUPvQPhP4YHusZtQKpAfKQUcT40ybXw4qWUMqo3LSQ8RJSTtTJkhWRW7lovZZY
-jVUh/9YqH58sp/e9MQtCgoMptX3GJUDDnZWmxGCR+ex3iTSIqnn0x/y1jR3KgLV/
-quyZ7y65tN/uHQM6+w2yW+9AINxLNG9krz2czvrcNHBmZKI1HgsVEkrfdeSqwQR1
-hEmMmfmZwy/s72c6h4amnt6yT/vJE06I7AK8zK1mxpdq33rgrTIg2OvD1dIP23jS
-wWCQAMRrzfcvrGppQQCtoMHuKLL1uAA5OcQqu05nXKny0+HK3mN5S9aY4+zYjzfb
-VrOb4alaBxJf4XTNOIJFAlJzk7Oqld8tK8Dqy00E0lDh26OaLO/VvYcFIrAJ6P2t
-a2zmSB92wj/F0DyCEp6OqFPPCKaNqu38Y/AhzhIFKfYiuBC7rm8dy932m2pCeXus
-j4Pt1oh/iYr4uijGAfMmS278LKnAIyAFPKNfJQxAU/5cGHYOwttJCe/SHBQ+iwlp
-W3wd3i7i2kRajCErwCLGf9g/kUj6yPYGpJqCgELmjvz5aeqqccecW4JwPrRcAMIc
-fGxU7dk0nf2ddmnpKdaA34v9E2kIaUR/RnJUg6TORrNONCV+YhXVGriuZYX70pJx
-nutpr5lOyU3rsJWi5DjLamHxdAKqy9voqOhGwOSM7RPM7sgveLTQXwKkEo3FSwB8
-XGE3B4WQNMCSgg86L2h6Yb1Ut6ksF7aV55j2n/nwv7i5RttU6qgo2OYVy93Xh6+7
-nWIG+cW750fYflhRRBWNIWzaDrqlxUmLci068V6gBy95HwBzVx/5XNTgbl2E6HNR
-uHYg5vqphsKs4cfAKqOmi6X7/lZjQcCt8n7Gl9oUxr7f8VIX0cSPr/Rr7BImBdRk
-VD95H6C+lcsoQ8Hgjh7+mqWadWkRkCWnUcUFqtHRocDnJHh5ztJ+m3D6WDnnHOXd
-J1f4JgJjUbKkHWjuYiRk5rty0FxfiRJtZx//4XX5WBLQnBRY/OPyBv3tazpBhzfM
-6+p8XrILapRa7QSJivXrlNxr9yUSkMbddjiWwAo/RRDUvLtMNF/W75rfm/3q60ir
-7NhuuLw5nc52di6goG2sZLPf+GOq1xvLF1H8QGqSZ1QzH12qzNIBCeyUj/Y+3Cx/
-nFaTL6rqeRiKb8/Ud3fE5v5loGnYK1+g5v6GuyiYxYMgOkG8jEkniEe8hWvzOCBp
-+9o3/jI0a1hu7NpWkJdNYw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIz+RQjkFfYT0CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFQpcZF1GPjeBIIEyG4/5aBxk2HW
+d8fe/uerwkP/zeHyMmsq73AYYlgabUghm74V+uciyjzf10ireoLqh8O2IphKMyCV
+vZ8IcFIwV8sP398jWgLYLN1I02U+Kct6H/f+yuhC8ROZkP5x790iYQwduhBxF9ze
+eqCRARjI5a3SJRix4UrRK8gGlxforc9d248xUQw3BtYtmDByYAzWLTqgmuy+WKSs
+zWCdpp+JUhqpCw87JQ/cxlDq8ZJGicW3DJwuktcLpMuc2TRmQ+pIMev69DSKdndl
+GN7jeYmWar6urZM7bHodW3E7X6LWa6IyYq7LpWM8nSOZ3l5b64zrQ0fEBHink6xz
+sEWfuDKncmmnVXBpI1H7ijMbUvlFxn2sADdP/lA7eTlPy2tL/iSvzY8vgaY6VV8j
+pgRKWxxL/CdAZgTD73C5spu2cSU9QNOdOZwnaWYuymWn78FHbzZylmMGEk7pIc9H
+YqeGus3H7nUiMYZjeouK2aSevXDu+1zXZfgCnBDMUkVqCbA9hIA1y9dIx/sSh7rh
+ZF8qWouybHvSD5etXqw6dUCJfm37mqkQjP4AhtsE+TZXlwqbef/I5j3yqcELxd9G
+bf1XRC5v6Q1sWO6G5xFrp/FMJ6G9GBMNxiz9/ZkXKB7DY+PsqsbwTANoQIrP5kyp
+52mDoyT/IVK6/JhEMzUPThiGn3yawtYptzGI+pi7xT/aTSWcejmHjGuORpRLBn08
+Wo+DCDXEg2zN2BXdamH3zpH+YI3fRlGQGcjsIJ8qAmbejJ7NzbGd9QhZI8VQLIb3
+ql3U0jKDdF02IJhpoh+W/pT6wgqWKIArgRTuJwTax4zEjlfFdnzs4+Ngojlgm0Tv
+kHk8cBNFo/DIR3VIVd9Mx5zbmA9cbW84o0QJ3Pn8Ex+BBfPBLKF8YRo0YIKVk/I2
+g3FAB9gmSNNsP70qII/nt53lqxRPRWQVOintIFS+ey2a5N2bIzyxLZ9exrBGBeFj
+UquOCwIcHgOQ0fp4rdchYghY9tg/Ew1x5OrbIvwzvPrWc+8ctNWMQMnGadeAutuI
+yJPrg33zh7GfZa0gjR0U+a5w3lWdTlhOX7cB7NhmziKuUTmteglbhGHBrrJnieiX
+s5nJA3Eo1Dqt5bzawlNzwsVmbNwzjVwrq4I5POnUV0x67MCYOBWV0gpTZxWoFm2V
+iLpqaKG4vIOXF1RGRW03z0BIszfr00xZX4UHPKjAxbXj0ZX4AS13NXmZpwvxXyN2
+3SojNvnUWxltdxPd0Ilv1OfMFs+Gwn+5eE92qmv8E6wuWwb1J4lXjyqKTOYfAXc3
+nF8KPmviv65MNHMJXq0zx7tDC5S8nNthahplHYCQrHc+4YAzixhWmNKX15J1y3Z+
+mBxg8nb9WEE/WVZRuSWMEmxAXO55zmMdjpPo/FZAOfkPF0IHnLL1taIr0gXyQBPg
+TouIuxDApMRScmcUvq44tV2fRno1U0PSsjq00qi5fHwnRMZnEs4J8PQ7sf11FnFP
+UfE0N8EZV6FZjclD69iOhQR487rTm5pCQje3JDoBaLPhqML9Jvdd9hSuzn4wVvfF
+Z5V9gDZWTuSufkzdMvQLIwJ5ZIqYBpTKQlJpUnxTGZNuYcxjan/W8VWA8IbFiyBv
+tuALvyiaFvr54YDEjtNRLA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4.pem
index bb7f1888fcb..7b99c7eda0c 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4.pem
@@ -1,31 +1,31 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-Zm9AemVyb2MuY29tggkAgSvhMIVd41wwCwYDVR0PBAQDAgXgMGIGCCsGAQUFBwEB
-BFYwVDAiBggrBgEFBQcwAYYWaHR0cDovLzEyNy4wLjAuMToyMDAwMjAuBggrBgEF
-BQcwAoYiaHR0cDovLzEyNy4wLjAuMToyMDAwMS9jYWNlcnQ0LmRlcjAXBgNVHREE
-EDAOhwR/AAABggZjbGllbnQwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9j
-LmNvbTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAEjSd
-E3TMx6c7dHBQ6+2hSeE4WvwOjClomYCSk/RPZi/Uw6uFgJO6mh/WgdaXm4HHHU4k
-GZ6hQxSephZgZJZ2Wram5Gpne6DaXG2XvQLwYtL0RgWCx01lFnaUSExNEOqzjGAN
-ZQ6WE0FUF3eqkQJKLXHuvJBJ19iABADE+jNGlO2b9XlyaJUYLffHeW8ESVZd0Npb
-FNsWpquHWW2nZr9OFYuoka8rA8aWMmN974d4hOD8JKU3nSTMJ767oz29n2DIO+3y
-YWOh49JsZdSMgzmy/xmLVY2SGvtNIwvzTTsJO6KZNkuFcvwYWiP05IWM4S365MP5
-RsBWAQukVHG4KkN+TA==
+Zm9AemVyb2MuY29tgghHBPovLA7xMzALBgNVHQ8EBAMCBeAwYgYIKwYBBQUHAQEE
+VjBUMCIGCCsGAQUFBzABhhZodHRwOi8vMTI3LjAuMC4xOjIwMDAyMC4GCCsGAQUF
+BzAChiJodHRwOi8vMTI3LjAuMC4xOjIwMDAxL2NhY2VydDQuZGVyMBcGA1UdEQQQ
+MA6HBH8AAAGCBmNsaWVudDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2Mu
+Y29tMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQBBRXny
+4ICB8gASz7S9e2rgu7BlWHqdHDlT2io+WFH9oT5SroIcFT/d/Kix0ic/u59dnWSB
+4hVATMePhzixMic2Ln0Hw7KDfo1Z45jMcfQkHuf9PSpxY6GLat0dp24Wtb9NfSG8
+AAPL7NlvadBozvjciAcZJ5isqLq2TjWbG/y8DsPMLdlZaJpD0VSGwa1ZTFpWErAv
+A0vpkBgR6QkA87dkgQ3PlKsFzo/lNW9v/CL8SoH5OHGzcaDfDIYM+8bQEXAWX8NQ
+LufC2qHMThV93eQ5u+FsaijYzX2KHLweLm2eL4OhvtXwp2NXQb7OQHYgTZbqdda7
+neiaFu0fBCKELwEW
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_key.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_key.pem
index df6b5571e74..3bffb6c61c8 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIQjciC+dKkzkCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAAepDreP5RtBIIEyCXGuw2mdR0S
-1lmkXagAASpjnJchGyZ+b4v7UN2DGwWt2ApEDN+aFrvhk6NI3Gh1J3wmdzQQ1T0q
-v5kg/bSmCw1FqNmiKorI+xp1j+yKDOIwOrxu3F2dGKQgIjXkVQZQCptnZrjdMAju
-DoK7ht1UADVT7MSruuFZgSn0q5hujERyt03vLajlO+WUYzgs3whXkZjxvlskn1n+
-UpespVJ2aBVXAT1ZzJ65RZ7kIryeGwFo3KpefwxLWtEn+OkC6+9mClPQLZ3DfXuE
-LLC2B4T2cZceQyzwrQc4VF726xFXLwXn/MJzSFzAuekjTPQbavcqns5JuJ/JBdQH
-KRZTOXzw2jFC72ZqFQTfktjcVwxahkOZnarbehN6XbngOidRhCHmpU3m5RH70s+o
-9yXEA0WZ7NaWL+zNbs7iBqGVPWvW7Zr0EEXr6lqAeVHgFDl0e6iL3TTRNROc88Xu
-o0LkFnuwxk6fVVWY8Nxhw568OhRbg92EKVGxvdZBiVq3iXEG1GcdCP/9opCJL8gR
-YJgWkeq+WYegZC1BlgtLvSv9M91Ae6wmQHMaubAmni3sk5piVTJe2O6DE/+Y7X9G
-gpYVmQtt80uEuo7JIzvFxrZNS6x3Va/wcB45tOgjwt+8Ay/BmBZYW6uiRLx34h1T
-bF0YwKhKrn7X7QupBVdVL9GIadjxd0NAd1m0w7ZHI8xa5GqJckcsaWUuZXMesfvX
-yvfoGnEVzbJlrk82nsE4Dh1HYJzpdbbflBRJnCpocvvKk0wZ5og7gIAvZYdNnVvb
-+KMmpgYT/FCRqx05jb6tqXNnWhddO6zqqj5VRFg6T4TfRAZpFCFrsUsgzwCnLOKT
-rVVNeCVWZciD940Omy12qFcLXpPPGFqrDp2+LeXQ9cF+I+wMIbjDcyU/L5hMYj7U
-LMh456O25SoS9e4PRxgJi3kODp/TcHQuANitCOIsvmIOc8KZS4lxADiXrys/toYf
-LN4cL6tHKwvKSnhKqjPt/PlU7CmNAFNurApZY3QsCDCrRVp5ckUNNPuDw7FDIaVF
-ZdnltounkCgncEFQscbqFsRokILIGN7XaVhqnYJhzBqrKZG3BmoTQXYViRSUOOdB
-NY+XKqriBmLqRWExuirpopHZwsEQnImkZo7VS6HJRieGYa1v6+JydYS/dC5AIzyT
-WBFOobSvR8u2BKvtRspeu47b7tHH2wYYtcKH9nl+4/8D2nzDfvfW59+jYiCEtU3K
-M2+L8KPCQC4U5h+ssgnvqR0RNApOx8BHxz0c3EkLYpJuvSu3Px9EspAqoOKa0Rtg
-afwon0j7GtJ7HEo1IjCmzg7JtkliAv1wXgTsWi7ZuyVnZgyxmfPHVos8GfeAug06
-lsCANjJIXe8jDa1c3dIQLFaHUH7JlchtWV7eoK5EejG1lxrdG8qkc77rA7BsAmg5
-poHYnmPB+ZjpNRu7pcHU6SqPDAx5iHAF/V27oWoqoGykUFPFbvFDf79MN9S7w9Gz
-8uUeHeWcea282RQXLIy/m5RymZbGCMzlM128Cei7RP44pociCwuDE99hVIwYMOlU
-bAOl1Ms8qi6LDFOXh+adN57VniN8KKoB/aAHcoztuzobU6bD7Y5dEs7MHyvr5zBd
-3F5F1XGFZwWAKdvkl43xeQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqiBG7n452u8CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBd1TIKapUJZBIIEyPm+zbkvZ6Fi
+0rM1rqOrFDXzCpiL0djlHFjrQXxmMkM+gQwHp8nUpYnDvvN++KSzgFIKmYlKOaPJ
+aCcfHnzGBjT9IakuT+bBRmfuEVannwLfahtFR7oyeWA7lbne89LEScSlJFCKse1m
+hMx/XUqeUNlE055C2B1Ovz5uyKzVJtLWYAuGl/TUiNbzbz8kzj1SsSDMxVXmDSaJ
+09S8S/vQgOfvJDTZUqmGhJW2G/ydFaDM8i2Oy8UIrlGW2/pUM/s1fUpIFeBR35Gk
+Fcb89Z5RUUkXsF/LtE5ryJkqX0B6seLYYwU0gJNdQyRRj3dnvx5S3+8YwRQcUGVb
+79Gi0aryS7jGE6jCRr+5ZKBa7PQZqCNfliRIs38oqp2lEGYPm2Bu4iFyxM7bJtyv
+9EvPSo5Y1gDqv9uO0G8gd8MoMQ92B5UR0bKjpkdcdQp/BTFZ/cIPly25J1bZgYN7
+fre+5A3k0Od81ugiX8rYhghRNNyEwhS5Nzd70aWs49nA3TskHkXgSqD5EnihuCUE
+Zp9zdcgNWJf0hbh+3mzUX4FtZMaA20qkbu+puiNq/BRG81DcWlrdwo7TmMHzq5BR
+P40JCFLpJYH7GeV3DBZHXWJ2MbpSq/Mp2ZrXBjhVbvDgsrWb+wMjRcgXqTvPj8gb
+lb9BL1Y/XPB6g9XunUvAQLGc7kp5ZyYqdlI1f/uEthuXd1BcDroOtfPBDi0zuFne
+/J0OfSt204uwAyLVLghvt0B4QQGLg83YUk60Nr8XxJKRQe/HKC7sHzRR71FiUuVf
+Ifa9sjQg0cnFfeNOPWa09vvmFTdmcAv8C1vzd5tYf8nMTpz7TVLSjZOqY5EJrFF/
+gjfas8x/BzhFG9Z+fZM7TNJwrZVzVXuU/bxou2IUxa7Y3bSjtjw2nMlaHyiXES7W
+m40maC2K1BnyXggi82qKJfa8YGS66MBsqmWjU57kr7By/odpJ8H5nHwxVFnajp7K
+gDFtakWsuvN0hqmVJAxA4xFnSyJZh/h2c2ZYUvpTLmH387rzwg65RiSgYDvY+8L+
+llW6hIuQQ5w1i9t0GVIzAeYE7BeGdQbvA8aEWJ6vEWVpyp5SeDwdHiJd+fsgn+fE
+8KR2GQqVWX4Sx0hxM0r+fot6Ot3Uwr2NoNMg+ELY00gEjwHlOWf6+wtcTiI+ZWSX
+XNYNBNrIex6letlrVh/VjC/Xl7NnryIs0LDDG2R4f5HZuGaOGXChziFnuTqa9Xbs
+72rcVk8eZ02kIruB2J1ahQcImOpGuOGCnwbPUexFULt/MV7uYyCtRr13ODBQYMOn
+u/G5DcodwSksYBKseXwNqkNdHm86wTq0FVRPtHmrRaCDlv6pWKv9qI8Wdj9TI+Cz
+9MGheXm2HnHC2qVe85DW/CSwLw06ancHBdU3F0KjKnWRAbImZBINqizr6Pz9zJbe
+oEpgbUR/ohbobhkz5VmMLbyAlXUZU+N/iG22DffGnIKpM6HLbsvweh8F7eUeX9SD
+2N5CFcdBIuYAf+K7K9X60Ws9yU+NgYlfULWaN1EaG8udA1tlQHXtua8K89fdQHDT
+ngwrg1JBvK0MhduCknkjWOCdUxeFfIvI4sjHvwvRj7R78QNNtPdzoytLCFp0QqbQ
+Q4TTUO4uhaqd+5+8d87JqA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked.pem
index 1273ab0ae52..6a9abb70397 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked.pem
@@ -1,31 +1,31 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
-DBcGlsbhFRqHDgz7POzM5waQsq0=
+ggEBALCZy0O52uOqxbFpaulWQeGfI1vg7fpyvSSYNvzofwZ7tgIuj88xhS8lYHY9
+vrtNI5vVZ0vaFjrlIHY7Ovp1I/bU9M4UtBVpHK20Iw65Du7BnVutWSdNWViVxlVb
+c8mF/uNvYnt3zhtZ3T2vNxK9IPhrisE7eFBxNDWePfYbmolsF7k/hKOZJIuGunlK
+5jczgz+vAxlx2vz190yhWaZm7rXJY5PA3MFOfZl5pXT/qivhRex2yRlm2QlKrgsy
+W9myY4gW3hB3AhRhSjbULiFBmeujhijVi9dYluv/4QDNaP8OkMuyop50pJu7FlMM
+oFThpoDp8Gpexkh64Xub7UkkSNQ=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked_key.pem
index 10ae49fd32d..563856a2d5c 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI3QS6IBFNbUICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMZL5ChdJc1uBIIEyNSaQAKFFQ4z
-x82Y0ObFuYLzX97JvKO6ty6IjL8F6yBXFNdD6kGu8S0rRmOnAwjEwD3OG+zOFtAO
-DTld+oCNoE81TDCp7ULSfFMMUBC4qeYrIiDl7qXGZLMTR340wkr+kiJWnDwKIspp
-aUqKVEwjRKMmHXvLlwjjDx4UtfHjYNCyW8slXarcJSrB0idw7hx0qS8NX8swSQDT
-PwaC5a+lnIKqxtxFz9BwzoH+UqXye+0AlL4vbT4N/dz+EKR5DZ0AyQ2TDjkbuyO1
-yJyO1YTnCnZO/vjDt/xCqsNG8mZKqwXIJeqpOUacBTdZsvlRRPJoP1Y0q6WTR9sM
-qvz3o76Sy0jhC0hXDxR7+rc4YU4fMt3es5JUM9KChmo+Dc6n67wrNjjkYBlzAU+j
-L6QPaU+3rACe14njOf1yPDY/572HjjVTTB+JbC6Hn19TZQwOlYQFU/5R0CTH+ief
-JJQeuiAHIeGcikrMEITML+oYAuB6efJYsAjprplHcWH3wJmnxyZcmyLEzW5NIFqS
-cauP1GsNca26iPV/vT/X5bQ0Bi4bO9gXMtnO/sPMQJZNxShEgUZH70gXG+q3lm+Z
-y4f+EWkBlYRbA7CAFerxCWIUvP56lqdFSXdeTAQcAQJVlIGmaLV2p4XwPttdCdZ/
-+4kRcjeg5UP8topmBcGjsdx4Bl7ovbHznN9STB7CgE991YGuxwVh4qNqbZgo8gK/
-prS3ZSIsntWeH3MwoupecWkhmf3T6WcIvUqeYcZh2iThWZIrzUkOlDGFhu4LwDxp
-j1O3LYUa3rJbScIqSs6ra9dByP14CoVWtvcLotWwd3dvndNcaXMJlRtTg9HeIGK3
-HBlphV1fDF8dKXLU+pa+0Od3JtRtto1zJx6k2YubU7FDmh1EyQagVWNCVafCl6kb
-JeA77EQ7jiBiUk69jt6voL5guo4tFhDviBZyfmfGjUMbz96vyGd97y/HFgXWNI7j
-u/RIgMZ3zR5Z6FnGXgFnsORqmM6yW+behHCL74NPxr1q8ZFBCISfWDLQKcr7kF4O
-REuPyuEzciaUjrkn9Jmv+rEDcoBNKLkNO3K/2nJYevyIi26rcz+K9v3G2+htpmLR
-c/A24uj62hvTP4+70PDEc5RRtXOofEGVS4QoZ5Tr/u4oUwy5qniQGKbJ9OJry33F
-mZ+Djb/oNZs2UkbEckHwpr3hcpqPDrN2dx5UDqLnWv1R2OyoAyHFcxdSw3lWnLDX
-CKHj68cI02i9XKheJmCS2P6M5JbeZQsdgZDziw5Xveyiat192PVS0T4vdFVKXAlB
-MUoB+5gruPpOQphc4eVBTqo7OsIsbTS2Kap1WqMt+0kAadBwkBo5hQgrecTYc7dh
-MkzkDa4M28l2ea90N20Z4H49utJmqILOQk1fvSYRdWZYW0/GYMbumz5Kz8bJ9ECz
-eVdbDciFEvelasV/KNyu6Gn2cbsNhZ/2HD1g9L3m2FplJsDgcYabZGsJDKyjxIb8
-JD1fcMRQg6t4BOa5U2iryuIdAJZF17+OI7vfmplN8IpGDLj/QlriuLCkpw+rIzIi
-Iqi7tH4255p9d3ODiy9NJr78ndcJ7s0EsttsLwRH7OUgk4aiCbF44WMRjSELgfe6
-Y3573WdBYbW9F2PIUNJgiQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIry4XwarZQ90CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECN01lzweGb7xBIIEyJC8hWpGL2tT
+8xQEBkbyj6QGKWrnY6cuxSPaXIdV9F+D9xaLjez70Eb/vp1BmXsB3IZaz2ogL3dR
+gknfpV/skLQS4Wmswd4Ca2EdjGaqAay+gv/usAzF77j5LB4d9a+FZ1qk+qNv7dcP
+HAqVTa+QES2Ll+g2Fm7ZPRFc3WguDoLQzcxhhDT8yrUnHcZYSup65axu24f4Q+BO
+CbaKYKmWDGSxcBldSObBZErl259SXm/YrCdBOaPFLD2QBz74lUhhTtrFQv1pce5s
+N6jb+UWk9d1WE/g96llAII4CMyAOqBCwfuWZEuMDSySbmCmGjJ4rqk+rbYoPDjta
+dGcSTBsX1w8fczCmAnuDzpYD1R8ePRZdJ7dpLUa8wBtSHBLGbslHhEvfEJjJ/s9e
+d9vnLlx2qd4ibkrb1TSqnvkq/RLLnhkgYBSjYTw/7XEcqkXt7bFS3Rv6alhARwmg
+2MJI8l4xAYV+dqSplBWfLocBJUuP6Wtgpadr2JzLYDwdiDLoUzUhzt0kSsdl1mCv
+2a8cRKY6UVtZ/lc7gFedBNUbvMJxQq3DUXqpFGlvdUTAle6iAoy+CvGjyPOLiQ12
+kbnM5o4rosYP3rOBACSZNujk+JV6jIkwQCQkFwDpMnkOydml559dYL4gS3x/GQ2x
+vSZ/1mCpQAnZmSYv9/smdUaO0CZh61hMY1q79ZoKAJC8QrPdVUYshYVY5S0G6YAa
+4yL/4TzPoatZIkMCd5yIscLEtAWeMNprFBfJcfvjrVL4O4tOFNHvEAR1Xs7essss
+JmjEzfaHLExZUTQDRWMcGsI6pUzXNg1pMvSWWAKqM2tYwcUe5ShZcoVNCD/HaYUV
+3iJ6Q2O4vfNGnqV0LG3aMOn2mb2Vl27AMBuCOwelm8H0k3kW8h7PABUHLdp9AJqw
+aqKJCYpKBaVUQq9S9KMiesK3ToLEeGQYErmXnVFbU+J5Ykl0+Ys/TTTWjye7ZIek
+Gn9nw9rLv6GnOLX9w/iB+VXaC0k8ygWh4ucceQPW3TVP13z0RL62UI3doDg3ocAL
+cHKjHMyth3NC4F2ZmTh/3cG/dPdIiv5IusW7GMis9MK1v5Cpef7Qa0QLtQwiCjmw
+533G5rjwBlSrkGl/pI+YThWYjqfy41I/Zalo7NyFxLilIkdcgtxlO+ynnpCfO394
+FVgqyFmA/fTnaUh/7kY7dF4+Nx0sK0FzCLMFtX4CdBVh9KDCsPxFgAQ+tVP1gMeP
+vN5PS7azcpEyW83lHxVEIzr919ATsvVDSZ8sccbGfMWGvGBy9/PSm+uh+6UlSGR5
+1fodrTHN1oUX3RKXZG1SltwrwhH7Lg0bfwnnRyunSndEuUWlRd/fFvtNfZxhmamd
+d/DvUcsNRT1TdmNTUVxJSiwtpGAR8BxtaCGHXa8ZhHME+XS8HC3IQExCPnq2AfxC
+ezs1pThgrSVEKon2QtYRtsFRwGv7JcCdr/YQZPzl/7S7tXL5uzJa1InL67dOHOnm
+FXl89FbvKu4pUWHVOUvdmnSXBsRegLapveiwCpN/R650vDJsZZOXd9QUCw3+m3IK
+fQJqBPMhotkZ4/aZu6zdJnCuBeSH+UyJzICqEo74Ox/f45KwjWkd4hoJVyCNpkqE
+udMmt7nSNWLaos4QlElcFw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown.pem
index 062775b7cbc..f6bf288e5a5 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown.pem
@@ -1,30 +1,31 @@
-----BEGIN CERTIFICATE-----
-MIIFLTCCBBWgAwIBAgIJAMDCPUtC26l2MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+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
-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
+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
-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
+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
-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
+DQEJARYOaW5mb0B6ZXJvYy5jb22CCEcE+i8sDvEzMAsGA1UdDwQEAwIF4DBiBggr
+BgEFBQcBAQRWMFQwIgYIKwYBBQUHMAGGFmh0dHA6Ly8xMjcuMC4wLjE6MjAwMDIw
+LgYIKwYBBQUHMAKGImh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2FjZXJ0NC5kZXIw
+FwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
+ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQAD
+ggEBAIZRcmnjNs+iHq99O7PUFvRJcLmrkr9idUCC54A8N1MSN/ck/n9m0WrRzYww
+tnk+KtU/ilKk1gcxXAQti7vXlQW5WB47VStbD5n21aHTPMOw7/R9ID2DQCnYl8PR
+TW79rSlZSJLtdmWSjx90sOcRZu96ry3GQp/jy2FiJGoVAVAgigE2wY8uCF3GS5TW
+nQwCqhE0PEz5cw9iV0/ro3cNBwNNu3rOaTHQtAZN1ULZhGtndCIR+sIdnvtuHRwD
+3mUQeV1YcyfG2s/Jc/qMvU3w6GcvRR5ylczLXia4Kt1Erm5Q7IHBKEODEiLX7EZf
+nHLIk2q/09Gn63MKk9SZ6gQRn1o=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown_key.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown_key.pem
index f32445875f2..400752222e5 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyCPZ/HCxop8CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOTbgzEC/TXnBIIEyJyIKV7U17PU
-ZLb1T+DgCizhz+pn82oEgpuFSDvK15iknCBihYQ+QT554lC/8howMJiCQtPGxpNZ
-wBrBdA2DpCTLtASagpT719wZ75GT0GBlIvsyUtcJYiPrIptuBFkQ4IjPQia2daQ9
-gWWkBWWl9HAus0M5nVokEaAclppeNvX4Y+ezRH0HfQw4F4d+Pi/ahjESWufHu3HG
-uRkYUgom8FvMVHb2MDO1Z0onOWBnt6USq2FR/LRcmu50eS+k3AvlIu5VRjeLhrT6
-Lspxhg5NhtBzhGMPV/hL0Da1fJoGc6kMWqRGvLfNlOzB2x+3WtWv1uybue279fS9
-ISHNXlyXiVlJpdDNnEUG0BFZYfCu2NNwcDobjM6kKkDIH1Z9oZ+ZOaMMRtpdX+k8
-JhdG0gNWWVWRhPwC5xI06bdBYLQcP4m8nlBVnaRDoNSOML+BHoJRCDz34UuKEg+X
-N34bFhSogbflOi+3edtcbjmRe1ydVu/99UV5xHMA7OkUKomPM2t4A/mgxl7/iMbI
-odgV9IRhAtny++kk9fWalf6sNo8Xf7aIV9WLk5yT+9DNHbogT01/WbjOTVmH9a0S
-oNvYtvKEecLD1+R1XeZbxQ/hrwcyqNimcHUskxDffMnTHt0a8BmwVyE6CwHx+0cm
-O3RfuYIkqKGZHy9o52umReVpC3kvKPzdzIw/0efLg9ud7h3OJabg7hIc9FuRY++9
-fgWHYGzX3+/F3NdDcesR08O3NlvYGatAk08fTGX5DZxkuWiHwsVFMTBv69qyg82q
-az4tJKMI+tlCdNGa2/w/edsu39qR5batAYs+IkINTPxONFlzD2djpZm0P76Q0vKH
-ghw17YJ6NrKzVAh+Oq24Df2wPgLWqVxVa7AzTaY7yJbfHOGO+3eEtFCogm2HFfzN
-ef79HRdp36QYFGadQaXlfYn4ge7cUlne7zhJn3Dcy7pHERx+YVM7VzNDCzQAJrMm
-463B+J8xEiSI4IZ6du4Sb2Lw4JXzfhq7SxdjodwAJk9msYbJb8KI1fqt3yeB0kKx
-SoPyLFeudnKjT0Ho4wjOorDWoimOXljfBpE3ubfnaaDreMNuaM7UsvvlWT1cRcmC
-/FzAkQJ4dZg/5psgu1CfhHZcZM9NDdVhP10evUhhVjr7BMdhZsxW+x4Nv9B/9Egg
-Wsd/1Fh5w/orIxvkhq/MFf4KCZ1/gGgYYBdhZ+pgvNKCr4kHJdJ1jDu/NOuBNjs4
-JQIGsBcC+XISSG0xyJMfrwKw9A9PlySI/LHvyTzhQMK4h6Tk5ojHxSECgIPqgacT
-qM8ulaMoS1AG8ogWsXdd7iXmoWxrElZ+6yJ2zltJudIwACC29IaNp94lZ3C2SPUt
-iHGIrOGXuqR7CZpMTSq8gBHiCjIa6wzuygyI3gfGBc+SjuMTxEaMAmabpjoDxJFs
-m32MuIPi/2fdJndM61PTaj+ZlV31FtPtl61bIBB1coww7k/bTgatAbOQto+r2PVH
-w08jB27xN2MGhavknpn8UaYWFkaGBKVlMaSRiWSYDoayD2Sbh2NOSMNRQ5TBpkaR
-jsnqQOixFSbslAEKjUTNhjOyPBV9x0up3/BSObSR16kxCWTiZblppx1UeYDwSyub
-NlFYIJ9BluwQWXgS7pQxBg==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI2D+aVvBjOaECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCG5u3bAXBzXBIIEyIGJacDhfCLe
+OwxJ2apdm78z3nm2CLjxPbXCc0vANOq/6b8Tp9wUCsqBuu6jrrFJpc2fMplBapLB
+mDDf1S4j9XE1bUFoniOmlFkiBFBRkCLbQHWNCLm/7ok268zur8lycelSj3k12QYh
+5X9YTOFGutehL/oU0fLkgsCIGZEECTDCXoDhUpNISXAwF4Hm4E798I0m94vp1pkn
+tUfFzlQWbJvt3K9BYaJw/EMOcpER5XBVTIDlGYAbBW9sXM0fGT1KgmtT2K9zmyq7
+SyzNPSTLOqYGAUYXkF19uJ1/8VyzhMLaD83x6glv9y90e88HLjaOR2+tLdecwlDA
+grbQoYObfg7iDOMtLoRhLeQ4xyyRxuuQVV/W+y3d/OAOKOCjSw9elFq9kqpjGSKQ
+6nbDoL/p9jxOablSI8ByKLej9cQ427dSzOTU03DpRJQvFw9c2O07grNXRU6Kh/Kx
+KDhaz43++5Hix+dquJmVOzWGav2gGLw348GSMcUK0RTa1Ph6+mxNT5Ky7YK4KfAY
+aHtBhyqdFCC8e+eFxZKoIjgKrNlAQ1zGw4AFPf3pyvvPfut8AOD4HOSBjxXM3U7d
+j6Gh7znAKXCFnJ+61A93ictN+kenyZ2cmrWdQAhP+SrCmcs/Tt8+7dhFs8iShVpQ
+Fy5O7Fa824Gr+FQJWfMJZg8S25Yh4zEKcjsxgwi48QQyAIIUC1ExnTRzZER9u/8M
+JgCpMPyl5TJVWmPX+ZYK/PgkgxwHvm0CWtfokyX/MgJw4KKAcyu1BYwwTaDp4dAv
+DP+4K/UJRym5IMVeCwXaZuXfiZ/NC9amfgZY8aVm4lizI/ZpjsbUH4v+GDsAHltT
+Oq/gWV6PHVWk5VGITTWgO3p6Z0ePsivctGJCiS5dn73ECQqXKOwheTBW4x36RvpL
+rvQibcVbX7r6adXuDf1sj9gvpcIxYOMAF6m5N6x57Clnpq0inohpLIVkwePIG3mw
+pvavturO22tzzMOoUCZaAuiOgVV1i2arhTq0Y9Q7FDUVBnqL68RwG3aR8dnzG9/u
+lyzYgE0uCD9641TW/ErMdiRo3UudrXAG1w1weSPPdCf77GyK5s46fwIOlQ30y53n
+40y7ua4Vxhvi1keA48ciVq2tYQ69T+4gkRYpn/d1E3Rut6vQ1RBKsLA36D+dhO2E
+J/isIDdhuNwTWrIrgSpHmFhtR1hhsv5sTwU9IRHOiwDf3wn2qnveQWDodX2mgoHG
+RpNayewy6ozvrexsmJ9beCtUYTThOSQfmXhWZhiNGj9c/9wbgKR49I2IS0LZsyD9
+kMB+9w/6Nfbosebk3QZHsUUNzfyyX8XpAtjL7FU2VH16mmwY6rk5HaoYSyjE2FNE
+2+3VaosuPTkSahc/bqqKcofamWN+dwgP12JtFw0jPToahscBLUigLqMDGJkEnJYo
+iynP2BjrN4E+taDP5YggdkVtnkcLzLDqosnxkwvQQGnKiYKr4DmZ7c833E/8IyUF
+IeeY5Olhewgfe48j6MiHL43VDbBJ3s4XBdF3ywuz1Scok8TXx2FYp95MkcCtblql
+Fni+tWqrHpyJs0YS6WdyYWkAajhDDVTINvz1ybPVoZE5DWEi3yG+U4gyymrTg6Mw
+BYOBZpPvjR8rUTxXb8OlBA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/ca.pem b/cpp/test/IceSSL/certs/db/ca4/ca.pem
index 96f069257b6..52956d05bf9 100644
--- a/cpp/test/IceSSL/certs/db/ca4/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/ca.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIJAIEr4TCFXeNcMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMTA5
-MTYxNjMyMzBaFw0yMzEyMjAxNjMyMzBaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
-IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
-BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAME+gjpbcHfR85ROm4hsT94XBQQgCcT7ZOqG1HvzDRyZYs5jCxpY
-9BeKLd0JjacuXpp/uiFiy3F2MSkEp1KyviV10+uqv3myGd+phCRtRFpDRX2y7ocn
-+WUTWi0koqfs2KLqzqBhgfSLHeLHECKOH3u1NUGZSjfR7+hEu04Ru65non7SyQ3U
-Csa1psXsWMKlo1YfdPTzGJ5IQ2cJXHQFylpgLk8yrVDImMHPymsajXFsq34jpkpu
-QDZeKHCaKEgl20S3xrmALCHpXNdkjqtc2gNoVI+C//oZpk9ms2EOlsKwzxB8/d9W
-eunK4h0IB3H2mZ6QWAm0SSyAVSAdaNBDxxECAwEAAaNfMF0wDAYDVR0TBAUwAwEB
-/zAdBgNVHQ4EFgQU/it+ysGyPKGv41bKHJBfIpNzzLswCwYDVR0PBAQDAgGGMCEG
-A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
-ggEBALq8P+lJ+nvK7LegSDKT5WamOzO4YThObANCsP/zLQRsIbHjWGDkGT57ndwc
-1Wp0GkhoTWOraocAnEHTSFnMC6j+xABspMxz6ob5T5mIFLmyiTf2psVlmsPDmbR8
-RIOMkW0WFBQKO+zFSE8Mwwnw+QKGL7Xj396ZxGC9SfNiOrW0UBJUBsML3Ck/hM/H
-+GVqFN15/WK/LOzCzTWVUlrFFAKtii9r9PUgJfX+XySULcFwvu+rPsgxxMGn2CNa
-iuAAumzTVRJTVM7VSGEImz0VM2F32jKhsjQwbNI2KqlYCTZlklecHT6Fk1Dd8SQi
-pBJgYgVfzEcgm5pNMFakDUzOcw8=
+MIID/zCCAuegAwIBAgIIRwT6LywO8TMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsb2Zd7YfAoQe0yqQf9Jln4GgXw/MTwIJtNSsXlzCgKFez4sNvZTO
+zZDXEGsVERnrndwDO5/Fh3za7HhAXHwd9cmYiTTkMgQZy1dHyCx/LkYrLx+sLGnx
+BnhEMh1h79EdU3pKq6WRFbxpsJ5mWG0yaSZoVUzhz0WUDo1YmAisOoYFEtOwg6PR
+VUX/mWOHo5jlnCsLK6Ez5Uw99CVctNgfbHFTdVIowj6YKMtiFccWH6q39qg2Zvzv
+RLvYcT6ZsN9fnhDo8XdK9L7BPrUaCkBxTUbiljwIkErcbwlQODzADUuSYEQGsPjn
+R+eg/AD05uqBQfX8eXxtX21Yujb9ooy1+wIDAQABo18wXTAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBQUiznE73EGhCA1WDjrJZOvZumR6jALBgNVHQ8EBAMCAYYwIQYD
+VR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOC
+AQEANU8ZhUyK4zjCGZoea5zYtk8BLot8POj9c+kCQHVmyeH6fjyuxICudX0dY69n
+myHvI0jhtxiHd7YGEYE6OeWeCOUHn/8v1unqbDWFjBmYLOgoNVQ6UhfcF9gVn6cp
+356nTTcGmz7ZvhloqQb//6rKk1mfq+6KrCrMO2qVRmYtcV2blrhHZj+4flmFbn2e
+ldsDqOwLHinFpvQFnr7xnBYyGMISOl/MM89PQRq22Ob313qExLe2G7VFMJ7SAEET
+qeqcGKHRlF01EniJ9OV9cnJH+uzzsmA1GRZltqpdrqcDF3z7pmiePFO+zFdSqDtv
+zagOFOzlR8lNDB0MiKhXWZx61w==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/ca.settings.json b/cpp/test/IceSSL/certs/db/ca4/ca.settings.json
index 695493121dc..e14ccf789c4 100644
--- a/cpp/test/IceSSL/certs/db/ca4/ca.settings.json
+++ b/cpp/test/IceSSL/certs/db/ca4/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256", "ocspResponder": "http://127.0.0.1:20002", "caIssuers": "http://127.0.0.1:20001/cacert4.der"}
+{"validity": 825, "keysize": 2048, "keyalg": "rsa", "sigalg": "sha256", "ocspResponder": "http://127.0.0.1:20002", "caIssuers": "http://127.0.0.1:20001/cacert4.der"} \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca4/ca_key.pem b/cpp/test/IceSSL/certs/db/ca4/ca_key.pem
index b6804980a36..7abb38d13bb 100644
--- a/cpp/test/IceSSL/certs/db/ca4/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/ca_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIYo4vzb5d2tYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKbx/sHxLxS1BIIEyGDkOn99ZiuC
-ynbCEzPWWxP6sLb3/HPnFMVpwJvMKg7v8/hTu/dJ79XnUDYzk0LC6qzg21nCEBSH
-F0kbrg79L1IRsq2DGcJxlqPkq7j+aRiUhZXdV9xe1dRhDGGZTjARkQ4ycTt5dzf1
-Krd8/chJrGvx/zTWNpU78glFIiVd6qY7tkmCDyyQMLkkxh7kOQUZi3BSkyOU1Fl4
-hxcNW3xyrvDoC6qk5awXqLTcobaiUPzKu3cTxndySzrZW99Uen4ZySbfOlPtf8YP
-2mnD7Op2KiZNaZ/ogobB91yEkxpIL2KRlZuiX64yDe027l1ODNUcXjXZYslBS9V0
-Q62BUKEUGuWAGKnr+QXx27QsZAI2X4Uek2zvlM14ha9/CRQGwHtQXPntFJO0bDqJ
-Sjn1P1+Owus04Gh7/a/oIXCXKKyJNY8olfJZwRG7dKUwghY5WjX1JyoqsQNzv8bw
-O9Ql94fMqM3SZUxXEhaAPlZWa4kj/ZOBkbZ9PccLXZKYaOktmK/HBY5C//JoopkQ
-+2rh+yi90rEPo3m3ChIXadmZQsL7ELUEL0H5xobpNKdFGyb5qQXO/bKagaAtjL9B
-2mVEeff6TgfywqqvHjl+9NznyN8o5ImF0l7hkyeMhvE9TQ1FgKF1o4fKCnfSwqvH
-EAlxGWYmNUrmVHwX5BmqDvniTWOskCaAC998kpRV0SkDO/fZUkPexracA7vSD0rY
-upyYbvvs8AJaTa/mZWXWu1obbs90G0Io8Q1ZG/9emqGsgKfxgMZiNncrv94hpJZb
-1SKjmdkUtl+GBCXQQU62Ilcoq/r1jFRqwzE9WA4FqkgmA2Uqf3T0CzAhdc1ETMSw
-kvyZa1G379K45DnBIi6i9L0NNGCecQcnbwuqUafiu8d6NU01268QJDcdE1Q49WJo
-nrD6PsJ8Fh2dt857/WvUO7axCSsjIzpUugSO9XMUEPvqaI+uRH/rTkYiR+uy5v64
-ohKlw2N//q1dqC6AuyAnqYId4e+lONAAxElpD4Dr/HWo8A03FZW7i5NVn+CKxqti
-oys4HZPQ+8bw4trQCp2MriJxioHDPgwnoMaSLOivczVhirteDK4ps2vjE0b92Ogo
-Wnhd+oU00PnnbeRsWW8FGY8n3OmNOHVwaWgIQlqH18uwjAcBDXV6rkzm+5EhyYl0
-wbdGKEI6ulFqxCZqOx2IHPdWnogryCATfb3yQXxFHkFpn4aq4TTAweDwNXIy3H7I
-42oq8kxFcuBxYMCVYTveoJsWgFgrVOgCqS/exRs4/ZGrPfEQ+b9hyi/XpPY8wFTn
-xo6AeJX+x/sRGRiLZoZHqWOWDFHYAj13JF8rIxjeVOrdDX7Cu3VYyuylYcnHVBac
-FZ1LvJLiDLqKx0/uSvkSFF4WHeTFfAXyKjHUwecaRihs67O25yztNTuKpuJlt7FG
-rnHBW4IfSBZNaK0T8rCSJXxlIhV7Xe5GPusGLzrIxS19eLy61PtWL0nsiEqHBzzw
-ZT3r6rauzGX+K6L5a8bKdf1c4RY6Yx4+9rHStF6F7Iv2tuOkf+foIfPFcgC9WXse
-bpkJnJn75y/k1Aenv6kjSVXdHCqERS/jxxEeIEgRqWA0XG1NiyCO1r3IERq8dWhm
-2ps0SCX3ycbptqHuHKo9hg==
+MIIFFDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI06/j00H1R4ICAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIw2bT+HV0IOBIIEwF2KBloPkebQ
+qargA4wMn9jSx5Z0wL3q1PZQNGYFqxJOugLIKxLSpX8h74mhPo+LnlfR0eYmPwcw
+ERUZ0LOeAsZFUuy2I58zkJh7stoIhwoH0QcEL+ckPRuJ5vzWaqK4FR76va0oOIhE
+4Q3thI2knQNsvqvx3RbBtUwn2xcy1+tHyrU7/Q74R2ub4B3SdFxKUh1cjyXn7YC6
+K1rmjfiGUgiPIf0KCIX+rREI449z1jFK5/2EXmgvDMMczMq48oQiNlDUYXJjkHO7
+r725x2w1rUDIy4Xc7g+d9JAW/7UHVo4S137IXFjMcwbNy74I2YEWugLRfgkXqA6+
+0hZ6r1YpbWkcEBA/R7beyqLLlTfGuOvrimFeCbq4e2Y3UYXg0Jjk/bHNrDOlXFWd
++ROlBE285PoIYemwihq/u6EoOeXVmL2hstTVuM2xwz/IfSgAfsHGXJ7+WiXcJ+qP
+R89lERNxYWO809e+CA5vwBCBd53ER/vaT9YPIC8zYYDpcRsDc8s8aIb1VLp3+Twv
+ntrW2VbP/2Lqm2Z4iLY5WjS7rxvzrw42jtYq75qaGX51+P2XWKyiSQmssSG8P1U1
+vVfHCITw+4sbC0QTg2EMVd4BruqXi2v5RNgJnYZ4bw1wvjS+KMIiHVQ65bXRW+3K
+NjxxSxjsyXrgDUnAiSXlFziBM1V88XFgBETmMQZ7FdCElBuEdBrGDZ2vjX4znN+w
+/QoYMW4Ood3roTaKoOhDhpFHL/tDhyufYtW+OyEUandhdh9ju7S9ZwXXlYtFTfXD
+TJVqsyQpvPrsCr+McOYU5mLhh/2bHPxaT5ZipQUv7i2ACT77ENeYIvszzdNp4moA
+Dpjwrc1Izc9elPKkfSgFAjVW5qjLzi9m9KXYdZwmg3DsCaxnBXjiPWOyOFo2i8P0
+uixpCp/qu6GgoK3K8607sdwfLlTxha0gUDnQhXGkS9jWg6IKD+2K3Q0yWyDHYoQp
+vSomai2kHBQOjtkUHvYXHHZHOAlW+STC4ugTKAeQDl2O7f7Uh4vZdheHZgmT+XPs
+oP0PcUyLNGu1uKm+Ytxm6A+JkiJ62ZTghlOIAjnPkBDshVZwE9TTcTpiJo+vkCTl
+zGoxvumsKaJ8gZwIs7WAaUOH6wTaipQlQtC+lTmYdPKiFmFxGVdFn8UfRimbyliX
+NV7u7OGawdHGt2S0up8hVikM6Jc7+rjV4ICS9Q3iWEvqa+J//OXl8g894uf6S28h
+DjhDBwze4fEYMr3pEZYOrfMN0AT7fX9hyCcYrYwv+XOBv4GLEuRywhsRPp/znsE8
+zLZVJjimdcqlIhTClv5FT/oN9F1fZxYBSwCI/BHr2X3YrK4wmluoLu21Urz9nDGp
+BzA9j0PKIOs1Qc1ONi/q6k3eYvSOp1XVF80i0Z4ffu4cPlPxL8ZjR+QH6l0AIlkx
++7VsYgQi/PsJBbOpIxsGKcMsHVcAjrxy50evWOJt6OsBEPLo37UFnvAy35dIRooN
+PQ7ivNlf/ScttW+IZNOcHaO9a7ep/sOFgRXmWK2uMFJLznGORJBznqPjTGyxhRdL
+zxGVdPqOdbZLBdDULWqNlNcREsgpOwSd+Z3aHj6dvNk2k71QnEXtY5zXS6kVyXaH
+SLCX0sxfiac=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/crlnumber.old b/cpp/test/IceSSL/certs/db/ca4/crlnumber.old
index 4daddb72ffc..857f065e415 100644
--- a/cpp/test/IceSSL/certs/db/ca4/crlnumber.old
+++ b/cpp/test/IceSSL/certs/db/ca4/crlnumber.old
@@ -1 +1 @@
-00
+00 \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca4/index.txt b/cpp/test/IceSSL/certs/db/ca4/index.txt
index 77faf783e67..fdfd5b639e2 100644
--- a/cpp/test/IceSSL/certs/db/ca4/index.txt
+++ b/cpp/test/IceSSL/certs/db/ca4/index.txt
@@ -1,3 +1,3 @@
-R 231220163233Z 210916163233Z 528FCD564D74B882 unknown /CN=Server ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R 231220163233Z 210916163233Z 06B0E86CD8619859 unknown /CN=Client ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R 231220163230Z 210916163233Z ABBF8C8EDFFB78E8 unknown /CN=ZeroC Test Intermediate CA 4/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202555Z 220719202558Z E955949C6EA73EFD unknown /CN=Server ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202555Z 220719202558Z 914B487CC6DDEFB4 unknown /CN=Client ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202548Z 220719202558Z 028F9505719C41D5 unknown /CN=ZeroC Test Intermediate CA 4/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca4/index.txt.old b/cpp/test/IceSSL/certs/db/ca4/index.txt.old
index e5fed01d59a..b13f484c4d0 100644
--- a/cpp/test/IceSSL/certs/db/ca4/index.txt.old
+++ b/cpp/test/IceSSL/certs/db/ca4/index.txt.old
@@ -1,2 +1,2 @@
-R 231220163233Z 210916163233Z 528FCD564D74B882 unknown /CN=Server ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R 231220163233Z 210916163233Z 06B0E86CD8619859 unknown /CN=Client ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202555Z 220719202558Z E955949C6EA73EFD unknown /CN=Server ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202555Z 220719202558Z 914B487CC6DDEFB4 unknown /CN=Client ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4.pem
index 4ba6f5721c1..5db169a13c6 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4.pem
@@ -1,60 +1,60 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIFOzCCBCOgAwIBAgIJAKu/jI7f+3joMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMTA5
-MTYxNjMyMzBaFw0yMzEyMjAxNjMyMzBaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
-IEludGVybWVkaWF0ZSBDQSA0MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
-LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
-VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDW9CwWv7bxP2hYov2kUuKshDNiiLJ+GnTL
-9XQwgGvy9pJIizDhyrTAgvNAeLY46TNauZpUKYGXv5qRLLOckz6jgP0tKDTxpBpA
-ZHA4bFybi+TkgvbrWOPypTs/ccQyts+8aHw15ZUdt+P1kVSEIgR6+ZC+Y2nvEA7Z
-GUMGCkUd6WEMwQ9uhCH2eb4c4i0Eqt66DZyZjZZoWnEXcOQypdBBDStpX9Ea2LDO
-Z9jdCP0cQ7aQoWE7VshmKXJtNQt8Y4h3JPmn2dUJBdtFBaLDtyVw9EyYaW5++MXh
-zERxf9IZs40eIsr/FiSuBcEOBUhOxhSoBCe62uUfHF+/YW2YcrdxAgMBAAGjggGL
-MIIBhzAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBTJIksqWuICC9mJkR0dfKlkjZFV
-MDALBgNVHQ8EBAMCAYYwYgYIKwYBBQUHAQEEVjBUMCIGCCsGAQUFBzABhhZodHRw
-Oi8vMTI3LjAuMC4xOjIwMDAyMC4GCCsGAQUFBzAChiJodHRwOi8vMTI3LjAuMC4x
-OjIwMDAxL2NhY2VydDQuZGVyMIHDBgNVHSMEgbswgbiAFP4rfsrBsjyhr+NWyhyQ
-XyKTc8y7oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNV
-BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
-EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
-bmZvQHplcm9jLmNvbYIJAIEr4TCFXeNcMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
-ckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAIYce+hcm9S5U325ke018B83
-VmTyDPPs4DzUzxw64MJoKHG3F/1p0uHlXtSEMomokb3L0ro6FJ8JypMILGBO12d/
-SuR5yvivDQa18ek6654n5wupeWgzUOSsESlm8ylykFV1FNS1d34taxnoPMFTm/6h
-tT277HBSydKneAsIS+eqTwYrfkJKUuAIXMeNAgFC9dFzX+P6yecHj3bpxdqwu+KZ
-VGvHT07SDa+SFha7o2a5wMfkmrDnff+qGEcB4xPPv4aGPcpU6UNh1aluQeO9Rb4m
-uk4LudBow0zv0NtVg+HFYgIdbmuEmAgsgyatODMuMIQKXee4Z+Hfqc/eyqycw0s=
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_key.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_key.pem
index 0d477dc2f23..275330d2f6e 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIDbeDRHNOYc4CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJ5GkxMZSq29BIIEyBq/dHmZR18w
-J/aZ8uxUT/Ygy1NRbkr20ItvCYASlHLAzb+cIwvbG4azjx6lf7GMujnqqFuntgSl
-4DC0dMC5af0VBahvncnaDddbrrPGLKz0z9TSBEvtJEAav4c4wV2yLUB2ejocLXJP
-fKHY18cgQh7bbjzyFtxowUDrO8TF3ZGDqMI6NNL85synlLUNLLtuCwkevG6MX7Nx
-gb+x9vRiF+SckvSN++K0qSDQ93qvfWMiu7bEavxH0fwuHMnQABfzc/rySBjdeXN7
-/9bOqFaSbZoCdRdVONTRLGPHrZr07EXZU/zQ77/DOVxTF/Nu6DfgsZuL0yBREpBY
-MPFRRhEPqeCrpU2UOUZQBvQT+q1+FXbATHX36QO+bCyggijM3yO9yU5Yrrg6euaA
-lRBxrBrWyIIxImI/IksCCVHqZQmTy8cwr4VInzIRCb1aLxMqaiSD6rz5BGWlr48q
-3iWSVHq9dvPJ6fD66hUzeOteEHKHdmDxxRzEe0qfm1mN+PArKDuUi1OF5MKWfCek
-I2XhRQgG2OlJ/PCiOTJg/SXyjYvp878fyUSfLSjM7oqQs2k+Pb1dr8VLuLhuUeg/
-B8JEEQ4UWPDcTa0YiYtMSLGak2sx2WPWr40gobfHZKPLQwfOiZKf31pCGr/wV7ss
-L6+6X5Mq9PFtjjnCseKjW08f6mIDUo+4m7jz0l3K9wvfT6L4RPRhUE0PhEoipagR
-xOci0zSAFuYIsGtrvCqcJegtnx3Nfd/D3uPS+hU+FmdQZQTbpQ8o/Wjx6Eulqsw5
-nMF1RMGs5pzAT+y45G6NpbuHAPrgEx2v4jAjgtWwYYc82DgzVJIMHerLWV8Kxs+J
-c7/td+sh59dLUKBTnoV1Egp3cQFYIxYcXdGOLnym88AFx+JCMSs5k0doBQ9dPw68
-yXS9c78ebXbYYq/CEVuHv/yMPeKZw/QLmdnWODy2nIzZ1GQeK2XoBNiuX+zyQBga
-DqR5FpVotvYbdLst6eqExCohcdbftaperrMnpIrE84Yq6U7/cutIL36tleXQBWzD
-VqCR/4IcJ05WqpIeReVqSjpNGYAvpzIbvjJyKGixRDKCxtOIWFFTe1VaNloz8ufL
-+iHTEaryIG4RdKqv1JanP19oebanmKN+CnZi9pXHZL8pP1sbwVwvCRx6iaUSNRK9
-SqBxIVXNo+UxzL1qaFwrAWKsqZGmTAl939kf49j+pfvLsfnUrIOud9sYnnzTjoyx
-yJ6sDuHmIMDJ8YvLlXeoROO0QyBZC/OlNlIAaZ3Ho9RSJUeKGQ81cUfBr9ydLfw4
-1Gi1ndAEW9161UJiz/Gf0+cI2gL/UrVsHeUAZLmHOxI8yfvkjPN1kz5bM9EYB4WB
-bsqeNvro8DfO8hZv+T3qDfqt47rqck57DlQqxYtCXzrnUE7g36BJyToiskPZ0ep2
-q71XXUr5VE7DnyxTlQUDufegQg4Pcd9hGjt999AqO1sZreahtnCj68NuH758B8br
-O1uODGcrFZEBuGcoVrQo5CPS4HqtCfEqVwnVRC591ox62RTkHZIh9nuTRIKJ+/H1
-uaCXiYm8AOato/krsmaab2bqIEc+G2vVCXpGAD4vOAKv2pRDf6BFWjWW5YyBB82q
-/V07lcgAbKWsj3U/nhUVOg==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIc4BeWIYj16ACAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECG2cUtvkuJzvBIIEyNUfjJFmV1nU
+EeA9RXPEO+hOsS9hrQeyDPGVjnYnzqtTux/80kfF0h6PY5XdBN1SlvFF1MFkGJOq
+kG8AbMuRCxO/Y+uyqE5UuphHt6rInbZshrbuNiupaLNDzZL4BLmyzA6BiI5h8Yw2
+QcgL3Js3Ugsg10PG0rdhHUSps/4pcoXgw6kpovFwKm2V0YYCIsOHFuZCu0il7Y8n
+7+e4ZJjtvJ7Gw4WthlIG1nlY09huNx8cFUerm4kepR7mpCwIdcSy8U/nkiH95KbT
+obYAbQpWUogz2vkgXk0k9LzVGYO7wPl9vBn3K9Qd3bHpwU5b9KJP0IFDPOhHhfia
+m8jXWJFDSaQ8ZY5lbFaQLyyWevudvh44iAxTTziev5feYtx5TrjXRCEEAa771Ed/
+lDQqVZvssAOHZ9qih2nRemV23CxKkl8APFh8slHCuI8tBnM9SVy4nsPvSdTDRrj0
+Og/XJCUFE92gkgWt+g61JrSgHaVIEJB0R1H/LBKKTs9vqULb48y5f2R8ElllrkZi
+n2Nzhv/vGJza+oioyTRt5pr6wPErS87G9it8+3VhBSP7SRsF/E3UFGBUcmLre6An
+eIF4BxyUzGZUNWoOXzw45hnNsiUZYfOrmJ+jCj5JfBCUHwOd5SHD25qxPX1ppLHg
+o9YG/CU9D1seRj1g19NVCGqTZlp9y8EhBmsQb+LCkd2jWWXGZxX06mzXOKYG+7gP
+SSpi70plZPXdrWHO85YrWo7fC0RTL5wt8GfX1n5W5gac0dkCRqwnTa6qNr0dpRTK
+YWae8AlJwhQb5Au56XhHlNCGKy96UwNQm2eekJ6Iiq2LBbLnqnM5RrHGjzXxBF7f
+7MozpsG6dvGe74gADUaCokCHiYtCjFDAWi4/1qItP3NVPQop0LETFM7N1l0UtsXG
+IsKuxBo4ls5Pf8URgUIazrH+S3KhZ7tTeh4NLje1B+Z2s0TlLLJKFXXLgVdtB5vh
+ewAZ95h9QEdg3v9+6+HUmtug0vWib5KhABkpyUvQm6yGlf1YViODTX44aXM41Tpa
++PS60SMoDzCHjWjVgYjGD4MFasKlP+V7Bi0QhOR/yDUAl/RQYSRGy8TqGIuTj2si
+bMWZo42AHBg3MxYB3jB/uRLZ3MQtAwKVFjvjtyFkQXviwIQic/DV1F2BTHsDZh5N
+BCzCw65NS2FhYHpJ3mtoUFC2st4xi9TOwnRP4m+DPefakY8xM/qT12JFwPQkHUEX
+7KOeZkzZt0nT0+tsZZz84n7b280e58RQbEi1vknXcZAXcToLwFTVo0sE1v/xiFbJ
+iaS7E3Xf+G35wiIBxT8w1dw9oI81gJe/+iAeQH6lbuTmk6fluJVHkL0huwtrUK/D
+j6kRBvPKLAPO8FTY6uYoO0nJp0WsL3ay2kfSMftIUkZFSVa7PC/7asLWF5ml88dc
+K9fqy0Q3yoPklME4yEC2vR8I+BL+MM5KLgwXY/eLZ+6vCEO3jb0gmXKKI8eHRgdU
+tknBOgTLm5/tJwUgX3ZaLRUn49XLyXmtcuVDL9OPrHmy1dpdbYhzefA+42s5s1TB
+jw963xPdpY5TN31Z9dmREIxOCWbzWJozcf/MfBnQpJF5KDayF8HIKpJVtmpdcOTf
+71hu3J6WMs99pVRMXAXcqw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked.pem
index 51e153c5c32..054b105367a 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked.pem
@@ -1,60 +1,60 @@
-----BEGIN CERTIFICATE-----
-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
+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
-Yy5jb20wHhcNMjEwOTE2MTYzMjMzWhcNMjMxMjIwMTYzMjMzWjCBkjEcMBoGA1UE
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked_key.pem
index 969b69cfe5e..35542b877fe 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIp5oIzWsgeh4CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKQqykLnC2SRBIIEyNdDFQsCEPbn
-Az1z3Y1W6pmKkjf6ulGgYLRmqyA4CAdAo1F9P52i/qOoC6aZCcSXgZRr20x1a08i
-ohKQ4D+YcxrHmW8sKyBr7Q3842MGk0DEYOY0ljBtNERLyvGLWbVrOLGqb4Sd+UYa
-CSPFNwgzpZoYqUpViut9JYNJTsCoyB6Wrcdz/2U6Fbicvo793+JUWXUKCTe6h0R/
-3+7pPVtqd2cwhgy3GA/20Yf/n2JczwBnUVqRm3Lq75jooTrxODAMkIL9ciIyBEbJ
-rWilEsTg1sj+8Vjyje+2fRAoqoaLVrgmjb3m1P9dPc5vUJKIAFIHBJ0Lj0xYljrr
-n4GvAD7o2hH2+0TjglX1vzlKelN6jgTMWfkf52L7K7GRvyWBaA5ZaC8v1gWXHyEA
-Qkcq62qMG8VOisiMS7Fj32rhsHV4Aat2w/SaP80QEqsyKb+klpe1OG+oTgZ73FTU
-xqWKhPBN9vilfGkHkvV0GqxtbT1IFQQzPjElTprk844h3cW5wC7FEK8xePVgz2U0
-rb9sHDIuTcPud0lDLa0vbToLmAkMCz6qULnfCejUmWv1biegg0FErs+yqaepYJYl
-LBnbk2m40PYSOxTTk3HuJRk+fWSxIKN8pZmURZDmRc7LUytKgYkKwtBEt28/+pD+
-MD0M89S+9nUtv65bheF4sP0tVk8RmUTiJrQPl0fcjppj6TafaaIP1pED5QwfiqyQ
-lsJGOfgrhNgsLE3WjXvvWmGGIRb533vfZM7LU5hzjvSgV9BUxxY/iE5oh2HS/X6O
-GMSoAhEv7QnvTCi1eD2wQ0EC8n0hUfa9IQE93JsC0ZBbW9xDV4V0GyrwREMrpL6w
-3iXURAeKTINpzr6vJ3lCluJWJmcyOyeKX4/SQlSpHdEjiFoCoiAdIGYHIrQSxzSH
-fGPXIBHguSiC4BDdyOASHglT4DLhaG8VbJvB/nntkqRScVFvdsJ79vKzLsJLP6T1
-WfZsR1cZHJBPSu/85Yu2Wf29FHiO4f7ITpmR6k6iSUubNrAi7EW8GqXbmJn5OKzT
-2VRp4uwq8IJpkZUwt/TYAIhG/WlsUTJ6Qewsq1ueUz0ShnN0ksl6ifPXEacOlQJ1
-D4JTXp6hQdnzCMZRSu0BTB0JzZtNaUweVuIzJ3DNvDtB9PYf5BuCR2HIkm0Q+F5j
-ABT+vh0dAlv2ugjhXZx5jv3GGcB2TsSEX3D7vy1CvPqw3RLPwoo+sl/aYvdPy900
-ZcZcI5i3KKV7DGNwGIP0uWxtbPxKTBN843ytuvn+HHkqN3Aj7d3C6XE32xzC23+a
-j/hpzXnf0DWJ6+f8+28au9U+EZgkpRQM+bNofZpIr+ks/oIajJE1uicRnWQ1TnWC
-6WmDx6GxVJ5mbAQyH1qX+C/Fw9v7XRZNK+7PgX3d8fPaHgbZS2ZZ9ouAvkaildFJ
-ii4Z1U1zb3cozrRSCSkE7Ic14E+NDZ/gugbc3A1VwSKSkTuTT6EmHNdLvbanr2XG
-zkIFXTGmTIElo/9N1E1oFAb+zXXtnN1gaIck/NJ45m1HskU+evm/InYzxWVRQu1A
-ipXDwS2j54yiUTqUOuGXw/dcAvtTNhW6PvM2AZJn6FxHvTlXpvdhgSF2ARELcKC3
-Erkx+2n/CLnFlKDZYPz3cw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIgEE1B28QDmQCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNcOIFgOcG1YBIIEyLWSxqJ59zle
+qp2TAbXTWPcjKKCv/XuDySLR8OIGJD/4VFrv+6xSt6MF2ObvYwld2OSp3evfYyJs
+1bKuT+RRfXqdtlB5ULBntIRKqhhL7Q5sYjQuQc4ZtULB1+7L2ZnOnk2jWMy04w9Q
+ac6O46xPy4pZFrKWlXEEaCSuFybK1yKxSCcUmIziLl4uBYiq3GQbRrxkLWQu3pHy
+TMXXpiTv4Xe8Z1N4KvCN0mjijYkfXgldJr+9eHP+1aoEd7bh0zV5lqtAwzgKS18y
+A/0qh0L7950lrW5cfcanvanUSitrQnzvcXVSNbDRcg+Rir38U/X+WcGcLekpVzZl
+x5xobC+oAMBQuS0bdHHVz3tU681otYhseBqe4u2A+fZTwZeU7yC9YifuVRdgQQ1K
+qh0SFmaw/SLXmt20M+FvgCAWlSjOPK/VHdxAszY6nKRvDDdh+TEiJlVeHfZF06FD
+Nu8YG8DQottLT9Z4sdIrZMH8mNT6RvcH7MDocPKomrV2/C93vxfZB5c2tcPe4MQA
+Jb8TPkKriw6NttvbFN7kI6bDzAHQBo+8Z6UvtsJwh6v5v8RvxYDQI7QJZdWruOhs
+UsBIJ1plmC5700SIED6p23HtbLRDein4Tfpfu3ID7S9UI1mxghmzRtPcrGel8wfs
+Y5Jpy83We52ZURnCATvorEIa4bNNQE+NoltXcF7x7U/O4X8Vye4YjOhBwOxsa03T
+JktvEZCQVlA9ckTrxQudpD0voVS+t38X/OvAz5B04tAcgmT6YpltKCnEm38T0978
+YvFkNpLd/95kGSsEjVKAWbe7GZ414Oz0uisDCMMFFVSgWbBZcDDz3JBjJgfr7QHY
+v4LdT2SmYE1GbSFD0YfLwxLg4y6X3iDbrZR9TjkkWQfgs72zsH/oq5189KtzxXXD
+CqJmwZWauheLSXUyZSTXhJ1N24gsJ/NAf4Imbk1wG56VKvkE8fG2nS+ofZWB71mQ
+Hhv5SHFtMuF6T5bYkFoP4at1faI22MsFz2uOqx7aVQpf9reXYHGifI47/QG0tk2H
+DXsAKGbY04iJcLS5IwL9gNn2oNH5hhNP1SYD7N6O9ocuqxcaToZmapRJ7nLk+MDj
+mI6mMBqMQmrLgBVNZO4YhCsprbf0yHFiYPj7XCuOrR0xYQvlfzVIrRQDRzp8PJAq
+Bs3CtxwSWIhTTX1hEwZ6WMszCqb0rIm5FMdLoTU4Oa693RmqHXsHE5FzCGddT7oE
+GYvVHM0kk4aZm3V3M5gxjrst4j9TEl9zgPiOS26qsMUCSs9YDvJzA8OGcY98iymS
+cWPaiTVgF1ZTfquKaaTXu8n//axapRlzMwQ0d2f8Cj8hlBi1Gk211ej4RwMgbBjX
+e5slL/41y0OmjBRnMpLakQ781oGTQXCdLFxJCG7qbOp3OCQeVTNH4b4z0MAoGUVx
+IcW+ATf7M8HJ1DNIayeghZsH6YLOaOU49qjkMSOSTuhlR6/sNGb9zXJZJtHdaY3W
+tz0XP5UP18rfx7z8FMQDNx7mlTwDMdeIrs25PdK60/jCwVyUS5g6HZpvaWNarjLG
+tKMViEZzjCCgYQ4y6mAtcjrGHIwkWgAHgAYCk2J2XB5zy+1t077GobdRvGWMe4rp
+JnQ7dXOlMfvLi/+lvsO27g==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.pem
index dcde1a9df19..42082a50202 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.pem
@@ -1,60 +1,60 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.settings.json b/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.settings.json
index 71c5b7ed0b0..47bf3cfb6bc 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.settings.json
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.settings.json
@@ -1 +1 @@
-{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256", "ocspResponder": "http://127.0.0.1:20002", "caIssuers": "http://127.0.0.1:20001/cai4.der"}
+{"validity": 825, "keysize": 2048, "keyalg": 6, "sigalg": "sha256", "ocspResponder": "http://127.0.0.1:20002", "caIssuers": "http://127.0.0.1:20001/cai4.der"} \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca_key.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca_key.pem
index 2a72da27cda..f23134ed2a8 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI6P8uudSvpA0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIGa7x0efGtwBIIEyKYIYa9Q7hFR
-LJczhrBP5HuKNPL7EHnCfroKh9Xw1lTSjP+ABy5BG/n6sg8n9ky9xUaLfZLW0UTx
-W9/+STDxMgkGL4TJQQge4AtLm3u0x6l+X4mENGtoFiZaJUzNrDiirzVXSX4r3/n+
-IEwEQqeZbsLXhgD8itdCPSG8T3MD9O9qkZH1VV4Jg8fGAIgrjIz9lNOQkLihTcyc
-ZtemvavBnuxl3G7zRu7/DX90SSDufeXPESte5NhHy356zPU0+1i08xghyk1cwwun
-5Yc7eQT0o9kKpeVdOjl8jHJVropFFj/s1naYA0jcVq+/7/rovJ3wrbcS3fk0MEt2
-elVrp73THlyBqIwM82mKBm2IxdMzyXhCjqS+Svl7bXRcC9V4V/Y2Vfcb9hBuh54v
-UcV5Ls7aFbLvG1P47WzgSNx3VaxDdi240/nh1BvXpY9Fjl1ipuCYCoiniFG5bncO
-/WMIE25grsYlBEtfQsqb3mdswfTPsV7dN8LW8AVhXlU6O8UOlr2/S9z4/jVtHzik
-jXP3MaXSpJzw+G0bB1g9wYli0vaKMrXPqr3t8rgF1z1fX53Gkx6NHNoMLtcONt6x
-PqjeeJYdlxfGp9LYgGyMBZhrqsh5AnTIxK3705AOxKNTZNK4PCaoQVUUjHC/MuxZ
-gXMZ2p6fhEQc5c2p2GyR74t+dfaE5aQShEKrwJ6Bjg+BSrqNdMPfxQMgWq2K/Efb
-0pS+AlCMm5WLie3QgTbK91joQGKCZJxhSzeMB30av5W3eB5UYZ3cri0s30v4xwew
-fMfkdhv0aga9cXr67cOaVKl8vrXU5aXBrsNTQV8RM9cCiD70cFZJbgcGRK8l0rE1
-lMIkbSzrChg9JU2E9P5+9o1oliTGWyhq8T+Kdq0nJbkaAD73BjxsCwlsQPwhKYRq
-x93DgbWog/erPBH/+Ex3PmZcuGof8sD6/VUZkf/a+uCbGw+8dpZdhGRMHzqURzCR
-c9k2qbpcIhYclHNISB7jWefpg1EKZ+8X4BDJb8auv+m//KQ6CSJA+Y0InsfsZ/j3
-itUvPAfJrew6syWtcnYF2/jsIaspEkEekAaJ3wZPBuO3BlwJ0f+aSTVUzTmMv9HD
-mHVuaRt6HXxCSIUWh1OOajkdg1MP0QoFbA7D3nMrQlsO9HqY9LDNmlQ+X6C+kTaX
-mqAoEgwHziZrZAF26aynl6zMOmN7Oeb4ynlbxgLsPTff73iU0qXGbWPhEfRYR0Lq
-Tx5Lxe2HUi1r3rKRcUgNdvIeDb8EwBMWixcwYpovuuLl9412ldmnB0UlRmkE/klE
-dqQJQpriayleykP2plJnUjYwwkr1qB64fHNSnMSiLLUI5p65J9zAIZbRR4Vdn/Wv
-dV0NQ92gqGK7oth8BiQ4gYihZR2hzQs9rOp/cXNJxpJ0RkC9hdQeqy/9TLMhIYNc
-cmoZDbxVNz6A5I+0H/5S5+3FudI2c6iONynwOexAa88E2tX9seFTtqSxoH0Q6UHr
-6UddTuSWV6lroD3t0U0rUF5JPcNbvULcf3S1bnwKWyQT+7U1c1oNpSKcwWvINFAu
-awnrprHFYA0D/prSav0pX1xrZs62bd7C+SK7uQBcnVpcUDVwsVsAN1YckFh1Bz2B
-Lb/e4GdYKRn80Vuw4JIlMQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIkVR4iGTIPvgCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBf+/FcZdaX/BIIEyHidnlBhFzPW
+22MaeWqOm7hombxQviVa7wq1RFvOL2o53rR6wzgj3QMR8RBM74qA6H5o2sUuk6fU
+WkEuk9ihmNT2tvgsADkV53eCmh21OTWnmM9AX8S4e8xf4WNmX1MsJjDdkI0aR2dO
+wBSpVnr6otwWYVm/asUHWvR4l3eW8MnoJtNv6czelKhcB4kiEQgwzN13Vz6O9+D2
+4wMsBwOYA7iUD2u00kAQpTv0aBuX+goLoF4Q0cT/2CSFR7Pck1mo+hIlTnZRaVXr
++uPSt/wMfDXJcQKzHL1j3B4TLzJJ29SmX385GvwnIO2JtwPTMh26h0MqFn20NJfa
+EJ9qL1MHnWpLkpu4fYXqxNWuIra3BAJqMuFepXwgWf/xNJK+lDKCrpCIQrX782EN
+wkoJs8qas3Hagu0Wvo1P1hF7LoytBz/XZzWZ2BYYA16Cy+4H7o8iWtlmOEDTkBIH
+G3Rk82hR+2bB8aEfIUc+TeaMsVsNSKjmY98OZXMvnv9mOdmJGI5xvNlSYyJ9Txui
+itCSjqlY+22qa1e3biCvLT5q0sVXVFFHGekBZ1Y6recG1QtLmaYHJ7a5R+Ytf8w7
+rqWg8MPUV1nTuCqBM/3fH9TKouk89nOKqmjG4bQjTSCrJochsW0/M0hUt5DKjE0n
+VfvT0wtvNQLfZS+lIdfw3OrE2yQNonL2Fef6kZ2gwoZSEKTk+MLwQoVnEdWmL6xb
+wBsWW3T7WFHZL2VdohqJnD5/Mmy4S4ByaLHELzHN8y6xO1vpGchtkLOtp4VGSEn2
+nePbCsFxImYuYAtYQXCtExxfDnZioy35ULcTBd3wLqFjGu80T6E8nP3ER1tDFI3C
+PJx20ta7xCbRJ8iMgt/cqgVEg/7wxFHHiGi+uOTKt5xZuWMRGYwUjilydo4mRIQL
+FHbbPfYRr8eDXEsJ1wstKX06MRMIiC2vCRiepsOetum7aIgEjErPHE5sgLabSdL0
+fQuB0wNNitSf9N5th3sSNSPBm8csI1DVCOPm43ZNuacriB6sYfEaD3+c1bA9DvFA
+7qNrrdZ5OKUfz9iQm90Ng/wpTg5sy9FLZizMhr9+fvHx+LE1LQ4XBpn0H+CDy89R
+3Ik5idRdn89yIo9ilkw3ZjOyI4qELnRj+GJL/5atjhSJdqz5hMPMq3q2C7aBVcbK
+ozlMrp5QC7lEzgPxk742ey6HkHsIRbPq0EEwWPTgBjk8B5V3vq8wz2qrBsA3fUu2
+3d5UJbMD79xyQpW08fYxmlc3/BRPSOywc2dd7UquaEmOz8Ib3JvrdG1eCVzi/0Ji
+Cj5uCGBv7cKuuNDuFV9pahy+O91ZkpIVHUi51xhNne+UHQHSGZm2Ao0mkcbepIOS
+G/oOTBZcqaNQLiBY3k2Q5xNfSUO2nWx1sdm7n4acsoN49TWvfmgR/jGbUsVQyase
+gznEGfNG0VFdspcPd6ZJrYK4KFUcMnCgUjYjSMByII1wD+bQfOwceM467FEvp09P
+qrKddnK1lBJIvVfWoahTgb+upDd8/zG/4ycF2muJAMiYm2oUkERNelvYu3DzFnG+
+hXAyMa9h7qU9+0l3xsuC379wT6zSrG5x8qZnhMQ+m87FbTKjM7Lwt7RVe6sWbH5q
+zbKDi+R5jNoBUhazap8oCA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/crlnumber.old b/cpp/test/IceSSL/certs/db/ca4/intermediate1/crlnumber.old
index 4daddb72ffc..857f065e415 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/crlnumber.old
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/crlnumber.old
@@ -1 +1 @@
-00
+00 \ No newline at end of file
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt b/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt
index 38d3658b8d4..9a2861ec241 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt
@@ -1,2 +1,2 @@
-R 231220163233Z 210916163233Z A804CD37D0AE2824 unknown /CN=Server cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R 231220163233Z 210916163233Z B70BD20AF96E3CA5 unknown /CN=Client cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202556Z 220719202558Z 5076FA069983F0E6 unknown /CN=Server cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202556Z 220719202558Z D68878031FFE9374 unknown /CN=Client cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt.old b/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt.old
index 08a36b974c6..7bd9b8f2dba 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt.old
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt.old
@@ -1 +1 @@
-R 231220163233Z 210916163233Z A804CD37D0AE2824 unknown /CN=Server cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R 241021202556Z 220719202558Z 5076FA069983F0E6 unknown /CN=Server cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4.pem
index 3d6020eda63..4860ce7eeb0 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4.pem
@@ -1,60 +1,60 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+MA0GCSqGSIb3DQEBCwUAA4IBAQA0XGU8R9eOY3SBSdVcYoxhelHBGPFZrE36Ki8q
+86vs14uhb4jGKF46CRjV+GuhSDWei6N75JUjIjtcIuWvyAHZJBmL1f3Yu39+0690
+L7dqXLW1lHoj+gMwHxipYY4fo5ZjLOWO6x8joBQ/IbPDCRkrEVobqkybd7H5t+IZ
+uIiyO62YiO05GriFE92UVKGTMe86BjEso/lPtUGzeuaWGHus4WJz093oy9LGV4Rg
+3eZbu5EbakMz1tSuSgzxzdVxrtM3/g1+poJqycWtWq7tZcVp4inV88p/bHuuZMS1
+cgU43ICPpkL4ppld/r73GlfnAQVSpJxIniNfNNK8v62CLewR
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_key.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_key.pem
index 49a2c588a69..f157036f5f6 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIVvW3qbOa38ACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDvWgcehMgaUBIIEyEmf7gTDindd
-NebqUmZ+qTMXeiVNJnhQf10aH8m99AKc2dhzKvGSLAAT1epp0/xNRltPFXiEPtFF
-2TTU2IYEHvsuAiBFevH5AmuIZvPOjAw+v6AbwghgLTuwip/LeAxXw1JLoXd+zQZG
-uPn5p9kUZwSNmK80w96piu/LYc5WMzjin49otqhtXWlBiPf6qSKU0MMMqZ1Obimf
-gE5GKMzr1h0m51rPBUuISgbFD/MAtCSadcnEB7u+4Uet7+jwCqXvsndfzqyHQoJ6
-BSeZNn7E6sX6dUKbMbGN6ZV6xPtK+bOC7WzPViTUBDDmw+U3dvz/wf3r/gMZBKH9
-ra3r/O5c/t0ixYSJLOy5kMgLq8D2cL9AgQdSlBk7YQbehAsC3D+/3R7JmVXTVF/j
-z2i/OllhqCLbyqfw5EGjb2RWnlW17NlS1W9kfidIa6K/OvE5CJvM9W5+crsLIB5g
-ef0DUN83TVjfGoX9GWZcSzc2mybcEozsXq0cGv5Mw25PfRbhNDWomCb9q8k/0D6L
-p0at2FwSRlpe3R+ibkgArDdF+hr8TwK8w+EAM/GRyuWol7QmnZPgyB0Fm6KNnjwZ
-mgExG22r81XkU/B7TWL54lZppHKZBybukNfHbLXR3/qAnSybRPzR6eDhcfMRYOen
-JAWUwjgxIBRswGygm98EUY3BWbWS/UD/Oond1pONCEcJHnCQrd8WgSoZjoJDsJ2+
-/aRLyDG688uwxKPmuf/f4iwO6ZIPiDcjrYsXM0Y0kwtPtPb6zJDTgigrDtN19fgJ
-kF5CKCiZF5pGEjCQhvS5FhZuS8JblKDHUtC3tErVjZUXQfmWIPsYYK+a8G6ai+YQ
-Tj3NzDGY/2YE/ALf6J/I1hlZZaxflMzfDGmvAzeNfmbdJuV+o8KtjTK/zhfBmuO3
-CeLmkOFeU/jNL88ppUrLC5H8fg2Ik0/AZpGpK6IHtuckftvGuiY1gdEXmjFxdlIe
-9w3+12K5beNw63anzCSKRH7LpCFzG2yNAZzJqx0RkUvLixBKQzg8aJs9L9uNmhFj
-us0zKJ30AgT5bn/dbni6ghSV3NAVpVnGML9WhaOFkA/LqtPCUhoo6y+T/wTQQDhY
-8ERraAl8Vnj0K8UwqYe8UGX/ldRSnJCJhxxhi+OcH1j3soyg5wqM5aI5tFNTUUv2
-O+4kfh70Ni5lot6KGOgsCX4jvEOOytv8FiQGCRVA7UIQBB8egx7Vb6XaVIlbiWkU
-juIjQKK/bQerGn1+lC1qTsAfVmeyl3CtqEgBkZ8jEblqW9rd2BTq4I2fi8XwSZWe
-ZJngb6HV8++aOX7Ivy2fv3QiKQVeXeHsjXMxbtos7I/uwUF+TXrGP23tbRwB5PMw
-odszE+NPqrxKVtSDqJdwguNuusNcXs2rAuIIBhb1R9CD+0I/F3VMKoMWkwjmlS2v
-s2cmHlCWSoRzABwhro8B7eJEXYEwJeNH77h1J7RnXCUzAbqGs9hkedCNXInjUqe9
-/rryU/BBoqlqJWSMwqYbHdI0rKBSGeKt8DEBXwemd6trKgd5M5K+wxGwioP3E70Y
-oxaePUpWC0XdNhMVWFVY6OWytR2wxSFd2T+l8LUYE7jTakzUOau5OjtHIa46pjbS
-eB50SPqDzhWwqTnYP2ro0g==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIiStAlR0JHZACAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDE448TeSTDSBIIEyOPfT2YIh2DE
+pZeL2FzF29PfaQAhilvCCql1VCHjVp5e5dKgv704TUVWddKzbJZwe972wOcHFLZz
+YtedyEAj32frpph9FhQ4Xwu8yVGadQEimywCY88RZh35dNkxkqIckPRx5nhJNkN0
+aPDoXiTqJjFHk9JTQVerhLMJhGvhM7fDiKgczyb/ekGoEo7kRlmbycHLU8xhxCUr
+rAnYz1Mb30/kvedjfrfaMGHAziVIxE2M2bPemqxNzqm1nfzpKixC7/mefw9D60YQ
+0AIEHUO5qhePU5doieId6p1RHnij+f2zk0rcPjghFSUStQfT0r7t2nwxJ2U7yeFH
+u4UQNjlWZ0BEbaI6VyeRaLQs3rWveP1nGsgSZdFVRsmzy5HLCTYQuZiEDQRlvtly
+BkYMoDkwqQTxwUwRj4w7wRDkLDKeDqPmoIS4wF+8FLtnudycxwFPjdHwUPyG5gES
+hnq2yOOgfYUPogVVHhYRDQYv3Pw+bqwEhWZfs7SbZrwA9Bon8q2Wj6NTctx8JhDA
+SHVoCWDyDvzvRYq3m6DRR7TYhWYil39OnSql98+qV2ItNVxsBEgJmP9xLmHPS5vX
+owHZw1BUfXbvmXxpLNpQJhA7DNEre+sSoqsdSPl4+LEQ1EPB36cw2Eb6OSjINqUS
++XBud4faaw2dv84DD7+iCDMSyjBimYYn0pl6BxwrIdUtZoNh8jGwSCSsfUynJg7y
+nPEpXU7oj4i8dHi5fxLQNiUSRIFxmpiqtZ5HYo/+O5A/3tFRTDP8VPH+DTdu8zXp
+5lpswJq0AUgA3scjsQQdb7ccDKXXVAXIFlk3c46/JerEpyWin35Xf9jRGz9e5qJ2
+UGw7d7T/TECkSURDHKChDp/3qJUnJKDJOY2gdDp2rSiwnewpBVVMN+JdXrO38Lgl
+0BeqkYoB6TmVtUtkQk275WZtm5H1G9ELg6fp8MKicdhlz/DY84ihx4dz+UaYewxu
+HraCjlHEFZ+D7dbaPw2666R3OMAKaOybagIYGK4dbAaVd/0ufmBrnKmGv5VGi8Ft
+L6QYxYycvu7d4hp+MrAMk53dNg2qsclEKVVjTGbBIUai087G4+S16iqDvAmi3Xaw
+6/+tXQ30K1uspG1prufsnm7+eYI/EVyXCLpUWPiKk/CpiEevsTPYJGGgU/dODk7b
+fN9itKqlKHpNpvIsXI2G+uxKtmJtOBLg4qA1MuR3Bqzdof44AFnQT83VTSKuT8E9
+F1jg2nv+KOD+mcWvSRx2npwvM5b2p//NfdVVY7lbSNylPQlwwepWfZ/XlxhkSnXZ
+H5HmvDh/nmMBc/WHa9yPy48IojRQ3Cv+Bj26fGCi/aqtuX/ZGWm1F5/I0pgOQqrR
+R9GE0yKHhcwXIF8CJ6NA3hFhhOdpjeQTDahxMUAL4IYEHK2/uZYB7eHpXqEFyby/
+WJ3NGobxsnPmdKdPmqgKsjXjgPTm7n/VgB+dqczn7Dc7j7t9UEp4AJahRCuF992B
+JETQ6UlJyt0MxW6qg66AgHRfRXp//GOQ1EiVtxnVjaWfbUXV9qVetQPynE2KrGf/
+GDl2UIZHyRYVZbR6Fh/0gSub1EsP16wkPdqImxMDDROljcuBACvj+dL6H2r+2xsF
+gSkdAxUL+yeqqG9G2RW3/g==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked.pem
index fefc75e47d6..0489a94ccac 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked.pem
@@ -1,60 +1,60 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked_key.pem
index 72fd28da803..3afd79176c5 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI5V5ZVJ2XiawCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECArXKmZv4YjDBIIEyAzIcRbgM1v8
-ahWTzve72A4opmIjPFeLGWSo26bX6sAbVnJgE3h9JcdzsvmU1yRCGyhMYJ0BIsyM
-/iDRXKaeQfRDKTUrDP/PlEgTVP2HAeBtC5HS1YVmkZT0EXPy4WbSFcbV0kxaaFAm
-1joyzNnxkZSecpgvVwEfR/dfYk1psPPRAN6X6Ltw/HGTgR8bXCgw56l37NJFJZPt
-V3EygQjeFWxP8dEXh/HHbOoAcEYjtsWkd7kROw9L72xYyXLoyJD1GUWyZor+bn/4
-WDoA8DotPbTmmz2f34nccaeE3u0h78WT03FbSg8VgtvHpJUTvsSTvT/zvQ8/t09O
-pi7ovhtRXgDMpa1n10+7n6+ulw5Rap9cOEogJYiQAA7yorGPHP0v7RGBTtij/nZz
-S7+ZblPfIyLSkK/gRKxc30IlcV+T8EMXYuAqIlOt9F0EyhOlz6RodQibmfEdIM6P
-5U6FMX4eoxDDWR9v9DFHwCKWdo7W9yp8083QAF4akZVV/7VbSFTG59G+CYZ42CNJ
-10HJDJ4uMunMf0eMYv3LXY0GcsCAT9cbgtq8erq8SL5P7Aw9/RIdAuOTlu4NpF49
-9sz0/XcirBHIAXAmKJ3uXWFVEn0MIMkcjb49FBLrTwzvl4san9ktVkqiCPegDgPC
-8FmkWPkGwRP7+mo7qi4lFFv7wmSe51AVW1sH/0umjKksiu/AqV2QH1ZhJ07oyRYE
-VIeRS81Fgn6AizNC7Qn6s6JWnInGzNxDaSuI734JAS7Uj5IjMKoaNT3JT1VwaBDY
-7e/OugP7TRA156Nxht+Z60wlD33/KS/WzXzjST29RJCK/SWd+Nzkm0uF55TX73Oi
-u9PjT61FEUupgdqjAq5AAjWmgyUR1l1mLCYjsgkXQcNWRNrDn1RdKBFQ3qd/EWXo
-1f8VW+iAntr/6agbbErmJBYEMPiI0Nx7cj3ylB+vqFC8UN22uKDhoApxw12Yw4q8
-BKa8Kmw0tzid4y9nCAkbMqAoEpHM2g+6+1MTAPe554tKf1AIzJDh9OVDJ+3zNB4Q
-ZZ2/deYZCwiIlzIwOP07fCNjPN3j31WnHj9yKbuKfCAqsH1Tecva82e+XjCaXxY2
-D3AkXWPSV5EfJFPXU7SmOavEs/bUElrnB+D5oWu6QQrFKR8EVmY/Wl4+QkLhaUxb
-asbWIrebKM4WuJdIbL1oZOCHnYs9A19E5464NKF5eMp+K2DXVopv081DEOHYbXHs
-qrisRlsH0g4BUb2pzTy9ipFeb2i5O9SyznWcl10QT9O7tN9oDhJPD8yTfhkz/aVY
-ckWBv1rEtkejdNlRK+1G/uGAz5lWkEWE7WZ8EYry52L3UK/dRyyIXAKb1VrsrEF1
-vBOuK7APLWDyv/MeB0qQTft/31nObIvfkrpaLhYnY4aXWB1vWGVxkTB9VzJrZGDv
-t5z4zNO2xue62OPpDBLR+Ptbkzyl+ETvUHYQqkk8Q5+nj4MDkKps9n7Eqg4nBcus
-uxRbT2oAjEKIUtFHXaR/VswixRigqeGiXk02Sm7CuWtxpv7sDDWSG1H7rOiqnTl4
-HZTRwwWJ786djVIY08HZR7BP9+9RjKBJFCQy27MwPKTqrVcUr0MhpjOqwxAQeI0N
-AzvlERuvYi0LGLT6Isig8g==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIcAigxw66l0oCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAu1m0/Rh0CABIIEyFb4NsNoltl5
+IN5TyDE2PUrd6xho7tsiaT6uCbvwfggQkDIHJpYryvBbeiOkg092k4nuKVnqC3OQ
+CP+8pS8hcG4WnWG0bbUtEgHFvyY4Kjc2Mck3Eyqc5uTZGIq0X+KTwY+TU7bKzbfb
+3H2Oq4tILVGZmUQXd1Iqof9d9SOUjcEeWwI3n3muSbvocPaqv8nYWQlF9MrV1cM8
+d2KZ6KHXkXFd3Jt/SlaqaPZvk6JlNQ6MZbok2BRRjt13Np2a68Tg1iNGGHoOF6pt
+SONX55JwbilRPTe8H716YWvnZT7MkuTgZq4s4112xV5naQzDNoekyBtJhp5evxr0
+/W9DlOs9pQZeQY7ZoxR1REnnpg199PvbbIt/Iobl/bai8hK2whTLQngqusYlT4rZ
+6Mo/w9x2B4jbs+BHUhVYsa6mfq5KjYbbXamLUqsJdxcPX+Wg5tQ/E6RHpDJyYzlt
+qeDfVjsF1qkNPQC1xHGtW9mikJrUfODdO6YsKklCC6e+1wpzs73HimWuRTplrfrc
+Q+3YLL8sxI5gGizGyq1GmLlWTjrb27rVF64v4T6tUqq1zfY/swhqz3pTdUZfAEl7
+ff65wpAxC79lbKTBLyr4BCct+5kYzqvxqZ27Fqit45cnAzUHOLMQs80pjxCf0WyO
+SwR/ymHeznJAUUPifET7iwktKscdIB6I/OE5dLebZvf4ejsGNPJ/f4W9npvJ0rYs
+2GP/p5PsLZDvmifCU+zS2okngb14AB+hFm4Z3YI6Ew4nJ/GSprshpjwH7n3lEpTF
+mHngcWTcixjU8bSQIpE+J0BskYV9vNr75KnDE2DcOYAhNx+V/wBeQ4mq/VkIibCw
+OpjvKJX5ltWmG0QvEvhu+4Jtmu4eJH7E45LsUZtR1CyuGeL+qFbi7BUQkG6cR+yc
++RMqeg5XXCgvmzWXFShGcwQ/TLUSZXZXmcuOZQq4JGI93U4ainWy25HFVhmiqoeu
+EexOLSZ6N7odIEGYXP85/Ftn4OdAj0RfVanjCLcqP0kSXdSxp7xr/mgflzhrP359
+NE7COPXgSiDkjWY1CozZee6t4VE+7Z0kzosfGN+kNqhSFInOPUFsZ59iufL+BcAv
+u7Rq723tEnBeaZn7m5RCTRxOJYbamb7V1MDr40QsRKi++uskhBTPGgAJUx2Jf4Q/
+njnlH+nr8vGi19+d7GF7ywPu4jQQdTzi6t3/7TrnbBb77WDRRXWQra4Whb81btvm
+bEh+T8GSrB/YCMXY+5BOIWZwPb1UmRANQI9491M24sRWqcAhMYuwRD1n/uYoNDpD
+sUrlOQDG1Fs8PULYS/8mGtG5AkUR3m/mMBCMUk8l3Q1cGwSmAFhZzR5whx8wfvl8
+pUfagnNsgxI9GlMetd5E1MdzUYTbEfA2uve68iWTK2rTE4OiCFwd16SDEYoqdvb8
+vVKJKQwQnF7/iZDcK/1kJjSK7XqjRRmqlGq0nMRoTL4BXQEPGvixKOatHMBMNKG0
+rfSz+P93K5EMcnK9ZMKZV4/3C9+Dha6CM0ymLTXfaKFhs8z+sBdvB9/cI9Kirq6o
+LXrQqZpCV+gtojcE6h0XTzze9A71IsltAv/Z7joKqmUCsR4c2cTuAT3CQm8x/dHD
+C4wi43okqYyFLT0tHJrCkQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4.pem
index 240c5a6ee04..0b88a87e69b 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4.pem
@@ -1,31 +1,31 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
-deGwtS4k5Ac1ANCA
+Y29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAv1lvc
+1kfVAMaLffiil7dRSS+1PCsNsIIiZ01Zp3KkIhAySS+4HonuGfnCmOJfN0uCvF08
+hcQLhCDRWZJzutP5M0dL9tbMhRoG8SoC7g2kCPGX+UcpBEPK8wdI/f26wz96/t9+
+dDdZNu0gUH5WSCupBKl+6ao1gJxg1HHR90c61HRmyRP/U4hGj/iroKS+XQEe9lho
+ijkD4NhLqmlWFnCgJcTWCIoBJtEOwg4/HVwTqurHfe3QPI+rXMPlrqgcXgGRuDmC
+LY5quRq6sZqsbIxAMcAnIIlJGXkuXysDh7LesiK8wD9caPRKQX21RQBe2JMNv4+s
+wFQxwJeNg+39qUab
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_key.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_key.pem
index 5137f5123d3..7903e21b7f4 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIXOaApjh3qhICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAIA4sxP1G8tBIIEyAitLVmuyOIe
-svoJhMVDpNptMTCiZ4nhy3ZE57HBzp2DX2YXJFNT3/DyBn4taqv+Mq82xfVxorjc
-tNSo87K0SMDubogtSyHBmmpLgakJUAuiDvos9gXyUBJjNfdc7pUvAaqPxgQHuByH
-ceKA3XcxE3CmSruwPJeNzSb4U0zlD+/fHtle/HUK0Ug01R8e4jSg30QrCOo/IsEu
-UZu0YdE/DPGs2vJ+QUIJOazXbAt+cR7MOzozUCez76FjVdt76im2u4Qcbws7/i49
-MmZ//W0XLJyMT+o/Xu27N/5sM7peVob4tyK/dgycT/scUJvIkWsM0uyfWC89DCy9
-/8rf1GUnayaZkwVxDHcoJscasE3wubsGDuksQFTLI2Y2kjqZZNvrjNkkB7BQ14D7
-M0jamFctIW1X1hYFS+NTdQiWpetHTeunNoBAPpkODmHyRzmjRqYof3gpf1tGtopV
-VMpbeC3Cbjpo53fToWEkinOYp5o3ZNrcVrlxI8HHjtve1DiA6mVCoBhg7QT7Apis
-eqz1WYCKEqx7KKcbGh0ffbgQKuX4DJZjxbf3b7WFAgKf9mOxc3jZh6aKKH7YTX9G
-v6krb0jOAL5JwVOhN/OeTJ03uxOU2xc8I7DbePTmC8LEchy7zwzIhzc0XKM3Jnvr
-2GHHvaXcGYgn2rYG+mPNfhMGKVX1Yyrvnz+zBS9slZdFe/XLj2wtGORa7DdQwYIp
-yULduYOfsYdlONMPwjKG+vb/r9XcxgJenVbZ1EXzfsKGA11rZaSI1sJidHeBMzzK
-GDid0kFs6eQLX9wfupBjZcq9tj5L7CIIrdijFZt4WCklxwSjImBpneLm1WGKIJ0H
-vWtlfZIWiwvyJacnM8yrjTY4oy9Va2/g5QEGfVAtt8zkGWQbIJJynZl2juCCCwD2
-hAR1wmehUk5nfMC452RzC/t1rQHRMBwJktmpwhMWRBHhhBqykCLiRPchoHJ8zlad
-V1Ig7a+jrnXUhVqiY1OuFZMaNLzBV4WlQuC8uWI0jflxFT4kaPKj7VX42jf6GWUd
-KWmq/720LkU9lL6dNJbL2FMjflKHKi5pZsGpEy7YkE1lcF+XzX7rN1M/3ZdM8/3q
-IJ8agYSudNLug5Pz/0iJ/1iQ1VUcPapE2jhaSBI3sZvOYiYq1OgXuO/tE0NugZHh
-2lWuJng+bijgmnEHlQ5/aL0/Y0YrIj4a7rngfAvz4/9apWcGYfQMkorYGq9D1sV+
-UMq8pyxndRTVuzbpJLToj+hI9xQp/f7DZH8vP5d8KzeHv6XuoNUHXqaIF5K8LEdZ
-bqTbNWvp1TnMnNWzAOGRq1qpdKF+/83OhvEuMG1UFbZMCgmpqlBEReaIdD9vIzJP
-FqGlMCUlA4CM4dJOJcy1qi+JudqOvBoJb4+t2IpgJRnqZ71gmafrXZkupO3gZiLD
-I8RM+v/1IyhbzJWn+gIqICuX7EERaMtG9B5uy8xqywTtbSmgpzk8B3HUmYPbe2Yn
-fYiHXWnKzrHHAcYaGYPHf7GgI/tntj3E7CdHgubznzIRTDDJJtUTXAvSV9/saLLq
-zX+wRc7PCKHPHLiKfm2Cf2ogAXU0lF1W9BFZX+xvEgWrkJXhk9Pq0QFHUFEzHrLJ
-nVXsxXcpxeqNmwhmcZHAMw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIPh+poEapAMMCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECImt2sb9/U5CBIIEyC2Pr2U3gji8
+THbXSQ8jeFQwLNnC92RFS4bwfv+BoGSOpAdj/IOYKybN+yajvvJnZiNVwNL5KMrL
+5pMg/2ynJ9GqLYepLFjqbwB754Q7jutrVY0MJAei3Y5QWTzoSXeW9iM+bPqIvxEh
+4luA1q4PFxY+bOSdWPmHTOxh1Q5ggAgECJRuh8A8LnztsfVggMFp7GrOGrl72qvi
+0+ffsM5gQPSuMbHFoq95u1mjMIyA75/ivV9t9AIJmM7iM5jepBzNgrL7VQjB0wyE
+USlidvrq0Ixvgegk8+gOiTRUyz9KV6S9ZpDzHdSJutQFjYVgFCugtx1dQKglkKRd
+//Zyx5qlcv4v07zuLczisBIqXuq61Eiy9pFyPbpRKZCdo/x4S/gQsEneNGLP+krE
+Wc1uLCXMAmTXH8JsMDLp8Zwd6lD5iiGqcWV4HJn5HLl0duOjZL7tVN9t4OsTWKBu
+0w/YnLWU5cD6oMhbRj7IXG9MQo8YeTtGH622K8iDbr7q8ubsKmBuNOOvfpCR2KGw
+qL9TOcAUJJW7CAwo1ewBpRRRd2mWQmpgddicS4a5FnARaAE4TaxjNtvK5y5jfzjE
+C4dssld7k83Z1dRmknpFv9p0VmF+WZVeTA57C1n9/ZmgiviB2Zv6QBZpb0Odmhrx
+S8WW0I3GZEqWuO9HdEr+jZXtg4m30vfMRFe6lFdFr16z7egJwArYH4gN0HejQQyh
+++nSack0r30Z8pyaNmJs/e4pyvfQjSfllICTKpSnE2FyWo+jxaAEuLSAmttP9F83
+pGlrOOr0VQp2PqmsxUiGk2gnjjrcKHogopz14HDuB7K+wzvkMS8IpnhubgmjDitC
+4ajpm8idj9rY4U7o3vsxBAGVlY+TBFik+7r7t1S4VSM+Fy8kA5MwcaRv3gb8kG7p
+CUhrW7JNSJH10LxBFtm936tT/lYiuRuU/u8G4GL38Y+slAXTAqoiS0pj/UM2jsDD
+kqkG2EQBJ9PU3PMeGUCnwYTOKukNxX2ht8AoRuwg4SU7jhekc+VQzc6ibG6zeS/i
+m1UsH3PWPUzI2ZaPSpbv+GQ98NhyodGldZckQg9C7GWvBlYDnredTiBXYS2DavUR
+0aj1fYqeCiX2n2riUYRFn/KiyBx2YBmCZbx2KAp59/Q4ntyATuEMR9vs3q1ghIp7
+VqAxpdp5MDpgoOw1gQn2PTfsoVT/WIpVueswrh1QL3LKFkMJPJMmZK9D0z1iR3+2
+vf2D98E7wR/3DDtZizko3SdaORAMOD1Op4tUm4p72RR+pEvbHeLmlO+ScfVQx31J
+P13tECtNPdNi9MbnV40H40E0FvsOnsebjmzOfW4ahaWN3MwgTwvftOEDPslbidQ1
+81Mq0AJdqF1qFuS0h2wpEShFQewx6r85C9aclPx53gaq1sKsUR2hF/E+4+92gyW+
+/GAvaxydC3jr+zPmY4L20f7lAeun2i2XL74DXRBwzzwriZBAZRIEShN2WPwFwbhk
+4M11df/4rvLe9D/LOlAHSJ3oLn6MZrTE3/db8pg+sxPoJw3mZ24x+tt4uOx9G1dI
+Hej09jzHVlgPyj/wDyZR0JM4cFGZBWisix6M64DXnvV4AqhM78lTKc75L7oMSCTH
+SWCVFNKjYvWQXwS8Mpgv6Q==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked.pem
index b75254776a7..9efce48f11d 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked.pem
@@ -1,31 +1,31 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
-Z6Vj5MAe/CIvb8qk13h2SijLYn4=
+ggEBADkapihXtGEPwmceZ6iY2fnPaIZMEeqxXOBKsUx0r09tXyv5UeUs6lPR62la
+T1uweSOOWNEfxmKbPzsxSx1ZG6LGm4XB7H4Zp81pxlx6aKgKSFO6hs5geOd/Ep6C
+8SpdzD6FvIelC/D6yLJJb4/CcWdEroRNYC4g8XTzLsO3fndda97H5iYrhDGTv5h2
+Op038qhT58U3lYD1Trl20ZjAT4Ehi24cEacVJpgnoLJsVoP/l2cWKT1OJdsAC2JT
+S3ayiDFkZLjWLmPJw8RKxpCrupYPjzqtexEzwPnd3fgxTlt0VXcDmKWRFyrqSs0r
+tLXlY0l6wUbC3VvH5oh/Q4OIiNw=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked_key.pem
index f0905a2c1a2..c8834bbfde8 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIkYcakpzB8lgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHH0ipwRYGZGBIIEyM10R/Xkidxs
-Yw/j6nQu3IBT68PTLzMJw4f5NC4g+ocfOHxTkvRvEjXaEzEvWpzq+JtnrSEojT6r
-fUA2dvutzBHrMpxpvGRGzOjbs49fgHmtTrdIGasih+yz8dy9LuNBZLz5HsnCpChJ
-IjPo48aUQPiXz+RGGb0UENPwMaff7E6ojwMYpV8IUbZLce1kTTT2vv4RMX7XzfQV
-fnuYgbakqYTkicVyLm2tkXisabjCZkBU236plsKUvr4nQLDrT10WuKsoNFifdZfv
-fFQ/Z3g2S5rEmEsv03n6s+sHKpP9Orx0s2wN9Xo8VWVTqlpanWG6lKfgqby3ufJY
-goa5/v9VTZwEs78w8hK+vU8QE0XSAPEHwZ+UQZ16sIUEgSti0kBbLd4qmlxAWm3F
-Ur8/8P2K2oYHS2XhB0RTVbsa63CZs/mkYTqe//ETUElE/7Z+hKy0bwfzatBlsasS
-D6i77ODUZ3gWYZtEAPRNSe7oa012P2MYdNsaP1LqOmZViutks7jQUMy5FNk8djtK
-tqun3IE8VokfBVuI1pvXqUteZToP8lj0F9EUBh3tJAI2hOMlLVQnLeld/wwC3H9V
-PBy16px8kKFaU6fN67UZcBeZiUpibo/FxLmaNIsNt2Ztp3SolrbeXT+tybsEQOBI
-BWZGKKAAH++JzH7x7Rkfn/fPW6s9SmqfHVOrYXXMn6qHN3gDM0W9a8nk4AnuD5QA
-Xn5C32zCdGJ+gbFMzuj+liy6Hc9KQbY4dlDDy4FyofwL12N/dZqq4Kpvp9ZZ9xag
-HGmjFEaAufnr1qTwTsXaa4uBSnxgcqHvLvEahDZNnX/imWE/IZNK59YGf9YC96UD
-fD5bVzR6NLEIZJDMgGWxf2Bw6RKex7p9233O0UGidn5l8iWZbJH/OyP+8tF4GbsX
-HFZ/PHTWlzvGgWmy5XOEY7lWx4s7b46ic/GntOKJx5TYEygGdgWhUOY+BYS0/8MX
-9kkm2qyTzxFVScYI3MYHB5xKVsq/VTsjOr2O0YxRucSDL3HPMEzbA848ec+P/TrO
-g87jjW/Bj8Dcs5yagLgILYEW/yjwalbJDmK1Z7YyViQ9X9dvrXe5w4Hlu08RiEe5
-Y6OTG1va+h9PPuBo2YlbUVpAaGUsbGoXr1ABt/PB2Uh62jNRw2B5YxRgtDrHg73S
-DfBsbCp89XAJYY9DAx5x5U8IGhOQQnTFunvLL2mj2HNLWLVc7NlIZk7L9gJEuwHa
-czAc5rsfQ8EwT6IJHD7FgIePWmdI/kULdWGoCzBumcEP0FXOvQTDL7Jvob2wky95
-Sd/eCVqIhMXIvzWb6TeWUQk+KEnUNtfrWxGO9fXS25iMgIQtx7TzIKap5/llQbfg
-U8H1U38w+aNP//Mj8Os1Rq2imLr4vWlOlR8h5Yz+nsS26LLKAdrh22H0w/8l3vWY
-OsH76b+yGo77U/OGLYfTp4QpeYjq/L6nI7TGHD58UG5zFDbJBgNwx26rotdd3Qd5
-uh1GQosT3zg4Gqn4ZOgQOrPxLwImScSq/XKics1Z0RtZbqT2QRcIwckRV9YU+7b6
-BA0toyh/NNYUZ4ILpDQ82on424gF8GQL7pf3mzXPPm4bncj+WAaqNCYKBOvYvNJe
-YUAfnTfj31qMPyym+OkyNw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI4UXSVR/CKS0CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECEhlb5+wgiUUBIIEyPd6Nv1A3V1X
+uyudNVcTkU+SLUh8e08X/kFT2O4c1Z4nUBvra78QF8EwEuxmWXoujlI7VGmKrohd
+KEQWaT9wvkEiRYJpCuoSeP+rZ/Gs2ya1/lELptY+4XJIoa9OaHVmbU1AUDpw0yZ1
+ct3hWYbzrLRYYLpLN89NcG3sBOT7aNPDqDsdSQ1sQkSvkaMx3K/VaALqwH+fwEbe
+2g9wyucGjmpdxeAsbeh0hNWqectIrgGV9PYVxz33dBfbNgj8wkl4lvSRO6+/0snI
+0u1dZeo2PswfwaXWxSPNK0/zFNXsG8kRf3hiWQudeVYoEmL7/P9Cfr0GwToBafUu
+2ZX+GWdMMiJP8zVo8i4hZBp5jNw/Qwj5QbxYN5jpSvmlww9303yktFWGoSW2nkcx
+7EA+1eki6ikrH6XChN0Gs/+SqduIr9VP5s+AfANguGhH9vSB/+0xQyTiev4Hm+B7
+1pTiJaPc1f/3nWNi2gVT63OGmGv2Zsh4X2vJFCsGhBdy/GwTUyUvUalqPfaOjari
+2wC5M7igiqllu/fJtQoJd56Z2DJtEf3jbd6weWjFE1VChMKLDPVQIVP6K/gK1DJO
+LRPuyaNdquJBcUHMSH0DbU2n0KGsRkEkJQ78roVAHgQLwNpt9LqYm95/AHwlZhcD
+mTHNK3P1kLY0LuAUQQSZxs4wTBEghZUCZAuQXFjkellMR5DYWBBT1r2IpMr8V20I
++W2LLEnfJckjcLcJvUXXgzxi1p8GbUW14TSioJSCf4l4zHJA6riZprt0qbR5WnBC
+X8NlF/xUlmYuMit42qHRzltSnG2+3rY51fQCNBCZDvl0uneva0My+WBb/LW3n5OC
+aL/If8j5AuogjE/rgtLmyp9P+LswT0SHyFGSf/7a+YNnIhTzx475m6buA6q2FPyG
+BNM6uhW2blEDgMOWlIBzWLPZwMTLCSdAbP5FZ4w9v3ZIdKpNSYxXcZo/4hA11tLf
+/SNLSUOS/J9uiovvLNrWSQXHDvYWpkr4e31pqQxGMx9FExwanDplh+fviwfgSp6y
+k62P0p3h8bejrcGOhQ70mTmtxclRHtwlPTK0QkS78WAPVaWCE3rpYgm1KfTbECa8
+jqcI53gKxNtD3h/VGY4rHmhlNhQxqiWa/gxSzxMCi5HEeoo8ZvSROKDzcVkqscYy
+rZxqqoQpaX/ydty4bT/z0V1PRnT6Okqd0ympXZ7yAp4C/S9iFjKIVQKgTs59hES6
+UfDR5/rdWAec7+KR+qMHpKiF5aCuYZ9nEI1r0N5qMB+NiggGx/2Rnfdbvu0SDskj
+WOXeNYPH8XGcBIT7ScUvJQejUAQC0GJY3s969Ppr78H+8kxBx8ZEoRDEqkY+n6Vn
+7eNwLo+oEDpnpVSfGxjj6nnVipyFYyO3VlQq7jj1F4qSy0NDTTRY92lyFy1gg+x3
+UZ8B8jK7gGH47Uu5kKxoNTCy7IxheQz6OHR+hdAwe9uiNqku4+XzhLmIEMwDCOtv
+3ggBZdMquzsh+MOR2tfdD3g+/MiV0+rB2T8ZK9ZvlQZnBkUw/xsb0Gh6NGEITZ98
+6Z/h1Bf5ltogqPfe3HV5DtfQx6X9EoRpHUwYdfw9bxHhnC0UXOHqd99V9UDWPicB
+yTMkgdb3jbUEwRk1MixLow==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown.pem
index 7eb08ec0c27..1db47c03c9e 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown.pem
@@ -1,30 +1,31 @@
-----BEGIN CERTIFICATE-----
-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
+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
+5bUwgqGi5zHa90YQGyXX8w2Q+A==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown_key.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown_key.pem
index ce29f7fd789..34af1c26caf 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown_key.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqq5fXqgPv28CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECI8ivIjb0Hl9BIIEyPyg3TCq5DBE
-uPiHvj7BH9yVBygZDUqDaiB0JgiJXvIH+a075iPkemE0zgS/O0A/W3Wz3S6338AB
-ePayM3gK/mCDBJ2bRtEDbudnajQu9ahJykWbeFhuHIJ/2erFcn4ydsM69f1cMa6d
-GkzHH+ZQEeS9TxkUr5L0z+cxfk3zIDeLO5X2D8rtpIfNr6dy4aS4StpXTVmD5lLe
-npiwUZwKw4vL0Ups8veoeH0NifOW0NKrse1PTvYmxgIWbW2DGdDbH77lxINrWPYG
-+kV7gYhrcD7zWwqAWVcUWBiDXzxoCvt0rVzHPnGcNEg6sw8c69FI3zvDK8ouJOTh
-APMCL2WK9hFaUhTyeIBMzXhRypH/qE9zQLO6dnkwtRmMQ6P67yufbNptVUmgC8OI
-eOEBEJwcFNZ0DcM3EQ2IC47qWY+EofTjxzpP9zQRJTL9pvd5TUHvtaDwFLRzy7lz
-7vA3/slTHQajDkzVBPyg8anpKMCRBYU4PCB0zICBaaVFDh6LJC5Hy2pkiW03aH2m
-mF8PpdWpkkqMj7L9C4MFY0j/mLyCxValWZtwLscPcd7ZjGkbLd6nzABwKXL5jZMU
-hpkZ3KeugPwElBy8e6OX/vsCb65s9pBohIz1xLoc6D9CLWzl79FGkfSUJKcrkgLt
-ycdCnbk1pR01mm5qnwKSP03Fb1cbStivVAZqluiq5mtz/JzHsLLzLxunSZIiAnuy
-JhifYvPLg6UICjMpUnuXqrdgR/6qSQXXaIfg5Z1bbZRxes3BpHQRL5woF63sWydf
-kWPHEiI40SHedlYCQY1VdqmvMgT3NJKl3q8xpRP1qar/hCYCsi7KanplStA1UKZ1
-BBFvXoAB3ReUrcLXOsOeJCUTTZSEJOIg0ASHngmoFpnpMaBjpgoiR7FLLWQIRKTX
-uRlVxJkSUpEB+lfGDBjSfVuhCHOLbbGRZ69E1hAN/pUUD9lrcDjKAaI2J6xhl8CD
-IjayHM+jVGmGdAowVLp7h0R9lNZVJLL5hmuZw0SYcMYMrIrSme32R84CQwMZD7i5
-r/EtKAwprhQufLZp6naBfZJPeJ5U+L/28a0Jdm21l0axvpYPKeS0o7X/QWIKfh1L
-G1o7YyyaA4IKM2H6AFfvQlrjVWyj+mCOf4rPrmtSjSygKTx8To1Lz7rvHBsAdfge
-+z+JIawm1kJjJFLu0PPv9TqAKVhsuvbebNAXYV4tT/AdPR8id2zXCrNSlfq9Z+yw
-CJSU4jOBOI0IX+rj7npq83NNGYK11+h/l7E5lKI5OcCQWGSWwFQMldHd7wAW3Coj
-PjY3EzzuzzWMOyyS+mlZEktGseQH9+O++635zX+X4w0ACjHTc4404hk788y7iQlf
-BzZUJttcuFzUg2H08gQDmXSQwjiYkBw/t0EZ+4lN4pP/IvzvqFszMbYKfGrVXija
-KTZrI0wVnQwwTq1xdbaZOs+93ElMw7TezZuOH0jBpg9MkjM0llfBJARSbV28Vb76
-FV17TnpqPrGkPJDiA87xNt096K8ckRBd2Mg4yLZh/JfVz7nl1E45YOLUtRX8W2zW
-x6T06YEOqZZmhGe7YBQSTvMP+Rl95fEBeQyAldM/qjtCKSfdCW4h6OZAZtDd/S2j
-YcBlzaTIqIUV4ByAKo7g6w==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIuG4wixr+woICAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBfBae1Wa6gaBIIEyHrji0sbrlbs
+pEPacf4tL4565Wgt2KpCMTjdV+uccGV9tAgXCtOJ7YD1qaKV7om94ZUSX8Hw+Fjf
+lY/sr0MwIRWDwSj6rq3uujNJxQSXao7t0oBsTr9FU/UyoQrxh62T447K6rHQH0c1
+q5EOQmfktQuD0Kc2X1KtbMp0E4s2U+6Y03rtWuevEPmkyX3kqfvysio3qxsgBp/X
+iloM2FlSKkgIeXYHpF8Tp9tVW7M9gWe60S1Q2ws1aM2UAP7kAxAf8McG8ddJC7MO
+SzM/t9I0MQSce9mSEXEkCByXP7tibsMvbMyCpQSYKVxGw8Z5QbYFzwMKuKcyGacC
+Ir9xiOBvEh+TFObWcv2WflHq0fXCjvQ4MQhSqw6tcBZM3sJtRro+fnBRxYxGMyJI
+/XYL2TXFbQkMfeGQdK03rxJ2kaCazxcBpM3gbo+xRULCUKbHV36wE0ygPoXCPUxY
+LhkaSPn3AuDvAEVTY7gNfcnPUWC6js7SEkj5dJ8kw+43fsXR8V+OVIe5zfgBJp9m
+CGTHC23VOY6FA+qhYLlbvDT18XmcyG6NaCUfAsJ3jiHR74nF3jr76qVku7aOku4S
+bntVH4H1T7f8cN1RBFFiFEuo/oqgBhJEcpmDvp31XpJIRQxbjUg50TYjKg21/Jab
+Kc7/3zbq62EbsxCXJM8t+KgLCcqlv+kmke8IQH/N00Wft+zWmZ9HBJXIryTOrvWP
+q1o8uCqfURE4mmkMzH7sV5oYtNC4Ixm6V5q9poI/TCLWZ0aigo5HzBywHjcQpR3O
+TvScy5+BxIzcvxzLRnqXEHof8hqSciHRyQc7Ed1sqa6dF03KlgB6cxWDfDQ2g7K+
+oE9COQ9BdaUTb/D/8PcwPIaKwVXrpk2yvrEHayggDIttUitXsiuKHCbG08pNTnMG
+z7WcsHwp0NJfq2UMDYnULFdw6hOZ2gslq/Y4qjSolhvej9Qv2rKDwbwCuFWwyS0F
+Voq+1T231T0kHT0DHiXgbys2T08V52/otVr99ncQXVcBny+Cz+yORivfQXGFnQh+
+SPsSrrzsjbnlIKGU9o1sCaXtdEwGH8AfzovUWdQApY4q6LCmdyy7yAiXVGe+6sRF
+iYxOPhZipCYSYf4OzUPEDvRRpObfOry5THt+9nzR6j2N2+FsmEy3MHS1Vh/w2z8s
+DrJTJqW8WFFwtsemM978NPkNOxDdLDaU0vb7oZJna1hdTJzAAzjEAQ7NMrFiGhud
+JLA+1sgaQTKR93R7FR2js578WA9xESvxMjYTfB6jspEnz/tKhrhXJp9ZqOKse/fR
+jfeON23hKVCxVj57jgOLq76R/CC4sip4SPa+I3lQq5uQIiGRNfsN550zbHu7+VOu
+yo89AYBawSlaRclHc5PcDTJzi0J26PcjcpPSFatodPLTcAfzoxIfksNNRRWwhN2k
+UDBVjJcOjm16H2RVCZeOKN9NuuAZ9EqRZZP9jbwGf0Qe0/4KHm2xlPhYH9voRVia
+thdy+Xua9ryYwyCE8Fkd/bVPiqmCQimwUR1kzchxC/6zXNhMgaR5TV1ZW0Xq4QJO
+jaRJEKOWLHRi7b57HdqeSzBxojhMM/m5IVF9l9A344/iGrH3ULqxfyjhDXzcdA4C
+kEHTkIiPXHAKLZ0MmsQ2dw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/dh_params1024.der b/cpp/test/IceSSL/certs/dh_params1024.der
index d3f0f89a5f3..335dbd9bd47 100644
--- a/cpp/test/IceSSL/certs/dh_params1024.der
+++ b/cpp/test/IceSSL/certs/dh_params1024.der
Binary files differ
diff --git a/cpp/test/IceSSL/certs/dh_params512.der b/cpp/test/IceSSL/certs/dh_params512.der
index 6360473beab..c988b870722 100644
--- a/cpp/test/IceSSL/certs/dh_params512.der
+++ b/cpp/test/IceSSL/certs/dh_params512.der
Binary files differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage.p12 b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage.p12
index bef912091cd..eb82c25de4e 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage.p12
+++ b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_priv.pem
index 07f0c287cd7..d25f601a9a1 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0HnWZzg20UIHz
-MBQmhA5jK910mXkym9M1AM6/Dsa6Yql2pFnbaLMzD2eLA4yKGiwkgiY8cJ7o9+WS
-8oRcvwLnCHPU27/rHNHX5m3zxUHMl3jGlgn/PZEnmLu2vUGDnBht0teIL7iX2NNT
-TldIpaNYDWTgZt12ZEbsRoEQukYKgbGWIlp7+7/WNnCJJxav+1BhboCEvo1vGiQV
-m6VQ+Akxj3D8vtz216Irb2WPS3ERAXMx+3vrN0PoKzrxIE/Sa6mSoxk7zGG4ZXJM
-U7F4l0vM8vsxnPNjC3T4hsA+1hU42uvRqQS7FioiQEPY3WwQniM7ZS207xPHyBhF
-dVIJVy4nAgMBAAECggEAPpuHzRpucQq64MkJeAnW5mnM5Eakdg7r7zSEqKx+LzM0
-LGUcRsOx5kGogA2PwEEwrs/+cmvDEL96MQXTNFnArIWnnYl0wEiYOC+EcINUR8Uu
-2fg1KV9BIT5ZoT9Pkmujoijzegb8ZuubKQ3GER5iFK0zLz0SJaDdditbmXDl/6hX
-tmdWxCK8nCKFCYY/JJZtuo5RZ0NW2Hfx7QO2+WWkHv4K5tx8p//uaYHPViI1Rrhd
-sN18572BvJ1Lski76MuTd13AYmvSoiUV6mOk709itpf7+WUaGDLf5UmVEyeVpgTO
-0rnLPj23y/JN2isE2vLsYb42W3YDRCsNzncPEwrDgQKBgQDdANvA2UPLJP/tiW0a
-A/GYRxpGNLbjJDk15cB+ulQklVg0k5xfHg9Et2OZp7Ydk2YEO6z30Z80Ge9Ipyzc
-+j7ykaPn+SCuu4EOg7ruWjxB2VWYGsbcrqiItBERaghY3pNqCNkEG1XmyzRVPVwM
-d/U4NgCpv7ZS4mhUBDYpzuKqsQKBgQDQpDXdbb+iWndGIkHp2bD1XGhSWBFlYjjf
-vyTIIeTJRb/SrJG1IccUTPsFIPgi+jHh2EnGtGFtxppuc0G61wL/Kcyf4njBzMCE
-g6sQrAoxZaCBPH5kxWmHnmQ3ElXLqcVzw8VfKDawGr4lN+1yxMKMTOG0cSY/aRn6
-uCJe6TTsVwKBgBLtmOSqdwj2EUlZ5NM+lTmSlWh/6U4I8zFvjQ4NjVlYxSYzokfv
-PiWHg2tMludvkWQ5bDYJaRZARmM1lj0S3cNOv/gFOUxd2M7Sb3csmU6We6M8X93U
-w7B5o6CXMUHTRlLlkRit8qyCqOfICpMyzvjSfzoKpmXw6DiR58Wq53TxAoGAWyr1
-8ozLSQkYx0ee361k+sHnP9wFtfRmf7aJPv44d46H1GndvXVGBWPh6ArRAo+rDlGx
-Yydcz1gSESNB3H+pao/8Pvz54U0z7nOOY1mZlp4etXoWjLgKdd1LUxkq7jR/+Cba
-bssmomr9HUxD8Htzu1S451zt5pVpabneIvTqUD8CgYEAxZ4PIXOjQ2+krS1KKQp7
-LEGwYdvl/TOG91E9xGA83sNxq8geC0Tp5cwlvYCkw5zVONQfc+knBxEWHhd5W76z
-pk6axC7WBJV1WJY+VQNxkjjYXf4dX6e77Zf1BGAl7JkOj1fSJKVbOkYr7iJVCAch
-Uctjyev8vPUExS7X/Wo3ttQ=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDepZdFssvlixoW
+j+VYtdcE7wnx8vlECsULEdxLfbAybGi5V3HQxsDubzwEkbdQ7tX3FxEdW5Bp+dq5
+SVJruiBVE2MnZ091HWOl0EUft86tokjM7Th7tfDUOJv2zL//pNyrULbyQ4ZleXnv
+iWn1XQUuFAo5+zEq45qQzdwK73vYTOfeohcxBd5RBBNBa9TeO0YiKzh0+d5UDDRx
+wZqfczEGDe+FDFaxh6YxlOxQzMEpdF0zG+81O/22OiCY1oIvjVfg4YMr+frZgGBa
+DdbS996keqkVys+WL7X/NGiQT1HlD+MoCgzOtEsePJGObv8pGbDnFEEdnJZZfTjm
+kzuVhLVFAgMBAAECggEAMkJbFYa49EYkS3eMJCxYL2ruacmZbzynIkqT2g6zWY6T
+TVNqA+D56Fj/yWBDa2eesTppyKDExsd6El1015Caf9nyhhCSJTPPLL0I/ZH2e8eo
+e2oJWBPIG3/z5RBvPvwuPBXqVmHb0shLOEFiw9qNsssfS9tiS/Y5C/sMcwOAh2DZ
+I85Y1G3HNwXLJFGYQ0XdgJ+sTRaJ/A02KcPRoDRPd3Ei0Wv+EeazflK55ykiPwy4
+zmmzPH6M4paTi0nuMLMCK8w8shpiA6qUj6IA3KavOIeHgzPh83hiyQFZZtnxtobT
+9QAqvuM3QuQ92KU7hIuhcrAf7oi2JALFm6NROW94+QKBgQDsN2hlRU5e/izgs+yV
+r31xGRD9kUvTcZk4feKSwkb4wgI9GzRY8RjlOoBnBs2oZTzM6FqJxnRjsXDgZ3n7
+h/ieiep5JHl/IEPR8blzCv2ZzwBoxzM246ZVM5v3yzOTdRli7hAjOWxVcyyKGr/5
+wTBIvbKC1muIZmMGJA0AoITszwKBgQDxSz6ZMmCINEOFBewdkAYvdZ1hdv6GC+O8
+QX+o7p3YeTGxVLfq9gcuPdD+zUidoDUTBhVLKVLpfri9enbEsm1kvgW9QvDbABHy
++fzSRnIEVkciL1ECcB3p9bY7QvTnO5c3CD3Rpnt0ZzQl0qpqVBiCY7RpnS7T7t1C
+U59Of3TJqwKBgQC0yC8ImoNBZkwYaPtfD+D0Zte/CK08lQtL1eRKp49DoM+vzptA
+mryP6zcMIoPRJjHjLMzl9tFq3wlhZTBRVh3rz+d4cXbe2WWuTs68giPWzDsm9ZV3
+o8DQImByw7ykVRFpyoLlQnRr7WqgA5r7XWRDt5LgWZQQ3zNYJs0gtrkktwKBgGGO
+e4uy64aGIvpob5NwRJ/xnKToWHXX3sahcLzbZOQ989Jvn0CXIkYW5iXu17orKOo9
+HmTaG1SeUJEDL3vNbB88GNPxebIBsEAdxJM7uiN4wp/Wo5kpvV53YqtJIf1PgY7V
+fTEDb4yboWDdcNs2jwZAy5Ob4m/7dme3qYQyUgSrAoGAGxmqkhAQhBjOtXhh3Dq+
+SjRJq0unaFonPcbVr98F7eD8OUwmiP03xI4zvm4FP1BvnI3BeW1HIr7vop9+yYiA
+hpH6Vr+34Kx7/apPNM6punJv89qS4diYFR1fYtyeSl5d/SO2TeR5hchvkvhkbaVy
+Vn6U22uCeZbjLfLEYweGhgY=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_pub.pem
index b5c4521d4f6..bd9fc76d4fd 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-BQADggEPADCCAQoCggEBALQedZnODbRQgfMwFCaEDmMr3XSZeTKb0zUAzr8Oxrpi
-qXakWdtoszMPZ4sDjIoaLCSCJjxwnuj35ZLyhFy/AucIc9Tbv+sc0dfmbfPFQcyX
-eMaWCf89kSeYu7a9QYOcGG3S14gvuJfY01NOV0ilo1gNZOBm3XZkRuxGgRC6RgqB
-sZYiWnv7v9Y2cIknFq/7UGFugIS+jW8aJBWbpVD4CTGPcPy+3PbXoitvZY9LcREB
-czH7e+s3Q+grOvEgT9JrqZKjGTvMYbhlckxTsXiXS8zy+zGc82MLdPiGwD7WFTja
-69GpBLsWKiJAQ9jdbBCeIztlLbTvE8fIGEV1UglXLicCAwEAAaOCASowggEmMB0G
-A1UdDgQWBBQ5+sjBXcHU7LFnDIC+kNlFaTkCCDCBwwYDVR0jBIG7MIG4gBT/Kxdh
-8YBcEbCHAFNAvfbqUs63WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBD
+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
-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
+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
-HSUAMA0GCSqGSIb3DQEBCwUAA4IBAQB5n/HoQ9AMWzSCRGH0blACzXtZlD4vTfxl
-TYaNiIUe0kQaVZiBtpLyl5eWhYMbCVIlILmN3QCTudJSg+cOMlCormZiJjiKCt4R
-TnTt10U85d1h0KPInBIMCcxUUgElgli+zHTVBSJZYrV1EPbcxY3Kn1dcBv8j0gJO
-yDe5DK/eS5kq0aV0Tyukb4CighvxPum6X51ERmZtqfUGcPhD4anSiMFpsHnk7WM0
-oROsbdXGMoVIezALdeEJ2UdO/DOcoGyQg17tccnUZG+40+XZeo28QtV6iwJrTAVv
-+lsBdC7o1NYFGzmt7GNOxRhn+25puqD+CXEo924cgNiXiYGeh/3f
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth.p12 b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth.p12
index 8ff24f1d2e0..8d6d382534a 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth.p12
+++ b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_priv.pem
index 9d677995e6f..05ea15e65c1 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC8dDEhnuoA/xf0
-NaG6fqUpQCnxCLQFFmOx2XqcaxKBnAnSq/dRFBNXOK1pEthVBLYBxsWpsqQxqFJo
-WxF5kpqhbGodAAez2NFKb4IrX79Q8yPjC5dE5dGgiLwRvU4V2LCQxOj5vt+RVviU
-eNkctQ4OJjmEZaVzkJyFrqgxvWnLwtSDCWo1pjws6Iz7VSAImva0JX/P6Qs4ufhm
-9htnc1zLUTFXJPW5AIN1o5MRyZTsI5/JVwN3qoDP+zj55QwMZQEjhlXzkGgY7w5+
-wmUgKl9LD86FI5figVbC7S/yjqktoaamGQOLEuLZgSJV3/io16G6FNGa3OdDZwei
-myUDBRgFAgMBAAECggEALcFoTGlxF1zYTArZgZZOM33IsSUT0EhnXD8ZbfDxRVbF
-a8kk+yKMr5irQd+5dqr2JehFBbbB9uyPVZcG3yWhNaBFA1WGiTwTVKdOS4mrwdPG
-2tFtoOTLyNZqE0SLOPKrq/qjNkAJuBgNsr7EuBudlgHh5StoyG5MEokdfTYoAbiZ
-Gf+dIzZvRoKkABNieAm5NK4EeDITsRnGs6133oP2pkqZIUDBaCmeyyZwnrPoMf5g
-uOC1j2bTvaBKL3gOYFYu/TDrY1O+R32EP9s4tx9nQWzk5z2RVX6O8JftLGLKHGgU
-xLw87Gw92heyWlSWAwbwXsgoszG7FC2ZhM8aLr0J4QKBgQDwO1guopfm1NP53+om
-HboPiu/xm+aF5OrsTX6fwD7NroPz1nbimYnMA/QAeXlkQyLuuONhM1W0TeXUtteM
-GxzUPw136xk1C4G6FnoIBGYjWt/shhUXXcBk39wrvpbced6twzdMfgP9TrEFxh5A
-mGIsP+otSg6Pfyu8LEM/YxzK+wKBgQDI0tBk2B1aJ8i5rP8T/XlF6mmI9HOXrnW6
-J0zS2l6QPA7DChwTwG25TEa+ZtELXmAFQE7ZOTEYoa5MtlbE7HJGEJ7TqwmkpkVe
-vwpROsiB8SZioz+Hzj9ktUPDZL+1CGqH7pPy47ll5AwEltpL9LT8ZlZIPE1nwowp
-DvsdY9A4/wKBgQCl7ieblpzbSLfdyQa/Kxs/7xSKyscwRozpiSFkEHKQuPDVdJYL
-MEgYjcZ0qXLqiODRCQ2tLrsM3h1Yjq5VTMjd5WtVICL6G6eQNEQ302oFE5jFk1tw
-F0Zzppg58tvbD6Z6WPOSNxxkU308Yrq0nUx6Ce+jNprWDN3VjLEqUDgsDwKBgE8z
-zZqoHVNsM17/Wo6Qvl6Tp9Gqz1f4J1gmncbe9sKd3RiRCSfFEcEt0wzO0g1QyD/p
-7+79/l3/jhWVKD18H0mAzpMedqwoI13NrI0CyQduizwFtE2kSx412ybZuj30tscr
-kdAOfhUwTokU0b15IlQVLFxK5CBS+yJKVUFvFzUTAoGBAO69CGxTkE99cGK5dVK6
-uzi19GMhdGQd8Ax/jSg7JsCws1bTgAO6SGBm4PefNmL8XLeY8uEmaTPG2klZ/qas
-V/3sTJ/Z4Dra4ri6FNTcW+TVlzsup+bkfDCXZL5uMaf68rkXgMg6gOhE4Q7SshyD
-28WoUp+btaayZCdYzfFki0Jf
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCWvs47jwMGVzJq
+ZOtx/3hnGtdYJX5aa27RbNoV5FEBSwFH8XvhMteW+H5/F4+tVguGNvJOL5HSx4zI
+1vtMDudk/SOG7g46x04QcCts2z9TaqL1KB4Sv669yvhpz6abfu5xbrNxkdEF8iEm
+ZXOF5AYspYZuesGZyVgnnF/b50SnhXPDFNUctR+QJSggYSjdfvKBzRIHG9EfBjJb
+xLpDv6qrx6Pi633tJqh0+LEBk2VQAxhlfS/Z7JZB6WLL3BXKvWHLPdC8gwcZrjKJ
+jrIT97GOmhQMv9H/QuvoK5Y8Yor74kTy7JqffruntNHtFH/2ji0uF2+Tv/XhIg3S
+euOcj/QDAgMBAAECggEANB8dJ7K3FQYpRGhIkE4Iz32UX8H3AkSLOJYugctDxvKs
+KrfwYVk2+dhJxJ/c6c4KhgmRlj8UaJDeuMK8ePvePijYk9rTyLcI4t4l5amZJ7qD
+RcjtPQZR4QXBBrTponIs98OS//2vDCNAGwqQ+wZwrBc/eAuxzP61IF0NN/eq4VDX
+cJqUHMSqFnbjOsKPM7xKnzhXDhydB1fzMYR/Gk4NOkvK8EgFI67sGmW07nIg+KWm
+ctgssLJfQqfpmnqQE2vmfyD20dNsjYK3vpXw1ohDKujrSexD4umPgVPukhpNqMQ2
+MRtySTR3hiNaF1JPufTTEbg2+j8ZPqh4QEXZsVoCAQKBgQDDmVbu3NzzHn6acU74
+tgenNAGwXr11ONjUuoJvYskeI/2K/toe3H+G4TZRJ1jvnmUq6+bQebJ0mbWFo+6b
+yqJFVpDLHu6z1hsLD4EeD7mxFzJYxjFMLLBPpznZmi36iQqffKZtGznf20lh/TK5
+CS2G3JexvxmAIB5X6gQdG4/TQwKBgQDFS6gQjexued02w+2youKMStLbdiqgXLLr
+AxkprYYq04QVl1jvldOOG6ts9KzL4m/62HTNRH28YAs8QN7Z9gdjAgkYvpZ3rSV2
+59hZ5a51vkMDOxVkzFH2MaGd1h5VZWZeDBrZASRzBOtpfWlm/IKHyVmvEizcLecH
+A+pk0ApwQQKBgQDCweDcj8/0x61ZzG7MmDtAkjkISx0sJgFIt7j+fYcx2rYu+xlm
+VzknrQFvhtU4Kigjt6YoeLRnA1HKEnOYbghrMAmWJmOZbxuYRMTUkOXdXfKEkDsv
+1ONtPF4OvEUBzAhmyy/PPae/rNIBnqItueS5/tWQZ25VtCVidiHIddQcjwKBgC0E
+qGKun6ZNtEZMyq4aMKtmX1qoSe2xeTnaySETcSvQe7EZibeRbmZcte70nYEgOAD6
+5xv3ZuFW4Plsq+z8EI9s5Xp58od4QLYzDNDmcbp4IX5ZOvZ3ELSmeoQzWVSPAJ6x
+EGc3tYNxOe4mKajQMVCehxJFiWrsJm0ZXaCHP/qBAoGAE7Wr/gshPyZvruiBzHBF
+MDrHb5ZqIiEMeRMxU/W9tVvFPExx9HViYOhXGh/rIV4PvCE7+tOJ/FPwsp/7cW2F
+oVB7I5iRpd7/c/0+lih2GijDXRCBnkgBlt0NDn99l+HmxWqdeLiZk4t30Va8tYBM
+2bIKTXRGhKt86uExm8iQcUo=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_pub.pem
index 27dbf134d07..45e70486abd 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMDky
-MTE0MzQzNVoXDTIzMTIyNTE0MzQzNVowgYoxFDASBgNVBAMMC0NsaWVudCBBdXRo
+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
-AoIBAQC8dDEhnuoA/xf0NaG6fqUpQCnxCLQFFmOx2XqcaxKBnAnSq/dRFBNXOK1p
-EthVBLYBxsWpsqQxqFJoWxF5kpqhbGodAAez2NFKb4IrX79Q8yPjC5dE5dGgiLwR
-vU4V2LCQxOj5vt+RVviUeNkctQ4OJjmEZaVzkJyFrqgxvWnLwtSDCWo1pjws6Iz7
-VSAImva0JX/P6Qs4ufhm9htnc1zLUTFXJPW5AIN1o5MRyZTsI5/JVwN3qoDP+zj5
-5QwMZQEjhlXzkGgY7w5+wmUgKl9LD86FI5figVbC7S/yjqktoaamGQOLEuLZgSJV
-3/io16G6FNGa3OdDZweimyUDBRgFAgMBAAGjggEuMIIBKjAdBgNVHQ4EFgQUuUp/
-lVtqD9qHbSkfGb/0yylAwC4wgcMGA1UdIwSBuzCBuIAU/ysXYfGAXBGwhwBTQL32
-6lLOt1ihgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UE
+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
-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
+Zm9AemVyb2MuY29tggkAv96HBRg/RI0wCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiH
BH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJ
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning.p12 b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning.p12
index 84849762592..58afec2e843 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning.p12
+++ b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_priv.pem
index 5f4e613e4a3..1fdf463ec7c 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDKckXZOB21S3rn
-BU+eqCrNi82X4VV+MCkiwp7mgZmI1VQkzwaCzUuPqDY68AHpJQ5gmyM6sDNAb4Jb
-aN6fKBeLGL7Sg8VggPnqi37R/YAyrUwHfSjpqK1go0KQj3YhyPVXPJnENCLN6CVW
-LYL4bedhOiC+e9hellFwbnBLTHflkSqUw6/QHWk6RonYVkdx4fVziQC01JqEk4fJ
-LmgFrNyStl1u1PgS4+0gGpRfa+GbsfYr9XYyPjaFiclLZqUqdTZFoseSaQEI2dxt
-njl1NbkGR6yvbJtY88+s9ZOxLtwVng1NlDlMz0rdKBCu3aUhXoL5cPFmKS0AWwMJ
-reVmfhlZAgMBAAECggEAZLV4HdkWnkuQNkCkHQ8XS+1SN033U7DtpccfeRfbowBM
-vYrneEZcYniRkbw3lx3CCzjhy54/wLw4IvUGWjJ9k8qZkuvOUnWW3aDLU/dBwPQI
-sGkI40PwC/TrdjKH18K6mc0hyUMOVVQ4zqgRUTiLNAjQpTHCrzskBERMRIkj0+UC
-wvMx06JiMa3c8m9uRT8ufKi93+PngtVnueODWXSUpWdMGTnfgnhcKABLSIz3EtNB
-1VEs8nKzhKfiFyeHIfJ4xtB5DfhjsEKHcDqktlOEKgKwkUBo+DBbAfd2JAO8UoDs
-w8E07wU+5g2pgPLiLmKZRaVwwnq7f6St1LXHkLmDIQKBgQDkvxngM3BqCsFO7drS
-YeFt1qbgoPN4pWiBdWt1sfADD8jZMAeppvtZkum6x9i7ixmdGaLeC91mwuDNRQUj
-8Uhwb5ZqCptmdsrIhx6vzVpjbYeVu4ZjvbRu8VIA4XMfj9jG6V4DDm8+FK6D4Lk5
-PLCtitM7rYx/Aws9cgy76XCEDQKBgQDikQDa8bbcUi4QnwjbBuHMSkSGn5rH1Ovn
-WP9CETa3Wqlo6k/KK7WUKUJZuAzEionU7c02pK1PCQFpNefm8iVy4+fWa7JDzDoU
-RXaIF+QsE9oHb+URrNuQ5XTeBlLHu9TkG2PUBotJA/2c9d8r0w1qEuVVzF9SddvA
-LdS70dFbfQKBgQDb1tG+iJFMSMPZ4HzCXrGxx28gSW9VDtsuODQrq/Q4bQ4htahX
-oxTD1I7vJKwmKhxWwNGnR43j+fzlKqUzEuwEqynLBiCtzBM9v6Z9XQW2swhwngYd
-i6+CREkEcagbuDqliJkCpPfCmUvTkMFSwgIm91nla/iwBLPjvN2CJ2ssbQKBgB8d
-/TkU46GE4/DCduvmGRL+zESVHSP++Vtv3LcNOC+ckxHmxIim0iyEMimyXoaL5HxL
-INk1atwlB32UusH8VepepNPNPNGU9hEcrTfp2Bu5qkNFOffgftN6wD9SLQJjqMyf
-eml/cJfZpXZuSnVxajE8YSUUia8AourVIJefLJrdAoGASX1m9i5iL2/bn/qL2f+x
-Lrckj+pvKHtZTEoX2dA/yNcSFv8muotO/Y+1muK/eRtPEacC0MQfwieW/UzdKPgz
-KorsEAVEOmvZn+ZiM1vwyUvpXlM32IhgFZLNrTqZhxB6mjsu9Fs800OBinWau1ay
-1ZRqv9Oczt3aUv8r2wlnIAc=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDe+n7kAutLsOVd
+5bMdg7U8wEDr+MudHzgYlsHZraigArfU55kxk0Vq7Mc8gDp9Ub4Tdi+LLIjFO95g
+M2NdZBhgy76A0DAmf1uS/rDklsduCoE2TFsBOjg9NRNqta0CnC/ohrIWzk5tM015
+eS4+skjYhs9k2Ey0Ih0fQogvSgNBYOm1ECJginwfL1oVSkpv4sytITioaANYhVZ3
+HboIUJ0ZUNtLQJnTyfa4VFOpySzjEJEOk8g9WRyEA/XANruqpFU8zLGzpkz0Bjxn
+Ztv7+oEopAqbZ+5+PopbG96NtI9kxDWv76iN3f++4EMNYYYq9fiuSeGhK3cLC5/w
+XqNmsClnAgMBAAECggEAA/sis2Tk0/6RK7PWpgfFZbd5AJ7RAouyELLNKAQCg1od
+jSZvo6y17TYlpzUdHeZkCMaEhvJOCvtHdKMfMuCd0gG3oaQqY26HePttCOzhMGY/
+SzZ7sxDKZQ6kF7TB3a/73YwLYFWANwmefM7NOTTbvs//HTQM3HQPd8QMpZmS7KpD
+WDKxT5skF9W/hD+yriUpD7facQiNLoBesKm0MXVbxNwnQi0CY2qy+i/Sh+sq6Myf
+vFRDZ7d1PJOWsgaB1keoCX1G3q7SM86O2aur/3vOzZtvyjY+vdJJDb2rA8B/+fKg
+jxOohNA9kQRmVDGduVvTQnl5E1tD8UxjOrZ3E3hn4QKBgQD7vdZKR9DxmTv5GYXB
+/Uk1gGLk3w4w5CZsToflAcwh58+/k72YRjVSfAf0KaUAJTsl+FckUXNV3K438n+y
+RJTtclcpwaZX4hQPu6An1ED+/k2nKu+0FqSt9rKBnLcrnMeSFPMfiOHctCbooE4d
+LXdmexIY/azewMLVDibHO1nEvQKBgQDiwBnDbhxk8M6E6v8fYEGwSsDvcJ7cFBRV
+/x8vGsL6jOwhlA/aN8mkZEr9pR8KTX754ONB+oipPa5Kj2vEwSJuk4/h0J57RNGQ
+AOJp4cE8DbPUSd4h67wQICYyKxDymItEDQYlN/9ujheOzjHmpD1k9YRM9JljTrpX
+j2hxONuy8wKBgFePeRiPECrofIaxDOgjfDJCvKMUvm/c+0xSqEvMKz9jzMu6zIhJ
+a0SMZYvUbFK3oHIdhdnZBr/HqUVGcIoF9rL8QTsB4yTQOuAaB6Oy3QSUWVgaxBMk
+iRUFKKOSadeeiX/TD5lZWA4XDy18jI7zgINBrVLJ8TXtYBcQ/AXyK9AVAoGAAd5L
+WAzkNwC08utsxrloUSeMh2yKIo4XzM2ZWC4ERUQ7/drWdpnXE3+wDn75zn/s9+oe
+dUC3N43Gjd64qJpeykJ1AQtTAvkCMQmQ1AaELRZ/0NP6/JSQrCFXrzojnZwcKadh
+0ZSwihypnQed6aSYzOgo+ulZCjRv3KDV33j0dnkCgYBm698USnDPS6R7v0jDh8pE
+tpSBkc0j0eHgBGK1nclotzrOtV8KZfgnNqjzrJvh8N+JcxC3rqzCfNicWeyb7VQh
+aZ0Q8kQNt5UgE6bS5mBiW35MvmUHzXunwUbV6g2PvCE8WYT86kQRd9QRRlXm7i/Y
+TbHmEpnbZnRzqSfCoCdt6g==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_pub.pem
index 658648fb83b..d4d3eb9f5b8 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-CgKCAQEAynJF2TgdtUt65wVPnqgqzYvNl+FVfjApIsKe5oGZiNVUJM8Ggs1Lj6g2
-OvAB6SUOYJsjOrAzQG+CW2jenygXixi+0oPFYID56ot+0f2AMq1MB30o6aitYKNC
-kI92Icj1VzyZxDQizeglVi2C+G3nYTogvnvYXpZRcG5wS0x35ZEqlMOv0B1pOkaJ
-2FZHceH1c4kAtNSahJOHyS5oBazckrZdbtT4EuPtIBqUX2vhm7H2K/V2Mj42hYnJ
-S2alKnU2RaLHkmkBCNncbZ45dTW5Bkesr2ybWPPPrPWTsS7cFZ4NTZQ5TM9K3SgQ
-rt2lIV6C+XDxZiktAFsDCa3lZn4ZWQIDAQABo4IBLjCCASowHQYDVR0OBBYEFH8W
-zhid9ojN2179uKSEAEIw44+MMIHDBgNVHSMEgbswgbiAFP8rF2HxgFwRsIcAU0C9
-9upSzrdYoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNV
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection.p12 b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection.p12
index d30aabbc7e0..8efbae4b222 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection.p12
+++ b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_priv.pem
index 129897fd435..7e2a2cb8ecc 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDwNHhDppbmxvK/
-TtxO/AzrFw0deUFXZREXV/0dG2G+mK30FmIGxwCiDTnoU/zENd+niEu8o++i/GN+
-jgbiKT/Sv4pXBva3CiWHngdQ1jGzt+jLT+B73f7Y1glAmYorn0gkz2uVh4RkKtm5
-KiWz1DFP3WSVVJ1MNs2cho4FksRJJNSzbeD6+nlrIoAYltAJZXh+TTNV1u1+gxb2
-xouQsiRgfm8NyEYl40wAt6kx3casMtRKWjTKGz5srocZAqsQvpj69YPyUxCWXyAD
-cKaXy9JqvSuDXDD6ojB57N7wTaK2LKBQOibFPpEANeX7QrjGfY+9mD9e4qA8DLEm
-5TjIzLxvAgMBAAECggEAaS4Aj1bt8sWg28ZTT76shXCFjKdgxjz6G+eqbMllpojC
-ewQmDmOrUkpKVgIYx23zri9PQp3iO9MaWfsk5nk7ejPnBq6E76dgwZ6gA3SXNOPN
-6uDiIjsV8arfSEszJmDLvVqZ+FLr1NSym5LqCXFb2mXOOllfu1Sv+d8tZyFaE9BU
-qwpX2Il7skiO1zBLfgZnb+ckOV2KoYrVjGOz067AqHIh60ZeBlVyV5s5jWl7bPHD
-SjI3jP/DSyzorex/kTgJFypTdpGu7jTU1zFKl7RyQpA8coJddW0o0M1bDRi5nJXi
-IysIkfJad7844rGJTilV5VYKLKDq+b+V5m/HYtf04QKBgQD5M7BjjBm83aGRYwVB
-Khbl4mJrhnUQKsdzDPRoDDCPNUEXIdMDbIxbcKfy2hl3HaT2d/8LuYfCekC3N+hQ
-nteG7mfvCQmvBOqAviRoXNuudsWC1zNdzHxXM2VQUaBdhDOpx3Tw7HB94FiywPvZ
-F+oJ9vM81S94pRQmEeNvoNMIEQKBgQD2wfNBsQ7tIzE5XFdzbdgi2Lvh/POoOInK
-QwkUeUUNVIktBJqIk5LdEgFpLBuw/q/VtEMBUhi2rpo0BEaq3AclnEyLIpDVDICO
-yOxGbbAm40o/WxtYjEiQ+Qq/YsIDhH6N627MBQs7YhOzVLtuz1GbNy5SuI9XWICi
-FGTxJHv8fwKBgDu+iKtVC1acS//vHXNiA9tZSv88XRRjLS4IDRBk2795pQFGurA3
-de72M02lvDUyhjoQyrSk5kdZx+olHS0257URsxk7sXakVxRGgbQDjydkkjWsIkR6
-odTGHaQD7c59w2UQzJh2FwIWpy0z1y1U7mc1LVuIQLlL2mjGISDCDdYBAoGAH4tn
-x4wU9me7UTPm0hDGwp2mVxt5IpYntz2emYlvNGcMKj8eajtDWROGLqW+3H+ShuVG
-c5LFKgVkHSY2ynzaRQqYFmlSzomMnbQ90DsRe8cupK7G7ijw1eegYhsD5mM3snjY
-byht6Sd+kTxRwbarHgaN23FQkb/0ocOtq84YM40CgYEAirRC/qR3tBLwHnoBKNuu
-LpYfEOuE1KPNoPIK12+76vW/huY+lEWBv3y8Xz7hRiNEdzihUAQMC2CdZuijMnV8
-obRKQna8Z5U7Po1rzKDvNP3/nvrkQ9aE2qQWht2o23hfsNaJEXUq0iAgUECDJM/a
-VCCyvFM7Wtu2jGMMLr9HzAg=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCxTi8s3gOZuCXa
+3yUpDc9al0/WKJ3WzatTBAMTlQheDGmAvDET3jY9srWpQp50BTDYQ7Y0IL5/jCYs
+Qv8Ee17NOEso4iBK+smS0cuupGwsccNCEdB4IgE+P4vCrn7WvHfciyCTJWEfzmkk
+8p5OieMa5LPMIt57lGJRBbs8nYZ+HehVwSxSQ4/d8v3ntBs0ZjJiYzN+kNcrcuy3
+/yc/VoLWnm2eOkvBWIVpHL1XcLEODboiE4zWFdKNfJvvJkaP1+Rj+gVnqPb+voKa
+ZhmpScI4Vv/T1s2l7Tm6htgUJjivMiLhy/NtSH4JzLgmPLAvYEIwiIpuZOPfJWjC
+ow+BzAq9AgMBAAECggEAFSxuC8tI3h7p6QpZiLPifZdblwqWAXnhf3IXiqDIirAB
+cA3emoMgh8ZYqqmO/JybaagkZnM77Jq9pZmBP3VwK80Q2gVZr+U6ad3DQiGBMt7f
+CiZ7IRgxJ9A0438tHH24nqNqtMfI98sRhAez31MuG3RmWEwYX4+nx1802JdDNrou
+mkyolSEXOgJHHot2AqkOcSnXY/+PZKb/eQU/UUtwItvRNCRaJhjJ60n9bGMxUdqx
+BYI9K1M6UjwJ1B2gTA1mZd/pZFjoSN9c0d1nxWzfEJboq6c77Uu2ydUdG92eGeHR
+RPosqt8VSlL3yN24y31jBXGd26m9grY8PE6ZJTrh7QKBgQDjWS36/8sIshxE6j2m
+BMh2Q9FRiLbz16AmDqZuLyTd3MeHGvyJV3Xx5G3b8lVvfTFCspMHBQvltMzvzsFu
+a7bFKx6KPa3OyHc2ZUEHvSAKl31AHZOiSejKolxT2WEw49Hx4TdzdgwNWedAfRC5
+zCqDqIwIyvxUDaBAfI49lYhxlwKBgQDHpn7L3Meb/k/HR3/WmoKw76/hqQnfLV2E
+ZrQXyOpucEMrNIXJ1cPUB+tAOFP5XL4l+xxt89RNmT/mY5kn8UOjX2xd/TDxyiaI
+QYB5UE+lHDkUUIa38OG5zuNGoFJUA67xAZnzx55Nr1TzYv32G6f5E65fuwnLhXd0
+GYvp3ITIywKBgGmRn6hN3xnKmxXlL3tH/U3tb+VMdqgEGHmTk/TWL2hWfNBf16Ru
+2HXafKkFfmam25j9EwjPbxbbPc6dU3TSz6v+uc+3lF3Q+Ippuii9yYMhlSeQlF1n
+tJFjkzvcVSU+pN6MlhMnXbFVbeykJoAgLh20xlHO8ByXtzI6pFI0fYdBAoGBAIty
+qFeeArHbRD/NmeX8D9Kj53Y3ilSerBYBYkLGq6+tq8yup8/dBiW/zjoR3d1rQMjo
+hufpid0VcENsR5pVcsfWq6tOYHRRnO5IygJx7N9HQjsFL8OkdRVCAw7ehgJ2fCeL
+1csnH1PlZfGFsBrJIF7ht0bYLjRAKbom6cnTo89XAoGARIb3ttORMN+0snls3S9K
+g21iCFnUkYPzpFDgEOld3xVb1xHLs1sjUiXiOC/0sYIoxaRlmqmQzF3Pa9/WxdTL
+UdzC3Veq4aGh4KxWYSXp7vEvhQJMfH3hBeinGIQgwU6nNKKNm8yFBt2SbQXJecaf
+5eotG1P/MCs9cpF7j+439XA=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_pub.pem
index fd5761b74b9..fdfccc387d2 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_none.p12 b/cpp/test/IceSSL/certs/rsa_ca1_none.p12
index 7570cace0b4..ea57f034209 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_none.p12
+++ b/cpp/test/IceSSL/certs/rsa_ca1_none.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_none_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_none_priv.pem
index 3be9c8f0934..50618719f7d 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_none_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_none_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDSbL3UJpcz18ku
-xPHV/i/bOoL1yT1HrutwQXAtiUIUNW+F96nq2BwxJrce+1eelgV5HQP3qZQnb/C1
-lsOhsFa8fyg7Uxgd3paVQlZUmGx2TJ6c5mvIinJykmJ9J1v0KnfaWbLiSY7aVFai
-c0J6CZCq+jyeWEFJJ2lfriSRAiPZS8+L37vdO8VA2w25u0Qq9yiV6NqvWzxAz+97
-/hQBis4gy1QpNBcDfQMVdbf4oh/cs0mjFGuGr/sYeB9/u5GVPuNn/jp0H+6n8Xc4
-07+sb3i6er38PLnV3k0svrFY54tSpzbToHCBu0mQGa4L+Br5fpPSyL5k1rImsIoh
-VYLFXLttAgMBAAECggEBAIgmW9z86zBcGovsWh1/zi8m+L1XbBMJlsSXUqHkAaFZ
-wcMIsCSHmBYlWq7tKZAuuXPX1k1Up8usni6gUgw4MKbeD4XzCdOpxfzlYz5xMRyK
-DsauQGcNTWfcV2VrJhAhulLJXvkTZx7VGwkZUpXrwnMeXkKGEBfpLEEASCCbJd7e
-BZCI/JPaCdULr+VYxbBZsjqTOmzwhwhB7+WDhdE8MRi/Gq16UfuYoS/O4y44bCWA
-fjKR4YJkDKZtIvrUP8IJN9lAwOcYB2rykoE+wCrx1JOSxK9tLu/exoW/gDs2HPZx
-gcEaHsQ6n8JuMxuSDEn2lI1tiQSZxdsGOQB/07AC9nECgYEA9qgcdNvAvlb//zee
-fdA73rxh+fYcpnu6nRriCUn4trofhGYwsI59g6PQxuQx7rSo9wbNQhI8XX3ta6CH
-bf19X5agpG2qZnqJY5HuZlrcHiJ5bQeThRg4vo8h17Q4Ll6RYquk/0poKyv83jTV
-/tTU/Zi1fL84IDkxUMzbzf6IjVsCgYEA2mVH5SZ8FFJQSvI021tjJ4hnF5afIa63
-PNeP73LbB8ucgToPZ8YMoUYIB6DEvxEF1TZMNWH37pVWzHSXiyDj6laQ45FIvsJw
-qjhPw3dIpAuoNMLOjLtwV9flNjaBMJbIuInbhLz6qYeArnTK+36Al2LNKYifyWqi
-h3VowK7VTNcCgYEAmFvrh/ueKXTQGLQggJK6CLHQy3hM5kGTWiwa56X7rdN2WHBP
-LyA1Q7VS5yhZ95s8q6pV67Qb+Zwppcu5HCXy5bLDdA4Rrc+PQiQIYM1LHooo+0Is
-y4/UrVD4lKdL9MiRgaOI/fDWO6SmRBPbA9gv4J4NrQro/m6VmdWRCMNrUfUCgYEA
-n19DjOx9pZK/90Ey41SYUhQPLz6CV+EY5LRl3BYT0md6iS8maNM1CkeBupdOnCO+
-/u2FxXr9o8SlN8RphmT1DWAokXjG/jYEY6N+SaT1hIjhMcdrVXW/MMtjACHcOun+
-BfTMFdyWizpP5H9kVQzmqBK4pvOFr0U63+EFFX9ANrcCgYBfSIwZFdD4cbhlpaqc
-Th7lbFayCRuZ8t3Y/0son32q87bD0botg6nAjMjF8/2gYSWM+amWfbTWuikz96eB
-ckgFt7UN2yYGKVR/gdP6wqnw1KY2zH+HnmoXhzD5fLHDphl4tW0oI4Dxm/n3ippc
-5UrvxcjVuJJQQ9CCd9tcLVhZ0A==
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDV6Fi2WJsyfAxX
+7azfll5SsBYQuK1fL4QjfcqX3WpMAY9qI7QKHDK6UEetbCUgYJf543yD9lJSEWTn
+wk4KyQIaSKAmziAqUGUBs5UmwCsGg+4HlcpYHl6bAvaMyTEpfPKSSvcOw/T1UIuH
+wXnYbPhzIXRdXPeRbBGfweqTaMpa3YmRbuPwvoopP1ZLjzIxNk9jn1B26ln6sOfJ
+MfDfVgYRNoIo7H3pQ5MHY5Eo91cUikMDmvbjiSoYkXTnL/h0Cr0WTMEIKm6n3ioP
+dNB79e5UvgbcRU+w5HuvlP+ETw+b3V7vp2W45a/jnfvAcBv/nbu/9nN3XnUFmzgh
+jjlj2MpxAgMBAAECggEAGYIJJyh6jFsC0U7yRyDcK13cab7ODNxilGVlHfY9PWZP
+uvNaPjzl1zYoz/9GD535LYdBQ07Buw/gMatn6U0WSzpXH72DlCwtWVY4DmyKzO55
+WW31OMwZUcCZFEmPK2B/IC8glkILoV/LHcOWgzaea4NFKDeEfbLOiLekAJNV0x8h
+X4LokKXlGRHyVZjiG/Dx1r11nwkuMcdXgmJsJpm1kDTEjlrLBszqNzIYgota/Q5x
+/7AdwlDsq0PB/UU+tzRjgN4Rz3X3PkjCeMaeciQPWYS+PnIcWoY+xHJUkIuttexT
+1G++GG6SFNH1q1oCQepSskcXg77wf/PArGDBnyf2CQKBgQDpaYBWXuuOgIK8L8qM
+/kNS07nFt5D7RGVdW4WzQTIsJJphz3rldu5RO4HJ5Zrtyiz6vecCF4BAPemKc64C
+M5HAjwmNJo6FqDRt+8KUyveVayS/s0ZCuN5YbsgLNoNSbCe31/N3n1sdQZER061F
+4MOH3k1/P9sgYF69pNgYBQ5Q2QKBgQDqm6UXy0oXeZ1E2lVAov8t67u/pFfmkJti
+eU3Es+Y8+dpzQvLe6odPJkK1MF/g3EljicGE9WrSDuOsMhN6JTtTrZs06YG22QSS
+3x9TwVKdcAOXI2p98oekIAlL4j8mXq2CJoK/nbCabLAeHfTMrkjOnTFIeSB0LGuR
+DnlkBXbHWQKBgQCn5dIBTwoWWW6xO5dx0DxRSieph5/sfoiDnSARj2Ytxq6eiQaY
+JPLM0AdOWbEWN4YfX5baNFl23JIvm4Kh5sKDRuDR/dgrYJFGRAD10wJBIu8uTiDO
+Qfj+l8Gh/zZ7hX0Ui2yAscpywwU9U4yiZUmBZHFOhXp0UZ4UwI0IyipAEQKBgQC6
+23jkuK+sftp6CoO4VZp1ErqY6uZv52E7T25XawnIKyCIiRwz3AwlSE39TigvSoTR
+WNjfczC/WciQT9ofgSP9g9qIjCsaXUM9T6T96o5Igvz5FeYtpkvOtw1weSTfBK2h
+adbdk1UjycmEU0u08mNe3Ohx1re4j+Ckyih5N7jhEQKBgQDjmvyTP4NjCD+/JgeV
+bRAusYs7IO8mBzQKwY4thQ9GW3nEy5+oKjbnD0exSKExestLjxeCDAozbkPMOBNH
+5DM+oqwvWAg9XtH87lstSJTyECfdTvsudBrLOp0tz52MGyZ8UDTDTURS09uUN9Bc
+aWpq7CjHK9OS3C4s7x+qsRYpGA==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_none_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_none_pub.pem
index ff505b65957..36010f5ed77 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_none_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_none_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-MIIEsDCCA5igAwIBAgIICBK30V13vlYwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMDky
-MTE2MDMzN1oXDTIzMTIyNTE2MDMzN1owgYMxDTALBgNVBAMMBE5vbmUxDDAKBgNV
-BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
-EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
-bmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJs
-vdQmlzPXyS7E8dX+L9s6gvXJPUeu63BBcC2JQhQ1b4X3qerYHDEmtx77V56WBXkd
-A/eplCdv8LWWw6GwVrx/KDtTGB3elpVCVlSYbHZMnpzma8iKcnKSYn0nW/Qqd9pZ
-suJJjtpUVqJzQnoJkKr6PJ5YQUknaV+uJJECI9lLz4vfu907xUDbDbm7RCr3KJXo
-2q9bPEDP73v+FAGKziDLVCk0FwN9AxV1t/iiH9yzSaMUa4av+xh4H3+7kZU+42f+
-OnQf7qfxdzjTv6xveLp6vfw8udXeTSy+sVjni1KnNtOgcIG7SZAZrgv4Gvl+k9LI
-vmTWsiawiiFVgsVcu20CAwEAAaOCARkwggEVMB0GA1UdDgQWBBSjJPeDsqtV4wI6
-5Ln/SUPaDe5R0jCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63WKGB
-lKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcEfwAAAYEQ
-aXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAr6Kj6PYMYxjxzshi
-dT0hqvKsAZd+jxF7LHX4OqkMDlHaPeM8MaYVfG9EBsxTgSJqVMo+GKg6K6Sjg4eK
-BwyNjAluSsDro8iWfj3Bv/xhYvZ32Uqp9bdpbBd8X08XLyRFm4tzHqkoN05d9Cdo
-gGsPVEfc7bkPpunByU7euQxj/oQnGXrqL/jcQgAFUX3SN3c44r3WF8O0XiHlKGJA
-aoImg7KSGS7fF3pZ93CGwj19tD/IMKIu/wSV1r21XI7EfGcIcKU/+yRpc5UmRSIx
-ypxNg2yJHL1iP+cid/qv02b5h/ZXE9AgS1MrKft8xC7srBlj49fw0wr/ZPDQYRjJ
-L3+Ebw==
+MIIEsTCCA5mgAwIBAgIJAKxHMXmgvyIMMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NTZaFw0yNDEwMjEyMDI1NTZaMIGDMQ0wCwYDVQQDDAROb25lMQwwCgYD
+VQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVy
+MRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYO
+aW5mb0B6ZXJvYy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDV
+6Fi2WJsyfAxX7azfll5SsBYQuK1fL4QjfcqX3WpMAY9qI7QKHDK6UEetbCUgYJf5
+43yD9lJSEWTnwk4KyQIaSKAmziAqUGUBs5UmwCsGg+4HlcpYHl6bAvaMyTEpfPKS
+SvcOw/T1UIuHwXnYbPhzIXRdXPeRbBGfweqTaMpa3YmRbuPwvoopP1ZLjzIxNk9j
+n1B26ln6sOfJMfDfVgYRNoIo7H3pQ5MHY5Eo91cUikMDmvbjiSoYkXTnL/h0Cr0W
+TMEIKm6n3ioPdNB79e5UvgbcRU+w5HuvlP+ETw+b3V7vp2W45a/jnfvAcBv/nbu/
+9nN3XnUFmzghjjlj2MpxAgMBAAGjggEZMIIBFTAdBgNVHQ4EFgQUvVJyej9UgaBB
+BWI+VFXxoQm9BAEwgcMGA1UdIwSBuzCBuIAUAv0b6W9Olo8MDplhj0VIaysUPDGh
+gZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNl
+MRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UE
+CAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVy
+b2MuY29tggkAv96HBRg/RI0wCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiHBH8AAAGB
+EGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAKbX0uaIGaziBnxz
+aEtuuQjSIFv6mHAbJHbv1IY6kIFiNvwh/RY4DeXnsDGd2k8SpTNcfVld9LI3WrS8
+6yhSvkxm3xt2e43Y96rT3nlC7jN+RoaDjPrXGedfK4i2wkIURMvgBJs8I37xveRA
+rhqvWQjTqPTS+FBhL8kfvykAOY/TsTnC7DNsaf+eLlq+sTfkm03qwDrZXYXVoErC
+btQMNhZAqxX2avk7PTYO8go2MPRhid2D5/WaGLFTbLk7/8F502jvnpZmegklQ50z
+cixa+K8JSE5jRxnrDsvL9Fp5fyZQ0gQ0seHsWkJk1UMfspLd63smtAB61eR6xqDZ
+/HM8tJ0=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning.p12 b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning.p12
index 18a27d7b15a..c3026708c44 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning.p12
+++ b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_priv.pem
index 1fe15900ef2..b06873ef300 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDfFnpSO4uEtXor
-JQrsWzrsNMj8wFgslU8cvvH77+Xk7CtmUAt+R/GHhFdhJWVGfO6Yyq/Hv7TJO2L0
-FAgTNYtNs+YJmvCO6apTAyLiEwHhZ89gCA1S3B3K4IVE6h39MaQfICSTdum6vKTe
-FwxaRLSfJC2hkRC/r3Dgh9HTKBZS/JUIjYaXD21v2X5mZyncIQt5kTRnp49dAh0g
-DWKAIAowaL2slEnxXHdCPeDu9cAPFztslCN59LJ3oMQ7WaAqLQvxXOkR0X4M5tqk
-dul7IGLIUq8WUwfhgLECgz5DSkJe07hMVCU9UiUcgIkp8zLUT2K1100VzE/vDuGr
-Bw98U+XBAgMBAAECggEAUU+xD+3yIVHAEJ+0xodOB7AJnc5BlSZqqnCSZKCA65qF
-Cwqb1dBFIX7EFn1512JL2NbvkN+39iy2GX5/nvjCKHUsoE2f5ocWdKFNApeo9M5Q
-kJD+wjfGiB6jlIW8nn+McWfWzQTnlg+SC/zcnL40E1ktZJkqQKOigcQfX1ZaJK6L
-FmcxzcBzXPWI8Tsu5D4je6HYKSgEf1LGIe0ozqLDCi6+riNkR5P6wvF1FoO0jCff
-gx1/Ux3Oqq0qc1fU4qluypn3NqbgJSt7PPft6cq1x0+1BMgLGZlDBi09mJGnh/12
-lrwEp9bpCTA/UYu/Mrv4X3FXVj0CuxyXe7Snj1atfQKBgQD3jwe1wPdiFzYXoeh7
-TJ6wVQ+ria2wO4N9Bwgg5L3SBwGX6lSYWu+UdjeGAc8eOPvBwTsfe5kv/W9wKQzV
-ucLvn84GjK2LdEpp3FzBEdi5TtgI7Q7lZwwn0jtWpfybtsknU97+jiM6WCqBjLL/
-WCmBsVmf+ji+qZCBC1j6djpzhwKBgQDmsdaT67Un+l8c6xi6gW/yatQJjDEXBxhu
-xR+tRf6FfIQ8OR9Vj1loxcj9E6jl7zlIfRIxLl5n1w7yTe1R9m3CoyZ1iq4i7g1R
-1iPLN9XMEbXuw7XCSQYh0TTXZshZrdmasFimbFsdppqMs6Yc7lOQn7tH1duY/Inp
-1PmMnca+dwKBgQCOsdMv4Nq3n8l+NcVbzP5rhZxStDl5q9RO7Q6yZydDOOaiOmAo
-scIHQV0f0UshkJcNR+RccVILZ3oknITZbQoANYz8GXqvN4jtHCga4b6akefUvVAo
-yw0mpvetKmBBIUsxcBbJhASqTMezhPZoWNkT+LZAkGrE+9hfibrwI9XtYQKBgB9b
-VNtOUpVYhs0bd4UCSwEcXC3gDFwg7sU/rgqTVQE355F4AjZTAcgn+iXMIkz+sz6T
-IYHl15ctuC5fQT6+zDSEkJmxe/HrgYv6G2tn73uJfL0zhOUfn+HA2fndUqY95zIL
-fkFAwTHKj39Ie++6xUkHLSGag/rLeMN721+tonIJAoGAS684quY2jgvdji/CJXIO
-3kCVVmgHnFyhdt9YocQxkoKK9qfxNLtozo1DuCy9rpGoa7dsfH3QkDMMdJUuQYZn
-AQaINB2F+IOdLuEvXqirHGoFR/ueaxx6E4Ygf0uQ0bKdzLMkowg6Vxfxp1m+0T6v
-FL4D09IwbjlgqR8Eomsr5Mo=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC9hS+jOrVjQ6ha
+q6tsMPn2Jk+19DcsV6sH5mpayOf6glU7fx0JvmaI4DX1UOytvB9KzOYc8b2EtwEs
+AxtHjZoaphWFKu1loNgVXPfVk7YCVV3X0uDrpN7lKOXYqv9niAPChSjgstfCyYqz
+0RcbjWcWNYkYwrsNpKJyIpLwr87BdYFjPwvqaiidTulMbyrxA1AdPb75w8f/M70l
+1rTkz51fuNy1/dSgPiFz+iPvdLqlYiYyT1QOSLX9oV9sHqebvf3Jor2plt+uAYew
+uxvlhLiUQ6vNmzrfdWw+EFfTiOJlwi8KItoGFT/YiWoRiRI3Fi4rRRuzxBWzZQSj
+vQHEECWZAgMBAAECggEAAXQv2x30bcRDWpy2BjCy/jEpi+EJelDa2kbpenRPmUOe
+MURmneBEy5iCuXTLOAL5L3r2afLtzAKWYvbMIwaiT8GF6T1c0FqFRdaufQgyzX5H
+p8Pxn0Umw5XGe5zGNE5eDwQz/dNJZfBjXMFGHts9FvXGrTazNiXU7DC5NVj36lJ/
+0DPNWLoI1VyL3CIBDNi3vJaSEMbEwMe5UY148HutEEsKZlVPd0QzAoyMAt57cFPx
+0HsErnL4ZRmFIGaP18Bi/2NLqLf4pUudrG+wWEkvMKQ1sfi51mcN6f7iunPMzbM8
+RFeKfeZpkIE5LdfxwUvRnYaVF74mU72ftG26LLhufQKBgQDcsDtXEHsdoHHvur7i
+RpJCmhtUHARa+ilClBiz2ed9wKXQcGgkfyy+HWEUowwJBcddbm1P3n+/5AhOf7Jo
+QjbZoMtt8PcpRG2223xFP1wwcd4BGmSK1VJY6BYQzl8Ve+K/fpemSR1BJGLFjX2Q
+tg5yCQ7CV0956sZM3EbPd6S5DQKBgQDb2EEq1/UfaJ69ZHBp1vzJH68iAFSbNGiA
+yyIxcG7pBoQeijg5kurNgdnTIOAy7fQThz79dNThL+svxT7um/0mDnfQCD9J0TGO
+WxuPgFXc4KJYPqWpvIoG9lmjZSIIPDdKFFyRVWU8fIBsNxfNwu8VczOdjjvMFgsT
+6uK7C5HjvQKBgHsIwTxr0seUoJCvQyYxg+8frWa56++wkfotSIxUSovAMHFBib33
+LMGc7Xes4tPQ5fH/0294sy4O+laROKyJZbz0uRVFBvZ50NTmDqUoisPzZ3qj9TO1
+dCBe25ZpB3eZxrNN50vsbSPZHjvXAw7/gJQw2oqcVJG6wu0szUlzAWGtAoGBAKov
+PTtaVDINPh0k3HTCbYuQUHXExbokFuXk2kJlZCZV2f7+Rsoi9ktCQwpSf9xNIk3f
+u55fS9BK1Qh06+Ows4Y7Wvqa98s/+tnVo38x/MXwyxv+2yWLg1oiaH+5cV/opXBe
+VM5YyfbJ9mxPNckeJxB2zrUf/yBczBSOFxhuu3ANAoGAOxPaxKAQgFiOHm0rI1dq
+G9oLkAfp1NzOZ1Y6zcXSpmSJEGJJV+nTU3cLrCBgOIK+ECKfvWHsFuCzJ/AXYvFq
+qMWTrh9Uy23lxQNdmqc2EDlo68fW1OMB5O6C9UhjNaUjj2SY2qqBGlllzJ9YaXbd
+0qdvfypSnilBY5MshqkHs70=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_pub.pem
index 806864d7400..c7385ed836b 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth.p12 b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth.p12
index ec55065f3e2..ac33d3eca42 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth.p12
+++ b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_priv.pem
index a772d2268bf..cc7b70324d6 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDBSb2LNghkfMYT
-meQpXzVxIAiwTgzPREne4larnAB7jqZP1l5Fcx0AoD2+v4s+LNEZLN1m70m9p739
-UdPCALrXeqOwDaW/AwQ2xX7V+seqP4E87V0sh6bCRF2K/1/jVjJOql2JfZC4Gl82
-zzjgt5/lnTk2MY1vFSYfnL7/KIk0dvjscB1m0eacitFt5tCzSKghmHrTl13d2dZE
-GwybI7Q4SOOJDhghQg3/qnKXnloowr6fSCy3+tOM3BLXtMvqRU/Bs07UAW7JVvWE
-UVddLVIv//laiZk2kyXzJa4CSml2GCVzvZW4jO38U5xAbnytpi8QdoSks2escV1P
-7j+yVV0VAgMBAAECggEAEfDJQhmiz8jxDbK0Bc8Lg9OIWuzzrW1WOfTiPI1/Ufic
-oT5xg5q6r2swL/tRblT0l5SdfEdrncnrDY9By3kL3qJIfTfXEZKzGm5cZnoffELm
-uQQDKPXyWYfE8vjfKpe+laSkh/V6sEvqWIkFa34/vi1IuSoCSbQ51KdU5xQZICBd
-kMfhlEpuLYtjyd/0SWhukNMTi9a8/TpDfnCru8ua9qH/fKQNAd9HnERyw3u/37t1
-fGkxJaXb76pqoNgSXka7mHrfQocl53bTC9v7ENRsRlLbB80I9EYNsmPasCHk/yXp
-0SEii99F94s16UuzKFrnrhi1H0cw2ueBritnWznwBQKBgQDgSRg06NfbvlKd9rNU
-Hp41+ZJZ+BJIEhGRVFJMVWoC1sk+mT1rsb5SjvS83QSHWMuG7R3l5XbvhjQVzXi+
-Nh8TV51LdDEtC3BUxjJh21gFVRAD+EDUqUt8o5UgBAfpbfcJfKXLY35yF4sWH9qF
-BmVYORMTUqqzFFx6bDeIm5SB3wKBgQDcnpGszx1//YGqo0Y/4S/wZifdUMFbfUi5
-D2y/PiLJvN2dKpWk0lEgVfvSQ9vhkFHmhTuB//dYk/YK9X/igqdbS6OjcmXOkqZC
-XEX5eJicJzBf/5flngd710OULiCd3izEo1jIT9h/Dsax9T9Q/xS7smE+vEjAoFCf
-JagW+RJHiwKBgQCEEMZeMVUZoYIIXcHOoJDMe35/16D8KxeJGbu0Ev9vWIX7hEQ0
-a98DwgW+R+5ovBJsCqd2PZ3BAKcex3R3nGrD+u02Bt8GBRxJ7sKv+HZl/WaGz+Fs
-15sJc1FWHsmB3CyAu5LsplNIXzCZAHyto8x9HG5tDFpTRIQH2j0BBYt2xQKBgC9F
-/xsTalPRo2ZIBDaN7zLJAQPIWRZcmyekaX31N4kY4jfaNySROHcAVaxxg/0qapJF
-vEGX8o1VbyRcBKIpsui6JX9RdQU1oVCY6xmQwMq9Dv2TDB5UpW/g6Ycn9y88u0UL
-Z2vMyCw5o1PgpEeb0PqDN5k0yTYVZBEmBYWeq08PAoGAWTnEri1qyqvlHAslzl65
-OrJxycAAfOCyrMoRH/633EY52ulDclD+1Qpo/HDY86WwJbsiK5WjhE9svckzQwEG
-TtHDWt3jJi0Fl+Ey5SD3Gf8Hk7a6AXoV/rWxcPBsaC/qoMbL6CUv2y63Nnng/cWn
-bkEHzX/fo16n0X89SkneoXQ=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDKT4DV0LsIqrQh
+GRBOHOATnnR4LFaAbNK3YMtLaNXIdQzPUOcITqFbV5erBuimJgir3b1Fx95mrnoI
+65yYlh4QBX7ZX4I9K+IqqYHiGcbkiow0Fm1sf0dBJfvSjLnMDPi6/XrmWyouz3X2
+UtIGV/hQ+0dthO0Kq/SRDDYvWDv+/mg8O/1Vm53bsKRK9AOpw+pAmn1H96YrMLGi
+luvh/IKDxZT2grNCW48/cw3OoaQQDOCxXgcrpISN3BLjUZ0/9ysT5HlRqf1s1MvB
+P6BJcXXvwdBAwJuQrq/ZRPzW6mCmOC7eA2DZFtAJtBxqsHrNN5wE471ZrQNmscyg
+/KX8FXMLAgMBAAECggEAX/HJZ12Ivej66TFyPqFKEXPVx4I7ecdiPU5dy0MKE/mS
+3CUBlDp6IpANYTIzFky2Uw+jahsKGcdIH7/hcanL0wxQJrW5VdpgdZwS+VABN7SP
+Hkq+lTRdbgOeBDHyEVfbhA6fgOyeOjnwNyP678A7huhMbR+brTJ0l29jqRtexKQ5
+gno/o4ifqlGn+MCF58sab1dNgIYwUHrdcVeC+XPXDc0cyBsI9w06SBiDEkV/SyY+
+DeON9fqoo4PLGW3Lt55VDg1o/GOo+dBCttC1aTY9JNeZ2Ha8I6Ya1lhv14JCvoII
+3FILfIOwkLAKV8vR0JfrMVdFi9I7A3kNR1BJOE25KQKBgQDq6IE39ppLl5REc/Zv
+h6m/zVAAJ2KumjacUVh3qaCrQvXn1zrC7PutJ7udNBMWDaMggvXVDfMZ6Bjz2NEh
+hL9O1VeN+NkBSPD5LAkIbcLUItK43LXxgfncMf6/SPFraTmiLlEx6CetcEDUwu4c
+dKjrKVOryGEO0Hwk2DHkj9RsaQKBgQDcebklu9jIbP67eC6tGZ9a6DzJ0gTX0RCi
+zApy+gmX7KB95TnvlU9mGnHRZya0yElcx62lADiiDNHuCxd398YaKAC7FOhqTlLG
+RcRcaim+IUFBOW21n2kOxcbSV6NvOa9c/SmpfGVkf3mfNEvTTJiG9rtTD4vS7yPz
+5X3/aU5FUwKBgQDBpSMIiDBPikf+Wf3XmOUVKOH/Dnip6JSGLgSYuGurYoqmMOXO
+1F7wMeXWRJxLPLixz2Np25MAUzVmpuBXGkA+c142ueHhzkhfj65ulVTbXU2KeN8/
+lF7t5wTSmQXy/o41JKtoUbGLpxK6kWqKaJzrJmlEHe3ssW71TIdsnCiHqQKBgFw8
+DAnOKSXH+1VANP6znmfwiiXAV8hVrQj+JUzub38APjAM6ozhQOMtIvqAlb/BnndT
+DcDec9LPXC+iskG9BUJCA/RADe8TLyvFWh1zSF1DGkKIHO6DbvcAJGowwa2xSzyy
+qHBAG0bM0XuZ7DLMc27a34kjEtK+uqK5Gln0mwsDAoGAX/2xGAtTr+1hN1kq89FZ
+hedf4pR+abXfQ0n7mSLGVeBwTXFVHzInpzlYfZrRuXTsxQA1mcaJ6G3fueZnAqz5
+Uu6XHbzLX3ztb1omZihXjp1iKHGN15qfzzLm5DMC3/CMlhwmMWfBOt2RpG6dB5GT
+IdRGuviQa3C2wC9WA5Nfj1g=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_pub.pem
index 9ea113ba10c..fe4e4457618 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMDky
-MTE0MzQzNFoXDTIzMTIyNTE0MzQzNFowgYoxFDASBgNVBAMMC1NlcnZlciBBdXRo
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping.p12 b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping.p12
index 814bda9413b..7f3d5f8b902 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping.p12
+++ b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_priv.pem
index 66759ceea2a..7d1ddc51d13 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC9Oea9jcgxYLXy
-X17YsifW4ueRxdIqTEIEkFeNTXsa1CC+WIvPb8IuiX+jHQI5lawyQBDAu4O8qYdA
-60gTrgKGtmuJ1QUW6UMRxrcPqw+GiquRQqcXubeiRaEN9DFjT8A9z2pHBfRCzGy3
-0F/SC2IEyT5TAaQ79vgNCWNBqs3VQhhNi8IWMmD/TNJoREZrYtxq04w+iGxHqae1
-BP6qfE3xK3tqwDg5I8mJC7vBnyKSFpb+OT0riC6QLsawNfmj5VeYPJWGl/+YbKTW
-nw79fyYfNYVrrHGjYSrJKj9u8VsietbHbfCo3fGcggJWjkXNIK6oFSGMH9h9wW5R
-ARoR1OlFAgMBAAECggEAaA8XXNZDaSQN6qOXvQL79agCQJ/Q24HkLC5Ud1hMgox1
-FTgMap7C4mSq1EB3oMM2Vsv0aoi0AWQZBRJeKLRgn0RiDwIeMmNEhtoIgY1IlGxd
-vRwyV1HCMnKoBsxq/Ho29cbCYxxbHwDcKJlmmFO6K3ef1nXoozFFZ6Xp94q+dq9W
-zQ9UYCFD0ac3mWRMx+6cgcn+50fctQVR6my8K0Xv3bHCn0AiTwv7tL8cROBV63qo
-dQXUbs/R1YQIi4OIqoLFxFI022BSMOoqYfy1Wg+N1LjLG3RXYUndocbU7aK96F9R
-OdmmyeWp4+c1zGlrDz5UFkcRJ0igyu14E4APWH6eAQKBgQD0x43w9RwOHbvULRS4
-LeAmjAhC7ufQpb+lF/M0SwUaxPBh0W5o+JE+YU7ZZIDWsSbXLV3kbz6uW0IcdyHO
-twHoxonAJ+Oibd7R3DAvOccCLQ0vWXI6UrVGLz/kNCNR5b6XHsvSgXEdmRaPCcAe
-5gkFyldK8nWGVzDvyW0gKG4esQKBgQDF5nAj3xKLko6Y9qBPlpbaH01Me/XRd/ZZ
-VNqCUVud+rldU/j61+lakGQO8ZJCBU0HebLDQDTPyB5Jn1YOTI7849N/+l7NN8Nx
-uEtc2MRNSOIoWmZoCBibuYki/0+ETLkcpVEi9YAfPVE926u4JQXK7c0DyddE/6ax
-GP6BGKNg1QKBgQCnWnQiJQK8Z/nOM9AxqDPTRvQzBvH5BgmED17ZBt2DktgimLSb
-Ei8DbjYhjYRExLOgdET4dFJvlLcbjRvRH/AvPOZbOSp6GBI6ewd6kk8Mns6f69Cc
-LYYAaTeOh1MKoD/xRD3oO1Wh/dOdkfYHahELI28RL7nIUn6DwrxYOywm0QKBgDti
-hPAetl/voJ7CEyUO2UGm9vkmkYND7kasMc29QDLN0+Xvlt0fAUVN4tihIPRyxsSh
-fkUc9TwMnxoUmCw+SQIWE5dpuBz4yMtNNEAuQ+m1HzhguC4rj8bbDA3WczQOGdZA
-vXIyHTpCmihnzMW7Rlu4tDaY0OJBnPGzwFtY213pAoGAepX79TVMBH/uPTJjE5c9
-p7WqouRCWB//OAqrjomF76M5UGS1k/ptYy7gHdMdC66SYiH97P/FGuK0V2u8Wwj6
-9fHbZgva/whtBT0mc3A6nCOBC6rjUwE0QtoD7zMLeAFgg0BIn1bmEMzC5/xH3zl3
-ffKQtHKSp/XmAE4+6Oxq+Bw=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDDA4M7w0nJhQva
+jaAsvKvHSL4WzRr601KiGcyVvSAvGBPrtl20QvgTRQKH5YXqr1rjx5zJqfX+86r+
+F2P2nv13INGCohJZz7faXQUKkQxupC+tEoXqgepLnZCjvZEstj7ADmQSlUvRJMLI
+UlHH0Q+R7dSunnd+DSrr+ylOSv2TPR5NsUc/dKknhWJmP6Wuibl6jFjLfqDiX+hw
+5WS3ef5uqxA3ZsahfNL6ha7/pGzjOM8+19VkyKCrypX5saMBvlilIJqJRLKekuou
+shch7J4Ucuk1SAzz6k0JE/VlRt1rRnXLnvvDQDnrm0Jmw7b2XeZbDirp6HV0SpFl
+tQDmKKMRAgMBAAECggEABvN5Ggg7+RLk+UVTEEUpWlEddXKaI5aku2JwCGZVX1hc
+XWqCrIo2jXlIPc/Qlizp8HSNAiMswYmt7qCmz4ObRUPGNAHS5aChzQbDxzykVM1F
+ZcXjQBihYVCcdzmqkw1r7yyUJJVtvmaxCrLkd1rcUzdG/XJoj/WoMgEh18iUgUr8
+cTswJkzhqtUHeU9dZQZhoxxVkkQPCa7nbap7S+bC3pD2/1z3y374StYfD536aM4n
+/17OfWmGZhIVoPJ5p7NVcoKRZb4nuqDgyzs4C5csr/acIrhZK91JlFHP55fksbnQ
+emd86v0nVMfYPxM/sNcA0Wddx/UWTebE5gVNQuvIgQKBgQDP5STnYEZrdA7idcsW
+ORHqbK7kE1y5KJraC4IPfjRSyfstKsF94vPmXY/j18VKm7q8TgFy5mUc7yaZkDaS
+ZiYqJxz1uAC5DAAS/NeR0wsXRXizp3Xy3ubHaMj5rFfvkZVvWFKLiqP6iTchYnfd
+jQ7TJpGGzwnxGm6FGMlvVWL5zwKBgQDwI1QdFBvVZ1Tulkf9cYweq+VFh7wQTUhw
+9raD3d5aZuWiIwFuZF5tSrkXrXTUYpvLUkiXgsVJ6w2pqzkGubuQCynKe2WRKGzE
+VVvqQrFG5yn6qyM1rNqYvNpNGkVA9ejkrEnh7Bv+S6/aHxdhuvx7fTvaiQVIaDUq
+deJxGk0tHwKBgEiQR7hG/21kHgnnaZKBKwKzGrxbEcNDLAGtgKEdwO+gtn5GbTEe
+dVlUEPRLDP8EqkItzA2p42MdClERaCrjYrDV5CLULdRpHuGBxVCN5FIkGoRCkEXM
+jarOpU+YWz0wiINLxcwVATVijY6miwYWxTToQmVWgLbaLfdg9nZYzGo7AoGADa2l
+e+aKU1SIdPKgdSJDnfeinpxFrRQJ3U1gRhCcOsADsoGV8kjLTCRmeJ/LuNFJGIK+
+Wcr8G+LEq3ZyUBzCP0kzfzIaLfOEhoZqLuTPnj9Kl9mprsQCy5JuSNgHO9UGCAh8
+SN8fFRQQlzcQKOPyv8H5Z9BIOcCdzqZaWKDr5ncCgYAuFh7rUzA4tkMPtxbQH82W
+rmQNQ/bee1lSYfU9BHExjjy3hGlcpzlqAucj7IXRyyA+pK802bOATUzhg6aDcGnd
+a8QFurkhpxO6OO0KXpg2ktEtUEuBiaO6/LYczmVEUA7xFVfUFwwPviIERUN16rmQ
+AaijmlfnJKqW31oQu49C2w==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_pub.pem
index bc0c167dacf..74ba332d449 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_dsa_ca1.p12 b/cpp/test/IceSSL/certs/s_dsa_ca1.p12
index e1363951d32..cd6f842512d 100644
--- a/cpp/test/IceSSL/certs/s_dsa_ca1.p12
+++ b/cpp/test/IceSSL/certs/s_dsa_ca1.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_dsa_ca1_priv.pem b/cpp/test/IceSSL/certs/s_dsa_ca1_priv.pem
index c1ff5772ed9..3618c0b3f95 100644
--- a/cpp/test/IceSSL/certs/s_dsa_ca1_priv.pem
+++ b/cpp/test/IceSSL/certs/s_dsa_ca1_priv.pem
@@ -1,15 +1,28 @@
-----BEGIN PRIVATE KEY-----
-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
+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
+hV/0OXRqfZx/Ts3CO+U4dw==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_dsa_ca1_pub.pem b/cpp/test/IceSSL/certs/s_dsa_ca1_pub.pem
index 80dd141b962..225476631e6 100644
--- a/cpp/test/IceSSL/certs/s_dsa_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_dsa_ca1_pub.pem
@@ -1,39 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+MIIEvTCCA6WgAwIBAgIIZgilCUNqEA8wDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-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
+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
+2c2DEk+QRiSNYapb5OVU0UA=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1.p12
index 1f3ab428605..2fb53f7cdf5 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.p12
index 987b238420b..a3803fbe389 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10.p12
index 52da5ddfed0..62b995a717d 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_priv.pem
index d5d785aaa80..960e13d5cb8 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDrvbLZEtI/DgJM
-pwRpcVeoTGQ/V8NI+m2/35TwwMnnN2sFge+2D5vcdQ6330N2fMuHpq/MTl5qUQeI
-/AtQN1eaVqJIni7ZcbZdqfk/Jp4AvjfjJpOG6Aj3m8jusguZefG+WVbY/oDilQgn
-Sq+2tc66NzezAwYHuhBbwWPUMDirMIFt8s7ixkH1dtcjwSM6r0pOE7TUbf79aiYv
-16a38QLbgVmAZOAN0sWsa5N2r+1FubH0CNaM8c2W0Lv+V5C2cRKX5eyt0BvRQTFW
-FnXwBGxHviiW2k6g6RmegblKOk2DXupyThfUk7l9WYMaXAR58qKbwTPDgCBroBmj
-FTlSS705AgMBAAECggEAERYItm8Eygkr5X5ddX7/iXUv9t9XihyMg9Giq+htOdLs
-cNPAGgP7mfjp/i2yaA4Xeld8emRbt3zz/Nu3vjKkqM0KqhS89ImnXBaLuCYGYatn
-xZDwNGDw9XFXGOXSrWcHPHKhNs0LbmC63I4vOiDnQNvrr4/SihDUSrIzmBd+o/mW
-ZVapr3/g3aM/N8qlK8VkY483EKy9WsBRyEGx2DiM/WfpuN4RqZPlOjfy0Z/r7KWZ
-D1EGXgnMp9xpclzso5xYoNwIpkbuAAFA1WNCfdw0eYbTcpbj2qI0kGwq6vSNIz6y
-5pM/RlR4EAPospfZR23I/c1s4Urtl2LnWnqiGOEvWQKBgQD+7GVdWYVx9KHG607R
-28hmeSW/x/MYsVCw/U9JYFw5HYl1ATyKxnYIuVw99f0BsUuZU/yh6moPqah3QO6n
-ufA+34eNpPsKwDL3ExpzMU5rhTInwwL5fACngfMjRyxbZUJIaszcDgjMwEZ6/TDD
-4qbE3VZreynySQ0wu3JCBI0ZzwKBgQDsvJBoCrtZdf5M9TF8CGyl6Mi8dxgpsXBq
-R5RufDVUQP3eM+6Hhxb0dHOhTT5Q+qPmIWP2mUBZDcKNdL1c8GCxYM7SddSDRemk
-Sr1/1AQGRYx9WxlGnkaW1Xv5VVOSoIvBiwAAg56Fcz12WwK6+JKpRcc6m8aqLwz+
-0cGMFFTidwKBgBxtJ/B85xCKAvA3lRZ5t6MVp0v3c/gw7ZqO5KR+BkqoLIfLl4Cy
-GL9oTAzsvUXPC2sRnn4/sYwFky+ZIgO6DDw2mNsGpqfQPt6mVrC5stDyjWE5sb84
-QKptJzur2Bpo9Dc3EZkIR5rtZe6ZBTMStx4EwHpDxa2qz7m7bUZHU6SpAoGBAIdX
-KguBDyiO72pZxweM3WhgU9qDD5pOaeEouPANLIPVgA13jQeIMJRiuvRdb6HmGKtp
-LXf+ly4SUsaCFfw7JFxj5vmlCXBfGLqnS/z3XbGkMzQ7T5DyzZJPzEd4A4ZRKHTm
-nYKtvIO4pUuzrjTsBRSm4sZb5lDHA1vu2QLXYMvzAoGBANNakmLF59a4k4Qor2wb
-vnOSC0SgH27moQWC2ZWU+Cb/7OUxvN+3xNNhGHBT/eHD0j3GF1YJcKwWgQw5CeZi
-K8prA4OsrePz0Ke4rTtHyCJfAVNFfxa+JLCOySglkl1alyDPRpp2A86zmM9YS/0i
-/nUwIIdlhFP35qwsknB1k34/
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCQ5LurIMiunzch
+3dXyDNKTSsnJizKxGfDuS0RVwORoqAR5cgZshBIEGGXwr3inh8u9dy5StaMm2I52
+I2dm6ie7h/P1aRP6Um0uaq46lltwaUDp7Ua25MAUigcxmFwt53dmshE6ku8MI+Ix
+8wwmAZDllCqrGIireI/R/7fmfIOEZqUkuhXkfwx3jdadWlXIZLxiurJa5jgkqe6a
+vhcVDCp8n2eMHQzG95r5+5BZn0xC3cOq+4448r1km9RzSt96hmpI6n+HnUSWIewc
++9F4ymzZavzIfNpQo6QH/s2Ayre0IsX+Nia3312Ss2crNYvvBEtHRICIhvCVKds/
+T45AlxdJAgMBAAECggEAH/WL3X2wNjAhMYOkVqz0X4+9/YoKBt1RcsZATufqmZkB
+z6XSe+oPrT6ScanKo61Ex8g7e/vbfkyC89TwUFdypx8gNO/V+79lnLjkMEEM7zkQ
+G+j90YaYRY+CcbKJFoj5IbpCKZjSSGu7z0esVM/AnZr2ZGHXd3byxh+w+RJa0f+b
+D167vBhjbQ+Sy695oT4Py4qCarvrz2jSWqnjxKzE+6i+upQcNEjbplCCzevy7qdR
+81/iHVDCtTkpWyj6+eAjxGvpcdHLTb1OhuF3tOs2ou1gWwuWLcOvJpY4hWk7TCgj
+az7Bc0I5uNXZXD9RchM0VeZqr7egbqFhbMiO4M5ofwKBgQDEp11767qfG5eKTZ7X
+c0cMELiw4tf7DUMfxlqE9EaUyXkqHut8rZ3Fyc/ovxdN+4ElDvy4XZfQKTqQ/lRy
+F+RPJqMZfjJHtGLgrhS67+gpgwd2Y0wIpJTVjIQY9w9KTd//xccwGv8pHmC6onAA
+6536nJMXVTB1WY/GfIdGAWiz2wKBgQC8npakfoZvQ47ypwSQ9YQ+ckBhIamfBy+q
+J0qwrQEGI4nwDENtQeVQarTdsJD09jQUo87sJk3ZCNbac5EC5EGK06eAbcF/JMQY
+lEda/izoXriLG35Y7B/cwqEtYGlN+dOZ92anc3M6zVs3IJVX1/AWgcDDePLKtWcG
+CFGwAmEcqwKBgH5mRQQ9xDo4dfMDaTF6exQaO1wWslQ/dgGacNw8VpGT3jlgnmQJ
+A/v5d5VWHhiVq7CyLWYjYkz98xL3JjgfezQU1YixQIguPc/ElLaDNWpZOhayRFDZ
+2IBaTR3uzvknjO7NpPYapB8901aiyfMNfwFyWmkI7JjA9FTT/e7VQQM5AoGAB/L/
+EkuqysGkIqHbVWijfCZAhFdw2Jzq61bglPWVl3aj95Psu4wNaAg3OyiX01sU8tG8
+hMNQgJcYxvgb4m1QPdORuZ3mi7827HpDT5hquBhV2rb76i95YEprlIf9qCWhP1nn
+36LD9nR1Jauf36XgHnK1dwd/4/8lKmHrX2maQiUCgYB4ICX4rt37Lt3aNbVDn1iH
+YdIDUtQogEqFAbLEo2hcq8yndpoHpkuRQHG5FHOq0JrcWqA8SDDhiOmXtsLmgMLm
+fDy7SeypzkURUyXj9AR6PvE0pB0LZby85NqF5ghmoLpBVOlx8TxKDomuKl99XBKO
+OfFkSFSpdeYcnlBMfP0hww==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_pub.pem
index 77fbe9f72ef..d1f5c52184c 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_pub.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-b0B6ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwFwYDVR0RBBAwDoIF
+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
-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
-nDVS8dCEhfM=
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBACawYllsXX6S
+o1pCGbAFPukkVFySAZl3V87i9ZxYyd94VIhrQRWaXFV07Nig2nC1KrVFOdBIUmXq
+ID+t/z+//+fwaBHBFt3/0Eyffxs0jleZ7mx+e0f7O6NqlcTCfcEFnwSSCqG1eCcT
+hgFW4EPKITpa7vpA8r/UUpiucadDG9YnRUwlFsgYLjzC1p6VC+SzR3Ep6Rp62KN2
+LJEcM+B+xJFjea2fTTOy+e8/4iz6iPeILCAe+xIbILiRD1vYrdMXLrECeJ/2pBEF
+toixEHgnujWB2ksbMTaLMpdLofY+nGqpCUhoAD0nLm9vuavHSEgRQIrhO1l/kcej
+BNVR0NxbzV0=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11.p12
index da2f0083023..4b6a0f0fafe 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_priv.pem
index b5f0e1e0fae..8155e57064c 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDhj5YUwW81iGbl
-HrNRj5NPwiguvkEbreBrNkV0l5u5L8xyu5h6uW5zshgDpLhShTnbrStrP9NX/MOK
-BvHqqLjzWabTuJnRmIf8SreVXEv0cXDpHBfxJcB6UomXW0Z17oQR5bNVEdcnx1Qc
-suiqH+WNm4DkBrbM293oTJN4TfOwrDaV2cl2jdajJ5UWRt8OvO+NS19HPtGZUYAt
-VofoA66cIf1PzA+WtiBpF8cPMprC3zywQ7npzkrSTjGMPomfpezw46UhMMuON1mh
-p7Xoa9Vw0MLUbOMjHsPJm9XKF5fRomv8aS4zmAGY/lfj6EUlhP9Uo6mCxi9ITdkG
-2P//lv33AgMBAAECggEBAJSTgTeAxyFLDQQFOfcSjOVvrgpENhzmZroYUJ3hM6lD
-K/ezTFgihvfcqubTfLqWmSrzoXMO4sbFb4Qe2QFKTDG3ryUtJt0iDQkJqm3PExUc
-GFTktXyZ8nRgo9M4Q2xxRTuIw5zYmJHSQbx5uLo/MnUZpkgNiCHe/ggDUOxg5JFN
-UjuIRg2aEkWWRh3ZI1JvNqc6hgyvYFkmv2OqBZBcsusSn5P+0ReXluVySXKT1bUY
-GjiUFuhRZLfj3jGTE8eYxCXeLso1AYRUOPJUdSKiDt4yjCtHtLuEALnmDRiMnoOP
-fATePt93v9u7HdMM07nv1qo/W/ftA9jKuohWjIsiGEkCgYEA8wOo6unw7L1HkE3o
-djOOvVvAbJSH/Ck6r+ENzHxPLwCDt93QRmJVsq08o0oODva4Aj0w42Hr+GifzFGb
-CxR650aIDJwRur9jkeMLnsy0WZ46e9klx4aNAdd8vJi6ZfdG6C+UoVmsAW1LeVP2
-CGQOw0onvdNRwtXjI+/3RicG8fUCgYEA7Z0rq8gfH5eCquLno4/DXofnJ5+tAFVq
-Iqv0CrX9q1gluYBL8ZYyaFTJ0wB3dEpobcVslqL4qqh9gCZCzPRUpchTtGnL2VvW
-L699xb1dzG+cHceY01/vUQ83XV/exlZz1MHBznJafuzsBWv5z74aHhG+Eg7RcJrq
-oyNpZz2LQLsCgYACttvAI/TI8CRIfFZIW7MQcmHn1JDgRCWfqUfaLNlFkR/ngda9
-soN6h2zR9hXKHP9ZJw3QvFtCXwjJ429z5DqrMqJ6YZPhHhoimwKaN3ccOSQ2FerS
-G7KffqSqBpquYOCt3zotwy6kpW/eXw20ckmn7MAc4qtbHcB3ukpswirVsQKBgQCA
-p/JGb/QSKfoxRuy/Tg8ttw49ESMeJCF0poBb8FBqny7F8yarp3Shsw8YdY84YzWK
-AjSal6Fm3hYd9hmDWeQfY4mXDRW4Ghat+Spzj+Yi1GfGZBVmlfJBhKiooUlBQPw0
-vbiPbLF9OhFNmjpH9pmzoE22/1j9zJOxQ3JF2Tf2EwKBgH/Xp32zbXhcCksMaAdI
-GTStTdded0I/R0u5eQa/oVoQtphONhkZ7dGaScQswZsVGiWL4kwCKIkk81F5c/aZ
-/OIxyR0/dID9dDsn4mhhmERgmuio+GAB/x1do663Ev31etu20Bh/uRTy0RokXRqD
-YOZPdzGflHZM+Ht6WGwkXcVg
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD027mrQKXG9Pla
+lHQ8qY06heBKMaLfzipgguXsD9B4Pk52xLkH9+m7RD9gxHQbnDIDng/rt/Z+nH22
+Mfwm89hUxuEs/Q7qFRrZ/aOBaWQxBFqtWCMJfEoq1rpysNZ56Stpgeh3YyOzE46Q
+f7ISe6nwo24ZIDBjo80nk+t1a40ggxJoMMpjejkBdplIxKAyZphLcj6UFXex7bzw
+63dl8hWF3FxzXzt9YotX10SUf2KN7lsVrZIpU6wY+/kePSD0+YO7xdUvgbZzWAf3
+IlptYUbzG4QQcIyMLTdVUoi8rkT+o4PNz3edvY/F2ONTd5+S/l7RmEfXTwzBcSwd
+hNpTpmRdAgMBAAECggEAUO9iB0O2qDVoSLMCWtzWdE41LYELq7uLUVxjIGy3xU8f
+A24SFRqylPZBlrxI/qlZ9M0lyQ4FOaODgBo0lTGLw7X7TzIUYHZ6aizHA2sxNWyR
+hnO4HRYKs+9HMMrYEfLrKRRKIVBRSAuCV6wF0csziHmU1lRH+l913AuuTCExRFm5
+TRFHwGx/NVZPhxl+YwlrEhzDfagqrogDV0928FjCYcaog4ifudiF8mb3Lfd2uG75
+pGhnjU6rMyWsyO/mOXhR7dfT2FPofn+H1t+TINQjsspdTw4LO25PwAkXi5V93zwa
+BYSHp4bHmXscuAyUr2Xh72jXv8uPKlNG5j8WItqblwKBgQD+0ar0afqfNLLyxEUm
+cscYk8PrGTgmORte0rd72nB1Zb0lmwFmr7L8/BEZJ1sLb90Wxx7Ej6APt2c1PpH8
+71N3KUoM91VvN2PzBK1Z5apn8ws7odrdmNuXovx5Ojsiqy4/3vkyZPC2i7V7CFaA
+MDgbnxOU4uS9n0gMBReyAcESlwKBgQD1/j1QIZ3PoZmcWXs+uZGcpA9IaGE9nCwG
+GKOlCruftJ3BGQHqlvSLSu3XLdbHX+U4tY9aZj0voB2gUCQRoqVLQc0k+vRaceUU
+y2sd2FBCEAXJpa4sDvKwwFYHs7GIJnHmdDFXVO7SpD8eEJrUc0huF4wTyXjf9c9F
+594oyZODKwKBgQDPp8939HF/kjOOMLHlfj2PYsOS7+9Y/sq2QGO0M7PXh7xXS/Ud
+WGs1TLkmVXMVY+i46jXBmwWmKSCbPE094U6UWfp1jI1735i87v/RtZ5jraVmyCSS
+10GEVhcHN5P/UZ6UAEH1dlrPeBTBmW7cce8XW1Ba0Xf0qzvMR84iitlrKwKBgAUG
+o8QOW8YRPC04ms8GRZZYt8M39rymgzPArx9BH+I8c3ithR+A5BAwgLmDwz6hk/Jb
+q0kii598ev56hLIji5MFDibyRanPZ+nL2i1q7QDciPG8w9k8mPLJizhvEHKCrpMR
+zqxFHPgKyQtZNYCftlwheQgydpjE0e5QtXZJ4AyvAoGBAOHs8Zz78Tl6LXAyOXQ2
+VH/DsIPRbZ2VPiUOG2fsMaRLfedMrERbOglHWpE99EH3Z9ENLBCZBhoXwCN8on3q
+bCx+McIZaFYywCbRQ2e+n4MHliEpjTG03IkvcJfNnuCKgnsQ9OIE/BvMlVjaWzdX
+AKXdxushz6C4q7EA49lvKJN3
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_pub.pem
index 2e82f8b6377..9f8c84357e2 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_pub.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE7zCCA9egAwIBAgIIG8AZlL3rEOMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMDMy
-NjExMjI1MVoXDTIzMDYyOTExMjI1MVowgYgxEjAQBgNVBAMMCTEyNy4wLjAuMTEM
-MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
-aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
-CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA4Y+WFMFvNYhm5R6zUY+TT8IoLr5BG63gazZFdJebuS/McruYerluc7IYA6S4
-UoU5260raz/TV/zDigbx6qi481mm07iZ0ZiH/Eq3lVxL9HFw6RwX8SXAelKJl1tG
-de6EEeWzVRHXJ8dUHLLoqh/ljZuA5Aa2zNvd6EyTeE3zsKw2ldnJdo3WoyeVFkbf
-DrzvjUtfRz7RmVGALVaH6AOunCH9T8wPlrYgaRfHDzKawt88sEO56c5K0k4xjD6J
-n6Xs8OOlITDLjjdZoae16GvVcNDC1GzjIx7DyZvVyheX0aJr/GkuM5gBmP5X4+hF
-JYT/VKOpgsYvSE3ZBtj//5b99wIDAQABo4IBUzCCAU8wHQYDVR0OBBYEFJCJwfuC
-jXL3FZ+2pu4hu0kmMABsMIHDBgNVHSMEgbswgbiAFP8rF2HxgFwRsIcAU0C99upS
-zrdYoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
-A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
-BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
-QHplcm9jLmNvbYIJANCpYBrCeVqJMAsGA1UdDwQEAwIF4DAjBgNVHREEHDAahwR/
-AAABhwR/AAACggVob3N0MYIFaG9zdDIwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVy
-QHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOC
-AQEAVQS8doIS59J3wWIgLAixohcghU9PtN8eVE8AirlyyeEaLfkJBq5UZaox/Na8
-H3fTumkuwxOGS3L6pV48A7JWZJYLrdqcd3v/4rywTgSBuzcr5aGeHKuxPM6UWSVe
-5bV7iUwMC+CjRT2XRwIPQFxKbgAf3tMWylxXSuDqVZFXe6kqJlN4tmq7yudLABeq
-G2IR9Wy4GP4Ki4UG0cu0THZnqrB7jeR8Or2kNCEihpE8bzXE2RPUOgm/POevo1h5
-L9xOc0De9YOqgw6Lhalp6n3M0zQzzTi6OckmgqmbDS2yl1peIL3IBVqhGwnEe9Zt
-6/lX1mC+wmN49m+LhRvALuNhoQ==
+MIIE8DCCA9igAwIBAgIJAN9yWOwaa559MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NTJaFw0yNDEwMjEyMDI1NTJaMIGIMRIwEAYDVQQDDAkxMjcuMC4wLjEx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAPTbuatApcb0+VqUdDypjTqF4Eoxot/OKmCC5ewP0Hg+TnbEuQf36btEP2DE
+dBucMgOeD+u39n6cfbYx/Cbz2FTG4Sz9DuoVGtn9o4FpZDEEWq1YIwl8SirWunKw
+1nnpK2mB6HdjI7MTjpB/shJ7qfCjbhkgMGOjzSeT63VrjSCDEmgwymN6OQF2mUjE
+oDJmmEtyPpQVd7HtvPDrd2XyFYXcXHNfO31ii1fXRJR/Yo3uWxWtkilTrBj7+R49
+IPT5g7vF1S+BtnNYB/ciWm1hRvMbhBBwjIwtN1VSiLyuRP6jg83Pd529j8XY41N3
+n5L+XtGYR9dPDMFxLB2E2lOmZF0CAwEAAaOCAVMwggFPMB0GA1UdDgQWBBTXXnkH
+ZZ9Y8golGVkPgCpJ+eHYwzCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhr
+KxQ8MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
+DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
+DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
+b0B6ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwIwYDVR0RBBwwGocE
+fwAAAYcEfwAAAoIFaG9zdDGCBWhvc3QyMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
+ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQAD
+ggEBAKXO5CCXKlb9/nLaL/q42P27EdMqq0m9pnMDYPeFeUWs24/LRyMTCjwib7VI
+IFI1fYmzpu6YUNf3hcrAyqLd/9UTPOh7v246T3dyyG7grLLvpceMOlnntmUOvKRf
+q3f6/uLUZoFV7E2lKBDfTmSlx4YAOw/qFzVbEcJtXXGOOMWM7Z4nQfY6Utn973hU
+wOh7k38qt5El4E7mGztJDZweOtPAF3/lCMsYwgDVetsR3l3MCBwU3Kj4q9gBwyoU
+KsYRJkt2i8CbjSF5UDiFezXvIrgC715kzAqvsvLePkhbAV/fhRnSWNUe/SwM8S80
+UkWErlegn01vn6z8oORY3JcWnwY=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_priv.pem
index 4824412523b..9385ca4b7ee 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDmeOmnU8pgyYqX
-tddGYYH0K55bXnea9644YafIIxA48jFgd5TokxckUgEnlqpeCzSoIx+/ENzN3T1Y
-VAVH/w5w6S6n4zku0bYS04OdEiSvJVLQxB+rfimzsaaPx9VCOzt3/NWSt9HnIDnT
-Ldy8Q+FYl3BFvkOzE/5y3acNVXj7onspf/5yB2iIY/nlYTBMuCjNjz4kfSKniWlp
-1MdjULscqnsoQOfMWxlodqa+/6wDKiYWs2wf7Qc1xDA5Gz0eceECUtiDLvXHDJdp
-eO7lItgxpJRZ6AOvmoLQYvu9oVceUL5qbVDfqhJEDwL6hxDYg61vmP7GixEX2OhZ
-nCTpF0INAgMBAAECggEBAJQMafO95IwGC0xnWDFy45rpBiGlbmmS30yCltf+hiY+
-li9kwbgg/MWtE+bNZwVgZ2P2pCcFewGXNBfwaTAVjL5FXF4mnY4Q0sgHLU2R4RTN
-ggRvZ/Su57Tx0pAcC0cva4UpWjyUbnbtAZhBpsEdTb2uEkYK8cwwdMxuzCfJlxz0
-y8bRl8GUioQ2D28kIfUKgE743A7dMRu49a8guZ/8P462wWAsAH03K5DHhZb+fWNc
-YGCvzMaEPHMLO+ec239/drOWfxCqStjQREQyqfFNRWMgMDVOM3I441pLSk3NZ57Z
-q+40AxS5yGI4oRklEpdLP4cAGApM+pSzugaq2fJng0ECgYEA+L0AH5vMYD48sg+V
-byjNva1qqzQ9fkCLhswisDXrJ5uQxSf0J2o9+em1kSL3kPuJy946+zifT5NWv5mL
-1w7MlPumJPpGZshKekbvn3pnxfccz8p5QSYo+ky6EhTS6NzG3hmJo2Nv4DVuNg3p
-6ntKjPcit3cmcnOzNgyLph3SdT0CgYEA7TNlxhezrtps69kbR6k374pbZKVvB+YK
-J21OsxyaIt+/cHqHn2+DFsaCJRHyLO7RVfByeQzN8IHqMjKZDfJXkEWRdgHZcDaE
-+2Oe5xS6KsM+avxNfJkLiOVy8nhWVhniGvw8yRgbJt/UVAAzDUWpHrSg+Os1xFzt
-Aw8jIrck7RECgYEAj8fYmWzar8tqFFdzvuSsQPdMUJiK7z7qKEo5xvfz7Vo8Terx
-dBMyrhKNVM8Moe700Tati2hIlpwJqglczzyLv5bTjE5rgaBHhPUaMGp2L/XO3sIg
-YytmxoCxkiAdZmOwRNQoPp0NH2JjSbWzQEpyZpe4pqqmO8RrlFOeKbDVZdUCgYEA
-5KMtT7NbBIkQgonEDOAkxaWkkLASBRgM45IuUOGaBVGNE1tYTStMvXBc1GSm/f65
-E1Bw1xOrkk93sikpdNMK6krUel4v/EThC/wrl+xXwo5uJOvLuPVAtBUPJn8uIVJT
-qtVFtkShL2iDHvEORJXH/Yv4udbm/b7gypkVsgm88zECgYAmOth05tdOzn7HiEpW
-nnnyNx5rH4UUTKVXAJPhEaaRcXiVZ8kUkKNzLlL/zMxxOYbcJ8P5KaJsf8yO7Red
-3rF+YkYniX4yBIN+j7sFywGEycWYScQCZDH45eVvSf+D0MlOiUNqajJRwxEOPNXy
-rw0IacsxOJY3ihdHg44PJ5BNoQ==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDT6eq9sHZufyJC
+3gmnraSDi2vfZEtMIpgoAAF9FHK36xCGlp84XLpdxGDZxdhriVQSOoKNtFygh5i/
+09MmDelgqyX0p0UkiGWhZL86qYGvPNXI7Nq5w3oSyMkhnD9vwrJvt6rSJsshbxKV
+p4Sfb+5M38xc3YyYK71rdkcvamP1BcL9uGcDicGPlDtSId0Xe2OlYVwQlXv6/zuv
+xdSXLXqcKrAyCaR0oSxrYCsc9pKtFuvDJ6Q+DjtdjYjfCPzsF4LUBiSH3fAlXltB
+uPEDJ18WBhvolgAz4jlijOTiRiOLgRjn3TJCXBKXyHTZ11nOlTKZRzxM2BhU2+k1
+RLmQ/XkVAgMBAAECggEALjDFjvVAy1MA18xoFFmAC4A/UiEdXIoJ2mYt7OKhIr+l
+CYEZUYK8yKV+atl6E+6KGbMRM+wFaKRFwkJcuuW7YevMSSiQpKbqaCR6nkHGV7kN
+7E7cWjNmj2Oem6ngFe89T6acIFR+YFpClcY+3TXbnnwFopRUCfM2xY6xc39gLE7g
+pn+0oa/BOe1DCPSrghOnHq/a7dvSxvpQHrc4dofLgnkeQQNyhIKFC4xIF+jU7y2I
+tyUshOzCY25nu3e4mxYyIyx9WL9J52077Vr47AeWjKvc9J8E1uopbTHfislZejOm
+mvzhKpioGBeJvWJlu39FV4US4y//BCLvhhgxkzFZoQKBgQDsJ1EwmjzfzMh4G3gZ
+LLbLNjQi+j2Qg6gJI0s5Yeg3QxbwMoou+z5F5FBu/DfV+XEpqKz5j6zlt/qTIM6H
+8NUbhG6q5pXdil1vP+t8tt71jsMIpxAFw4vTWjJJxr6OpZtuXNwFPx+jR/8Vg0n1
+zPmab4wFDdUQdYcckfB3soHp+QKBgQDluRib8bB4SMOJnKNpucmJwEBQzT+gJfE5
+zmLJRO3FxXzA37GS+QSuLt3r1HUIAVOA0seW10njbvkI0C1NPINPHG8pZNdEUrnl
+If2DXpIqDEN1T3ddT0FoNmxVmTX3E6WaOTkM6GTMV/J8aDzetmliBxnG7mNHvXYs
+lgBEmqKu/QKBgFTc4ClGFAAcuCGpRWROlDW8ecnkAUGwfi8idsLdMzTAsDqK/utZ
+MAyvulPX4TzMkeT1j4tzHR/EGJDMpktluT9VPOu/RzXApkj3QGml0cOOlPnEB1b6
+6YF/FTk76XibfJqRViOwhm8HzVvuvSJOkZf04+1hBiMPCQm0TCTHijYJAoGAMgmO
+PbF4UcrvpJLU2VuZdYLFv5Plbvm0wHWe+N4luHVaxhwzbqMFDPeyaQLe9v5q9N10
+kfuU4ZAzeGL36yHqLBoycF7BsOUgDrPHp4y646PGMdA8XLu9sHhiQobbxVSnNp+O
+OKyKACSL8eM2lwA+lhab28PjJiYzjmSh7E+ObfUCgYEAmZDePBLt2b9RHK0rlDq7
+97p3tysBxACq02o08KWqEsMXdwfNHnTuk7Ks3TXz0nGNsmG4RL9t8dbuQrdRDVSv
+w2QMmFELDSiLGI7sn3Dp/jGjNV8AGDZtsioKExupy1Vqhrh8IoTpXM8M3S1rf7ww
+5ROsHFAXT2m7hsK2xqC+0MA=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_pub.pem
index 6bac456140c..c02a05b0ac5 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_pub.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE3jCCA8agAwIBAgIJAMBQ5e7UppGEMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
-MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
-BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
-ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
-Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AOZ46adTymDJipe110ZhgfQrnlted5r3rjhhp8gjEDjyMWB3lOiTFyRSASeWql4L
-NKgjH78Q3M3dPVhUBUf/DnDpLqfjOS7RthLTg50SJK8lUtDEH6t+KbOxpo/H1UI7
-O3f81ZK30ecgOdMt3LxD4ViXcEW+Q7MT/nLdpw1VePuieyl//nIHaIhj+eVhMEy4
-KM2PPiR9IqeJaWnUx2NQuxyqeyhA58xbGWh2pr7/rAMqJhazbB/tBzXEMDkbPR5x
-4QJS2IMu9ccMl2l47uUi2DGklFnoA6+agtBi+72hVx5QvmptUN+qEkQPAvqHENiD
-rW+Y/saLERfY6FmcJOkXQg0CAwEAAaOCAUQwggFAMB0GA1UdDgQWBBRn91Ayd4RJ
-wIe07HIGto7xuax++DCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63
-WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
-Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
-VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwFAYDVR0RBA0wC4IJbG9j
-YWxob3N0MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wEwYDVR0l
-BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAI/3U6EQCWzBuIc0xSOB
-SdZarvT+Zoht8Hj3PY0iNapaq1zjCVbxnUgPDo2gHK24ss+lO989LBf8krYG4xn8
-79Rm9UfP+K1ug5UmBQyfw2GtQAPR+B3HIl2Dr11m7pnNLv2CpWQqmOV9gsP5NiCT
-m5aXwj1flGVrM4iYEn7AnWxYiKBqOkfvVHTVUlM6UFkSYVxvD5F/esWGo0OS7dWV
-AH37edTB3H3Wg0r5K9QbXCuYW1gS/4gFSiI5h+Kn1aHezQZyRGRoT8EdBMmJ9flX
-M1GvvLoLJBvxX5ia5aILBUa2EtzlLDxpAEKMnprip/QZYbDtrAF14ZwlKGKPpNYB
-XA8=
+MIIE3TCCA8WgAwIBAgIIXF/CDa4u5zMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU1MFoXDTI0MTAyMTIwMjU1MFowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
+A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
+cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+0+nqvbB2bn8iQt4Jp62kg4tr32RLTCKYKAABfRRyt+sQhpafOFy6XcRg2cXYa4lU
+EjqCjbRcoIeYv9PTJg3pYKsl9KdFJIhloWS/OqmBrzzVyOzaucN6EsjJIZw/b8Ky
+b7eq0ibLIW8SlaeEn2/uTN/MXN2MmCu9a3ZHL2pj9QXC/bhnA4nBj5Q7UiHdF3tj
+pWFcEJV7+v87r8XUly16nCqwMgmkdKEsa2ArHPaSrRbrwyekPg47XY2I3wj87BeC
+1AYkh93wJV5bQbjxAydfFgYb6JYAM+I5Yozk4kYji4EY590yQlwSl8h02ddZzpUy
+mUc8TNgYVNvpNUS5kP15FQIDAQABo4IBRDCCAUAwHQYDVR0OBBYEFC5o/2LaU2hx
+RKOxw4RYYyti/YXzMIHDBgNVHSMEgbswgbiAFAL9G+lvTpaPDA6ZYY9FSGsrFDwx
+oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
+ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
+BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
+cm9jLmNvbYIJAL/ehwUYP0SNMAsGA1UdDwQEAwIF4DAUBgNVHREEDTALgglsb2Nh
+bGhvc3QwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUE
+DDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEADfkCHhuKjdAGA+3BhLF1
+5kWi2w3gssdYAW0ZDsFIT/KnUqAaYDpmORG3zClAuUI6Ak8rzYa0Mq5XTHRvwKln
+dvaCksq/hrQUD/uuhxlvHpUt1eXjg9QfsMwsUDIwxFbzes62tu11Nt3u3qPyVd4R
+S3OAqzFgf3FX9FaEnB7WBdL62LjoUdCFv3rygpwVIJcnPD8+TkekrsJn53deDicP
+c12LlLMW35VFCh44qbs7n6hN0Le2V8GPO2fFxZ1ZJn1UuNqQ1XjVXmOK2FW/8f7w
+7PbVD6tvYl2lM2/D+QIAfp6nsaC+ommLsYllz6K9VANMikmwDHF0ZBjH6g8QXqMc
++Q==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn2.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn2.p12
index f9f6c7cdb28..a2708c31e54 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn2.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn2.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_priv.pem
index d4b9c54e60e..de55ba7ad8c 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDdSanzHL2/Ey2w
-j2U7nfUufyf0Ca2YKFehnZZtpylSSENXJyGWMvoKW2DM7WNTjwSa5m+ZeMW5WDS4
-k0B5iioJ5h6bvLCpqfzwoGqOTWaqBz2/mw0dGTwZZrAMWkQkOXJr9k3w33GafsxO
-nSTXZG87z0S5tfsGyEbsY6OEf3sUvdVuhmMuUrnKwSH8J92g86V1GLKLystpVRw6
-LP+PmtD9qhqi6P5MLopJ1cmeNeq7y/NFWBnK3RM4lr5BXLqca0OggT/iSzNA0LrV
-9SHQq1qjTc4CvkxVWUbz7gLH/U/mPZxSDBFmsKLLy8xEzDFLbds4ZKPsRU3Tee3A
-X9sJqy6nAgMBAAECggEAIodF/2syqEfjzzLwxtak1TZ+E3QXJDDXS559RGra5b3k
-1AqFERyvK0KK3i8EWptsSoc+TqIrp/n9b/d6DfzjBlxj1kUhA7hEgX9mYQHuzQUI
-O4eEClBPsl71hVfoXgagtfveuYEEBulWE8YtY3aGbLywqpGcs7g4aNY7Q4douxmB
-dx4XIHGzLFGc4yNO//oWBZhNNvek5iyvpMkxip7kKUlevnlOv4nncuQMaiPrbev9
-6oiqRpnSywOPup4JdwlkdTlSQaFDFu1EUv9dJARNdTjDqC8l+Z5l2twzOqd+CZ2T
-H12CUUQVc41N8jZ1TE/v6PAVe65NQEMiLDBAL14V4QKBgQD8PTeRELT1TgUh3weT
-E17Z+F+ANSXW4jmRPcZbtkEEAsfZ2owt5AGt8XXGp7HJHQT+3wpMNgoerLEKcnfK
-RhDk5lgE9XLdzIPwwOoyvMrwPA4xSafsQS7hw5K/y8WyCkkZluC77WcJwGHEgZ/R
-+umIhRFfpgmN9y5JG8+9cH0XiQKBgQDglk6dR7QB67dp/WC50rLWAnK65LeVgJvs
-SDvSxI/BQnF/hbhb045E6xaUG07eiE+YdfX2dKCm0bvgaimUopX20dlVfNqecwoR
-H2opH1syVquWfaLQNoDTm8B/ck+IM69MLtyVisBXnT6iL4LnIYWRtvr8SCQxpumy
-x3M3fklYrwKBgAqC1ozyAEh0ntwheiRT21ED+57RGCmTNcjqpRhvSNhM8V0PsWW8
-KaHA/SJxHIR/9BRW4Qv5+IP8uEfyKzG/p7aSLrrOK6I4gosGzvucSGyoZAMDyb6b
-nMOFrdjWOf/IU/GACw9pvjB21twkdq9+YDrzKJ0uwxkqYsBjK03+oQfZAoGASFrk
-dPN24O+KJdGF6hghmaUsRV4Ob1IB6fvTmjHNhpvbaRQxsxPTUAzVN14c6MDNs/a9
-CWvFnjkP6FsLjmFbIyu0c0BIRqgVZDLUxu7dOLiHi3Jqk94bXxFc0TKIwP61yTuH
-wX30PcXhOetIpyI7oBhtf/3V+1ElFX4Adq5u/u0CgYAXgOXizaa4wkwfCwjviTMK
-Rhc5O5rIcD+vZxiRWdEUNUtEjFli1EyQ0sG7RpnQ7wcQn/YlxO4a9UXnS3kOSk4h
-IRpJ1sRvIX9K3t4FWi3zmqqxz1j/LyxQOZYSGwihuhsWq5cTIJ5Ier8GojjDiq0/
-A15jR6uWxg2pmTP1vP6GyQ==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDB5okkB2TxF/ky
+LMgN18oW5RcoXXGNJBU82jbFYh5XsFBh/MSGtVsMzlSOAnfpONZ8pv/zTPboNWI0
+NMBd+W8mN87zIBPhsJ2XzqYvzIBJvxBvLO+16bMyhLeySgXffp32amb2ydinTRG0
+kbdHmuEMGp5SpX7v2irtIDMnfDK8/e/n9r0TJ7PsU5Ju23ynaO/yPQ/O/M165K6W
+Ru+0qDHR4z5xZDjbNPR67yngTnO/bsDFZO9tp6PO2X4HD2mCeKaOM45Q/3mZGsww
+JHfDD9TT5di6waj/vtnaDNP0VyB70ci+2SbnqRwpYifIohZ8Y2POST3lIJdmqBiJ
+ZFDufLxHAgMBAAECggEAIxXGWeUWoENgvXH57vtNX3ArjQu/eLT/PMgVYgjbia1n
+FhvpKaDWLU6GYT3UGbjFor+LD6itAp5qOx0Sc86nDIjLoxV6U3ukQGxNiNednPp8
+DEnaxBVZ7fmyzYl0X5jnF0fwgpZKZBdfbUdynPvK3ehRHo5AlkDpRIfviaUA/045
+AY/loo2TNiqG0mckkZ4Ut9ks57iQip/7LYm6MgP1ChuqMRQV3qOh/tCN85HbEhum
+r0fzSep5FedTwbsMXkAa9dfhex7fACQ9/Ekcl6AtTaAE1kQBdbmQdh3JY6McRxUs
+WSPdUd/BVI6Y6iC09lMnvk1Dj0KVYJ7lEJBALmvZ6QKBgQDc3pET8IZfKXxlfwcy
+Ev7Xb6peoGKkLv4C5rMU4d/mNFPcvl2MYxNjuw+IqBs0iIAxncPJFKDhTy8MuwGb
+TaGjMMqkQVOtyqgEcneEHvu2OQGDgOTNjl5TPvbZ+2bMSEjlrUN2St29u8bC+Jo4
+24brw7or/53dFan+EAjx0AioOQKBgQDgvddyOkDstoqEZtVRPqoCnxfJaqvQheK5
+bRbCOsHW42oBq89KhSjLYiNKkCSCmhoS9gzL2q144vuWhi775Aa1AH+8iwnMR/Yb
+gFeg0xzf/l9tieR2Sa/sCxxgjIY/c4Atgfz/5k9zMF/gaMMukkwyEKWAsiOhUvC/
+Ty2cWWuIfwKBgBbVL1xHVizKRiDb8+t6STwOQCeOHwRoEzxLiyHSg+nxaOX+C/+y
+UlPSB7YR4tYYcmAutgm4hzUjkXKYdn8OlHIhXiGC21qxA5OKHc7bwRvCYuSsU3ro
+h9nFPZGlSqg9pMORmNLGxIuTuOV4+8B6+USwNDPONgyf67XnBHWzEuIJAoGBAJlE
+HmfCHoDQRErjLlsH1z2ObdRosN+2TtaR9NFk7Mi1speNKgLyKM37EYJKJvwCSAHi
+Vvu3GFK2yUjwHZ6e9Yv+2R4l2/q6oLZEon4FO03u1fmH7oxU2GqrcSDO9MbU5/ch
+DP8fe9NcjCYoi+N41gnWnGfWFMJyI8j0IHDd8p3VAoGBAIcaFPw/g1vchYf3mWcb
+0pjG8sPY8aEY49qUcrrGrazAB3MhGui2lfgYLj+gbZaz9BYCpTToUQXTMHW93GYk
+hE/gCXbGvFefBKCS1f2NbGC0yF/GJrOo44ZYxFpVElumhkzJ4t2SuCbF93hO7+5Y
+aZ9A/uqqvhHSVvXk4TTwirwH
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_pub.pem
index c0439353cce..25dc126d0a4 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_pub.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
+OTIwMjU1MFoXDTI0MTAyMTIwMjU1MFowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-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
+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
-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
+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
-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
-Wxcx
+JQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQDWRG8LYL3mNmfOC5y2
+trb99nuG70mfyd3rPB+BgD1cYoJa1Rferso3mcjbZ7PPw3KfjC+Ouf5NFiV4xuII
+QKYh0IcLp+EnFyia1jd5xmRwS+K1nErtXoRNI9YUBQgf2HQ0XMuSvPZey61shkAI
+13vnqMqAhFR+FZUvJ/RrGLmeNmVWSz8D0h7p1ZD+CYtwsASOijovybgfdWLR+JLX
+kis/H7ytpXqVCo7POetdgCiDhBUx+bFwWx2rLSHqUlzpmebSW+kiW+P2rhFPeZbu
+pGM6au04iJFKpvmYAUAzgAJ7ZoHdP9KPs7uX1I+JSZXq985a+gEsdXxum2SyvRf+
+9juO
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn3.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn3.p12
index e511440b85e..b06d3e9dad5 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn3.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn3.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn3_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn3_priv.pem
index 514c99a65a7..837bd36036d 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn3_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn3_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCe+otHWIrzVmHm
-TesEp/wCBecqCGrpMcRd1MbiNCFJ1r1mZS5fGY0ZY5ZXfWEPnAvlRE5+sDmHz9yq
-a1T7iwDUUOfUk+1D6kD//ebF8bol6XS6cmCZZBd0D30ujFgPzk3P278NTBbXWH8J
-rE8De8NmOVcwyV4t67RbKMCkGEceX+t8Jus2F3Vh+v22p0MVF9hAoTFOp340tw6s
-nJMsEvolmzLqgOLM7l/zTDSpMQE7vvwxG6ni9StXPe31rvNfJ54eaV/M1LoZLTNV
-BGfkHd405Y/3m9/E/FuZb+AAWnJkfgdWS1lRFxZ7zTS5arqOIEaw9xIvwlFSwo0b
-XAYWh4r/AgMBAAECggEAGbm3QgNM8NWAoBDpv+Yi/HzSDFYyXqvj978Ps9j1rgom
-ueQTneX3lC0uTdgHFcyNjDsCbLO9i4GSVq1pog67QqAY86hAU6YbgJEof81+7tWZ
-QvZxNUEiHnDHM/oX4e7jXohToSY35/71B66vVoP3eZo7xrQ/HjUvCTVN/v/CumJP
-zipWWy/dsRhf/s5/eaVWjAc3PDVJKbncgsjnkzmSUHOFe2ExjypJDEpUD3u+bkmp
-ytyxazErvUsl7gFs0iakx0gWyv+0p5gBwEhOrdkYvxMgisGABmP14a6GHZnjxcpU
-G443VKyc1k9UhQ6o/QsBWxlDEq1doxaGHqq5fyOsQQKBgQDTqyElemS0pOsFW8AY
-ydPrf3Lsc/wWAVl/AZ2L+PPHSFLBPyspFhl1hL1ZfMDYOcGcl6Xueu/5mKb74Ddb
-BtiRz18by/FPko5pmug7q7CzngXEWeq4rim9YCDMdJJdFK6d55qQYhmBHigGIvWH
-nxZrU8iHshOx1JDTqtPnvlWOXwKBgQDARmK4owvhCca6gVI90caD4i9r2nzt7vo+
-zxlU4K6Gv7EdYFdR9CZhsQd/R2Hxrdxx9PxBSX5gZSGS36z4yu+y00FyZceXcT2k
-YEkMkdhCXNiDtQKCHz9uv/9x4WFcRADmgJH2IB2tPd+gwiuSfDsduJuG5UdMUjty
-ldrv+cgHYQKBgGzFjh0CTmn+Lb/tLEQQw1RLhDU6TRrJysHXhKx/XFbWNaCU44sT
-jjWz5tHrp/X1iCb+TwjEKDmtVnItAIVIeVZEqG1SWkk32PMv5ZN0YTOMSw5h3prU
-9SIaGgC3DtfCXxFKCUWVA+I0KwEsSdxNxmmU/oGs4y4JO/tp18dJKhIlAoGAYK9E
-FypN3+RlnQVIkLN6ynijde2RIqgoCAtl5otw12tvKaF3Z0uJPViit3ryom/VySvy
-6PWG6fwQrOVy+kw5ykd2woqxmdKkt5J/SSXRhFVhvqD32OzTneJIFkDKD3ZWqZH/
-U6+EnMffOtxIwslbhK9+7Y8/kf5LzGvUgxWsYyECgYAwoKVcipHqch5TWdhxyX1f
-GeqDQsxcKVgxJIhH0HXc/3Wjjv+eCOKCizVbbwxCo54ncyU82c2FRXabVCp8qEqE
-ANhkN04IleiiMhyzogHnuO+LXa6vLa4wH2EDKA2pueNteCADIAjqfuYiJgWUY/5/
-VFf3OVTJhRDK0hik78N2SQ==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGuYNCCxqcZImG
+WRMiwPXCQ3pBIQQ1nOMV+yC0WaXnzGSr+NSAhuGrsEYkzoowZJmB756bXJWm9Bz/
+8u0H5E5bt2TxLWGd9mGf2sPBW5grhGCChx1gBhVdKUV5CuiQnbfvS7TS7r18FkKj
+retEw0CtdiHYpdWkM2RfNnM/7UyIa6JJLw7vA+G61pIzTwq4wodrhzxxz/V/Evo1
+pqWpyMlyJmSV5ux2mAza5mOh5jORHkBD4bkL3n/aUaL2dH3WMdKp8fKAORUTWLDQ
+51TZol+iaXi8hZb/0Wtw8LI00YHaOBP+RoW43ekQltYzCNwXgqB5mwAZkqMEDwHG
+PkK3/vCzAgMBAAECggEAFMHc5YGeanaP7OIR/x/Tq9J7iyEFPQphp/KexGfWzgMK
+AvKPU8uC9/mGIiMWyR5A8JMUaJr/oLw/6TY5LwlYa/kYiJ6aYzMQmG9z4hcMqoL9
+x7SQS27nPV9pu855Y12uEEdCoIPCdBspI8qvV/PjJhtARs5vpeKeWdmoqSVCyL7y
+JZ7ukCnwB36AUGOgcEVruM/aM81agEBvuUz9eNyPzkvecRciVZGFL914PVlJmLLS
+MGfI13VmclxQl1JpU1KVhu1KOc6uFmb0USwwI3UWNHrrBrACpOL9diHPRn+CqR7s
+lR9fV1IcAVFf7WYiKL5hIvVutrxWjQAOtpnM89m8gQKBgQDQlnFffC1FJM3/xwaF
+x9fwo2LB86FC8UOuBnywKK34NSueUlzDjwT+7C3562H+tUgigf9H1MyQi0TWfYbj
+AwGGdnSwxBZc7OK7dG8YDNylTZuDA13EcDbKPEq0fIIauPvia0YVryCYVuMiGZaK
+ZKfCXDB5chXv0Ib9MkDhWCtpgQKBgQDz5SYguFJU9HpgsHW9DxA/c5XiQ2lErZly
+c3YR7nOqe1BF/oVgNPj9FuqFUZALbG8vh/U0ypw2jwa0cJarm31NqMD+1A3uPd6f
+vIXzVBDQiuAwyaCjpoX0dxLgG95YpwAbqG6JB9WJSnNtikB3jIDIfKUCGEruzJet
+3hwZkRbsMwKBgQCY0C7dAm90AYO9yISZzBACpuB6MU/KaFDqFKySrirN9b4v7i0x
+w/yn+kWwm+aeIRdo2I46hMcdejqDXVFNzOz4Ip5Yxj+P8qglJycgmoOnwxSURgoT
+GRa60LL2SWVTyIQYm/ireDLMCJO8brygRR+2P63vu0og+Ed9Ba0MqnibgQKBgEFz
+Jecz74wyy0B1OjNQ/og4iWlds7slZv9Kss2fEtUWIHWYFsy5inPImYjLWX9nSvMT
+Zh8TnBYcDa2QZS6KHHchqSD5YP+lBMATBFNHJPgBvKX7BavE/T+cUKlpcSKTNjk1
+2uvU+V3NZ+pmZmRuhQTIRjOotzscFjwnVZ0azW73AoGAEn4eaVf2T6s9w6RzqkH8
+GvKnNyBUN92O/PsQSGo98xKYqMXTHu04lkicRRPP7Hp1IbpM533dlG5W4939DR+G
+ShJytJACVnFvOu3OqgVps1ltzvwZZQls/XV5VkHbDWPavE74nX5G8LPDIi5CGqKe
+JUarKP3rvp7akx41mnVBIns=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn3_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn3_pub.pem
index 3f7ba8cf6ef..8acdb5b42e4 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn3_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn3_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-b0B6ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcE
+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
-hkiG9w0BAQsFAAOCAQEA2oMYMvppc2Iuql7ulWJ2lWbesfYvyIekhYtpbzt599Tj
-qsrvhvO3qTcLR/3FHcX1Vd+p2LYqpk7kuIpnvZ6AjfJUDJ6JtuFVIPL5mfDnqpMu
-UBUe/3Uj8maSn64xjGjZL4IebLvjI0Az9Kf1ZfTYawVM5Chc6MCkWNa0wTWwls21
-8UarpcXO3wizEzz0Rr8XI/My8UT8/qUdPlgbAsYiMstuG4o0+vvsxSWXFnXt2NtR
-zy6BWST1pMcAMakqT49lTUw5rLaJZlVdoI9ccjlpW6upThW84n9zE+YQo7FtupPG
-5lQmoLQ8NEMumi59ExESetV4it1RjFGv81invpDR6A==
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn4.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn4.p12
index 613328e653d..854c429c23c 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn4.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn4.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn4_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn4_priv.pem
index 41319c2be6b..895899b049a 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn4_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn4_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDfw573/xTy0aEW
-pAc7rgJQvNu4ecCwWrPKwhw9QVojXieJwS/hVjOEa2MjL4NoSL/HFmcUklFpfK23
-O7Q8mWNUzw/UL6IDXcvEOahPqnLILDb0TXfbV368ktTe0kfL7MtJDOAYuLVmcpAI
-v4ZebvXvt6RApdtAAZBB8iHdTFGkRiJkjvp8ZNCSSfa+AKwa3l2QFeie7DkOqhtY
-2ruBVYwhHCG9UlnFu7GsKEcXN1eHC7KzsbEosEWHRCWGa8TBe7fNDVREfxQ4lC5T
-Vt2W+nIRsI7jsJujSpPgjlzlIoB33aDy+vQyMxe5kBmIYvvB3TDsSWwwIqHyqixW
-iqTsXngrAgMBAAECggEBANASaqc3Fja5Aa849dTj+Rk0lKgU5z3WCeuX1oSLWZMb
-wW5SKwDBlIQlC3mze+EkDNjHFzFE4dlSa4LATNgw1fIN3S004dV5ibo81yrFV5iV
-rMA9rR9UW/BkJPfR15tj5KBYDaZPU7cg/phz6DG1wpGXVXAcCiWZjpgT3LOYfS5f
-n5IqRIQrr7OS+RipZaVbjuo1unLX6KRweV20nYWQW3uO/3S2jYlc5A/7MC07cV8d
-aOhqEMV21vTNJCZOIrQMEf81bbWYJvml8y1Ha/Y5/axtG3YhJZceSIeL/0lf4PSe
-/Hrqp3jZQadgEwceRL6szsxJEB0JcOsrwmjIKb0oBFkCgYEA+qRGXTkVKh7Uhcr5
-BLNCT8oerlkl1K7qhlqoUVZcnp5Oq5XGLbQ45jcS2d2sb1TkBvfOTYDYIxXt4LgO
-VL3blA7pOFl+l/nJaxxTZHWf2k9EqrhsSYb3jnS2NwhbBKWeMyg/cRK54dOUxm/g
-jORoHv4hiz7/JBsXzapG7jSo3wUCgYEA5Iw/zFbbRa9SQKvXYaSxPLn4REOJ5QE4
-yb3PxElaWztJUlTXIlO/QT5iXQVFB1RtBpOeoDhnPr6yvrtknvC7OvSBfRcmBWoR
-n0N8xRHAmuZfaDLb/cH9vQNX6UgGScichaPjIvXu3S79AeXhYkvrNxGsir7h4CEk
-NdBVkJxnwW8CgYBH4Fg1X6tMGu9DNwPWbzmy+/l0cihBJ7Alu1XNjYCeFDPnTNo6
-PRacHmsPg1xxyNxjiyjkXPCejylaai3h61hOyz/iYvfEyWMTjlnz0y92QYkllCGp
-rETN23Ztrb28RWpqrT4URRR9SFm/1lGE1fNt/97KudQdHI/k8NHKedt7qQKBgQCq
-Od/m5aaKP6xG6PcSDiXIskc9KQTTIdbXRF40t+Hp472X6gMW2UOxZ7LB0AP7EqHl
-7RuQAJK9xDHEKDUowOrjXWv47L3v+HHJqu2Kps9LUF0tcfwzBENmfdADvBaa7CXQ
-0CGET6Mq8S2XNU5q9VrreGmIKeZ5FpYu0s54WFZbVwKBgQCOQwZo/N0x5VY+6XgB
-pB/K/oRLvW3ErRv+JDCJNkVRzD8du0xia2F16VxxEUeEhpnfQwuuKDVXFH2xE4iB
-ZC+ZQScPiRMq3OY3ekj9/lZSWkW5ldDBbGkNXL5HuoKaW/ygbEggu+PU47ZpgOn/
-x/Jyu2zvH2tkQU2FvNgn/EqRTg==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCv9sZTQby6cDbi
+pquIaSdpxTYEQwidEVRWgp+SlJb6XNsITGrDh7Mqd3KPH2ijO62SwhSX+VDkAXhK
+QJMePNNYN8dX4LHPB0ebIRbYGiALN7yGyXYRiHRXE6JPnQ/gNq0Yf0tXwVYRHEJc
+COxfw1ZZ1z+5i9qN/qDmCQawtpCGZBDEdFFKgybc0Tdv9Id2f16VoogbV7wUWMKC
+H4zi+99wMI7mJUUP2fPwJxmyCsQjg6Xz1R19cftN/Ojze6D0qa7vlVJmWjxGkSh8
+lUsS4BBY8TxzDGhDMoRTkE3u83j9pBrP2oEJVr5kkb/dsYdtxE+uvB4f7jyHJnt7
+TV0kpQ0zAgMBAAECggEAISuBozwnGXYBwqPsfeBkn5mfXxpLy1/y6APjlLwR4cwT
+NfNBxO4VphGyNKyVCwA67glL3IIQ74ofZM/ba73HkT+igjxHCGG069dG+SGjnLm6
+/iWH7jIszCVVWXCgB4IHCzEjwL0fPkZ3c+XyuPKXmoPq7U0hu9ad+f8FldY0VEDD
+vsMkQZeJZhjt/IQC8O9AsfdKZIobC3OyRjWAkpnogE2fNwEWtxjItWhdnrTm75cI
+plCChGJb6awDvt9qSQioqyNt4M5apCfnd0Qnl6lciYaa3Lh/yQszO3DJGU5MazTc
+4M16vo+g7dxpDtyWNM7hl5Z/+OpmShhFx28lwkf4UQKBgQD3Ek6VffoThlvV0Q70
+ifkh0mSaIH1spjO6Jw97eErgHazWUpWE2B1FKL+1c+12SZympt5esWXCWOxBYAoo
+zPIpln2qAXjTDxZXQXNlsOtMreNjuIR+nqFjyNtwBTHQEJJoUM+ZXORoMDssqU1S
+IE5JwpDMgE5yd9ctVFwRoZoHXwKBgQC2UqRS+MK0JfZP5OVWJbaRnWddwhBnRQ7o
+PQ/YOMhj8bLaVyE5r7pdqz24D8+FYEO+fuFCkhc9jpNMYXAJSHApDmh+fT6r7lxy
+V10aD9XtAs8XnP6ZFcWMUxaUrfcWRAiehvN0/z6AMqcU8I4LakiXlrWrEmqiDlhN
+H0GWvqUurQKBgBsnrPFrRigNNVy7vHwOCg64lAwIlCBz5+2Gy4HTh884E73+l6Zh
+Jl5qix+DXU8J6ii64Gfh8YA5y8Wnq5YuaFM/0hH0VXZFCzyN2gQMPOBRoFNefVl5
+T92qvsuCFqZ6m8zRTO/bMNNusaJH/VKQcGpU8xs24uhb2Y+G3ROnAknbAoGAJOZ0
++5X9Uhic0W6yO81GNhJ1aTRtvXjsm3RAULKtXAz+9dHMl7BJN8wAodARYB0rmNJ1
+JNQMgBjrFvphgn92s9iGrZMLrCCB9WJZJX0u/tkisNTFcpZFdTEb0Nuktozucac+
+ft9p9uhJiKNnHEhWiNenzQfdLQ9aL8GztJ7BL8ECgYEAsmbwkg1TrHf2m8o+qjg9
+oHz3pdxMbRAzUAmgH0lo4bKKsHIecnyV1ruE+bEa1yE6k2tmEq+nn6ut/KiNUOCb
+9CTKHiQXNuD4Zxrtl8hGGYj9mwNTk9nuz4g7TwTtwSV0Wz98TMre5eQ2HdlXbBfH
+BYR8vixQU8DzOnCzzqsHEyQ=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn4_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn4_pub.pem
index b90fbe86a36..b7004a8c6fd 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn4_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn4_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn5.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn5.p12
index f6edecb6464..b299beaeca5 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn5.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn5.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_priv.pem
index 56842dfb480..0a594ea1944 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDOAm//7QAWbnBX
-JPEgYnaKLe5Nx+lrfEd9nxencQUW1Xj7oD18CQWTMyE2GNzwGafSf9RjpY5bZP9X
-AI+puzIEyQ6JClQo8Uv15btvVZnSnfo+c9aSSKYBl+2mE/CeHYueJQk8yjpMFY2u
-+G1M44pcseQUPmxx/vWAMLH5nB7xigfJHIAt1e9QjyX9cQM0xvo8iLRXko6e+rgb
-OdcrXiQAKPRSJDSKPY6mUVdK580ErIDp9Fb7zSXqPxXYSKiubfTHStuNc2DNJpEg
-67xkzm/eSqadKhu/7x+yW/IPsdWdR7oNI2i4Ws6njYFDUO4a8aVzC7I93vcr7Mqg
-yyCuD8D7AgMBAAECggEBALXXzvcQQ4iJWZ6CnFlisJIOMxDzSqY3IH/Rg7aoe76J
-Fm6+JierawFhG4q97Z/+dXXIojiHNZ6VCxLICwfelitFMhBjTqCJRey7KXUAEXSp
-P/AKnjen6ujzK7HyXe2j1M72kC3ZsBXi3Jq67Pf2zfY+jD4WT/FcBWZvFVpopaO8
-BpdaNa91h9+seUUxe2GdOJMzoheVPH3gQtw3YXBQwgJhJMcIhwjdms4Tk0Gd8sBE
-r3mUAWMQioY/EO1v9/qXkZ+3NxELGkBOG/MlRuf/VYg5zAiTwGIZDGQH3d1qji6B
-g82zBP+qe88iHgmsVdcH5eLGMHpP6j9zJzJHA2UGdxkCgYEA72EbQTaf3/jl4FLh
-vpXCn/K+y1u92SdwjteA4dn6NA+72hMGis9aSjLE70ppuA4P6bB8vmITz9862VkT
-feHo9OOaaaCzWgzyuxuV1v0YvEFtzkFrlDIEVeeOJORh9cetsYJs7H91Vl66X9wO
-FS9rvttXOgazA/ulS2kTKMphlfUCgYEA3FAxcR+nNZXIQQaLmfH5x59i+vwkxXSC
-awXI5BQIU9A/wXFnXujVPZfx6sTkN209OM8qIZFtREtGH8G2NkDpZm+a6HFCzm60
-TUA+iyLnZ4ade3uPDOzWlaO36O2M6z4ZFTA+FAVRM7hoyznI8gOsU3zddu8zeHNt
-Xs8lxChDtS8CgYEAmPdtqiuU2FO92a488UPT/c/p2huC4rxQMgdGJYzcVN5lBUK5
-IITGRrnQnLTpf6MEyilsXWBhFqmoenFwgjWVXr/+0VbOpVG23pgPFTXg05Pf7jhh
-3W5k1NxGOg7zBlMWDGOy5SHBwnKAGHePTDxkVq7lO4BCbt4kz16SzrMczu0CgYEA
-rdyfV/250CDW+vH2Y1PBYZbX3ufzANxUO69B/TQN6k6ysa8T+6NU/RmW8UXWMCOG
-J/nc7sa8ayPYQCF38VLCnnM+1WbkaNKWeUxUzyqJYXqrdxJoLrQNF+Qus6QcDF1i
-IAWFR/l2PpGuKYr9mHfrm6szfrOAc/LrgeGJlUaNQEMCgYAWv/p09wI8+6/hDcyq
-xsR5Ae2e1kCa6GEDLN4ZqvWv0ovhbdslLgYM71qbsgvcXwJcgWA9UhKHufnSFmG6
-cv7AVvxC8mzhWEH/kkTFT2mNjz1MQnimeK1WxVYpzF6SYvRhVywel4CcFLu8NY9w
-q1/wwP9IG+FQKWXIHUGL/c/URA==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDB81jJ9jv1LsmV
+T11N9MIxcrBCUWsYf9cHuP8HND1ifo+eVKM87cg1j+JXQP0CtbiU4ZHziIzh38jg
+tHxoVGnerLiwsn06iqPEIa+2X1F3aVb3xTlKHxTriIQEnOo69qkqgak7zRGlHSZg
+zaAyySSyr+BP98k8xX1ALPnbGWMjmB7vnvD/yc0ghOPf6REroew8+1eZBySqQMCx
+aOfsiGI1zuKVKapC4S7QtcJ8KRWOKnXOK+fe5C8qJ22weB9r2n8I1efn70MZd7r2
+o0SzGuZecC7LBkqdHGdecKre7Smbd+iO19Z0u8MUZJt0ATot/HQyq9us5NMKIGho
+fKZ7KdqXAgMBAAECggEAFQqXiWGjY5gt2nr/vmNdZgvxP2Ch48iKxZW2ZUuvlS3x
+2tWH2CZb4CO6BIlSaabZXZ2TPf6EekTTAD3UeWUfDz9h0hmrKFy+I5sb+wcgSXou
+KzdEXdw9Ysguumljp/32oFvsxkYbMfSVo07roFbeGlymU0aomGU8j2fRu4lnjgbU
+PPAQGCxf4DDsDl1pSZOLyN7krLpQ928yq91Y8r4lXbv4iXX/TTddsqAHpUG2tEv4
+71qOpgt7lb/JLIQmFLSszC/MyE7NUPQ+vsM6tpQUXxRFu1e7a/iuFaoqCBzePvRP
+vXCJpy2XLxN8KZX/zu1RxJPB4xpTJEtSHet+KncOUQKBgQD5UB7uVQHfqmSmACMY
++l9klLaOMntX1QHWShAPtCuRj0hUSicrnDrGbVQ05Gw39BcBSmtiMh9JRUIvOtAI
+rUdWktCI/w5YVuhpAL4Zq+So9MgtEdw2GeWM+S+O8vL2R3ep61HSeRg8owMEe7nY
+yxxjR3BooBU0p/cQh7EGum6ugwKBgQDHJxYd4P0R82WUYqMOevgqUNKX3tdZ1wpF
+iByKu5mEQDizr/NF3MdItB2QkiTZ7cz72RqJQParzwbXCmJcRsr8EjEeYjuFTg+6
+H+DwM6+wTQts0WEkJlDrTkYWuhz4EbsEUZCP1svWo7Fn1f7jC46Yqe9jiWICPaKY
+bXKLA9+nXQKBgBhtLiqhr4ZPdn8BIm8vEKuVGnHCJm2LlBt/tCUlvOMNC8QeY8oV
+C3knewmXm7a7tolM1kqPqJsQKxTfiURgXc3wonfZrXkgQrMO/JEdU1DucrJfvpia
+XvA59dvml8FjbSj7wk+Bx8shGYmV6baA5+4eMLg/fvRixIUdFk4XdAKrAoGBALQb
+CChrYdNLINGKRtaApVB3mYzZbj6EeHibeNyKfnKZNe5jMIo8+UkqAxbM5GDma5xU
+ImiAhNSqPRBbBstXBpnixeMpiZSsHRMBY4c35yp08uEtlkGAGWxEdKR3Gl3KgyyL
+q0Y6RkxN69HxOTsSJ5qvDJ0jEKzgGtzpFk7caPbNAoGAKSdHuPlwpT2z/RbPtT9c
+WgBzY55tGyHZ35G119BQ9DxMXdFLGIlS+ssc5tYt5eUXBeZdYTBISMXAexgWfR+V
+vbScVabqSbqkWRrfdqGPQZz6TzPia1qhNAs5+KtSbDCeNB+QoXaHrul98laBO3tY
+YIktHpTYDEc+ZtI0A5BoV34=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_pub.pem
index 975a9bc14e7..2ec6f75ca6e 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_pub.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE4jCCA8qgAwIBAgIIfI4uKJZzFJ0wDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIwMDQx
-NTE2MTczMFoXDTIyMDcxOTE2MTczMFowgYgxEjAQBgNVBAMMCWxvY2FsaG9zdDEM
-MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
-aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
-CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAzgJv/+0AFm5wVyTxIGJ2ii3uTcfpa3xHfZ8Xp3EFFtV4+6A9fAkFkzMhNhjc
-8Bmn0n/UY6WOW2T/VwCPqbsyBMkOiQpUKPFL9eW7b1WZ0p36PnPWkkimAZftphPw
-nh2LniUJPMo6TBWNrvhtTOOKXLHkFD5scf71gDCx+Zwe8YoHyRyALdXvUI8l/XED
-NMb6PIi0V5KOnvq4GznXK14kACj0UiQ0ij2OplFXSufNBKyA6fRW+80l6j8V2Eio
-rm30x0rbjXNgzSaRIOu8ZM5v3kqmnSobv+8fslvyD7HVnUe6DSNouFrOp42BQ1Du
-GvGlcwuyPd73K+zKoMsgrg/A+wIDAQABo4IBRjCCAUIwHQYDVR0OBBYEFNuOZCVJ
-I/I7npLF893cmUOCFYA9MIHDBgNVHSMEgbswgbiAFP8rF2HxgFwRsIcAU0C99upS
-zrdYoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
-A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
-BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
-QHplcm9jLmNvbYIJANCpYBrCeVqJMAsGA1UdDwQEAwIF4DAWBgNVHREEDzANggts
-b2NhbGhvc3RYWDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMG
-A1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBalJ4zgdkaRhEb
-YwWD9CDfSeutOXDuyu8hcAnPS2sZBfqyw40vJ9ZQ+rSyK6x1CAhT7rYuep0rjGdT
-bBtyyad2lwbZWgqbHDKy1BYQlm/ZjzEHEORnruZxqh1xtxA+qtIZxHbWKj2QiDqQ
-5Z/IPw4qWRrIhc8qK2VjRY+s9NbxQ7IaCF+SJVZ1EpKGaC12kHGav+/CSxiDdmep
-gxTFcqmXITZBl4/1JYk4/8jxmSBMWHpwkALXG589fjH75l76uffDV8FJSNDbI2cI
-D7qxkvF/3NVZFfSp5V2M1MsfhOGaXeZyrk+23ySsDILcAYu8THYhxfbSjqbSOXdH
-ABCryWoM
+MIIE4zCCA8ugAwIBAgIJAI5ESrgpzLqUMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
+MTkyMDI1NTFaFw0yNDEwMjEyMDI1NTFaMIGIMRIwEAYDVQQDDAlsb2NhbGhvc3Qx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMHzWMn2O/UuyZVPXU30wjFysEJRaxh/1we4/wc0PWJ+j55UozztyDWP4ldA
+/QK1uJThkfOIjOHfyOC0fGhUad6suLCyfTqKo8Qhr7ZfUXdpVvfFOUofFOuIhASc
+6jr2qSqBqTvNEaUdJmDNoDLJJLKv4E/3yTzFfUAs+dsZYyOYHu+e8P/JzSCE49/p
+ESuh7Dz7V5kHJKpAwLFo5+yIYjXO4pUpqkLhLtC1wnwpFY4qdc4r597kLyonbbB4
+H2vafwjV5+fvQxl3uvajRLMa5l5wLssGSp0cZ15wqt7tKZt36I7X1nS7wxRkm3QB
+Oi38dDKr26zk0wogaGh8pnsp2pcCAwEAAaOCAUYwggFCMB0GA1UdDgQWBBSOVYMH
+MJ98UjtqBEEtuCShGV05HzCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhr
+KxQ8MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
+DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
+DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
+b0B6ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwFgYDVR0RBA8wDYIL
+bG9jYWxob3N0WFgwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTAT
+BgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAegVzsrawU1JJ
+0qBh1A4DliBR7zliSG/gL5+5R3kztVWMm31LJETni3g88yZytuDUZsPdsoKavt/2
+JDg4svSTLYN+nmK7g9JzjlP0ReYqWz9Ibxrq8tiDy92Z9ikvLi6xO0lN6MXcZmyX
+kpkPayGo3Rllx3BUM9G9wXX8tLTWg3LRl/EEZ+LJTFRpkN3teR4jy0mKFBA5NdDd
+jSa+CSwGPQO8Jyyo1T+Fj0baLtATL+92Ja6RZwzJnEMTwaVcL85oqQLM67jZiEb7
+xYRUd98+qY+qn+6S7Yn0jcVl5sF4n4m9+4UMHMlgECmsSvDTdH1xJwSZT5LNYjct
+1pETtVHB7Q==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn6.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn6.p12
index f61e10ce8ed..4fa878a276c 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn6.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn6.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn6_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn6_priv.pem
index 314187d195b..d79a4b56f66 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn6_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn6_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYC4I6k8uTlL53
-7FV28HOmHEZTCgJFNciErttgKN7AM0IMAJ0inj7OsXRo2iOILZ0rZdsiU4qXoLy/
-wVRWVUPLP+zpW9aj0MyF3fwJ+sfuJOrr/BFcSQUu/VNPhvlp2milYsBiauSk46f2
-d9Fc6d1HmpLdiaIFt25DVUtuz5vbbRb6VfHOotoeQa08rOfOLkpP5BqA/h4je7dw
-UE2PxLKP2tX0HrRRIWEf9vAErYKpNCtAW7diNg7d+futUF2AyMX+96suqRNfQF0m
-d+Sw/qdIPQpPte7g9NpDSUKy1KNUBZ7no2mbco2r8ezv5OSTuADwKf26XDsZ5NVk
-AWufgRm5AgMBAAECggEAdzt6xutUWgGoULUMwdSYbt+B7EhE0n+JR7jc96f2r2pa
-lBcuobFmBlqnXUque3R5Hj9bfglPHrmmEcoXyoHKJX0FOhDmV4hfp63IcJWIC6Uy
-RcTaq+zcwH8soGJkeggA4u2qMWa/A0VlKEAeOsISzna/gSZ5VeBTKTQEqoZHhQQe
-jRevndlbso8MfPJ2MLRBmhBtpko/8YhoErzQ/K2WWyIkQbIWp20hY8nhLMoJE5xq
-3s5BavxTa6UoMn5KvPEjDP+AA/DcF+ib/aybcb8tl6ig1aW8zsMUOmsTRSlAe8pm
-Pt1buCpytbKZTmfvr3ZkAZFwHSXwtUplLTsRa572gQKBgQD74o2LzY03qsRPX/DZ
-p0coEil4+GT+kDv377pPh7zswp74viuWnkMGkVFRMewa9auiVPEreT42awrbcci6
-mOL1S+8Qx/q9+kvlJLSTQuYvuVm2nnHbGhPQ87vRMTtdULwO/DaiDBI0C9X62Aut
-jc3Dx7gRj5NkLnR0If9yOvLJKQKBgQDbkxBP00/f5uOriPQ7QhX66DTsuVSAaMWr
-5xE/oC34xYIjPZAi6yV3b4Cac5PjXlyVuM71eZelqIRD30Xx4uUAVvJJVcBnNgYL
-O2E5j5kOPYpRrF0t5dapBtp5ZXtO6NEf6QVwM3umf07dK7/yPMZvhkX8OtKYB/Ku
-MnSzvAWOEQKBgH7jz3ipMUXk0gZGh7et7EvEcn4NbBtNn9g0PUBJWiRPmvQmISE8
-UvmhBT0JEC84qaEad2/2ISAa5ppMBNnzoQn/mcxzYd6Ik+k4h3tUDU/naMl1olfF
-GEyALJKi4YwN2t8VsZQKzrTHbaFzataghBLnrtOx54dlW6cRZXUvOxWZAoGAMWQ1
-aR9pej4fvHhEKAhHlXciYJWX0oK+5FpH4P4RGUKkcXTptVEbznAAh72z6JNTVEKM
-G1/MovDzP6k7vJuDU747Jg/qBc17Mo+a4S3SCggB0zlohGiNDtyBzIjtYeSxFfJ+
-zKxoBh3hCZNLzBurr26O05wPvy8ageDLq5qBzWECgYEAslKiWnkffDTmbOwu4LDN
-U5okVJTc4mKJlgekfshkAJhm4TejKyrWetB8MGxJk1q8YFKAc641ayjoli9k1YVb
-K+lWfPGNW6Co6rJHiUmJ9yynu7lL4WwGAwAm8qo8b31aN4gIWpURXsB50MCupKln
-UHxzugqQqh/azfn4PKSnLYU=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCs0J//x+vhHFxK
+VoVjFrWKHtkqNGG9CHK7Okv2g2AMZHclBcS3PGbVPDrnoVROv/BW66dyC9SZAenR
+0cqHnIVUu2/XTfjG55Mvk2juzXnxf2TEeC1m0HrzK5ALBc7VoJzcQ0Co+HO/76kX
+YjHqUoku2kvfgH5+5Fek3/Et1a3ozHD6rn42STUQoWJOzFR9vJ43LDM+hcO1DxxR
+LXSIkf2U1oAcwY9dvV4cKQt2GxXSuf6pgEb3Um8jEhX/vtyTKxAvW/I68a50p0h/
+7KMYNGQ/za2PiQ6j9ChSCmLjR/pMwJtaSCxVFzG6Y2RK6ERaNy2EViT4P6SdOSdJ
+mAUDFNvXAgMBAAECggEAGw1uO9j8z1ikXTdjGmpdJnnYGVe+2cZ0ng4tAwd40H0k
++4+GG6sMa/f0PqX4xSUdx0riLk5fdvOfjyrDWhbsoPbV4K3s3PI2Y720hkwgeTyt
+4RBGXIW+oXS3JUqWS3HLlwgTcKqyr/VL59mwIlQjnnPUvxrlx7u7Y+zHMUYgZcSN
+R2K9IZwr860lkWMMYValDUOxwEosRqYR/QoGd2YPIuehGcmTDiQBasiBsIH+GXl3
+Tn8NM0SYWn2yU63pjifdUT6gvfl9QYvUpO3VvHG42Ly1CRSAEPBT+WyUV8/ShtLi
+J6YYButF77IjQR3SRzVxZ+EkmbOZyqKpZiNdWxW89QKBgQDJhpczuibvUrh7HLzS
+Khk6K9RoWCPubGa7nosP9Ym5SDprHYlBECd6UoqOn2+k2wDnppx3Q5t6B1eYeXMu
+8Rx/jeTmkoUf+f65xyesoZG/cStSrae4DcOsCWRjVw/8pEmzEWz2lDgpu+vCHRef
+Icet+wtCn90jP2ZDhd/reviYpQKBgQDbh0V0QZ6BSMBpCPa5SxdTmBLIqsEGLyro
+vYwCdswIZ2g1SNC4aV2F5MMJXehoZrSO2bVAfLGQg+lQyVOg2vGvtRNVHzu/DuMc
+HPUW4Qy4pnQydHrdJyqgtqU2v0POXR/ZmloI7KtSw181qtmU0Bq90Npqf5s5bsfd
+GDIzVJq9ywKBgQDCGkt6PBsSOdeMZMKNnpTLzbl5gyOgmnJc1bjVd0be2e3CjCFO
+NJQBoozoEDLFU1dMx9I+oTSYVYgOSTQjC4LKbM4DMy7b/LtXDrZs9PXfsc3rhW1c
+vo0wH5+8evff/BEsU2VjHqH1uJW8Uq8Uy8F7Fqji0/133LHP6ZsiQUA+LQKBgAxl
+rjlrfz0D08HavLwoDnAtFVp5sh7cSQsNsTtuZAVReaQQsaDIanymN5Fu2TIUIrwy
+dTboE8r6eBGU3QEnfCCVFDtpYSFgANlUlU6udN50n/k9dLbKgHDE/72AvZ6IycSr
+H8yDOQWafOT1+gWaXvg7NCpxfF2Y8PZ+aE9XxslTAoGBAKzMuP8+2bzhce144Fio
+WVzjRzLom80veGS1zMbVlsGqMI/pZ3UjxXx3oCFCIMb/IZQBI6EChOZuMkRbzQAo
+tanrHm8lqk1zHA2tiZxsAlAt2zuMaE/QeZIrK3IPCgLD/id3STaVtANbo6JLditG
+F7eZiLT1khnecXIDcxmSVvOF
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn6_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn6_pub.pem
index 66fad67e682..9a747bc617b 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn6_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn6_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+MIIE2TCCA8GgAwIBAgIJAM8OfZvF+jZSMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn7.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn7.p12
index 6df04a5f9b5..426afd3c10e 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn7.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn7.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn7_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn7_priv.pem
index 8263dfabdd2..83032a09635 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn7_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn7_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDJ1+H4Ezf3cKRz
-qkYT8UCp1eLrQnEe3s78AL6AxjjyHyz7ksGYo2M7DNW19qW6t6zLFa+tB+2K8C23
-QKWIbAb6Dztd+IlWiUe+O0vCJRJObZY5igIijdWTLtbP+uQLNGzkaFCWfuv62r7L
-0ixx41nGnus4HsEBKsv55CGbEMUk36UBa/RtZXCOWeTplNGeMDHOpSouxnUYHtFR
-BS+YKznDThlpBySqFvrErNvVwRZLMYR+NaKlzoRPq0r3j9+k2D8CD5TQwX5VyCxU
-peUztPveSwhPEMlnuSqnjnzWk/T6xc6E/bdrGe5jpevTe9YBwssVrK3vnSVFCyUJ
-9bXyNVWDAgMBAAECggEAaQQri9jj+5fd2Fg1Udbp3/NqtyDAnmEqrC7u7y0zH7Zc
-vx+iHnqT/Hs3Dg+gNr+t5ZQI7Sv8yZchEgFOnuYl0yDtsHzJZ/7RFwbe6cpD9g5K
-ZPGLHtNQ1d0+4sMUt0e1iDlGBKdQvBnnv0BA45h4c0Dn/TDzFlpf+kpZucZF7GKL
-Vhtqr8UwAIu8y/mjmDYACMbmsHwrAJdvg7ubeCvtSurPWK4NEwm4kzEcN+S7lhj2
-4R67aXYg/KlmFMBAcinM9o01J8BdKJq5VprTnF3UPceqxorlyqDZYkMYTG96Hzab
-xPmnbWcM+Cr5/oMXzxkWyMZx7sOayYu6aE6SdtKlgQKBgQDrYr6gcaaeQu9okEB8
-nLcKfEEJombuDtBK8w6zknXcSHnd6Jrjrydh/gg1gf2qi11SUNsflHp3lYLxLW6D
-CwLx9gCzEuggyDd89Q57Aijx6zrmqA09vecgtyQdrTdh508Q2gQajCL7D/caEXOV
-7YfzIGEXK9o3tXlxxAZdJPDWYwKBgQDbhSFFqibhgeEZNBZtG1kbzJDJkWHExkoB
-IBciXbvuVBK5otP30Pn9ja0yr1ndk3BV1qRHg7w1jGrZWHH0x8OPJJPFhStEtcM+
-KUds5wOaYwy0KFCtir+dWnd54LP9prNldGXbV7sn4xycnyxJAwfC96xrOb32EOTm
-2e+Q+sGeYQKBgHozwZO6bS4swe4fNdt74OtoprtBvP5KYokGttMzbkz2s44pfIBI
-JsIRCGH/Ipqvz7s0jw5OH2aGEHz1gTI3PUgw1xwg7LJYP7Z34xSpgmhWHzYweO9c
-7+lkKzPdAauqUroE9axypJaDK141QTTNJI9sd/t3oMrbRDlz83nX+9DRAoGAWiFD
-E/NUm2pUHaEBRDLiV0OafuguGDjB0cx3MykBLE1gks+D8E/hFHXDEvhkEVGj4dqL
-AMHZ2LKafDqQL0yFwpPmCEcxCLkIPNF9/fyrwgvA/4c9+MLrAZRPUb8sp4x2Q8WS
-vIg805ev+65u5FtWKHrAVBYVJJ6zHQWGEyShsoECgYBut1kLr7y6HtfUfPkjoYza
-rUxzSD3/XHkmBfuNeFKr/09NihzEBca+aZD7pS6R5MhH9mpU0mYZrksPfgkA78Fu
-nXTlAhOb9Tdz+Km85j/SIWg6QrTtwLEl2ClPC+LL9NY1vve4uu9c1enHwSGLq08l
-StJ6DGt8XtNdxoSvq+GpMw==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDN5LwvTQs8yqCu
+BsnZH+US6j6ojfR31KWGarqEJ4lfSI5kPP631xeif+uKst2RYmkfoNKmD53gn7JF
+Jii3b+7Ewooq94iLlERjvDGLi08jF9gBBp4h4RVEB+EYbhP7RMx3SJA3eoQDd+v4
+WCI1oD3NDlPr5TcgFIuLJtI9H+wuEnU3l9M1y/iDsYdkIaJb5em5RJP84HAl9iVU
+lybAzyYp2bcUFxcFASQVelpfPzjwMS9NwnhxA6QLXAyXeSsCNKqzB7e////LblGX
+ozGgz48zHrB52SPamXxBKAhm/zWZwc0zXxFWmd7nGQ73rBC3oIittoHe+vO8PqLg
+pLGmnijPAgMBAAECggEABiXvbKYrULxoQeoX+vDV4VO3XUcn5rAl5TaorSuVEZBU
+GDAuFwVIQmT5fqHKtf2vT+94etb6iuuZ4jC6hIfGJH/+qjvMCwb5Z9UF0bnuOgkL
+PTSaYj6baPWnRhh7ZkRuqp0zGUUCTiw1kqvnEZzgW5Ay91dX5xBV/mjBXGvonJOI
+z06j/gEW0q1Aw22du0at774f3whdRm807uX1q4Xoi36YgirQTyOH0bJZGWeXW+NS
+M7zdFzZVMOAEVYa7c+q7dHs3gZtLTI1jG8cceDYa7lZX8gyZAkuIA9n5r0a9PaaQ
+EvNsjNCB8i3M2fiMLUNJeAEfsrWDVMl7LV0KwPes0QKBgQDf47qekpeB3/1+TV4m
+wvwDcGYh09t9LhjsVcy/zrriGX+L9oScrZuVTQ2N9NeTMT0wws0zkQCaRbc9jO9G
+opDnjeQs311sWFPlvSY93n/RxiO5QpEyi/lfIljyvr6Cxe5iSJqSZck+g8I/eD4v
+Svym80uhQKV+jsDXsB3cr3uKpwKBgQDrbERgoxBAQImYPU27DjLddwmqIJ3UH2/y
+NkTmKbrIAD5vj7q0sKG8qxnj3Ql+TwT89yGjDNM9J3bdwH13tt4OVZUW3rLwm7I1
+SHj+1f0tvFj7nLhvCC17QVg8mz8xJCufC0ZTvcpg/ClIqPmzJD19nliaQ2Q7+TDh
+crBqOJ29mQKBgDKtJyaRY72/527ZMEBxzf0xSczKWVoCPx3vZcLclixrPRV/HREh
+sp+eqzzAeLMWaBVLYosTfSFuOkWySs6gKVBgK4+El27Yp1TO9YL3g9MFmDxsttTM
+HgvMiHmZdyG+j3CromEUrPJ7fFJFcz3dKUbYtvuu2EbHJRss//VduwbtAoGAOP2P
+m/k9gOBerr0AaSzpwVUEwOt+aZBmsDLVAQbPEYWFl8oqf31W2e5tqQykNLB6W6aT
+vP3o0SARlWL4vJdHMB8lpVCp7rcyL9XofIBe9shmnhp1R2OqZvENpDZM2N+Rs8Gt
+9621JT9F2zIUqHo4bIV9m3J+/Em5vIngDQbBoNkCgYACqCVQSFDeaos3begcB13K
+P+1U+YLJPBX3HEfReGR7gLxKCJSod43+djiaWEqWk1zDaEiN+zoJUq1606m6crYp
++cNmPHvXuzriYTPBNCWPdMWVtGEE2jnlBIrAWmtcswPbsFhSGNJNpu+11iCmjoLy
+DANDIpV+ogI0RsflwI3LXw==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn7_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn7_pub.pem
index c83e1b1a1c4..9f7c9741f93 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn7_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn7_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn8.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn8.p12
index c83861a003d..9d87abf7a3d 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn8.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn8.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn8_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn8_priv.pem
index b0f73f36288..1a0f559f4c2 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn8_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn8_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD1HagE7ILcacen
-9Va62f6dF4dD5F+jYF4cf1u0aNIbb0QPbqFX9zdQoK5wsTyVF4ISyX9M5vh+ZLFi
-EHZlEJvHCSOKJewIJPq3wr/Keptbz2usvKHeC/sQnDuq0BZGMCeMg5Fh8oj8vcxu
-nEUrKhSZ12K1QuSfx8sLuPjGLzVhehb5YxMUIujiB0srOQSDFMQv5iuRLyN3iwlo
-xvt6b5PzpL3j7Za+8/32XBUNXunPKLXRtTmIhYHt45z2Src4tTZmVir4QwYqKneK
-ZIM4ZcOlhfaLnrgPXyj4NYLpJPl6rTRnIUg6ttVgseL//Nuim3YOT09FK1Wf/Lce
-zKyVe8NpAgMBAAECggEANRkwjaiCjKbplmviVuXkbzlqlv2A7k5w9LFuNz3Bzimj
-T8iCcSDfvbqhL05ltlJ6XgGCbzFVwWOkvX6ddzVK2aoUJdgjMnx4R5iLnZxDzXa4
-d5oBYq2rvKRrlIwxVxEVcC4ML3Cv1jhzcb6uiTQ7dDwhaOzNxAMu7CIs2hnd8Xhp
-u2RQFNyEw+ROLGMAqTdiOtfO/Tg29AsxMvMMlFjNM/CA1PUe97NBb8/iz+beeBbt
-+LIF1+CYBzzgp4UD0nB2T0nxcwUwel9xPAzZ6HuYcS/teFkFqfJYvGdqYcTk8SvC
-kpm0D79ki3URNZMcNu+ue2m7wLg3MBmGKh60QNJWZQKBgQD75r7iQa2F44b2sQrw
-z275TLIx0xsBZHp2LB5srFL817SMRbOLjDLEQWCPQpW2JyekaypELGhfpLdYpC/M
-esPThEbb10mSkVVsSPcDA2ZFJR0V52sBUUgP4uwaL5+DvdIS9giBjIB9lCCqewp3
-/PzEq/ekPsHld2oPoqMG++iZRwKBgQD5GqWSFV1I4F5bR+dWLoRH9AazReRPJlab
-YoVnaog/0iy7NjgY/vaB5+GG/G8JAuoKP6Xe1vUx3lXL5WDWvH7Hj2DtMqJdu2tB
-5tDEgZIdD4p1kAPty3Ok0UR0Qwc5JisI8qbNU4DT6nimMj8VQtez1bUI35JRevv0
-y2XG3AMVzwKBgQCadAlmwc6b4b7HVBbZQNdSlOxOEJrmZ62O985P4/mefsR9nd9R
-GU2neE60iKczYR61eeAYnQICYwTonQOR5VRdRSYNdhvuep5eHv8WIed7Th5fZ938
-mNIOq50JEVpFdQZyCdl9VaETXtgIsBjjKYPzM15Mnw5UnLuzio1bouoj0QKBgQCn
-s9nN3FY+DtdXSrQioBRsQIwWOzJ2WtApsg0vz1fE56E3tEvWAChC0rJRZzb1cSHR
-HoJz4HGYTh+isl0clDAh95QAfHs08U1HQ7Y+5SBSMjk75mXOvI6xYjVctBdz0Q9d
-6caEKvhrMspg0SkJDkQbjP9g5ushsdNYPWrakxn8nwKBgQCcteqMlP6DNbNSnDpM
-m9Siu0GuY6tbG5IwNN9ZIQ6di+vRKUwuPQGz/3BBYLCPIfayMc2NLHCqeJyLpgKQ
-4nnotvrz1zF6uzkLYX6Y4azWT0jdECLbovqAjYmZau+dMNn5cSBHRj5lolAqAyVp
-VILgACO6d0rP5b2vigWbpKlnBg==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCMds4PPrRv3uzW
+vCO+aHD8lRW5jwjCQx6Utev7FnBl+xQsmy/SIv96p7nE91SdDA1Mx5/tQeL6duq/
+NSdvfQZ3eYhib+yaO6RtlWGcA2wd3c4SXf0TI7PUG8vb0hGFNocRzlixmgxLtjMN
+jVS7d8UcglXJfFv6MnCax60gsf4fxHAkQNXo1PsTIIaVG25qwqk7YdARZTRcoAn8
+fPvDt4mopgnFVKbo66MVvKmQP9X2v5HXtQz/IJKGG5qQd+RJu80ESsX3ACvW1fVE
+/gsE7C5hfCh5Hcs5hSA0RrcLbfVWEYfJQhtUREmoUnNgHWXPbQUx3RBMhAJZkD8n
+s2zkxcDxAgMBAAECggEAMHpOWseW6adEEUaEhZIxMJNZmJ2rdbRJiSSSSamwaBn0
+GAMFSZ6HkvLxM+/ylXMT4gRhhzZ+mlfRY+V580nwoephbivXulFMSf/M3NX3igVD
+umYS0ni3d0SSoo7JOjMcAcK4LK+Qf87lps84x6yp7FF1PyE680pWP60bbNXRcW/N
+JnpVnlNBKfuztLwbuw2PdhsOc4053DLEnCo7wvyBr3zpVjnbVF+R/VrXH1tvuvVy
+jFnqYPnndYD5ffSuJ/Nb4+lSXfUZwbMHCmxjOuhW+w0FP6K57E7kvYfDAJ0gQBo0
+bDCwEJGkePu7L4yaTm88Pmh44OkxyiySe5r6XPl7GwKBgQC7BSHpj0sCPXEcYdee
+GWmw5fYKhBnGkQ+nqRy3R5TqFnUxPEi2f/nUsxNlmKRxkHm0+FHat7EqCzl9GoP+
+Ly/VgcwSzfD7AjnqNbpnHniEHE7skVa/JXACUE0gtb0MORXc7qL+6Afqq7ZK7KBp
+AQt3F9o/thkZsHOS26HpaIFh/wKBgQDARb/351+/7JyXMNENthqvnkO3Ton/KTKg
+ZTFPLCQcFoQdl3Jih0dD/NhJfnCOvfEBNjzkozvQovHWCFcIjgJFlFR39pSm9HBN
+KfhiTWsGY9lSyIXO/+MlgLtHxWTu6rbEjCPdVoxBE7sPc6edBpegKHqUles1lgUS
+qBpAaKj9DwKBgDorPoEGsK3hrmzFgesKvHTpEb3zmJDKTbQ4RVY8TXUBxzGpLnSV
+GX+usznGYF9yMGi5U7xTpicNlrPyq1tEEfy2gmLW6z0nVBwk2fV45MMyitnJ2tFZ
+M52EnHiwDjzfBI3TK59dTBkRj4F+V+ZRDN/d62Qln2j+GPR0m8edWaDBAoGABa4J
+zbj4CyNiPNUkV9NZVnbGaVPYn8EHzdUvb7dOGcZQgM9IgcCdSlTdzs39ZToXNIH1
+qotn6PHnUvtMFuSbDJMlK6YNHiF6b80dmUnQL5Aji16BFWxZuXHkFmquYKBuZb/+
+DzvPSNzcWciA2xKmyARqGpmTKTIVVEfC/sQYueECgYEAllpHqZd0x7gWMzZVlvHX
+bwsuzd2sR1zQzWl8yeROInmLGfzx2gcGn16hzM3uFByzLvH8vyExVDR6Gw3/LuQL
+ls/5Z4BPHrkrLjU4+Y11lJE8ppC5BBOLCmloTcKI13LazGYUCPvy7u9E67Dgo0F0
+OykPbuYH7aZrFnuB+bmuwv0=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn8_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn8_pub.pem
index e2446c7b513..24dbd726fc7 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn8_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn8_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+MIIEyjCCA7KgAwIBAgIIflL4yIJIGNswDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9.p12
index b7ee9b4e868..001627807ae 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_priv.pem
index 055160d352c..81707296339 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQvcHuq4din9RZ
-WK1kerBFyYDhQHzO/B7epJkZx0QNEk8CWqpDg43w/GHz6CqDu6AL0GO59xZiPBZ1
-TXQvcx5onVgBPcmym1zCHwgM3z4WMlZGsz54Ste076aHazE3AMnYIrS5PtH8jTb6
-U0W5njxVwqK21w4cEba3bFg8xFLF9kk1ha3OIo7nf+j4KnNoYZTOSR+btBxffS5a
-lEVoPaJj2FMi4VuAqXHfqgEOTlSWnmAnMziD5fKPvuPVte2mkPu3pbzIuQ9opZIE
-cXVgt35dmNkTstcfXr8+zzMH7F7w0JjlfNNnyUKIHZR95dsofoROjxMXe2YBvxNq
-AGj1B7oHAgMBAAECggEBAM0KSE/fz5nR861bzN5RIYs7dsxMIwzSXKRIPFc1BCRu
-4osmce7lb2zTDIigefpyN7DDHuKR0jvmWA0batAdHTaXr9VwUwqNT50jDC5Qr1Tw
-Vw0Vjnxsz9vcN9D3Ox2TObGDzc/U5EFWmTVkzK2awBthl6FQN3zc7YTY+QeftMrb
-7fd8Xe+HP1lX/8QmA6opXIw35cwQDPP5Bmt1bw+t2+CKMHLakr0tUX3q9ga9OV20
-fTBuKZj8mRHLn8DgzP0AkEtVTa7CQ/1HEPnSQhNgdObZFphAuoU9p4aBd2qkIJeU
-yXQ1C3EU+gqM25AnmkpByYQfI/M8QZEQDdAR0HhN7QkCgYEA76qEAYDWR5Lb+DZf
-DIY847jj8qq5s7u3GvqynVMd65n+s9SO7FJ4BuTQg4yDTzaBaM4k66c7wsAxJFLG
-vK1mLn3sOHYvYJfZiv8RXnJgEfxvlt37UEXskN37yGX7BdwmzmIS4SEYTUWhpciP
-N/wBHPNnIysxl6T+KBlVuMaN+L0CgYEA3vexPyJPImeVgS2eoAAAEkuv9A4HTyEO
-RWZExQ5pWjGEtTemmETI0Oz0A9tkHI9UPiQyOL5GKiNveKcTi/wdnyflDsVcegz0
-zbF/dUuqICs6rcUt05V6xI28F+/L4e+dZD6dbyHOQgQO7DgJNI/9k98h0BN7WT5I
-GoWiRn0FlBMCgYAPF57OdW2I/k+J1uqvYDivYnJAUs306opCUa0zyQsmTgFDE8yY
-Ry01yezzi8KtF1KY5fpfOJ3DytSNZAUN1qGLpfRdLdwX6hgR77QJTYyNNWdVic8M
-pAqcqM31Na7UFKQA9R4ZPTtJimv+g525Oc5cI1vIVC0ATqyOm+HRC/fexQKBgCO2
-ZqRnGWe4UaD0LqEP/vLvPoqHqLIK6F9DRyaM7WDt54SjGkLvWX7lRRxNCpbseiDN
-6WFfUJu1O0iG8kGMqy3v1OdtwyclZhyAHpsp+GDYq7hjibiHC7fpv8PRu8U/fOUu
-hkbjkkbOoZlCTG8n1QTXS3IpfKtJp4DgAKLrqXYTAoGBAIjsvqAIHtkbYUsaXLx6
-VadUeoZBUIi5C/BkF8ZZLIEj0+bKCfyc7QR2YQ5N6e0o/B0LTWJ5dBa42eVWM6Zj
-X86LjpCoRBnqIYRWYTQ7s+Id2qGPzH89C0rm7Ys1Cz0GTQqPurMV1fSXlhxatXkw
-ZfGWWpKoZIudCV4R95Al3yKT
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDDyn6ihRLcKtUR
+HwilUzSIrpkP+HDGmUd4hvM0yS7kMNzJZZfX/T2IZ1Cd84sOje67B3D6IfFvqByz
+ypzBP9DthwYl9Xo81Yl4ayW1ORNvwbYNO6aiI+R1j7NUi2xFcuPgQO/snGvGtwfl
+OGi9KFXhtaf+ykPQhAaSTKair2iOj1QMdJeGe3P24ereQlCxHGXZQ6I6EfnvyBLX
+jdzFM/Zvb/DTvumhPBvibFzMpQqJq6ztPtw43IKydTT84exddaLoWtqSuc9ULBzz
+3B7vi7woihGC3lmvphkKYdgHOtTzkU5LuQcvkCicoCZmYEGd+9/UsG+wJvQlGpZ7
+03YWYPUvAgMBAAECggEAEHopLO1wFRe4G+go5rW/tRHXwp1Q65XL8WiO05sFMQhG
+FhKDtEl7dTaxdSmHqWKBr26RfN6znlPFxQFaYdt7oZHJQnm/OM44jIOcuWMKFk/b
+tCj+ynE+cWcpKDm3k4l3HgQfbO7ZFYpWLF2r8UdeVIMTyU1YzOKSvwGbM61f0Kds
+LeEr3J0w5ACxzm8J4R4Ny0ueUBz/5KS0oVF3cEVH3xoN3TNPNaNymsJuyDzDzivx
+82PqrymDcj46QNsl39pFxFnOP+onfDZLGHbVJIVU1kLxXIdkDvknV0cOriU3Lg3u
+dPUp4bmOX0C69JWc2yH31Ib1iTzq/pPtmqDESENm4QKBgQDIsxDk0Cestdrn5ZcU
+IiA7o34KAA2s6EcfNOGPiTS10VGuI1oLb4q+WYHjwGJ5rasZKZjbiNET/4HN+D/b
+8HhfJTjY1HG7gqfwCQczywcqDGLXgYDSH56Av943lL/8td3FmOmQ7JZzOB4pNwBD
+xCnR2OoAf2V0L9KYzd7I547ufwKBgQD5vTG/m2wh4DuzuZHQbllHSX0THpR8VYAY
+IE5XFi51q96zYiEjU+hdoJhpt96tgC0X4AFTi4GpXGaqihr60I2Rzd2I3yvgGDVF
+/jC4ARSxW3JCw+d3ujFkMWAoccd4ic7p+NAz6UVmAM1zb+c8NT1GsIR+WZI10aDg
+oB2z4kcBUQKBgQCt5cHgkJ+f3V6UifFSx5LoOewOnCc9R3HAj2BVr0vVsk20tfri
+Z75u2j1aaqqoxZq3zbwdlDmcu0nsfopOdtjFkAnmjoURNM9wg1ITRXqqq1rFYfeN
+mUoMQrM3s5J6U9aZzLmsEeL2aIxxp696CDE4G1v+HGR6vKkcL1029LR63wKBgBYj
+0a885h8ys9hBEU47GisZtr7lLSDAq7R32Lobu06vR/T7NBjfrW/vdtOYe2NCQ70k
+HLn9Widbi7Z+u9mUd5h/ea5Sqp8ZRk/IMyV84wq+IqkMmQ6iMRLC1dWAEMD85p0T
+c9HGUmKym4QqXYOW7LHBoF1bL30Z8ns3dqql2smhAoGBAILSH8GgsMiZ6OBuG6pc
+crUjEgG+/V+BIJ06K/1b4Csax/jd5RcNtzy/MDZKVMoLPr7ZR5lTP5nNKuI0+cGH
+DaDXb5RQwG2i2CWol9svJttx7jdHNdRnZfdzf0bWG97YeJZGUwLiZwx3n45+xMii
+qUBizmjMk+yqoXww5GdUCqNf
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_pub.pem
index 0f42f6c44b9..ce1908c69af 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_pub.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-b0B6ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwIQYDVR0RBBowGIcE
+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
-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
-OrRGyD1V5lKreZE96f/ZH/sQ
+AQB5c7rBRsJjaRUJwb86V+JPTdlwmjQyjO6WbTq76wtsmv02UaMShu03f15sYQSa
+72OMOXOpeYr0SvMQXjlcn2nI5HbK1tRNNXFaCQ3qLIehrdV5Vv6Ow7t9DO/DSC/j
+LxLSkObaB+XiCPJB4JUU0kzvDBkRHWG4im8jUXrg3rbCQpZGBdc3wdlC6+vs01CY
+Lhalstt2wQEm6qfhY8xQyWvzrw1NdVdB2KXSJD0sc5m3g7ii4sOY1EK6aEmIFtC6
+ccnbNGwA+cOTdmvmowZS67vb19jc8E8lXAwH7ZBmAMxDybFM21ZlalXMfAXr1Ft3
+UdgNaqo6TH6ZBo/5huB2Yqso
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_exp.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_exp.p12
index 068b222f9b5..a2bc505ca2d 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_exp.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_exp.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_exp_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_exp_priv.pem
index 262e04e695f..c1a2941cd4a 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_exp_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_exp_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDJY7zT+A3GxZ5H
-Diaf7MrqSsm6/+QtPTn8V4wkuCHLRq/2+WVCaJp+j0tcDsXHLe8NFgxcLFEDcnQY
-baGMB4FVB9KOtRmKBIgfFEAop2ZEcmKig5leQKqTX6ZcNkED1nzJ2NSv95a9M12O
-GTrsaENV9qAbeR/WxjjVBv3BYurYVjha/pS9ry10IjsOjFKIo7WjRy082oB7K6pP
-eQwFh3k+lwt6d6zbC4GudlLPqiwQ199ubb9shT90b2wFldM2l0WRycYpinLJnvh1
-nQTY5Hhzs2X4gDUl7BuLu5sMflXizRwBjr2JNCIAnpl3heO89T1yDJEQdGMkr9hG
-UHHAb6DTAgMBAAECggEAXHkkwrxbLxOdGwl/aN3lSvHucaSAlNlRX/KfUlkOg3XA
-5QodmgHINyb7Npk97bjE1OBz6nsa9BdBAdqNXGwx0eaWo5q60GpGSucUktZTGkjf
-y7nb2bCd4rAABsWO0wFRKaob93UbzWLhqZciPF2f1cA6QoM6wHcir4bXTE5sgcs8
-SQmjrXUPRIQWCXHT7aoaownuvlIr0eNrw++aIqFkuJBbjF7r18DSHTfZT5b4gSnB
-f78sERtKTaHsTbMWmTKQ0paFsVfhd0z7ROruj4C9MAAD6WYKeHouAyf9GSLq98vH
-Uw6TNaj0OknqKPb+2WKQ403lg8wyBW3b+uQplg1Q+QKBgQD1mFbEFjxr7wsCuDuj
-FnKT3qwBg0XYVuOUn5LKY349lTYI9aScGbRoTBxBWhT8N0U6l6h9HrZ1RaE3Uq1U
-sX14ci3RL1AAF3CdsK+0HnzHZ/PGG4IXGlyObU3G3cJcegk9psPcvjsVZjJrmOeJ
-ACbH+GoNrRAcjBP86mbxSGEAdwKBgQDR6/Ucmno12y/IkXTr/GVPoLgLl4uJQJ/u
-OGP4vkqskyzTwiWsu6+bUbZoIgzuG2FmZMEpBNT/Ej7l60n7QUyFBGR7DF5omMIq
-q/dDsRiLom49Nodg2I5UoTk6ZrFkBVrbjHuF3CWimrpE7tk5ZT/SAaeK2fkDVbPc
-K1g7nsx1hQKBgAlts8cLY35xSubr075LGlL69XeJZqELlOkbxzLl5u7OT6jAZXVo
-tzhZ06venXehV5MMR3emOjL+XVYWYnkh50M8fu3M9zFJtRUYt2Ye1YOCRiWQ4Mmq
-RWtiXt4HnXKXbMtlH5fV5cbIiZ7/28Oyscpziv7Dah7uccX/6bvRn4e5AoGBAJiQ
-Um3dX2Bw0kOEY2N25fJ/LgNOulygGRu64/1N31uZAwVLnrHxHelV86muxZLvV1Rh
-eXjkSCCxFAFphTUT+hbaYGSFUr/V9Zepr2UE+n/RJylZzf32pUqgecUWCWpV8fiK
-GuPoYXnR1fpvVHRAP6fTB/8D99QSn0suPUvnV1U5AoGBAMdJ3oQvcRArfoPcC5yc
-eOoQ9CP9M3K4WHE10CgOhqLoVfKR16+v4GBhvjZHcB6K78ZnDfXdOMilfEZCwMPK
-VIjgJbv00QCEZpN1Uiup9IhwlkpsJtyAI/12JCigvtQK+EiMoGvagmxHeMk+dUy+
-YrCBPAfsPyTunQnDRd3Jc87I
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC14H0eLBO0VlVa
+wo3rsAf6lH3qIPSYmtRCDCPdLaSpfkNRCOWwl3LQixqujYjJq8RiffKSsbwCgvpN
+jbsKVBDQS6dm/QwMGY53dfqS+Z87T39rE7c1QkOj+7Nhz62SA43orfpUo2w/C88V
+jeCqKMPvcXTtmT9D8DHS6HjWMfJUq02WyI8j7WvLYhOsiOyZH9SCE8eNlfULqy+y
+nxwQCr9LtQAiBUb66JQMLu4AkRNDR6Edw8kmBJpV+6EWGHBtbu4LtnZTcyu7jHfQ
+ehSCcgmVEl0ssxTpO7x/S+i30+JvJdu4O4hx1MC3swAsEUGtPHTRqdmF3RmJXTpV
+sNACM4mrAgMBAAECggEAANSYREcSJBmNyCYrrnsOzSpPuAtEaLaGMxqXFjpqpFWw
+A57G/Js58NgI7dfvda57lO+L8OV2chjnav0HTYlAuq07jJV0uRvnPz+QhUP4UEu0
+bFbg2CwZoSwwss1KF9/2n+pkRtfmQKGDCOVmzu+Kgi4ABwX678O395/gQK6JSZ+b
+Qr84Rlp6uPSOvdNBeYzboL9McPjlSBHuCmpdxjCDquoYWi37g609tEZRr8eR/xll
+uINU0G7l4fClUj04JjW4N+zH+xWEgYW/SeSMRfwRVPG1KhI1jdTGQq48qkE8yRlR
+S/mJ8PrJVp5vuhDZimmrKHNvw5bfuwTx92EzHWi+gQKBgQDmPBT+Nvw27U1xqOXV
+Mm8th20PMIlk6gBxWMdgPdeDnoX3NNrUKCJTppAEQFoj0NShfcWXOaLkrYKk66NR
+wInEPRckULEeDjvfTZnKJ/Dl/V/12lhrROq7K8L2t/4m9uqiXNkjRRQ0fjZDGieA
+g0RW9IM0ZF2kdXwKvzkiIvYi4QKBgQDKOwU7kGAXM8Yvwhc2N612HG63MBGJs03X
+mjeff2milrsUIyjDaeAmrKL1ShVwJI6d8GUEZmdHyqdIZ0u5RWddByyHSOzEGXsW
+9fKOZYplktrI3Ezw/z/CA4TI/J1DtRcDgW6uEWcRbHqOB82JCXzhHCBEJH35Yy/u
+8OttN+tKCwKBgGHOiliIgVLQMsMjLigI2eQskO8P/n4pTnDYdzJycxiOAnlHMeNI
+/XQt4SZ9NA3dDEdih8s7h/C/qS1okSQMuDnufeNGiEetYk/1xmxz1UnO/rIRxNgl
+GdbTu2pWNZjV8k1xRilOkkvOhjyxYrCcky6hhw99x64y3rQuEhZnZcrhAoGAZt3O
+s5WkyyiSzwgzNmjr2wBrcNMKmLiUB+9yC7eLzCBP2NZpjbz1P7bgzVR5wylVQhFd
+0Pcl4ea7YKDqa7tZ8IANrmLxzG4JpoxEbRpJY5FnqHQmzw+HJvETQgj9FcuvgSD9
+Y52Gh95eGJDvg51H4FmmMAM/8PL7FteFaXDgRjECgYArqo0DHtxgCtzIA8z6DlpS
+4SfSsKJx3UYwXW6H4/Wtm2XhToVe5kt81lGtblpq4xI7HkaHBMJXOEpqpH2bnd+s
+5ZGmn8bkxg5BkpldbMe/aEG4KI56GPeC3le/dZOg/yi1/o8fonT2qKdbhtdXrqqt
+BGLlqGWAtFks7jjEJcxlLw==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_exp_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_exp_pub.pem
index 941a58fb5ba..38e425462c8 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_exp_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_exp_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-QDpZwX+kHXqXUt5fZa6UQNJkvhV4HYRfmGBnNA==
+9w0BAQsFAAOCAQEAEzkThPh7m1H/fNuEvsJ4q82IOWfE8oFfbABd/QPdw/kvI7xL
+bztQONjHobj0BDk9eFj97whj9eUufhOetYT0nRK5CCzZYq5PtUa2hzQIIQYG20IN
+CqInMxMQjCwmnxRYptBg3orvGAwrkNvwvlvW/b0OOJFyVdeF3XbOTclHFzVSga08
+xws2nH8CcNkL4ZN+MkScaSO06Se7pZTQosIxngQHWhfZrMcDHjSu0woKceGeelUt
+drjgeVm+NIBz7RyR9LeU7sdBNXsJQk0W8motZcfvLMnYHVDbtkZ6zx3n/v9UeZ81
+XDhHjM/CWJCaxceZgxp+TuvawcMSxUpaTSz3uw==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_priv.pem
index 406c9f08998..d78c442a8db 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDkewo0/CpTg+ZA
-LLmYxf/UFlBtuvwDcjHlwFmGEMISuItNiCdFaRjoa/vHamQiBrMpYUG1ZyVOfeiP
-dh8vCU+nT+4tIzhe66xvyu+aeZ49FZwLy7uPk2eDJI9ojjY8gtNx+ax+b1gwLjhq
-Vjsg3peAQvhGjael385ELVM4ODDnUTp4bqIOne1yNZX+XMoUxrXdYXPM4VbNZm9O
-Xyokv6ZKrWKw2uloWYYcgqkELOcnl5qIxOT6dZTdjqtwDudDMv/4YpOenlTnWJim
-xXO9sQmYoPtAGxoOtXUhsONcGuxbBpEB9GJWc5GuON8+0GyTH47DxvkWQTnV3KOu
-/wjIjTjVAgMBAAECggEAM71tNUx5ZUo0RQobyW3lHikjc4XpdfpRNF8XptV6rXSf
-DyKrCfvfyRpS/Pipzk7IGbHNiH/gIeM/W+V68FLid9gQ7qXQKSajePlywv+RhvGy
-0bUEN2JBCaCo3Rt/SrqxmVjZ6BPc26RL4EDAyRO/KSuBP7DqaxTAiA3fj5ah9G+x
-7OU2l/zO7aig/3AhTwrpYIdbsaNeiVCsqt8kLcfrI0Zi7+cF1Ff/em7V+lQgXmzq
-79CB+p3DPoqcsTY0BFrxkHt+lGql/h7wOobMehhscLs49IbgqwlMyo9LTGnYawMS
-Cs7XeNA5M93NzvKIPUaU1up+OZCXISKDy4ne/Ia6rQKBgQD91fYOiIzZWy8I/HI5
-mvBI0k/wlV2gkNZBX1GXXGINu2wjZk0OVpMsFHyvSmYvIPdCzPM3wCdGfjEEJdMw
-8ygc1c3kHbNDWbzclWIYDU/nvEv6Z2ScyT180BefQPs/3SW8Ykmn/l3WmmFiwaj2
-UBcApyeXo3DHwfkMB9WjSLXm5wKBgQDmbbyiaBSDOHIOQcWRitvr2qLnpMErOmuu
-BO2/RUAZxbhD5FEkX5/1FGuaPy6il6wrbJ5uk0zyIlbsERrL0CwuIOyAcs3gFeXd
-9Id6hAPw8Dn++H1E9ARZeG0GA0PiKEuEkiDHWy2Ef53YEiHesZawaZn2PeVbd+P9
-hxVX7zV24wKBgQD0348C0DpIiQ2j9p1e8xhwt+sEZaOv/WmkIQc+JJI3OyKEN/GI
-Ln7F3HG4TOas+nluSPctRkLdX2l73d2R8FE3GA8KzJgeFhj7F2VNXLJEFUOaqlnG
-YuDdYoYXTQHUx0vbI1p5JQtztvTR549PJ045hAfO4o4vNvJB5+DyJ3fL6wKBgDJP
-gWEgQmJIH7b3K1DUtaGwUeMruLVcgwgysUoSr6Uw40OHhSPg8QbMl5XM97yuSvwM
-MidIaANx9fKC5YvcftjvfVOqPUMQ5OhqLG5WhpnDiZYe4RL+CDkUrxEiA19Mlvhy
-A1AjmzOTvX3gr550vcb0t5Xo+7vV2GSRatqRMuYrAoGAbYhA33N9eExlOAioy9dX
-CJqT3n9VQG8MgVwsJKZE9ev1VXvXpEfIZBj3GOKDQQUhnOrbKgNatn/4G0VXX0yU
-gM39i6BfTGkXFOilZwZj6zifouZ7usZudu0aealA4EqtiwlPhM3D7yBVjYZhy8FU
-rXh6G115yeaWS0OyJG9hvj4=
+MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDXsmYx4MCVXnAB
+TTshaBjgDfJO+4UDm5opSDQFVolup7sDNHlaaL+pmZ61M8CCqPaPc+r2KBcHAcvx
++7yyyczCRlKnWH/awY50Zh4YSipJ7tb34DwIG6e0HqxvKOiS+MLS/ksRHwBSrUg7
+DKcbnkAWOwC+Fbe3maOEYMxZzIkVcmA8i9en2Fh7CDVmNDVFejkP8DsQlGTq6yjz
+VPZZaBog9Z5d9T5oi/ocbNCd9NqJ1CY1oXXlw8vv5ryUyfkWGU1upxyZ9o9dliR4
+yN8V5gVwKSmGWtvib/a6zdHhy37g6k+c27tfD37WiNtgLsblPQPH7/HxrSs1zGzQ
+W8y1wy95AgMBAAECgf97VCXanwd+YGDqXZ5Rm5OdiFvjjSygw3eB4ybbZn9uJblo
+O7inWP09m/iC4vRPwQw5Oa4+0O1ZtE1ILwfVskzBSDQ6Ov/ftIwfQcQzXzSO0WFY
+mX25pRZehqtRY7KXVmUO/xcs0uz8WNfT64gg4nsCOvpRtVk2QUKdjjtJnQlEmPRY
+CBY5Knox/1aDVhSITiD/IA6I6WgdFc+j+120+oi86zOzSuhD5ufneVRd01veCv9g
+7kTPvYRxOWUO0E2RmiRv3tRtHfQWFv4gSeklM8I4w5E6+fu2mtam1+y8b7j7ZX7T
+zU9GmvUhUgMNQ+Fe4tLsO92ZKal9IqNrGFpDqvECgYEA5DRyCUOr1ZMnopscoHgT
+oEDSt/qxOEuAjNDOZoHhXqchB2P/duyLxE5Ub+7BrqxvAjsl5xU0Cs2h5jkktkEZ
+kXAJw8pp6DiM6rTN5FgWvTH4i0wyFAdCmbVNnhK/tUzI+y6PgjpzLVyv1QmVr/Cs
+QmwEl/+R/AKSD/Nb+kKm9GkCgYEA8ffyk5Mr8RzTneysS8uiNzcraQJEV6VVUTEZ
+BgB16hmAvv5Xh/wBqOrxtgFY0QUi6taJSp6zeDvcn6XUSdCS7m02WWKNhOdPe2j7
+IjUyC9G3b6v7Xz5+YSnpAStTkOGH5oMzt5YAsUFlWML8BeJkQSWZ9XUCBn2xgUdG
+ngJEwJECgYAemNWNXnBko2VWDPwKm+7ttqNKHaezR5RFzR1Payyfd0MbbZHsDQ00
+VdhGZbm8RMxhfTK4yAQBSs7hQlokwZe/A0mb4cDPbP2f3nwYmKL73P5ZFu9D9jE8
+0K1Ge3cOxOvRmc2OBW4578p3guB6BYfjI/59rruREXsp/lQfut4NuQKBgDTTkR4u
+71UAmiLMXQFfP9cWMGAIoqsP6YSEV5Y724J0dus71BhYKHScdpDp0l4v5OOoWujz
+pPMG/q/MIIDNDIcJSOhS39q4NV4YGVvqiTaTXpz+yy6MEkNcRwZ+Uww6cNUep9fY
+4+XPBTVPvH38Yy7l6qrwFLUeE/bJfN1aWXBBAoGBAKEfZxH6K43DQDqnMrTYuwMu
+1Jx5rtXsJmT0PWJ2j4aXKS86CjXngUxK3kjss5og8iRpq09XqSo2NNtTsdl3Sd66
+Zm4N+hB+0qNW9Hda+wR+9md2j4MfTCb5Z85ErxWtg0kw2hQ0Oh11tWptsKKO+xhq
+JdgCZKetX/SCxJYYvBDs
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_pub.pem
index ee6a9a654b7..2d0f4276151 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_pub.pem
@@ -2,27 +2,27 @@
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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca2.p12 b/cpp/test/IceSSL/certs/s_rsa_ca2.p12
index 51b6747e4c3..63c24d98a20 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca2.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca2.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca2_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca2_priv.pem
index 5cbab3744d0..97a0b6944ed 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca2_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca2_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDu7CjZJ8mCD4zT
-t/OZUb8Rpt1ESADI0UeLbWCblc8d5CVbwg++pZNpxM22u3jZqd6ZsOMGv4dsrqzQ
-JakkNuILjY+m0TAFeHxns0YteG/YFEzBIj+/4RkbnkJWtcB+1YDKjzGRhRcPA8qL
-vXuT3oVnLaTl0fPkj26Miv41hOctwPQMt73BQxypcXZP4fI1kubBwXchbyD+ZU+6
-a1HpW0buIcdxRNKxn7mjz08l8yb7nEP5bdfLBjJltY34l3HBr7YatdVZvwOm8NLo
-Hmvqgj+hKAUXjJKCwu6FSn+GnS5/0yO98esKYRbRQr8sUzkabTv1EaNMe6AbiquA
-zEpNyRxdAgMBAAECggEANGuWLsb+/E1DHbSvesUnwcy1oWSW33ijVOEDoD9HOQy0
-caRrZe3YIQ2wANazFjaiA2B+/x0IrnzIp8aLjMmJ4PUHPpeJDLo5uVrpG9Lf3y3d
-BUbpa8UMiDW54mJwQKPBZS/ztTTZMU8oom5JbdEVveSS2GWvOEeL/sQEMGPfgPb3
-RkpepzVoyPglhGJahLMPJ3c14Vh18NY6gBN+TFEL16UGCXFNBxSjW92bTHRrPcwO
-0TV7d9QdPNAUw/A+JwFrgiv9ZGZYnWUNDBrUI3ffGLFuRYSxdijkWxdqz79b+XPO
-HumPOUe23Mfew0WqJhht8K7m2XDSlBUc/cK/Tg/3dQKBgQD9bSWVtznxW7EgV1LV
-42VSnYU+Cma/4cvxAY4uaQyxFn5AdD1ZwmcExRBqpClmdRGOQst/1dnQR8iFJS8I
-KRJc+bb32FGWCgVUKXdqy8grE4IoeJ1U6GiLRZCzaCf05sdX0ONjnkbIXtf5weRR
-gQPKdqpPmIi7iV1LZJxacnSMWwKBgQDxWU5OrkrCHMrQRe+3KMGaAec0ODsLL4Dv
-8Rsf6IGSiU4A+KlIQJKgGhqdU5eoYTzX1qPTuUn9Xegp7DDGMGGgEPacsWnHNL0E
-+2/BSc/PAHj/O3KmgVUgXE4Ic/LMuzcjdEgoQ54/Vy6e1R+ZbWQHxeyPiQMTfE1L
-1Xm25+43pwKBgQD0LjhqmxK/VaPDD6CG6gV0psX9UzRRahSA8Qi3+wv5jTy0icub
-Ms7kL6RzvB0P1XjG4+EEGV83ahLxBzTb3gcNgqYjBFEICju8LgAb7KG/r5pXuG+P
-oicpGiwkURU+ySYFnQWbtKNq6MecpI+DYJXwfIn5C3WjjOVRgW2NUH6vxQKBgGgx
-Wtoi6olUrsYteyjCgpo/OhZUNEFG984ec8xZrx6ZAkDvGP3lSqetvVGwVefOWtr/
-geiUtHmagfEfU4ssNelJiX3qJbVncjblacCzYfCGzrW5b2yspxh6YQHLNMXoCQzY
-VZJ0ZqwHskvFzIeLL0Uf0FnDF73gyunzNkGdbT0/AoGBAOT3eHtkQLERNObzUuyr
-bqdAbf5cK/ovics0a6TtFqbWdP2o/nKYYI8Kl+rZkxdPaIR4CcKSRnuNv7W7nw1Z
-PDUBy2MKk3kTPmu60tjJTWHdyTqxEnj2v6RFp4m0v+K2Fn86SNtcnE4TElaVqgUJ
-BJ2QQ2yEKeFOF4XZ4PmDjy4P
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDPfbloOIJ2BOR2
+XKlqhgo8DG7MJt0GopSROwF16CGg5T+jDeqn9nAFs+ADLy1fdN0V9x9pV9q4jnyV
+XFPX2545Lmms+X4VYI5G4YTkGUUYkur+AE/fwbBATqclBWix8QmLpGlIfQAGGKOm
+JPnCOyBiLHg+jiNNs/moJ/UYsu9HF17wUh61xojC0orl4zDOAXy8MDjnsUTygkPx
+dnUvBfxcX/NFe45YlHM0KQlRF5Xn3nJ4/5sfFADYYvU6gp7YnJLyRX/LT+vJilB+
+M6HdIarr+xZcdDwarH0QwN6aLpDEe/MzMOo0cJswI7/mM0DNIPD0ec4lTe2JdSYc
+TMuf1Qd3AgMBAAECggEABjmT4T68xJSoqVe7VMZOXUx+2yIZWcnGjPAzvtlRf6Bm
+adpmMqwlN+PpxxQDF6I2ayJzBKKNncwsjFXs8ATB455IWQJSguABig/ZqvbfyKPJ
+ErNosgz/YCvb6N5CLKskvwCWO1tWBQN35BP86D5aM4fOWGDESgr/D56Z7v1DSiMp
+WJAEIIjQD+eM9CcCFcvQyr1cgDZzYfEbf4gCFvJYCCoGBw/9OJMP2qQwXEyJQrzK
+5R5wzB+XfHw7rN/gXQQsm8EdoXGiE0GX3cuMcomzHAJMtnhKSduQIEtbK2rjO1yV
+zQKK+lpZxRQwvf9USNmZAmRXki14CCDbrWy6ZO13RQKBgQDbSGaVJ9Eug8hSYIMY
+/ru8eagrQ4hovzuhNZ9/GPDNZy250MrjwJNrPAGY6MDMiFtf+froIHLsBYEh/uRL
+ssf76fj28HzvMX6X/by7gCCHS00rrDluvgvYbQKwJ3Q9Xv3GFmAjX1/SSpZ9rP4j
+aanLZ1AE4SzCrbOzk7UINuQ5XQKBgQDyO96wC2UNxHCDbRj4sey5cFI0dCSSoMyf
+OM/IzafFy+Se1DwkPPSgtsPbBfwBhRcYaQOJzIQCm2ixsRN/c8uRa9piMtQXRzYh
+DB4oK2DMFShMzepeUrrQ4jiC74qQu5oxKH0wLgQpK0I97I1gjLu3d2rDGcPfJ5df
+tEQyYyoy4wKBgBQHXudMxbx76PYtPowv6DHk4slg17rJjMbCwRi4zHXWcMTCH2YC
+FvT6fCLdT47e/YmcqaA+JoEMV6klQPDxGXcW/diASskGOkvjrzNpFo+E/z138577
+2NUhz9cLI4DfhkprjMhuU7A/g9Ni06ukYQ/lFdf8QTxe5UUHvsdLTDk5AoGBAJNA
+H8PGeXygAIF0LWzow+2KQP6P57eWtizIHU+E7MsJggWnIJQq1c5oq7CV97Z40CxP
+kg4PW+Q10rPJ3/9nRcU12gA9w74O1PHL6v0iOWp2JhRiTGlgQx49lnrJ4OLQmA/v
+/AHwxyi7mj4IcXzSsD38AtNs8yvRZmyQKbCzpXBfAoGAQyulNcCcYuwT7YraYhgi
+XNxgz544nAjvjoeqBRspkVszSnsRh0PMh5jqdLLg3nKhD44aMtvpHlo9736/IGjt
+33xiG6Y2aUZRFXUEE/7BvMJgZUDlNbSX1jKDuPyBHaqnPjaKe2CdHyTrdPOzisN0
+VjPo21PSJEorFSgKnIplseE=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca2_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca2_pub.pem
index a16fe079d78..5d5f629d669 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca2_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca2_pub.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
-s7BIMkk=
+ZXJvYy5jb22CCCXzWiDvCokFMAsGA1UdDwQEAwIF4DAXBgNVHREEEDAOhwR/AAAB
+ggZzZXJ2ZXIwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTATBgNV
+HSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAQRSpgDQ5877+uxhW
+q79KlolBJj9TTFr0ZRfAnIF+tebmHYH4bEk5jG6t6kB/MCYctpJSwid0pYOjNHx+
+oVV+YgxAB8xzuuxJ/vgkXjbVBIH2iYf7yHB+H0G8WkSUC9I7twPfyaZJZPwzf4nk
+S7j8EepJWSmZTa4jxrr42nywwROgn75J0QldHqBGZ3MhK2ee+s7uHDt9kfSSdDuu
+IqMv6yULobSyEqRJNNUJ7gnFyAvN+ZrvcX3AFhVMMZbs+dq9CLplxzOjCj3R5a8A
+56c7ZHjqnhgiccSSdiEIPmpngBwTrRg/zGMFp/4MCqM6eskXAhKEhNuUYancgShQ
+wAy7uQ==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3.p12 b/cpp/test/IceSSL/certs/s_rsa_ca3.p12
index 1f7436010d2..50ddf5f1ff5 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca3.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca3.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca3_priv.pem
index 7f28500d541..2ec28f42a6f 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca3_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca3_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDYdleCJVKqC10i
-aEGidqFUAQPelLFRJVXTZQh1DRT7GA56zxVY0OLEcCQpQWgAA0wB1o3ZWQQ7Skhg
-UG80PEqJuea+gnvji3GDxzLRmVx2jfkIKKLgcN60QJYHApT56gxVHSutDM+UgK9R
-t3QivMORmxUdb5vI+ZRExOUaz4zJzLkyg+dsfiUMljBccvurflIZAP5fWSeqW12P
-Z4/QYd1BG/oWr9XA7rmaJu8qfzYyvHKIukTqyIiOqvfY3dZl3SdWJP0u2sljFuYi
-N/gZ2SvSV7mAR/5vuVmpYF+/SKYrYguol4kaGrISi3UOkUiDAxSNXXdu8ArGxlQQ
-uJsWQHKxAgMBAAECggEAdd0yVv5FnaukYcjM/E6GF7yZw8fJKTsgGYQo77tY0kRO
-FhbOM9dBst6xAfnITEF/UHzoLhHnWPVgpXkGpDW0DHw6JT/df4/9FlkP1csg6rjx
-gbzGu1kaGqIUTurb/ZywbGP+1TJlkSHk1KUEyqln/8+m1qlf9TXYwv1HFqsuqO4d
-CZxFkIPPVe46toOL41YZeSmPdTecdd7eWa57s8GNYHkAOKIcHVSbPE1IfduYcfcS
-05EkFRzsmxIR0gKx/Xz6rLa9Grg4lzuX+2XJMmUACDyE28i26pqi1xafo4MCdwDT
-CGqfYw/PBcJqJ8lIa1VcA9ev1ZRx3Y2KI28f1j34AQKBgQDr3O5rvA3Yic1gT1Xc
-sFiXpjrCnTfJzq4ZaKQbOLgKJZLK5B+qk5OlS3oUkIug+QyWoCaorZJEU+o2WOtc
-zIvGXMtnRUBXwO0YypAtUKo1Ur3alQ1q/h05BwdwwozO/qdShhTHScGNhM5A9mUY
-007znuwSaKZwlZkckdUhGL/4gQKBgQDq8WJTL99x5VXNtuG/QOuvkE1DUjl1dsJr
-oBbii3kexTPhxb17D/dk6BPqVwETJtK2E3ZZvhkQTDzvwaRSnV06mJBquPKb0d5H
-9zRJ0ddGAUAsz4pqjrtcAAGbmq8Dh98aB9y9kbYuJfONrjCPlRcRfeTf+6WKIxAM
-zAGE0CDiMQKBgQDB0gC+2X9LRRpXHXrCasuyevBogseYd9YLnTjWAcsC05OIVORM
-yQ8YUyjUA2AqfN5CXQLHtDKxIYAi/vkSfigSbqjbiUXxluF/cN3/zvy/6umG2Nt4
-469h8IvFtqn9Y7heET678bkzMUJIkfHL78E+Y4c9LXAwrk5u8swAcZU3gQKBgQCA
-V7anzNoaZPaXdxUhHjzh3klmwk8jLOoOUxjNTvWuannqFtRompNB60md1UOAC9BF
-qKIZajBU5+DN9JFolBBuxxL1Se02U9JCq/dDcD9SPbKqCAIMLcaJ/nLiZwC+RAYL
-OUpLwIKt+QtwVTyv4vkEFCrodJa8vGSzKOqXe/7KsQKBgHG3NlwMPNJ4Tc756lSB
-hGZOnYGC5ze41OOiBQ6PWooFi4AUmJjna7e1e/W5rRapheqU+Dw1c5hIDKiovIdB
-k1rOinT1Xjj/eEthzKWvzF2XlPy8l+teiLKrU0rcQ2PnambEDfTVHVNkWS2wQjJr
-QKwwTRvMkMK/QiG5PzQHciBA
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCcfpLjp53yrvfQ
+2NYxJ266QUV7MB4Fx4rmrfw6bvJT+7p0MsUCwLNqOwWVIIpFRpiPXuIoHUH7HXwQ
+rDRmkH+LsM28jM5ap7RwnydJNe3ZIU0LhkDZXxBt+oTjLLFKmxeIN63Rw4PVhWF5
+JNXhdyY6Cgon1mqdxQDt1YXP+nKH6RYCwE/4l7fOmb3a7UVh/nacVlGUSvgpPYko
+r9vCRKwE/vTW6pLFDA07B/kXeIEO74JIeapYdgeO4spW6digSp9YkYOkovCwZ3yo
+YKB0x55y72k33B18UzY6hTX4u3xCGJ2lJPPboSKBhCGiYUby7Mvy4bFgVdDaHR4K
+vi3wRwGRAgMBAAECggEAAKD2T3942CzVam+VmDnWpT1OBXk/dKHdLDE4o0Y292kK
+ci0ySxEZw3BwZL2OSqoWgrR0k4lPDp6LJSDA/uS/m3DC2doludnkxONRz8atgYbj
+iatg2zK5ZNy54BUJ0xE5lGq3WkF3KBJmrms8SAEv3FG2Idv33pGIH/yAsrHImCTR
+LVRDsrOfRkKFnS520UEvC9jH39cnTT4Rp9XRmQYf7l1549pddmm+ezFBH1ACBzpT
+GFrbi0uE90Gfrn7LYZdmPhCrdQs1j8jEC2mr/pon51xAWzHy+ZIEUh9wuf3q3Njv
+FEu1hJXdz/4oXtkwfx4ZByDbwNB+voXfYHu9UCWvwQKBgQDS2qYz/vwVZMOUIn/f
+xtFJoAPd4ouBAdevcKddPuwUOrD+86+U2eBnQNK+LlncfF35X0lc6kD+v9leWtFO
+Qdek0eUF4tbkaDQcNmQmfSVA+c1wNJEhw7a2JSMOcOEmm5YWrKnxchJtVGYalIjM
+0PHEI0oYw/C15DXlUm7ExnGl0QKBgQC+AFu1UPrA+JZsHszMRHb0cfKYCPpzbUfu
+l+nvJAicLNU3fzUYQ1Ind5QkTVCf2MXXut8ZFepnwiDgWqsaP40WJceCeKhG3Xvp
+145XELSHJEbEgPXemJi3m5nW5s8c8WMP1OVoFqp0arNWOVr3ncmMa/0Q8EBYvYWc
+Jh6h93XPwQKBgBmGuuRElEQKxNqkKpLuwNuG8bDlAjqF/JSSsNBLE82HJXJYEgOV
+NOOLJ3g6qEpXDBFqhbkn6uJsW2Ze3EP7GJ4tguppgdZ4/wYDV7CJKf9pvoM8+ez6
+gp4edNYEuF0yLMNl99TxGGX/97R0EvOov/wcwZWp8vQyQowWpK5Rz+RhAoGAAs8s
+i/TDkGDckIKwEoEcpSaeKKNRWK2P97YlTlThD7YV/PkThuVP7Kd2+EZwX7yryDHK
+JKvPSHN1WvvcNcokwuQSHBq+mjWiJGX8g8sKcEkYBsXFXOIyt9xEHQpSm6HyDgTe
+03gqUwhU2HyGnMyncz0Rg9OZj/ZVaGaj408uXcECgYBGLseJRh8zxfIAF496bDcy
+298jPNr+i+1sNUuoQ5LkWVc3UxIDKf4zruhHAw9QkiYdW6UFCdpD+FrESzX6Dz9o
+sRNgBdME5Gg00vNsnDqSaUBiZUmaDbtIz4TyO9nL9OoRWHUDIW5PcKjruQnqAiFg
+xtweJQ+w68whax4tSI+8ng==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca3_pub.pem
index 29770144830..ca7dc31ac64 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca3_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca3_pub.pem
@@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
-yEauD7Avxpdg
+MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAt3nCUPeg2
+4NCplwbYeSRe4+C8KohLFWAA+1dWW9rbckOwpmEQ+mjd4xj9OaX/qy48Ygxu18ue
+W7lQsJf6z9rOxBr+kkDftvGNLHe0Y8GIC7wCtazNeKPUEq6S1NRMarxutj+xCiOb
+7MUEO6k/R+tBs+TdzFqdjPlApzrKRwhHdcFJP5kP/Txo9vtPeBv8x+XqhpC1K2c/
+dICnov3Nw+fikjhlDxjUqKbHoOk8sb21ng4gVodPKcQdOFlVidQu11nD6mNlYKr7
+kaDQCANOESFTYP8nKLVxn3MwWYVx0S92osMz0OqnzoABdW6CnSznshYknoU5AHWa
+ZuQ2CKaVV5cd
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked.p12 b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked.p12
index b0fff44a6d1..424619a5c6a 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_priv.pem
index bd4383e9314..0533dc3b11d 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDeH1VqquDmETqr
-iVcVfYbDoYhynUlr5omD4DTInjn5bQkguLU4kKkFE33LkqvOBHjQtqj1avgI3olo
-JGMl2hPr9kU0B4OKrPbTHDT0+oG4+2uI/e06Wg4zCqyPiHSZXTTVpzv/ANq0ftJP
-gVpSuAj2mxqf6gpCAPU5bW5VfaXsH/1KidmbbRq3X3GOrEsHyayhc+KzkP3Juyox
-551jzoh5vecaSlTnQi3X/hL3QgBFW0ZUMxjIstHYk4+XjMMwtmmWPR/SSSc0qBMs
-7aYJD1Bxyv6uNYunwhYi9mUMMqW3VDv0TV8bGviGS+7cOEr0gA9kklAHkt6XCZXg
-OpAEZisdAgMBAAECggEBAKM8vcZFTEBn2wkjRpdph7ePp7orc0DTzK3ZAJGLDqoK
-gpHEjJHEZiJv35vS72XZDXy9MFAjy6KhALRDQYYYzVk0xEjnWLl6QW6GJTkAPINY
-af/kNQoUEqlaJ9TYAHCQ+fomC8Zst028ggyh0GJIE3ZAKIHrOpylHZKVpGc5js2G
-mjEZDuoIH1vZ3boXeJrg4nv74Hk7fZ1zfXUEMEJw6mI8LLKIVbWJNwMayKSeJZKn
-a/uyV2B9388Twuz92fKsG79GTBedz8xrb9YXfXpyt9XEvg2FN4CL9OvJaCcEjOdh
-hSEAVkjApDXAHmFnO0Q/EzTFy/pdrV9NrDjnKY2tFsECgYEA9hQ5sLX73II91hix
-xJ0rQvLmntRFmPiIxr/oU2VP1P53CxdT+0kkPo/GkkDyfYx3fbL05Ovn9asHe1aP
-gfDUJi7Ia7gD/8HpRFjPsB+RdQ3x3+9h+Mt6GfUFjUDmzYrIAgPxYAEaerSjUq++
-zupHZCt13KHzZ2+v9zav7GG4zy0CgYEA5xPaUeHGTSjaDh9T60sbcTrxRmrtXKiV
-CmVKTrdPzMrI/8pRMTo841OKGSsVSpP0MwEFzT296m8LXTvot4nUa4ms6SOT5HrQ
-DKHDfHKSXf6dkDQ9WQKbdYi4Acb8tf3mCTSjE4W84D7NCPV3/31amWV9CT6cTeLN
-zx+8SBHmwbECgYAoMfuOatt+FGQnYZdAB3A2mlijXwcTSp2E4XoAjU7x+rLVQ/U6
-2aKq+W81GpjBez1VcfLgpcwY69voAKamUgFFT2T7e25jy3ff6yXZnf5zgVid/Isj
-SZFjRgunHA/XSTEMazp1NRjvLCx1aDGhuND6gsLYzDdnEO5MUkmAMiIu7QKBgCNB
-bSrXBplZJUPIVdZtZCd3db5nrAVaFzs5zweJglxdiCM2rAKVvxpz8Xr7jskNH9H0
-Uv1IcURmYtZ7wHrYRZeOrtn3OqY+cqWqvJetJ1W99i49OirtceiRznk+8emWblVz
-OXpOCk4wZrn6Ma/CYWNMD7KsYc6kTwBN+D0KtilRAoGALA8tzPn/z0dWxdU/3fpW
-6s2iFjuECAo7gNooV4rRkZpIh5plYbNAuZOBvJGDq9AOmd95Z9h/5XhQXv0kADlW
-8M14P0eJZYpi+7Ve/KC71wcj4Rc1YpOUWwC/wLzJl36b92/+ejbXrPd7JPKBTpIP
-6J9JbUSABfxt5myth2opjDA=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXGHqwkqDEECo9
+QwYcMhbVanB+3j68TI1dTOdo9ZuAx4IEZM9g09lfOq+fo3n7pYbs+Pc2mEH9M0Ns
+CtCE2V1VC3+j11SQKPuddtakfjz23QJHENFM5xnL5w68bKvVEAoMyyDzOBzNo7su
+o1T9YmBxfgo0CQDl5X8qx7HvienVVMEgV6pZQzhyndrFbLSAKFPdhlq6A7OVya1z
+IueziUBWDBJMgVsOg2PWzN617/QwoBMPfslQCB3Hr0+9EE5gvDII8FEwFnoAfbJH
+w4W4A4tn/tCw623FlN4dazldnzh1ylWIcPyphD3+IWmfxGHlAwzCE6BhFhjLbulK
+RNsSTB0zAgMBAAECggEABrsc8BPAHKvZrdv4ADaNBNnWhBhTdCD25TKhVnAmisCY
+fqidAmO9mbvsCfEG5Jp1ncXjgWeb/PMVLFF5A4oJWdoGyB42Eqv4tYWPP0muXpLu
+4IqTwFjFMeuroOI4b2flArfj0mHsCo8iLgwxo44H3NZwDuxdwWANX7MArrqWk52+
+5wgzG1nWKQnlDhuZ9Bqk7hF+Q5c140mUtsu2wdi96MWw03t8fMPOboYYocXpOXNU
+yEgdUAqfa+Eeyn6XHjqQn+npa6WR4ALhkitlDtY5sjD+ft0gJwiucVxq0K3eeHS4
+JNdedayVX5z5NkXbEB2X9frBlRYOaxY5ZMtZ6lBnwQKBgQC64tgCWRwOjFn/iVKP
+ik5ZPLFg2n4pLwXKRtOUCLGErNCvgEnPuO7RwC4hv09jMW/0l76uROCo3zfCDbxv
+APJ4zB6E2lMUuUYliIPrUf57HbPhctQzZoiZCeFEkGAX/ciT0zVtF2cCoBNJQFF/
+JsWKoV5S3TIhq0MBmAS+q78uQQKBgQDO+TnYh87+gXcDWdueY0Z83hZnmujNqC6O
+vfaKM/CzgUg5LOhSiRH9FJnQZbjP1g7oyzycoVKOxnwkXRadJKCnyjXc29YdXkzD
+PVgipIPmHtPXGPHqhNryx3CDBTfV82iamDUW6SOVwTKpwW6lt0ygotwCxshudEAH
+4CH46sDWcwKBgCKKpOQiNjZWKJg7eGABbyO9PQequqDACTDu0FJPHQhprJSTgJD9
+HF72R1CDfJfX3lp15Y9uOZvczgB263oU0bwT9hwWAj8VU2rChadr2z5EKigkQiZR
+8DNhCRrUGH62sGjqI7jLF4X7sjTax3VZ5C8QTk/AhHCGp/bWcyIOumJBAoGAaVk1
+9l76H1UqjMwaGz6QzFIGuWmCAdwPBpzudl4FsHinmGKhRhF61IS93fNI5JEiOZ/p
+FBiQ+xdQbPns3sOb+ovUaryC+aPcEqyQxeFTObiLPzr1N9ez0kttm2L2jrI8liPP
+MgAtGrah4QISHct093at4cPolUAar2eIIzjqOr0CgYEAjUpip4riSjuuaT7663hm
+v5b1tl4tgR4iQ8px/vNE1Il8hCbVjgDVpQdnGsmHgX/sh+jWbau6/RcXoTD2dc40
+e+cMdHitnquPVXXqhtiB39qs/zYxCfoO4m28OI/U1cvZcdOLptoVh50atZOGgJuT
++TMUdS6FMvaW24aEDB4bLHM=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_pub.pem
index 11fb50b167e..3515c7509d4 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_pub.pem
@@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
-gU3gLEIK4DyHbekUlnw/0FQAlQGN
+A4IBAQAAFIJLy49mWCeK6hqVf4EreoLNqst33Tjnho8z17ajnhuSHeuzA8nh6E4O
+IGRYCaRpb4KY99oZ2mX017hgj3FjgsOyyFaQxpuYQ6+vSEGEUSEVj872n3jw58qC
+7tLfzBtzLsCnmmibeLaE1QL6J7xvq9KMXgPMe9BfleiFuK4tOVe3fXd1w6oIIv5d
+hefMLpMu4xh7ZZeJz+P3Aji667Z4M/fxFENIPsAg+dbJ95s0hPfTojQIoPElc6E+
+gPyYlQfAZLi+oyK/wLqNvaQvvkZFhyxTXAtWDl8AV2x9I8Yfk8a5Eoj7WxksYnNd
+zmMjrT1Z3K2BUvW7h0DuBUTF73aX
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4.p12 b/cpp/test/IceSSL/certs/s_rsa_ca4.p12
index 1788f80927a..ec8fe150b9a 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_priv.pem
index 5f4da29669e..08d96ec535c 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCeTUJkI4e1YX4J
-k/+uQzQ8jEIL77++UvEaPvju+upzliJmOidGEKW0NBBFp1tRl/grNV9s5bz3INkD
-lPPyOqTbmKFUatp1ewI4M+5hPWnvscHaaf2gIaS4+j69IS34RgGoVYoSce6G2won
-cFTpClL4sQFIyVFAE7Ci3whmJEAKQaKP4IYRVrN2BylJuc7D5lp/rmyTLC9aORqz
-6vaDas21i+4jy5rMwFX3Zlc6lP4u+ZjVCnmBOVatwwDGVFkNZ/Es4ihVfXWer+lB
-P7AUbC3gJ55eRWCvgB2ZU4cs1Og990oynhA5VuXtK6S71ns4nTEqpp3LZOWCiYC7
-683XjQIlAgMBAAECggEAHwbLhW8FUUKbfmsYiOI5IcjnxQknjrkY8mj3R3e8bg02
-Ds1FF1F5+Njfe5dyqYpcpLNgUaqxn8o7Xp1aNtbRqwy+ShprWO1UIQnkpgBwe/9e
-HF37zN/rNiouE8mmBexKtOCXIEheVOYnllVI/yf73SxsMQTsPN/fFf0a21ItjxTB
-SkkWDlqekVv/x8DV1VupVjbg7CWEYrqesU5BxQLCUh/niIOQU/o4Jke5THpSD6l/
-xlpenEWCN8r1Ajop1DHZqg/NGWTJzpCwECpjXJuEOHkchpAhrAljNjJFLn5Q1oW+
-C1O6fxM56ZHl2c1ztMz1Q5s++nrOXdD8vVrQ+AE6AQKBgQDLTE5VEELuOJ9JTJu2
-1bxnP6nCTNJbWfikEiYevE5z/eJziX1PC77qc/029XoBtw7DciIV+TfrdFLsX7kt
-LjCRwSm9VdlBEn4Jhvz2Er6dN7cumYlr3JAJet22ktmnbXc0evfdyLt5QJf0a971
-zMUO8s2ERdy8l3oplwKnLNxbpQKBgQDHVtDdP/ZvZu2uhw9u667E9I8n0B4ltXRk
-dREsS5grJLvrwa96OEFfYs7MCsIWhGb36G95gE9qM7HK6lwIQACgxdWSfu+n71Yd
-LKteP81RHx2HMVG+uxSa7vAJoDCPJG8Ddc4j4ABFLVP7+O1EXWvz48X+wtxOnPzB
-Lz5JB49EgQKBgBAuIo3inXEYUJUk47/JgxU0m+467wMWRhPI3f/UPOo+aqeHadHA
-vZErahvVrcA1MZecndnh2/GBcJgfhj1yT6tKFGhdTM1BC4b2l2t+Um1w4cNztNxA
-0bXvcXX2ehw5OiOTJecg8srTuURa0YP+qDBoYrMEXG0mITLuMefcSi2BAoGBALfu
-JESyOzppl9BdMOFhOF7lZZ4Py3Fx79atqk3b5qmQeJE9oyO7+p3/9t6Q4quSOcxv
-vUQ4H47X6ipYetjl7W5rfPhyhcHH9gZvbCRH7LP4aO+Qk2PRDV80L2pCU+wQaxqf
-PbkefEFYZNDvzEYziWN9/PhoZo1nD1VVuTv7bLeBAoGBAKKtiXx2kx8YYWTVoJor
-3PWiYHWjPrL1yV4Dx05vQXcnXIlfucHPDQDHkCrRB/TVc+VsDyBBg5XmoKT3fWZv
-d9gnurnyrsnsQaKkaFbPeJpWweS4qTJyRO58RxZt555TemrTWCaBZX46Z6PKHQsh
-Lb6HUQaCWVA8GgXd+WOVNfA1
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC5OBwn/SCe7DmK
+6GvUoE28RJ20PrUG0GcfgueihucFt8mxupgjYakMIFhypdog5OjW4cTgI6Pfcly7
+DP15OTSz+HmXuaYTvZOVNIvNF2jJ4lxr6ZARNgFdMdAbWHbhtGqE//VsrL7sluia
+FKb8n9sDYZ8e1nMmsL7QAiPR8Vnfqsmf4wE6jU2f78193+nETafdElQnCoJ6eoZN
+/AHb2KHy2JCQr+kiCgqf1jIdLquP+aU670uKymgoD5l8p38H8d07c/gLORt3rif0
+A+Xe7pSq/LAqikWVDj3lA+JJLr1+9ZJ0giF20l3D1S2Pr+bWdVeyf6E2PEr10TXp
+z/svs/lJAgMBAAECggEABNURGFKofbegXrPmpaL9tDTpamZHwc2WddeBT0JhbPWZ
+EQZ9vqU8dwEHCGK0WK8Fi3RTdxzm7cb64rRu49vuuJKkgCVgpFuJ/1a3c6/cf4aP
+g7nnFNPfCufoS+EDJQCt1hokHzmN4k1OSerSWn1EhlzkfQuk8HRPCM1C0vuO1+DT
+mQoTiL59IAkTgqbTo5qTvy5R5LQMYt2bYBTF4HxyYM+35NRyRrwZpo0tHHogLFyw
+hq2B4ygPciGdOREEcNywr27b3vi7U8aTEJpX8VK0JkhvHCg0hdfPdj5hqtTsS/1a
+MiqRdwU6mLmfXU8Maggf3KVtWV1BMUVaBpRbGMT/aQKBgQDopsJpNSMeI/e0jsn5
+J3u8leu3KNRCTIgmLQ8KbG4vqi0tHwR4/zrx6Mb/F56pH1sWqW0x4SrT2v6iH82x
+5pD72FN0c5T1X7fdrohz/cEsQoWa8vCJDbfW0LKb/1GKXDLISD/cjMbOJ4Z0vLu9
+tL0v/+5AhaBYeJQtbkxKw1MdJQKBgQDLzrrYumAmErWQYMyVF8Jrk3/JYdX3RxOA
+vWm9x0EX8BHEiBod4uvJFw6molxuxAkATWEtM6ZtHrfg4JhlhAaXQZuKR8YkEjzI
+grUUwJ2nV+ImeLUb0dMGk0fH0PMqKl/YcZDNxaI2weFC+l5hUMBUssyRjjUawrpU
+xre3V3pcVQKBgB/3kez81Sd2D7oqiIwIpdLi0rGnFYtKksaUGGX5QiagfnadtXKe
+t024C2fPqghY+54gh5V79/OGOsiyEARqxu8j6Uut+gDBNzVpnuw5KMrZFRyWVwCt
+9t24bWJL8btOMdgdPVEjsslu2uW9bRqC9B/dTbJl6gNeBhY7+pWnQwtVAoGBALGU
+VEtowUQLQzYkkb1KsXVoVIyUeYl23bBr2cmo5rfDzsduS0tFIGrbc0GP8Hf2yV0B
+Dy4Cdf1YKaGAMGkri06ZtLvc4/EkDuAquzr0xak8sukQfcVaosN06rNZBbb0qwR9
+l00j6b5KWkswubGTWbGzBPnCbdT+XLpnV0Yhq5TtAoGAQc4YeuDE9bZZZBcyFfnI
+9KMbMVzwPAc5Fa/I4CJAHnlk3imqGeMcLy+0KyJ2hxDdnthW1AlVowNQPoD7diE8
+8u7OYoX0Occ44kzp7gYJ5ejisxysDn2CtI7Vg+lASF8yMOieugf1MqlhIiKs8v4t
+SdnhPb3MVGBXO7MFT8N/iC8=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_pub.pem
index 240c5a6ee04..0b88a87e69b 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_pub.pem
@@ -1,31 +1,31 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
-deGwtS4k5Ac1ANCA
+Y29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAv1lvc
+1kfVAMaLffiil7dRSS+1PCsNsIIiZ01Zp3KkIhAySS+4HonuGfnCmOJfN0uCvF08
+hcQLhCDRWZJzutP5M0dL9tbMhRoG8SoC7g2kCPGX+UcpBEPK8wdI/f26wz96/t9+
+dDdZNu0gUH5WSCupBKl+6ao1gJxg1HHR90c61HRmyRP/U4hGj/iroKS+XQEe9lho
+ijkD4NhLqmlWFnCgJcTWCIoBJtEOwg4/HVwTqurHfe3QPI+rXMPlrqgcXgGRuDmC
+LY5quRq6sZqsbIxAMcAnIIlJGXkuXysDh7LesiK8wD9caPRKQX21RQBe2JMNv4+s
+wFQxwJeNg+39qUab
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked.p12 b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked.p12
index 8802156efda..91434cb7a79 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_priv.pem
index 563064d4d60..af82d6cced2 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC7QKJAtbvYhuHD
-WiQ1XlLRQgE5hm149VGe6mAYYae/o221Jl/C7AeKqild6wDy6CMf9DkWmHNELYKX
-vNnwiRYx9XJLQK1OLKVXGQh3dLrqKJH60Pi+cRP0JYY3vEMhpu7YNoDctZLYjkeM
-GD0Aq8wmIpeQhr9lpJSY1x7LzDre5bMQ7RVR70CuC9b+w5yNukqOzNyA/Q8q5nag
-TprIdeFYM8/fIBPv2eBAGvytlDHYzM+DiGsNO17wXa95zv4cX6/UXcB9yM2p6RoA
-ML3KVUUwgbcBP1Bj7qbX6QoGHBA5LdkjGBnHq/STDVyx2pJnTCCZ2M3FD4IYtdpB
-EPCoxvsVAgMBAAECggEAIcoN/UNN/EqKnqe7dO3qX9xbQDgjtPn/mn+Mi5nDnW8u
-MswT56aTzc/a2xm2+B4viGqXip5D3n+f2yW25hK2sJkr4KxxGXQw+cCIqJWlzO85
-OFtRJ3xcL2g+Cfys2Hu5Ccb8Bde2AeHaw0r0ZxSZKCCB3RCTpRHHxrS61+eoj+Pw
-H8UL+buIg1rEI+1LBEu6nxzkqQWfdNCoFtx4GIHx+mlNd7jgC4DK3q0Vo8PldCla
-ccYFjBATG7ra60IclqTuHm0tOFHZiiBXoZTIlU6bNLU6ymiddU7zzFpVqtzXRHbm
-U8WB5mOhSnd2V60GW8snjjFprOqyrseC47LqyiwoWQKBgQDd93ruyUCPlUktZXbh
-0nc1X5l80Mkbw396FjZH7cHR3CBW9354xFcHdPnmcsJkUBaAKTGjCsIfs7/NzNBt
-4lFkZOd12zofPSstqk9xeSNiKvfPwURGtiIUCxiTwSQAMJ0PGNCYOwQ7eoIKSaNt
-tX8nlI8oZFZGkpkCwVSMTxKcRwKBgQDX9pGLZKD2Tih1af29bLW04RunQX4wvh5c
-tPHFWNG0562ledREApRqk8zJJbOv1TIpiE6+RD79m01tKwCO6V2M3gINuwnxkzCd
-io9303xBaxkWwHK03ePtsKuICZnwDczzi4RMbe0hhRxBEI7QVtl/uUj0xc7YWP7j
-o3U/qAwHwwKBgQDQAYYTVUeKBmUABLCGaLvLqZ3laKa9vNOuLjiJ6VWTe0xXEzFS
-rPO9ijJRccOXS7H6QiBA4OkP2lto2YGNJ+QMR77cJCfwdFsNPSebd+DfstJtv3hj
-J3UCAW/zrrA0+VmFd0SrE8sgjeplB6L+QXI6Pi51tKlhEyoOeevoXIVdKwKBgBTB
-yy1lp57k1jiqzkuVlkVjWYAS6GkQ7OQmNBKuvcEwf10nP4Kl6NPxjr5KlGGzERYy
-1ras4o0Hj0KN3ojd3zL556KgNo10gzixJ6bxucCj5Y5tQtkldpHS6Dm0CoqrGObT
-owyhiCgvng6W49Mcdd0z1tJH7OCYdS8197/9i+J3AoGAEFtaYF/TzNdy1BbeWf2B
-PmLlq8tJ21fseKX3zJJspsBQNJzp8CCSv4detDdZfWdvfYZwUN5gMONirR0uiNEm
-aIecsPVX8kJzehCWC+iGlS9gOZnZjwwRE1qGFy27c1pJdRLtViSyIXs/M+ObZlHd
-/kczC+3VNc7qpvw3oMwVBz0=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCnFsewN3pMlKiB
+bBZkfTcbm7KXb4wAk6Ry7tJlek+2WdESjo3MkVzq28IbfzFlnH548P9I+/V27xSH
+M1IGWz4QvVfM+c4n6eIRKXu+ivNX6tlg1bxev+yA1KUv8jxS2Rhdl8ev2MiSkgQH
+IDRNgD6Eyp2SAOjXRw18lo0wkl1OZz/lnSWsjfylT1fr6j785Hdi359XZwvdifqF
+oTj06dCOBDuPIf0H0UBBW274GIACbxy81UXjEH41Pdzdopdlmx+rdvoh1KPikW8j
+I3aM1X+dUj/PcSP2MWibVC3AdY8uGoAQWqelDbIPSdEqIFn6vPh2ngrsShlr3Hkz
+xpyn43gPAgMBAAECggEAKkv79MG2ddhT559C8+E2qAh75xXXrPWy9V07aXDS6OhH
+opjvkE9j5BgJRQinqn85DMiE9ybA9oCDA86b/vvt9DLaHQtHgpcUISANMSjffOv4
+Zyjz7FBNQDeUMVTyrE5EerzHUd5gt6m610rxsoS6TsczqBgO2SAla9p4l0kV0Zis
+sRAPb7xmuz15bW6CPmEFxpRbsVNn+rvCRKVeNp8yX6+o2T4OeDpCXlDHzeLFqSXN
+q3GSQoSErj9VwNkTqjkDENnr5kXcxWR1kSElz8s6134mnxbMfQKW6PXj2vLnXrer
+W+jhuN521wo7GrEUzwhTo9Z+XRDdifAjTW6tGJn5oQKBgQDH+X7SBNd90dncqJYS
+cqFe7VYuxNO4sSeyZ2IS8L7o5ekO24BlLJKmmwfTyIsbvTgw85APl8wXMbd+8Gg6
+kv1kJTtPhwtrvmMkSMqdE3c48DqEkK0YiknZNQmdoE2RFaEpcj1XncBTu3Q0fJhZ
+Lvx2q9FaPc+ZBXOKZeWvhWsVVwKBgQDV5qzW8fA7HtIWg/xQoofqU54VCnUPXhNi
+ERrnPkJIbRj5pF8XEKfEwUg/RL7e0xB8O1kPl3v3X81JpcUMYFrNy/dDxQJEV+Lx
+i3Puic03DICpDGCNWnNthSQQxrTfXOjnNmI7qdlsr5n0IF2jKLDRmUOZJANFv/nv
+HpU+nxMICQKBgHmgMZYjA72uyMcAcmY9+g/2YhiH9g27Ed3cKzZB3ptgWmOC9ZCT
+j45tdFFHA/SXHXoIaXJSbPsebfBy37HgfOVQD8bK6BNb9Ii5DSKEGFs1ISJHrD/k
+vA2zyGlqekLn2OGQbebAN521wXO65B46CatTzT0Jox36xs9CMnSSvRJ5AoGBAMR1
+jvAI3K1gPHODnB3vecgmLr6CkUuhC0p6DWywiS5+TX8UkmXb3UtgftvlZy2/S5fe
+5ojkiG6HZkSrZZVddmkoWh27d76Pvhg+DifcF0jlSdJ6VL/fgL7pl1t1NjEk46Fh
+GM5VzSX/DvbjNz2hJO4Nx8GDCyJoFcWjIE6YymEJAoGAXbWeeaRhhaPk17JR2u+a
+jJddiQKc1jLx+Bi/IjVv28d10lJIkr033h9pxy8WZ5cE3IQx92rWLoXf/5Do3Ghl
+SeLGvb3K+LuaUr1EM/gGlVAGyXdJHYfs2Gd878o6kjGhNUxy/thqsUUzwKuXNddA
+J7iCLNbSVQOz8XKatfmGLEU=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_pub.pem
index b75254776a7..9efce48f11d 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_pub.pem
@@ -1,31 +1,31 @@
-----BEGIN CERTIFICATE-----
-MIIFUDCCBDigAwIBAgIIUo/NVk10uIIwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIxMDkx
-NjE2MzIzM1oXDTIzMTIyMDE2MzIzM1owgZExGzAZBgNVBAMMElNlcnZlciBjYTQg
-cmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
-A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
-BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAu0CiQLW72Ibhw1okNV5S0UIBOYZtePVRnupgGGGnv6NttSZf
-wuwHiqopXesA8ugjH/Q5FphzRC2Cl7zZ8IkWMfVyS0CtTiylVxkId3S66iiR+tD4
-vnET9CWGN7xDIabu2DaA3LWS2I5HjBg9AKvMJiKXkIa/ZaSUmNcey8w63uWzEO0V
-Ue9ArgvW/sOcjbpKjszcgP0PKuZ2oE6ayHXhWDPP3yAT79ngQBr8rZQx2MzPg4hr
-DTte8F2vec7+HF+v1F3AfcjNqekaADC9ylVFMIG3AT9QY+6m1+kKBhwQOS3ZIxgZ
-x6v0kw1csdqSZ0wgmdjNxQ+CGLXaQRDwqMb7FQIDAQABo4IBqzCCAacwHQYDVR0O
-BBYEFNINgbnp7RP2ww/bQOCoDL549pk8MIHDBgNVHSMEgbswgbiAFP4rfsrBsjyh
-r+NWyhyQXyKTc8y7oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDQx
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbYIJAIEr4TCFXeNcMAsGA1UdDwQEAwIF4DBiBggr
+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
-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
-Z6Vj5MAe/CIvb8qk13h2SijLYn4=
+ggEBADkapihXtGEPwmceZ6iY2fnPaIZMEeqxXOBKsUx0r09tXyv5UeUs6lPR62la
+T1uweSOOWNEfxmKbPzsxSx1ZG6LGm4XB7H4Zp81pxlx6aKgKSFO6hs5geOd/Ep6C
+8SpdzD6FvIelC/D6yLJJb4/CcWdEroRNYC4g8XTzLsO3fndda97H5iYrhDGTv5h2
+Op038qhT58U3lYD1Trl20ZjAT4Ehi24cEacVJpgnoLJsVoP/l2cWKT1OJdsAC2JT
+S3ayiDFkZLjWLmPJw8RKxpCrupYPjzqtexEzwPnd3fgxTlt0VXcDmKWRFyrqSs0r
+tLXlY0l6wUbC3VvH5oh/Q4OIiNw=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown.p12 b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown.p12
index d3615e8e6b1..38023024b04 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_priv.pem
index 024f127381b..cce5c0437a9 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCycS6QUCkXZQZR
-+im+Red1xez0Q0GZuM/9OSTs13+GSTWKrcLs4JxDzvjPmlkD6c0CU5T4XDaBvmC0
-gMLyMhXohvfIOESL55lk+BtsBvPUSUDoz2mueSNI12MkobBSgbZSlv9zmtswld2X
-J3LyVLlcMbwh2q3CsXNfkl+kpIdU8hOzesMLnqxj87YC4u5EulWpZ9ZbDt6s5lQI
-qAUgXo0IHbFTJegocRezFoBthIu2wXzEmu7HZ8FA18Lh9E+FNJj/yDlqvUTbxbHZ
-df5/zAPCRAsCZHY1Ql2lZ5u8GRrEqXvAemeb0gvgaVllfNUMlhXmLgFzZqm3Jjc+
-FwMxsPxnAgMBAAECggEAeTTwEA6jGsUAegaW/Cu3gQQkY/abRLOIc9SxBD+M28Y2
-nDBTS1t2SYj48OtCs6nIG2ByvBDG5XJPdcxQnvrubrfe7x1pUi7Kvw7YcZR3Yycu
-8/SPMHgQQ5YqPeOmRSTel1MByaDSajoh/l5Jcdmi3sDZrZVAmhK276AZX1hypHt3
-QULWLSlEB26dHC2sOMq6PHq6PkBJKjy7gBu0yMr4HTPeQnaNSX1vFZfTNOUbrHBI
-jaFo7CBAg+BpSdQrt7ZycE33YxOO/pfG8aAyrbjfeOpUNktkOOf3q3CtsTIAD2/M
-PLkmUMlbF45Fgmb6xinY6Pz0nKBCUnoAsOydUCtkAQKBgQDmYgOP+PP6+eVpyJ3B
-j7IL2mJfaHoDmLEl+EBqauuh8KiTrXwwwc9kIWiw7ivjcdTwXf+fOF9z/a5a8ETy
-3n57bdRG2g5xZeSk6WMys+fvlQ52OAJasJdWZ+e8fAEI/TU9WPBZH2QLsAYcnd5T
-ZnAuDRscWfIRLloqEMkLomrN5wKBgQDGSKS5wVrAOWOugNPKbKAFfpMOI/RMZmjP
-xSTAqSqvDYsWNCliYbdj0siauXkWlSK29+HSvF1RLA+6X7MmBRSB3sfOfZLRyria
-PKe9EEIhjdWbOlFkku3HkklTVecQ361Q5VWja0tb5Yc1Ox0++tdm4IQbN2CW3Mdu
-wwAW0PGNgQKBgQC25s2pOZ6JfGf0Cb+k8i4KVwCOemWUAV9yo5qQYf5cfLF5PNxB
-4TyDZDq3bP8O/Upu4lGU2K5/acFIlURIBPgpidJjxa59vMU/X8LPeCEFBjOLC4Bi
-+5vKj4ddDp3LwyrHX5rBRrioxsCza2ockFEzXlhNs+MIXOJcTyMtx24/tQKBgC38
-6zeqAMJUjSoL9xMb3oFnufOtoxuVJPoLX1rP4XZ4Tan4ryCCSWZ9nMlF+y+hp0uI
-cnfN+Fa7QWqYh5Rp2TfF09GwjjzaJ7aeGsle2/esTb6S6A3Lhhqjcx5A7jabqjb4
-+cPNPs0xjwppi37v7sWNjRZC4cQbsKWf1IV2MJABAoGAVlfUR5Kxop8poggFplTv
-p68HR98g7sMbm/JG2jo4047c/uwqONDF1AhPXRXZSAmXu0TNo4WGmJ/v0Dr9ZJol
-N3TfD0QT5W+uMvyDitXI5evCGTRYoiB3AIXpKbx3/0EAvI8jr4KsQuJpwMMAqX4q
-L1bAOYgSdgKySBAsJVLvK0A=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDG2Wxh7ekpxh21
+9S+aK7sCUrqoxs4iL4sDQQ6RSKo4uzo5u+m2J/8NFKY+3T3jR2zVE/Tfy9dbNPfK
+pEOyb9BBidIWYtEWbj0v9vrCwXtO26EkVuz2CXZ33avwivj/2VoS0Z9Kgl5eHd/R
+ye8HNKhAT73/iemAFJ0tKokzcfqAnHMvdnZ9N1HNpEbcCpX+pFs0CDU4qoM0ik6x
+tQYtnsHITSaeTef8mNqKebrE1KHUIZNem0p3lRPqA5JqDTBuecJHkf75XNvw89lJ
+jDbWMcSMXZpdPznLgijJVU4WODqOrQi14FxXAvWxOsgDeBCMVuF5Mi/4KMgxnuPm
+Cya8UDmFAgMBAAECggEADdw6W9du35CgYgjm1O7JkHd5Qh88tNvOVf9Qd2EoAkp5
+8WvEdi6yrl6l2YRngQJ/FsQXFwwDj7yGWBYxOiG6k6g6YAE/yeSMYx3qloLQ0us9
+VRsyVaeiXb0HtCglA9pf1vzMXFpwHvcjR8wfmzI5Abs9Ma+9z5sVkJV3g5c6gCvS
+vxsal9jsZk91gY8jx7iNhASRN/pYdQ6zqcVUK1xhrRuMuVb247dlaDxdt4ozgCzD
+6gA+rZKr7ruCiUxKmXCpULZVtE1d88kggPSEkx2uJEtGMVzb/CNrH0WcnDBR6y+i
+BzWbPzZ2KqK2Bexm8gwfw7EqibrZwz/lLFknXeouAQKBgQDgq/rfXc9BjfiFINg7
+0DZy8mJvLHaBqXCN8xNH1jPwYjI3UjBS/Im0oaA5nBQ7GsTdTBzqK/lnm+csZXoP
+vqsPY55xNMOdlWICdIR3Pmy9+YP8Ni4BryoR+Fl8aS1mlIr9de1zF24/MXuYpfIA
+1k9+MwhxTaucNPu2XlWFiiWHhQKBgQDik6sXtPN00LG9djYcgbczRwJCvuetWOEC
+JDFM81bT8wa+/wVFTyK90x5Q8iKFqmhbrCnIFFnKuNqFcIruybY2ltcCnqs6UtKl
+/hMNkjKslSI/ZybjN9LYq5KRDs4aATD2UpkrJ0QfkzuLjfmuatdd1GiLZiE8qayC
+IjvMaLmKAQKBgQCq8vDeSHjMvoOceFNPn6vuZnNzd/drzUsxFwVSoa+/dlgTM9xF
+KJZ29Iv/ibzzA/lLEQDnRTJuHXgWldf8Zu2ttfT22lkFbIa4q4OnX75KBrLgkzEK
+Ywe1yKv+N+EtrlTbaoGUEv3142bRzWKINIkj0xzXaWvsXXwxVTHpfCX2KQKBgQCr
+GFmdqE4jyyg86tRHyIhgF2IUpvZqB3C6XjxAYI0TtjRE7Gy9ftm8QH1nIMGC8ECn
+4SUX6o43sEmLdIXldbq8FEG+v7SLcVmScX9PwzOy8VcQS8Oo11HHviAKnAR0zKt9
+hrgVRyyBL3xKkOaXmCSTvT9I7NFybqpPBqzjWb2qAQKBgEjFl89amFPE6pQQ8SI6
+OIV+0IHfJ60ubOUiMziqJqfAcgTj3ddXKBKt6yOLrq1bjBW+CNZV5tc1OyAUjlpN
+VvAZlisitURGA3OsvY8SIBmxJwMC5Qe72KIobW4BZQNsh3NUxbx0qkq7CHNequQM
+9YYadK1sPV8V1xsKC1YPhs9H
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_pub.pem
index 7eb08ec0c27..1db47c03c9e 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_pub.pem
@@ -1,30 +1,31 @@
-----BEGIN CERTIFICATE-----
-MIIFLTCCBBWgAwIBAgIJAJ8FWSNATPdZMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMTA5
-MTcxMTI0NTFaFw0yMzEyMjExMTI0NTFaMIGRMRswGQYDVQQDDBJTZXJ2ZXIgY2E0
-IHVua25vd24xDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAO
-BgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0w
-GwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALJxLpBQKRdlBlH6Kb5F53XF7PRDQZm4z/05JOzXf4ZJNYqt
-wuzgnEPO+M+aWQPpzQJTlPhcNoG+YLSAwvIyFeiG98g4RIvnmWT4G2wG89RJQOjP
-aa55I0jXYyShsFKBtlKW/3Oa2zCV3ZcncvJUuVwxvCHarcKxc1+SX6Skh1TyE7N6
-wwuerGPztgLi7kS6Valn1lsO3qzmVAioBSBejQgdsVMl6ChxF7MWgG2Ei7bBfMSa
-7sdnwUDXwuH0T4U0mP/IOWq9RNvFsdl1/n/MA8JECwJkdjVCXaVnm7wZGsSpe8B6
-Z5vSC+BpWWV81QyWFeYuAXNmqbcmNz4XAzGw/GcCAwEAAaOCAYcwggGDMB0GA1Ud
-DgQWBBTucWJMNPVL2JfMlfA+q+CRjg6AfjCBwwYDVR0jBIG7MIG4gBT+K37KwbI8
-oa/jVsockF8ik3PMu6GBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSA0
-MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdK
-dXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3
-DQEJARYOaW5mb0B6ZXJvYy5jb22CCQCBK+EwhV3jXDALBgNVHQ8EBAMCBeAwPgYI
-KwYBBQUHAQEEMjAwMC4GCCsGAQUFBzAChiJodHRwOi8vMTI3LjAuMC4xOjIwMDAx
-L2NhY2VydDQuZGVyMBcGA1UdEQQQMA6HBH8AAAGCBnNlcnZlcjAhBgNVHRIEGjAY
-hwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0G
-CSqGSIb3DQEBCwUAA4IBAQAOPCApghGUbY+qnoqLROe9D/+gyBudCyo4EXEaoKkb
-RZjgJw61VkuuyM7SonvQuZD5mPqYEVHofg+pmFbk6hmDRrjd0B/qDiSdyj+YK8ls
-HjjbayvBIDDiN/qowmdfkcBMZUHMiVr4KH3TEuzDcVACmzzNf7PS7O3cD8AxI1qL
-zTufpZ7PLTUcaXOttRSIG2qqXo/6P/995M6zY+VTehtrp03fcN7vXynDuRra8w6d
-3xwEKEcTYM2N9GTiUu6g0OMr06BSYRBDWUKG3OnEstM1mZqoDvtXOCW+1Mgr+keA
-hVEDlSQJI2ie0pjgWRWpo+Cf7u3Rc8WXanQn1gkeAfNb
+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
+5bUwgqGi5zHa90YQGyXX8w2Q+A==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai1.p12 b/cpp/test/IceSSL/certs/s_rsa_cai1.p12
index e852be2a652..3c022ccd05b 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai1.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_cai1.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai1_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai1_priv.pem
index 2d87bb0a7d7..a257843fbf4 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai1_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai1_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDMXNhKjDz0yzt+
-hSXCOPgcV0yxMJzuANPqtTYsdXO1JCSgHS6YZn0NrVJnpHV9Fd9kQhthpnQOXGHe
-g42t0oeSF1lcIczYloadZNShaqvHNwSHJw9HilwJUNQlVWoVpNKYcWsrSzwIy03c
-+Z1tpt6XZ61A9zrWoeQmh32HoUNONr2a4KD7+adxZjdoNg9fpiAH/ZAmEiKHF4Et
-o5PBni533NgynG2Cdtps0Y40DZ54tRH0xMs2GEb8FspPKSlLcesX6zszQoDPTmHc
-eStFx4eLGTuQoMLy6BMO4bDYxVE8gAAcnZQ1iKjCS3WonO1EPJjKa2m3ZbuTcPPo
-/+28Y+O3AgMBAAECggEAbFkFK3DymG5vmoKJJFID6TK3rHGzodO6hwOQNz4GHJGP
-AXy3SYF855VuzRg6WhkQmR0bW0he24ZLNSfWI8QssF3EuL4K1wHnWOcufG4LqNEY
-i3c/+JP4e8/oyephFhyOstffE9MNfzQakf+dYZdJCEilaH4rKcQnK+5FtXTgNESK
-4U7ltX3Bc3g10UNdciSjZnsnyCPvaNWvRxlJ8tWTpE2YOm2E5QuK9V9QreAyBfRI
-D04qpOmDC817SPY44/CCW7gLglNlMnWHlPrbmArRokw7hk+GyVNvxcU16f3bmc1W
-z4C8YmyRNQFVp+JqvIQevxzLDPFz8lhupokBObL80QKBgQDqhofDV5ivpOj2eywt
-HBRXGgH9uqrqk4RMGnYY0xlc8Sm+T9/pBbKTLnIr/GhsQ9cMo+IMi+5Z8AXwNJRx
-2wM8NVXbe6+aLf//PwQ832kXPxR1mYZYOR9t9wYhonrfQVvH74wObxvLmtgxcjzW
-Me7aWDWJwk5JgqL/DRXh22gu2wKBgQDfE0XojunAMVOs3g8BrwUq0vfqZU4GLxky
-TIJkqlsZRjU5+r4OFVmE/lC4sPiVybkfeXr6SpaOc0E0tY7SzUU+pJ4h6eORDB5Y
-3wMFg2UScDH/dY4628bl5B0xlqmnhIOCbA0lngr+TCM/bdqgRFbTkVmXroE5qNuB
-fNQbY+CPVQKBgA5IKQZdVEAGA+XWtGb+2cJAJDTmZDgqyZi019JFMLs3OHqNdK5F
-GY3a+zrwgQ9uxi7P4BkxgE9bzZDGMvAIDVdiTBs0mgoCmR9bIA/w7v5qaf2LXuIK
-gH5615W+xkrIOSWg0d+jJocso9PHCCtnGQuU6ZW9DnVtji2IB3gcm2iXAoGBANMy
-LQqbW2URjlXouq5uZGcB66OoG7GxH5rGYuEphCwuky/8W7l7rxBBsmzZZ9Bwdmr9
-GVgkC9x78+0SQ1EC9J71PZ2AEWp+3bBoGzU6DBPj0wI36tuAvhNi39zV9nNZ+yQc
-ZmoJ8gCGVwyzVbxMVyPgxcDcfw329zLl2u6/pZgtAoGBANHABANXTPisCkhbdAb+
-shd8X1GJS48YvRZMiiH6WQo7/wSwX/PfsAhiYGfxW7B/Yytas9PXaRtcf7s2X3Ig
-ZVbeDfnjJEHElZqczRLJt1lZA57Yy2cryI8YeuTWiwBGbDAyzQhf6DH1jdQ36Pqk
-4N4N2iyAijbmZ/5+Q9WdoYu0
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCjlVzHkccof9FX
+j96xpWZoU3uFepmq76oiU5d5X2MBQe0azciFuHt6kDNvRIe2+UstMdlBvGnJAVV8
+nuQn2jrbM/XPs+VqKZJzbIffit1EMu3kGLMlhM+9pUnUs+D+hzvcgqnu0ecZhET2
+rt8C42Q5WvojS+G1YPBkLMCyCElJAfkFZcvwxbwzMNkLkUVKxYHsBI3FNuod8y8o
+hJASBi3WXRoIxJ9TaSo8DwPNGJzDed5sRuVSObNlT9dcU0u8x0iWIZ8Fg+uzbfYS
+Ht/7Yzb3g+O8Wws9wYg+JjMiCCvkAexZgscBy+daH7Kx7Gt8/9pRLcTy1AI1D74N
+/kcqnentAgMBAAECggEAA31OK1uquexwFMQW5gc3NgaB3gkNeh3+rRjHZGlqfT5g
+xm+ZVXDoAWdOEZOOqZKLzf0AO2y/fPAwWKYzC76V/tMO7U1TGX6lhxzLkTMvISNM
++86jE6vPmqYJ+yWTKRrNZhjLczK7EUpHBlQYocEkBC0ypMobmHjm59wkiCexGIOP
+hdPUQaRTZmZIcgiy3n9tLAPUhQ5Sp6HcHFFAHA67KLvE5JkIs8N2LGXpFvoIxXYI
+TMo7lksEe+OEfm11QBVXT//gJvlgLTlc3QOqClqO/z2L2EH1+MUwS/c+6PjktBIS
+JvGNErXShJteJPCEM0PieSmTndIYVFXjek2FLUlTKQKBgQDFZNLTKdRUac3V5YkL
+rd2C4y4iI+PcoLdxFxHpm4pOQRwdcZQahfsK+NGq72QT9hFe2zhtrlMgMBb+evH3
+lOIMrD3CMRaxrEEkj7VQtROwHsyB0Z8MexAHfcwpNV/0sC1BCmMq527gNJCeTs1m
+GYBvYZb1UoCrUoCImaJnvULbqwKBgQDUJrxXXP5mMFuIZqWKstOMI2Owr9HS5j/R
+ckBlw/jnXz85UZ4m5k3nnsicdR8n14QCh2/RRaq8bUGRG57qZa5otyG6nTYUj92x
+8abk+I8BNOigNpTEB1VhxqlaFy04H+mBAYkVR5zlAg4Gx7cqyO4Rv5pUrkue9HcS
+QrvsGQd4xwKBgQC0I27ChknfPy85JGAM6H5eFDTlsxsfHQxLiGIwbmGpSIH/3Mbr
+7ZlMSgYNmKocDVOM3UKB1bTGixxw4IIxDw27wvQZY/Lx8eEBHKS7IoT1FSZM0p/z
+I9tc+tB2St9mzeB+mpwla08kDNRtpDyOEHfFLao19zS1JHVoM8yiH3YEQQKBgQCv
+kLrOZZPWR3CIScH3LRQqZeMLBgVTTd5EWxN15B7ogocUzTlfIboY0utbpwU4eH6z
+hReBDPFFa/kVt9DkU29pExxjjdSCYahqqPufgx79NabJZ0Hnk9YRy1C80G9IgghA
+DWA/bvsk/XVUIRSw4IU7xN9X8sF78v1S7E0ODoyDYwKBgQC9Nf0g+0itDz/gbZ7F
+e0mWVEWr7YdG8MrRKIUiwIjDfJahKk7AERwATwnjO2Ort+zsOBuQ9dKH5JIXAhdO
+/RXJCY+pcbmnJtXGbl9RCsE5vJ0+uq+y7pyj9UadkFZ+Vt+BfbwbeQEOoHKdq12p
+4k4Wtw6d2zEL3iUqyXAIXtpVwQ==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai1_pub.pem b/cpp/test/IceSSL/certs/s_rsa_cai1_pub.pem
index 0e61054312d..9720c8635db 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai1_pub.pem
@@ -1,56 +1,56 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDpa1vT4dZN1oHYur/6hrjaWCbfQ6BhNcjL
-Th25dqyey1GENZaPaJXBmCun1gGgsUyp4ohUGb/YL12M3HjVDRYZNFazn9OKjPyq
-EN3bjuvnu8b+rmscwDf/c9loGat0VWj3aUIw83cgGK2P/xNIfnUijTZKWndMTxRy
-Au4s0xfTa/AnoAQmYNHYbw+Iom9snRedXQ0yUNwxX/tXIClGJe0bSZAD1J9ui6Ng
-S0Bl7mshWOUtdiYEzEQg6DC3bIVtGIworlKE+W4OX5Dkz6H4RsGEvxZ2cuOM4J2t
-A4OqI5HDOsBhh8D3JmR9VSal5Bq97enx5jIZ2PeAt7305zNqlA45AgMBAAGjggEa
-MIIBFjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSJpuYD17HwLKKw7ei/tv6ROFeF
-tzCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63WKGBlKSBkTCBjjEY
-MBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoM
-C1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRh
-MQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDQ
-qWAawnlaiTAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMA0GCSqG
-SIb3DQEBCwUAA4IBAQDJAG9+LpBg/rs/9sVP4RDGtBTyNwpinF3O7RA0zUL9qaJG
-YpYM7yInt3IKqeawD+VIZZSrnAHN41XW2Ob50dIdTXJogqVj6er2DyzvO4yvggGC
-LJjoF1WCpdurRv/vgnx2oJUv0EDyH20L+cl+bEXq9kmpOH8lhSlhf+cLMhj1wB++
-NCnDR3Fzimi215B04vEhwAxihyC1UEMhgMhXhKQk26lx1sUNPyYl50AzBF6h52f1
-Mufse09pojIqn8N0cjjhelD7Ik+pHzbgdjlflMvSDRXTnhBoCgxnkf9A12gbISVw
-zh/xyXToHB8t0ZK6FbsBTOBBfQhl9RURDikdUAC4
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai2.p12 b/cpp/test/IceSSL/certs/s_rsa_cai2.p12
index 78034138bbb..484b3fa34d8 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai2.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_cai2.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai2_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai2_priv.pem
index ddef23306b2..cde2bc4be60 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai2_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai2_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCy6fz+3jnaZHDW
-4XjZOtqqGKitAxxCiTCTU5T2kk4jo1UVCeihkVSaqzO9B0Ii25TAt6CGS6jZNIHo
-1m3Md6k28JcJbZpP9URcpOgI1pruO8U+KfMEBjquXPpuv/kdFHmxqum21j/lcODE
-mezEuJGP2SWuABMhTKvWOKO8tv/WD9QTXS+XMpAF8H9/HHSW2EV9RgCYtdHZ3/JT
-Gis2Puyn/XzCB1qymkXbuQysPgwhmqIJguXWzRsa39GaV5ZofroqQAmgTmAeO7CR
-cMoctLrAM4/kBUlotunPKB7qSvtKvKGStQokHLorvYnzPOftH3oxdWetBIWtEiu8
-+/mflxO9AgMBAAECggEBAKMoy/XJx0yoyFbN7B1+lKcGMd0FtyHeZpQUZwatyeCq
-NQ8oqCOfm14pvtcl5WRQh0lwrE2MdgEO52HlGuCaR5C4u6R3dYBxldQ+9vQIceXM
-UEYuj1YeMCmO1TtmitHAOHKUAOsiW8brt67TCJ8mCmj6iGgz3T5C43pK0Ndqs8kL
-wvvuHDn2eBdqnXHhUwru+aRzm91JNQIfCkhh+9z4oIcQskMSMnDfw0fstQpFcbWF
-GNXJfz7oTYG07wF6EEE44bgedqNA2OF8pr4Vl7CgKlDB33NicBEcLk3FdhPeb7ay
-S4Ne72fTJ265NVIQPZEz5HbplcIjE24U7vZWa0HYxEECgYEA5W5yezJzOcUeb0hl
-taw8Q+wEuv1kGOCRcbuQjL/OJs3+MP3Alk3o5BSp5hoefeoHR5K3WUFKgDmZ4BXE
-ifScfu9QYPnyoka+kbQuV3RNHBSToz9MLKunYlagew3T88nFxC0C7V8W+tTDnNqo
-n8xo6nM0tw7wIU2uN9JjIYC/vJkCgYEAx6HwgPD9l1o1mL1jacDa4jCbsUlvBzMd
-ZWC8JzWhiXLh92BwCQaGwM9PGxiB+Go1zZJTw7fFQKNKexKDH8yn8HAx4GCyIMcT
-rhsMz/3Xbc0/lPdMZOGJa1iuAKrndgbsJZ3Hwdj2o4y9CJb98g9iilElfNUtaKjb
-doT/hLR3wsUCgYAZVdH0gsSwm3DZ7w+0ORnKklSPZY3ZJWtKOOEkecXFCThJpqvO
-rTnLffCpBTdaxi4ZnDz88TXN5Q517VFvvoBNkBW7L764ZsGCi3gWljQxpqALBeFe
-iXIJbPF5xTQjlqNtH19UYQzDlB0pxAec5dCsGx62HEMuGkrjxSrHN1V0+QKBgQCp
-GTIYdonIH6CQrbO8y6BcwmHPLW2/wnte+S7HY7VeMRLZMTYVXxLb1X6jbAIDwyup
-4w3TFiIem3Kmh0rMr9V9Y/vLnPylqRuxebZDpDhMCPSXoVZziVuWszpI1HtVTY3Q
-WzLur3JTnQ4ubX/T/1Yv5YaElCpvocCsRwINjbR4JQKBgQCjLDbvFryb2KyJCoV1
-9KzY7P6EDd8KdI8Pxrm0K48JWoh+8OBLifIZ9gNd01NzqZnoBcpB4NAmGUT0QW5Z
-hxy6PPOG1yMgRxKlYwKP/u7X5OvWmMlZW8/ctdj2vL6jfA3WVvYS4S+I23cs1SNc
-9XmtcpYSxq1GZGmUSOoV6Sq/BQ==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCVWs4fd6lg6y5t
+3DeBdGomLdE9Q5MTraN+bAC/LpuEeGOTe1/EatBTq3YbCairiban7byvdAPeDYFd
+wB+ozmLUdgEDciBK5GT/YTkmLSMF28lXN1Ia058FUs1IpyiWBWpDCvZXxmDKNI6N
+VUxHw5wzn1uCcxzcStn04Sd2hKqLWu1mKMzEP8qhRFCFoWORJgA1Zeki3GKyFY1g
+H0at6BgAn7UwQVMi68SNO3HigM9nv4UkoVZVGWfFvzPYl4j8HI+S8rkvoIxtwBtq
+p9Dp6xw8RUlgmDwTzU+bQmupqv2k4rHLZJ1gRpbXGmf0ubDIDI/F2u2g3ZoSZsf6
+UIqQ/NqPAgMBAAECggEADHJhLoLUwndMYEAeVBM1QXHyDRlTlCvqrdTRtHJtktBM
+TsnVBP54gXCO9YPhjaIlbxXt8pqdiTo2PMTlHov3SojRtCLPtCNtPfyGkbrolKAT
+cHRIyw7geBtwG4zqt03uOXYcFNvlzGmC3nPBrqgLnXW7X5djoVbk68vTyRnB82kD
+emNjNV7XfY2VPFAMTLhGMJ4LzapUEQz3dxsN2h7ti4FUvTk9jv4+4WEyMy/Om8SI
+VOvS63wE1rUS1IAmPQF+rMbN0vorxw6H5cennekIbuEMsXnjbS9YejZsCi1o8TjJ
+cahPO+9OnbnRehcsBz6nyzx3Aq/9O753IX6oqI7aeQKBgQDSfPeICGd8mukoV59Z
+r9jrIlE+MnH41tU9+5qptm9p56lmHUfh2JK9QWSKpfLOMHn5Bb/h5rZ7rtQHujQ/
+0c75ET8ieb/cAgrcDQKeKJ0eV2C1oDvc2Umi2OoYyl1MaDRUi0V6MDpnbpUn+3wi
+6I7I5eGQ15N+y8U9EkCo3ackEwKBgQC1pfPuiBiCsMuc9W+E0ipusvtWSTNx7pOb
+5nRZumxGTWL6caQ1PHuYRhITW0VwzqF9faobNBSRb57W3NSOh1tWH3NggVmReXVU
+6ZRiQcgv3SrnyL1C4hPKjy5UgBXIrLvdDMrlzhM4r/rrs6bazUnbOPTd5XGrm5PU
+n2OKjhgnFQKBgGHQTts5RJYECuuDZHqyG/SQuv5TROFlPC0UmffZ3oZxcCgS3U+X
+bAFkvQstONsWbegKAvRAWXa6dK+umQ87OZpGqHcl6sGbdV5y8U98Ah+SbU+ZyZfE
+pdJ2SLsCdz7FgePz4HJ6rPlZyxiMZlB2j7vOD/dWJqWanerWa5PNhRlfAoGABjjy
+Gzi0Rj3SK8VIla8xXutoqrMFPSDkE5IYaD53mQzrmBKuglhZD4VO9zTIMy4Q4CCe
+5CGrlrPRKCEWcu92FIQtSqADtnUHrOn3eEoyllkoMBpzSUg/T1AKUUC1/lLUeKUI
+iki95dI5cTuNOq+PmR/hW3yRoURKEx2GpmdpsmUCgYAJevE1s7igBMTJfRDgSStT
+d78qhmf6FPSRX0m08qMGqRkDS29MTyumY4WEwGW9WiIIkLtazirgln0bVM7rV9dY
+LS/obAbFzOi2jj6qFFG0FlCQvGcpN/mRbguJ2hl/SSgibxzWUkFRguuh6ix1Zhq4
+vx2sPeoTYMlmWsGYSvtKew==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai2_pub.pem b/cpp/test/IceSSL/certs/s_rsa_cai2_pub.pem
index 883197b2f51..7479ecd8126 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai2_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai2_pub.pem
@@ -1,84 +1,84 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTtmIyxuBS1X9dJJ+X
-7zEAab8mnxlUHx3x3hIAPh1PjinU6D6mWxWVViza579x3uslQvlCW9jstA9aNlLI
-vSK+rAKtNOxRRnXp8V8Xfl32c9vYuCOVmFNWrgPHKYU2+GbUhX0ctgZqtzRX/gUP
-MYJ13FgusJIsMq321I/4aEHxoHLue6YPIpr7WLa94YLN7y9ozmEOAepamerOIXEg
-Yn+Wrgxy/Hr8FpXEEurlrq1sY8tl7/eSWAx7g3I6yNSPAiKK0nrNhuUdoWqt6Err
-9JWCWBoBXcVxuF0iy7Etl4+pkpA/l/cImcHezKwE2OwX6fDXkbTZk2Yx/K3R9U1s
-WbsBAgMBAAGjgfYwgfMwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUDKx165nTbrdm
-p02LANSqPK3Vxr4wgcMGA1UdIwSBuzCBuIAUiabmA9ex8CyisO3ov7b+kThXhbeh
-gZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNl
-MRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UE
-CAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVy
-b2MuY29tggkAhdKR/g/NercwDQYJKoZIhvcNAQELBQADggEBABAptCiBTme6gKgw
-JVLQAF3iK2MHX2oEVvIxVdpFcBKgYs7dobspHWnf5B2Jcff53p1BxPv9XKL4pbkT
-F4c2E22v16Flv8jXf3MNu033bNhL0jt8LhhqUCWWpRCLZbFnp3cXHQysAWqmOrRG
-NXLTIBikIhiBjBynmtOVWe0qdJme/P4dHXc8Shkhz9OY1hwAbxvrDFsmmSstcsNe
-Ld1cnNttffgAgzXv7/jwbo66iEH8N3uMa82icZy/4OabudPtFFqdjHzx06zpeKsr
-+L0sNa6A7vyJekM9sLctzRbVFmDxa5bkcoerqYu30YJm5+bFAate4yiK379mqbVO
-rtgun+Q=
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
+CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
+OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
+dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
+Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
+6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
+e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
+WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
+Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
+MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
+SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
+9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
+ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
+1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
+1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
+g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
+92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
+JZSn6IpfkLAH4tM8WHSDALCJZAQ=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3.p12 b/cpp/test/IceSSL/certs/s_rsa_cai3.p12
index 5303a746dc2..b5cb8e32cb9 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai3.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_cai3.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai3_priv.pem
index 19ac41d7536..1b90526e924 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai3_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai3_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCrtlryuD/Nt1eN
-Rl/Lr55PFwoZF/xXHpHFN2hDlRgqxIB3oaR2pukXjiNnsz+jJaAFO0C3fZiaGtWC
-Y18s9pdppsaE7k2W8TrmPoERAl2/WnV3DYJCaPv0mtlDRYqusWqaNLjBWbMNH9zo
-q+BHeEuSgn+3nklfnv9JaYkL0lGCjPNCb1KSXRn2Qv1Kinrz7Ft4odtkSTVD+xAg
-1iQnRGHY/Zdy/1L7RQq7EDoq2+AZBiHW6dXRTEPzaxyimBvDLTJWykvJLOyPP84W
-z4IKPCS1bZHkQWI/h3UahDIp6atjtdLaQq3YfPzKylgRRkHse9yhcQddoZyn/gEV
-JDtfz/flAgMBAAECggEAMOa17/nY8dUM8gbgsTlKdGuzTIIwMv9ZtDibUOPdBhEA
-JRG7rK7MIxEvtBCwRt4oPFUrkRYLp5eMxp1WNY/kfwon7yOOpTX9+CREzXtHB3/T
-hBwsxIzxdC/FQAtF+4o7Ob9Z/nZ1L3+rgfew36m6m/beOISzkK/PNDEB/oPfArZ5
-ybiotNI1gq3QNRKgFQWUTH8skC7URJOE6XtqiEw9XnWRE2G3ngOlopsb2qhgrYTi
-3f34QxOxdmDJEq2Js7QwKe9AGrDaFaXSLLf+hOmj+f4oLCDnP0ET0TLXQhvWU6H9
-M8agSVr4bbZlF11+PTZ/rVvTrqn7whmuunxe8Nzh4QKBgQDfKVPyyw2wA/XL2ynA
-69QVPVbWwsH164Q4oJoP+URP/x5H7zkcW8oXEtAHPwSuZ2+kkkai/VTNj9iwB4sY
-Goe4XFgCOSMZRenGvUWSx/vTeFm6wZoN57NuwFU4kZJu51Kg2zSscik05+BW9jqW
-kec2jAKF9mUAeC4vwzMeEtXn4wKBgQDE+uXK6Nj7teeLJ5NZ6btQoKLJmuXiI1ub
-vT1zQ75fnNJ6hBCtyxun969gYU2oHwWj9pumsEAKmxCC8W1oJ4XuUVxQOsPcolQO
-Vm/GQyB7w5PBfLooHqeKw98x7asQYbgBTo5xi0L3uCKyPZM3/ZMLpAhVJd6l5Y9I
-+nHO4bfblwKBgCF1btK+QwUa8uVnrLDyKtAsbDKy7KXUc/SRj8fJVcawt3eNlIB9
-+qTO+0W62xbTB1gjXlfdp7NSV+i8mMw6XhL0NXXP30VQyCY2BpJlTYp9RubLVC+1
-h5+ZUq2ylcPvBuJ7O0CHtUnrYiVnsY0VvxbckxxGvwn8+t/KYoWlyVCFAoGBAIwK
-mE6PBpzFsY0kIMVev7ZNzg4o2uDQJHPvsX1+Hx2Yv6cstzLn4IylMgECjJRHIdp1
-HCoAyjcAEVgWzqKq3rQVEd1UOiVlHv9mgmbhGHoFDMoVo7+cM58bLFYx01l9L7V2
-JR0iVgUJ21j/H+hBlkZDY00t9EHbl+fZbgoYPX+XAoGAFne8xomgrHsXynSFCXN6
-JXBoVTnrTszy+ah39TRF4L7Tm83PR4kgmcrEriP2oILXloGyz0dtJFNxzYrCBEeI
-eagt9+/RabkaGjtgDIGpfyHPbfF9Mhj0Q/YOMjon0zRPLuff38kyhWk0M8MNSrw6
-0epgyM5rD6BG0d75yjwbqKA=
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCngOlwbPwWpr/y
++evMFJMrGVOYv1vuwts3eUPHW7Qd14fztxQaooHVvzxeJsRZcm82HwMmUezrrVVA
+OAIaqQqBjZCFmaAeGGgXN/F2FFlCtWRvUJy01+2Lf+juMD5fVK0RLcviaYGCVu3P
+IxlRPabXp9PFP3WGQcOul8cTfBpWWyZ/wMJlMwuuLmOXA3WNaJKYMF3u8vs4mm2w
+sEeHxJJYrBFlUOx6jDZlP3ZvjcqYCJRYx68GbgB8XOOyj/vqIU4p4ASan46qzypd
+6KqEdwDVRXz5FwvK8lyAibUHKgaanBAA6T2CokPMio1w4TPHKtQwRx+kRCrL4uer
+QS2HYyvtAgMBAAECggEABab8eZ473XnQBV94nQDevHgU0ZU3gXWS1yrg5iPKjq08
+ubUmWQW90twqqdSuEISjixR90ze1gnhtZYbeT07/+0IvK8r0078oGAx7uevS3UTo
+uDbkqteUfP4aepsnJ6lgU7GTbTb5N1A+oxxAmPS3IhTYORI8oYSrmUMm5Rnte5d2
+vw3JOhn4CKqsTXApSICJT13YqlB/yn58lexR5j4M4BscpmagSMCjnpEkr/FebNeD
+kAjy2Fm95Ad96NptpwgZPA//f3US3U8zIwNxv4hLiKEUeqKiN9bXvkMFsBsYYVr1
+I0PMEj2n1M+zV/NLOJRBiYqBeHK/W2oiXGo/28iEYQKBgQDqCHAPHVl6dBh90mRm
+8EYfnHNFQnGUZb5ZzxQYXcSYKJVHZK/Co8y2A+8NzfDC6vu9PqPckdCotXfsx9xE
+JIgHWJZ2afXOHXVOqHxxaEvVnQgKheTq3Ekh7uyyX/IM2P5S+oo0mZydhxjic5xS
+V+FxiTXVKBl984RFf6vRpC16/QKBgQC3Odf9Uj7XIR2ZWsOrRim0sAO0lPzJvXhX
+qxlIKSM2TmtSMN5vp8JLZZEWmz18kVVCHX7hS73mpkOarNkMoKSIQqVYT0Xfh/X3
+AMWslPUo6czq0F5Ot8jSQh1G0fVqgscuRNSbSFKtrwMZwLYhZ/BLsrJAeixvIIvO
+Jx0rfyafsQKBgQCeJ/+ap0nt0AExHnqNejjZagAYQRPCppNh2+iHou6VqW9gZPHG
+Rq20H6pwmMjo4KYpOOjByaTKLoCR+mqnfkyTMlHUSj08AnphIsmeVk5RWKKzgdK2
+yRF/Jhi9XsuT1Rzh9MBrVZgaeM7fUiPFHfCTqpc/qq63iFbOJL53mUzG/QKBgQCv
+MZfcmG+NtBRhNfAyLHxkUIi6elrba1dOPEOIRA1vN7xWcnO9v2KARTVdsEIygaRL
++3f+ZDXH/OJXWz6OXGv1/gOrVOEywwXkj9BzHFruK9/MBkCmdASJRr5HoSpQFYvu
+KdJAR/8GI3mLfkCn4IJbXxohnLAv8aa8D5pMpN+BgQKBgQC3QV7Qg4Z9df7qaRuV
+UABi+0xBMFJFvK/kGRFn26lg+0nqieFuFWDjswakBb39F864ksD4Zo+fETN65m+u
+770fEaXxI1BP8Tnz1lOJXTUbK43muVx0gBPLlJE9bUekG5r50X9EFJGH8PlSqTc8
+g+IViDFDJ/9ufkvB7HvdElO8dw==
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3_pub.pem b/cpp/test/IceSSL/certs/s_rsa_cai3_pub.pem
index f7c1b0a9906..03d1869c77e 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai3_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai3_pub.pem
@@ -1,58 +1,58 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+OjIwMDAxL2NhMy5jcmwucGVtMIHCBgNVHSMEgbowgbeAFHe0egLdUvhuGR+r42yt
+SFEH5G64oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNV
BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked.p12 b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked.p12
index 659cd45a7ff..c1b18aedac4 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_priv.pem
index 62158819a0e..7a84369549e 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDIYXWIGMmbgMJ2
-zTuHMtbEEKBGpbnkuXmwPCzQkUsnT2aFznuW7RrmXbzYEXIR1cz/o3VxxZYuciMb
-icxp0PfmpxEFWV0h7u/GSoWqQtBUfYy3ksHd0zBYKVs6bSSdOLDrCZn1XLUlq3Fw
-BilkswET0wdIzJEHwlcmDnvp8UDKqaiQLydJmlgKl/cE1Qka4dOlnxXWQPo4SdT3
-XwJq97gXO1I/eyi6A+5417a9MvsbDKWS3wX2WBkYWr6eymkTuJcXdg5GboENO8nR
-tcZp3AawIcy6/pRutnaFsEdBnZpsYz0QS9Ay/8enFMtMOx+BkbYC+LoSV0CjmUts
-tlcTE3DvAgMBAAECggEBALycv/yzGFH/CQy6ceX4vJ8g5zyYkjnxO9HfUm+f05XU
-7zPUABE4bbGZWkAna6/OB4A5ZDsLOSnO1az+MCMKR84cQ7E9RKTEO33yd46kBWUC
-KIpC4ajjOQZDJ1P/mA9FZYJXL0v9T6V9kvFXW28l70WxxZGIvJsJGu7/gzPZmpsn
-GuT8rI2VHWurTYCtvJpsZR4Qrm3R51Hlt6j1w+Z7ySgZy10f5B6Ptt4ue8T0aq1E
-8bZLciQsJJPVx+xhApMxImPPes7wUzEhRH/4aQpMbqpVHnSsjvc+L2H3niE0MiR9
-ZA4jzdgxPF8oOJVBuSqGB7hlkFLueXCfJ36BzlQtS4ECgYEA+T7EEA5SLmvZNLbZ
-QwA3Sbr7MBWvE6tD4aln7eMEHkasJpZiJzpyZuz4kiIyjIdCKpn9TWvVg82OtPJb
-xMxKMeOGZQ4c/GLTkuKfUkzQaq0tEQDyHNan0F3pnauISUSg3a8tYa9ir2+KS+wt
-s+QNyPQHNcMyxv0hc1PTX4EB9xkCgYEAzc+tWadwOMF3+SIlncQtgxE6GxOZnV0h
-AFt863IkEsbi0YdjCQH+IpiQldWIBP8XvUp/WXWzhA/TQnf5L9Tgz2uSC24fHODm
-4T3IblNWNE1OiMIjBxDQo26xpZlTwEVGgO3idQmtJOXAg5GcBJ0FS2JZ9XvM8ZHq
-UJ7XKUdBUUcCgYEAmnezut+lPu/H5UuMymFP4nnnQp2tq1rw7uG2b0/KNZlHB4Mb
-wYQPcopaYvaerUkGULCus1SpNs4mKy4ogYa6VMDVgbuFa0U0KkwYwUCpyfMZgvg7
-FHRT/Ga3aefsxruplroCPhAb8O4Hn5X3nQ0xHeFetosK5RfrqzXAQegJ98ECgYEA
-uSwyhuisgpQncoLzn0gDvtpAEl6HJtvEtoKaGWif5jkFmImcZF1jnxLve7Acaopt
-fIVLoVzSAG8Qn8w76no5LsZVJ22UFrKPaHbjH8hhVjt7/nXVeCT74x/UO++BOAvc
-TGI8Dxt+qiUBGh9nZYs1WUcLM2CI24xyaskPQ3d14D8CgYEAxrB2obY20gZMBAxU
-9SXMZuI+yvNYpnmGe8kjkPo4w9eYZXfp6Pp8WJdqU2eWNUCTArQg81fHj1MFRF2M
-b6wbWIegs12Nh+ohRk7/7+i5l2050PyEK9XRHbe/CdNml/ZGmxDayuEN2NDEZ5DL
-EyvN/3O+/fbqGpyUqWFTz8dth8I=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCM0DAxl9PZ8iv0
+0bZ7pGas9+28BHrRqHw5R3n+92ESnTePvQ5HoHVxhfomLz5JlEqyPRskL797SF9H
+M0UTUB6BOa9BgPJOSOlYUDMlKKTAyprdXgAQ4/T3yls8Wi6SjCoHlE6jm66dRXy3
+xd8ZYmtuN2KibZECI9dpLGVdERhRtV8zl6dMRL+v4UEZCcnsa6qp5ke9NTKjECyk
+CDdhvwlBpX9OYfHCcuPZSnotf7l+1td7Jxc9fB6/g63v55jyMa/nM8+PZVvLfcGE
+AYX4MlZ3Kg3AhjmIaYb7Sd/qUW7LSoXkiojAE2dCQF0F8YUmzUz1T1g5RYtHwZHm
+ug00YtUtAgMBAAECggEALEjxTzeDrgCGqHkn3dzHWdCjWMVD5xoI7262RGSCh/sf
+1TnM+uPQ68IJ+OZUvYlAsKudFJVbsCcDp/3M1JUW8uc0YfJuwgYWNOsMGryci/Fs
+IQCGHsnCagefB+0IxpgEQ9v1m2jD0rxey+EUGASm6sPKZnD08Opavb3zpwBQWKmt
+YmPDZ6shihscYgptOvAr29SQApMvAQMdsSO7yYfxc+D+oQGAkjwRwWy+cL8K1szd
+2WA5m1IF8IsrwGmdLRhdZybEAYJhAVQ+wk79vcM66xl0uryZdgf23WN+G2kU5LSa
+q2f3oW3pnxNNyQO543aEph0SfLSCVW1+QVJVOo4+tQKBgQC2mNswiuR/RaPYsLsx
+U0mJuG8PrDiBFqrl3QHZsV41NXsOQLQP6FjfCNU2hpWVBW3XsQUtrkpofOZiWjvF
+voST8DNg7yJ/gHuua/7WamfPoZZkd9fVtmQCLP3jqTvH171FR65H8O2XozN+wAE0
+5vtEz6A4qWjfyNEdbsogG8J4ewKBgQDFa1ZoIYqqTBl7RbsGLiARw+oPuQKJVAeX
+iF7NHEdnVSfjm7G2iEeNe+FcrF+okZvqVhYZwbnAQ55/ErEiOZtEYyhjGKlGJQKx
+y/Zp49p9tqhLPto7ZWYHGwBv+kwphNQrSVlda9ODBh3vkjHO6WfVr+QaFlbgD3eL
+eUJHrkA8dwKBgAE1je4KXW0CVw1uTi8LcCc7U3D1IQKp1cPj7Mk2RXtwuTnk78xT
+K5N+iXrs9TyhZpLRF0mwJ8n9WcE4+8BZfKNGKfDwZHgXr7n9+RgOaFWVqltL99/w
+b0UcayoAyuaN5TD6Qoszaz9f0015lAh3px5TiaoWZR1mRQw+2ZPQ2z7VAoGAICdV
+UWx1Gzt9wvged+k3S+1ux9TINvm6qtGJLzr13jyeXJHVJfeYP9D3aZKhmeDtVgNj
+YhqNWGUrAWNX+k0Lnt3PjCROHaCVicPAhIqZ4XPIgUjhXl8reOjK73ICyZhavhoa
+Nf8D2gk7AvP6rMqTINie/Ci7SY77V3oOc4JL8A0CgYEAn94Ny+nXnpTQI0/99a7Z
+QYfaZEwHmu41p6ueuYLgIyXlVZLlCJPgd3hLYLgNkILqD5jq/fM2EE2LdEpuDZtm
+IlfO7oHnfQeCnY9Ca0cgnMxDah76cA6OpehyI+uGMHrMvyXDNri69E3D8XCbXfLs
+VR++twAOk97SnulFzzJWcx8=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_pub.pem b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_pub.pem
index cadae49e17e..f2a7d40d7f0 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_pub.pem
@@ -1,58 +1,58 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIYXWIGMmbgMJ2zTuHMtbEEKBGpbnk
-uXmwPCzQkUsnT2aFznuW7RrmXbzYEXIR1cz/o3VxxZYuciMbicxp0PfmpxEFWV0h
-7u/GSoWqQtBUfYy3ksHd0zBYKVs6bSSdOLDrCZn1XLUlq3FwBilkswET0wdIzJEH
-wlcmDnvp8UDKqaiQLydJmlgKl/cE1Qka4dOlnxXWQPo4SdT3XwJq97gXO1I/eyi6
-A+5417a9MvsbDKWS3wX2WBkYWr6eymkTuJcXdg5GboENO8nRtcZp3AawIcy6/pRu
-tnaFsEdBnZpsYz0QS9Ay/8enFMtMOx+BkbYC+LoSV0CjmUtstlcTE3DvAgMBAAGj
-ggFZMIIBVTAdBgNVHQ4EFgQUCveNWzqlA4WoblxS1vHuePUhW/UwgcIGA1UdIwSB
-ujCBt4AU2amOV7SSbtif1SgroCifQgGe8kChgZSkgZEwgY4xGDAWBgNVBAMMD1pl
+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
-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
+VVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tgghGHko2c1Fk8zALBgNV
HQ8EBAMCBeAwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovLzEyNy4wLjAuMToyMDAw
MS9jYWkzLmNybC5wZW0wFwYDVR0RBBAwDocEfwAAAYIGc2VydmVyMBMGA1UdJQQM
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-bmZvQHplcm9jLmNvbYIJAOGYOElEzDTWMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
-ckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAAsID9xkCD3L7eGkeY/J+N2U
-q07EuULqsanW0fq6dB9EpEu/u4YAmUlNc0oQm2gKGkYfSC9iXzxfpGGgdVlQKpmL
-VHC207Pl0WxKNhhSQe8JYDs+iR+n+4fZt/HnnK0Z1ONJBvHsy9bpMbzJoo0CosRb
-KNtvTr3gA3x1eTiji8qk3Vzo/N9iyeW8gcbjuHC0j3+F96cf6Zt/1m5mqDSsOKyu
-MtqTvC03CzCTrHgJjJRQ1i0hW0oCu6jRemlJxSAnpJOQN6grtJX5vui6i+kK4CKN
-dh0KWY7DWdEE2rUaqxcy0gQM83fC8pL0HhJ4HJK+BOqEhZ1cn02nz0uA+HbmZMs=
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4.p12 b/cpp/test/IceSSL/certs/s_rsa_cai4.p12
index 3712acf9d8c..7e5eb262be1 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai4.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_cai4.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai4_priv.pem
index d842652e775..ee21a4f2c92 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai4_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai4_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDC6tF4jgl3fA8f
-UnvHyvvLnY5VvskVANLiJC6OJsKml7RYJ3Nw68iZfIk7vgQt+6n2KU9jbV6FTqup
-xMdDxLPheASNFp9drZK0grv0Nv68Q0AoKwmWqAV+sm+nJ9CmWiUnSSZ+NTlsiReD
-YRgitKnpHNszraMtE7CcjVwhQjrRMvZwoSNSzAACDIYFxWxrveePK8uQxdDykk3K
-gH24KEjBD1pY3e/VJH9GZHKFCIYhXpE6ayWbx012MT/fvFTMnSIfertWchBQUiMw
-ENJgpbna6Wx0s0btm5PYd9YblHGy3KWBtkXBFRxkqaHONcXxIF1mjzzTDBIO1yuu
-3BgLq199AgMBAAECggEBAIADfKNylaEVp1Do+UaUd56Y0bxa2vGiYt4G6VSO/FQx
-Wk5zSowlLtAvTGoiN9iDanKzWuJwGB3xNyj+hehqLcGs80A+VVhPAQTwv8R6wf6f
-JGm9KkT6APHe+xmLOqumlLQihNdq2VYBC6JLiHByuwzQ2N4t8fdO8TVAWfu15a8y
-ZcJpN1ibbmeWuaXwys+k+YnEG7bw8yqrT21mCKyUzNoVyFeHux/o3UKxRhU/mUx0
-tmd4Pf1uhegXlgczYr9DWqfQuWBxWn3kEX6XC9Ruhprj2D/dSR3cqM8X0mLEfvAE
-ZZyqdtPbjHgzQZ6eQk0lzBUb9ibWqaKC/2JWx0Kp2LkCgYEA5dspizT2VnpYmgrw
-kxIJhzpGmEBLybm6ysytUejVA1Js2kPGzcF7z7EQO+scSVV6269cYTNJfwNSodxP
-beiPSBSy92oxZ9kVxd3setjE1ojpmFu/Fg27VMXsQjqaU+X+i7qC4aY9HWIg6Pus
-TGppaRchlt46dJwhEAlYLk5Up/sCgYEA2RZS4vaTR7Vf0HMyrNXbk4xy4JNug0r6
-u7dcKFtG/Jd0s14LTiOrjr4sqBd9+eWJKyCyi7R2ysgB+DMFr6sxlftYBm9MpJ28
-3KIKNI/ARtEKARBL/BaGSikPM/BymCciLhbN1NvqQOljj9sE5T4CeHxwqYUqBL2K
-klSaIs4RpOcCgYAfYvbgSGIe2uQAXOAO5Rah/YYoQhdXO2JTUPGVzrpPktDEWR7r
-d7ElYiM6W1doeCCnoOF3cF5n1pdQ/Nlnw6rVB+aMPFb0vELp2uzwtWrjdJyZLmYA
-Z+2dnM0vGft621wPzm8SyvVrbrvZtIwJfzpXnE384OmQhMVLAEunPxD2QwKBgQCK
-qybhEc68hJAisCNTofvzwUh0SdjTBycol5THtp6epQSHuvAPxttEgBg4e2EeKtA2
-+1jxwqILID2Z1MWyE/HFs1rkKV5U3OmSKfPI5XZWBhuU2FshOSYo4xdx/wrERGMh
-+7EZYiy9sBfIAYicAsNDQYIZ1xUjGAwXMvGOgAFnSwKBgFnHeRP/BZlJJdvjOVR5
-UMHr4hEw0EvmXaNgF/oiViy2bzP2HQFunMQR9PbfPi+Wt1raSV+5G96JP0bqK9QW
-Cupa9nZ9xCMmx0DUIINwrnJijT0owMwvNV6ixT4TRpamgV+6bkhDSasi/eKCK98m
-ffhS/fPZJAjShEkb/e2EHFEp
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDo07ESMI0oDzwd
+aPIj/LxuDtS6WYkUs6RlU+qjq9dtyDD2Kv5cn+D9BxFCMmucMXE8DsaeMOkD1dbX
+tlTRsOEERSo1NNEOhZZsG74NH1yc9QkQqL9W9+Ox8QrbBqhpxbWY7NMgiwN+8UH1
+RzkqeM83NvpGodz/KEmXAd3MbIECnNcE3tZypwen2bddZdV6m0aZ5FqvedvH+UG2
+VHvxFFMJ8WiyeRR18GMA/Pr/mrpokToJf78lzYuzSqrHSOWcrcU0HYRrEGeRyYL7
+wzkeR11+rD0pycrZ+Pty0dH+kb9VnzGJcDgES5V6PI9QdvtOphmc2sr6t72awF8R
+jCg8IxJDAgMBAAECggEAJZIPh1dlV9sJgNdwB4WfpITpJ/8Nw1TvyNgfS3UN6O2+
+lOLANBMqm7oZu1xmiAhkdOQPgfRzjYZiymFmU4Ye8XD1zCsvNxAwg1aAtx5h9AQI
+h/MrGS4cRJkYftqWr6bTVI+WzDASitgEpD9vhp6DFa5d+arh/hyyr1cCQxwZP2Hf
+90b2sAlDM2FV1KRUzAgW3ZChSEeTb9XzmK9F0hE1Ncp08KnRMR+OOIEGgKrrX2YX
+5vNg8qCVY07vzzT2yX5uajSG52T8wcEKuKhINVXWrhcKH1Gh/ZkVwiZmrIZlSXcn
+DdhArThc6cGnLJyzHC4MoOb/w59VkK2Gire8NBjJVQKBgQD1rPvgBxrI851Egsm7
+VB16MrwlCN81lU3VExpTTUVHnOHJbrscSvL0nxp7iyz13IT6iLYyyob+F+4wZXWg
+c0RwL5Bn22celLD6PaJRsyYP49JB1J8UNAFKRoAjcVCm/wrM0wQKzyOXUv3iT8RI
+1oCQ+8i43VApHonjybGti293hwKBgQDynHp/owsYbfNWtseXYD1cuIEjJZW0rQB6
+F+U9p8QSe3v6i8BYXhjJ61ZvxrKiqWx5q9IC0y8GECCfqEK+OLFcptkFkQgWdoja
+z7PhHzEiUx8DwpaC6Z+9ZFR4SzdYIHFBsoepuoLTb/XyptImDE0RdbaEKaaian29
+yIGhODZGZQKBgQCQeDAJ1sO2hiPmZO7SXS2UbX9cW/I+pVUGxtwFPnxOF4BjHt2j
+TqO+nE1Ld1VyI0KDvZ8/EP//Lf1gsllQiFgnjKDjog7q2c+U6Geqman5UCSVl74Q
+eGCF2B2EOh+OhI5KUpCe9p5cX25zBitMFe+20ol/xI1eENpPfI0im8tpwwKBgHap
+HikLX8PlEx2YbGqXgau1+kNsgJpL+227/j13rqiziOH0NHGEJG+uESq+bmSspQel
+iCQlklxOywYL0AklxWnhmUfltaT2+Ny8tegnz2pQaVz3cZI6Hg0N41qqvzj1NS/C
+2COlu5MasZqrCSHe5lrhzhE6JexOVY3bYbuuuK0ZAoGBAJeop2Q6SpvdY+XmXHCY
+buxB24PtHDWYVS0BXz0cTuOI8ISNE5JoSB/iU87O++rfPja++3MEmXe0qQEPSGQI
+NXuEO98DHcqIdgD2tw8imSFgAJ+oO0cPyVjsqx18uFQlzvsCm1DrY8YrTLFc161y
+wB42B9T9tEB/l/w72RoYzvLG
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4_pub.pem b/cpp/test/IceSSL/certs/s_rsa_cai4_pub.pem
index 3d6020eda63..4860ce7eeb0 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai4_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai4_pub.pem
@@ -1,60 +1,60 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIFOzCCBCOgAwIBAgIJAKu/jI7f+3joMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMTA5
-MTYxNjMyMzBaFw0yMzEyMjAxNjMyMzBaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
-IEludGVybWVkaWF0ZSBDQSA0MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
-LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
-VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDW9CwWv7bxP2hYov2kUuKshDNiiLJ+GnTL
-9XQwgGvy9pJIizDhyrTAgvNAeLY46TNauZpUKYGXv5qRLLOckz6jgP0tKDTxpBpA
-ZHA4bFybi+TkgvbrWOPypTs/ccQyts+8aHw15ZUdt+P1kVSEIgR6+ZC+Y2nvEA7Z
-GUMGCkUd6WEMwQ9uhCH2eb4c4i0Eqt66DZyZjZZoWnEXcOQypdBBDStpX9Ea2LDO
-Z9jdCP0cQ7aQoWE7VshmKXJtNQt8Y4h3JPmn2dUJBdtFBaLDtyVw9EyYaW5++MXh
-zERxf9IZs40eIsr/FiSuBcEOBUhOxhSoBCe62uUfHF+/YW2YcrdxAgMBAAGjggGL
-MIIBhzAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBTJIksqWuICC9mJkR0dfKlkjZFV
-MDALBgNVHQ8EBAMCAYYwYgYIKwYBBQUHAQEEVjBUMCIGCCsGAQUFBzABhhZodHRw
-Oi8vMTI3LjAuMC4xOjIwMDAyMC4GCCsGAQUFBzAChiJodHRwOi8vMTI3LjAuMC4x
-OjIwMDAxL2NhY2VydDQuZGVyMIHDBgNVHSMEgbswgbiAFP4rfsrBsjyhr+NWyhyQ
-XyKTc8y7oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNV
-BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
-EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
-bmZvQHplcm9jLmNvbYIJAIEr4TCFXeNcMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
-ckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAIYce+hcm9S5U325ke018B83
-VmTyDPPs4DzUzxw64MJoKHG3F/1p0uHlXtSEMomokb3L0ro6FJ8JypMILGBO12d/
-SuR5yvivDQa18ek6654n5wupeWgzUOSsESlm8ylykFV1FNS1d34taxnoPMFTm/6h
-tT277HBSydKneAsIS+eqTwYrfkJKUuAIXMeNAgFC9dFzX+P6yecHj3bpxdqwu+KZ
-VGvHT07SDa+SFha7o2a5wMfkmrDnff+qGEcB4xPPv4aGPcpU6UNh1aluQeO9Rb4m
-uk4LudBow0zv0NtVg+HFYgIdbmuEmAgsgyatODMuMIQKXee4Z+Hfqc/eyqycw0s=
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked.p12 b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked.p12
index bf2aa56510f..1ac63fe2055 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_priv.pem
index e3deb8692fe..e73f031a5f6 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC347YlrLzSpMN9
-mLeXaRsKStN+Jy+GqL3BBrhmbuiEZYSPaRrutJKl15aII/9Zze2skCYcAihk/LFQ
-Cd5UrZJeFhfX+gt+wkogeCI7VvS3zoAtnh8E4v1JFxe+yZBPCLq+s7pofaeheNqZ
-zSoIAGucqwumLOb6Oz++XF89qY2I2mmliEJ/V7RGS+p4LzfO5wvhWyIc5GKCw63e
-P/sMH66EGZoOg005MT051Q6uKcb0QbYLMmoPqUup8//g8c7Dvtn2H5woTLTD517d
-ike3ypAu26zuPTQXFXsHhi46XaF1H9b7U/k0Jcko763HiZbzyKT0frfnwVbiy89S
-LK9g2MlTAgMBAAECggEBALVkav246j4DB0+yQI+bv2+kpgEQGGKFu0BYJ7freXN4
-TI3GiSmkd/AdvMCoea+VYfjR7LW+LyiG10Vzppvy56nlszl5zrMIZmSm/GV6fkV9
-7pSRIFoKqvzZSbQKUk6T9to8ogmGwb+XXlNOvUJNX9mYJBKUwndd0KAvsEc8JIAz
-/sQJDivjmKBkdnxCSg9BIPt4Ab/aRa+IEUwIh6o8B/URUSuujjR9J+AL1vtSrK7T
-TZWCOLrFsrVBBBDMb8iMqnOPOEfPa6cR0ad705oPAV7dS3kt05B5pQyvjMaDb7Zp
-T4XeOrsZi6dhKswD0K3h4dDTUSs1UwDBmHxOu6MQlNkCgYEA3tpYj3OWIf2CBYKl
-wUqrBdknuBt/l7FCm07t6ZJ2/o8LdDSgdCdW23h9BvmCnsReMbsaiUHJtZ8hLWJh
-rC4YvvWkglyvnrbwmR2XKkSNHDeywq8uDHe7/nGIiohTeznzyGUYdy895095pppy
-GvWVweOmEXTGw9oZ0AoSdgYCNt8CgYEA0z29r+nvWsH5pOZb+0GmnPGrLbASXgv5
-XXdX+kxo2xnHZu/omSbX6dGk67E1iqJCtHV54+26yMMAsHSK1ZhN4J1/suxYC9YA
-b5Vr8vre1/2kw//EDxjhT7vntA7MDVz3Y8HSH3RLa8JzTIW5qoABGHWOPxN5bVa2
-UxEoMvDEAA0CgYEAyDIqQKQ7iMluFnkpYp0rShOshM3fL2yEQ3UCcUOsNj5Wscvd
-ILt+Yaa52pwm5W3OmKpWylsZU1liupyY1c6LWHDfmmSdN91sAoD8nXH7ug+nPRGW
-MokVjxx65shVBmwnPizjb5425CcXR72TJ/ja0dUqCKB5NtQlQCjsMK5xKs0CgYBw
-Qxak/5EJzZ6rqRTnEbvHGpQbYsBQJNLwfjVOOv9auXeEWCloAwGqLJUWAQZwV81V
-dD1ECZpDiYa7QCRsYVW58lnkL8CXAbMXmfRVnEeDyDOhSjLaxyEuq7D2uwpsa6S5
-6k6OEtLmQN/fog3K894hLpBbKzFUD0o0GSEg+V1gnQKBgQDIf2q7KjytqkyMwgrI
-TMYl4y/1eysMnCVMbAzara0b1kkm6DXFtkfL0IuxEbWs8eW2visPtG592zz54fMM
-sVnpAqXKFYPKMcTLIfu8AwAZZ2CY3xfWcAnKIHaQuihFHndD4OIVHXosGuQaErqG
-vrVxHcIRoEHuADC2sHRgIm6z3g==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCiY81cRolOEtM+
+bWv5mgwhL1UBsOxFgSdzTtbjUtglOSd1yLjPeOQkusUN1HWYd9RTvrvy+u1X8QFB
+dV+FQLrwpqJlV9OKbnpqTIxXkOMJ3dSdpSWPDdQOwGUfqG/LVuOvS+RlTEj5TYaR
+g8Fs2ZnXMA9TfAAWODwFUU/2L7iqJhsoO17AG44EhUkMmlrunRDxDA8ns2YaDFlW
+tY9GStEHAt+U+D5TmICp4h0+4I3ltpLZinC6GTu/qvmI916W1aoAT+uFQPGEfgfS
+TFJzo5b7xqXdh+EKYhIXnEnA1//o6Hpk4zHAzdYMpe34R3ypjDInSsVI/9D/tdOl
+IJFYM7gRAgMBAAECggEAB0r2IQ9Qj39hmfKuEe1CJmruUA2vd5ufmu/AswdGptm/
+P5c+b0rdlsIF3CqWIy7kto6Lh2kBRGQgGYiVyiqL7HlGbR4LZXnQBV5RJdtfWKik
+8MqcOjOucuR7gpOutg6Ey9SxCCpA/g6Q61byOhP+yF7jncJPwcwlZQWFC692E4J9
+1OkQOj8KfvuOLFwebhdLqu9rzayfTcTxDnFJDXU0dHY09WoemIces+xQ7yKiQoBP
+4PuhNuGfrsGjzwX3dOOi2zgdiGf4OyB1NU+blvgSCSl77Wo5ynmxir8gkw8vPUi2
+XizOCMuwsLs/SbhxORZMMIgVLuIT7AtjG2v9fFBIpQKBgQDQmQOtOtl7LSBeAAIL
+SBRjQtC7FeP9e0ufMpwCak27Q6DvAA+Yxdm9OXxZptGvsOljz+owislHKVjgAmJ3
+EjmB7t7e17d3NepCHSxBXNPO6wGDAiAtl9dKnCFeRSG2yIOEYVeRyoXwBprF20lG
+YUp3xJ2iap5f2otRBPUNAcbYhwKBgQDHSq/UQaRalnbhX3OL95COe7LXdVN2/GsH
+X9glm6ZTYiPRtTg94DUGnMtIEqPeQKOTET7f35XlV6XokPOmpNKvkNcMuqp3Az3M
+ONty1ThSHtM/gFzlyUbJ6wuvDg/AfUOBELF7O8NFP7J0isPpZQfaXEYtYvGVffH6
+zy3EYtXIpwKBgQCE68wk+agVzoaef4DN8YtUSQI7BNL39jYU5qn0/Ao2Nvz47uAB
+aKm740Ky2hMp0iCWgqlnbzidCOLiM4LM/yb3/d+0vl7hLtDseix2JhGt+6BF+/fH
+NcdxepXkvUajc5gipeioNRYuAfdj9rz1hQ9vzDDqiugKindWFEOWmzg7RwKBgBge
+Drc2FmisCsjtXzNSC1li2NrAJRCiLWWgEK1Eb9VpbAJF1v+N8XzSXrtjHheYZPM4
+RA6dpSsy9y301LeW/LQoaA3vTQ/IAaOEQfJcoUs21cO6igN43ysyWaCeqANYZWHq
+HkBWlCP+OF9oJ5tIEbI4NnnpnmjD7BO5HMXGXC7DAoGAFPq36KhfYOIzO0prmyPO
+dMenRlPa0PhODZIz6ZUCUroERcXYuG7amLUDGl3Va7jGbCK3Mt81lvWUBSdIeaPC
+EtOPr42VXrbViA5svisgNNLQgQfShIo8oy4ciiqi0Xce3u3wbLJuqXyUWqASMqbE
+jpiOHwmr9Oz08XVuTkXd3Mk=
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_pub.pem b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_pub.pem
index fefc75e47d6..0489a94ccac 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_pub.pem
@@ -1,60 +1,60 @@
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_pass_ca1.p12 b/cpp/test/IceSSL/certs/s_rsa_pass_ca1.p12
index 778a1cd13af..d702b45f4aa 100644
--- a/cpp/test/IceSSL/certs/s_rsa_pass_ca1.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_pass_ca1.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_pass_ca1_priv.pem b/cpp/test/IceSSL/certs/s_rsa_pass_ca1_priv.pem
index 95b7608782a..b5d50b7cbe7 100644
--- a/cpp/test/IceSSL/certs/s_rsa_pass_ca1_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_pass_ca1_priv.pem
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInqCk1xVLodgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFwVRF4sJfjkBIIEyGIBRIl+/GCZ
-BKvuDfMFb6PF/KDrrjVTvzXkXW07us17fjqbVt1e0S2jBoKeVt15HBtLdIE3XySG
-W76VyGl/7yJSCK1qmL23R1emxorcEzgjSBfWPd9MsWVuYQ0sWQh/Oj2nt0urhtiu
-3RK+fk3M6Z2FZmL8cKThiN7SMVSgIMQVJd3XXymnBWstNBWCn0vg0MLXcRoYtTFI
-ROHGRHKC/tdG1T9RT07PQzJSq+EsiiclSgh4mGJWnbEAEKwvaVwKEsYIJGjYrQXL
-lyySBghKzT9genjOeZ5UfF3XlKhfWpJvMDyNc227D/qCDI5TKeV/1qMWj7Y6Cv6Z
-sjNCzBEpbwgxZ94SRJwhAfEzPlRFrhve+GDMHJ1tz7wTWBGRsWzVNDiTKN9eDeQY
-ySybHGlCvdpiyPT2SAu/A2Y6cnq7pKz4qlWtQnX6tB+8KDvEy6Qoll4kQ1HK/Ime
-17f8B1Ni4txSOia4RQxqkj2zWpq9tkSaGdk+LF0n4dx/u0mqBbXNZFepuUh4kK7Z
-AJ3y5h86iBwTAdhA49CbWZ92MUjpEvghs/iCFLJ3Kf8ey3AeB6G+Hm6JFF0gZSRg
-kwHlXihHEGQrH6hkAUs5HMlw5DoImeBwVY8b/u698zvsxCaiO83t6yHWA+ou8TyN
-AmAqbCEl+4d9NmcjwFWc6q9NpvMFU0Pi8rs1aqmwJLW1iFQxONJaow+SjMPrA/6J
-IVnKR82kOCrL1Wm64/3dUumRYGGMSizL+RjqOwmX0VZk3LFkp4BQTpBjdyygs3zB
-HzJ0UvsWLTFt+ehUsO8HL3cbEnuQ35nBisyus4afk1zbTEOyACph1MmTqtq0q9HA
-aOaigQPja06ZRf4251pJlJhHV1kOle9F/ERyanz0Sb2hAPmexAWzsSZ06RpcoJi0
-04V4Dp8RiQNkVGgAKMNN7BAYcNF8te/Vqs6PB4txAlRVzyXa4ytGOblpeoSFWKG8
-qfFpBdONaJaNKEzNTGUydC2D4gpkQHnUA9vJ+7ov90DjBDrGP+ItkBrTxXy6ER4l
-8g95Huay6lHbx5+ekmAs0gEdZIL4Chq+On+WPJU7WYjPhuNHs3xE/Xh4mu8W454C
-nTeROH5bAeN5v1TVggmsuls/VxQ5bNI0ycWFSbesWs/knaQiyMd5Qtk4eRb4tEP3
-Zf8QHLMmq+N6FR6FNouVLUN0BfEQN9LgOGT4W0+1B64Ood06JLnsY+LJql6J+Ctt
-XmUJ+UDMl/1wY/PrdPRTrqJDaN0ZCYz3sNRJ0HGtinNbtRYeqP7kkr9KFjC13xLX
-X311x/fXW7hs4hLjxIIb+cv7fhzrBABnURg7AijXJacFtMPJJExtzXTmcDLfEiuo
-Iz1IVaHjw2iW+Qb0pE/8BR4LHh5vXMZ/XlyGucRDLr+icUT2R9vvoo+uneEdg+tY
-1qM18ETClkJAk4lFnvNipLcSRENYenRTRyWNJuGHeYlrkIujNfyw2XTVXLYVcfzo
-kUIP5yh3YQj1p5ZyGNFn5JbP/FZyl2yKxF2TolN7127RJSGhMWZHcSoXX0gGIHut
-91nIeyfkSTA8oVNBJhf1/lLvFAYetDp8N9SeNt9czAUVYDnYwq1CwkgTdieddrzx
-wgF7SMj5PuVxbJo0jl7V/w==
+MIIFFDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIa11ufb3QJDUCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECG5z7FnKihuZBIIEwFfd/9I77beT
+tyV8JEzZx6HFCHJtVyfZnjOqxtZJEslf0O6AhTgh9fW6Q407foCrdeAs5FsatGsP
+xqpUqs9t0SCQ9amoMzyBH+oghvQhwWOt8lX1ulHcncPEUhouWR0r7eiKIGWbJLdm
+oAvWny6UdQ120CI7WwRq1koXEQD7MAZ6EF/9aHTdmCRWa0tEqzyFcpjO2OrWw8UX
+lxNl39s/grXNevs5iNh1/i9fT/DSa38dbuezGe8dtOqkzyDCTYOuaX21CANDFXak
+RR8GNUyYLihx9mriUEYmzgSoXicrfAh8wAiflRcuNS3paF2AdB2IQZBZyBP6i1sU
+y0CX2e+iLId4IseHcRDCTzapoPtc2jYQvss9NGqfT7gdsiQZqcWAeqMueY24RAqS
+gwLWsBFlhBWx+ymHSOw7V68OVBoiVI5f+vCb12K4np2TQ0ZPr/aW3h61rKZ1G6Q3
+PeNeTV7qI7nKKRU3q5Z7OkEvAYnXaLGY3WL9iNrEJW6zgZzXIWc4j219JwuStuyF
+5JREeyv3tEfIJqoRZEvy56Mdvb3IqSR0wc/9myKkFfw1eGZ7ib1Isl043O1l1h4u
+XQMeaI83GKHUmd6EFeOGGqpia5afxtUhJ0iDUBh92d9T/ZXw1Byo/GDiH8CoRh83
+wDb6KdklHVklc6cfcYOasIzTw41cHWmAL1G0AwoxAmQm3vznziw9d3I0+V+RFJCg
+AeoNKCic+sq5t+YmyyjCWjOF84d7KO2njZlJM1lg/E2uRMc//tc3jyZfWwZLzWJN
+61w3ztxXICbgV0zHynnP+ps1FZFAyHajcb0n8GS4RG5oXEs7/58KeULR5z48t9kL
+CvjL1I5JHkzV2SDJB4p7sZL5K4RBIw3i2vkBRhiGQZqpA8OB+s/iTQvxxQhak72d
+qxgvXvJ8QeNIhcrCXmHXvbxb9XEBRn/dIEaowucw6BYb0Nc/1QDXirUfQDGp100X
+2bBBmPfRv4liHd4DITNpnpbX5N7Mt71D7CBJTW6No1of9ceAYGRATKLodXCA/4yJ
+vrrDH1du7JwWDO8IWMFuU0EwSPyvp8/LxnLeKHr133tTX7OMb+PIfcPIziQaLd3/
+/96RYPpb+hYkwP0XsZrfmyPMx2UH6xiHbsyA7hFbHZzdRIx1LJQDMkzF2fYWEfoT
+nFD8RkHdeJYr5eRGAAVKMb3JUPcSs6si37hL7Op63qS4lECeyAtY3KDBkvqJaKaZ
+BgfY1DHPdHttwYCXgvQ0m6+YlnXBwVStYac9AHc69dBLlTbEQ9nITw6GztYJfww+
+3u6d3LD4mGvCObKF3QPoFOCwEyfreVOq7VLPiZiLT4g9c3p9FJrkDjD8thlvr0CJ
+mYWSnTyXOt1RJVlVSHdLMQJhNPOQGOvvkPPdVMkqCXkHLABNK2rjKrkQubYUbmE8
+VMxWiijf13bqScyMIo02xkUL2heWE+19ypMRwJN8DVXt7kXfem2NKUuo7keDUMEq
++liUrSoqxD0LLaY0r7RbGMSsGPJqwqbBiqLAaG7DXVuJKYc6G8sLAmiq2S1POxOX
+gaGYqSFsNoZ7D8OQPRc5Akgga7DGFp9hwbdasl7D5HiIP8E+Xw8si6vKa0UIOwmb
+XMccJyYAZC8=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem b/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem
index ee6a9a654b7..2d0f4276151 100644
--- a/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem
@@ -2,27 +2,27 @@
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
-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
+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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_wroot_ca1.p12 b/cpp/test/IceSSL/certs/s_rsa_wroot_ca1.p12
index fff31d6eb33..6785cc58941 100644
--- a/cpp/test/IceSSL/certs/s_rsa_wroot_ca1.p12
+++ b/cpp/test/IceSSL/certs/s_rsa_wroot_ca1.p12
Binary files differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_priv.pem b/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_priv.pem
index 406c9f08998..d78c442a8db 100644
--- a/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDkewo0/CpTg+ZA
-LLmYxf/UFlBtuvwDcjHlwFmGEMISuItNiCdFaRjoa/vHamQiBrMpYUG1ZyVOfeiP
-dh8vCU+nT+4tIzhe66xvyu+aeZ49FZwLy7uPk2eDJI9ojjY8gtNx+ax+b1gwLjhq
-Vjsg3peAQvhGjael385ELVM4ODDnUTp4bqIOne1yNZX+XMoUxrXdYXPM4VbNZm9O
-Xyokv6ZKrWKw2uloWYYcgqkELOcnl5qIxOT6dZTdjqtwDudDMv/4YpOenlTnWJim
-xXO9sQmYoPtAGxoOtXUhsONcGuxbBpEB9GJWc5GuON8+0GyTH47DxvkWQTnV3KOu
-/wjIjTjVAgMBAAECggEAM71tNUx5ZUo0RQobyW3lHikjc4XpdfpRNF8XptV6rXSf
-DyKrCfvfyRpS/Pipzk7IGbHNiH/gIeM/W+V68FLid9gQ7qXQKSajePlywv+RhvGy
-0bUEN2JBCaCo3Rt/SrqxmVjZ6BPc26RL4EDAyRO/KSuBP7DqaxTAiA3fj5ah9G+x
-7OU2l/zO7aig/3AhTwrpYIdbsaNeiVCsqt8kLcfrI0Zi7+cF1Ff/em7V+lQgXmzq
-79CB+p3DPoqcsTY0BFrxkHt+lGql/h7wOobMehhscLs49IbgqwlMyo9LTGnYawMS
-Cs7XeNA5M93NzvKIPUaU1up+OZCXISKDy4ne/Ia6rQKBgQD91fYOiIzZWy8I/HI5
-mvBI0k/wlV2gkNZBX1GXXGINu2wjZk0OVpMsFHyvSmYvIPdCzPM3wCdGfjEEJdMw
-8ygc1c3kHbNDWbzclWIYDU/nvEv6Z2ScyT180BefQPs/3SW8Ykmn/l3WmmFiwaj2
-UBcApyeXo3DHwfkMB9WjSLXm5wKBgQDmbbyiaBSDOHIOQcWRitvr2qLnpMErOmuu
-BO2/RUAZxbhD5FEkX5/1FGuaPy6il6wrbJ5uk0zyIlbsERrL0CwuIOyAcs3gFeXd
-9Id6hAPw8Dn++H1E9ARZeG0GA0PiKEuEkiDHWy2Ef53YEiHesZawaZn2PeVbd+P9
-hxVX7zV24wKBgQD0348C0DpIiQ2j9p1e8xhwt+sEZaOv/WmkIQc+JJI3OyKEN/GI
-Ln7F3HG4TOas+nluSPctRkLdX2l73d2R8FE3GA8KzJgeFhj7F2VNXLJEFUOaqlnG
-YuDdYoYXTQHUx0vbI1p5JQtztvTR549PJ045hAfO4o4vNvJB5+DyJ3fL6wKBgDJP
-gWEgQmJIH7b3K1DUtaGwUeMruLVcgwgysUoSr6Uw40OHhSPg8QbMl5XM97yuSvwM
-MidIaANx9fKC5YvcftjvfVOqPUMQ5OhqLG5WhpnDiZYe4RL+CDkUrxEiA19Mlvhy
-A1AjmzOTvX3gr550vcb0t5Xo+7vV2GSRatqRMuYrAoGAbYhA33N9eExlOAioy9dX
-CJqT3n9VQG8MgVwsJKZE9ev1VXvXpEfIZBj3GOKDQQUhnOrbKgNatn/4G0VXX0yU
-gM39i6BfTGkXFOilZwZj6zifouZ7usZudu0aealA4EqtiwlPhM3D7yBVjYZhy8FU
-rXh6G115yeaWS0OyJG9hvj4=
+MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDXsmYx4MCVXnAB
+TTshaBjgDfJO+4UDm5opSDQFVolup7sDNHlaaL+pmZ61M8CCqPaPc+r2KBcHAcvx
++7yyyczCRlKnWH/awY50Zh4YSipJ7tb34DwIG6e0HqxvKOiS+MLS/ksRHwBSrUg7
+DKcbnkAWOwC+Fbe3maOEYMxZzIkVcmA8i9en2Fh7CDVmNDVFejkP8DsQlGTq6yjz
+VPZZaBog9Z5d9T5oi/ocbNCd9NqJ1CY1oXXlw8vv5ryUyfkWGU1upxyZ9o9dliR4
+yN8V5gVwKSmGWtvib/a6zdHhy37g6k+c27tfD37WiNtgLsblPQPH7/HxrSs1zGzQ
+W8y1wy95AgMBAAECgf97VCXanwd+YGDqXZ5Rm5OdiFvjjSygw3eB4ybbZn9uJblo
+O7inWP09m/iC4vRPwQw5Oa4+0O1ZtE1ILwfVskzBSDQ6Ov/ftIwfQcQzXzSO0WFY
+mX25pRZehqtRY7KXVmUO/xcs0uz8WNfT64gg4nsCOvpRtVk2QUKdjjtJnQlEmPRY
+CBY5Knox/1aDVhSITiD/IA6I6WgdFc+j+120+oi86zOzSuhD5ufneVRd01veCv9g
+7kTPvYRxOWUO0E2RmiRv3tRtHfQWFv4gSeklM8I4w5E6+fu2mtam1+y8b7j7ZX7T
+zU9GmvUhUgMNQ+Fe4tLsO92ZKal9IqNrGFpDqvECgYEA5DRyCUOr1ZMnopscoHgT
+oEDSt/qxOEuAjNDOZoHhXqchB2P/duyLxE5Ub+7BrqxvAjsl5xU0Cs2h5jkktkEZ
+kXAJw8pp6DiM6rTN5FgWvTH4i0wyFAdCmbVNnhK/tUzI+y6PgjpzLVyv1QmVr/Cs
+QmwEl/+R/AKSD/Nb+kKm9GkCgYEA8ffyk5Mr8RzTneysS8uiNzcraQJEV6VVUTEZ
+BgB16hmAvv5Xh/wBqOrxtgFY0QUi6taJSp6zeDvcn6XUSdCS7m02WWKNhOdPe2j7
+IjUyC9G3b6v7Xz5+YSnpAStTkOGH5oMzt5YAsUFlWML8BeJkQSWZ9XUCBn2xgUdG
+ngJEwJECgYAemNWNXnBko2VWDPwKm+7ttqNKHaezR5RFzR1Payyfd0MbbZHsDQ00
+VdhGZbm8RMxhfTK4yAQBSs7hQlokwZe/A0mb4cDPbP2f3nwYmKL73P5ZFu9D9jE8
+0K1Ge3cOxOvRmc2OBW4578p3guB6BYfjI/59rruREXsp/lQfut4NuQKBgDTTkR4u
+71UAmiLMXQFfP9cWMGAIoqsP6YSEV5Y724J0dus71BhYKHScdpDp0l4v5OOoWujz
+pPMG/q/MIIDNDIcJSOhS39q4NV4YGVvqiTaTXpz+yy6MEkNcRwZ+Uww6cNUep9fY
+4+XPBTVPvH38Yy7l6qrwFLUeE/bJfN1aWXBBAoGBAKEfZxH6K43DQDqnMrTYuwMu
+1Jx5rtXsJmT0PWJ2j4aXKS86CjXngUxK3kjss5og8iRpq09XqSo2NNtTsdl3Sd66
+Zm4N+hB+0qNW9Hda+wR+9md2j4MfTCb5Z85ErxWtg0kw2hQ0Oh11tWptsKKO+xhq
+JdgCZKetX/SCxJYYvBDs
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_pub.pem b/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_pub.pem
index ee6a9a654b7..2d0f4276151 100644
--- a/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_pub.pem
@@ -2,27 +2,27 @@
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
-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
+UzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMjIwNzE5MjAyNTQ5
+WhcNMjQxMDIxMjAyNTQ5WjCBhTEPMA0GA1UEAwwGU2VydmVyMQwwCgYDVQQLDANJ
Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index bb0b411f0a5..c434edecb65 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -1429,16 +1429,16 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
const char* authorities[] =
{
"", // Self signed CA cert has not X509v3 Authority Key Identifier extension
- "FF:2B:17:61:F1:80:5C:11:B0:87:00:53:40:BD:F6:EA:52:CE:B7:58",
- "FF:2B:17:61:F1:80:5C:11:B0:87:00:53:40:BD:F6:EA:52:CE:B7:58",
+ "02:FD:1B:E9:6F:4E:96:8F:0C:0E:99:61:8F:45:48:6B:2B:14:3C:31",
+ "02:FD:1B:E9:6F:4E:96:8F:0C:0E:99:61:8F:45:48:6B:2B:14:3C:31",
0
};
const char* subjects[] =
{
- "FF:2B:17:61:F1:80:5C:11:B0:87:00:53:40:BD:F6:EA:52:CE:B7:58",
- "15:60:69:5F:C5:27:48:7F:25:99:3F:3D:D8:2E:CB:C2:F4:66:03:53",
- "14:56:24:99:69:6B:AD:B3:FB:72:0E:4D:B4:DC:9E:A8:7F:DD:B0:E3",
+ "02:FD:1B:E9:6F:4E:96:8F:0C:0E:99:61:8F:45:48:6B:2B:14:3C:31",
+ "7F:4D:BF:80:65:E0:EE:A4:18:D5:6A:87:33:63:B3:76:7D:42:82:06",
+ "EB:4A:7A:79:09:65:0F:45:40:E8:8C:E6:A8:27:74:34:AB:EA:AF:48",
0
};
@@ -1451,7 +1451,10 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
IceSSL::CertificatePtr cert = IceSSL::Certificate::load(defaultDir + "/cacert1.pem");
unsigned int keyUsage = cert->getKeyUsage();
- test(keyUsage == 0);
+ test(keyUsage ==
+ (IceSSL::KEY_USAGE_DIGITAL_SIGNATURE |
+ IceSSL::KEY_USAGE_KEY_CERT_SIGN |
+ IceSSL::KEY_USAGE_CRL_SIGN));
// Digital Signature, Certificate Sign, CRL Sign
cert = IceSSL::Certificate::load(defaultDir + "/cacert3.pem");
@@ -3732,8 +3735,8 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
"SUBJECTDN:'CN=Client, OU=Ice, O=\"ZeroC, Inc.\", L=Jupiter, S=Florida, C=US, E=info@zeroc.com'",
"ISSUER:'ZeroC, Inc.' SUBJECT:Client SERIAL:02",
"ISSUERDN:'CN=ZeroC Test CA 1, OU=Ice, O=\"ZeroC, Inc.\",L=Jupiter, S=Florida, C=US,E=info@zeroc.com' SUBJECT:Client",
- "THUMBPRINT:'10 8D FB DE 94 EE 36 AC AC 3D 58 48 46 AE A4 28 C7 D2 49 A9'",
- "SUBJECTKEYID:'15 60 69 5F C5 27 48 7F 25 99 3F 3D D8 2E CB C2 F4 66 03 53'",
+ "THUMBPRINT:'8B D3 64 6B 9E 80 AE 56 08 05 0F C8 DE 9B B0 4B CC FD 4D 9C'",
+ "SUBJECTKEYID:'7F 4D BF 80 65 E0 EE A4 18 D5 6A 87 33 63 B3 76 7D 42 82 06'",
0
};
@@ -3742,8 +3745,8 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
"SUBJECTDN:'CN=Server, OU=Ice, O=\"ZeroC, Inc.\", L=Jupiter, S=Florida, C=US, E=info@zeroc.com'",
"ISSUER:'ZeroC, Inc.' SUBJECT:Server SERIAL:01",
"ISSUERDN:'CN=ZeroC Test CA 1, OU=Ice, O=\"ZeroC, Inc.\", L=Jupiter, S=Florida, C=US,E=info@zeroc.com' SUBJECT:Server",
- "THUMBPRINT:'FF 66 AD CF D5 DA 3E E0 D9 91 E6 6B 8E 74 82 3A 54 E6 68 4A'",
- "SUBJECTKEYID:'14 56 24 99 69 6B AD B3 FB 72 0E 4D B4 DC 9E A8 7F DD B0 E3'",
+ "THUMBPRINT:'F2 EB 9D E7 A5 DB 32 2B AC 5B 4F 88 8F 5E 62 57 2E 2F 7B 8C'",
+ "SUBJECTKEYID:'EB 4A 7A 79 09 65 0F 45 40 E8 8C E6 A8 27 74 34 AB EA AF 48'",
0
};
@@ -3978,7 +3981,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
{
// "SUBJECT:Client",
"LABEL:'Client'",
- "SUBJECTKEYID:'15 60 69 5F C5 27 48 7F 25 99 3F 3D D8 2E CB C2 F4 66 03 53'",
+ "SUBJECTKEYID:'7F 4D BF 80 65 E0 EE A4 18 D5 6A 87 33 63 B3 76 7D 42 82 06'",
"SERIAL:02",
"SERIAL:02 LABEL:Client",
0
@@ -3991,7 +3994,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
"SUBJECT:Server",
#endif
"LABEL:'Server'",
- "SUBJECTKEYID:'14 56 24 99 69 6B AD B3 FB 72 0E 4D B4 DC 9E A8 7F DD B0 E3'",
+ "SUBJECTKEYID:'EB 4A 7A 79 09 65 0F 45 40 E8 8C E6 A8 27 74 34 AB EA AF 48'",
"SERIAL:01",
"SERIAL:01 LABEL:Server",
0