summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/IceSSL/certs/c_dsa_ca1.p12bin2808 -> 2832 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_dsa_ca1_priv.pem26
-rw-r--r--cpp/test/IceSSL/certs/c_dsa_ca1_pub.pem74
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca1.p12bin2892 -> 2916 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca1_exp.p12bin2892 -> 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.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca1_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca1_pub.pem38
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca2.p12bin2900 -> 2924 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca2_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_ca2_pub.pem53
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai2.p12bin5414 -> 5438 bytes
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai2_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_cai2_pub.pem140
-rw-r--r--cpp/test/IceSSL/certs/c_rsa_pass_ca1.p12bin2892 -> 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.pem38
-rw-r--r--cpp/test/IceSSL/certs/cacert1.derbin1014 -> 1015 bytes
-rw-r--r--cpp/test/IceSSL/certs/cacert1.pem44
-rw-r--r--cpp/test/IceSSL/certs/cacert2.p12bin2654 -> 2678 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/cacerts.pem88
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1.pem74
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1_key.pem30
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1.pem38
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp.pem52
-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.pem44
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/ca_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/dsaparams.pem24
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.pem104
-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.pem140
-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.pem156
-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.pem140
-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.pem88
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1.pem66
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1_key.pem30
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.pem38
-rw-r--r--cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1.pem39
-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.pem37
-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.pem52
-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.pem53
-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.pem52
-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.pem52
-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.pem52
-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_exp.pem52
-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.pem53
-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_key.pem56
-rw-r--r--cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2.pem39
-rw-r--r--cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2_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
-rwxr-xr-xcpp/test/IceSSL/certs/makecerts.py10
-rw-r--r--cpp/test/IceSSL/certs/s_dsa_ca1.p12bin2808 -> 2832 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_dsa_ca1_priv.pem26
-rw-r--r--cpp/test/IceSSL/certs/s_dsa_ca1_pub.pem66
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1.p12bin2892 -> 2916 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn1.p12bin2908 -> 2932 bytes
-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.pem39
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn2.p12bin2916 -> 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.pem37
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn3.p12bin2892 -> 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.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn4.p12bin2892 -> 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.p12bin2916 -> 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.pem53
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn6.p12bin2908 -> 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.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn7.p12bin2908 -> 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.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_cn8.p12bin2892 -> 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.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_exp.p12bin2892 -> 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.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca1_pub.pem38
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca2.p12bin2900 -> 2924 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca2_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_ca2_pub.pem39
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai1.p12bin4150 -> 4174 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai1_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai1_pub.pem88
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai2.p12bin5414 -> 5438 bytes
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai2_priv.pem52
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_cai2_pub.pem140
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_pass_ca1.p12bin2892 -> 2916 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.pem38
-rw-r--r--cpp/test/IceSSL/certs/s_rsa_wroot_ca1.p12bin3948 -> 3972 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.pem38
-rw-r--r--cpp/test/IceSSL/configuration/AllTests.cpp24
124 files changed, 2740 insertions, 2726 deletions
diff --git a/cpp/test/IceSSL/certs/c_dsa_ca1.p12 b/cpp/test/IceSSL/certs/c_dsa_ca1.p12
index 5624bce00cb..87f77c54869 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 5bc90e675fd..a80a5562c38 100644
--- a/cpp/test/IceSSL/certs/c_dsa_ca1_priv.pem
+++ b/cpp/test/IceSSL/certs/c_dsa_ca1_priv.pem
@@ -1,15 +1,15 @@
-----BEGIN PRIVATE KEY-----
-MIICZAIBADCCAjkGByqGSM44BAEwggIsAoIBAQCz18irQulvQFwLzbffNxd2Hv0k
-GES3lxMltXiWERDMc88ANdJ16MZ7cGM5NP+SHT7n6Avs2d9lhfea+1RLLOk4/wBT
-EZdHk4dUZDHLbXVi9uA7InBLmOJ/QBWUnBKO0IMcrWd3N4BKjbCB7KiLNA/IDBKt
-o4Jasf0VZsC1enjFCozRpeAfMwjSYC+TPM0bOlRY9LoT2LemhyzDebkT6ZXcVI1s
-Yi1p4wJ6mVwXirGYMGlYdE5ekmmsxhVjjvHIdC7FaYGrXKBadMqS5qoOwzHDhcG8
-Uofu4aiVkV189Yrin5bxostG9odjHCa8lHJcAXzweXxjDIDoUattOf9yANj5AiEA
-h27zSmv+xtLB7H4nrcEnlEy1yYx5r6xAicVOTfdmfXECggEAGvA8stDjUAVf3+YW
-R8MRseaH8ALN7N91yQOZiIsylg9R9OoTorPXo+A6oxgKhcT7mIYgBOmdKPh/0jas
-StQS/uqemtdhahazFChncGHATS5lO5WXt/Clm+vcyn4gVkqg+YXwHEQ+kTOfNVrL
-klH5WEDsNqnuj1tw1zE56528ekHD8vqoQAblrIjPmWtdOgcKQgqr3ghpZ7Kf+LXg
-l/VHDMR0n2R4SH/z7OovBjr7qBZ5Wg2a3URtX/U31VeI63l3tBavyCnTyMYxmxrv
-EjONhpvo3idgZ37M/TKM44hhbmnN0oWxH9opkd28N5MYcJBoDchI+rH/kAAd4jdL
-mqV+KQQiAiBfHrSevL1m6+sbc25JKGj8vWexpVD/AlQ1WHDlKpfGAQ==
+MIICZAIBADCCAjkGByqGSM44BAEwggIsAoIBAQCmoAeImEtgEbim24TfsmdI17qB
+fhIyVZY+JYYNxtcZRMdfZRwjGQVYY8rsjxk0rBT2xWezk1+iA0rqHdhyV7kAFjRl
+EFuioSZnjSSx2HmZzpMVX2N2mytcVFLv/h++/RhrmTdIEhNIAU7SSsVBYbxsrEDI
+qWsbFMkDhH0MKRv3lRfMfePa778DbksmQe+imbbYWRo4bLU9gG4Loh9xsmMjzzZg
+RFZ1EVM4GGYCdFtn/ubJKO3hBPoYhcbUJZwBSCcO+sr4kLfVc/jNqDnZa2ROJ9av
+2wYFrrkO7WWZE1HECFPOsh7fOZbltvoLvdz+fKHeYz7zU80BesYD39fRXwUpAiEA
+uCkHn9Y4zWsI59kj0kQsGIooY3CS1Mku/yyL3r4qDy8CggEAc4F5h8/XYWgjaYT8
+C5291Ek7NpHPfWtdU0hEiBflS1SPYFoPXNHq/KkeDHQKE7wbHOUXREUdIoelBE0d
+fuO3C0mkjZnvPHUz327aFoDymiwCpRcxKCGBLazeTVzWJD6p49FghpEsCOe6T/t1
+GwsSexIfHHcLpy2ecxQBpw2GuBO9yJhouC+QlHxloSAx85rdb31/Kj1Sxma2e9SE
+rHhSiwWr5/SLpJNx+iTFujvuXOjvXVBmt92ymW032spcT0w89/N4XzhjVn8pNazo
+QZIKDNftMz8aR725Fs/HHqSIqGYRpr2X9CrBH0V0XHq1uLcZrxpnu2WPbyLe5f7j
+lWiIWgQiAiAx/hnembzCfq805iOjo+WTTI+nV8u87KU6lmTSudr9fA==
-----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 54db0e1ff7f..23ac54d4c1a 100644
--- a/cpp/test/IceSSL/certs/c_dsa_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/c_dsa_ca1_pub.pem
@@ -1,39 +1,39 @@
-----BEGIN CERTIFICATE-----
-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
-QR+qqzJDkU8PXw==
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca1.p12 b/cpp/test/IceSSL/certs/c_rsa_ca1.p12
index 98f235e16ca..5e345e2e663 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 cb836f60fcf..37f5cb44740 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 56b27a1ee6d..6c93376085a 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-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDJ2js9qbLr7v8f
-0wjQfkXgif9B9hZinW2PK5TgmDRkq6ExLU58fC93Yt0/BlKnTUx6/MSaJVBcE8ah
-KgnSLAPIYA/svyDKsh5Aqw1FflvysXyJZ9f/cBHus32bvRIAc+kw0ZOracD0g9vp
-r9SYboiZ+56t+64+knNnva7sJtzBp3H17BYJBGflKFLr081M78wr3bcIckYfQomy
-/mYOd6S3z8sUSqjwo6vKxuRMpETUzERbcUxgyVicgiqXkHndO93lzit+SsHcsuYy
-U98nRz9QMVK5dUK64wHOPmhJBiuMzLfg6UcYsMf3B10b+dSY819GKshpw+Az58Og
-+Y94Y+jLAgMBAAECggEBAMCpbKvxgpaROq/MhPhD3jxwWtRBp6IeswjZRzOL8043
-RxaiMOy+t6uTEKvsRA3tyNcG1jxu6yHHumnvrwoM+ttRXUHSN+FgW2HMIlG3RtoB
-sGWSWWc1N9iHN5fjwf/uop/3GaSdvw9joA6PxjJsJjQbJ5zWwbx1mnNlaEV83m5y
-ysugh/8tBrgNxmBd4jDqFF+mIARRADOFdRdljahYb7KPYmkJE8xNmroi05YeqlLn
-aXpxLQD2Mw8u1iXmuNXP+cuxcZIkb9bAcFiboMd5sF/YEQfLGyV5cCe+Os59tqxp
-I5BYR6Bu+btXIlrv3fA04/yESvjQS+Om4jbCKqKvUxkCgYEA8Ah9qPZjrr4P0bFv
-1O4XFYzp03HpHiIlTDRTF/FofFKBW9wMGPLilNl+kUkRj2MJ2ZJCgvY3rqMjDoCw
-XRqn5FWBM7uY8nbEeDmDM2Ct1Iph90bepBiYRoD/v/0Rp+Hfc2ejafnyIA06AuAK
-DScej1dxOiNU3e56KMorf5XgqtUCgYEA10eQWsv2Ryvdl1CcpCnWx8+GXsV4BMdP
-pkSr2WYp5v0q5BWSCuWCKrbu3NrLSUKXDApSJPg+TI50YZ9coO4itixgYKqA674E
-kM+69m90g+5vSilNiRe0RoEZgNAod+ONROStijgJyCQCwMfE71WQnRCW4LTYSlhO
-01JQ38Hc1R8CgYEAoXmUz22xcYR6r95mFSB2dxDs3EntQVBHNxScMac9WyVF0L4f
-hUkgFHKcKrC1F3jQz4UNKXzpyJoGo2L/QiMEfx7mZB73rWUolphaIt4PEsRlUyxh
-6pKBHiz53/YnQoE5CTHXRRvYPqenNvfwyxhd/qAck7fhB8u+cmJPEO2KzmECgYEA
-rmtS792UufE2ZeRwJSmo1Na0vZAsP2Lki4fT3B3EEVxJJea8Hov4vHbebJ3wWnjT
-PHQYPc/LWeeJL5cYS2LlSMgHhgpezaF0vYcwqX1/32yNSn7QTSShcQYkDZOZVhlN
-WeYVHIluk3Npr5urWWXv9vF77K9ZFlMZ+mkVEVVWgG0CgYAtBMTFnWhOsIiHfy7H
-y5HQr9AFHL2O6mDn+RtrV6adCNPYw6RbSxA/GlTabzfGfp5Mq/It/6Yk2UV/NkH5
-3DNjuDdPszKlGcWoXbRFTIUoYlCeXG4UJux5W5csM029b+CcQv7jEsZdx5l6AweG
-Rc7hYAoPi0WP7RfJUGLh/3SHIw==
+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
-----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 92f4d13fa6c..5afc54b6738 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-----
-MIIEsTCCA5mgAwIBAgIICZHJd3BlDgswDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MDEyNTQ1NloXDTE5MDIxMTEyNTQ1NlowgYUxDzANBgNVBAMMBkNsaWVudDEMMAoG
-A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
-cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-ydo7Pamy6+7/H9MI0H5F4In/QfYWYp1tjyuU4Jg0ZKuhMS1OfHwvd2LdPwZSp01M
-evzEmiVQXBPGoSoJ0iwDyGAP7L8gyrIeQKsNRX5b8rF8iWfX/3AR7rN9m70SAHPp
-MNGTq2nA9IPb6a/UmG6ImfuerfuuPpJzZ72u7Cbcwadx9ewWCQRn5ShS69PNTO/M
-K923CHJGH0KJsv5mDnekt8/LFEqo8KOrysbkTKRE1MxEW3FMYMlYnIIql5B53Tvd
-5c4rfkrB3LLmMlPfJ0c/UDFSuXVCuuMBzj5oSQYrjMy34OlHGLDH9wddG/nUmPNf
-RirIacPgM+fDoPmPeGPoywIDAQABo4IBGDCCARQwHQYDVR0OBBYEFL8VJHv+V8AX
-LLGzyRbCQH2AganKMIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiHBH8AAAGB
-EGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAHugcNpn1Vr1m8me
-CkH4PJqdUWD/xinGpfy8tJSjVIgY+Y+hAzw9i1VY15ENVkPoWVqcd25Ay9feCqiK
-N8YfICQpmpR5Vo9l2T5xaUKyGZQ3+28sYAZ+9KGW7sgEtsHTDFctbZGtHL6kRRzw
-NuMPXyNKUc9GLbx/dUwaP74YfRtqimAUu1A3vxh/0VKprJ+IENg+5dwIrkmmlPjl
-F+BoJfixzRuQ4y818CQyNksxrVaF3Y/2+jqZ9GehFM/7MoNVJ1JalCSJvzLNQykb
-Tw6q7GdDsXoNl3SqFWGVN2GBjFQSU5Bi0kYMcU7C8PPkQG6XE+6RH/q6KTNftgSG
-FV6RQZI=
+MIIEyDCCA7CgAwIBAgIJAI+hPswG/mSqMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTQxNjE3MjlaFw0yMDA0MTUxNjE3MjlaMIGFMQ8wDQYDVQQDDAZDbGllbnQxDDAK
+BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
+ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
+Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANJb6RsZdKLWXwWYJXZSnkuiaK4SHZu4VXoTo7JyRK3z/Qa0uca3gnQEUihJYqoC
+2k3XYS4rdHvqE72w8HBhN5Unk8j5dM4QnHD0Pld2DHuOhZiucrcWbWudTf1R6a76
+T9V4Qfbr0k5SUgIM/tkaDR7eCcfPH8cw7a2atOtLcQVV2YIUGDS5IGbz08+fiupg
+LpOisHtXVgbIyzdFx3PuOacO03eaaqb+ZeHTnTEs68WqdDCLdtk3KKwvdOc35MNk
+cFEz4sLQRoVTFSVZ6lJyEQOSdBulE+GjY2VPKJGnquJpXSdWSsiUDA5a3dhRh0l5
+28RD7xYD0t5HtcIgyN1q76kCAwEAAaOCAS4wggEqMB0GA1UdDgQWBBSaPto6U7l2
+ZtSt5vZqCgBx++7M7DCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63
+WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
+Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
+VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
+ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcEfwAA
+AYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG
+9w0BAQsFAAOCAQEAxPUctLGIMjn48XgWgzx4uT737L+7w3EZLc39DqQ0rkvBtODO
+6l4RLoZUfNiK59N16yj4t+hhgfTMPbCuONtKdcshkfLRFG20ZVqCbsDWhFZCPmrn
+aR7QwIRyks4+nKZoLMUtD8qZRZqk7Bpr1N4oxZq8ze0VUpvtWCPeQ8vN31eOHKJY
+Wu71mZaf+p25ZH7dNHp2pGoflIf6EX2mmv8bCNiFAqiDw8//PMD1z9qk6677ms9n
+Ggn8i+4liX66hU+8ez2fsj4IRxaW51B1+XR8RZ++z6laz9zaKC63BsAs4bg08sYj
+2uiPJmIjiMYXrjQJV+aiTL0qQJ30oy6iq+RYxg==
-----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 df013bddc6b..6b283c2f0aa 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDeC0hlGnmtbHQH
-mwLJcqhhyPyGQziaJanBTLKg3YdB03ZqfqL6Hwl86KuiTlg+cXhMOslaGThiW3vO
-6MPtTsW/1lNMv8vrdtyuzINNl8Yn95qijkwvWhnGr28h0HycB8QNtlost3Ysmhyt
-vSnX02XrhjIBtXE+iyNWUesAGfspH2fbYPJBG0v3X4dbwivoYrQB9oUhwQSBYJCR
-4fi9Q+s/Mt5FIJBbljsyL8xuG31w+W6CZlCormIr0vWWlG1FhpT98GxHIwkS/73w
-BCvpY3ZhUs2lDuma0tyejMMqZe0H0rZaym4N0SCyeberClSVQ4E+FjgJhImZsyLp
-WqD1+29JAgMBAAECggEAK/Tz2gAJwolL1w2a2aJ3LxSI2VOJawq1tmymmC4Czsc8
-FA0J2pY2XKH7CGCWG5Z/CChDIDEJ9n7B3c46q0oC391gFDuL9QtM2NXn0H6RXewo
-krG051Lg83Jbf8g0QvdOmqBU7bFMFbxUnRhrpixVavDgCXKP/p+w2S/SY+zAyfzt
-BRojSfsE8rfo2gaDlKdVlgsJZDtIsBNnfKu+47bW7SxxvIJXez82k9I5qvo9YJpc
-/M4g8tP9pGr4aRdkw0DyAT+aclwLdUO5n2RJs44iIVs6KNCGEd0WtUivl+URxDph
-KY0GjjcMmmwTB+FasakRBlPX8NcLr33YWsjELfuzuQKBgQD/cHrG8OaSKd7JGwzP
-2POmZje0AmT0qCHLLwiCXFA2qElml/0FNLoRbjA6vP+t60hx3c3iSOPuleYflfwB
-o2lxLVddZz7JAKKir60Q7m+1JuDPt6VoTQhTuLDjMGXqaHr1Z0nEyL4IsAsUAJus
-qDuz83ivpnYON/uHNvJMlne7AwKBgQDeiAoxEpjnyG9E8XBOYgNQHeJELFRtY8zE
-/XF8Enbeni+JaoXY8UtV3Y4K5mz66l4zUP1YIygCogdCmtKhzc5EVDduaqK+kOZh
-8q2CTIbNWoq0pIyIAUm256+ojuwgltDXAz6tEsQwpSqdbnCoQtQ1pSCqMZbbizPh
-xZCQOXlUwwKBgQCw0/Sqc2mqFUIchZVA7Tb+IhS9kErC8wEx3sVNOQpuS+FEHEMT
-r4R/PIA2qU913kKwUJON6lefejVr+DAUEkOUDYdFKYvVKZNse6Ca7/R0uw01vjPL
-GEiDbH9HRuHGe71i1LXEfBLRgMyqdCFQTMXHtOv+7IUdIrQEzoy9aAxKcQKBgDAE
-7x4Tw0cQ62HXL8LaR5i8Oh0366gHRyKjBiAd4+S6AcwHXoan2vfWbVZQzud+N4Gf
-Umv4eiPHTwXCXv1nacE44xVCkYfJwM0WDvb1CIm7pf7BG0ol7QA5EqCu5qlJohsj
-qhyy1f8hRQbf1BObCCvjTB8twD3z1eg8N6vHmzT9AoGBAJSlBvUKz0Atp7AL8gD1
-4njCUmTzYxMGx0vuzYoyTMee3AiESO5SUZkZNsx7BX6LEbczdCNgxkkfTZTGcVW2
-DRR84NozEKu5cvpYCL23BsjHZlprX5uI1Yi2k8U17PaiOSgYxS3fDUDZ+t8hY2yw
-lg7HULj6cBVI/cxMFbiVyGZ2
+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=
-----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 6003b292cd5..edae554810e 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca1_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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
+ZXJvYy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDizfZvVfj1
+ujM+F6PIreymdX/SLXXc9uXwrHu+594o9FHdx1XWJaP2/EnkhdU82MG+s7Wn/ETz
+JXnkLk7uJDXBcCMZYZj3DUI+6QRknErZqX9b1V/dZQGUc1zjwJGT2vsA5VoVwFAO
+WpqDcD9/cCDpVoZsbI1wi9/kMekBmM5Rpnqt1m5B26lyXrn8hmRpNtJidxayt/aL
+33qCo1GBhg3LIqz1zhQrvdKTISiTcWHQLn5AMUe3C5MYa88tMsHtXxKQnDki7l4Z
+0Z75BHv/+/3VIJLC3vVjt0lYXRQcgWbAExt/+aZLJHg5lP+SvDEfM8YHuzLsfj9W
+my0dBzN2xajtAgMBAAGjggFHMIIBQzAdBgNVHQ4EFgQUFWBpX8UnSH8lmT892C7L
+wvRmA1MwgcMGA1UdIwSBuzCBuIAU/ysXYfGAXBGwhwBTQL326lLOt1ihgZSkgZEw
gY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYD
VQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxv
cmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29t
-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
-dKWoD4LtLd/Fjuvzfc6rO94ajxEyeWk=
+ggkA0KlgGsJ5WokwCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVu
+dDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQAg8SMUdqK9iZZIciu2MCLaTNe+
+EEJYPmlBmmv7XVYoWdbnuYt4P4Agv88rr48G1Ris63pCgktGrYm3yZ/EFRGbeud2
+th8W7kAfZcg08tGdw5A/sXZq8VKuVbuMfQB6Va+0bYOsMNo4Q7bksjS8202NZGQV
+/qaYaj1a9wrqfLxlYK/eMkUZNd87wDeYM+NYk0W80+5nX857znlruGJW+od/JFWj
+bl/72UD/Y3RjQckKM2uxjtdyKkjdHODyI4ExWgJjPLC/TCa3MBD5KHT6kr0b96bX
+9TE2+IIEyBaW45wG07y0fQ/6Z/n9xXINbMpTJAG9Fi50rdVoFZUWqkn+T43V
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca2.p12 b/cpp/test/IceSSL/certs/c_rsa_ca2.p12
index 818e06426f4..44f66e55751 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 0d92a830eb5..a5526e27b7c 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDPVOxw+IFcmZ8D
-5nzcpTZCOu4eUG7d2PNkYC2epOflJc/3j1Octu/AHOuffnRamFHSYleq4ChVhiyY
-fQhbp8tyVU+QR8FEarmsW/XT2MzwGlz/6Elye4T32wiDitz6Bo1Uv9M0XlQZe0gp
-erXcESbKXt/J7R7F210TY1rwabt+hO67VySBGp4wltOrRzBOpGV9WDNzblFDO8+b
-z8tGqW2pWW/GTd5++NkAqY8eHBIja3g7H/AHTraOCHA8XA8qHWc7sK6cdQCSOe5R
-gRV4rpM+z8uMzhV3fYozPmkndQ5nEfsGtjja6j3+xfCqp0xYODFhhK5pd7vKkUsm
-xGDlHTgxAgMBAAECggEAA/rTVw/OG+LvBHomJ24cboUHERnmJugFNAYMmiD8Oo/R
-QCVGK5nvXDax5yvcO+j0mR8+I4+N9qZOsNallGzSIO22S0S1VwTdb4uMWnas6Gb5
-JghlcIcidEeGEFBYEYySpe/QtA6jeqG9Lt6mIwVJQ1Uy4oNktdOSI88ibb751GHb
-+9FAo/QYy92r3ixlePDQU7pIIpKR8sVwUAqLuwyPpSeH2raLNWbfkiTXourQkcp1
-lbzPfovlnKA/IYwW52kEd8V+MBs5TQdq0tNyzmkFYdCueVJvU3rGVbQ9zydfSbjJ
-d2FemhVABwP7Oc8Lngd/IE5+qsfqFE7rd3Y5FeQq6QKBgQD5iFk17Yy9TeQ06BFL
-yKhtZSWHfKOnKnofS7t0F04SaQoubaGOIvZ8jbhUvyehygbDfBzeXGt970zWmbar
-Bt816jBJZK3MGMkm1hQJJnMSaqVlr/NLyzXI9MOJGYAQRbWAFrMV7tkzuOw96sKI
-dPe7EjNIjvSrQAuKgf0l5UFFFwKBgQDUtJJkXA2FuectPhG9/mWHp1Ybtr/6AHYs
-jVxs1pKRCE/dLQso5FYBEzbecF0kHityXajfVLp9S7wOfCPf902u61qNl4qu7bHt
-sK/exDnq4mXCqCrVfkTxlD0cabKQBNs4kDLCKy5SQcdVlyOPKqgCw2ODtivK5kzR
-qOlOgxBJ9wKBgAyF3DxJnKuPcil5kAymmFVNIzIGfkwQZKqXaWPtG3zvCpTD6byx
-Yn9juWF/amTDN82tt+Es8DQUw11tv24b3S3ef+ffBp3cjJPHYKAI7vN4qK5Owz4F
-h8B7ECkcP4IRjYdNHFW4c+wVlr2Qv4yLmjcoNayph/vkLfAYj/TL6ZenAoGBAIE2
-gIe+8+f8mtb9EcIdPIg/uytyxQSWKzO9XBwx7S91oS53IoRg0W4twfM2xx4dxb7f
-7qpcyj07OK6D8zcnAGX2SzggivrhImmGIBBvm894YODzT7IJ1s/6gXU1MGgUyyd9
-UZhqquUFWJZCDjP2ccHb+CQXEltbs+bZeYFcVRTZAoGBAIJESm65nSgUNbxal5jq
-L0f+4rTziwANXvHgCu3zRd7+LfX/6mk5w1GkDN3fiMsk6CZSm1kKP9XD2mmmeCXT
-t69HPoT2aPUK3+Vjsl64dNhIP84GbgkVQaH8f1WBYnnLZg/OckHzFJmNZZFMQLA7
-ZUl+Xg0g8zkLOUKQeLp5xtCF
+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=
-----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 b21c958214d..4f4fa65d183 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca2_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca2_pub.pem
@@ -1,28 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
+hCwSW/0=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai2.p12 b/cpp/test/IceSSL/certs/c_rsa_cai2.p12
index f052cb20b9d..be84f99a011 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 570900a7ba8..34dd7033f69 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDOb2XVvNJNXkVb
-gLHIJMKVt67Y5SaKnSQ2eyxinktA0HpogGtGTay+ym/mkZe89sxoby6MpWU0NaCw
-MzCzGyF/nnZMoGG1BIDS6yMJt6KkvN8AkCVDspGofG0sO+J1JXXE9jVpHyl0/pL5
-/EUgoZFNyb6j+DcrQYde+3JVcwlTpRAg5YV34Yx6DENNe6wsdNd1SO1K4k5KAvPw
-EQNZMjsMamNOUGEJEuKees5tbUUmFs4fezIxz41/8sORT74dSluT80X6e5IV1rZu
-sObEeLrW5mzPVfkVGdtx7mClbm5lQK2mdQG8e/yDGld/R2lX4f8gVykTupdyZ9nm
-ltnv1n2NAgMBAAECggEBAJL6Q3IjZ0RIm28juPB8I8K/LhElTgShD3huyFJKy9+Q
-z6Z50GcUxKpura9m97dFrJGqn2TqGZ1LlWX+fGz5Iyee5jF2ezqLw0Dow2CWy4kp
-JEldV/rUN9rTBFPbK0gm7KvYdHytADJZUsID+B/ciPzuZ/qMrpLwq/ZXZrcqGXjg
-JE7KFMwGU5Q7vmWGKjSzBwu54WzZf6qCkQP9Gg4aH50z3m9MpGOP5yH+YFkn2hiL
-iXRWiuotEh69ujAfkdA+pHqsUEXlPcReXkSh/itGN9JkoZIOA+PNF4ZX2Xp3jXvJ
-M8OSloL8Km195dNZKOtUdvRVqaVTj5nUCUrBgV0VvYECgYEA8dRCqwMajhR03+FB
-KO1lvdD+PhrgQckeuUlfmEWAIRCenOOzZ97/yy7uv0Kx54TXa6Kdgs+GK5aNkjRy
-RsT96+8p1MSp90pWVFCpi8/ZgfFm0gVVgv4V0YEgCOoiFL2qT3uB4WVeEZA0lJ1N
-2NWCQW+apt+61rfx5grq21zVRaECgYEA2ogu5T3m4JSt36Nwvz2ak4od2rItpArx
-rGASW1ziDzvlbm4yAzVzpH27anJHWAgWGYZq8nClA628unlE+PvOgjw9U2sEcuUF
-/VaFQ2l60GkWOPJZ1bDreXnz19TWUQXP7CVDjmNyT/+018uiaAiXN7sDszJRrm3c
-pV7+tkFI2G0CgYBc19o0n79tNutcHLYQiXwbMQa7P0RD3Xw/NK1P37b+esv6fe0d
-/t6D2mPs6CU3Nqgh+c+xLg1b5LQ7ookRJIY8M5kCx/JdL5wPSNyfAdCG8/A+x695
-2CT2RzXOVl15Swv88fT+XRWNdqjJOc9uZSJaDwf380NfNkXXxO9AAtcaoQKBgFuk
-Pl49/kLxtpSROqfIErmKcwiSLdecC0rpIumTYu1WhdkwduKnmK5DV8PE1qxQ/8uG
-dfTjTh/jzMA6OLVdC3XMAz+nIj94UXGyxcHGSw149Cu/XfLh9W2EucAp7hIeKNpz
-qgfdJkPsDI9uQtXzvE5Pq7aLBHvscFodIx2U9RJlAoGAU4xyFbVMNMcSR8fKh/mZ
-nIB8oKjeJj7GccSNv1/SSj0lvRmdwKythvJ3IFe4cYa0LxeyF2oytw2EWbJ9A+Nn
-gyDTehTEoZsx+NusUMtRwTOtBI0DxwN5cFFB+0x+jJ0f5Vp7FHGWl8swab+rh+p3
-Z3jgnujoWfOnW1yPAeRl8m0=
+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
-----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 3d093c1a183..c4202d9aa8f 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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
-Yy5jb20wHhcNMTkwMjExMTI1NDU3WhcNMjQwMjEwMTI1NDU3WjCBhTEPMA0GA1UE
+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
-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
+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
-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
-rgC+JHcx6rzfU9eO6DmRyN6eEc7Ksss=
+AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIALjJL3tTAVYwCwYD
+VR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVudDATBgNVHSUEDDAKBggr
+BgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAOi8F0u3RtT7ddbqJryb2DcGiEhYD
+U4j/Dgnjfkj7FfC5ao0eS8lN74lip5e7yA9vugJ4/pw38GcH8+p75q5bZBvrqBjZ
+BgUcCxV5y1SSzR+QUWZ/UxeSvzZhckDU8mdh6y8os3HEHwEPX6NDJCTI7CwqXV1V
+zTiXw9UZ4L1fFMbJe9ChS0ra91Urv2fmVB/TAMk1Tb+wrW/0h+eGFD973+XaXPvu
+Sarosac0pdVIB0HwZGpmSsPsOiI3uR16QuWwvc3d1VJChYNWisbnLXJV8O62uN22
+RvENXb6FOBQc/Gq7UFYsW8kLKU2bfPw0yrG4THuQas+xz018D4vK53TGNQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEsTCCA5mgAwIBAgIJANiFYSTmOKdNMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
-VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb20wHhcNMTkwMjExMTI1NDU1WhcNMjQwMjEwMTI1NDU1WjCBmzElMCMGA1UE
-AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
-EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
-RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA46cFbP83ifuRm7cI
-3J4AQ7v9yXucucLJSO+hLGQ9P2ibOvxxRj93q2XxQFoiC1HN3FAxanaXRvFsLkru
-RrEnKarEdsjiNu/RSpSXUJR5n3YqGvHEmUDKUB2a6NILQZm+Lq1cugnA2CJ+tjSo
-4zK/KdbLWjnhhYi034BNR/FY3rWZ56Z/a1vOK1+rKkOM1o3aq4zlGARcUP4KpE9G
-DCUCS3Fj27yhROxwKwo+mMDZtCyqSZXWIa/k+TUE23uBGUFcZHrKbWSW+6RBhYti
-AgNy8Ra09CxxeqSR0t5qbXc9ThfUbKPpynp3OUPGQ3Adu0KQQUe7rh2+5RTZpSOs
-tv9wjQIDAQABo4H1MIHyMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFIJAlzpOQAzi
-Sl34+NaO3e0yV+cuMIHCBgNVHSMEgbowgbeAFA3cEk3Z3Nkk029mvLtysb6oOG18
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQADggEBAKpeLbKpfD1QAgje
-AozcGBUrg54TKP6lEoGi+Nceqa5xandajGCbkYL7qTHo8pseM1l16+7COtNB2uOi
-NdFPxJpXig5IFavX5DsJAKeo4khAPYJPAI6Rj6OLoADDXnkFc7N4lFVPuhIUA7/U
-Rf73fksdcJ8o1Hi9cWJPVIzZ2kz3l/BIPFBtcueKX81XpTVak69dDPpKg6Q4LJwR
-JoWyJ+Md7QZPuufU6hy8ZLRgtMgrmRugcZ447+jvJjhVEMI4vSi5di1mLtZTQagX
-OuWRPxUaic03lNiUVYyQh0GFnZI+QjHFV2G/MvAAEYQR2SHzwaFemC6dAGomec8a
-E1AMako=
+MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
+MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
+B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
+LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+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=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEyDCCA7CgAwIBAgIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
-SW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL+F7psdqISmpG9p4Q2hPrW57gmzJzbtpBOA
-flAAdNByheX3OL99VFyelT4CPGfj6XmFmaJQL14naE+j9RdH9U7ZasxLSyNbt0r6
-jpaVfr+3WzCQffnA//2m/EofLmTS2BLFpPP6ONuC8fHRdR/vMEEVZfyMW++WskSE
-ss5fOOFDQeKnPe2pOYjxfH88ZJWGpyd9g/YJ/3ZAAb9EBhc4rYiD1YalYBxizXNK
-ObduE+5bze+aGraRr6N9Ed+D9Fy4Ade0ewyz7eWm1GhA3x+f2BJKmuW8/ij0DUJP
-3hzXXaqZWuVsWMm4kqa1z4tyKx29qVL/IyJKp92MZfmBCxsz1cUCAwEAAaOCARkw
-ggEVMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFA3cEk3Z3Nkk029mvLtysb6oOG18
-MIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9oYGUpIGRMIGOMRgw
-FgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwL
-WmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGEx
-CzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIR9gt
-YlhxuykwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAFLa/1Ik1HPC8Af1R5PXgRcImznsMc5X21zCibNOAcYn4KP7y
-pUgjpJOyd7g779l4IZ5PEWK8ilEPflNWxLv2p6B27Oohyc7MAKVsAxkBrhj0dY8M
-Y7WyvDCimxppGD2xcXS/6h5jiYBdOpAmH40GvEnDRMExDg1MRJIgoV/DD/nG9wyx
-brMHbzH2mxsp4jEmHAIdrrCrGf815Af2aR2vIWXt3B9b+e56KSJG5Wa2sj1fEYPu
-FzQNuhI0CaWFbAxKRWHhVWelPyyjwxa0RRlqijA2ldjSTrTDmd8Wfs7Io6jFVSka
-mzJ0SUDf4aJ0X2lty9iE8XOhHwPTmQBdrmqlww==
+MIIEyjCCA7KgAwIBAgIJAIXSkf4PzXq3MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
+LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
+VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
+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
-----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 0c533e1504b..d8089faf8df 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 3952e4ef369..e9afa657d32 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQILveitf4doLYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLTNNhCiGWVxBIIEyJ8URM+8K958
-4gLlQSkOUwpOA6xMeA7xebl6W4kqCbwWBJon/2PWdaSsUk61dHI1cuvTH9saq1bj
-bsUpCvV7lIkk4Cf9W46ueYnhXKrJb3/vV9O3ILXg/lIbjksy2n4KfNgzotdDXgoc
-yNzehq6U3irnwSbIZSq8H021p29uZYK/ZDXWF1ZklhtCZY9inrD8Jo3UOHvvWoQY
-bLfPnNFQhlLa8loz1CfYfTBQ0AxSvBnnHUeItlp2NsGhRn+srMjcYn5/NzIjyMfr
-NFmjPsDGzqN10xSIkjzivyK2NBKkuU6OfU32hbxHuxO5DkObzIBZ/K0SPkuIxVmE
-cbYgjHqZEKN82FF9R1pMz0ZYzeIL32wqe7FM9aQ6v1reGB18Xjpa1hdHknMyrRcG
-G7+iqftWSr/IFJgNCZDUXv7Pkjz7HP92dzDMt6CsPCVSw0tm18nGCNH9wxmC+VJ6
-QdFTsv12LRFt+EuZKizjy3dcRTipStM6P7tJtkK5eo7V+kVHdZSBUo4AQQNC89oR
-SJOr/l1eMRVSl3FHoZE3IuGeYed+kp+6jBssRWNASUlLOJQdXd5JhpF3anQ0cEBO
-GRLHyjzFGWD8xlxopiUCLVnAkOsuspxEY+2m42K2GgTMaO+Z6L4YhN/KFBkYsgIo
-6S/JLZGYtXd24m1demt3MGDYj6fSLGzHvG9vKtuzGl9l2dpzSb9F2uVbRfE+LjcQ
-oEysIIzyRCgZRetNJrzo6vqU95+igqzKGovJ7H5qvnmIb913FWapLnh1tNOXDBjV
-zpoDhIKTxZNqpd+9TSkqwkWp0QWRtJtl4tHtlDO4F7VWpgcNnmH+p1a13T4Mm0Q4
-IWGc/vDKkSRDJCR0qXngk9u+0E9wEmTWM39KlYpfQzgKduywWJu8Tnzw+Pf4XZmX
-knelxgTyYTJkg+25VOwSBkaJGF2uCS9/gw7C/5SXQEnkIshYGUWA20IBJGH2SfBE
-+xcIgyNtqhfq9WOxoZBVyZGQSpwMXT2e7DtKoaWxOxBeCdJFylzbHsDmqzKpm+a7
-u/n2xqlFRRpTdWnJgm2bBfh3p6cgyw3PCejfzoDOkOq75fOxNzcbgjNJg5+LjL7Q
-lpNOcNEYDSH1HhL8JMVWqtq3FGcNtBl7rSapUnsD0RR5GO4AWnMUuMnBRePUJqeD
-9jV3QtVodBcOU5FllIE5fXwbNsK8Ky3aJ2FTPqGqJSwNbfOZTm6/+df0U9NE27Ox
-MX9BxZlLup8fCy8Unlpml7eV5K00BpyqBEjZkaWOwfa/50hExSPC4nsYwOu7tmSU
-vJ5g9UXjXRtao+wnqP3VUxx77KIlBcRq4PuI2w5Sw+2gLequbulaHb26tEsIe6I5
-ACrblwguUqwG7wvNLzbF0Ld1GXfHxLHM5fJXlBmtNE/rwLRNwg5jHCZfd0XlYhSR
-oNaox2dF1M/lyuJ4nKI8HpAaF3yS9nxrYze1Fwx5YnjJBXFAqIL5pVtVlbLI4VLA
-VCtt4R3Q+mGcjQ94dZiyr8lrgouY5N8bd9ys1RpXovE0C5mTuXiLVQ6NRPZkC9P9
-fJWyrKL6i07wLAeCceBiVIgArx3kkPG08zaa1tdCCNRPZSEaMYJ1SH1MELU4vh7O
-8F94Ll0HxkyRtpgH8hu9Hg==
+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==
-----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 6003b292cd5..edae554810e 100644
--- a/cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_pass_ca1_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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
-dKWoD4LtLd/Fjuvzfc6rO94ajxEyeWk=
+ggkA0KlgGsJ5WokwCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVu
+dDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQAg8SMUdqK9iZZIciu2MCLaTNe+
+EEJYPmlBmmv7XVYoWdbnuYt4P4Agv88rr48G1Ris63pCgktGrYm3yZ/EFRGbeud2
+th8W7kAfZcg08tGdw5A/sXZq8VKuVbuMfQB6Va+0bYOsMNo4Q7bksjS8202NZGQV
+/qaYaj1a9wrqfLxlYK/eMkUZNd87wDeYM+NYk0W80+5nX857znlruGJW+od/JFWj
+bl/72UD/Y3RjQckKM2uxjtdyKkjdHODyI4ExWgJjPLC/TCa3MBD5KHT6kr0b96bX
+9TE2+IIEyBaW45wG07y0fQ/6Z/n9xXINbMpTJAG9Fi50rdVoFZUWqkn+T43V
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert1.der b/cpp/test/IceSSL/certs/cacert1.der
index 9d207577a86..8afebf04da6 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 737be4382c9..c59d7238aa1 100644
--- a/cpp/test/IceSSL/certs/cacert1.pem
+++ b/cpp/test/IceSSL/certs/cacert1.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIID8jCCAtqgAwIBAgIIR9gtYlhxuykwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
-Q0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
-BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
-hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsTX0N6eBGYSv/Q9P8hoI5m3a334DRMExlICxuUggWDV68vnwgv7q
-mx3ubZDHsi33nVO6ykpbfB96KENi/qb6whFZun4vUyw8Pl3X1eWc4c6ATU9HyWj5
-ZAAuq11HieJ3VmQA+SsuZkFLdQsrTHQ0XVwm2AwbqRtaTZS9wCsXzoXoCLkCjCbN
-fO+O0ORHoPMQXxFZK5PEgM2PlxAcFwPWCfDngV2Ch3zoLNO3N4rlFhXsNYmx7Hj3
-u1hr2m1v3RRweqzIbtbQTKyepQ1RVtx6t6zeoEcDg3DdMwW1rlLdVcZH7XhBi2Sq
-+GgYTLr+ktIgFE/n3kv4HZftgewgfAVMVQIDAQABo1IwUDAMBgNVHRMEBTADAQH/
-MB0GA1UdDgQWBBSSvJanI0veWekoO7RCWr339p0lfTAhBgNVHREEGjAYhwR/AAAB
-gRBpc3N1ZXJAemVyb2MuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBWc3VTJfCZvSlk
-sJMH+PTm/nvUULHStXuJKFiXV6hvYdLUAm+cfeOlNlfMq+mwJiV3iW5dDQjY+UZS
-D74i8vNepYc8XZKPC/B9VSAlvSRG6LeWRpYnE7hU86gcBFZdjrtz53lppiK3SG6Z
-LrLvXf6U+aDSJapzCq0OljejZxpBrAH8+07fPBUoFoXD5x68E8jlmp8jBJvkyGlN
-00izhwk0fptrk+YrTFGBZxFO7xIoX60+Xl3WbbMvvyb1LAQPZo1RAY7AWOfueyXJ
-fzrPmy/xxwE2dZwCXMT5tbAX2itr6RNj3iJ3bu+aaxkC25E1gnjc8JH4fEwXQLfW
-mkVmXORk
+MIID8zCCAtugAwIBAgIJANCpYBrCeVqJMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjhaFw0yMjA3MTkxNjE3MjhaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
+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==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert2.p12 b/cpp/test/IceSSL/certs/cacert2.p12
index abf70595883..bb01d28c68f 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 da3b0e75877..844ce57b1fc 100644
--- a/cpp/test/IceSSL/certs/cacert2.pem
+++ b/cpp/test/IceSSL/certs/cacert2.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIID8jCCAtqgAwIBAgIIM5lEiN/O98UwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
-Q0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
-BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
-hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAlj8vvE1K0RnqW2DW1cgik6EO2zwBWzwSUxek6xj5AAUmLyjYwJtq
-iK8BHlQiuLi5qo413M5SdLLXe7awFLJEW8d76nemnOm7OGdweazJvQ/owjxzbG7B
-LmCNgRl7DJFLQSbyhfg06OhR7/4n6upEgCDEuO8ndzwd/v6h2VDWIsuxo8UqI0Aj
-zZmi9n3Vgmfck0Zbw32Qks4t6dUZBlHgXifqoZgCgLDdAUpAiFJtqFxZY+rZFg3+
-Y0Y3Wlm/gB0B/NqKodVH38pF/BuUHliswEpOv6sKRlmazP6EzkMzPhHC4Pl2RCZb
-ITLKWHZvyo3StTTUr/MXELmfc59+9oz9gwIDAQABo1IwUDAMBgNVHRMEBTADAQH/
-MB0GA1UdDgQWBBTu5bRnL053Kz/sxZ4TnSA+vZqxBTAhBgNVHREEGjAYhwR/AAAB
-gRBpc3N1ZXJAemVyb2MuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCRlrG80D/DBINh
-920P1wi3u0cf1Ba9vFjQiJWbRZ1z0F5wAjqLv5SeSsewQCzWlVLvIQAKH6RAhpLb
-0fjrvHAT6JJknI1DW3qgj8Er6jE12MApIe651kE5AgWyk8u8Q/8mDf2/5tGAKvmT
-8mByebo9bkNfJbepP8iiYXeOd8Omw70/DdBB4wlqDFKB7IzNTbEJJQHdgKKnsayy
-7rbTBvddcVJ1LQWhsfqii9teJYao72boXxAVlBBkUMcxLLUA9h5dAzuUx7AFQrUl
-BsM59PLVyxgTsj6aLwS/m58XnSIAS/8D5iVdW5oeYIqzsHLzlvpQIX6CDhh6z6mU
-YZnEOWYG
+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==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert2_priv.pem b/cpp/test/IceSSL/certs/cacert2_priv.pem
index 54282da0d1c..4b40728c9a8 100644
--- a/cpp/test/IceSSL/certs/cacert2_priv.pem
+++ b/cpp/test/IceSSL/certs/cacert2_priv.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCWPy+8TUrRGepb
-YNbVyCKToQ7bPAFbPBJTF6TrGPkABSYvKNjAm2qIrwEeVCK4uLmqjjXczlJ0std7
-trAUskRbx3vqd6ac6bs4Z3B5rMm9D+jCPHNsbsEuYI2BGXsMkUtBJvKF+DTo6FHv
-/ifq6kSAIMS47yd3PB3+/qHZUNYiy7GjxSojQCPNmaL2fdWCZ9yTRlvDfZCSzi3p
-1RkGUeBeJ+qhmAKAsN0BSkCIUm2oXFlj6tkWDf5jRjdaWb+AHQH82oqh1UffykX8
-G5QeWKzASk6/qwpGWZrM/oTOQzM+EcLg+XZEJlshMspYdm/KjdK1NNSv8xcQuZ9z
-n372jP2DAgMBAAECggEAHrcwNRjAENtxc9jqUq4lk3S7qsorpNE1FdOhnYZvcTec
-RMve9BFRyDuuyNp+drEdE+caz9dGOCFPuDTy7mg7XV/8z0RCxZVq9u7+qYFPhN05
-wmvFVQeXarnGc/wXkcwqTFl//y9s8ah9B8k3s+jMtDz+uqf5s4CQyU6ZG+pQvLAD
-ofTbrIu0XYKtlZsMf8eDbmi8VEC3DTV4QMAaoRu073E9MeK2wyiqGDbMF/ecNB+/
-5sqyLEZsFDXbrFquDF8AxWS0U4yjZ5O82XzEmAg/6+bPVxwi5RQizFhUk/CvtMhY
-/B5fXWPPkY1hrbBTPkDfgAKkiHGf9o7i2TIOND1p4QKBgQDFu25RdDYyag+Clg5E
-//eeHoxtCN9xJn5hSzncQP/AJjgirFeq8PEl4lxIOs5JNmOjqouxWSADW/0WysmG
-ZkVfKx9tMGhtAhQAS7ifA6jnjgdpvRDaYNOvijvKe6LoIo0z2fIZx7IEi/JnYMk8
-enyC4ORvehR9YnyR1BssNTTcyQKBgQDChYuDZmeW8yFb8qvTtpnpvEyWFx2LMJxG
-8MLW8Zrsh8OELpM3ndKlVY86264s24V0Nr4ZqA2TzG+wIRP6wLSl1KUvZivyvwD5
-RkWRnb8r8+GJwU2uZu+82+dIGA6gOMBBIxcxJ7+Qh1K+jC28m2LxbBmVzHhx24Gy
-tXkZgQlJ6wKBgQCyOsUwlKC5hpJeceWA2nyXQQ/wxDur4TeveUA5QTmGOK0Gy/Pl
-uHKVZFksHh2NLoJXp0VtYVmSzZrurXFDPPIw20zjfevSvjnLHnXWl1TrC0GxVONZ
-BEgrBV3poNHxjhta7ovkIvVaVc700e/yHLIYwqAFv7OyZVDFnbu0eG0iyQKBgCAV
-2w9PguK5M9Vwz7raMcUGFDPlmC/vUre42sqNi5pcQnm5HPtdgvNWi4uP1Mj9ZKPo
-q66bs7GfVQTeT+dahfGcg6qv1avyqXx0hOEh/fiH/7mzMtcDj6O9OgcAQNlYww17
-dkXbYpO6XoGjqZ+kmctso0O8OFm/dUM+/7yfNiMFAoGAcQRRRki26r7f0SgPBIMx
-hoRHBXE8i0qyzN1xOxs8hknlZzY2C7x1tINevkaOCUCw7GDjrAshLzDzL3yNUiP6
-LJiwc8ZnOtlE3bDrv0X+aBtdmnMRDGONXeRaatcORnE/cd5YqafEiOcQo1hftBqY
-/qPog32qE8aWoo2UdRJpX5U=
+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
-----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/cacert2_pub.pem b/cpp/test/IceSSL/certs/cacert2_pub.pem
index da3b0e75877..844ce57b1fc 100644
--- a/cpp/test/IceSSL/certs/cacert2_pub.pem
+++ b/cpp/test/IceSSL/certs/cacert2_pub.pem
@@ -1,24 +1,24 @@
-----BEGIN CERTIFICATE-----
-MIID8jCCAtqgAwIBAgIIM5lEiN/O98UwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
-Q0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
-BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
-hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAlj8vvE1K0RnqW2DW1cgik6EO2zwBWzwSUxek6xj5AAUmLyjYwJtq
-iK8BHlQiuLi5qo413M5SdLLXe7awFLJEW8d76nemnOm7OGdweazJvQ/owjxzbG7B
-LmCNgRl7DJFLQSbyhfg06OhR7/4n6upEgCDEuO8ndzwd/v6h2VDWIsuxo8UqI0Aj
-zZmi9n3Vgmfck0Zbw32Qks4t6dUZBlHgXifqoZgCgLDdAUpAiFJtqFxZY+rZFg3+
-Y0Y3Wlm/gB0B/NqKodVH38pF/BuUHliswEpOv6sKRlmazP6EzkMzPhHC4Pl2RCZb
-ITLKWHZvyo3StTTUr/MXELmfc59+9oz9gwIDAQABo1IwUDAMBgNVHRMEBTADAQH/
-MB0GA1UdDgQWBBTu5bRnL053Kz/sxZ4TnSA+vZqxBTAhBgNVHREEGjAYhwR/AAAB
-gRBpc3N1ZXJAemVyb2MuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCRlrG80D/DBINh
-920P1wi3u0cf1Ba9vFjQiJWbRZ1z0F5wAjqLv5SeSsewQCzWlVLvIQAKH6RAhpLb
-0fjrvHAT6JJknI1DW3qgj8Er6jE12MApIe651kE5AgWyk8u8Q/8mDf2/5tGAKvmT
-8mByebo9bkNfJbepP8iiYXeOd8Omw70/DdBB4wlqDFKB7IzNTbEJJQHdgKKnsayy
-7rbTBvddcVJ1LQWhsfqii9teJYao72boXxAVlBBkUMcxLLUA9h5dAzuUx7AFQrUl
-BsM59PLVyxgTsj6aLwS/m58XnSIAS/8D5iVdW5oeYIqzsHLzlvpQIX6CDhh6z6mU
-YZnEOWYG
+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==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacerts.pem b/cpp/test/IceSSL/certs/cacerts.pem
index 875c457212c..accb6f6115b 100644
--- a/cpp/test/IceSSL/certs/cacerts.pem
+++ b/cpp/test/IceSSL/certs/cacerts.pem
@@ -1,48 +1,48 @@
-----BEGIN CERTIFICATE-----
-MIID8jCCAtqgAwIBAgIIR9gtYlhxuykwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
-Q0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
-BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
-hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsTX0N6eBGYSv/Q9P8hoI5m3a334DRMExlICxuUggWDV68vnwgv7q
-mx3ubZDHsi33nVO6ykpbfB96KENi/qb6whFZun4vUyw8Pl3X1eWc4c6ATU9HyWj5
-ZAAuq11HieJ3VmQA+SsuZkFLdQsrTHQ0XVwm2AwbqRtaTZS9wCsXzoXoCLkCjCbN
-fO+O0ORHoPMQXxFZK5PEgM2PlxAcFwPWCfDngV2Ch3zoLNO3N4rlFhXsNYmx7Hj3
-u1hr2m1v3RRweqzIbtbQTKyepQ1RVtx6t6zeoEcDg3DdMwW1rlLdVcZH7XhBi2Sq
-+GgYTLr+ktIgFE/n3kv4HZftgewgfAVMVQIDAQABo1IwUDAMBgNVHRMEBTADAQH/
-MB0GA1UdDgQWBBSSvJanI0veWekoO7RCWr339p0lfTAhBgNVHREEGjAYhwR/AAAB
-gRBpc3N1ZXJAemVyb2MuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBWc3VTJfCZvSlk
-sJMH+PTm/nvUULHStXuJKFiXV6hvYdLUAm+cfeOlNlfMq+mwJiV3iW5dDQjY+UZS
-D74i8vNepYc8XZKPC/B9VSAlvSRG6LeWRpYnE7hU86gcBFZdjrtz53lppiK3SG6Z
-LrLvXf6U+aDSJapzCq0OljejZxpBrAH8+07fPBUoFoXD5x68E8jlmp8jBJvkyGlN
-00izhwk0fptrk+YrTFGBZxFO7xIoX60+Xl3WbbMvvyb1LAQPZo1RAY7AWOfueyXJ
-fzrPmy/xxwE2dZwCXMT5tbAX2itr6RNj3iJ3bu+aaxkC25E1gnjc8JH4fEwXQLfW
-mkVmXORk
+MIID8zCCAtugAwIBAgIJANCpYBrCeVqJMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjhaFw0yMjA3MTkxNjE3MjhaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
+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==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID8jCCAtqgAwIBAgIIM5lEiN/O98UwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
-Q0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
-BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
-hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAlj8vvE1K0RnqW2DW1cgik6EO2zwBWzwSUxek6xj5AAUmLyjYwJtq
-iK8BHlQiuLi5qo413M5SdLLXe7awFLJEW8d76nemnOm7OGdweazJvQ/owjxzbG7B
-LmCNgRl7DJFLQSbyhfg06OhR7/4n6upEgCDEuO8ndzwd/v6h2VDWIsuxo8UqI0Aj
-zZmi9n3Vgmfck0Zbw32Qks4t6dUZBlHgXifqoZgCgLDdAUpAiFJtqFxZY+rZFg3+
-Y0Y3Wlm/gB0B/NqKodVH38pF/BuUHliswEpOv6sKRlmazP6EzkMzPhHC4Pl2RCZb
-ITLKWHZvyo3StTTUr/MXELmfc59+9oz9gwIDAQABo1IwUDAMBgNVHRMEBTADAQH/
-MB0GA1UdDgQWBBTu5bRnL053Kz/sxZ4TnSA+vZqxBTAhBgNVHREEGjAYhwR/AAAB
-gRBpc3N1ZXJAemVyb2MuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCRlrG80D/DBINh
-920P1wi3u0cf1Ba9vFjQiJWbRZ1z0F5wAjqLv5SeSsewQCzWlVLvIQAKH6RAhpLb
-0fjrvHAT6JJknI1DW3qgj8Er6jE12MApIe651kE5AgWyk8u8Q/8mDf2/5tGAKvmT
-8mByebo9bkNfJbepP8iiYXeOd8Omw70/DdBB4wlqDFKB7IzNTbEJJQHdgKKnsayy
-7rbTBvddcVJ1LQWhsfqii9teJYao72boXxAVlBBkUMcxLLUA9h5dAzuUx7AFQrUl
-BsM59PLVyxgTsj6aLwS/m58XnSIAS/8D5iVdW5oeYIqzsHLzlvpQIX6CDhh6z6mU
-YZnEOWYG
+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==
-----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 54db0e1ff7f..23ac54d4c1a 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,39 @@
-----BEGIN CERTIFICATE-----
-MIIGxjCCBa6gAwIBAgIJAOrCQDe3S23pMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0xOTAy
-MTExMjU0NTdaFw0yNDAyMTAxMjU0NTdaMH8xCzAJBgNVBAYTAlVTMQwwCgYDVQQL
-DANJY2UxDjAMBgNVBAoMBVplcm9DMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQ8wDQYDVQQDDAZDbGllbnQxHTAbBgkqhkiG9w0BCQEWDmluZm9A
-emVyb2MuY29tMIIDRzCCAjkGByqGSM44BAEwggIsAoIBAQCz18irQulvQFwLzbff
-Nxd2Hv0kGES3lxMltXiWERDMc88ANdJ16MZ7cGM5NP+SHT7n6Avs2d9lhfea+1RL
-LOk4/wBTEZdHk4dUZDHLbXVi9uA7InBLmOJ/QBWUnBKO0IMcrWd3N4BKjbCB7KiL
-NA/IDBKto4Jasf0VZsC1enjFCozRpeAfMwjSYC+TPM0bOlRY9LoT2LemhyzDebkT
-6ZXcVI1sYi1p4wJ6mVwXirGYMGlYdE5ekmmsxhVjjvHIdC7FaYGrXKBadMqS5qoO
-wzHDhcG8Uofu4aiVkV189Yrin5bxostG9odjHCa8lHJcAXzweXxjDIDoUattOf9y
-ANj5AiEAh27zSmv+xtLB7H4nrcEnlEy1yYx5r6xAicVOTfdmfXECggEAGvA8stDj
-UAVf3+YWR8MRseaH8ALN7N91yQOZiIsylg9R9OoTorPXo+A6oxgKhcT7mIYgBOmd
-KPh/0jasStQS/uqemtdhahazFChncGHATS5lO5WXt/Clm+vcyn4gVkqg+YXwHEQ+
-kTOfNVrLklH5WEDsNqnuj1tw1zE56528ekHD8vqoQAblrIjPmWtdOgcKQgqr3ghp
-Z7Kf+LXgl/VHDMR0n2R4SH/z7OovBjr7qBZ5Wg2a3URtX/U31VeI63l3tBavyCnT
-yMYxmxrvEjONhpvo3idgZ37M/TKM44hhbmnN0oWxH9opkd28N5MYcJBoDchI+rH/
-kAAd4jdLmqV+KQOCAQYAAoIBAQCGzeoiFgGZvOvSwEbJu4BnZrvMeiRzV7WaTxYx
-XPH76sRoGzsA8FzyV+8LGn0hYqGlEwqOj89vp+ihs2Qjxxg9iVwzTISKPdNob58h
-MBzoY0qXj+1LSw2celsSNsbxFj5juvxJ3OMqwIFw1LWPrNs/ZmwdDriGZcOPttsR
-1Aiz8/x4obh1dp5b+8T2f/DzuKp27Qc/+4ZX1cpoRIAtjFkGZ/m3clMLo0mNSArM
-4SuE1SaIfnoTHJ4P7wxu2WF4P0YCU7lCZNT1UlPPuSlytRF3n3x8Y0ZH0eIJkPgZ
-RTtcgSw8VRsJu7oM2SFyRoraeJQia+07e/nP323GzF9gOYlqo4IBDjCCAQowHQYD
-VR0OBBYEFNZ6DB57cI2b+ZK5AVng6o/JmB1tMIHCBgNVHSMEgbowgbeAFJK8lqcj
-S95Z6Sg7tEJavff2nSV9oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENB
-IDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcM
-B0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZI
-hvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMBcG
-A1UdEQQQMA6HBH8AAAGCBmNsaWVudDANBgkqhkiG9w0BAQsFAAOCAQEAlOrJ8KZR
-keM2vEkUspcapqlS7jeR3JMLENkdDBhETNTxOoI+x5bOaL9t/azB4eP7cXo3bXiI
-8rQma3GF3f0cY1AMcgO+XgoSv1C32MWi6KMXQeQd7FfeQSRRs2EzQCCbGVxlIWHO
-snO0ihkCEB0J+coqHFj3F2D7dQW+1lgPUYeeoxbSCwBdIh0Mvj0rQ1G9F/wiHlD6
-HxSPsDw4ssJo3fDF17fwrKj4ymIalhT7QeTflsf5HIUtuj1YmXFF1LdXn+7EL00M
-uUjml6kMb2q0dflkVTwjHjk25Aa1WKwmFRuMY2rz42ruF7/F0Ku4OT4AsNwdbNjF
-QR+qqzJDkU8PXw==
+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
-----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 98b87848d48..9aee3316fa7 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,17 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICtjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIFVWhAveqnrMCAggA
-MBQGCCqGSIb3DQMHBAjSv4tLOkB68QSCAnBWwf8jiPe0HyolrOMe80nkihbQuFkC
-4oFxh44WzXAm8InZmlq3FjUZ/8je19HaqNqC3GtF9lIl1vEO1RQoavNH/UTu95BL
-egGj0LL+Wjtd19UxZ11N3tvaWTL6UAnLpEeMYS2K2Bg/OXnkYdx+NaMFB4bf/AFg
-TSkDB/8RCP3hplYlAxf5mMbQobJVJba0ZG2vZNRIet4pzog6RpbEh+TE1XuoG1i/
-lg5kNLygjSnoc14BWvWuaeMKBhqa+J8iEHdykP4OYyOeVLVU4a9d2asVrhdgehZS
-dpwnBtexTeyoYavckG9Lo2so+zQUIxOf+5/fJU2pdAx/H20DObtiq4X/jV+L4sJq
-6lBTEOm7jCI6ZdkkmaG8ETAZbduDNihimssqtttPkvbMWruTPCGcf8ajHamptcng
-UqYaHviIO4KOYhRKR7d/T8DoSDokEKsdoNb3avJSjUvOfVr1jpl9EGBGhwZGyIgH
-um5yqDUVQLHXTE54Xi9OThJA+LJHYErpof3hRTjtSeGgvTqXIJQQViYbgYKasirI
-2djQF6GWeAyozNms9hnn9C3OcByN7rtYK2yQDc1XnssjyT6qJKzTHglnHdQQVn2b
-j8qGzkDP6pJbeA8BTc1JF1R5ckh7qjY/HzrH/L4iNcBy/0PUsztAwnS8QspzZOZV
-COPFyoL7OtgTtHx4fcalWGt+L9jvHFZReSxLRk3L1eJy0y9CA6Bhcv9w5lzmyyX7
-QqB7tzm6ElN3hMoaTmZxLUJbEyh2tCarU2uetoGe6BPT32kdZYnJJHP2tPjCmF8g
-NXCkRk0txU0bOqMQWC1kFl+bSn1H2jLOjHk=
+MIICvzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQIdVw7eoo7rqECAggA
+MB0GCWCGSAFlAwQBKgQQptxPmd9kA/oF3aEcFf6FGwSCAnAQPhmEabUxMN5SX2Lx
+jabtS2UybnhcaHlTFakwfbxnsVOTNZKYDlB9EhGviIGUW794TYqBZuq0RYxSLWJo
+JJ7u/NG7IZ46cnvdXgpmjt4vWJmccpu0yjfWCwOT50lQmyqnL/iV39hBv2gCd8ha
+b2ysiht/rnZjpNAys/TXuEw4x7nTSUlZiUKN8gJwqgh4yTZryZ739Nov6gOm20XZ
+QMwDF52xV9A6L0efa6ZDchpflSQmbRz7Y0Y1TuUY+tjyL7T+B3pqoBgDZIIRn90g
+md/uOLXYvZzgOruxPYGluPxAaBhj7XRAP5/43dAytYt8LAq72q5ulygzOnlWK0q2
+e3klE2rt9JBzKnffZcSuLRb7KmLYMedFlIZTzHyqejxXXfLJA7Lp/2cT4lGCUruv
++ygGosCckUltxsQNcX6uyzWjy6toHCXPKtLVvQ0p72n9o0f0A0XHg3XG0uJiWvRT
+WQIyV77Krnx1OUu/1DFSlALRHmHCIhjtBqdQhcm2DClPutLYQhZkOhG8ca1xHZFu
+NaPdHJpmhQ4CxrD6Tl7vdjGoztpvr87W5xk2DwIdzwvEF36g2Rrj6zUqGQfVc1y2
+2rrQn+J7VeP5AVmialu94E2hqpkCpJUhQkK2iIF6j5uI48qlfDIHfszMHiESRTkx
+KX5sh+VdUDTpiEGuTADGmEzbUousQ0gxKzrPSRiSy+MyPliCPdKj6+YlYZarazd5
+3v7gGQ1u2JQhmFxZT92Ay9bVDruyEp2iIS3vXjRViFHQ4SHTAAR8r+rVizOR7OCE
+yYC/OvAvf1QEjolYSIAuoPzISemNh2Rh8DOJ2NC7T7V34V0=
-----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 6003b292cd5..edae554810e 100644
--- a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-ZXJvYy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeC0hlGnmt
-bHQHmwLJcqhhyPyGQziaJanBTLKg3YdB03ZqfqL6Hwl86KuiTlg+cXhMOslaGThi
-W3vO6MPtTsW/1lNMv8vrdtyuzINNl8Yn95qijkwvWhnGr28h0HycB8QNtlost3Ys
-mhytvSnX02XrhjIBtXE+iyNWUesAGfspH2fbYPJBG0v3X4dbwivoYrQB9oUhwQSB
-YJCR4fi9Q+s/Mt5FIJBbljsyL8xuG31w+W6CZlCormIr0vWWlG1FhpT98GxHIwkS
-/73wBCvpY3ZhUs2lDuma0tyejMMqZe0H0rZaym4N0SCyeberClSVQ4E+FjgJhImZ
-syLpWqD1+29JAgMBAAGjggExMIIBLTAdBgNVHQ4EFgQUioq9Z8ojK1wHhLa7skBb
-wClG/AAwgcIGA1UdIwSBujCBt4AUkryWpyNL3lnpKDu0Qlq99/adJX2hgZSkgZEw
+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
-gghH2C1iWHG7KTALBgNVHQ8EBAMCBeAwFwYDVR0RBBAwDocEfwAAAYIGY2xpZW50
-MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQEL
-BQADggEBAAH/NDiB3zOLvxyS/czxokcYIXSXSHXc2c0fHeJDNmlGT53UrfqjHmbR
-ti3sgm6iiOU9tk6qSMWVV78jtl7IwI213AViEeE6i890RYSlMOCKQO9J4C0fuDT2
-3LUKQH1Eg6msgZQXhkg/Y6+PcVMfI/RUg9q11ijUxp0DNQN8OxCG2BcrpcBPwzcg
-w5KzD/njCnIfKpLA88PBlvQzBpnbKEMQaBMxNt3LInabaFKU5I0bfW4TfmCapwFJ
-JuzLllpM4hoDM7yZMJdijToRqtUM1EFEajE8Clu9GjcczC0m7N5Gj/L+4fJByYNP
-dKWoD4LtLd/Fjuvzfc6rO94ajxEyeWk=
+ggkA0KlgGsJ5WokwCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVu
+dDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQAg8SMUdqK9iZZIciu2MCLaTNe+
+EEJYPmlBmmv7XVYoWdbnuYt4P4Agv88rr48G1Ris63pCgktGrYm3yZ/EFRGbeud2
+th8W7kAfZcg08tGdw5A/sXZq8VKuVbuMfQB6Va+0bYOsMNo4Q7bksjS8202NZGQV
+/qaYaj1a9wrqfLxlYK/eMkUZNd87wDeYM+NYk0W80+5nX857znlruGJW+od/JFWj
+bl/72UD/Y3RjQckKM2uxjtdyKkjdHODyI4ExWgJjPLC/TCa3MBD5KHT6kr0b96bX
+9TE2+IIEyBaW45wG07y0fQ/6Z/n9xXINbMpTJAG9Fi50rdVoFZUWqkn+T43V
-----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 92f4d13fa6c..5afc54b6738 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-----
-MIIEsTCCA5mgAwIBAgIICZHJd3BlDgswDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MDEyNTQ1NloXDTE5MDIxMTEyNTQ1NlowgYUxDzANBgNVBAMMBkNsaWVudDEMMAoG
-A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
-cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-ydo7Pamy6+7/H9MI0H5F4In/QfYWYp1tjyuU4Jg0ZKuhMS1OfHwvd2LdPwZSp01M
-evzEmiVQXBPGoSoJ0iwDyGAP7L8gyrIeQKsNRX5b8rF8iWfX/3AR7rN9m70SAHPp
-MNGTq2nA9IPb6a/UmG6ImfuerfuuPpJzZ72u7Cbcwadx9ewWCQRn5ShS69PNTO/M
-K923CHJGH0KJsv5mDnekt8/LFEqo8KOrysbkTKRE1MxEW3FMYMlYnIIql5B53Tvd
-5c4rfkrB3LLmMlPfJ0c/UDFSuXVCuuMBzj5oSQYrjMy34OlHGLDH9wddG/nUmPNf
-RirIacPgM+fDoPmPeGPoywIDAQABo4IBGDCCARQwHQYDVR0OBBYEFL8VJHv+V8AX
-LLGzyRbCQH2AganKMIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiHBH8AAAGB
-EGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAHugcNpn1Vr1m8me
-CkH4PJqdUWD/xinGpfy8tJSjVIgY+Y+hAzw9i1VY15ENVkPoWVqcd25Ay9feCqiK
-N8YfICQpmpR5Vo9l2T5xaUKyGZQ3+28sYAZ+9KGW7sgEtsHTDFctbZGtHL6kRRzw
-NuMPXyNKUc9GLbx/dUwaP74YfRtqimAUu1A3vxh/0VKprJ+IENg+5dwIrkmmlPjl
-F+BoJfixzRuQ4y818CQyNksxrVaF3Y/2+jqZ9GehFM/7MoNVJ1JalCSJvzLNQykb
-Tw6q7GdDsXoNl3SqFWGVN2GBjFQSU5Bi0kYMcU7C8PPkQG6XE+6RH/q6KTNftgSG
-FV6RQZI=
+MIIEyDCCA7CgAwIBAgIJAI+hPswG/mSqMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTQxNjE3MjlaFw0yMDA0MTUxNjE3MjlaMIGFMQ8wDQYDVQQDDAZDbGllbnQxDDAK
+BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
+ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
+Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANJb6RsZdKLWXwWYJXZSnkuiaK4SHZu4VXoTo7JyRK3z/Qa0uca3gnQEUihJYqoC
+2k3XYS4rdHvqE72w8HBhN5Unk8j5dM4QnHD0Pld2DHuOhZiucrcWbWudTf1R6a76
+T9V4Qfbr0k5SUgIM/tkaDR7eCcfPH8cw7a2atOtLcQVV2YIUGDS5IGbz08+fiupg
+LpOisHtXVgbIyzdFx3PuOacO03eaaqb+ZeHTnTEs68WqdDCLdtk3KKwvdOc35MNk
+cFEz4sLQRoVTFSVZ6lJyEQOSdBulE+GjY2VPKJGnquJpXSdWSsiUDA5a3dhRh0l5
+28RD7xYD0t5HtcIgyN1q76kCAwEAAaOCAS4wggEqMB0GA1UdDgQWBBSaPto6U7l2
+ZtSt5vZqCgBx++7M7DCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63
+WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
+Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
+VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
+ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcEfwAA
+AYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG
+9w0BAQsFAAOCAQEAxPUctLGIMjn48XgWgzx4uT737L+7w3EZLc39DqQ0rkvBtODO
+6l4RLoZUfNiK59N16yj4t+hhgfTMPbCuONtKdcshkfLRFG20ZVqCbsDWhFZCPmrn
+aR7QwIRyks4+nKZoLMUtD8qZRZqk7Bpr1N4oxZq8ze0VUpvtWCPeQ8vN31eOHKJY
+Wu71mZaf+p25ZH7dNHp2pGoflIf6EX2mmv8bCNiFAqiDw8//PMD1z9qk6677ms9n
+Ggn8i+4liX66hU+8ez2fsj4IRxaW51B1+XR8RZ++z6laz9zaKC63BsAs4bg08sYj
+2uiPJmIjiMYXrjQJV+aiTL0qQJ30oy6iq+RYxg==
-----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 f2ae350f998..bc748d1cbfb 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQISpIHJSyzS5wCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECGxe5kKJ/trmBIIEyHp1s9+TkYiS
-w/pr1vy1xXpP0qItqmz+9goRlZlr6fBJ3J8AvgujnRsWTwAs9ji8LABI/prpOu3E
-pyuxVg8/FcpZN7JcwgzRRcdaP7wH/S1xrawoo4ZLtIHyZKlwsXam5TPRST+1jvWy
-H9GnS6wBxXXBpnFA5l1Z1UAR3owYbdcBx4rEw9Jn51R+9ZOln+UGqxDgx99h9U5y
-gV7n4Vd5rTUBL+9+WxMUd5WMtMIAI911rFywBm4H4hQYnR63lPAkOppb9k1dHXl/
-/rwgZY9eY6bebuygQPF4CdNXbWJZ4PyT6mYZKwT0wHy73Yu5cLN2+sJFa01FRROS
-0+asqM5/qGSPdtWr1ACm+TEaZmsOh6hRQfRwhPIsBDoN+dksz13WGCZ69Soul6VT
-k/javHY7kCNdUNEEJBIK/rn/jK9e5v2qjFGDNchPnAV9Tkwro+sFPNNhjl228E/b
-Qpc0FPjtE09ZI/RqcAWgo0JnrAVLto9nG3Q84sDkgRCYFoK3tfR28GzVAIR8sz3Z
-2AuygraenCVjILzBwj5MqSifksCfjbe8rn0T8xHnAnVnpGnJ7LUjK4LWHa3ahI5s
-6V6eacfpoKi2Tq0MzAFFzFGn/4EAnVZumCZW6qtYtEtakB68QofBH8u5P7mN+ghF
-ZddOquea8by8LvccmxRjW0HVv7jrfgk47LxrrXJcquz+orNM5McLp/D2fVUIYWAN
-Lk0m5ZzcyU1TOPFIlT4RIfjfprPDj50ZQZPMrI2NKwV2pPDZfGl5ZJtNo1JMJZW9
-chtYB84wRQH7pv9sTYOYtqQu9kGs5n2z0PFZg95KEqANGuiSJwZzfg1rpRQM2EC9
-A75NOC5eWofpRnDBLSJiboiwh6U5+S5qpIFup4tbjFvsoj+UBwiOYwshkFDZSiUx
-eEZhQmjFZ2aK+/AvmIBGUmyevy76V812o89N5PjSltCamLWsmR6eqToE5aSh1luW
-P+zd+9BFnf8rmgix8w6yrNF1Tp4Fdxwhh7uYuo3Ttr37DMSuBXdUEuYYC0ptDbhL
-4GCUqFUQl9fSv2HQUS3BM+F8zXq/yzZrXylwH7OkyqiPYH2okR97RHVYja4TLW1x
-duANxEHm2ngMKQ4/QwLT1MEzUAwXEr6xUuR7a2bK1T54O59qE2MuZsrhf5c1CCIY
-tXwJyIm1er5aIQTlbL1LFRRkXpzfIJ3y8xr4MqvwjqOpYrlfIaJiHkj6DlZ38tui
-6+mec7zgDqHwd8KHXKDzY58vnrVFrBtH0/fGbgOYYRFCRszrcIUtPoOzVnFNAlD9
-ryTfVZ6B/07kNiDzNTCkzn03aC0W4eqE8LLgniys5IZo7QDVVRXk3xhAu8RiwfHS
-RXxEbQIwCchpoKgEBoBgANkttDG1VQhUMcKtX2VRly1X5Q2alpqi2MCUzd83rYzs
-naxxNYJKiCsMvenC7Pg4wyuwkQPw0xEK6AIG81bxHBopzOH08/pjPuWf99mnRld9
-XpGKBdYH8rvT/R1n7e/KbOuyEqYn/dI0OuOwc9nBG/DihyUTqPb76y5E8YVrJEu2
-UpYzApigN2qmE+hb28xa6xcz+rnY8p0XHb/a9+DAEli03ELSHD/g+YWUwRHrSCAK
-pc4mR5//oRU+ZIihx5g23g==
+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==
-----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 ede13b58afe..a1e6ca5b362 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIoRByLUMeh0gCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAls8l4sgaUFBIIEyM0wn+qvDE6Q
-JOoW1N9huJfWAFTh1BbLMygw0lzeSF5M7Mx509UkyYcm9fRS5ldIHi9ohAtf678F
-dylj3zg7RgAhtDgFqJHdIG8S94mAzdGfLFWMM74IhAk5/W1/tVLdzTvUH51jKaWR
-VhcEcckqNVMd148e5kEnafOPkqKZerwWNq+dQxBmBGy9+hGRS3D+gIeKQiiz0lFA
-6bG4CHWDLkuhngb0avwIRh2QUjSqnjSxsMerzxjcwBXyW8Ov8073HJnbyaheMzDb
-Fo+NSIPw/EMVmZ0/eW7YupmWp/6ptevt1H88qyuMp3dU4yXAZ7ZDjvzD/n5IHj6/
-UaXhsaXIqAFw1SztU3mporuquLbKOdJJbH9zLLCUnJA2BEUY5D24Os/gA4R1UkVA
-NwySBzN9ETp0PJpyKafollanyjN+5EyW4eLKVCQJTB7sMjhH2BSkUGxgGiPIlrLX
-kBt3nT3S0pUMH1XVdIqMs8a4ROAf+LY4VBBBLJOGb1Nwkx1Ny7jjMCUGOMrKqEZx
-3FmBAEzBeQdpshzoOwtRllQHAoSv7HsN2gEGnYtDy6uE2mPy50d7BR2kENbR9iPs
-e0YyihwYJr+dw8eCApyRUpGC/dk1RamJhUAzXWQQ9Tngd2FF0ur/Zv/YH3yFA11z
-M5fVv7eRW64WqeRJeoV+xedcB85L6tGS3CDfj8YcnEo/oW30Xp2EflVtXQX+KD9t
-9KINx48hhUFxssnbtoMK0k7Jh7tJ2aT/3NtQ8j4AEJFZyL8+TBHTs2Ae57/Zjmq1
-lJH/1VPBirE+yxscjepGpS5bP6Euhgigm3aiIS89XfDNtFqeVg8AjOeGhYV76K3E
-o6y1Y5T8zk6+yNSgg6yZYk78QNEOvtmJZFLuFS7sxud3rU26UDK0udNaRnesRM2k
-lKIpUSRCYAEBsHrAY/8s/AqhLc4dEbw5j4AVstyUiVH+NgwDx2OMqike67E2HAzL
-+xJKFmHqq8UujEkZPN/d83hBg+Tss75HWS3tN3x3Ms/eFwXIODeyrtUmrTq89V50
-PEg7QzMdtSlhnXQaeLU7B9NUNuli10NVQsF0ce0q7X4Epllwt/Ba0WqIg4dDXZFq
-de+YcuFuABQGmz5b4ocFFsYIU6NoWxCuDk5J8wjE5q+A1YNUEoI1JVUnWmomLvpN
-YRoNEeU/3iU/IMpSsMpVptJNkiHdBQOHZDfPOAXVO1gM6/jVjFuIzZ5QDMQdbH1y
-+OayFomb9DODkWl6SACfq09qeKsS5fGWP2rd57TJ/VPwADZz60qshqIAnJzhu/of
-Xe/kiK/gsQuPM8INQuIDc/bGvYrmbLxFZrXZaYr3y0by7UG523SFpo4Ropx3OJnq
-DTJ9d4+Tet7b0Q2oJmhNoEEzemHG2OoRLxZVnWrg/IV9L02TAUJkDc7J+IwThD3a
-6a0mzJMWbdvKlC3KtVl/LVgD7+SQp4FcZZMbKHcPpjEYbq8e+w2k3Wdy+hFtsTLq
-71YOhvxYVN5TzHnOS6AO8/0XmMAm7D2u8oS6DMj+cyiU62lwBHHFtTK8UzdKDvN3
-qPTPFCXpftzsFEv7nNVNMbbTyg+v4VIE183TQgk9IMSOP4t/qswjZx/TUCyZoz7t
-BEi3lqVm30D/ACxpx2IRTw==
+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==
-----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 737be4382c9..c59d7238aa1 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-----
-MIID8jCCAtqgAwIBAgIIR9gtYlhxuykwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
-Q0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
-BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
-hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsTX0N6eBGYSv/Q9P8hoI5m3a334DRMExlICxuUggWDV68vnwgv7q
-mx3ubZDHsi33nVO6ykpbfB96KENi/qb6whFZun4vUyw8Pl3X1eWc4c6ATU9HyWj5
-ZAAuq11HieJ3VmQA+SsuZkFLdQsrTHQ0XVwm2AwbqRtaTZS9wCsXzoXoCLkCjCbN
-fO+O0ORHoPMQXxFZK5PEgM2PlxAcFwPWCfDngV2Ch3zoLNO3N4rlFhXsNYmx7Hj3
-u1hr2m1v3RRweqzIbtbQTKyepQ1RVtx6t6zeoEcDg3DdMwW1rlLdVcZH7XhBi2Sq
-+GgYTLr+ktIgFE/n3kv4HZftgewgfAVMVQIDAQABo1IwUDAMBgNVHRMEBTADAQH/
-MB0GA1UdDgQWBBSSvJanI0veWekoO7RCWr339p0lfTAhBgNVHREEGjAYhwR/AAAB
-gRBpc3N1ZXJAemVyb2MuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBWc3VTJfCZvSlk
-sJMH+PTm/nvUULHStXuJKFiXV6hvYdLUAm+cfeOlNlfMq+mwJiV3iW5dDQjY+UZS
-D74i8vNepYc8XZKPC/B9VSAlvSRG6LeWRpYnE7hU86gcBFZdjrtz53lppiK3SG6Z
-LrLvXf6U+aDSJapzCq0OljejZxpBrAH8+07fPBUoFoXD5x68E8jlmp8jBJvkyGlN
-00izhwk0fptrk+YrTFGBZxFO7xIoX60+Xl3WbbMvvyb1LAQPZo1RAY7AWOfueyXJ
-fzrPmy/xxwE2dZwCXMT5tbAX2itr6RNj3iJ3bu+aaxkC25E1gnjc8JH4fEwXQLfW
-mkVmXORk
+MIID8zCCAtugAwIBAgIJANCpYBrCeVqJMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjhaFw0yMjA3MTkxNjE3MjhaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
+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==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/ca_key.pem b/cpp/test/IceSSL/certs/db/ca1/ca_key.pem
index a1949211957..406d9b0e516 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI0fc+/lK8lLcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECI5kOp52wGfjBIIEyDUE5KerXJ4h
-hd9AImPW319LYHGkDomfJeQXM1kbt7IXJ0dWZoHJgl1q2Fis/4nQN0k1oNt0qTmM
-kPAx/xMCheOyd/uHH5V/CGb4a/xD9ChBSraCOskmrHHQFM4sylEF7ywaJg6v90Vi
-5gGsxcvOctLLwgqliTEbjTSH64M3voYbZ6jj+VPo4ybOL0JNuf+bwUhyi6dOhHIK
-WGx7/hOSGyRH21wTwLHNT6Wl86O/qgrAMpCxG8j4UHmZfiThyq1Ca275TMk8Nvjc
-rMTHY+c4+MZJAvir5nMFjWuAoT/Qo0ps29xrILy0ocg5p+epTh181DGx1XvehZJS
-Yo+0MUq9BFduV6Z/M+pn6NC0HiglDmmx+KdLUXD/oQxB5R4bk/yFsCfXTIgIqpp2
-HjiS3xO6Z3IWnzEwIEAnQXhGtcRbx40+qqV9Qb9b5uEs6r89O1FW+jlBKsbYbwkj
-j6W65iG4m26NKI/jjNaLZgPIrhQLkcxy5n7a4ugepn4C6Y35jozq7IGBnUhW3Sb3
-s9I1sL3qkhFBN4U9dXXjGU/EB3RQTJx4xY1FONIHKZSI6IIZd/lLZxI2NNNozWaS
-H+RhOc91KK2T1Kc0k2sMIMFcvw9ywEnJeOX4Hk8wPOaUyOQx2SADcaLV9gH39eZ4
-uPzk0tAJMdrqmtFNQtXEcnkWw4M91ZZ83LN87ziJv78UL73ZdEuK/jPsUznPPrur
-4aYFIB3gCyJMSETXOOziIN2bQi7unA7ykM5iXX7mafCEiJT6KimIEzsIVdwgP2He
-zf96Jf9lACuLRJi4U03h8spObXo1Xgq9r3mzmBzsQrNTAPwSQst3jSqZs/ht7wGt
-XCUSUMTnk9wWmtbDnAjsUGRW2kMGgwPE7eEmOB7ZBHfT/CECfwGxGOBShq7U9LNH
-4u5XDxN4YKjIjNKcYbSL26gESetPqSLbsPN5vQEQhL4xjMsqUa4nQrUj7U1itwlL
-pQJaO1fgo+TiERBxxq2mysP1KfS5GbEWOPr8ECBvp0jXg0OvDqV23w0WzXAmvsQP
-E61PBFLi1uBBLaKrxBXIJKoe5vNfXc9avQ0PORu4kmMwpiQx1O+fm00/HcMOR/Wt
-2x3vsCRmiUgyjSOSOl9oY6K0gfMr7+cFgRea4VBFE0bwWzP3yGiHI6PBDnn24fIo
-I0dy7svTZgZSGuvq7k8uSsDifHbqvH+qx0q5DIA52p8K8N33OAsuN/KDP4puR19t
-vJFayLtGJRI39YQWtGoHCT7aAdOczEjLP2zi6RY0bvQXliZMKOB57QgSeT42IlW1
-ZsZJUbz4+ZfgD5wDFSg502tm0JTcWT7RfnR9UDnX/n6nTh39aeX1uushpKoEaKiU
-Ul/9RdEeSk0sg67ld777EPRFsDFz02M0OjM7N8JuetTgfPDZwzOZmQWcY5erqbEJ
-c5HBocGKAWr1u6Y5Gknk6sObuklRVQKjMQB4H/5dp8J7lHJrgod7PLcLPenQJE7Q
-2ZwJUZoRTdfaLmEFyArI332IZxRnpCoUSOKVFaNPbNMWyLqoIHhKfu5sjIdYEyO9
-W6T8WpWM7Ti8DSP0x2AidhRID856Tj3btA1PgQHBDYZ2cJW1ctthNZQtAKdV5TOu
-vQiXF9pLYIfI5ZA73FEJRw==
+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==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/dsaparams.pem b/cpp/test/IceSSL/certs/db/ca1/dsaparams.pem
index cfdbcd76c17..4c97d949180 100644
--- a/cpp/test/IceSSL/certs/db/ca1/dsaparams.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/dsaparams.pem
@@ -1,14 +1,14 @@
-----BEGIN DSA PARAMETERS-----
-MIICLAKCAQEAs9fIq0Lpb0BcC8233zcXdh79JBhEt5cTJbV4lhEQzHPPADXSdejG
-e3BjOTT/kh0+5+gL7NnfZYX3mvtUSyzpOP8AUxGXR5OHVGQxy211YvbgOyJwS5ji
-f0AVlJwSjtCDHK1ndzeASo2wgeyoizQPyAwSraOCWrH9FWbAtXp4xQqM0aXgHzMI
-0mAvkzzNGzpUWPS6E9i3pocsw3m5E+mV3FSNbGItaeMCeplcF4qxmDBpWHROXpJp
-rMYVY47xyHQuxWmBq1ygWnTKkuaqDsMxw4XBvFKH7uGolZFdfPWK4p+W8aLLRvaH
-YxwmvJRyXAF88Hl8YwyA6FGrbTn/cgDY+QIhAIdu80pr/sbSwex+J63BJ5RMtcmM
-ea+sQInFTk33Zn1xAoIBABrwPLLQ41AFX9/mFkfDEbHmh/ACzezfdckDmYiLMpYP
-UfTqE6Kz16PgOqMYCoXE+5iGIATpnSj4f9I2rErUEv7qnprXYWoWsxQoZ3BhwE0u
-ZTuVl7fwpZvr3Mp+IFZKoPmF8BxEPpEznzVay5JR+VhA7Dap7o9bcNcxOeudvHpB
-w/L6qEAG5ayIz5lrXToHCkIKq94IaWeyn/i14Jf1RwzEdJ9keEh/8+zqLwY6+6gW
-eVoNmt1EbV/1N9VXiOt5d7QWr8gp08jGMZsa7xIzjYab6N4nYGd+zP0yjOOIYW5p
-zdKFsR/aKZHdvDeTGHCQaA3ISPqx/5AAHeI3S5qlfik=
+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 f68a8d5deae..21c7cb59faa 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-----
-MIIEyDCCA7CgAwIBAgIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
-SW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL+F7psdqISmpG9p4Q2hPrW57gmzJzbtpBOA
-flAAdNByheX3OL99VFyelT4CPGfj6XmFmaJQL14naE+j9RdH9U7ZasxLSyNbt0r6
-jpaVfr+3WzCQffnA//2m/EofLmTS2BLFpPP6ONuC8fHRdR/vMEEVZfyMW++WskSE
-ss5fOOFDQeKnPe2pOYjxfH88ZJWGpyd9g/YJ/3ZAAb9EBhc4rYiD1YalYBxizXNK
-ObduE+5bze+aGraRr6N9Ed+D9Fy4Ade0ewyz7eWm1GhA3x+f2BJKmuW8/ij0DUJP
-3hzXXaqZWuVsWMm4kqa1z4tyKx29qVL/IyJKp92MZfmBCxsz1cUCAwEAAaOCARkw
-ggEVMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFA3cEk3Z3Nkk029mvLtysb6oOG18
-MIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9oYGUpIGRMIGOMRgw
-FgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwL
-WmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGEx
-CzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIR9gt
-YlhxuykwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAFLa/1Ik1HPC8Af1R5PXgRcImznsMc5X21zCibNOAcYn4KP7y
-pUgjpJOyd7g779l4IZ5PEWK8ilEPflNWxLv2p6B27Oohyc7MAKVsAxkBrhj0dY8M
-Y7WyvDCimxppGD2xcXS/6h5jiYBdOpAmH40GvEnDRMExDg1MRJIgoV/DD/nG9wyx
-brMHbzH2mxsp4jEmHAIdrrCrGf815Af2aR2vIWXt3B9b+e56KSJG5Wa2sj1fEYPu
-FzQNuhI0CaWFbAxKRWHhVWelPyyjwxa0RRlqijA2ldjSTrTDmd8Wfs7Io6jFVSka
-mzJ0SUDf4aJ0X2lty9iE8XOhHwPTmQBdrmqlww==
+MIIEyjCCA7KgAwIBAgIJAIXSkf4PzXq3MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
+LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
+VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
+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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEyDCCA7CgAwIBAgIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
-SW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL+F7psdqISmpG9p4Q2hPrW57gmzJzbtpBOA
-flAAdNByheX3OL99VFyelT4CPGfj6XmFmaJQL14naE+j9RdH9U7ZasxLSyNbt0r6
-jpaVfr+3WzCQffnA//2m/EofLmTS2BLFpPP6ONuC8fHRdR/vMEEVZfyMW++WskSE
-ss5fOOFDQeKnPe2pOYjxfH88ZJWGpyd9g/YJ/3ZAAb9EBhc4rYiD1YalYBxizXNK
-ObduE+5bze+aGraRr6N9Ed+D9Fy4Ade0ewyz7eWm1GhA3x+f2BJKmuW8/ij0DUJP
-3hzXXaqZWuVsWMm4kqa1z4tyKx29qVL/IyJKp92MZfmBCxsz1cUCAwEAAaOCARkw
-ggEVMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFA3cEk3Z3Nkk029mvLtysb6oOG18
-MIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9oYGUpIGRMIGOMRgw
-FgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwL
-WmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGEx
-CzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIR9gt
-YlhxuykwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAFLa/1Ik1HPC8Af1R5PXgRcImznsMc5X21zCibNOAcYn4KP7y
-pUgjpJOyd7g779l4IZ5PEWK8ilEPflNWxLv2p6B27Oohyc7MAKVsAxkBrhj0dY8M
-Y7WyvDCimxppGD2xcXS/6h5jiYBdOpAmH40GvEnDRMExDg1MRJIgoV/DD/nG9wyx
-brMHbzH2mxsp4jEmHAIdrrCrGf815Af2aR2vIWXt3B9b+e56KSJG5Wa2sj1fEYPu
-FzQNuhI0CaWFbAxKRWHhVWelPyyjwxa0RRlqijA2ldjSTrTDmd8Wfs7Io6jFVSka
-mzJ0SUDf4aJ0X2lty9iE8XOhHwPTmQBdrmqlww==
+MIIEyjCCA7KgAwIBAgIJAIXSkf4PzXq3MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
+LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
+VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
+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
-----END CERTIFICATE-----
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 c55307c8cb2..781af2b71d6 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI6JKfdcK8XYgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECE4xaplQxeTFBIIEyOvTKi+q4Oqu
-eTdxUdAsxKeaYIiq59Uwy0emDMpPAL4P4wY2oegujFKaUJgGzbOD/RKgrd16/uU/
-IXqlKoM3harGO44IzvnNfRfffshx9HTjnfkdP1y3b19iSY4rr4J6ab3bdjxIwwM8
-ORGbUDaRj5o28NQlgsO5wi6ZHzfa6nfq+azSdB/koKyNrv18w7rSClguqRft3KVK
-t8tY9dhJjP3T+vTnglenR16PbhJvEpGAY97D3CGp1+/o/U3+2UdkV0e5dBjZsqqy
-5if61Cd9CpEeW3BHrXEo0N306o4ZZ746MmkuNkCLe781ndX5AyAMDbF/QgiUUymQ
-kxvOobufMwpM+Q/uYDxwaFWt0l7AIsM48n/xOmMm1tKRgwUNM+7M5xZqwtyz3DLm
-RUxmo01PHxI7UsmbpdWZAwQdLz0j5oAcZ7BY6IF8RaF70ICeANt3YLt7OV5Oebie
-zur88kSzlNTiSRzQ2PIwzmZ2eLAYK9n4uOwny3UjQZ7DLkDmrAARdHNOIH0SCJVt
-S45LmzA76S292mUhg0kqqaBjolA85LXK9QLRlbxJwv8RicrVzRClIywchnIQj+gS
-XlFJNiQgwX9P6UxtFnecjo2gCw0lqgmk0kqZo70BhRpR23Y0mco5ZR2pofRR75yc
-V+QiVHlDCyv2FPxQe4/rpmhKKmhfMlxPIatV7IWJp+4PDJJSCuNA2dN0gmttqtPF
-7BtPfi9FjAVyXAQ5RW19F+ovjAKcwNwKydwajp57hxvwyoilCQH2CvsS4/V+OrBD
-MqL1h6IxqzyCZYvHj1bufg7i0YbvOc0I8sSr6EmZ1Y5HZ4GSwvrO7TDL6n9XriLX
-4wtwSDWqx2YI/PJ93e2gZ3k8kTLDRSQnLeqXUc44smW/l7Wq+H7gn304tJ/QqgNO
-EnG4KQ1wahK6joaltiSrkJXZd91Wx2Vk5zNI/z27DpSMu+uMbdK2yh9r/OVXsGzs
-zLaj5d56vNvCauuRFF5Q1WRsxZDyC5oYx/DTn4IBVxG9z5LEqH1pSNG7TOvCzShs
-LNxEizfI0UDGUPDRz3rRORkX9+CBAnWcMrwP8rz4wbjTpfgRcw5FaZ620obytsVR
-cQ7BjfRnYl4UljjYYmoveJVmUWXmOTVl72GXKqWN+dTCZ6r9c22bxYyKbkqsTdc5
-xc1f2Mrl2vakA4xzmMW/l1pDR45lnO9Pa4jE4vCTwt+7b+G9z3bVY5xvtG0yf0jT
-hXAMYYXLTM85chYi/1SWLQ2amp1tUi5yztbjdJuSzH7CMCjjOvorDivF/f8GXg6O
-bjxGTg5uYJ/mjH3FpW0DFE0QFObihstdVSuIhUJL5wwbj2t3Y4VSHuLq67SOaH6S
-tzMZGxpPslK9BHI+lVCPDudYk5HGMU+8eKxhRf84h/BnYaCFanpYLp5a+jCoQ4JV
-Sb6THQ+Y9Q+swXNs4JwzYzx9AypRkmYEY0P5ROaDPa0QCXUz0SkObdcx8BfQn23g
-6tEW5ohfOi+q0VY57Grp0uPOU8sovqAdz+jrEnS3I0aevu4aqSHta3BAfac7PMZg
-FUeMWs16OZBywJsYdKplrEWdY/lk4WXQWTikuN679B9Fg5x06Ekla1pVCN6h/zVu
-N8OQTgZMnbSNuCG3li1yVQ==
+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==
-----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 3d093c1a183..c4202d9aa8f 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-----
-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
+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
-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
+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
-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
+A4IBDwAwggEKAoIBAQDSTD2FjAf1PFYRSl2+zAzaY93t/GlVSQ+vjZb1vku8jsnh
+PDX997H+ui1SzakS/OCkY7AFy/z6vbB6+v1EC4wbsg0hhvpwdrfot9Fxfp/X1T2V
+LNuP4XyFs7LN0CL4aGidzjEg9umLYD1wwt9hZDcX+Ld1j40id/9kRSYpYaUXNZtM
+/clPwaDwU1WY46ibD/+dk2r7e/QjnZtpdNZam2cggYNaUoiED0NdOsZPOP9utulO
+ESfm4rYhAZmAYhSi+/iltdXWp8OaPmrSgbsN4dRybMCu9ApTRKpM4a1XlLpoPqzL
+bSgdfFiKUDKX/sVqw9h3IQPo/F7AOLBo5Gn7Q/z9AgMBAAGjggEwMIIBLDAdBgNV
+HQ4EFgQUxkBLtrC2lWvQDUYNsLRZIhxCTi4wgc8GA1UdIwSBxzCBxIAUDKx165nT
+brdmp02LANSqPK3Vxr6hgaGkgZ4wgZsxJTAjBgNVBAMMHFplcm9DIFRlc3QgSW50
ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIElu
Yy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYT
-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
-rgC+JHcx6rzfU9eO6DmRyN6eEc7Ksss=
+AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIALjJL3tTAVYwCwYD
+VR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVudDATBgNVHSUEDDAKBggr
+BgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAOi8F0u3RtT7ddbqJryb2DcGiEhYD
+U4j/Dgnjfkj7FfC5ao0eS8lN74lip5e7yA9vugJ4/pw38GcH8+p75q5bZBvrqBjZ
+BgUcCxV5y1SSzR+QUWZ/UxeSvzZhckDU8mdh6y8os3HEHwEPX6NDJCTI7CwqXV1V
+zTiXw9UZ4L1fFMbJe9ChS0ra91Urv2fmVB/TAMk1Tb+wrW/0h+eGFD973+XaXPvu
+Sarosac0pdVIB0HwZGpmSsPsOiI3uR16QuWwvc3d1VJChYNWisbnLXJV8O62uN22
+RvENXb6FOBQc/Gq7UFYsW8kLKU2bfPw0yrG4THuQas+xz018D4vK53TGNQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEsTCCA5mgAwIBAgIJANiFYSTmOKdNMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
-VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb20wHhcNMTkwMjExMTI1NDU1WhcNMjQwMjEwMTI1NDU1WjCBmzElMCMGA1UE
-AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
-EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
-RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA46cFbP83ifuRm7cI
-3J4AQ7v9yXucucLJSO+hLGQ9P2ibOvxxRj93q2XxQFoiC1HN3FAxanaXRvFsLkru
-RrEnKarEdsjiNu/RSpSXUJR5n3YqGvHEmUDKUB2a6NILQZm+Lq1cugnA2CJ+tjSo
-4zK/KdbLWjnhhYi034BNR/FY3rWZ56Z/a1vOK1+rKkOM1o3aq4zlGARcUP4KpE9G
-DCUCS3Fj27yhROxwKwo+mMDZtCyqSZXWIa/k+TUE23uBGUFcZHrKbWSW+6RBhYti
-AgNy8Ra09CxxeqSR0t5qbXc9ThfUbKPpynp3OUPGQ3Adu0KQQUe7rh2+5RTZpSOs
-tv9wjQIDAQABo4H1MIHyMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFIJAlzpOQAzi
-Sl34+NaO3e0yV+cuMIHCBgNVHSMEgbowgbeAFA3cEk3Z3Nkk029mvLtysb6oOG18
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQADggEBAKpeLbKpfD1QAgje
-AozcGBUrg54TKP6lEoGi+Nceqa5xandajGCbkYL7qTHo8pseM1l16+7COtNB2uOi
-NdFPxJpXig5IFavX5DsJAKeo4khAPYJPAI6Rj6OLoADDXnkFc7N4lFVPuhIUA7/U
-Rf73fksdcJ8o1Hi9cWJPVIzZ2kz3l/BIPFBtcueKX81XpTVak69dDPpKg6Q4LJwR
-JoWyJ+Md7QZPuufU6hy8ZLRgtMgrmRugcZ447+jvJjhVEMI4vSi5di1mLtZTQagX
-OuWRPxUaic03lNiUVYyQh0GFnZI+QjHFV2G/MvAAEYQR2SHzwaFemC6dAGomec8a
-E1AMako=
+MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
+MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
+B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
+LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+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=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEyDCCA7CgAwIBAgIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
-SW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL+F7psdqISmpG9p4Q2hPrW57gmzJzbtpBOA
-flAAdNByheX3OL99VFyelT4CPGfj6XmFmaJQL14naE+j9RdH9U7ZasxLSyNbt0r6
-jpaVfr+3WzCQffnA//2m/EofLmTS2BLFpPP6ONuC8fHRdR/vMEEVZfyMW++WskSE
-ss5fOOFDQeKnPe2pOYjxfH88ZJWGpyd9g/YJ/3ZAAb9EBhc4rYiD1YalYBxizXNK
-ObduE+5bze+aGraRr6N9Ed+D9Fy4Ade0ewyz7eWm1GhA3x+f2BJKmuW8/ij0DUJP
-3hzXXaqZWuVsWMm4kqa1z4tyKx29qVL/IyJKp92MZfmBCxsz1cUCAwEAAaOCARkw
-ggEVMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFA3cEk3Z3Nkk029mvLtysb6oOG18
-MIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9oYGUpIGRMIGOMRgw
-FgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwL
-WmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGEx
-CzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIR9gt
-YlhxuykwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAFLa/1Ik1HPC8Af1R5PXgRcImznsMc5X21zCibNOAcYn4KP7y
-pUgjpJOyd7g779l4IZ5PEWK8ilEPflNWxLv2p6B27Oohyc7MAKVsAxkBrhj0dY8M
-Y7WyvDCimxppGD2xcXS/6h5jiYBdOpAmH40GvEnDRMExDg1MRJIgoV/DD/nG9wyx
-brMHbzH2mxsp4jEmHAIdrrCrGf815Af2aR2vIWXt3B9b+e56KSJG5Wa2sj1fEYPu
-FzQNuhI0CaWFbAxKRWHhVWelPyyjwxa0RRlqijA2ldjSTrTDmd8Wfs7Io6jFVSka
-mzJ0SUDf4aJ0X2lty9iE8XOhHwPTmQBdrmqlww==
+MIIEyjCCA7KgAwIBAgIJAIXSkf4PzXq3MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
+LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
+VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
+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
-----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 9af77bd2a86..c2db58a6015 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI6k3EcAxHHSECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIyBH4QGbpJTBIIEyMUamzjMXc/q
-McZBKc0B5GCYbpsceb7R6rnnXckhAcIG66itVPnn936B8BRAuyeoXwYSs0WnEekv
-fsF63os5GOxzwD6OOUJu7/QtG4Z3sHZo6zCyHYXiSC+ZSwcugXjiDtKqcobRWXpG
-yTBPy1TC+HclpOc/PyRKdY3r/tCwf3oXuJtpxrhjor7j8tSCprhQ4yN+odt4XfYl
-ZAlU3Xg7we2ZudkQTpczxCdjCqx9V2Ms01peBglmDZmXn/HU0LahopMxKV116gWS
-GrtqrM9UemfZFn8KbJ+C0MJyC0m30gqCOWhIy4AdcJSp8Cfmkcr2MfZc7n5Dn3No
-ziflsbI1B368CsMxioiu/zgl0VJIkc7oWcvICIa0qiWI65Y10yMm8Yz1ZcCL/jKX
-wmnhpaCgpIj5geTqo/k42vaG+cvqTR06ed7+RZy7L8W/yl+GkXek07bCjdFVLnHj
-WGZaWIWDMllX9QVxjvtNijRnBahTksraRuC5CU3HvHnI1nD4lpjY0gtRWkX2g8mM
-EoQv7MHmHQSCI7h5wQJktbsqXqFIvNhcS4pgSpf/BMURWzhny9p0ayUyGGBEIHN8
-u4iXpNiq9i/k8XThThIuLkicZkFdiyTsFzBTCeioA95wiDlQmh0V8FG9XlnfWbOl
-QzdW1iR+Cr6q5S7M+Q6DHE6GWfgIcoHSObNIBxackPUa94hY5VF6n2p5glwo9VpC
-g1xmzm7cOUywFLrKh17pBzvOPZB6FxiieiwzIeq/n/HzurLrJK6tgEUvXVRta4Ee
-DXwMO6sIss6J8/FX7xbbVRWxXEY/TtlQ0yp+2A/IscGo0zwEbd8Ob6stqOlSJfr3
-NgvL6EsdcUQF0nEWzM/DLnoqsAxXDVowxzlhLQ+LKUEguSu2oodAqr9cIj/NbN/A
-Fo0Wbu286voY2Ip3+2eiRAsv4gXCrjRLwdQVj1P8YrQvkx0zrzjq3v13XCo1qnit
-TZzxJPx+zRGUagrxMzCT47HL7qGmtEhvRWGcXN3jZ47nrPBWzweojK0oKQKRfusv
-Yi74S9RPdkEbTukwYYu0ylcQS8EtBvSa1QARmwv5dAY7RXFZwyJ7LnLcoMHL7mAC
-MwBzDKnFG+HPYNpGgeZ/pR1Z1b+XmvPtc8Hh1tp0+erbCOm7nZnhbV+egccnB4Ec
-w6Plur7/7U1dKrUwW+9VYzb/osWs0m3gFdhmCSgWfTI2Zw6+WG4kLnOhzIOxGXII
-7CY2f2EeZk+2Z+scvL2kcIudMbjdA4q2amUqHYpbzMUW8E2ZMxTaHshzJXaRTdGQ
-BwM3PKcceNut1goqpMoR+xh1MloI2b6XccBNqA7D6uXgmxfsjF/ggXzAIiZk838H
-7RRMOrn0bYTCfGAk8TTP/72pmWtOHpK7f6n2l1J93KawJwXrM7BRsGnI0rTsEH/A
-dgCwu2xPGhRWI5KgCiEfwlRqYvJt6XhIZRw4xAR8DtWR3jhM9h1LAtFPC3wUWJgz
-aZ8yfa2EDun5oorgvzIeVXiqd3ojwt3piGHw1Ke+n8zD9Aj7kQ1LRb+y9cI/ejR9
-OQbFPd0HxuYbA8HBgpyKoi/ft0xX79o+wDbJfu5uKHBvQ5JRWt5VKTzcoOf+616i
-v05ZsXmey6Wvpa2zR+iwkg==
+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==
-----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 4579196770a..a4a6eb8d5b3 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-----
-MIIEsTCCA5mgAwIBAgIJANiFYSTmOKdNMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
-VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb20wHhcNMTkwMjExMTI1NDU1WhcNMjQwMjEwMTI1NDU1WjCBmzElMCMGA1UE
-AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
-EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
-RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA46cFbP83ifuRm7cI
-3J4AQ7v9yXucucLJSO+hLGQ9P2ibOvxxRj93q2XxQFoiC1HN3FAxanaXRvFsLkru
-RrEnKarEdsjiNu/RSpSXUJR5n3YqGvHEmUDKUB2a6NILQZm+Lq1cugnA2CJ+tjSo
-4zK/KdbLWjnhhYi034BNR/FY3rWZ56Z/a1vOK1+rKkOM1o3aq4zlGARcUP4KpE9G
-DCUCS3Fj27yhROxwKwo+mMDZtCyqSZXWIa/k+TUE23uBGUFcZHrKbWSW+6RBhYti
-AgNy8Ra09CxxeqSR0t5qbXc9ThfUbKPpynp3OUPGQ3Adu0KQQUe7rh2+5RTZpSOs
-tv9wjQIDAQABo4H1MIHyMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFIJAlzpOQAzi
-Sl34+NaO3e0yV+cuMIHCBgNVHSMEgbowgbeAFA3cEk3Z3Nkk029mvLtysb6oOG18
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQADggEBAKpeLbKpfD1QAgje
-AozcGBUrg54TKP6lEoGi+Nceqa5xandajGCbkYL7qTHo8pseM1l16+7COtNB2uOi
-NdFPxJpXig5IFavX5DsJAKeo4khAPYJPAI6Rj6OLoADDXnkFc7N4lFVPuhIUA7/U
-Rf73fksdcJ8o1Hi9cWJPVIzZ2kz3l/BIPFBtcueKX81XpTVak69dDPpKg6Q4LJwR
-JoWyJ+Md7QZPuufU6hy8ZLRgtMgrmRugcZ447+jvJjhVEMI4vSi5di1mLtZTQagX
-OuWRPxUaic03lNiUVYyQh0GFnZI+QjHFV2G/MvAAEYQR2SHzwaFemC6dAGomec8a
-E1AMako=
+MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
+MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
+B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
+LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+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=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEsTCCA5mgAwIBAgIJANiFYSTmOKdNMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
-VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb20wHhcNMTkwMjExMTI1NDU1WhcNMjQwMjEwMTI1NDU1WjCBmzElMCMGA1UE
-AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
-EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
-RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA46cFbP83ifuRm7cI
-3J4AQ7v9yXucucLJSO+hLGQ9P2ibOvxxRj93q2XxQFoiC1HN3FAxanaXRvFsLkru
-RrEnKarEdsjiNu/RSpSXUJR5n3YqGvHEmUDKUB2a6NILQZm+Lq1cugnA2CJ+tjSo
-4zK/KdbLWjnhhYi034BNR/FY3rWZ56Z/a1vOK1+rKkOM1o3aq4zlGARcUP4KpE9G
-DCUCS3Fj27yhROxwKwo+mMDZtCyqSZXWIa/k+TUE23uBGUFcZHrKbWSW+6RBhYti
-AgNy8Ra09CxxeqSR0t5qbXc9ThfUbKPpynp3OUPGQ3Adu0KQQUe7rh2+5RTZpSOs
-tv9wjQIDAQABo4H1MIHyMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFIJAlzpOQAzi
-Sl34+NaO3e0yV+cuMIHCBgNVHSMEgbowgbeAFA3cEk3Z3Nkk029mvLtysb6oOG18
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQADggEBAKpeLbKpfD1QAgje
-AozcGBUrg54TKP6lEoGi+Nceqa5xandajGCbkYL7qTHo8pseM1l16+7COtNB2uOi
-NdFPxJpXig5IFavX5DsJAKeo4khAPYJPAI6Rj6OLoADDXnkFc7N4lFVPuhIUA7/U
-Rf73fksdcJ8o1Hi9cWJPVIzZ2kz3l/BIPFBtcueKX81XpTVak69dDPpKg6Q4LJwR
-JoWyJ+Md7QZPuufU6hy8ZLRgtMgrmRugcZ447+jvJjhVEMI4vSi5di1mLtZTQagX
-OuWRPxUaic03lNiUVYyQh0GFnZI+QjHFV2G/MvAAEYQR2SHzwaFemC6dAGomec8a
-E1AMako=
+MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
+MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
+B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
+LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+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=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEyDCCA7CgAwIBAgIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
-SW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL+F7psdqISmpG9p4Q2hPrW57gmzJzbtpBOA
-flAAdNByheX3OL99VFyelT4CPGfj6XmFmaJQL14naE+j9RdH9U7ZasxLSyNbt0r6
-jpaVfr+3WzCQffnA//2m/EofLmTS2BLFpPP6ONuC8fHRdR/vMEEVZfyMW++WskSE
-ss5fOOFDQeKnPe2pOYjxfH88ZJWGpyd9g/YJ/3ZAAb9EBhc4rYiD1YalYBxizXNK
-ObduE+5bze+aGraRr6N9Ed+D9Fy4Ade0ewyz7eWm1GhA3x+f2BJKmuW8/ij0DUJP
-3hzXXaqZWuVsWMm4kqa1z4tyKx29qVL/IyJKp92MZfmBCxsz1cUCAwEAAaOCARkw
-ggEVMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFA3cEk3Z3Nkk029mvLtysb6oOG18
-MIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9oYGUpIGRMIGOMRgw
-FgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwL
-WmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGEx
-CzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIR9gt
-YlhxuykwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAFLa/1Ik1HPC8Af1R5PXgRcImznsMc5X21zCibNOAcYn4KP7y
-pUgjpJOyd7g779l4IZ5PEWK8ilEPflNWxLv2p6B27Oohyc7MAKVsAxkBrhj0dY8M
-Y7WyvDCimxppGD2xcXS/6h5jiYBdOpAmH40GvEnDRMExDg1MRJIgoV/DD/nG9wyx
-brMHbzH2mxsp4jEmHAIdrrCrGf815Af2aR2vIWXt3B9b+e56KSJG5Wa2sj1fEYPu
-FzQNuhI0CaWFbAxKRWHhVWelPyyjwxa0RRlqijA2ldjSTrTDmd8Wfs7Io6jFVSka
-mzJ0SUDf4aJ0X2lty9iE8XOhHwPTmQBdrmqlww==
+MIIEyjCCA7KgAwIBAgIJAIXSkf4PzXq3MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
+LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
+VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
+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
-----END CERTIFICATE-----
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 58ad49c286e..d384199fb82 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIHjMjWaUscrICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBEc3R5h7QvDBIIEyN9Hhz5aI/Sc
-7sibq5ZQJlG+ac5gwJHjXRegPkf6C/axy7zSaMrB+JoaoG1Fr89YW+LOBrkVnqq9
-OrylLimobVcQ0TG8PqzuIcm+2gPiXo+o5tWPvBwQnNmC9lzuCeEB54aj54//lVmh
-8kl6j17M9JN3EAKXVU9TaC/IlqsEfyKkSBew76SphT9aRkQ73y9/Wl9pAlDd4/Cs
-MUWqPsncgKzsnKLNILP7FXDHUG/BSwG7BNiaUjgQpkyTvl6s02R/aIp5ck1cxorW
-oTFfkoL4ymfRnzy/xjuXfOnm9JyMjwuvmXrmufyZJmtLa67uIxt59jxAeM+mApMA
-oNKUYOXr7yCjLb+N8dYaXFx0gX5W+eWNSxoLvqyWDLF99xazaKe6zXru8fCmlKCt
-Z/f5luDCy73DD7LsqnZTvv6eTMvi1gUzcC9xtib3bdvBMwVh0vvfYObEbNbJOMYB
-hWPF6tBkWtNkctt0JICI4guMFtw/bdxDiaxCD4R2ksd61/Q3pD3dLCgWZhORsOoM
-IiXcbz8cNru/lK90FLcziH330YfTC1fDoVdtPvm83mtdiaMBsRF0vxqqiV01QbO/
-Fgd1t/vwSpbiTlNAMfNUFs29ldmJcLDDNLD//Q+sWqOQNtEPcp3/MIYbtNh1AzH6
-WvISTuxz3DmzwdRC5MnBTj0VvaTppGYVNn9tzph9OIqwCggMiJW3LsNZKGuB3HIE
-96jC5AZpkkmfjxc0/Ug9TdcEWH0ZeO6dgW7j87cCWjA/XMtYpd3kRb4ww5i9zSA4
-cBMolwaoCuxqTueMWE0bGLIKIEeIa6y4vXMDnulxaWBhHGJLypXZ+5E7C/RPQFm9
-dO4KSF0hI6dhCEFlXh8UGfkNpwjbU21ss+vPSyoXS77wGbhuc68Ynzd17pLSlWDJ
-FTJPVcHCtO8p/BEz5vOIrjumdI0MEPs8qTMAFkD1DziyCkLWdo/N8Udh+jRAskNj
-UsBl22OTTq+QPSgI7ojAv7PsoWs6rdib3EzVkJc/MIL/QmJOTBrzGWBX8hAxhpcW
-mL2oa1BR5KZJbR9EDZi9ctfrnO5GPA10/P7GwpYK+UzOFd4j9Vjtp9MvtkXlwzHk
-fHtE/GgkDRdh/wUGx7QQ/aOR0Uj+E540Q8b05+ufnlQnfbImz1yDB5zSI3FB55xx
-cjPPkv0hjlvDZ8bijtOafRsXVKL65r/loSRvF7X7ISxVNKUjlkkd0z1vGXc3S8QB
-8MEH8tV0FxeDNrKkGXPkrfkZ+I0Ynh9cYw9LKcMQqFGDzSoyvB/rZ4ViujieOUpA
-bd+D1jgVLP6QngI2g5tkVh+FYCV/wX1Sw6eV0xii6EV3ftm6S7n+HWSPIMOOoAQg
-rRi9GCdeVjD975yK8+5XK5cwLSwNVAd3vBYJeFYoCxxsGWDpHMxq3ZHe8O/umqF5
-UgecJiCI1ueCn5MJjp2mRdvVwW+TSZHLlGegm9X/MBW61kZ7Pf4pU4t/hJ74YnYM
-YWQwbesZLYL9lIp9ZIGGbtB8sfjz7MsQTiHBPRbWohR2JQ4Ox2v0/kFfQCJc4Xxr
-wL501id0OSFmE8EHRj0Fb3JeFk0hrSdQ3FkqnYa1L6ZxTZ+Ro1i4MdwhOGcgLTWa
-zf2YnBd3aw4xFu96PhUkwQ==
+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==
-----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 63f2d5da456..883197b2f51 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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
+MIIE1zCCA7+gAwIBAgIJAMu6eLPK3MqkMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2Ux
FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-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
+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
-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
+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
-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
-dDr7iJom6GjAGWNWIBOmR50HGoM6acw=
+AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIALjJL3tTAVYwCwYD
+VR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBnNlcnZlcjATBgNVHSUEDDAKBggr
+BgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAdS64Wgxx/ZM66NKKjMDBkkFWLzOJ
+hqC9aIQ1QrD5LS13egeKx2EuRwVZdAV5dRha7/zpwBi9OY8rs9+jfZVnssM/73QD
+3ae06/IO8OMekCEnv103EEIQCWHEU+Mgl1YfVyPKH0STtjHRYto+ryFpMU71pLFa
+cq9WBky/7ftCmM04IJ+0ncluHHp23/ojkdkaA0fKpBGMA0DGUbigWLY76bH6HYWx
+h2JDcnZNtyaglHeKUf37338yU6njAK9mgQRMXRtzwXbm2YcaG0nJwcRcFnek5E9S
+t9vFlNmmsAit9FK0ol223zFbx818q91eo5tOIGvphdEdVFXmCMLkyJGVAA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEsTCCA5mgAwIBAgIJANiFYSTmOKdNMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
-VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb20wHhcNMTkwMjExMTI1NDU1WhcNMjQwMjEwMTI1NDU1WjCBmzElMCMGA1UE
-AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
-EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
-RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA46cFbP83ifuRm7cI
-3J4AQ7v9yXucucLJSO+hLGQ9P2ibOvxxRj93q2XxQFoiC1HN3FAxanaXRvFsLkru
-RrEnKarEdsjiNu/RSpSXUJR5n3YqGvHEmUDKUB2a6NILQZm+Lq1cugnA2CJ+tjSo
-4zK/KdbLWjnhhYi034BNR/FY3rWZ56Z/a1vOK1+rKkOM1o3aq4zlGARcUP4KpE9G
-DCUCS3Fj27yhROxwKwo+mMDZtCyqSZXWIa/k+TUE23uBGUFcZHrKbWSW+6RBhYti
-AgNy8Ra09CxxeqSR0t5qbXc9ThfUbKPpynp3OUPGQ3Adu0KQQUe7rh2+5RTZpSOs
-tv9wjQIDAQABo4H1MIHyMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFIJAlzpOQAzi
-Sl34+NaO3e0yV+cuMIHCBgNVHSMEgbowgbeAFA3cEk3Z3Nkk029mvLtysb6oOG18
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQADggEBAKpeLbKpfD1QAgje
-AozcGBUrg54TKP6lEoGi+Nceqa5xandajGCbkYL7qTHo8pseM1l16+7COtNB2uOi
-NdFPxJpXig5IFavX5DsJAKeo4khAPYJPAI6Rj6OLoADDXnkFc7N4lFVPuhIUA7/U
-Rf73fksdcJ8o1Hi9cWJPVIzZ2kz3l/BIPFBtcueKX81XpTVak69dDPpKg6Q4LJwR
-JoWyJ+Md7QZPuufU6hy8ZLRgtMgrmRugcZ447+jvJjhVEMI4vSi5di1mLtZTQagX
-OuWRPxUaic03lNiUVYyQh0GFnZI+QjHFV2G/MvAAEYQR2SHzwaFemC6dAGomec8a
-E1AMako=
+MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
+MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
+B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
+LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+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=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEyDCCA7CgAwIBAgIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
-SW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL+F7psdqISmpG9p4Q2hPrW57gmzJzbtpBOA
-flAAdNByheX3OL99VFyelT4CPGfj6XmFmaJQL14naE+j9RdH9U7ZasxLSyNbt0r6
-jpaVfr+3WzCQffnA//2m/EofLmTS2BLFpPP6ONuC8fHRdR/vMEEVZfyMW++WskSE
-ss5fOOFDQeKnPe2pOYjxfH88ZJWGpyd9g/YJ/3ZAAb9EBhc4rYiD1YalYBxizXNK
-ObduE+5bze+aGraRr6N9Ed+D9Fy4Ade0ewyz7eWm1GhA3x+f2BJKmuW8/ij0DUJP
-3hzXXaqZWuVsWMm4kqa1z4tyKx29qVL/IyJKp92MZfmBCxsz1cUCAwEAAaOCARkw
-ggEVMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFA3cEk3Z3Nkk029mvLtysb6oOG18
-MIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9oYGUpIGRMIGOMRgw
-FgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwL
-WmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGEx
-CzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIR9gt
-YlhxuykwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAFLa/1Ik1HPC8Af1R5PXgRcImznsMc5X21zCibNOAcYn4KP7y
-pUgjpJOyd7g779l4IZ5PEWK8ilEPflNWxLv2p6B27Oohyc7MAKVsAxkBrhj0dY8M
-Y7WyvDCimxppGD2xcXS/6h5jiYBdOpAmH40GvEnDRMExDg1MRJIgoV/DD/nG9wyx
-brMHbzH2mxsp4jEmHAIdrrCrGf815Af2aR2vIWXt3B9b+e56KSJG5Wa2sj1fEYPu
-FzQNuhI0CaWFbAxKRWHhVWelPyyjwxa0RRlqijA2ldjSTrTDmd8Wfs7Io6jFVSka
-mzJ0SUDf4aJ0X2lty9iE8XOhHwPTmQBdrmqlww==
+MIIEyjCCA7KgAwIBAgIJAIXSkf4PzXq3MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
+LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
+VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
+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
-----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 747e4408efa..f7c0735543a 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIZbE9o6EOS9sCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMM9fg1/vTGmBIIEyLCsSdoqwMFJ
-iOweIAOdD2Ukv5MRxnZptyLhbSxBmBJ9ZEnlFGIvba743ZE+Mob571eG6nxk70V/
-dgQX8uW15oKWg1/GUnFJPa0zMOp+VTn3Xxb4Yo8KB0YcAZr2YOuv48uJaQpNanWV
-XEi1FAcfVzi/5csXvzlnGTtlkgYceaf41CHdHiqh4r2deMxg0KKvIfYZCoAjvR71
-8SORAwvbj34D9zlzduPPIZeCDwrmqkDe7S8q7l6c37pQq643sxWF6KogsRsU50nB
-g4sR+fW8WLa3CFHKaWSikniPXxmJzsujDtTeBT1bQ4TTacUOdirTGPFkccWtbpz6
-oFwYOLJxrCIuHOmOWTN5OdNFs5P+spSqD3h4aLirGrYmDzLwESJY69ynpJsuEgR1
-oxUp70xpL2NXQCBfIk50wqv0CbLm05He2AWviDKF8dMexPz2IghyBqfe22R2wtFk
-Or6aeEmSeQzKH0j7v8Yt8XEF9vOiV8nbOcg+cBOWSKO8PqsIJvdo7z5E+XWLNdYc
-qn0tblkdY9Es7b/kcS038IqLiWpQEC4iQ4KrDslEHDWcCHwDWKpXBDBXnq2gPTgp
-kJ06NBPcXEbF0ARS67EFGe9g1jHJJq4HwjLMXhPc8V6k954UpD/MFc7ZisfUJH/A
-UpNP+rEVySZtrUSy3yv4m9/X9D/EaLvg8kc+xIKHGsYmz6N0+GFXtV4q9vmPE9aw
-ZwSRpUgs18w5x/VA5stk2aGizOGgHJWxtqM3W+r/7rw4BXCzRXyBr7cP42sJ/bLF
-EtE70XLadsS1uVSjOLp0Cyo3tdGMwICv5dEj4K3+YHf5QjUQInE4KHJOvPCL6rAe
-UIxuT/e0V+HlYl5WNbS1R165Xk4BWrfiPjgErxhRMshw7YU1GU32ie69hv1Br80q
-WVLukWqaRwPBtZWodzHBwxD4d+dooVfvq34priyrtPfOMJ9BQqhb3isMCuIUnJ4F
-1B6BRbCrnTG5Cth/QV7HiOcizx1fMXZ9fEAaZEh6/Wv7GEWY6wkzrjuyejFlADK2
-rnkHOqnE8aY7F7LYYJ19gcZViC2keRHsD81In8dxGMDumQMpgRiQvbcoH51rc4SA
-+Okohkxz1n63o+tvvFItkoxCqJkPKqa3CyKOcdbqaZp/MsBhC8vA4GUIDMWaaEhV
-LBJ7X4A1KeaO00WG9kPkDMvKJIVLpUfu0kC936f90IkEr2Ac/cRW3Cxpu6i+ZDtl
-wS3Im5pbZCqxO+D9s8SE2zup1XrMjTSc/Xv+5vR2Q0CgNwjz9qq3a2BTI1CQHYhj
-L4edr1KqTV4zJJfdTgo+Bym/1TvHt3xBdr7v2JhN+JyNmiHMi9jq31kYG7jrzItD
-TpvtmWo1C+DSX8/rbpPVDhRTVrW5fycaoPdF/lFyvzAkSg0rOISKX7z2MTRLBgH2
-YS4YoaasBcGVSLF4hXXCPJ/UpWn1AT7Exkz11KdEe4Cd5GLFa/CyP6JLIu02MLZM
-4CM+gyJ0yGmg5Y7tH5pxcjpOOmehscZ4s3GqwqUwJA0oVbwTc7FY4w6w1Wh5XiNy
-4/8Q58a1B0J7xNud5ebL07JZ7/XmrSD0FV/eBHVzk7DaCRa64t3ZXVOgCL7+rbhM
-3CuVJAF/Rzr2c4GzObnyEA==
+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==
-----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 a13159a2e58..0e61054312d 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-----
-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
+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
-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
+LmNvbTAeFw0yMDA0MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGFMQ8wDQYDVQQD
DAZTZXJ2ZXIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAO
BgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0w
GwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-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
+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
-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
-VBH/F7T6rUM=
+DQEJARYOaW5mb0B6ZXJvYy5jb22CCQCF0pH+D816tzALBgNVHQ8EBAMCBeAwFwYD
+VR0RBBAwDocEfwAAAYIGc2VydmVyMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqG
+SIb3DQEBCwUAA4IBAQB6zQZH50qkUfkYhpZ2T3heU80TW9xGoSA0LBwAlHwci8z/
+ITv63iXWtNDRJGY93DPYe14LvQBfFZe0khkvvf1d3Nv3/n0XxYiuz3wNOLM/fKcb
+xm9crlQFWxQOGvWojXbMN+c3qSWBEvjXENHTmSgoRyfy7C8fd9LVhO+0wk+DuY27
+rZ6yWCu8IowCL6TSUEJUSYBTOH0M6WZ6StGLzZChW2SVWpyAZGDalP+//aX4M0qM
+1m9BckameRIytnEKQIkX1a1DT/b8b9v+JHzfUVC0NmokMepmEQG10MyDZ6xHkSeG
+z34hYCIFd037quQRHTa9jkty1n4EMfQMAHgmOM8/
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEyDCCA7CgAwIBAgIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
-SW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL+F7psdqISmpG9p4Q2hPrW57gmzJzbtpBOA
-flAAdNByheX3OL99VFyelT4CPGfj6XmFmaJQL14naE+j9RdH9U7ZasxLSyNbt0r6
-jpaVfr+3WzCQffnA//2m/EofLmTS2BLFpPP6ONuC8fHRdR/vMEEVZfyMW++WskSE
-ss5fOOFDQeKnPe2pOYjxfH88ZJWGpyd9g/YJ/3ZAAb9EBhc4rYiD1YalYBxizXNK
-ObduE+5bze+aGraRr6N9Ed+D9Fy4Ade0ewyz7eWm1GhA3x+f2BJKmuW8/ij0DUJP
-3hzXXaqZWuVsWMm4kqa1z4tyKx29qVL/IyJKp92MZfmBCxsz1cUCAwEAAaOCARkw
-ggEVMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFA3cEk3Z3Nkk029mvLtysb6oOG18
-MIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9oYGUpIGRMIGOMRgw
-FgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwL
-WmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGEx
-CzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIR9gt
-YlhxuykwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAFLa/1Ik1HPC8Af1R5PXgRcImznsMc5X21zCibNOAcYn4KP7y
-pUgjpJOyd7g779l4IZ5PEWK8ilEPflNWxLv2p6B27Oohyc7MAKVsAxkBrhj0dY8M
-Y7WyvDCimxppGD2xcXS/6h5jiYBdOpAmH40GvEnDRMExDg1MRJIgoV/DD/nG9wyx
-brMHbzH2mxsp4jEmHAIdrrCrGf815Af2aR2vIWXt3B9b+e56KSJG5Wa2sj1fEYPu
-FzQNuhI0CaWFbAxKRWHhVWelPyyjwxa0RRlqijA2ldjSTrTDmd8Wfs7Io6jFVSka
-mzJ0SUDf4aJ0X2lty9iE8XOhHwPTmQBdrmqlww==
+MIIEyjCCA7KgAwIBAgIJAIXSkf4PzXq3MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
+LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
+VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
+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
-----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 dd52b3c915b..5b7519ccff3 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI9nhQwx3gAFYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECB8TjcMahld9BIIEyPoCC31QVSaM
-Y8p9YXPVzQ9O/wTS2tzAVNiU5unXG0guSfpSr1SfddtIiCveerh/85aePe0NvYLl
-v/tL04hLyaMjN4m7eDrue803G7JByvHPEK7YsfHo09DhkvNBx6w1PnOwSyG2aGw3
-ZUXK7ASJqCtS/66uHlJWlEcC2zZpl3j4n+l8WoOuBrElcwpHCFcrGsjxe0MwQNZF
-CoSKWN428EbqTNdIL3n6FubSfqFDh381iYnuDyhldSWQ6g6g5iSYlJT5MIf5R2R0
-Ll/33wRv25iprxEjy2JXYuE/+fUt8EXN8NdPiTGjggMMc9FgRov7iB8OHvGQ5kU2
-3y+//v3IvKvz6AluCqtulPNBs4MEbFH2vhCMQwh0AXIOEd+iIgYONe2Yv3T9GMCN
-qHDJmIHp5kTlVCf5r91VLYYIjyp2PJVJ6zvTKdWSlwDnOx7+sWx6cMD7ULwTfPl/
-8cgHKA7uNhYkZ2uAeq/YzWz2A7B2k/eQXF9MYg3R/rlr2JYb39FmZS94zJ3NhbxX
-mAyZRXfI1FD3gmXII7HPIjefZ45k4I2W9vkb9UsMbgFWy09NyeeP26zu3Yw/H7Bc
-LUQjek8nqfC4p7o2rbsLlyY7SuPlIjZ6SYYvTAMNyaqVIMS+rWAacWI0KhmqpUJ1
-RHnLJvTOam4/3lO9pY89e/m6KRYjMDMrPgtJhaNcsnggpW/+R5jtmNP11N+GH2fj
-9OCEMXhKlRkhkveMCijQ8PPUr2S5RWP11xVF8EVKyfRrZiAGGsW6ti3RXhQJY8KC
-cbccVgu0ujMmbFkiLBQ4qI1wyuJn5YOPjN1iiDlWl9dIeoOJHAA/zrZWMUESEL0O
-uCGnbGiFJeonzZCibRTWlKhWs1dw81836s/p5WPnezp7uSYVs+g9M3YgAe3LaCYl
-Tjmp1ebZ9+TUu/a5LfgY+beL1KlucpG5EvUNmQgrxIgP8a0AEbTYvAvfxkkn0WLD
-oiWG3jIG4v4gGLYp/CuM8TOaHtSFsU9Ftqofs6GM/6WgOSr70qpZbGMakrLfW48e
-ZnaD0REVLsKMj/bqCrO2ak9HeZl09wFz5CeHAWoCiAMNZFwdQeLShMB7umX0YHXC
-7ktq21PoJRjm9r1RuvCkQEuaczFFVNqkRJbz/PazH55jZKThGFyAEMUP/5UqFN5M
-WCko1Fak3YP++PY6ApWTVfW8eJ8RBnT9u3PP06O21PMfiJhc1AFwuCm/NSSKZ3bE
-m0AAu/uU2MZg1qUhE92LNpeSlvbOicVo2ZpJA726RVs08cmV+L78ke3UYidnbmK2
-VtMb626e+WAyxHFGN5XEm1EUbSOKQ5aDd9axq4mjZY9jF2I5rS9d7rH8/FuNREMz
-yfrh7Stp9oM9xwkTFIZ+FHZIgMPN+IBeA/GU709cJ/DUKc5BCqCqtaU7qd+ewahE
-5bquqNBXZ5KM2I8Q3szxwro6F2/6MNA/Oh3cW3GbY+gSvU6Z24La+aJKb+n8W75E
-Qe/Q10q1H8uraun0iEvf/qg9ZTIo4kx+/jo0hx0euzFDdEUQ3ryYq1sRdd22eAWB
-ugtVQ6/33cyXMZA4SSW0C1EavCm8hTKkVkckWII/aEQhFoIu6bVI5cOv6ioqJdqt
-keqCiD3iGTnF411v/ih8jQ==
+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==
-----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 b03c18e6800..80dd141b962 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,39 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-ZXJvYy5jb20wggNGMIICOQYHKoZIzjgEATCCAiwCggEBALPXyKtC6W9AXAvNt983
-F3Ye/SQYRLeXEyW1eJYREMxzzwA10nXoxntwYzk0/5IdPufoC+zZ32WF95r7VEss
-6Tj/AFMRl0eTh1RkMcttdWL24DsicEuY4n9AFZScEo7QgxytZ3c3gEqNsIHsqIs0
-D8gMEq2jglqx/RVmwLV6eMUKjNGl4B8zCNJgL5M8zRs6VFj0uhPYt6aHLMN5uRPp
-ldxUjWxiLWnjAnqZXBeKsZgwaVh0Tl6SaazGFWOO8ch0LsVpgatcoFp0ypLmqg7D
-McOFwbxSh+7hqJWRXXz1iuKflvGiy0b2h2McJryUclwBfPB5fGMMgOhRq205/3IA
-2PkCIQCHbvNKa/7G0sHsfietwSeUTLXJjHmvrECJxU5N92Z9cQKCAQAa8Dyy0ONQ
-BV/f5hZHwxGx5ofwAs3s33XJA5mIizKWD1H06hOis9ej4DqjGAqFxPuYhiAE6Z0o
-+H/SNqxK1BL+6p6a12FqFrMUKGdwYcBNLmU7lZe38KWb69zKfiBWSqD5hfAcRD6R
-M581WsuSUflYQOw2qe6PW3DXMTnrnbx6QcPy+qhABuWsiM+Za106BwpCCqveCGln
-sp/4teCX9UcMxHSfZHhIf/Ps6i8GOvuoFnlaDZrdRG1f9TfVV4jreXe0Fq/IKdPI
-xjGbGu8SM42Gm+jeJ2Bnfsz9MozjiGFuac3ShbEf2imR3bw3kxhwkGgNyEj6sf+Q
-AB3iN0uapX4pA4IBBQACggEAHA4m1FTvV08liUrQY2etPxGKq/WCpk8YZBSkI80b
-bYkJdK4U1he1NytIka05/ilXFuUccNSv9lLvgjnoGGbUYAicX/AAYg5Wn3ICJr6d
-xUDLOcEJmCr/62TR4fCvyoh5dxtwOzympqFz/8mIttAHfr8HJl5TgmMw/uzIAP+O
-qAbcW0yS62HUjfyNv4qlugO+F5RMMDk9FIieqdiClKiOLwTGo9DoL4dnsmPm+l/y
-PiVi2jQ+B7u9z8MHoSlK0fULeGsp5WSLDKZk65JvOsQLHGAIoFuRzapdYmUSTiAi
-jVh2ox34LDSIRKfIG9+M/qzkywflag+D5LsYOPqhfu8JyaOCAQ4wggEKMB0GA1Ud
-DgQWBBStQiBxZBENtTJVagN/kP8VCqVBRTCBwgYDVR0jBIG6MIG3gBSSvJanI0ve
-WekoO7RCWr339p0lfaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAx
-MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdK
-dXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3
-DQEJARYOaW5mb0B6ZXJvYy5jb22CCEfYLWJYcbspMAsGA1UdDwQEAwIF4DAXBgNV
-HREEEDAOhwR/AAABggZzZXJ2ZXIwDQYJKoZIhvcNAQELBQADggEBAEowSmAwCC6g
-fuj37iVs5+3yninrMy8B971TT05Mp6Bb+ho7M+Zo2UlSEhyUqRlI27P+j3K/lVy2
-2teH20FQwJa+F41WCrNeXhIDDOTK3DcNe3VwxcJBroSG3jscSR3Xpo5sjQpY6a51
-FkLp4YiYzD1eQK2FUGWVYM+zwpDfNlhIRalFSpfvXXubvItiUXTQpLVrWxpSdJPx
-RWolOt+ALodo4jHmA530y4vDXOt2WlEtLHNoQ60EJhzce8MdYKuY1vbUvYArlNlA
-0kEIusoggI8MVmp9AYs44o0Fr2LSqdogl5cQjtH+WPw00OuJhYJ3DZBvcjwWAHct
-63vj4Ss9AnE=
+ZXJvYy5jb20wggNHMIICOQYHKoZIzjgEATCCAiwCggEBAKagB4iYS2ARuKbbhN+y
+Z0jXuoF+EjJVlj4lhg3G1xlEx19lHCMZBVhjyuyPGTSsFPbFZ7OTX6IDSuod2HJX
+uQAWNGUQW6KhJmeNJLHYeZnOkxVfY3abK1xUUu/+H779GGuZN0gSE0gBTtJKxUFh
+vGysQMipaxsUyQOEfQwpG/eVF8x949rvvwNuSyZB76KZtthZGjhstT2AbguiH3Gy
+YyPPNmBEVnURUzgYZgJ0W2f+5sko7eEE+hiFxtQlnAFIJw76yviQt9Vz+M2oOdlr
+ZE4n1q/bBgWuuQ7tZZkTUcQIU86yHt85luW2+gu93P58od5jPvNTzQF6xgPf19Ff
+BSkCIQC4KQef1jjNawjn2SPSRCwYiihjcJLUyS7/LIvevioPLwKCAQBzgXmHz9dh
+aCNphPwLnb3USTs2kc99a11TSESIF+VLVI9gWg9c0er8qR4MdAoTvBsc5RdERR0i
+h6UETR1+47cLSaSNme88dTPfbtoWgPKaLAKlFzEoIYEtrN5NXNYkPqnj0WCGkSwI
+57pP+3UbCxJ7Eh8cdwunLZ5zFAGnDYa4E73ImGi4L5CUfGWhIDHzmt1vfX8qPVLG
+ZrZ71ISseFKLBavn9Iukk3H6JMW6O+5c6O9dUGa33bKZbTfaylxPTDz383hfOGNW
+fyk1rOhBkgoM1+0zPxpHvbkWz8cepIioZhGmvZf0KsEfRXRcerW4txmvGme7ZY9v
+It7l/uOVaIhaA4IBBgACggEBAKAxwlXDZg61FjSkICWOvwroKfyk65NZzh/EE3ei
+kYALOdekswG0u5wzRTFNh5AbZF9PAz2xqqetlKakulPjaUFwYNx7B21FSFG/VYfF
+HvBi9IrJeUIQhmWvbcZWD5rf6EGI+INBEow6uqsekD0v1wAHgIn0/N/lPIpVA8BL
++OEFbMuGTyk+0rbdOrLejc0MniGiFG36QZf/vjR1gAHRFyfZle+1DWKJTzbRV75J
+TpNutntGxJQxWMCVaDtV9znP0gWlkI9GTkIyQCFGZqAvmHdZ2+F5JucE8sVHtMSO
+TQMdcGmL5V2r75xq2VjumHRMpMw82oVePX/4Jdmm+6nZIiWjggEkMIIBIDAdBgNV
+HQ4EFgQU0xngjPCKLhxUS8kKrXG66sH2UL4wgcMGA1UdIwSBuzCBuIAU/ysXYfGA
+XBGwhwBTQL326lLOt1ihgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
+MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
+SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
+9w0BCQEWDmluZm9AemVyb2MuY29tggkA0KlgGsJ5WokwCwYDVR0PBAQDAgXgMBMG
+A1UdJQQMMAoGCCsGAQUFBwMBMBcGA1UdEQQQMA6HBH8AAAGCBnNlcnZlcjANBgkq
+hkiG9w0BAQsFAAOCAQEAdtBcSrbFeuAGXsQ3lFS5LXB5PmvR93w+5Yxk3ea2aWaW
+SeNWJF/+cT77aHNqXmb4RqZynNEUuVx9waoGUkFMWIWbLKGKvanW+VxMxnRQKNMq
+Erj2fL+xxedLlCqh80MMN3FpamKbur16tA8dGKkG6ecmUHsG8h63MqK+8eYGAmXZ
+8i56KkWbvzCxMW11IP0uPqWveFujPgRQpdNWswjHs2DHIgDKaLxnGzuNEnJ6akBT
+0vwVUaI9uKecLI+XVfyK57CAT7edkOtutz00Ac2JqpmvrgT6VJH8LxvHQKuQWj8R
+lU6Ch/qm1sNdaGgvxatKbr3ucage/aF+9kqCTqyuWA==
-----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 f8446bb7a09..9036f2cc089 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,17 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICtjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIPU8s31qjdqICAggA
-MBQGCCqGSIb3DQMHBAhix5d4CVsHuQSCAnDLQuSQ1oByFj8v4+sx8b1Xclnp8Edu
-M77EizczlTf3HIXP+1+KLV8+q3MxrdIu/yii2KvGSzCpf1vWkc8o5Di0wMcgsiPb
-C5dUwuYTjBU8UUN1zAtRHMLmzCcZlLGwi9/MYYXqstf79ntEZ/jkqDOR8hqvAHRj
-TiweVfLvKEPtIdG2oBpeUochk4qD+IKFHQq4Jb1XarZqKt4bFlz3i4D4UpCXHwCd
-tK+3KR9EyKpbeIE/OSY8T4lc2acIFpR4qy17wWobAdaOJYXwNPyOiEyT7ActP2v4
-Hkw7qebBKZhF87lOfEPl0X47tU+D66IxjnHuw/0jDQlVfOZdRXJUIB22X3eIusNK
-0M9KgYVGdRWfPKwhxpstVeAr8gUDk7ThWBxzHVs2qYuvbowTFh/cEGC9JhhXO3oh
-4Yp5lN8XBnCYm1d3g7SYTNro4EXw608YnxfqICSa9HXjVMk1pND5MX1u6oBK1UMn
-KpZNRWhMHATKiyeP/uHQ1iJHoAtg6L5tD4GGNhpnIJdgNInH3IhFDVPxXVtw9B8T
-Z3HtRIyhOdJyQofkw6oIPYU5Xs71lMWHGJfQU2Uafzvwel8F7EeHEWzG7owx2J8I
-2Vnwkz0+OooLA5eC+bnM/DWU/Rz9JShSP/t0wOToDgjVxSN01zXwMCPBXkaXRmQp
-L1/qCeYQgPK1Ts0/FkenvPaWEC35zWNSJzzCTXke03o1YWXJHXxeeNBznsVIRFs9
-XX6Ja/ij8bf1oZ7b8KrbatxIFMxeBEqIRh9PhMcJ9ErGIA6BEuZ2CMpwbvQaKVxs
-NjeT0cnoLRSAmX716wAOVelsfe8g1Qg1czw=
+MIICvzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQImOAS2fHLc0YCAggA
+MB0GCWCGSAFlAwQBKgQQr+NzQ08auwmpqrNV/z0+bASCAnDiWeOQcAXxH4sspab9
+O+000qkW3pyCBoFSd89cfsSGj/8IWRnOPsdPQWSEZqQORLBoy5S3JvKOWv7Tzbn3
+Z3I0xB/WbiK6w40He9SK5BepxU8HTTpw9tlfen91J3eC7rxRzeNRYgnbsIdeDFao
+qOQigb4sBx3Gsp3gXxMUw4UStujoB4vEG9rsVsH0O2Mvkxxd7ObjkJ/qSCBSq5lU
+iVAXcb1AXP45vr8H00COvvIu+5tHMtma8zGwofRMRLC25fKHyiMIcXq5LumEXTKS
+UKg93mwGWPcD05fJt7Hg73bKGwBFaQnhR5mWpy0RZyVjuvH9yTbbiLzoJ+98ZeBz
+lPHcq3jQ7kjru1+dOmh2R2I0YT0MjcWR5z3UCrFSRPE00Xv+d6V0dVcAIupw2Ln0
+j8ZoEvYpAMf0OOWcPhRQBzBhS1mb4jveMrZkLzRWIOcK0+djS6O+zvLm2DFnltZc
+MDtqtSdcskkkr/MiTkUn2B5FJazrgpucCXRw42ewpGrG/yWdr81vgazk+YDmSQgG
+TpLq1tj2sAz90qR4Y/QbvxtuD1K6/fvOyYAsdN41xzu8t4F9E3N/sQykdQnae/vf
+P0kzuVENTCXaF4EI/scu7qtPPLmQ7F7BQlu5VC5dSABo5r47vMWEual4Y23i6JpF
+l3bR8zpMAMuqTwr7h867j2wxyotBPuGik9nmloPFVlDrcYlnATOc8Xc5REbVv33u
+doOZgpMSAaGlJQA21bGHY55xCfl7m8BXMBFnwMl0UZgPto/hb22hES8+IcX01CVF
+w34PcBxVwv5sX3uOzPyGAPwmg7geb0hd12nmBOc8UIceYxI=
-----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 ae69e6780a8..ee6a9a654b7 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.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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
-BMIsd1bHGYMyWPT6g/NhPEOGRms/+yo=
+ggkA0KlgGsJ5WokwCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBnNlcnZl
+cjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBpyDNOvyA0QxDwxYOINcRB5BZL
+LNZiNSaYxVbH5tcXk97f9MdxJgUSc5aCxT05RDX2J5s1g+iSAztuFozp8QO8zOat
+MZLPfTpC1UbJ9dyXJm6x0jFq6ccKANQ6NsCCw0JjR8aDCW9ATzm5KSu3MIKGcend
+d78xv8IxoRREPt0s9HgzCdPZ8zDFQDZsHsuaanWakPpWEA+ibOWVbhcyc/LecBMQ
+EPNr1DNcbuuztqn6NJksDp8SKy4jDaxRmMhELXyn11rC+HUFxxxcQSKGIAH0mzuo
+NgMXh09lyLyqFRwwDBMcs3lDVcUMCqtfkbTKeP5EYTwgDjc4fzW/aqAYW6ST
-----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 b670641f8c7..6bac456140c 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,28 +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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
-ghKGyxbsADh6O3pIQ7DmpBAtNlJVdGeu3LtxHQ==
+ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwFAYDVR0RBA0wC4IJbG9j
+YWxob3N0MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAI/3U6EQCWzBuIc0xSOB
+SdZarvT+Zoht8Hj3PY0iNapaq1zjCVbxnUgPDo2gHK24ss+lO989LBf8krYG4xn8
+79Rm9UfP+K1ug5UmBQyfw2GtQAPR+B3HIl2Dr11m7pnNLv2CpWQqmOV9gsP5NiCT
+m5aXwj1flGVrM4iYEn7AnWxYiKBqOkfvVHTVUlM6UFkSYVxvD5F/esWGo0OS7dWV
+AH37edTB3H3Wg0r5K9QbXCuYW1gS/4gFSiI5h+Kn1aHezQZyRGRoT8EdBMmJ9flX
+M1GvvLoLJBvxX5ia5aILBUa2EtzlLDxpAEKMnprip/QZYbDtrAF14ZwlKGKPpNYB
+XA8=
-----END CERTIFICATE-----
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 fc52a1a17f8..16d74208270 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI5H3qyxBFz7ACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAwh5znf9p64BIIEyJzaEfCAcfMJ
-lXF877YLqrcZvw0qYTh2yHtaIXylILOzOc2hriNPmVuiuL5+B6gzMsY+NGq9nJHH
-lnqrnbG+32GDJ/+RTJUXPUyoNNWJfh8ecrBF8v2/mmm9BpjbyiIHarwwALFLnRiQ
-l2Qc0eknVY7JzViuzbYDNqh+TcN7SH6BSJDhuDw7dF2+XUFFtQRhNUcKGZJnp9va
-uXCZeCWj+cwYKGdaEDSXkTpZxdHeQv1+vbxeoD7NTPDW3FcWbaxNqObkWNKmLn7J
-bu/RKY1fmMOFDrLSO7TrJFV0AVJKmBlWS7aJzKoIZ7bywBwYQPG+DYYKTcRTt973
-cB0Bj881wFGtzR8fRABHH+0CKhrCHmaRtbA1ilECuWP8q3bnNGpC/93i2Mj7WmDO
-A0Tx3gbpffumsfYIyGXguXn55U9lHyb5aYF76irTIPDGGcBfhHCc+/h68DPO1Ia6
-EsvumBhd6Io/qiJT02AbgQQbiK6XPSzhaZ0JOVRVTHCIeJt5mfOW2wXzj8pK9nCB
-0Z7UA95+4Q9U9VwqSA5ByeAUQowTO+0nRQSQ+w0UfZNSQ9Bck8wF06/fl9NUz5vB
-wo1jP3Dxx1ywEWTv1qQ/Fi/K3A1UPq0levJx/CpJ0WssofhYAiDYavwE3j/N9+3X
-boxvWpYloMWphvHqVHXxRLiPDYKhoxFc6WMJb72/n6y+vLC62fNqBhnjbHESQIwF
-9/HZJ+h5tztTLBo2yVIYGNHgdqhtmP24S7uJKIWRTGIRuQivZtmBItekUeKpoRJm
-ka/AM0K2TeQwEetK5Dj8N3SYN1lCZvhuksCkKF5tzGMj4T6vnTMnwXlimEd7VHHN
-8GtOUWQkzF+ezrJetUgi5SnV1cN9Rm4Fz18gdKX0EtY9bKNAivA8/e/CVMUfPoTc
-39pfjnvrrurveNnkJOhzaXmU++f5e34DTz+l2dPmou+jQC7HLlfwGFiPlzZEVhCn
-m/efLNj8pPC1I5UXGfQ9/18oCOBYdXAf/PPLejCKjWuVRQGJgRfR6DPz+Dqu09uG
-VFXqUZ930zeyfsz1165HPa4ssLDaqWY0mnDWQ4dietx4mvcaix+9dEJ8HW+wxrNo
-HAAuMsh+tMUmxW6uteCcIJDrsXu2Q58VqEEXpWi8P30015WmSXkxqhrrZHrXfu7J
-CkmEMf4zAD4Q5aADGmpvFz+l4ncLI6u84E0MJstmZqtr3dVDNtQdrzcpshG5vNjd
-FSFkQjQMmIhYx1PR8VLLhgL6v5wehlMlVFMViPCcVt23vbL/6IYY7UAJYABEuEwV
-LozfaufWOJiSYpxNPahHEPiC3tDRdKBHlhplWn5zykHSQ0dNyhrMlGwE51czwkl5
-phZlsRUpTqUV01lzv4FKMOZZJe6jOjlWOoeuAG+gVrA+Xzn8P9Pm3UfIylBmCC1R
-CIWEUMrSJEyKaBnnO3jEGkt2fsFgruhVW8+1oqjZKuo/6LR9AvTP4PCSVFDI8EWS
-H2uvqD8us+mMRkQARkwBgnX1NOmE5luZoeAeklXo2EjtA1cwyYVr3UQpSBgzIoEY
-tD2oHYSZ9Geh2mmoekskURxIP5LNiwZl0TJj5EyFXp6ixYcSO4JTlsSGLCAKYgAG
-+bDszL4n5cKfqnQW60RpgQ==
+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==
-----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 1dbcabdfba2..c0439353cce 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,28 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIEyTCCA7GgAwIBAgIIMEDh7pXUw48wDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+MIIE3zCCA8egAwIBAgIICWFfaq0Q/zswDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NloXDTI0MDIxMDEyNTQ1NlowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIwMDQx
+NTE2MTczMFoXDTIyMDcxOTE2MTczMFowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-2nt/Mvx2bpPoGp5TOoIIs+9jEwzsComVS3clxCvpEfNMyUDI1CvTKWj8CAcX3GJt
-pJ/OiaE5nU4MLW1x7VfU5rIQ1ggCF38fvABRU5pEiLVSpt7sabmVngzBOAuHymB/
-LGdtqgJ2veI8LCYm4niXfxlRSTk821JqCGQ4ldtKy6/+rXXP7PeKfJVU1ksK331m
-9TriIprsQUUQPo1LZgfkZ0YodSnFOZhKR5bqAzWkgjw3H52MRreto0Wnc6a1ky/f
-AA7qQtSLEMWbQg3i4WwrUIxi/m/OpxAn/IdijhPXIher0vCH022pYBGjn9+GIlTf
-F+tCF5jj0vtNeYjL8MVP3wIDAQABo4IBMDCCASwwHQYDVR0OBBYEFMO9UZFXKnch
-4SugOiTsKXHcye2EMIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9
+3Ump8xy9vxMtsI9lO531Ln8n9AmtmChXoZ2WbacpUkhDVychljL6CltgzO1jU48E
+muZvmXjFuVg0uJNAeYoqCeYem7ywqan88KBqjk1mqgc9v5sNHRk8GWawDFpEJDly
+a/ZN8N9xmn7MTp0k12RvO89EubX7BshG7GOjhH97FL3VboZjLlK5ysEh/CfdoPOl
+dRiyi8rLaVUcOiz/j5rQ/aoaouj+TC6KSdXJnjXqu8vzRVgZyt0TOJa+QVy6nGtD
+oIE/4kszQNC61fUh0Ktao03OAr5MVVlG8+4Cx/1P5j2cUgwRZrCiy8vMRMwxS23b
+OGSj7EVN03ntwF/bCasupwIDAQABo4IBRjCCAUIwHQYDVR0OBBYEFBDM5PxDV/q4
+82FYLGsqA8Om/XxsMIHDBgNVHSMEgbswgbiAFP8rF2HxgFwRsIcAU0C99upSzrdY
oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMBYGA1UdEQQPMA2CC2xvY2Fs
-aG9zdFhYMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZI
-hvcNAQELBQADggEBAEC+4ndZbscLRWlqKpNt8aWKgarVJaCK5v3Sq/hySdQKJWEM
-nobCrc8uP2XdVdVGc8PC0qGpDa0RfIJGQ6yVRJ2+/cj+kkboNNLBtk/Dr+XXFECW
-xxLvCbIxGZPs1rT+b2HYINeAKkHqKgDH/48gBCVIqdqOfgniK0GH52XeRRqedvK5
-cdaAO8ymi+xYbFs90vrbYV2lehFIzvdAjwXvQ6+fHiRKMgFKjIGVNle+iueZVnIE
-dyShMsHtiHud+bSWixVVDMwOqzV6dVu5Wn1gFlbXsurEAeqGRx26tRwXLbYsUhQC
-uIiD4YbuM4wfo1DRZYBhJzE6C2jQib0gGoDbXu0=
+cm9jLmNvbYIJANCpYBrCeVqJMAsGA1UdDwQEAwIF4DAWBgNVHREEDzANggtsb2Nh
+bGhvc3RYWDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQB7ESTIKZ5uMXX0/f2H
+aNI07wCTn3jtILBDdrqlCnlJUJj8eqsCHZHc/P81AGMhIXdlza9ywASgdR46cb4b
+WcUd0B5sdeDLovQ8hDXrTL1f+CPOTp7ojmwGwPX2yd1ED038OEWTiHUh1Fm5PXyM
+mPriYY/noPpMAQU3MWGKT0wmFfI7rTIdebuEHGnf+xlucBmsGSI/r0ulNfIj6JL5
+MoUkri+0AdJFrTAMy7Qs5HYP4L3nHho+MEIlJJ6KQIU2hd3g39Qxz1+7Pw/XSHyF
+4AdjYVfMuYOJmSRqT4rZVZgN9TM9XuoOPVad+jee47Lj80RXZTfpliDLtCgTo0jw
+Wxcx
-----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 e327bfa0c16..e58b27b1d3f 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI1tEL7nbamxoCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAwFgCcUOHbUBIIEyJuaKPn1VY3U
-hNBnES7O7eepAaQjVTWsTP+WaQuyDhe04JRgBUzfHmQiWJI4u3GHxFVRa9gyue+u
-PRFqD/xfd0icq7U2pW58VfNW4VZa+VfQupt7N0ijAGDg9BwRN0uhjxlDEr4JyuM5
-YqQ3W7kr2Q2M+jDJMoNUA+YOuK8AHdYm+siuCV3zEV6H4zAVS5I53pVxxk7hLBlz
-TzZzuapJQH2MSRB6G2BuENCFcZoUhZr7QsdsVjeAKZyI7TDoH/0w3C1llF2eW6tF
-PHq7RN/Fm/0yZLM+MBW8uls/wW9DTHn1E2pSRF4fmHS6VzkH7mLdKk1apllitV2/
-n4hZLhsHt6H8cWavur3t7rYLlRC60NLizU78Rhgx6X7svf3aj+tQm3nJFqd/vXp4
-lRdY3I9cJCMPeQJ2oaYDft96x4hVSHjA45ntadsrMyTSv1tCLmlyuviyfYUxZvoi
-L7IjNaFVb0iXUlMeJhkFngh3TwLhEtxZZOccC5KwRNnDKm1U2JwtOEwHjCYh5MGP
-Tg1QnzLarDyqZYqN9DWw2GyMsCcZdoXpVE+GqGwHHdKqpMtfBs1TmNxMBAz4m/mu
-NvXFZX/XW7duXqPcUQX85aHdYvONWF7QbVIo8uLLhsGJVRtK7G6cAxDhD91MeXSi
-IJi6LGsqUMKkBbiJFqx0c3QXwpcfFQfSXIz8fkqmqtFQbYGNGWj0woWmWsvGfJq1
-ijKkXPV/yTXn9gZxgObnBNUj0SVCIEWEcQ51BsoOL7+oFjdqAEWnwYXsBmrH4xjx
-YPrNNS1Rft50wTxoFDaH1wSRP6nXNvXnIXd3Qt3z0xKzLie+bmv094W5ZJifV8Wz
-x660UhHC+AtXIjtGeILyLbGMoOy7BIYuZqHC0xU3b7R1IgFfv7JgEbKGdc/MQhze
-N1T6XaiuQAHS7eML7LlicbhgzFs3dqcXOH3kMJezFdT74zmaCP36ECX5YiwuN7XC
-i9TNdFOyf4OZMJSKu/vcMk38R1StwGoaiYk0xZa4EUph3s3R7Wb2LGrZiLJ9fUNT
-qQcoaHEsrJzuhfGiUGPWuk6MDSJDxn1gN4jwRsLGpAdNy4+kN987ZjWphoG6Avpm
-egBOYnUpuY7cR8CopXk55GslWmmrTbrKYu/PRpKD2DeAIwwMkffgxVNYwf11fuqU
-k1k2l88cbWspTF9tXQoDR5TNOAgVxfVsNEyuJrGi3bnJ80cdUgLTDmGCp35Fod7O
-5JfaE/EWIN1td6PB9LCB5Z2puSnDfd1V6AD2rXijjaY+yNG8MpbQGBaYDPEnf2gT
-rfPCf/dJc90whx37mQjPdJjrb3shJ0/l77TGVoe9Krp+6iVDjMpKQmvZLdUhS1Q9
-yaniIzeRRAD+//Appz2/YkhqbrTdnRqD+2buOq9ZOCRCLdblwQu3sKob+QcNoxpc
-fEogaTZQWVuyTxUtHfnB036OM9jY+wKp/T9EgSkzDCH6zI9UvFoyL2mvACHD5uUU
-Vk32jV2R1L+dwxS0iW4sIljFTnSd7btMoQjYTi2hmY4zvV9EqeWMSha4w9IbNagO
-4OGBLfsn7QSdNNgql0ioB2LWvWMy1Pq9Q5ZsSG3Lmbxhv/KW7ORKvsFOyhVU9dy3
-gHMIo1qaDSkjBHOzcN9JRA==
+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==
-----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 35bbf8615a4..3f7ba8cf6ef 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-----
-MIIEtDCCA5ygAwIBAgIIZun+J12DQcQwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NloXDTI0MDIxMDEyNTQ1NlowgYgxEjAQBgNVBAMMCWxvY2FsaG9zdDEM
-MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
-aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
-CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAxJHcPpGFpjBzcBFJZKxJ8wsXxPpBs/WlDKqOUQVdLbxhHBiE+0neFBOk05O8
-apCXSZmxSQTtr3sBCYUaT9XdXrNGygArjcxSwnn5YQKoyPdFJOIda/vPjSvw5dag
-rajFxz5oBAdipGMk0dWu1HGl7I/GCsighRqBQJHaoULN7wBVDJh/rtMZj+jAHu13
-9swaxu6gHefkpDzhWDpdqn+V4pb2va+87npqL3Vt2NJLscZQqsttG5VKm0De5KVJ
-v+689oKmpYTDrHn6ApGrHM+XdcV5ZT/Q02RVH3Lr+9DHvsJIoVcYk0bwZyxFfgnn
-EPqTGzl7GF6nrLaWrZvz5zd7pwIDAQABo4IBGDCCARQwHQYDVR0OBBYEFODsumWu
-8upzGd4FR80N8WoLkccqMIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2
-nSV9oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
-A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
-BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
-QHplcm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiHBH8A
-AAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAAN876qqder9
-OiGihsQRKK9kb/dr4NwplQKU6ywawq9leMWvviffXnJFiWjKKBo1i0F5v5mhWB4g
-IQr+afWCLbOQtM01qQhpksf2zt1Imf38vmCbKUopLID9saif+jV4cCPyTnHdr35c
-6O3BjKxXGVdyx9vYu5GQgq15Zbu4xizBxnB/DfzOyT6Ua2g+J4KwGE4KjXqz0wiU
-elPBtQtiap5bupF/q+bD77ch0TOTvwHBNpKkDoGFIeG+/Xg/bJ6zqFvlfetKVJrn
-R4mU/KemLbdrc5IpoXEqZvQBarglztrlNlsJ1SgDHU8Ck0ufyEEZmftBfk1hKLwD
-DfBwVrXkahQ=
+MIIEyzCCA7OgAwIBAgIJAPGEfcXx5k0mMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGIMRIwEAYDVQQDDAlsb2NhbGhvc3Qx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAJ76i0dYivNWYeZN6wSn/AIF5yoIaukxxF3UxuI0IUnWvWZlLl8ZjRljlld9
+YQ+cC+VETn6wOYfP3KprVPuLANRQ59ST7UPqQP/95sXxuiXpdLpyYJlkF3QPfS6M
+WA/OTc/bvw1MFtdYfwmsTwN7w2Y5VzDJXi3rtFsowKQYRx5f63wm6zYXdWH6/ban
+QxUX2EChMU6nfjS3DqyckywS+iWbMuqA4szuX/NMNKkxATu+/DEbqeL1K1c97fWu
+818nnh5pX8zUuhktM1UEZ+Qd3jTlj/eb38T8W5lv4ABacmR+B1ZLWVEXFnvNNLlq
+uo4gRrD3Ei/CUVLCjRtcBhaHiv8CAwEAAaOCAS4wggEqMB0GA1UdDgQWBBRYjw98
+0BfkZ9/YjU6SMEueUHXAFzCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbq
+Us63WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
+DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
+DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
+b0B6ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcE
+fwAAAYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDATANBgkq
+hkiG9w0BAQsFAAOCAQEA2oMYMvppc2Iuql7ulWJ2lWbesfYvyIekhYtpbzt599Tj
+qsrvhvO3qTcLR/3FHcX1Vd+p2LYqpk7kuIpnvZ6AjfJUDJ6JtuFVIPL5mfDnqpMu
+UBUe/3Uj8maSn64xjGjZL4IebLvjI0Az9Kf1ZfTYawVM5Chc6MCkWNa0wTWwls21
+8UarpcXO3wizEzz0Rr8XI/My8UT8/qUdPlgbAsYiMstuG4o0+vvsxSWXFnXt2NtR
+zy6BWST1pMcAMakqT49lTUw5rLaJZlVdoI9ccjlpW6upThW84n9zE+YQo7FtupPG
+5lQmoLQ8NEMumi59ExESetV4it1RjFGv81invpDR6A==
-----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 dc5ec9fb427..75033a4f6c5 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIikHmzU2T9noCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJAmvGMFmp4UBIIEyB8UuB0/Z33z
-PHg/JMryN6DI9vyLij77c/DSpxyAEWIFlQJINIWk1BY8mFRACwYJ5aDMp8e8zp9X
-/ENYKJuC7XvktFYjfQkL9QBO2Bt9XaG8txa2wGOiGyDFFeV2nEKu8/Edm8sRysL1
-mnkA4kBKI8tFGJej8oTgi5JcUAgx0P8di2r0T/BC3eVpdEKjBPRvwnQzRAJsft1A
-kXO5JQNAhjReJK8IGWanDmKWP6eoBh2e2aCEHTZUbM5C4/ioQ4CJ9j9ju/dOAGWU
-d6uuzvck3UnApRa3bQd7fZocyghoVN7U8ln5y7S+UyV+s5GtLl5H7OMvy12oaWhQ
-M6DUDXdPQckRfr01reKJilV3vMuR6Jli2yGd8Rh0tB6Uj/jO3YeCQKx4VUvKELEi
-oPDuyt5lJk4M/SIBv0Pv75yze5PIKsqmsGZm95T4DYWS65c/k8vvxcRjBhFN2mDv
-ZBQZZNUSuMI2gO8+MeMkUZ4sFJ3Cg90jCBiqEaeFsZAfx2ZjuW20sRdakxl/swZx
-oOIfRCflBX2tWwUjvooJsVs7ox5CyCJn1u2tYbRth322HAwU3HeoigVi8gnmvoZT
-gUl7etgYvonD2vf2Wf2TTZFt+4a+8EFxYq36bQUEcQnWR7iQr8b/nN8fUMN/2P51
-h+izugd4enNoWCsT6ENnI52xGNML4xYJTXXTfORZherGCq8auFlI7smw4Te8o446
-Y7HeE4oB1jO6+FnpkEzsMzwEl29Lg6PrjYKydlbTDo85iKnWFr5RWuP4ahvZOG1c
-dDJ89Ykoi6KCX33LquE0KskglT/z2M+Rnytzx1VRcdd9UTR/HCpbhsTISEheKo41
-AiD/hU2OXc+AdXnqHhRvijv/o/qYwWN0SGG80c5BuDlTRvafnyDNxrwSTIR+mHjD
-VqvN92X7G0JgcjlcCdYOictHXph/41tC2nrOHw6lCF3MZvEYykrsJ/oH6EmBsISN
-1lMlV3G7S7/mDrG4TlNxnn0+cM/O/FE+m0jX6bRaZnc1Nl6eKXQI+s6JCBNiDIWZ
-vL3ID1ljSFHlKEk8x4WHgdeHyKsRsTYlf7QqcXRoP/QsyQMufy31bhtScuFe8HKw
-Bre1LBJxaWwYN2TGJXnE/r3TjhMJqmo5zQbTtDJ07zgkpL9ViInSjRXWtqL6Yydu
-aDLtTrL42XT+1dUCoq8p+CXM7ti81LOl/hta4i+J7BORsWw14RbteOYQxN/JuXdz
-W5xsKXCLsLTrqFJ++Kp14Gvq2gDq/883fKkUCGxE63tGVEve9hiC5EhFjnk0/bh9
-sHiQjWBNPAt2Ek1b2Y/7j+/hMXsVKXorVSzRSbDR/z+aESD5J2xsLVFzmRXVXmmI
-NJpAtkcJdNxjhl4zhUpDkqNXHhISt+Di1+iguLx8VCCn4XcWynFLS+Jy0w4obN0k
-5iWVrZt+w3WiuqSY9JHxt+HWudRUqS1G9mCht5skeWmcn/lSTENIVBwxwGlGJpwr
-IJPbaQnjjddCm0kqd77atQbIQuUissaF57qkKN7JcPmuiW0liQGPzgAXYAw89L5K
-3DSpAQ1VI0gJZaED/q7abZjAdqDXZsWTJZmykMsKfa1TGwBo9Ef/Yd4CqEo+9S65
-+O4PnjfrGqkugwbkUS4RXw==
+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==
-----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 1678f94d1e1..b90fbe86a36 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-----
-MIIEtjCCA56gAwIBAgIICudabutQ45YwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NloXDTI0MDIxMDEyNTQ1NlowgYoxFDASBgNVBAMMC2xvY2FsaG9zdFhY
-MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdK
-dXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3
-DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDzdPe/ClH3/uzl/syAqbCD6LtKmeKS3o7gEECl2j7Oue998J+TDyYaPmle
-vyxcDG/5wUYNEoeg9LHJOKuVbbRS609nj73KBUoFyL1rNm7X3ejqGsaZvuF9sslY
-hQCe4sTt+ldv7dmJoLCT0qEJiTKzHknh4Y1ZtOz4GcCWd7i5nA+ioin2nRCDkWp5
-4V+NM2d56iohPMrGs2L2x2K9oxdPAA8mRyvEF770lbFIsX2+ie5wENDDqLEm7j4V
-L8S/vH2GjV0g7/nyhAAwX1ivZq7pp2VOWW7L0YK809qQ8cUTWBdKgdY4DfPU3IKY
-giEo04QuwFkM7D14On83rlyWOV1xAgMBAAGjggEYMIIBFDAdBgNVHQ4EFgQUo78X
-gc+cCMpCQL6kBCabu2E4PCwwgcIGA1UdIwSBujCBt4AUkryWpyNL3lnpKDu0Qlq9
-9/adJX2hgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UE
-CwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQ
-MA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmlu
-Zm9AemVyb2MuY29tgghH2C1iWHG7KTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcE
-fwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAHAYie2SO
-haF8Xa5Tz5sCr6K4jY+CtcL1MXrjn8MFKmY5fHhuste9f4Ly/POcWc/3rxMPvibz
-ay43/StScqqyFXXQb8yGYrVrbrSkIZ5T7UrJ+vQrMWXVGBxGQ2mfCL9Ejc4qTZgo
-aBEq247LDjwiT7nH1Sq1L8b8GfXdjfL0pufrztf0oiyoph7B9EBomYeRkiykjCT/
-wQ8SDr3aaSMKrCa/XMMmpA4R5N65G1jHBoYs0uWFoxBfR5tF9AuDOBVZ/BfBITJo
-XN9X5x1cRxYI1VH5lGvxQurP7TiTTGj7bFKkdRSLSiu+ffAxKuAYmO1koK9LeyPh
-/pL2MdOKCevgeQ==
+MIIEzTCCA7WgAwIBAgIJAIxtPUYegeyjMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGKMRQwEgYDVQQDDAtsb2NhbGhvc3RY
+WDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
+SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
+9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA38Oe9/8U8tGhFqQHO64CULzbuHnAsFqzysIcPUFaI14nicEv4VYzhGtj
+Iy+DaEi/xxZnFJJRaXyttzu0PJljVM8P1C+iA13LxDmoT6pyyCw29E1321d+vJLU
+3tJHy+zLSQzgGLi1ZnKQCL+GXm7177ekQKXbQAGQQfIh3UxRpEYiZI76fGTQkkn2
+vgCsGt5dkBXonuw5DqobWNq7gVWMIRwhvVJZxbuxrChHFzdXhwuys7GxKLBFh0Ql
+hmvEwXu3zQ1URH8UOJQuU1bdlvpyEbCO47Cbo0qT4I5c5SKAd92g8vr0MjMXuZAZ
+iGL7wd0w7ElsMCKh8qosVoqk7F54KwIDAQABo4IBLjCCASowHQYDVR0OBBYEFG0a
+2ixvWm3m0DIkRAI/gpnfH+s5MIHDBgNVHSMEgbswgbiAFP8rF2HxgFwRsIcAU0C9
+9upSzrdYoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNV
+BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
+EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
+bmZvQHplcm9jLmNvbYIJANCpYBrCeVqJMAsGA1UdDwQEAwIF4DAhBgNVHRIEGjAY
+hwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0G
+CSqGSIb3DQEBCwUAA4IBAQAyj07Yvs7h74uyRkIzs6Q6R+0w0FCWIxbNsGZUnPrV
+z1ex9CsP6Dv4Ao4hvxRrlnI8Bxtqii+uKAeV9Kk/gFzWLrkp1lYKKSoZjPYcAlvA
+nk5hHmpWxMztDpJ4ITsjcvB43k4AuA8eNXBlZR77jH5L0zEgdcrR8deU/PvEf+ek
+PbwS4m4RWdVSIDVAXft8FZdXqZZp2+klgC+QftvtodkQtTMMwNDekCoWB4iLa8kY
+MBHVkA4KFgBG/FhcKWH7/IYGqwD5ND948TV9ldNJhf74iTUbwrkZkPPLHbNjgJr6
++bGIfEgoSNY83mPqDTju2ALk8tJj3QVMRJQml0z+6YbS
-----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 8a6be5d0fb3..0c6a5782d68 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIHtmcW7EaLUQCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHFRBUcyK9B8BIIEyDlrXGkj2T31
-6Y9EMHuFe0ryFHimd4cOkIrZw1P0tsixS2RVk74qZkgOJOt5v10sKGPGLHlVXw/8
-GmbOFKTwGxIc6m9EwhcIChtMnLzp4Pa4weW9Ic9KmhvIvjGQaVyExE654+y2MesZ
-HpQ+C1he1BDE27M/g/QJmgIqcNY34zaiSvC75wtHR1ZJqIbvw984gFJnTlU/KVMC
-tF73YWACXHXVR/ZEwZcpMawF9D9F/L6s19dr2NDtm2ELHSG0F0Lyg9Su4w5DGeQc
-jahpozhfL2qiUii8IbBtfGsQPKpiKY2E0xX+q3/hTzXu1q8yzMsxltGEbAeEZ9D8
-gfyzY9cKKe2md3M3qh4Lnr29cMFxl2D4C/NjC+fdsfp3UdO87xv8bq8PsmrFaBW+
-hjt72Kpmma0Xhrkm7sfQWEBxEOrSsOYs8rkuB/KfsSkE/+nvGCRJOuEGfC32objP
-7HufafKc1zwOWmrN/h1voKwg2eJ1Uvdwn+1fGE8bUCYunYetVeSVM/AQ8/FB4Aos
-aoDHl4xKUUamztoRoPNf6KXySMIBQh2U44uiPa/RS81GLl8BuGQXSyBM1qJbxCE0
-gbrKYX7YlWlbiZZZ3TWY7lml9rSzXFoFdFockhnoZHPcN/Iis8YXo9AYeOcx9fBe
-Nxs/6+84FcnCa/ygkocDlr+DBtStVXX3rKVIClBAybZmmw07Fbhohv8D8nyDIUhX
-BdtD6JSdaM1DHo7XXFINyxgjFVx6jgz6caiUfJ5OB7tSXKFQDZh8Z6F7dSlraZfg
-QRgSK4AZ5q6MQqtF949u/C7uDKU6I/EtHjkHGFNaWOGMqzpaWtkxovyf/lT9V7oT
-JJ1DEV8ZSfHAGXLKNMNphQM68tD++FFQ6FkeFQ3K2KbqWlgybp/2pOKHBfeKQpN5
-y8Kf1qKgerOOwrBq80qGZ/kGbwLIR2u9O3/aPs4uZaO8ouP19ZxB/nXqjPvbIyG4
-p6JiJ5JuVlz3M6eRVqu0nqLLC9gISMdDxOqFPOX9FN5O9q0WZmDPu3jhYyf3v2/H
-j59QzM2A+t4d9/u5adS9F1mpKklrRVqcSJOavmitqSAlyclnQ5p6nCNVF6k8gtmR
-YVt4FaNWADtMbPDtOvc/ZC46Z6vnBjnOE/EN1PypXhqZS9rd3iA5pFvNc9YfMF1z
-ZOmhdCRfkDZIP41Z4Qxq0d/T3tn1KZlpkAYHf3OAqlKRygS/g+exHGQIxErko05v
-H3kcWcdbhLfWpF+cYRJyzHFwDckqUURbI5tgWdVgpoRz2j1z46V765EwqBhn22ma
-3aSeVrbhx4C3T3aRo0KdpoJ7Ik6q+0E9rBlgrDxyR17W+4WU4hgDZQklZA3pAZnx
-fPZrst71wFA0Sts1B4ac5mXgus13s0L8/29juM2ZfvNOQufeu0FGfQ04kyV30s2+
-CLSqecI5yGKo5FidzGxsLSt6mtkuylnhX5qtMsbaknBfvBhRNQY9yh79tKdh6kCF
-QEPovCr9fcdrgRmzPdzFe6X3NYNCCrGS8Qg9yN5igsYLmyHjwGAveO8A07wz4zGk
-Li2nOR/+/GVxCj92tFkK20LrJVoNTaN8Gb0E7wRw3Iy8J5KbD1FSTWb2n08f/1u+
-IfU9eriNlbjkKHHxCsCbHA==
+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==
-----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 a76f82355d3..975a9bc14e7 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,28 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
+ABCryWoM
-----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 46798e19ca0..206299907ae 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIoVSiPYQb+GICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJOA8cs9IbeTBIIEyPCgn0lylzD5
-GSzVXjwcHC+qw9gs+soY9MP82rBzhRcex3GqPREvLVvF67x7PbjfH/AyoVPWcbBK
-a4bTLHcIbNus6Y3ez36vTBS+JgVh6AiNvWODl+FA6xv3R6gRXSmlE8Fsf0sMyVbq
-rpM/W0jbzlMc7GAEE+GvBYxui8pwJ7eN6QpgyHRINpsyJ8eORnGG34FITxm5WlC0
-n5fDVNyj//5HfQvCH04mqeLaqwedIAsUo+8b6xa7dTxSrOfjXb5ky0MXTye4rVsr
-+K9MaH9w4ywu40LNHm0WodvQw/0fyNVzjcy7NdX0ZLh36uBH6+saTsw72ekg+RAH
-whmRf3czVp9A3YFfvseY/EzkDjQXUCWFI4RNBUH8nKbX/A2E7uoJsQQuAKjK0Y0C
-9xYkwun7jf4fLUYvEWWOUCWp6BxPSzMSwsUl66wJdemfXVD4JqV93BmHnUCylJvt
-jhXGhVRi1waCq9fsPHGAh92l8ptE+B/5DEIoHi3PlNyptNz1lJcfjbU3VwtArLxl
-nhOKp9ZtqUayjUI1CxNUFe/84e1b7h/NAjKR13cVh4CEw5BgBndPEU7TaY3rXlWG
-VQq9jVe+5jK/ZBFvRHuAN0JtFtEVxBapKe6m68xZ3JQUx6IWRiBYoe7hqieVdaSL
-/enVgDTGrB/9SV6SfTy8CnMy1iknDe2NSvoIoXxfZ6MtbJZF3B4HQfdnKUAT6E0E
-7P6LtRer1m8cBl+vrRDq3B0YLGxrx8k1aJ6A58jTdTfprq1mQ/3blYMmiQ2HV5Su
-odcmRNo8IrPBTIEjQi0uLgmYGPIMBN6MoqlJgM6XpQ80EX9Z7iHM4wu096JbVPIm
-dZwgRY/+DgdObMAPJb5j6VtJOUrld6f7tQXanSJFYiSo9vzgW+ZbHXi5if3y+bj1
-bjt8+ggUywHwemhRPDWxbRi00L+WzEbf0EI/r+1XSnB6jFd3KqN3beMHbf+4gzOn
-RBmQ5Vhz8If+R4pHgI6BoXp2bW6kDdjpIso4llcZ0gh0SQNv3X1mtyviJUKrZi/I
-YLAbMfm9e4GcUIXMeoJG5qPz+ibIeQ60iCr9ycQNG3NA8bCQAiXrKc6Rsh0YPSae
-fNzp8dsEujoIDT4h9bfnzVgaPcCNooY7fkQb7LYIbhToeqfO2UbjQ9gM3SxBwiI6
-ttWIxIzx/HvsxuUCk2GJrZJmqoVC0O3TDDwMS7Col/LqV546aLmM/l+0Ut2QbKhO
-Sk8v5dhVwkF+nhm26jOA+iekiSzXxrmwARorkvuffpW0dKyejY1Qsu3WibWzs7Oo
-S01A6Bb5Bti6n1lzZ6AmaNBIFEIQY6tYw95eYhXgHuALKUGLnYAmjed2MOoY9amB
-lz+DeCy5CCFcKBqdHhN11aoGhJ1wiWlwHYYrAaVFzsgdlGZ7nxmFP/nuzEJtthGt
-go1Qy5aCc1F5hNzRrQrT+4DUZSn4LzXxZAxX2y9WsjDerqEnrE4r1tcHyexCifqK
-ViWRMbkE6ycXS7y8L/DrW91dsjBBuK5719/XbdE+jaZLa72X/0sKxCUcNBRttVNa
-Wh9d8XC/BFPIxTv4Gj5hu5RyO20xpla2G9gY3ZN0d2PDEw3qasNBwq9RJZstdA3K
-Ck47uq2PmJl1IyDh1uXdFg==
+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==
-----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 253e076a935..66fad67e682 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-----
-MIIEwjCCA6qgAwIBAgIIMteJm7NAxFAwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NloXDTI0MDIxMDEyNTQ1NlowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
-A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
-cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-0jJ5Y3bLxYXuWlRqGlsrXHuXuSK/CkRcr7BcsvIwTtds6ZwwXQNE923J4YZrCfJm
-e//Ebpe4HSMpoLwWIP6uUBWP+/j0D8rAkpBjvpxND5M+2hnWELVDsIybg8cviRII
-HzCwroms93nkCJL36GHAZpUCsqO26xs0rwEbIBuhvde3hbO+4opArstqhmMfL1fF
-R8AluJrCVLiTlDV7twuTmdi0qL/rqns6JVzhrdovsGJuEBJvZmv1EnFGRgRVNfVo
-Gi3+hIel8yKuzUcQsm5KjoHiPvHHPvfMbDtX++JEo9kd1dwRC5xb4hbHO5a19h4h
-LpTKzafBqPZJoElpke6/kwIDAQABo4IBKTCCASUwHQYDVR0OBBYEFNhjOgsOGsP2
-3VoA1K1fv1qoL5IwMIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMA8GA1UdEQQIMAaHBH8AAAEw
-IQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsF
-AAOCAQEAr4MVDuRBqV+5oJ7LIQZNfv+D1ajuC+pxeXqfsSakoCMEi3eg4aOmsSLn
-9ulb4ibkrNceagXzKAvBxbNIVgUrRO0jt+yRhqgWLda1v0+4F3P1ovky9ZsMyiSA
-Fkeb/nM2p1tuAIURtANXWbqoeZAq7vFjY6tjVFDcgSkZEnIFvTRKLrjeQyC6K1YM
-aucb0eLz4TEEFR3XOaRzEkXzA6PqXzi846DJrvsHRL/Pqj7splMkilFZd6ZkDLqm
-M/Nd78IPOfvRRflOGLWyF7HWr/sFeHz7uN6RVYEHudA9O2t5u1XLmH9MBVT1iBkb
-YZOU8DVTqrrEqF8pOTgRPdIVUvllAA==
+MIIE2TCCA8GgAwIBAgIJAIcNZIoR72fvMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
+BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
+ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
+Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANgLgjqTy5OUvnfsVXbwc6YcRlMKAkU1yISu22Ao3sAzQgwAnSKePs6xdGjaI4gt
+nStl2yJTipegvL/BVFZVQ8s/7Olb1qPQzIXd/An6x+4k6uv8EVxJBS79U0+G+Wna
+aKViwGJq5KTjp/Z30Vzp3Ueakt2JogW3bkNVS27Pm9ttFvpV8c6i2h5BrTys584u
+Sk/kGoD+HiN7t3BQTY/Eso/a1fQetFEhYR/28AStgqk0K0Bbt2I2Dt35+61QXYDI
+xf73qy6pE19AXSZ35LD+p0g9Ck+17uD02kNJQrLUo1QFnuejaZtyjavx7O/k5JO4
+APAp/bpcOxnk1WQBa5+BGbkCAwEAAaOCAT8wggE7MB0GA1UdDgQWBBQZzdUHlEkK
+zv6M0SgUff3S+StpADCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63
+WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
+Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
+VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
+ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwDwYDVR0RBAgwBocEfwAA
+ATAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAoNbB2tLdoozVdsCraQESWQsUx
+oXt3JXIY8ff9DP1qK0SUj8A7WWyztYZ+qNcl+9SC2l4stT3HmhT555PtsJ3VFmLc
+h9YqVRyQMxmcTOf4AWN3AJ83sS6CMwrUNK911h8C4NrvXf6kqARgmCmVIZg/Wi9Q
+IdnDYJJHsS3VBGYrdr5EYlwkP7xfxmSAKNuOGI0tWBlAUFTyTP9UGMhEzy6LnBOU
+Z6VXlAMkcgluEvLhC4oFJy3rhfBQ5hKBI69Okia6f0cOhcwOQGMBxIBCfhplpGNk
+jagGWwuhjX2Mw5qNVNiEhviE9LpWOCHc0bTmFofskg5rYItXF9PqXWO3h2ob
-----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 d1bbd079b75..7fb41e2af12 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIV22BgBrI0YYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMzAFuKyCec5BIIEyH68gEysQoj/
-OsTK6KegG6Crz8jv3K2JIRr8LgThSEx/I2Soy1g2zFP/nqXPgDbu2PjRW2+utgd8
-RVcgFsRyu68aYyJeuUKPf4CTWbGFLo5spW+ncCdboxPX1jIgy3J0UxZotLc2C6Zu
-/8E+69BGPfuNib2n2GkmWcdfsy34Dkj2gWb+2K0aGDyYAwCcCC0OAxeQfYUYJIYu
-SLPgOjtaYS1INOuZYvS3TwPua2d24XNLMpR/q7pxBOAz8gdC6SOl42ayaRHAG2Mv
-MSEQ4i/S1U57dXFa4f+bM3glVQhHsnwgJNqLMepAZZHbhsWqYjBDXmhnV0M+JjGq
-j/+5qEVyWKGP12bv7P65j/U6USfzFu1xB6y4x9WV09TRedzQFdjcqWbi6T8kfcgM
-LiYK6lJTWrJ+6Uw4QpyQe2gtCBAeRju3yBYDCHk3E82zs8EzhANYZdKA730efHcp
-1jZD8eXu6Cj7T6tzOl4Ok/7oj+zVacFMidVlsgdxnBiUkh+SBOd31RbNvH3BaHFx
-MyQApNRoOmjYZKEH6KB4Gkw0ZWR8KErHP6pBMgCU4ZZrg+UJM1jVON0wBHj8vZTa
-vTtPYgK5273XYmMywVHRYTbL8qQVPXoRZs4+0hiqTOvGmlA2QqJXh/rC9+ZDbQEu
-nrRExb8qSWBA4fgktMH5wdNlGDfC0H5XOKN4aSmCSlsVgr9XJJCB1M5imlpiOi+a
-MklK/lSVgwgTJ5qevJSbe4Ys4gCFwQQS9AGqy+C318vQbvwIKXzXu9By9UdUO7D7
-aPpYJecTx7mNr5sD6wwJJaZZexmO4QjTupVF8R1Y9YYvOIglwRp9QDREnYpK9lkH
-YTP5wNyJomKh0SMDOxP2oHxVTfu4N/3iwtiMK3K84aTlDXB7CDbM6I/r19wEzCt3
-2xaRZc9yvGg9U1tnYmeyyVnLnB/syRV7vEzbFYW7VdmTDlqCK8po1O9C+Wl4yVge
-/5CGWhYhi7pLgUo3pofn2f9jMTTUDmAgS4zCuLp/SvQJ97leHBdbVZ5AaRw1nzbt
-Wg433aN9tL8yjDEaebiVNS2uj4LO3QmYFKDlQt0n0jYd1N+o1t1how87qI/vY7Zz
-4eJAMDvA63g559ydHj17AguAUqXW8x3h94GD+ULygvqQnOq47c45WVblk38aDESi
-lM1qnPNepidD0XRcuY65woUdTc9i0WXkO1+s7lh9diJBasFQL8fSN4IVGWqP20uH
-7U7TpFmyF2rMbiUuuMC0tM1gQVk4hhCMb84DH8MMAW3UUmg81GddNs1B9Ve9ZRD+
-DdaewiqA8LuVT+D04K96iHuhMlQgKZcBEBPUUIGseJYTokj+6ZtN6RurEo3y0UiH
-3oO1wzbBOdE8bPJxwLvlWX4COu9ph2j5UTcJA5be2vihDb/bEgYz3BvcPJbnYjXw
-/Ml7asRjrruhXHrCTfVUUi2aQT049BnhO6j6J4oPB+K1BxeFBLSrpxxko/eVwVhi
-QUqu8L1U69Pbrgjyuj9kUi5aWa3A8Hcb1IsFnMlrsh98W29UAsGoIuS5fWk1QsnS
-4E+YBQZFU9fySbOwZEe/ovtrAlW+6VHmMZFpzWrt5w2G8PKGnT6tq2H/ZIiRj8cT
-X6qEioY4ri41+a0kAg9CwA==
+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==
-----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 836d6ee70f8..c83e1b1a1c4 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-----
-MIIEwjCCA6qgAwIBAgIIS5+5WsFI8kkwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NloXDTI0MDIxMDEyNTQ1NlowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
-A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
-cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-0WArVU5vQgAsedi4vppRt1d3oWwrXtP7z5OCT2mqUMq4LDSnI7Ue2tsTD8CU26Bk
-ZFzAJz7B7szVcLVe2CKjUGPupwE7HJ5Q/DZK2qxEMYalUjFOY8YjfbHkArJNSLs3
-cnw+PU8mQBmOdqNfGfBgfcVJb6OqV3X0OFXRjfU6Q/fzxxyttWWzrCR3QcGcXrXm
-DEVuPHlc2MAP4WN9KNjI+vZZsq/LNT3oVkzvi5DZarZHCFsxxlTCEVyX+Qv7eeGN
-7Piw8o9UQXZk+yxVLftj/LogqKcAwCI2FXqdmg3IQjhiugMUSwKSWxIalZRH+jrj
-46EhOCCfccfeP55/ScGpoQIDAQABo4IBKTCCASUwHQYDVR0OBBYEFHtPO+92m2l1
-OjhoP1NmPJVn0Z/GMIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMA8GA1UdEQQIMAaHBH8AAAIw
-IQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsF
-AAOCAQEAkml43lIwS6KrYUM1dEiW8d1n0zcBFLrE0c5sB4HF9vqIljrcmOLXMecd
-vr9aa1NJbp8ntS0IwXfLayB6shgyGCzN3xYFqRNVjGCb4YU8AkNp3Ode/Y9IDext
-5RTOhU260NqyWjcm9x49zQZDWXUVghjVJL6pDezOJZevRFYobC15jC7vuZbTzIwK
-dfCGgCjPNiXBwLUGgSd1Q2/YLraQO768WljVAlsfHyhxFjTv8JO2J9l88iEs8vVe
-t3/1eXYGkJ9xTE0zzgY2pqJzpKOk4xJV2m8jyq13nBWnS32jUxyZsshT+RsxTJ/l
-feoclWB2CxVVxzwUuklO3qFIqJCe5A==
+MIIE2TCCA8GgAwIBAgIJAOShURND+1F7MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
+BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
+ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
+Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AMnX4fgTN/dwpHOqRhPxQKnV4utCcR7ezvwAvoDGOPIfLPuSwZijYzsM1bX2pbq3
+rMsVr60H7YrwLbdApYhsBvoPO134iVaJR747S8IlEk5tljmKAiKN1ZMu1s/65As0
+bORoUJZ+6/ravsvSLHHjWcae6zgewQEqy/nkIZsQxSTfpQFr9G1lcI5Z5OmU0Z4w
+Mc6lKi7GdRge0VEFL5grOcNOGWkHJKoW+sSs29XBFksxhH41oqXOhE+rSveP36TY
+PwIPlNDBflXILFSl5TO0+95LCE8QyWe5KqeOfNaT9PrFzoT9t2sZ7mOl69N71gHC
+yxWsre+dJUULJQn1tfI1VYMCAwEAAaOCAT8wggE7MB0GA1UdDgQWBBQzAmfT7wwy
+YqPG43MC88PFznoI8jCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63
+WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
+Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
+VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
+ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwDwYDVR0RBAgwBocEfwAA
+AjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQDiDzyPOb2wD5oWMIqmrJl7VTej
+1pfUUckQwViEunSiwmtiHbZJ2EyukhbTzPPijwK0BOxAQVRP04xeV5PYZDs6YdTh
+xr2aNMvHE755dHT8GE1EF9V3Aw9EZWwpWXBPSmq18UZtZxGpjTzPVKWG2n5lu8HF
+bl/znVh/bEO1/aBIiIGHHmN8s7hY0+Lp2zyKfBQMdO7NCmNM/wb8YqU8DQYGUIG3
+ixrEKztSzDDUbOt+xqgaEtc64++Zqt5kbi24K8AzSE/A181EzFnWilq3YjFZeFvF
+x8Dt4UPxHen2g4bIMjXShD4sUW2D1T4TICHNgC7JIjdBon8pL3jbZ6A+qbeh
-----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 7beb858c025..ecd51083c63 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIAGc+4Q6/OEcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKRRAATo27dWBIIEyIfihDWK34s/
-VK5riswR3Y3NLHMe64NBrbzpNC9O5smiCcwysp0f9+mOwJFHY5DaqpY4n/D3k/MX
-cz24wGzYIwOHew5AFALE7uVbPrZyqJyjLE04H+NQytJ3Qx/SBAxKU+t7DNeRFZLa
-umFV8AMqubFMgBGCGZ4NHHJd7ue+TYdPYGJVUu2WQ0WmdDIRtKmhHlpdjdQ3rC7o
-k+eOH6BJmsF6maSdJuPyXbeMoVItKiesoY9sYndzUsRYKWUncm5nZEMSAYnpKrLA
-r8Oss4h2eoTY2RrJ8EVrbcSUmAonxwxwo1UdCTJyT5X9rpMXvn38Z2OOyATpwY+W
-ZkLvX0G9kzI+SvkOtPbp1c3eywQZSN9T9SKCTqykfVqw3lpIXBtdWRy8Rtx6p+ZB
-Gvd7L/y8NmDDO5TIu+R6mRbcdrOQ6GfQfki0oXM+lrGTs+AjMMORzbFLj2h2L/h7
-gXZl+o5wNA77D8L4zW+z8+oY5ZlEZNQtGKJ9K7zURBKOcZ+KPvM8uUclWZTqRv3I
-RiWdkVZIKUgImzi6Jex0sgQbzVUPLkVX7OCk1OyXuLT8pur12WZY44ParAnYJvL2
-fplNIsfeNhWRlMcRpdKhHAnpDmGQe2iDUAU7klQAupJXHEHA7GTHPbUfB1a/5vp9
-QfJXGd5fQ6VQ9vM/5PEP+RL4ysqo6xqlqTBJcBgALKTTWfDaBORQsvSqeXEffwWT
-36phg20hN1CJtjaiwxunYXlylE8s4+TGwmzqU6LTl7c8D5HFF+S4G2StfMnMpmpB
-xYcOJY6gqs+U9Jg0JMFINVtgqAuCYJhsJwABV7fdXtH6yR1BiLDF9C6LcbPUF4vM
-YT8b2IQbLKKQG8f7q9um4KHocAC1gAEjIvUkzXnQu6OGSALH9jUEHandmz9PGxsQ
-6aPWi2in9LnTNzITnHhS5ljM4iZratfKUeLZ1jFNS6rOhA0dMNbUilmBKtLrrQOg
-1827MU6ot9O02M0Q+Un14SzitMlU1BynCfIdO2DmhRxIj9Y5Y6fBGC3iSfmdEjlb
-1m1ei9iBSbo9YCqivX01e2ppLjogKcalD4STUhBDj2eeElJr2uXrNHGnByMh9X4X
-Ov6l4KktNzCMdoT+PpCGjdXV+XTcZqRE6lo/4yGzf6ngPUaOa8/S188LvHQoF9JY
-+ZlB0alT1rcz11jUaDbEoCpovGBxfrXl75JAVZNggHrYyqVLvhmjSXJ+MUiHCldY
-2gE36JoBijiIxh3gpFqa/MgNY/643gZgRvuIFdz/NTL6uK4q5oIuNSl8DN4l5gJf
-PN2laBV2Ifs+z6z43S4nb8ZilOl4PKWSYEweyTZw15n2bid+RdIovRYj7ti0HhTJ
-YpvuPgnGg9lCdM6gvS3JwPB2RF7MYpDj2gKmqm4wyU7DxVXJiOHOmFBovNBHZu6X
-O3pcNDLQeYEFkLpz3Rf2AMBqxmBoPZ9AFOsRlxeODEwEyuR/pOPsJI/hgwqSHjQC
-1/e9LxtHVG6vz4AuJuR4ibHlW4x3DOOCWt/xgOe4cfTYMVGGeJ0whoyuYY/ufFfm
-qqFHSO6ZiUWTmFQQ5VvkRYCuGUQUk32R8UJq24p9KioQbDBSOACp5QS22ZuISMll
-YDspwi+n/au1QmYYwhEJTg==
+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==
-----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 93afbca357f..e2446c7b513 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-----
-MIIEtTCCA52gAwIBAgIJANeca+IcGRYyMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0xOTAy
-MTExMjU0NTZaFw0yNDAyMTAxMjU0NTZaMIGIMRIwEAYDVQQDDAkxMjcuMC4wLjEx
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAKBL/YKFg0S3YwBM//VJ6OmCJYQl7AY1ccaVTLsUEUsAeibXeb5SYxcSL5QU
-hUNCaasaVSqG8whELdfu5tR/ev+1HAWW1+U+u7+IRJG1D/VHwyjmxP3PYIQd/i9A
-NtJRa8Y0huhjW0olgFw80E/pd5khXB7KGtRrymewWSH6oWMuqwy8nS3VioG3D9f1
-O1exF/mQvUc5fndh3DOEUYrKDyE1otuVxKtykcu4fS2PClxmGYKgeLHM3OSPfPdm
-98iA+mNpuyAVb2VZmvykAsBU7LFlHha2pkTHAtVqGBPcgQuuOAFHcOeooyZm1yCh
-BrmB2IvxxTpCAQ2fDnPCi8IRK0ECAwEAAaOCARgwggEUMB0GA1UdDgQWBBTARSjw
-11XRyO20azXNFGHWRfe1GDCBwgYDVR0jBIG6MIG3gBSSvJanI0veWekoO7RCWr33
-9p0lfaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
-b0B6ZXJvYy5jb22CCEfYLWJYcbspMAsGA1UdDwQEAwIF4DAhBgNVHRIEGjAYhwR/
-AAABgRBpc3N1ZXJAemVyb2MuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAbQo4Yxsqp
-l38TzjkrJjNqFEp+g9hnGC/wWedqLEpfleWF3l7poPAYwDaF+TWaO+/gS2Kxl9XY
-4AFy46NgPFsJFMoDiNKIGGCI5fvJRm66Dxg7+fq35heogYy7QH70WhzCIKekYVMZ
-vcYZH0JhwlXNwsHWnQBKGs+0t1e6ab3CZaTb9JmTdjMHu2s7rr6+vLMiWahIDf3e
-Ea2uchlwnEYa1qGmMYngMw47cDbEbUUjGw9jkJxbxIFMujQe1d+jXlvdkhRujh6s
-yYx8TPJg0DHGdXzX6zVrV64CWQx6nX0CNLei2UnuIqH66gUvcUBi5qcxOglQWfkK
-iZTFYZYdLvRn
+MIIEyjCCA7KgAwIBAgIIJwm1PF8sj8gwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIwMDQx
+NTE2MTczMFoXDTIyMDcxOTE2MTczMFowgYgxEjAQBgNVBAMMCTEyNy4wLjAuMTEM
+MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
+aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
+CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA9R2oBOyC3GnHp/VWutn+nReHQ+Rfo2BeHH9btGjSG29ED26hV/c3UKCucLE8
+lReCEsl/TOb4fmSxYhB2ZRCbxwkjiiXsCCT6t8K/ynqbW89rrLyh3gv7EJw7qtAW
+RjAnjIORYfKI/L3MbpxFKyoUmdditULkn8fLC7j4xi81YXoW+WMTFCLo4gdLKzkE
+gxTEL+YrkS8jd4sJaMb7em+T86S94+2WvvP99lwVDV7pzyi10bU5iIWB7eOc9kq3
+OLU2ZlYq+EMGKip3imSDOGXDpYX2i564D18o+DWC6ST5eq00ZyFIOrbVYLHi//zb
+opt2Dk9PRStVn/y3HsyslXvDaQIDAQABo4IBLjCCASowHQYDVR0OBBYEFPCLDuPA
+280BchZZp71Pkq3F1OSSMIHDBgNVHSMEgbswgbiAFP8rF2HxgFwRsIcAU0C99upS
+zrdYoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
+A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
+BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
+QHplcm9jLmNvbYIJANCpYBrCeVqJMAsGA1UdDwQEAwIF4DAhBgNVHRIEGjAYhwR/
+AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqG
+SIb3DQEBCwUAA4IBAQDfNYwu6eHH1fvW/tVM2U6/1oPPeLSs/fKauALjym2bJoS7
+I+AzW+Y+sgbFslxgOiZ8XPK7amcU9r68/gYW3Nm8rGXvQ8ywRp6ru4/xJVDqJzcs
+g334ni5py1Pw2dP1dZpRXt2AGNoBwjaVsA3B2KclrkkIafa0is/pUp9NL0FdsrYL
+EGqlC2puCbdL8nzVUd5crDNDzeQnrWMwIFDEuydr/Og8GVETPhzK9RgLQROO10Iy
++uqAJaVXy0T8G7fAMQPgpA9TtKsxkC6CBk1yDBpE9Qzfp8oiH1Hlil7V7a5u/Ofu
+J6rVwHRPbe+q4qGwIpP5222aLd1VegrHplazJ4G7
-----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 a0a5bd8eca6..01f591cdaf1 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI/ikGW+TwlqoCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMmu8uk/7SWBBIIEyFdfP/LO5XLt
-CiBQkg0Mi0a4gwRMdRclTVR2TRBcP52tiBaKVZTY20zoh6THoEL66K54jUrrK4p1
-tyyMOQ8CoZr+Xkf5bE1YbF+l/22PMtAmnYCVdWgH12QF7wYHqOCLLZO3CcyYznjw
-xt8r8ePkfNIeSOqJu4XNZD+cBOZaX4VqCXDvT/bU7aaHqBxaFlBqLf/GQVCpLq85
-fNhcOPAZr4AZJanzOhWFsaPGCbL1YXqU2IP4TV83Ty3QC47K9ruqOil7ZWlxsRhA
-eHkQtrx62ATySP1cMxNz6b9l3e9s4YJkKCX+u60rU5ACW2uSi5zPJ639j2lS6y+S
-SwOprVXLXGwq48yOqSfSEL5Ga6a9cXEpDSWs3xqz8B6unPcacyL/i529vm98UVye
-PU1YV1rjiiJGrAgH+xvZDUDmkALPVcDoAv7P7mK0kgCPIb2wfOgMfX1a0ami4RNH
-eNqSl2AVJpj9GOH/HNKRfqgUDsmnoJNIe+xbZjvkq7hUXhRGrk2AQMB780KtTUvJ
-dc2ODbw10vyDdPoAaSgyGMBB1n3PNmvfYP5ILpE/wDrmWOCP3F5Vt8nBsSXWC7lJ
-Oa+olHksg5OomqmL5loZ0svJnNBCtkCVxiM7N3L+/mh1PGxTzXLXOB7r8W8MRHoJ
-HaFmVqaX9OHWibz2gy3f4DRnQ5A/R1cQGEYmKRXDh4A2UbubA7YEVqUmCYx6PyfO
-bae3zHofIVclqAh0FoaNyBIRcLaBF/5Bbxzf1xyHFraeFdeGk6zGjt/EZ6eHINGG
-NziSgm6ojALcgBongXlE3Q6GDP1HNjNXo5CBWezl1cr7ovv0M4DSs2HYr5F2QE3G
-lECfGuYlYOGNaalTSt340gDqY6SPAvyqXwYY3xtwGfcelwuXw812UBhsMY6Tlbja
-s4SXsvaV1TE9LisWC8jJgrNaWka3B4W2a2uzv9/D+9pQTZXubXmBQMH/L03YM1kI
-EVNmnwjGwMcc3VVHSpLqnOR85iSFYNSIOtJXkunUjHhRCP2c3zZkdlpqX1YYzAch
-339EZZiJQDFwbFB6R1KOk8pz9z/4vUcOcVtof4r8hZKcmwrUZvHk5wM7Jj+HU56D
-g4rS6dnzibcbfhiTcamIF5r6Zpc8YFEahBzHm7LNqRoh55l6KcwU2LzvEvrnMdPu
-w1rDSpsOQAs5H3kOmTMR1GWWC64UYtFK0rgsZ2c+krDWGTbwcvYpAVYeJXrLMkuy
-sQcZpnswwiR1CkTE6yO48knA2VQxWchuUDm4hjsWGLmLEFaj64dSJdx3HRU8j7qT
-tAeBaVPrbH5avpIf1AyYdpDrUgdSJ2kBhZ7t0jr/55BGMMZBKupfth3sGUDRggjB
-SKvIkKsN6+QN6yahbeh6dEXJpcvYQAyRWG+rrpvD3r1c8fT4egnuf/3IvNy5D+5h
-hvdMAVA9qay8w/fOIiXMgD9sYJ/88qw9vft5xtQtBvb8KiFc23tHZLQcCc0UiYhi
-KeAU5hsHcikZtMVEjS4TpiZuMqzgZnCu3o14jciR1jWGlJOoa167zkwKyDSiQr6e
-++Djo1JIAJgZ7CxOr+Ocyjva6xMfjVG6lA5BJOIt6fJlVFWtZjyCAXE5ttbAnutN
-sEv4bw+Xp33PiUD18cLAFQ==
+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==
-----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 730c69480ed..941a58fb5ba 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-----
-MIIEsTCCA5mgAwIBAgIILu2xOMQ1AOMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MDEyNTQ1NloXDTE5MDIxMTEyNTQ1NlowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
-A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
-cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wjVh0mmO2cLv4jU6F3wsg8r0B9D8ic/L9Qvalpv+KbJz3FwPwrYm/Uqvm6MAYghZ
-mt/MIaXkL04LiHONQy31jSFqV4VyH7+8CpVsIqCBkx3zwmeOsnzMQ9rkW9il89Ia
-MxfE+4d6Qthv7cuXGYrTP/J0rO9AfjJzxQPO+5sHBp6jOoI9m+wbUS5ynSyRhOxR
-RWBNegzHTJvRMRI/OKumgwyl2tT+0naEU7jd0JgCg1TkRKsRzb0379baq36Rb/vT
-yP6hoycKs5r3DRP9bazTERdQ1Oiar1sS8JRFD+ZmeOruNCLJ3CNAn78d67z1uVMq
-Xes3WUeY3qDGrY7pFK3ewQIDAQABo4IBGDCCARQwHQYDVR0OBBYEFFLNk0b66Rnx
-8vtJgF6a5+9/nwY8MIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiHBH8AAAGB
-EGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBABw7dWrhymCgUKIS
-HdSkZlu4niovnMd7nG6I8RtwWfLeEv3g5oPhl4mkNWTqoMafnHzJieZy0fG7wli/
-qwalJK8TnK9Cc/8VLZXhZx/f91HFQrtxqYM8JdE2yfu+UglzX4VlBZi4EJjehqAR
-L5wj6XWxzpIrffAAOPoo3ScmxoG/CAlyoDUL1qSvyeTHY5ie9apj8CjoPRrAKRpw
-y7Lx0WMaUR1k6TRT8YWb++5T7HK98H63eQdG8DCiSpH8g/NarLI0K4dtvUlAycS+
-dfSEdpaRG3g3CnsvZOHbSFbzptduxNMIB5CeyzYMQhM48cFUqefOd8sDPzGIr/Qv
-fu2onRc=
+MIIEyDCCA7CgAwIBAgIJAPYHKXnkaizoMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTQxNjE3MjlaFw0yMDA0MTUxNjE3MjlaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
+BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
+ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
+Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AMljvNP4DcbFnkcOJp/syupKybr/5C09OfxXjCS4IctGr/b5ZUJomn6PS1wOxcct
+7w0WDFwsUQNydBhtoYwHgVUH0o61GYoEiB8UQCinZkRyYqKDmV5AqpNfplw2QQPW
+fMnY1K/3lr0zXY4ZOuxoQ1X2oBt5H9bGONUG/cFi6thWOFr+lL2vLXQiOw6MUoij
+taNHLTzagHsrqk95DAWHeT6XC3p3rNsLga52Us+qLBDX325tv2yFP3RvbAWV0zaX
+RZHJximKcsme+HWdBNjkeHOzZfiANSXsG4u7mwx+VeLNHAGOvYk0IgCemXeF47z1
+PXIMkRB0YySv2EZQccBvoNMCAwEAAaOCAS4wggEqMB0GA1UdDgQWBBSox0vShZuL
+04jUCIRtXBUJzziz9TCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63
+WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
+Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
+VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
+ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcEfwAA
+AYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG
+9w0BAQsFAAOCAQEApzceaQ88XiwSVoxn80e3CdYiZONWJ9TONX3JRV5Jmka+KTMp
+PIm15/c1RCRlcaDDNpqGWNia+PEHWn/zfDoFUVPRUun7x/qZGbISLFfevEb1H4yB
+q3M60ULxhJlyGYMKUW/jhrgOI+V/41HnqeQA8ohwgas8JLE34HjtyNJfeThXZY0D
+FlAxkRzkXVBdsV99lrM4fA3gFc8HHuPJlPWYBrfKdQYWa1TB9NxV1X5Idb0UmR1D
+3uBEMDyo5nyX0lH7wi+7/0W0sMdX7yrrY129t/7Z0Ne9Dm4ueHJr4IyV+ES4GYDn
+QDpZwX+kHXqXUt5fZa6UQNJkvhV4HYRfmGBnNA==
-----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 31d671dc2c4..b4588584be0 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI6WnmLehvyK8CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJr54lAuvJrKBIIEyDBuzM3XXI8u
-IHXI+aTS2oIgv3xbk0eMSUyRdQ4UrP5HzFzz4TmlmuxmfU50KsJ400tOc07mIq9W
-4EjLJsCLZWUGD1b6dsxkS6bCZi6Kjqdv15LQFtyetG1/uBnKi22NIbPVK0yqKkIV
-ErXZat4f97n1K/LBn+JzHXFU/C537pRzDt0u5P3rti6rAfluOP1IHTFmwP4pEZ8M
-6LWbVGNYVbKghcHH4cMvMG7m+CCfOqD4o+kUgDCHTBcKeNkxV2Np+B3GXHd/Exui
-J3pqVs7HzuN15uOk9gaBts/Fr7Q9zhOBVG/3e6cE1XP4tey2tQmyqzNApP/746H5
-E9LlHd4itS9beq6rAX9dRxI30JtiMl+Ge3Zz3Fae4nkJXTQG4B6mwtiKHJH/Mdt1
-zJBLlWsgazSf3w8zwJifcB8GgFFg7aQbNt5RjGwqCkdf9rP7iWNqE4EDwyfR9Y1Y
-6RMsBIX4gsI2j7x6lx5XmbH9rf52i+OWOzGRZT7FKD4BlAzTogigaq+AzneRNbcW
-BrLpVlXtz0/SdpNGIU/LZRVYyDb6rgIsh/5Ne1jeNVZ/xvDOLExjqQ9ihk4FvGrB
-+OL5+Ib0HNb0Q6Ir6OfdPyc2c4DQW8kmQMFcPaQqSWdRShRmsfJbklFn0wM5kU6i
-hLHf07qn2WLYnFPE270xKCst9/r0FgBzNVMDZII86U8VfMAfEsul1ht67xamHl/R
-IS+7oHy17hGKfurKXcy9AOMy1p19SDdI1JYenWrt3/4Xo9mVr4dzXRSpvQP56zk0
-E+J5+EzErMTR1MlKtz4QjoQn04mNS2B20Uk7/Afg4dlKtQyeuBdY33siAuelUm5l
-xP4LJR7C4TK3k5xKQeWS/4FzGCXSiQdkvXZGl0HTvRV0zI68O0Wo8+7v5mYSWYSH
-Qmbdlxi58KJpK/7BeJg+ULWVnZnQmbAVoBGC+c11CECxkSLqDotojC5Z7NZae71r
-JjaYaqZ+pTEzzAlK1k2y59ymeDhKWQg0UgJvXDI2bajSukG+WZ5+PuUlfDMqaj3k
-8D4jkvNZjjWu5R3tZIJlpdnjxcs2Ox88EcZr3pHFed/TvVdzq7wENpNSLzpWsaUU
-16b9QzjhC/jTPJVX4703EwpYMQaVUOu8H1ZdHA/c75XLbXVRT86s2WruCh2djFYh
-Rqr3DZggwsEj6m9qUEiEIhXdHpaqbLMs9MVux7yKTWWVbR5RyFEJkUVlaufsftEV
-JG10biIl4C8nWPGHV9JcA5MbdBb9CUcWdBzHQ0RznCyuqrqVlRzyVowTxlcTqpQK
-WU7j6VWKPNL9ev+0wfryEyLGq1+1upq9CesFBv0JArnBmbpSS3JBx1cTNV2injBN
-0+AVwODohIz8/4nYwHzsfR371PfCXVsQ+Uw5/Bvd2elUlaR4WJSvJo5DwVV4/a2W
-jYlvSKfS9Pyt3TNNiuYqcjPe7iWuu3PUQ/4oyhmdsQjBUVCnYEw89AzJYOjzP5Kb
-DVTSU8cnRUZqMmf0KIDAQjcyXlxAlCAdjFwmIsDLg6S8AlZd6zSOaf559ciZtgP9
-M/kOWWLG5ZiLH3mXAxA+zYclxPMzNGz0EeajozwEWK2xGbRCelGtfXF0gNx48YJG
-7BgqZtBgxlUXtrpKGI8nng==
+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==
-----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 ebb81d9a9d2..9887bb60f6d 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI551Dxkj4WboCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNgtaSlzMeU7BIIEyPt5uHqnkGoI
-JVmPRDTuC7C0vnNZK9QrDH+nyUDLrFx7jDeu2xzr/fSoQetqNGCjpc94zB18kfRg
-yDbIs+Z1a2nhUu+pu4cOdFkUq4VPd8QlkNnpjAIbn+URSvkEEwJI59Kn7vqreT9l
-Fkl6qBWNhTd6+aYAFf4Hu038DYVKKX7hTefMK/HgNH4G/MgLCi4iEfSgLNm0fK6v
-zMT97hdNucgAq+8dS6aG5CI1sE5yICyvWqIk2Ydduf5tKPZHSVupigDG8vuX55xv
-byrkY896U18BQFwt5SLPEu3Khk+W/l+cIpfkXGftw1ltPyNKVrx68uk3UDYwAZ5D
-V3P/WMgHP+1II7DzRBqbRFHwsH9+75L4GIQNpu0QFvrXP3guQpnJYOR7f8wgbnRn
-G6so9cOhSfVBWPb7L6nekFZGURTgjuizalik3xI4+wK/Hkb9bQKPdi4qQ1IryLzC
-VPcBmcnWLDABUpz278x3ir4Dd+TK+2Dn4zDk6otqcBobTVmlpsPVkdQkZbqmVyep
-XXAHtohktWImM9W4mdWTZlu6QUOeVN3tJouljRjvEQSet5Gqvhre0/PFzMHI0dLZ
-dUyMwKIvTfihFZcdGNNDw6fkHB+NQTbOII2JKnRBorNwNkB+E7w4EK4E7IeV6Jrj
-T7jsbcdHxLNJFHO7dDJJ2tuPY5ei5ux8QuUQtlh4Npb/UyRdDXS5CCHKm1Ts7DVj
-bLsenh9QuazW8CR9XyhthiG1o1NJxBrA++FIKJ9iOlgXYfFzq4lBPFLv+t8CBqRW
-pDoJjILm9sVZE/d66NqSDDi/C0fTBoSc8nM1CkGuZU0XgZBf1sd858MeiiXyXazn
-ytCS7M5z30Ya/EemAHzdmmTUqIMwdOy1MZJizJUidRmjAi6VmFA2PUsc6Qo/UZt7
-OYABz0JNXVTkU9neKTQDBAuJuN7u6Ut4S1dNSkcSwCpbhy86kb5AvwRc/ZdHhdwK
-NxJF4mAkIzkM2n1AC4Mk14TmywL+pP38SSUaczCtLMPnG7mC288A+qiP7pkQZucb
-BX/uOFD02z8AGjjyGFU0eQk+us9B94gS+W3hUxK1nx3RdUljCwfCSk6IbHjfGTcU
-8HMfq2UKG65E8DrTHCVb4w+QGZ6K3+/I10L8dBtKZg4GoULuG0dV75Hb64cd2jAr
-O2CKCT1jcUHOYO2BkQH1j++OtGUhLowSAs8hggpMQKUcYrXkcuafgoVi3d31DOt2
-WLmh5Ve6eUujtRB2WAx8ikBeNe7DmY2jbnHwtIUfOCUmOvNpN8ftrCwo4P0l454Q
-8KDdqTZ/nPNPZYerZfl3ZUYNcx9Kcp5lNPpw1vIcq/1wt0ijEsSvDB0d6vCHq6Gm
-vsakSju/kB8UHXgj8XAHNK50FtwURkP8scdwg6YtcSE678wKHdE0rakR8cTXE8j5
-AoTS/IWSrZz2dEs0LdhmMAFNeiHEYGIaDbaFWW+PZl1gKzkUtRybvvEbNIu+eeuG
-txliEeYl1MqKyZLsWmnucx5QUvkzedDal2Sm7LZFJ2kbDeNszG+BLKOgiEIGz9p0
-m5sY/L5iFHTStwMsYXCp4Zl4PpPBQsupoW8vTwvKougbK5XaIaxvS8DmbhPaj4By
-OMh3mO5oyI6bn2ipgaJN/w==
+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==
-----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 b21c958214d..4f4fa65d183 100644
--- a/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2.pem
+++ b/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2.pem
@@ -1,28 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
+hCwSW/0=
-----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 8123a188cdd..06339769e38 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI0Vz6zjYezKcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKMLgqaz6VNcBIIEyLcLHBi1NtC/
-B4PpfIZI8ELtOB3g/3tXZI/KahccYpRVMZ6AXdcuuJwBMkbfMbXAlZ22bKg/72dE
-BfGAbyknZfhD89uX2M6t/Uc87CPufkAn8LNFXqZN+mu+b3D1qykthG/O2ll7v/Jn
-pcrYjUxacEydNwIuoNxFXBhBvd006b1xrAXwKxUXNLPv0JV1C8tQEYOWewQY848v
-hwpGoUqhvhXxj33aQTjUeprPcaRvvOHSkt7of4u8LvFKMa2Iu6My+0mf2XmwlTbr
-+wWmyZtXQ8R8Jqqbhwc9djVhU24XQGFH6HdsG5JnEoJ7s9/EWiMLJQU1GC1+BgxJ
-QbJGi/2oDghwedcR53A7OQVpERLnsRIs0g0kR3Rx0dSX18wDrX7mxwhq9K3hiDUv
-jrmF2Pt70TR3J+slRXwQUG3FpiMvc+SDuWIj0sWD2w6hdvjBF7fvLyxp3xe3M5Vh
-NLtu2IOuBbyQHBaTEAPiSna0AKSblgBS+0XwNLDinT1Jny8Y77uLV5Qr9ZDLhzOE
-kfPxU6hzY+QJ1oTzCRt/7UY/NuAAlrUk7gPS8QRy5R0Zj1ysfwjZdY4cxcIASHLD
-yDI/JqCpRcllNQoGF2ilk3estpuXKdw1EUkifonzZZXd8vxJZnIt8l/dc0kIaIlX
-2LODRnkXFtWXcIuynkGaEM8fJaJOKea9OHF4Ij5ZUXAEb+9AADeVxqf9cPlPEg9S
-mYaTLZ6Y1SwgE0yts3/002szZ6Ct766130h3UIdFRuVfDv+uBDYMEeoJ3X7K8ydl
-cmioKgar6W+KoQzTFhJTqdg920qgvtFsEzWxWT5g2yZY6bEiKhoIpsNCl2o67its
-JaxrIT0Azped1wFqeC3zmrGwtoLpi5NV8UNhG9eqELEkc+8CQadXq2G3pzDIfrtP
-da2C411xfwXOE9y5vYDVMVi417943vce9PYXZibUzhmsONDuzqG00WcsP/pyzD5H
-T7TLRUzBhmJt7xkdJhS9bk2sucHKE4X5Dguti4iLpQrybNRZU3CRGovRs/h/JEHE
-WObNsgqQmP5hvggvuKba76QnzVKWd5XRvMmYFnEhORTFAHJGMqVhDn3p7AJJM9Yy
-MYzrIvwA9qcUZt50WO8PvQsQHset0T4uYzMAyzZ7eKDStYiAY+qziVQOVqN/p9dZ
-wfu1QK+jkmZskLQW6A+TfXX4DT5B7XPs65tm+4azllhXWwPbIq2OqNHzCqbyvZrM
-fydk/GX8P9Vm7vSxnseaw4N52iXkAxjDX/RK4eEoHQAduGtjnj98e/Eq8sh4DZYK
-X2vx/Tm1xqFbd6BbqLWyhcSvG5JgmGdshwj2T8Yp/verNSuwJEybeqc6j7+nOYeh
-l4/6U8u/PDNgVf0xJn9VP9yADG2lCca8sC6vvvlvroezgWAU5Y5Oo0as+No6G5nq
-jKOrtE2KnFavBcU6P9aOCaAGFfuj57tdaHk5YBAHU9hZhI3cSMbfba0rdotmt3ep
-zgIqf+2A/ihZCAXPi40LwY2M29DXzTDGnMM02M7h0SbEdeqKMJTefRELfZQPDPxn
-tOHfnSONHMGONg2ICIYLUQorGFRUXXNiAOCh+svq+s6N4cniMxDgWv/iTMsD57Ku
-fejEnS75lFGbHsmofCLRzg==
+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==
-----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 da3b0e75877..844ce57b1fc 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-----
-MIID8jCCAtqgAwIBAgIIM5lEiN/O98UwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
-Q0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
-BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
-hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAlj8vvE1K0RnqW2DW1cgik6EO2zwBWzwSUxek6xj5AAUmLyjYwJtq
-iK8BHlQiuLi5qo413M5SdLLXe7awFLJEW8d76nemnOm7OGdweazJvQ/owjxzbG7B
-LmCNgRl7DJFLQSbyhfg06OhR7/4n6upEgCDEuO8ndzwd/v6h2VDWIsuxo8UqI0Aj
-zZmi9n3Vgmfck0Zbw32Qks4t6dUZBlHgXifqoZgCgLDdAUpAiFJtqFxZY+rZFg3+
-Y0Y3Wlm/gB0B/NqKodVH38pF/BuUHliswEpOv6sKRlmazP6EzkMzPhHC4Pl2RCZb
-ITLKWHZvyo3StTTUr/MXELmfc59+9oz9gwIDAQABo1IwUDAMBgNVHRMEBTADAQH/
-MB0GA1UdDgQWBBTu5bRnL053Kz/sxZ4TnSA+vZqxBTAhBgNVHREEGjAYhwR/AAAB
-gRBpc3N1ZXJAemVyb2MuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCRlrG80D/DBINh
-920P1wi3u0cf1Ba9vFjQiJWbRZ1z0F5wAjqLv5SeSsewQCzWlVLvIQAKH6RAhpLb
-0fjrvHAT6JJknI1DW3qgj8Er6jE12MApIe651kE5AgWyk8u8Q/8mDf2/5tGAKvmT
-8mByebo9bkNfJbepP8iiYXeOd8Omw70/DdBB4wlqDFKB7IzNTbEJJQHdgKKnsayy
-7rbTBvddcVJ1LQWhsfqii9teJYao72boXxAVlBBkUMcxLLUA9h5dAzuUx7AFQrUl
-BsM59PLVyxgTsj6aLwS/m58XnSIAS/8D5iVdW5oeYIqzsHLzlvpQIX6CDhh6z6mU
-YZnEOWYG
+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==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca2/ca_key.pem b/cpp/test/IceSSL/certs/db/ca2/ca_key.pem
index 9c040dac07f..a8bc35bcc78 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIF5BcGWDYeG0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFl4sMoUqlssBIIEyO0JD0XqnGpo
-dTcK9G6PPgukGlwi/eAajzYBwBejKL8AVQk4wFwYHRcbLJfyOh1N0We16pRb0qtS
-4gR4legCMdEEGxIDFBALYhCtsn/ipbRRhKnyyV08MdRTUUbBKjZMng2Ck8L/44WH
-8I+37uGlbWMU8wvM8QtGAyu+uuNLfYznybaI/Xa5IbLHXIyGs6ztcafbM7QiaM1o
-upWlvBbpU6U/NlTTxGKGMdTY2Z+5z5G7O8+/DlmDL2I4ZNbVIusLdk5kI610pO3p
-p+/tqs5RjxbB1pG6v6w+JaVQV/ehxPjztF+rHl7WBq0xhQ2K8H99TF2b+I0z77uY
-EdIWx/jwankBP3Fh0E10giQX6Ne1DyYBRiOMOfpbPTtBF8O6nRytglsbSTLNz9TV
-DpWCru+vrnoUcfJ9wXDMNtvu8DBPb5cnb+Q0FnSstouXIMyi9Med7eX8cBjJOXS/
-TBROIh8AFhft2uEv/TWQOO5Rkn/ix/i5IXNTopK5F5pFLFPKweNOqOybGetQTRIe
-6zolhZPm7md8CqEoty7ICTzrrve6djg0VerqrwQ51RvQKtaEgplmUaqukS7+v8As
-yXvGOoIlMJ4FCbQ/2DInv9zBzehmZipKU0ipXVH8E5loZ7jhcIna/2oogyio7WyM
-fyaicfC4GldYKNscba40SF879LNVW+V/9BWma1peGZg9j3mEgQSrgXqIge6w/mLX
-FrBN04EfiN4u5n3I24xrgqwKb8HA2zZrLBrKQr4wtucBd4G9unBZkiN+mqSrh5jq
-KnHrkgmYR6N5sk5O2pSjhA3lKyGHE6bNsu1zznjZUaEUNVY+O2pIQdvjtJ6tfjTf
-WscB3FHBHXRJT4yalQyGgdai6tbxun0yE1lI0BFz3fcxhuLEEcyBr+vXoaNJ4oj7
-K9BWwIxKh2BZwnHkuIXJrTcyKKnz19/dqnVFIe6w7Qjtmd9JsMr4EX4l8mn5bJo2
-UC9BBAOssWxwfOhhJiNVWM/IG3V37ySqyMbOJcfk3pq1+1B4rGpRyurNk4IlM0F/
-iXNIDrjYYaR8Epw6FNJZaNjP0EBnh2f4QVEknnO7rCcdaMRrU/bfQYWblTSGU1xC
-0Qi0eEazxAWNujF2mGj0YbGwPFddtYfhs3ZgpriLik7s/31z5M5faLjfpTbmKJPE
-IYTp3hpEe3Z1OX4oMhx02oOkXqjjLyyc7WWfacsYGvRZurxtB0265wOGJu5g5nIr
-DZVVsjAaUcZCofIOkKfylzdb91ecvscvRJCCibzydB2UxTqayejTVE9GZ9kqHIzg
-ml1pZtDu5jUCgw157FW6roT443i1yby1Oq8ygN9WeoYKpWAJHiQAgKeuRH87ZpTF
-vmxrEYir1pYyP/Ot7KOvekfgwMW5/7X9aK2V2KaD6EJx7QNUPcQ27NEZkjQeM4kq
-TIZaN0NpzxosQcBBBoxGhrtM1pvBStDNIoXeEHAJPup6yxFIPb8H8JXSvLhrb6mv
-0YoqPRP/PrvBGGqwHT65/paSAuX21fPEWFWU1A7jiHoFrSfYuiIMFJzXiSqemikO
-dn6AskjJwLAiX1RbW6ynQlzhmPc/6m0aLgQ4yZccI9KL/Twfy86T8RqxQGtQ1ExC
-zW7k5gpqQND3C0HMW4+H5w==
+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==
-----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 a080dd22ac8..a16fe079d78 100644
--- a/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2.pem
+++ b/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2.pem
@@ -1,28 +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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
+s7BIMkk=
-----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 3c87b820c52..d4032328da8 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIkfgsuBa1dzUCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNtE7m51OcIsBIIEyOBcnvxFs7sM
-aWVQYyCBjDAFwrFm5Qet4K9G3EzSwlW1vsITEjMqyvyueRhoZNqmg6JA3v+LwTc0
-iwR92PbzMHF+RSDMJerKCxEOawehRsF+GRjqa31LcVQs7ebc1pgsgQvnd+Q6AnmB
-dNJIIZBwgzRdNVv00HyNEEcCJE2lyAWj82/fCdb1PzcfGQdeEDEOLm0Md72Na696
-L0cakqj8KSVgnWnXuJBABEEfnJG7VNkLT3NZqgIGP/ukSCD8rg4ezhUmqBLnkmOE
-YpgHsyvVzdilA0GpfuusYhRYwttUMS9y5XuIHupZFVpUuNGDVrn8FF43ZPYH/UJv
-YcW4d1DfSoqzXBJV6hc3O1HjaDKb5iTwd3fAQobMsietTshy3/V5Z1K4+bpUPXl0
-QDcLj19ZlxiuKkfYoBVtBjT25CtMerpKT6vQFv9Hvwk5VUuHJG7oDxFQ7tlXayL4
-ALR4snGeq7OOcNQVKimQEDW1QY8ylwv+XNHcVObJH00E+PBq5fDjM6BbFy/Db1vc
-V22u6eTG683iv5whZ+3T+jP3fsOi70D6vdUyhlUbNXclD76V1DbTKOD5tPxJdIJT
-xkoF3QCHBtt4ULNjVluCZ0dhL2Y9gBYB/24yqJKmB0JVzmXzW8JRETf5fmPYLvZA
-RbGsNIM7VswKme+fmM7OUgaxCQrMFlSJr/EnkgqzUSL0bte4mXs4OBMkEZNcKm7p
-thh4NTe2/P7VwQFlOcvxpe7iIo36JbeOm9oPG+qy0PHUznK5EhkW9xmIXkUogPG+
-AdJfQAJzFIqZu/A3PfU/MoJVLFlq8+M9cHrT3SWxj+EvN2Zt2q201gCf9kX60KIb
-+E20IPTehMwtVq+kS4SMY6ggsj+SQH0duqyUqAo2K9Q9sxIl1L1DjFXhEsuaLAgy
-HqcPSJXnKHx6JiZrvqLtLV2ZxABxlWglyUq3lUN8e7hEXTRnCBKVOS7G9adCJdEG
-FFi7WWdR9Ki8vWPv9kzNsm6HCBPLQ1zCQV7XpAE0+cwesQ2V0+E5LrUSuhBKCKyh
-EcLN4ugiRZP6dwfjwPKBGA9ZAPrWkVxDFb1jzIe5bsprFBZ0meBchw17foNeHXqo
-7B/x69/PglO3qAfXOWEDztAWX7oRhQkLAXO0j0wA7lgDZVgmADAfZsr6jKmPgnIg
-5FzUCuCSPxlCpxs/i64CdHib+AuRtJ0RcwIFvnCYPZx015S9NWw7O4c9C/WtCM7a
-oYG/cSz4SGpHEVKcBO/w4zM3diMuLR58ZQ//RGoys58TJiXLosylMkLehvvZhnIB
-rErMnxSo8dYNnOsEQ5kHugyP45PyrUq2HdDtvKeEE2OBrOMithBFx/Yx7Szwt90D
-KbTdcFY8MhOne8KXflV9jxs6zUzI2M/bXvBU1McpIIZMSh7Pc8V3Cb+2KnwoQX1z
-sGURnVT1E/ToVoMMy8tHOqakzyKJ5zKOyfHqwCJveSJGS0Xx7bODSNoAvnqWSeen
-sSj3xcx/WWeOWHHrDDDdvzBh1slz47GgNztU0Uo6Zjcs5sJcGuz/QdU5ZP7nDqLB
-frUIPJYG2B9F+CJpFYS95kpNGMAGJWe3wvzJfet2c/Sf/zKIgUr9/00vXVp7tdVp
-WugGNCTPjh9dbfGZ/3tm4A==
+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==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/dh_params1024.der b/cpp/test/IceSSL/certs/dh_params1024.der
index 7ce3bc3ed48..d3f0f89a5f3 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 6d88830909e..6360473beab 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/makecerts.py b/cpp/test/IceSSL/certs/makecerts.py
index 34e94045219..8e7cc53b1dd 100755
--- a/cpp/test/IceSSL/certs/makecerts.py
+++ b/cpp/test/IceSSL/certs/makecerts.py
@@ -62,9 +62,13 @@ if clean:
for h in [homeca1, homeca2]:
IceCertUtils.CertificateFactory(home=h).destroy(True)
+#
# Create 2 CAs, the DSA ca is actually ca1 but with a different the DSA key generation algorithm.
+# ca2 is also used as a server. The serverAuth extension is required on some OSs (macOS Catalina)
+#
ca1 = IceCertUtils.CertificateFactory(home=homeca1, cn="ZeroC Test CA 1", ip="127.0.0.1", email="issuer@zeroc.com")
-ca2 = IceCertUtils.CertificateFactory(home=homeca2, cn="ZeroC Test CA 2", ip="127.0.0.1", email="issuer@zeroc.com")
+ca2 = IceCertUtils.CertificateFactory(home=homeca2, cn="ZeroC Test CA 2", ip="127.0.0.1", email="issuer@zeroc.com",
+ extendedKeyUsage="serverAuth")
dsaca = IceCertUtils.OpenSSLCertificateFactory(home=ca1.home, keyalg="dsa", keysize=2048)
#
@@ -124,7 +128,7 @@ certs = [
#
for (ca, alias, args) in certs:
if not ca.get(alias):
- ca.create(alias, extendedKeyUsages="clientAuth" if alias.startswith("c_") else "serverAuth", **args)
+ ca.create(alias, extendedKeyUsage="clientAuth" if alias.startswith("c_") else "serverAuth", **args)
savecerts = [
(ca1, "s_rsa_ca1", None, {}),
@@ -181,7 +185,7 @@ if not os.path.exists("cacert_custom.pem"):
"openssl x509 -req -in cacert_custom.csr -signkey cakey1.pem -out cacert_custom.pem -extfile cacert_custom.ext"]
for command in commands:
if os.system(command) != 0:
- print "error running command `{0}'".format(command)
+ print("error running command `{0}'".format(command))
sys.exit(1)
if os.path.exists("cacert_custom.csr"):
diff --git a/cpp/test/IceSSL/certs/s_dsa_ca1.p12 b/cpp/test/IceSSL/certs/s_dsa_ca1.p12
index b4c710e9649..e1363951d32 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 735e0ec127b..c1ff5772ed9 100644
--- a/cpp/test/IceSSL/certs/s_dsa_ca1_priv.pem
+++ b/cpp/test/IceSSL/certs/s_dsa_ca1_priv.pem
@@ -1,15 +1,15 @@
-----BEGIN PRIVATE KEY-----
-MIICZQIBADCCAjkGByqGSM44BAEwggIsAoIBAQCz18irQulvQFwLzbffNxd2Hv0k
-GES3lxMltXiWERDMc88ANdJ16MZ7cGM5NP+SHT7n6Avs2d9lhfea+1RLLOk4/wBT
-EZdHk4dUZDHLbXVi9uA7InBLmOJ/QBWUnBKO0IMcrWd3N4BKjbCB7KiLNA/IDBKt
-o4Jasf0VZsC1enjFCozRpeAfMwjSYC+TPM0bOlRY9LoT2LemhyzDebkT6ZXcVI1s
-Yi1p4wJ6mVwXirGYMGlYdE5ekmmsxhVjjvHIdC7FaYGrXKBadMqS5qoOwzHDhcG8
-Uofu4aiVkV189Yrin5bxostG9odjHCa8lHJcAXzweXxjDIDoUattOf9yANj5AiEA
-h27zSmv+xtLB7H4nrcEnlEy1yYx5r6xAicVOTfdmfXECggEAGvA8stDjUAVf3+YW
-R8MRseaH8ALN7N91yQOZiIsylg9R9OoTorPXo+A6oxgKhcT7mIYgBOmdKPh/0jas
-StQS/uqemtdhahazFChncGHATS5lO5WXt/Clm+vcyn4gVkqg+YXwHEQ+kTOfNVrL
-klH5WEDsNqnuj1tw1zE56528ekHD8vqoQAblrIjPmWtdOgcKQgqr3ghpZ7Kf+LXg
-l/VHDMR0n2R4SH/z7OovBjr7qBZ5Wg2a3URtX/U31VeI63l3tBavyCnTyMYxmxrv
-EjONhpvo3idgZ37M/TKM44hhbmnN0oWxH9opkd28N5MYcJBoDchI+rH/kAAd4jdL
-mqV+KQQjAiEAhlL67+wfIpOZNmWeW1Y2qnyA3zLsEyD70IX78Du1DRY=
+MIICZQIBADCCAjkGByqGSM44BAEwggIsAoIBAQCmoAeImEtgEbim24TfsmdI17qB
+fhIyVZY+JYYNxtcZRMdfZRwjGQVYY8rsjxk0rBT2xWezk1+iA0rqHdhyV7kAFjRl
+EFuioSZnjSSx2HmZzpMVX2N2mytcVFLv/h++/RhrmTdIEhNIAU7SSsVBYbxsrEDI
+qWsbFMkDhH0MKRv3lRfMfePa778DbksmQe+imbbYWRo4bLU9gG4Loh9xsmMjzzZg
+RFZ1EVM4GGYCdFtn/ubJKO3hBPoYhcbUJZwBSCcO+sr4kLfVc/jNqDnZa2ROJ9av
+2wYFrrkO7WWZE1HECFPOsh7fOZbltvoLvdz+fKHeYz7zU80BesYD39fRXwUpAiEA
+uCkHn9Y4zWsI59kj0kQsGIooY3CS1Mku/yyL3r4qDy8CggEAc4F5h8/XYWgjaYT8
+C5291Ek7NpHPfWtdU0hEiBflS1SPYFoPXNHq/KkeDHQKE7wbHOUXREUdIoelBE0d
+fuO3C0mkjZnvPHUz327aFoDymiwCpRcxKCGBLazeTVzWJD6p49FghpEsCOe6T/t1
+GwsSexIfHHcLpy2ecxQBpw2GuBO9yJhouC+QlHxloSAx85rdb31/Kj1Sxma2e9SE
+rHhSiwWr5/SLpJNx+iTFujvuXOjvXVBmt92ymW032spcT0w89/N4XzhjVn8pNazo
+QZIKDNftMz8aR725Fs/HHqSIqGYRpr2X9CrBH0V0XHq1uLcZrxpnu2WPbyLe5f7j
+lWiIWgQjAiEAkImw3r5HrS1DsE4iBvMSHCAbvko9nV/zs0BOfPBKkRE=
-----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 b03c18e6800..80dd141b962 100644
--- a/cpp/test/IceSSL/certs/s_dsa_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_dsa_ca1_pub.pem
@@ -1,39 +1,39 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
-63vj4Ss9AnE=
+ZXJvYy5jb20wggNHMIICOQYHKoZIzjgEATCCAiwCggEBAKagB4iYS2ARuKbbhN+y
+Z0jXuoF+EjJVlj4lhg3G1xlEx19lHCMZBVhjyuyPGTSsFPbFZ7OTX6IDSuod2HJX
+uQAWNGUQW6KhJmeNJLHYeZnOkxVfY3abK1xUUu/+H779GGuZN0gSE0gBTtJKxUFh
+vGysQMipaxsUyQOEfQwpG/eVF8x949rvvwNuSyZB76KZtthZGjhstT2AbguiH3Gy
+YyPPNmBEVnURUzgYZgJ0W2f+5sko7eEE+hiFxtQlnAFIJw76yviQt9Vz+M2oOdlr
+ZE4n1q/bBgWuuQ7tZZkTUcQIU86yHt85luW2+gu93P58od5jPvNTzQF6xgPf19Ff
+BSkCIQC4KQef1jjNawjn2SPSRCwYiihjcJLUyS7/LIvevioPLwKCAQBzgXmHz9dh
+aCNphPwLnb3USTs2kc99a11TSESIF+VLVI9gWg9c0er8qR4MdAoTvBsc5RdERR0i
+h6UETR1+47cLSaSNme88dTPfbtoWgPKaLAKlFzEoIYEtrN5NXNYkPqnj0WCGkSwI
+57pP+3UbCxJ7Eh8cdwunLZ5zFAGnDYa4E73ImGi4L5CUfGWhIDHzmt1vfX8qPVLG
+ZrZ71ISseFKLBavn9Iukk3H6JMW6O+5c6O9dUGa33bKZbTfaylxPTDz383hfOGNW
+fyk1rOhBkgoM1+0zPxpHvbkWz8cepIioZhGmvZf0KsEfRXRcerW4txmvGme7ZY9v
+It7l/uOVaIhaA4IBBgACggEBAKAxwlXDZg61FjSkICWOvwroKfyk65NZzh/EE3ei
+kYALOdekswG0u5wzRTFNh5AbZF9PAz2xqqetlKakulPjaUFwYNx7B21FSFG/VYfF
+HvBi9IrJeUIQhmWvbcZWD5rf6EGI+INBEow6uqsekD0v1wAHgIn0/N/lPIpVA8BL
++OEFbMuGTyk+0rbdOrLejc0MniGiFG36QZf/vjR1gAHRFyfZle+1DWKJTzbRV75J
+TpNutntGxJQxWMCVaDtV9znP0gWlkI9GTkIyQCFGZqAvmHdZ2+F5JucE8sVHtMSO
+TQMdcGmL5V2r75xq2VjumHRMpMw82oVePX/4Jdmm+6nZIiWjggEkMIIBIDAdBgNV
+HQ4EFgQU0xngjPCKLhxUS8kKrXG66sH2UL4wgcMGA1UdIwSBuzCBuIAU/ysXYfGA
+XBGwhwBTQL326lLOt1ihgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
+MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
+SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
+9w0BCQEWDmluZm9AemVyb2MuY29tggkA0KlgGsJ5WokwCwYDVR0PBAQDAgXgMBMG
+A1UdJQQMMAoGCCsGAQUFBwMBMBcGA1UdEQQQMA6HBH8AAAGCBnNlcnZlcjANBgkq
+hkiG9w0BAQsFAAOCAQEAdtBcSrbFeuAGXsQ3lFS5LXB5PmvR93w+5Yxk3ea2aWaW
+SeNWJF/+cT77aHNqXmb4RqZynNEUuVx9waoGUkFMWIWbLKGKvanW+VxMxnRQKNMq
+Erj2fL+xxedLlCqh80MMN3FpamKbur16tA8dGKkG6ecmUHsG8h63MqK+8eYGAmXZ
+8i56KkWbvzCxMW11IP0uPqWveFujPgRQpdNWswjHs2DHIgDKaLxnGzuNEnJ6akBT
+0vwVUaI9uKecLI+XVfyK57CAT7edkOtutz00Ac2JqpmvrgT6VJH8LxvHQKuQWj8R
+lU6Ch/qm1sNdaGgvxatKbr3ucage/aF+9kqCTqyuWA==
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1.p12
index 64c4dc8e427..1f3ab428605 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 9e4d586b9ed..987b238420b 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_cn1_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_priv.pem
index e294d92b2db..4824412523b 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDNNnhJlBqGdQa9
-Y3XU32600FYHQhOROfeuMz9nrCsxn3H2pFfskm9/w6IiL+oLfWjOmyrtJc5d15Nl
-SVaLMx07kJGYP/2PowMYGKb/ns+XDHNwfLKJJpyEs7+ALZxue37+i++7xOPZRTnI
-o4wFp8c26c+rF9b5n/NyY9kRo3a3/oK7/JA9sH8PuOOXYdYugH4MNbLY6y/iQGQJ
-3U5IXUlGV2/QrQPxewWEOuUP96J7pl5LQ2kIFN8ZX/nOBOPvPpgxsj4fV7rs7oFq
-hxfaJVECkCeLmq+mu+PRx9alJtFQESmVPDhEj3nZ8vakMpnQul/cveK3RXlDrwdO
-74J0tvBpAgMBAAECggEAEy3NDiteU0SqrZaXE58SLKnv8Fu3knIVeN1nRpwrqUaa
-kw+G/CAvdYRmKcXKnOpKmkycNW+8Gr8kEmpJQVc0mzWGtfD9FKiKiHz9VpSUGCzc
-uR2eXf0S0cAu3J7mqNi35LhVXnonRU4X+W13j6u/jZ1KgFYJDGlrijxUtDZPySBA
-ZSMWNey3rLU0CPL8jE679xqRvvhTDKlodMim3RcpZYNHoxdrscALMMvaCDGjkaZI
-U7Y0n+crn3lEog9vQLRQu42cG8nPrDsds+xsefYAs922hJZsVnSVxxzhFXgIm3ui
-ZomdlYt2l+H3+rt7rxAskT4KUvJLY+bjlFzgI4oXAQKBgQDn7HZsDR1rqIs/4WBi
-rmVWJwno0n0aVuOR8Fc3Jpf5LfSycE/wtiqZXX/H18fxeQl6FzzPn8zFkhTOltvS
-+kdPvQD7II9eoZfX9BppiBw1JWG0ZPe5bRZF5aUswG5xo7pAuKhdNBThZYB2LF/I
-aY9rFkJorDU44RSd9Dmb5ZOeYQKBgQDihCVT1ixGSu3pViqu1pyg0Uuvi7bZnA/T
-44+NDImQ7zA+d+8ed7hfE2tf7IH0qm3/VDppgTNY0ofk0UJW9ZGzYBKeWC/+wNXu
-7P6IL74uzZL+pzQJ39SrWf1KNUGLdCfaLx+zJH9FWaHyKls481DBTqDG3VrNJUbi
-F5vspNy/CQKBgQCmgjKTaOcSgDNZbaoRrzu6GtUWfuiqnG9OO8uiIOdDUyc3ZUM/
-gsoayfIPvHAkgc24Bi72sbgGsNaXa9/vHRlNuliV8857FnE57lt4IOx/i5MWPNdO
-HW+8Rx/LfWzN0crK5MicAeRr3r/YGAu8i20YaSbMl7auW4q9zLX/o1fUgQKBgBJC
-esvWUP1dnu4XXxt2+2tPU92T0qqaFQCMsI67Ov+u+GGgw2reVcN8SkSSSSuS7YkO
-niLRInV/iyrb35Ao/ZTLItUW4M+Vdelru1z5FEirk7Tpf51oKLmjaHKp9l2qgGfr
-Mo/7WjMZ9Z8S4QWnP5RFpVpCj8ZHwf4Jzyz1YUIZAoGBAJys9IBACHkVER4V237X
-nR3WowjzQvbYG6HBCjLBBsI4ckRr/+kDxTEQ2vHe0W8SExVTQdY6LxpN3uSsp/aP
-HFZ4CRr8yGGINoH8/6onWAsZ+Ogidme4gNUiZ8ZOC/K9512ky9vUubQvSc0Jjmnc
-jh43DAltsLwWDLslzwE9DRvn
+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==
-----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 b670641f8c7..6bac456140c 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_pub.pem
@@ -1,28 +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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
-ghKGyxbsADh6O3pIQ7DmpBAtNlJVdGeu3LtxHQ==
+ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwFAYDVR0RBA0wC4IJbG9j
+YWxob3N0MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAI/3U6EQCWzBuIc0xSOB
+SdZarvT+Zoht8Hj3PY0iNapaq1zjCVbxnUgPDo2gHK24ss+lO989LBf8krYG4xn8
+79Rm9UfP+K1ug5UmBQyfw2GtQAPR+B3HIl2Dr11m7pnNLv2CpWQqmOV9gsP5NiCT
+m5aXwj1flGVrM4iYEn7AnWxYiKBqOkfvVHTVUlM6UFkSYVxvD5F/esWGo0OS7dWV
+AH37edTB3H3Wg0r5K9QbXCuYW1gS/4gFSiI5h+Kn1aHezQZyRGRoT8EdBMmJ9flX
+M1GvvLoLJBvxX5ia5aILBUa2EtzlLDxpAEKMnprip/QZYbDtrAF14ZwlKGKPpNYB
+XA8=
-----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 c4692a374a2..f9f6c7cdb28 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 895a4b79321..d4b9c54e60e 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-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDae38y/HZuk+ga
-nlM6ggiz72MTDOwKiZVLdyXEK+kR80zJQMjUK9MpaPwIBxfcYm2kn86JoTmdTgwt
-bXHtV9TmshDWCAIXfx+8AFFTmkSItVKm3uxpuZWeDME4C4fKYH8sZ22qAna94jws
-JibieJd/GVFJOTzbUmoIZDiV20rLr/6tdc/s94p8lVTWSwrffWb1OuIimuxBRRA+
-jUtmB+RnRih1KcU5mEpHluoDNaSCPDcfnYxGt62jRadzprWTL98ADupC1IsQxZtC
-DeLhbCtQjGL+b86nECf8h2KOE9ciF6vS8IfTbalgEaOf34YiVN8X60IXmOPS+015
-iMvwxU/fAgMBAAECggEABa8a0w/AYQYWDsM5tRb29P9wW2mFpoyHxsvVvrHJwX7L
-65x03Rg6ySQDEo5kr4YcBiFmNSxtnEsQhAoJ4bvcPRg62eahb00OXUzA0OT9jXTy
-Loc0LVf3rYH1cOjT4o76IASc1MR1pGEDYb6oWlH61wKom7gSfj45pfg9hKCM5Jmm
-PzvrSrjxlm0ZZSexQNYin9pORrdaZoJjo2wVjUQL6vDBtVXQvlQM6atFfxcQHYIf
-SnCqpIyVtQFW/Jw4vN+tZvLn7ZRxSLe1t4dwUdCoMuk7Io3AXQUiA6HBiAf5HEZr
-F3MfQh7uUnm/ZSs1Mwlzxw7Y/auUCAGT+6cXyFK+wQKBgQDuJniFAh/x74IdOf3k
-HvC1X+0fOa/UjvNKytvw+lRnNqlH3g52AyRMa1b3Anm1j682wev0p4E0KzbZ5bNB
-41YeaqmbzLUIiXu+CXwacdjEZg1wlpiiOFaTh99RkOXxfc1V6T6mo7KuDHeM6cLl
-PuycfSsLISUCKRDxIHdRkctXfwKBgQDq26WtnhT1liGCC4wAYqZMr71zep2/4aWu
-W4+S+TMWCoZCBYk0dwwN0WldZwzU4uZebGocK0Py/8iJGFrZxbWs+HI80kHp9Jig
-Ob9M07ojQ8TCFzqVROje9rfOp/hsb6jfd40jNui1v2WOinqQor8SoZBPgk3KAMJF
-8QFY02k3oQKBgQDQjJH38E9nP5WS4Ijsrwed3Z46PPs0SebWNWV71sv5As4lKFlD
-kSbFYS5r6xgIHgaTDikCO3mS5NEI6fUbmuh8hG15CT/zdOoPFiE+yznHa5MTaF3L
-mUh/s3ml5RzoaIFbXYFGzo2Xi0VZ+g95T6xGsfnyqhjNlobGkebLYMBQIwKBgQDn
-iw1YkhXP2efHMmMgriGOUWTSSPzlhC24LITsPctj25Rp2tNeak/z/5WFhGdeKyU7
-yl8CzpT7Kbonj19ifE2U7oyR8ikR4xfmP4ie0c8dnV6KjCQxrfJ4f3zPvUJqhdtU
-FaWMJkJfjQcu9M/JcOo4EBkaijjvAriGBAlz7Vo6gQKBgQDIqfY27Yd3Iu1GQZpf
-wrC1hfDuN/eeiBPqYwqTcsG+0xqAVpZDjH86J+UiHp3NubI4CuK7VAdp4HWb2Lu1
-W+/WCfHCH2NOElPAJw9Xg7TIephym6JXpXvJbMhY9ZS6Y4dvY34eB4c/SxoRsw47
-0Hl/TX9mAms7Nv0pUotIEcWp8Q==
+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==
-----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 1dbcabdfba2..c0439353cce 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_pub.pem
@@ -1,28 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIEyTCCA7GgAwIBAgIIMEDh7pXUw48wDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+MIIE3zCCA8egAwIBAgIICWFfaq0Q/zswDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NloXDTI0MDIxMDEyNTQ1NlowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIwMDQx
+NTE2MTczMFoXDTIyMDcxOTE2MTczMFowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-2nt/Mvx2bpPoGp5TOoIIs+9jEwzsComVS3clxCvpEfNMyUDI1CvTKWj8CAcX3GJt
-pJ/OiaE5nU4MLW1x7VfU5rIQ1ggCF38fvABRU5pEiLVSpt7sabmVngzBOAuHymB/
-LGdtqgJ2veI8LCYm4niXfxlRSTk821JqCGQ4ldtKy6/+rXXP7PeKfJVU1ksK331m
-9TriIprsQUUQPo1LZgfkZ0YodSnFOZhKR5bqAzWkgjw3H52MRreto0Wnc6a1ky/f
-AA7qQtSLEMWbQg3i4WwrUIxi/m/OpxAn/IdijhPXIher0vCH022pYBGjn9+GIlTf
-F+tCF5jj0vtNeYjL8MVP3wIDAQABo4IBMDCCASwwHQYDVR0OBBYEFMO9UZFXKnch
-4SugOiTsKXHcye2EMIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9
+3Ump8xy9vxMtsI9lO531Ln8n9AmtmChXoZ2WbacpUkhDVychljL6CltgzO1jU48E
+muZvmXjFuVg0uJNAeYoqCeYem7ywqan88KBqjk1mqgc9v5sNHRk8GWawDFpEJDly
+a/ZN8N9xmn7MTp0k12RvO89EubX7BshG7GOjhH97FL3VboZjLlK5ysEh/CfdoPOl
+dRiyi8rLaVUcOiz/j5rQ/aoaouj+TC6KSdXJnjXqu8vzRVgZyt0TOJa+QVy6nGtD
+oIE/4kszQNC61fUh0Ktao03OAr5MVVlG8+4Cx/1P5j2cUgwRZrCiy8vMRMwxS23b
+OGSj7EVN03ntwF/bCasupwIDAQABo4IBRjCCAUIwHQYDVR0OBBYEFBDM5PxDV/q4
+82FYLGsqA8Om/XxsMIHDBgNVHSMEgbswgbiAFP8rF2HxgFwRsIcAU0C99upSzrdY
oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMBYGA1UdEQQPMA2CC2xvY2Fs
-aG9zdFhYMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZI
-hvcNAQELBQADggEBAEC+4ndZbscLRWlqKpNt8aWKgarVJaCK5v3Sq/hySdQKJWEM
-nobCrc8uP2XdVdVGc8PC0qGpDa0RfIJGQ6yVRJ2+/cj+kkboNNLBtk/Dr+XXFECW
-xxLvCbIxGZPs1rT+b2HYINeAKkHqKgDH/48gBCVIqdqOfgniK0GH52XeRRqedvK5
-cdaAO8ymi+xYbFs90vrbYV2lehFIzvdAjwXvQ6+fHiRKMgFKjIGVNle+iueZVnIE
-dyShMsHtiHud+bSWixVVDMwOqzV6dVu5Wn1gFlbXsurEAeqGRx26tRwXLbYsUhQC
-uIiD4YbuM4wfo1DRZYBhJzE6C2jQib0gGoDbXu0=
+cm9jLmNvbYIJANCpYBrCeVqJMAsGA1UdDwQEAwIF4DAWBgNVHREEDzANggtsb2Nh
+bGhvc3RYWDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQB7ESTIKZ5uMXX0/f2H
+aNI07wCTn3jtILBDdrqlCnlJUJj8eqsCHZHc/P81AGMhIXdlza9ywASgdR46cb4b
+WcUd0B5sdeDLovQ8hDXrTL1f+CPOTp7ojmwGwPX2yd1ED038OEWTiHUh1Fm5PXyM
+mPriYY/noPpMAQU3MWGKT0wmFfI7rTIdebuEHGnf+xlucBmsGSI/r0ulNfIj6JL5
+MoUkri+0AdJFrTAMy7Qs5HYP4L3nHho+MEIlJJ6KQIU2hd3g39Qxz1+7Pw/XSHyF
+4AdjYVfMuYOJmSRqT4rZVZgN9TM9XuoOPVad+jee47Lj80RXZTfpliDLtCgTo0jw
+Wxcx
-----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 ce50d6067bf..e511440b85e 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 50d691bed04..514c99a65a7 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDEkdw+kYWmMHNw
-EUlkrEnzCxfE+kGz9aUMqo5RBV0tvGEcGIT7Sd4UE6TTk7xqkJdJmbFJBO2vewEJ
-hRpP1d1es0bKACuNzFLCeflhAqjI90Uk4h1r+8+NK/Dl1qCtqMXHPmgEB2KkYyTR
-1a7UcaXsj8YKyKCFGoFAkdqhQs3vAFUMmH+u0xmP6MAe7Xf2zBrG7qAd5+SkPOFY
-Ol2qf5Xilva9r7zuemovdW3Y0kuxxlCqy20blUqbQN7kpUm/7rz2gqalhMOsefoC
-kascz5d1xXllP9DTZFUfcuv70Me+wkihVxiTRvBnLEV+CecQ+pMbOXsYXqestpat
-m/PnN3unAgMBAAECggEAIQdxPoItNtOFUhtVfbkFY/VFNS/nwllQNmSiLTL9iSXS
-G2pzTdYHns/+Lh7w1ecdxJwykdZmKco9TmAzH58L51GwX1jP+K+QaGUeZhKQUdRa
-pevojbBuG4Z6n+QEc6mcMfJmf+bNyFlwYmHJUqEWBD3URROZBUSC21qmpdoXyES2
-FlSsTjdzxCP8KCBO5s24omvfDjpHIa1Mecvs3rK1xpFPOg98SBmsnU//0013lPH3
-3KrL+9jPncF1qySeKQZtEZ4YYECIIOpbsb11SDPpYIWdiSTbw+HcwyusCa+elJC5
-esSWOF0RpndWknC2UOCO35oKHcSIVYncaWURKYeCQQKBgQD9ERT2HrfMD2ZM40Qm
-eu3MHj6MxZXsRd+wN4H9mifkznoVg2AH8o6ywRo6QX2Rsfli2LdUHj7n1Jh/wUXX
-3UahFCPf/VLj4R+TUK7BhhejasnJVWcatTFC01Y8gPmwEEpGX68Htcdt2eY3PL/9
-VVb1NbIAycsQvKMTmFLVWeAY3wKBgQDG2SLz9/tErW3kfdvtWte306MdnjefYPUt
-/LlWDZAIReIpZvnqjj2fpjqJKF1Oue3r5knUlLSwjGvZT/RiOZaUBpADmoEXpbpC
-VW2VHZ5YLrbrsm3wOBsQsUZFKUvhjq67aQk3htkyr0jqCnELQ+UWUHIkqwoaMNa+
-nRvd9QJOOQKBgHU/oNKXUNi+mcst0LlzYxGbQae/M8MQbJ8cWKHC9pDQCUhGYgvM
-mcjAJwKurRr/tmfRuL7EdKi8mxs11MI6xyqCRkzU9b6W4yZBz3XiRrl0FKGva+G3
-6Wbou5+0sfqc0YzhcBrGYevHdR5Kizk4fN2HTz2GQQs0GupNPLOUvHtJAoGAah2q
-d4PZBbd/s7YuzaXzBNjebYnnqRg2/4mk5nVqbd/NZ8bai//IhxBQoK13zfGPNJq6
-v8Vz/9uQGnJ+uoR9BRXTePjU92er1IZ+altaCzkyyOl5nf5zAx93nqUBJ6fbO4w8
-LPO7qT69rJhR528eLCBWKZdVVtDFaQeyvWppBpECgYEA9IFyrig5q0zT8ikroQJY
-7mJj/MYHMMifYAvXEam4KM89EbICJZt1UQTmYH6OsLYgpdufhOFnloZUGUpqC/If
-y/dy9Zesw0lfBA7iDw/7ea36fUCTzkx7DUieX+N3Sif0t8EpRTva/dF2BqQbv9Hn
-iPy/nQSAIkYIO90+DMJjAj8=
+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==
-----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 35bbf8615a4..3f7ba8cf6ef 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-----
-MIIEtDCCA5ygAwIBAgIIZun+J12DQcQwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NloXDTI0MDIxMDEyNTQ1NlowgYgxEjAQBgNVBAMMCWxvY2FsaG9zdDEM
-MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
-aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
-CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAxJHcPpGFpjBzcBFJZKxJ8wsXxPpBs/WlDKqOUQVdLbxhHBiE+0neFBOk05O8
-apCXSZmxSQTtr3sBCYUaT9XdXrNGygArjcxSwnn5YQKoyPdFJOIda/vPjSvw5dag
-rajFxz5oBAdipGMk0dWu1HGl7I/GCsighRqBQJHaoULN7wBVDJh/rtMZj+jAHu13
-9swaxu6gHefkpDzhWDpdqn+V4pb2va+87npqL3Vt2NJLscZQqsttG5VKm0De5KVJ
-v+689oKmpYTDrHn6ApGrHM+XdcV5ZT/Q02RVH3Lr+9DHvsJIoVcYk0bwZyxFfgnn
-EPqTGzl7GF6nrLaWrZvz5zd7pwIDAQABo4IBGDCCARQwHQYDVR0OBBYEFODsumWu
-8upzGd4FR80N8WoLkccqMIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2
-nSV9oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
-A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
-BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
-QHplcm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiHBH8A
-AAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAAN876qqder9
-OiGihsQRKK9kb/dr4NwplQKU6ywawq9leMWvviffXnJFiWjKKBo1i0F5v5mhWB4g
-IQr+afWCLbOQtM01qQhpksf2zt1Imf38vmCbKUopLID9saif+jV4cCPyTnHdr35c
-6O3BjKxXGVdyx9vYu5GQgq15Zbu4xizBxnB/DfzOyT6Ua2g+J4KwGE4KjXqz0wiU
-elPBtQtiap5bupF/q+bD77ch0TOTvwHBNpKkDoGFIeG+/Xg/bJ6zqFvlfetKVJrn
-R4mU/KemLbdrc5IpoXEqZvQBarglztrlNlsJ1SgDHU8Ck0ufyEEZmftBfk1hKLwD
-DfBwVrXkahQ=
+MIIEyzCCA7OgAwIBAgIJAPGEfcXx5k0mMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGIMRIwEAYDVQQDDAlsb2NhbGhvc3Qx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAJ76i0dYivNWYeZN6wSn/AIF5yoIaukxxF3UxuI0IUnWvWZlLl8ZjRljlld9
+YQ+cC+VETn6wOYfP3KprVPuLANRQ59ST7UPqQP/95sXxuiXpdLpyYJlkF3QPfS6M
+WA/OTc/bvw1MFtdYfwmsTwN7w2Y5VzDJXi3rtFsowKQYRx5f63wm6zYXdWH6/ban
+QxUX2EChMU6nfjS3DqyckywS+iWbMuqA4szuX/NMNKkxATu+/DEbqeL1K1c97fWu
+818nnh5pX8zUuhktM1UEZ+Qd3jTlj/eb38T8W5lv4ABacmR+B1ZLWVEXFnvNNLlq
+uo4gRrD3Ei/CUVLCjRtcBhaHiv8CAwEAAaOCAS4wggEqMB0GA1UdDgQWBBRYjw98
+0BfkZ9/YjU6SMEueUHXAFzCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbq
+Us63WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
+DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
+DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
+b0B6ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcE
+fwAAAYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDATANBgkq
+hkiG9w0BAQsFAAOCAQEA2oMYMvppc2Iuql7ulWJ2lWbesfYvyIekhYtpbzt599Tj
+qsrvhvO3qTcLR/3FHcX1Vd+p2LYqpk7kuIpnvZ6AjfJUDJ6JtuFVIPL5mfDnqpMu
+UBUe/3Uj8maSn64xjGjZL4IebLvjI0Az9Kf1ZfTYawVM5Chc6MCkWNa0wTWwls21
+8UarpcXO3wizEzz0Rr8XI/My8UT8/qUdPlgbAsYiMstuG4o0+vvsxSWXFnXt2NtR
+zy6BWST1pMcAMakqT49lTUw5rLaJZlVdoI9ccjlpW6upThW84n9zE+YQo7FtupPG
+5lQmoLQ8NEMumi59ExESetV4it1RjFGv81invpDR6A==
-----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 6c632b3f154..613328e653d 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 fd0d21be0a9..41319c2be6b 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDzdPe/ClH3/uzl
-/syAqbCD6LtKmeKS3o7gEECl2j7Oue998J+TDyYaPmlevyxcDG/5wUYNEoeg9LHJ
-OKuVbbRS609nj73KBUoFyL1rNm7X3ejqGsaZvuF9sslYhQCe4sTt+ldv7dmJoLCT
-0qEJiTKzHknh4Y1ZtOz4GcCWd7i5nA+ioin2nRCDkWp54V+NM2d56iohPMrGs2L2
-x2K9oxdPAA8mRyvEF770lbFIsX2+ie5wENDDqLEm7j4VL8S/vH2GjV0g7/nyhAAw
-X1ivZq7pp2VOWW7L0YK809qQ8cUTWBdKgdY4DfPU3IKYgiEo04QuwFkM7D14On83
-rlyWOV1xAgMBAAECggEBAIny+jq+z0l1oqiEIz64aDOmWRHhdngAMfcWXntb2gDr
-bJ/xC4qZp95xBOXR74HM7loXwOjBWibC4EaDnP4T5nyhpyGoWkMxkgsK/wHUGySo
-MkUMnQIbHcxK1ToaSwq8theepZLftEb+zW9Fh0hO/HJwNC8QzjZJhYjjlrPr7LkG
-cQqnlSq3oJdEIEIB7wDFqLW79sQALKLCjlmsh1evu2pHa0jAUgPdXBgyPodzB9RL
-4g45GbTFAbqyVs3Cq7jAn1gbEdMpL/PRum/3XYFO1RjJoBi5eLGKQajG4zHF8KZK
-NfFzmO50/a5hogoLevxD1aSoLcl1nfYgdms7HLDkpZECgYEA/AiTO6Eh/+wnkV3C
-gyQNzauQQ/gpHCpu8pb63wVwIIzjXYT26D50WMqnon7XnjBvSoddpMXTMpFyEsO+
-6QBIhKW0+tnkzqft3fB9xx42PZmpNmTsWWbJ15M1MOSGJyesWWSzJ75FrubnxOLN
-8WBAFRCT0O9b5UNpNnoqQzldGU0CgYEA90nWkZxWFaNwKoKxCxAYdT0i4GB3/SbL
-1rJhUPygRxPTNZbkk+38k73VVOu+bWDXcb4IhifvqOZgQoIQ8vFFmqKwLhACt3EK
-xkgrNiMrVqSi8CtTm7SwEXH1jVCde8Rs9Wpe6QfuqqT7vD5egr6tfj1JaBiv6kQs
-hPWe5w8TYrUCgYB0M1/utjP+0trLYvczj4Ptt5QkQl5x5f6RSpsQCGnSGCMcExnj
-qifqaEUx3ll7TcmCCzdZqPve7MAzdpymwMKupdfzcFLWFQbOtPrIu102uYoS0iVG
-cuXMxspXaIWRt/D2pj8Tq95k7YEefZOGHmJtU99TDYjJA3OW8mxZ4jDSYQKBgAwq
-Pbv8DOATojj1JPB+YjWiREz1cfGqLuzo6ZCqXNgiSYmhWq1MT9iUxiHfVwbadL7L
-sm+nF0sfyix7aYoKBHqO9kvNzdRoYzdN5ZJMOJ2Si9F00DAgu2igSowhIx4rk5Cf
-Ivwjv8H1S8z+5HdaGf7T1QCh9kV4BRilXKPRQgrhAoGBAKrwPY8YnfG04LMFx2uX
-ehiTUHbElcQvxaqTWs4q52YbPjh7n21qcMKmXJN+IegATrHDTwkKRgcjSw2eTVPp
-X+Pfp98lHFc2+myp/Cz2QvLZuoKUk69BevaeeqR4qmFpgj36fcaypjtG89cJ2Vm/
-ilNQ3hNozD4BaA/mWeTVmeKl
+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==
-----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 1678f94d1e1..b90fbe86a36 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-----
-MIIEtjCCA56gAwIBAgIICudabutQ45YwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NloXDTI0MDIxMDEyNTQ1NlowgYoxFDASBgNVBAMMC2xvY2FsaG9zdFhY
-MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdK
-dXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3
-DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDzdPe/ClH3/uzl/syAqbCD6LtKmeKS3o7gEECl2j7Oue998J+TDyYaPmle
-vyxcDG/5wUYNEoeg9LHJOKuVbbRS609nj73KBUoFyL1rNm7X3ejqGsaZvuF9sslY
-hQCe4sTt+ldv7dmJoLCT0qEJiTKzHknh4Y1ZtOz4GcCWd7i5nA+ioin2nRCDkWp5
-4V+NM2d56iohPMrGs2L2x2K9oxdPAA8mRyvEF770lbFIsX2+ie5wENDDqLEm7j4V
-L8S/vH2GjV0g7/nyhAAwX1ivZq7pp2VOWW7L0YK809qQ8cUTWBdKgdY4DfPU3IKY
-giEo04QuwFkM7D14On83rlyWOV1xAgMBAAGjggEYMIIBFDAdBgNVHQ4EFgQUo78X
-gc+cCMpCQL6kBCabu2E4PCwwgcIGA1UdIwSBujCBt4AUkryWpyNL3lnpKDu0Qlq9
-9/adJX2hgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UE
-CwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQ
-MA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmlu
-Zm9AemVyb2MuY29tgghH2C1iWHG7KTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcE
-fwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAHAYie2SO
-haF8Xa5Tz5sCr6K4jY+CtcL1MXrjn8MFKmY5fHhuste9f4Ly/POcWc/3rxMPvibz
-ay43/StScqqyFXXQb8yGYrVrbrSkIZ5T7UrJ+vQrMWXVGBxGQ2mfCL9Ejc4qTZgo
-aBEq247LDjwiT7nH1Sq1L8b8GfXdjfL0pufrztf0oiyoph7B9EBomYeRkiykjCT/
-wQ8SDr3aaSMKrCa/XMMmpA4R5N65G1jHBoYs0uWFoxBfR5tF9AuDOBVZ/BfBITJo
-XN9X5x1cRxYI1VH5lGvxQurP7TiTTGj7bFKkdRSLSiu+ffAxKuAYmO1koK9LeyPh
-/pL2MdOKCevgeQ==
+MIIEzTCCA7WgAwIBAgIJAIxtPUYegeyjMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGKMRQwEgYDVQQDDAtsb2NhbGhvc3RY
+WDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
+SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
+9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA38Oe9/8U8tGhFqQHO64CULzbuHnAsFqzysIcPUFaI14nicEv4VYzhGtj
+Iy+DaEi/xxZnFJJRaXyttzu0PJljVM8P1C+iA13LxDmoT6pyyCw29E1321d+vJLU
+3tJHy+zLSQzgGLi1ZnKQCL+GXm7177ekQKXbQAGQQfIh3UxRpEYiZI76fGTQkkn2
+vgCsGt5dkBXonuw5DqobWNq7gVWMIRwhvVJZxbuxrChHFzdXhwuys7GxKLBFh0Ql
+hmvEwXu3zQ1URH8UOJQuU1bdlvpyEbCO47Cbo0qT4I5c5SKAd92g8vr0MjMXuZAZ
+iGL7wd0w7ElsMCKh8qosVoqk7F54KwIDAQABo4IBLjCCASowHQYDVR0OBBYEFG0a
+2ixvWm3m0DIkRAI/gpnfH+s5MIHDBgNVHSMEgbswgbiAFP8rF2HxgFwRsIcAU0C9
+9upSzrdYoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNV
+BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
+EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
+bmZvQHplcm9jLmNvbYIJANCpYBrCeVqJMAsGA1UdDwQEAwIF4DAhBgNVHRIEGjAY
+hwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0G
+CSqGSIb3DQEBCwUAA4IBAQAyj07Yvs7h74uyRkIzs6Q6R+0w0FCWIxbNsGZUnPrV
+z1ex9CsP6Dv4Ao4hvxRrlnI8Bxtqii+uKAeV9Kk/gFzWLrkp1lYKKSoZjPYcAlvA
+nk5hHmpWxMztDpJ4ITsjcvB43k4AuA8eNXBlZR77jH5L0zEgdcrR8deU/PvEf+ek
+PbwS4m4RWdVSIDVAXft8FZdXqZZp2+klgC+QftvtodkQtTMMwNDekCoWB4iLa8kY
+MBHVkA4KFgBG/FhcKWH7/IYGqwD5ND948TV9ldNJhf74iTUbwrkZkPPLHbNjgJr6
++bGIfEgoSNY83mPqDTju2ALk8tJj3QVMRJQml0z+6YbS
-----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 7d2de20e637..f6edecb6464 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 473ffb579a0..56842dfb480 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCiiUZlU6SV5yO1
-i76rHQO+/vob0pMN50+7MrhEhjzy6it6vuKN7xzjbhSN5No4HQ5hK0OYAO6il+8x
-jCW0W1wcqU8Xcq3Z5rpfslodf2u58OHnBvK/Ph4Jrj2cDqlX1v1rWsJVTHFqfeaV
-sIFi0Hp/7QYK43FU4UOiGTfvsF+HbDo6z/9EFcBgWL38WDGdhSKx0FNKneh/JoNT
-ejbI2xezyS8LYm45GPNpiyg718JRhLjKAo7g21P7zOobYySF7DRrlXJEH45uH7QO
-1uVXuuzcBBFIUV4Oe42RgOPsSDcIsU+HRS+me/B44EX29ef1x7Up4DjavLAoHVVg
-ZMRQrCZPAgMBAAECggEARR1SjevPZN7w1FYkMecYnLMX75TPa24c/WFH8fuTF0h0
-TLG27Nvs0NkSbHQQRyQz5SXcjFp5HzK0R8FslxDyTk3AkBv3yVzPi7nvj/OK/3pq
-1S6jMqdbZoptMFsbr3qAMJJbaKIk6D+5OZXgrwAv1w4XL7IfkxRnChrnKkk5lf/G
-ADshJTD01bfZr2xeqZhABi8eP15jpNCAqfKxozyYqunJkcSXv655rmgFsdSqFCj6
-J/KWOyP48aB4W8UXsSIZ+9cNvUEnbxkZOiKU3K5V93muLUnyZA0yIY++qRbaSfE6
-ACG0rGvGY5dCjILz1bv+qxwgmyDOfaRk2iNIkG6Z4QKBgQDSxgkmLj2tDFaLBp5s
-cyA5H8jYEMl3uDfeN8elo5yC+381BOheax2inEHwNqLARbZgZdzE+25Il7zXL0pc
-r17nysxneG041sPZ92WLEk7NN0zogwZwrIW5nqu+02rOO7GUXesV5MMzUw2OOs5m
-IkY3YSrdxXbnEBNkLtyn8Y17ZQKBgQDFaYXCtHOPbVHBuDI8mruKmZHblZNNJF9d
-LSg6JzVJETBAP5hJ5Th7o1g/GFRQtXb7YcoEaiCdZkElg0mn7Fye6xLPmOOQ26mG
-8gnaJjvHsmNBi8lCIlvr2BC0uWzUWFbRAxp8/AgCDL+EcQjSeXI9Fbx8o0cX7Oku
-BPWMXzNxowKBgQCIbHvxhY6QGmNNuywBgAbEUqlaCIuOfONUZwBHWv3r3cL5W0LY
-EjbtUHxxcbun/bdM78GUkjVQsT4efdKA6VXha+cftdfkKUY9J59HA8OTmo6iFGSv
-u0sW2PfLHOaNtB99q8iEtDwQVVp5y+BaRSbzo2Xug2gxqLsUZiyWW4e67QKBgD7a
-ZA4j6g8mXTtya/xDv6ZXUss5ClcrV3mRIRey2BJVeKlcFh6g7qTe0v/zvRSdUi6j
-afCR4aR7pA5PiKoAZVTrv2d9ZCcA6S7f7ScZuTrRnyyFVyTJT779YgRIbVAGeE2/
-0TUuAVa1vFxsqMRqimbMfuCoE8CYW32dcpiozvZFAoGAIb5eH6MhmJWu/nKbNkK1
-BkFREtiNkryghkegAKxPBcH7COilhXMh+y3etGE9vHvZhKscgwY+8dcyIdcMuMHk
-IgTGAsZo/MFf+EfB6LZKXNlpcSaQIuOjm72HgPHdkgz3lKz3CPP7lOomTRGE7h13
-P7uyQeza53foFON3LwkWtPQ=
+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==
-----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 a76f82355d3..975a9bc14e7 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_pub.pem
@@ -1,28 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
+ABCryWoM
-----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 f5a2e4a0be5..f61e10ce8ed 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 642d5708f33..314187d195b 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDSMnljdsvFhe5a
-VGoaWytce5e5Ir8KRFyvsFyy8jBO12zpnDBdA0T3bcnhhmsJ8mZ7/8Rul7gdIymg
-vBYg/q5QFY/7+PQPysCSkGO+nE0Pkz7aGdYQtUOwjJuDxy+JEggfMLCuiaz3eeQI
-kvfoYcBmlQKyo7brGzSvARsgG6G917eFs77iikCuy2qGYx8vV8VHwCW4msJUuJOU
-NXu3C5OZ2LSov+uqezolXOGt2i+wYm4QEm9ma/UScUZGBFU19WgaLf6Eh6XzIq7N
-RxCybkqOgeI+8cc+98xsO1f74kSj2R3V3BELnFviFsc7lrX2HiEulMrNp8Go9kmg
-SWmR7r+TAgMBAAECggEBAIhKjgb+OjZDFz+eyIV6Y+09fi1e6DxCA08vrYuiGcyl
-RktbKMjGm+tLVsFSpQj4EZeJSdbjrU/HQvCjxD10pZXrxUZ+L9IlhyQBV4t6UUUu
-FmzYn8KJpfBN23BgsOPRu05uBcHGJ073y/H7SZ918okRSYSHPs3HACwRLYNuJzut
-/JnlBm1YSDjr0QvWtGPrEl9OgLcwgUalod43jiB5MXpJ6+Lno55ExtqrFxw/qI9n
-6UIkrQjmupp4PS7iUQZImE3J3CWLjf0LCRKPirj0rPy5x97mk1E2P+LxMRZuks47
-Csb3ycejMjGBBTIoek6l2dgIV+BYd2N7iX5SsX9QZBECgYEA8OELmiJ163P6QKFj
-REqAjj9reF2d1NRJe+mLIUTzJNWykHsYGe6zQDitrYEcz3ReY9Jw3IyygtNan9AI
-pN/MdWzHnuu3k7lCjDAhgU83pkiYx0zzo/Md7+9+7lIpQcE/FgOS8lCkF2lekUvw
-WaClvshyWVkC2RpMUumvbW4yQdUCgYEA32Rd69d/eR2ifKjXawR1uglTVvGN0sVG
-bL5ty05mKNacfsewk1h5D+q4hNIzY35E4eazIjWMpueDVQdRfRPYiwUBZKYg4pHT
-R0rvMDkz+rC+BwAfjDrv6nsRF1wz+TSFqX3bR288yi86FH5kunCgkGPIrjOK670L
-yzTAOpBtx8cCgYB6bRb1fwBJ7EdL4/rM8cTHB4q6wXH/gunaVcfF4AJoPUilUDre
-q0hloqj7Hz0iX3W97G46WjQ8c+mCgjxyd+C16dTHe+xw417kW24cB8Qz+n/UA9Nt
-B5q2oRX1UMLxTaOfr69XAw9zarWKyXreQt0ay0v7B1eAOnKCTY1A5BodBQKBgFAe
-vjTE8Hou78UIBWLjkZmsmJBZSEVs7ao4zkYZkzhYaH5r/l+KXrkftRgmD7pCYlAn
-Ht5JGG4QIKFRY5+Zi5Oosuw3TRoVtRIfxROloIfr9euq1qXDyaJuix22uwlJFhtJ
-AWlocwQM1ibdgiEAHgZLU4FvCQctoVo7TCp0/HqnAoGAG6nHSQE7RT/mgqgGXbAk
-jhj0HMGd3PKgnLh+0EzSv+4pOolb5etvF8txijQqvguHDVGNwECJVvZKGi6//YQv
-RbPrgb85HeIZMPldTVQ6EyrBHEYkUy5f+td5B7FAx5WSCkRUeCrCeb9CXt4cE1Dg
-lotnzhpjyrJP9oTL3C+RLsU=
+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=
-----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 253e076a935..66fad67e682 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-----
-MIIEwjCCA6qgAwIBAgIIMteJm7NAxFAwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NloXDTI0MDIxMDEyNTQ1NlowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
-A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
-cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-0jJ5Y3bLxYXuWlRqGlsrXHuXuSK/CkRcr7BcsvIwTtds6ZwwXQNE923J4YZrCfJm
-e//Ebpe4HSMpoLwWIP6uUBWP+/j0D8rAkpBjvpxND5M+2hnWELVDsIybg8cviRII
-HzCwroms93nkCJL36GHAZpUCsqO26xs0rwEbIBuhvde3hbO+4opArstqhmMfL1fF
-R8AluJrCVLiTlDV7twuTmdi0qL/rqns6JVzhrdovsGJuEBJvZmv1EnFGRgRVNfVo
-Gi3+hIel8yKuzUcQsm5KjoHiPvHHPvfMbDtX++JEo9kd1dwRC5xb4hbHO5a19h4h
-LpTKzafBqPZJoElpke6/kwIDAQABo4IBKTCCASUwHQYDVR0OBBYEFNhjOgsOGsP2
-3VoA1K1fv1qoL5IwMIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMA8GA1UdEQQIMAaHBH8AAAEw
-IQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsF
-AAOCAQEAr4MVDuRBqV+5oJ7LIQZNfv+D1ajuC+pxeXqfsSakoCMEi3eg4aOmsSLn
-9ulb4ibkrNceagXzKAvBxbNIVgUrRO0jt+yRhqgWLda1v0+4F3P1ovky9ZsMyiSA
-Fkeb/nM2p1tuAIURtANXWbqoeZAq7vFjY6tjVFDcgSkZEnIFvTRKLrjeQyC6K1YM
-aucb0eLz4TEEFR3XOaRzEkXzA6PqXzi846DJrvsHRL/Pqj7splMkilFZd6ZkDLqm
-M/Nd78IPOfvRRflOGLWyF7HWr/sFeHz7uN6RVYEHudA9O2t5u1XLmH9MBVT1iBkb
-YZOU8DVTqrrEqF8pOTgRPdIVUvllAA==
+MIIE2TCCA8GgAwIBAgIJAIcNZIoR72fvMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
+BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
+ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
+Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANgLgjqTy5OUvnfsVXbwc6YcRlMKAkU1yISu22Ao3sAzQgwAnSKePs6xdGjaI4gt
+nStl2yJTipegvL/BVFZVQ8s/7Olb1qPQzIXd/An6x+4k6uv8EVxJBS79U0+G+Wna
+aKViwGJq5KTjp/Z30Vzp3Ueakt2JogW3bkNVS27Pm9ttFvpV8c6i2h5BrTys584u
+Sk/kGoD+HiN7t3BQTY/Eso/a1fQetFEhYR/28AStgqk0K0Bbt2I2Dt35+61QXYDI
+xf73qy6pE19AXSZ35LD+p0g9Ck+17uD02kNJQrLUo1QFnuejaZtyjavx7O/k5JO4
+APAp/bpcOxnk1WQBa5+BGbkCAwEAAaOCAT8wggE7MB0GA1UdDgQWBBQZzdUHlEkK
+zv6M0SgUff3S+StpADCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63
+WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
+Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
+VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
+ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwDwYDVR0RBAgwBocEfwAA
+ATAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAoNbB2tLdoozVdsCraQESWQsUx
+oXt3JXIY8ff9DP1qK0SUj8A7WWyztYZ+qNcl+9SC2l4stT3HmhT555PtsJ3VFmLc
+h9YqVRyQMxmcTOf4AWN3AJ83sS6CMwrUNK911h8C4NrvXf6kqARgmCmVIZg/Wi9Q
+IdnDYJJHsS3VBGYrdr5EYlwkP7xfxmSAKNuOGI0tWBlAUFTyTP9UGMhEzy6LnBOU
+Z6VXlAMkcgluEvLhC4oFJy3rhfBQ5hKBI69Okia6f0cOhcwOQGMBxIBCfhplpGNk
+jagGWwuhjX2Mw5qNVNiEhviE9LpWOCHc0bTmFofskg5rYItXF9PqXWO3h2ob
-----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 7f3f5afc462..6df04a5f9b5 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 6bba392037d..8263dfabdd2 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDRYCtVTm9CACx5
-2Li+mlG3V3ehbCte0/vPk4JPaapQyrgsNKcjtR7a2xMPwJTboGRkXMAnPsHuzNVw
-tV7YIqNQY+6nATscnlD8NkrarEQxhqVSMU5jxiN9seQCsk1IuzdyfD49TyZAGY52
-o18Z8GB9xUlvo6pXdfQ4VdGN9TpD9/PHHK21ZbOsJHdBwZxeteYMRW48eVzYwA/h
-Y30o2Mj69lmyr8s1PehWTO+LkNlqtkcIWzHGVMIRXJf5C/t54Y3s+LDyj1RBdmT7
-LFUt+2P8uiCopwDAIjYVep2aDchCOGK6AxRLApJbEhqVlEf6OuPjoSE4IJ9xx94/
-nn9JwamhAgMBAAECggEAC5tKK6tybXU3AfYqn55MY1586jzl1pbnwaUKtz5DS8FB
-Hmo4zbjvofA9CUWCuv4UMqAVotdOxt8iAeJ8BH0/EmjHxQhDb52zHZgg5Chii2BM
-b9b94ngMZZ5j5mZd9Gc0dqs+hAWMOEdyZ089KWHy52X1YTPwcHLAfBL9z+HFPhk6
-Af5Ur72vWgj3VCv+wu/gt4SX+vwhC+qckLloWN1vo01ssOHqabLPue64+U9i28fo
-AZV3d/G46E+VmiWgdN7DZ90MOeRHOctZJdTLqyixJ2kv9a4nsaTmJKZxiCiWGSfk
-rtDwEKl9tVjlmNufL9DaheM9TMaJeCYySiVnbNMi1QKBgQDv96Rs/dRyHDynJfSw
-lPei2AuKsei37ZWRKhPoPwBApZ1futX71e2se6FxCxUIY08AXmAMVfWddhVgJQhT
-rBm8gcRBCfJc5FoiDxqd/KrqaQYVxXEQD6WC5WwvdfB4tJat3xfbCgDYRus4JXt6
-USAuhdepSpo+91sqmZKQ0IPqSwKBgQDfXUrTR5Jyjh8aOm4UYXrsFMbaw0giIcz0
-KGjNnmSU9w+NXBR8mljxCceLvz4lyWkfhXJeoLKDhVQwltWZZNenPIZhv9lGs9AF
-rN2tVKmXYGFuZMm/8Q/YovGY3vrVzr35cDDaA2GIjZdZ0ruTJMSTfadrqnQb8A33
-M1nTZhsIQwKBgQCu3ln2Cusb1LPmYmRzobrr8mBGy+r4zaumw3EKV47JjWancjGp
-eXXfsaAuDpNfL29Mp3l6w9Fe08Qz8gilYM7IbhAkDSmOw+Fi3HrbEltCwxHqH52K
-xLwqLSGvXFTGwWLkhaSOvDVtZhDXM4lN03yOKn7EIVdR91N6Mbt6yFi5DQKBgQC3
-k65WvWEwg3wui01DtOZZN65Dx/H2E3+mP7v7Gq4h/HgsvzwbOKPW3ynAwloqpkGe
-5YedHEf7bk5GbQF6w/W1/jmYBxxlTo2uzGeY+Jc10cHiADYMaeyTKUCVWtYfeX6L
-jtinpdW4bF6zNU5y3eouKjy6cWpiN8bSn8K4yxd2jwKBgB2RU4WsW1BbVw5hPweb
-P4qA8yU27n52SUuMBzkWtDWBZIwFqn0Sq7ZXvnzh7dtG6Jk3G8BvJhg1Zf+nXNq4
-o2MogulLC+ct49hMY7IYvnQrgMis1J8zyKgiMajDp2HS4DJaha1lp1CU58CGv3jp
-s/HN/604vJAaAlrk946xVpK9
+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==
-----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 836d6ee70f8..c83e1b1a1c4 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-----
-MIIEwjCCA6qgAwIBAgIIS5+5WsFI8kkwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NloXDTI0MDIxMDEyNTQ1NlowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
-A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
-cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-0WArVU5vQgAsedi4vppRt1d3oWwrXtP7z5OCT2mqUMq4LDSnI7Ue2tsTD8CU26Bk
-ZFzAJz7B7szVcLVe2CKjUGPupwE7HJ5Q/DZK2qxEMYalUjFOY8YjfbHkArJNSLs3
-cnw+PU8mQBmOdqNfGfBgfcVJb6OqV3X0OFXRjfU6Q/fzxxyttWWzrCR3QcGcXrXm
-DEVuPHlc2MAP4WN9KNjI+vZZsq/LNT3oVkzvi5DZarZHCFsxxlTCEVyX+Qv7eeGN
-7Piw8o9UQXZk+yxVLftj/LogqKcAwCI2FXqdmg3IQjhiugMUSwKSWxIalZRH+jrj
-46EhOCCfccfeP55/ScGpoQIDAQABo4IBKTCCASUwHQYDVR0OBBYEFHtPO+92m2l1
-OjhoP1NmPJVn0Z/GMIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMA8GA1UdEQQIMAaHBH8AAAIw
-IQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsF
-AAOCAQEAkml43lIwS6KrYUM1dEiW8d1n0zcBFLrE0c5sB4HF9vqIljrcmOLXMecd
-vr9aa1NJbp8ntS0IwXfLayB6shgyGCzN3xYFqRNVjGCb4YU8AkNp3Ode/Y9IDext
-5RTOhU260NqyWjcm9x49zQZDWXUVghjVJL6pDezOJZevRFYobC15jC7vuZbTzIwK
-dfCGgCjPNiXBwLUGgSd1Q2/YLraQO768WljVAlsfHyhxFjTv8JO2J9l88iEs8vVe
-t3/1eXYGkJ9xTE0zzgY2pqJzpKOk4xJV2m8jyq13nBWnS32jUxyZsshT+RsxTJ/l
-feoclWB2CxVVxzwUuklO3qFIqJCe5A==
+MIIE2TCCA8GgAwIBAgIJAOShURND+1F7MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MzBaFw0yMjA3MTkxNjE3MzBaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
+BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
+ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
+Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AMnX4fgTN/dwpHOqRhPxQKnV4utCcR7ezvwAvoDGOPIfLPuSwZijYzsM1bX2pbq3
+rMsVr60H7YrwLbdApYhsBvoPO134iVaJR747S8IlEk5tljmKAiKN1ZMu1s/65As0
+bORoUJZ+6/ravsvSLHHjWcae6zgewQEqy/nkIZsQxSTfpQFr9G1lcI5Z5OmU0Z4w
+Mc6lKi7GdRge0VEFL5grOcNOGWkHJKoW+sSs29XBFksxhH41oqXOhE+rSveP36TY
+PwIPlNDBflXILFSl5TO0+95LCE8QyWe5KqeOfNaT9PrFzoT9t2sZ7mOl69N71gHC
+yxWsre+dJUULJQn1tfI1VYMCAwEAAaOCAT8wggE7MB0GA1UdDgQWBBQzAmfT7wwy
+YqPG43MC88PFznoI8jCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63
+WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
+Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
+VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
+ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwDwYDVR0RBAgwBocEfwAA
+AjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQDiDzyPOb2wD5oWMIqmrJl7VTej
+1pfUUckQwViEunSiwmtiHbZJ2EyukhbTzPPijwK0BOxAQVRP04xeV5PYZDs6YdTh
+xr2aNMvHE755dHT8GE1EF9V3Aw9EZWwpWXBPSmq18UZtZxGpjTzPVKWG2n5lu8HF
+bl/znVh/bEO1/aBIiIGHHmN8s7hY0+Lp2zyKfBQMdO7NCmNM/wb8YqU8DQYGUIG3
+ixrEKztSzDDUbOt+xqgaEtc64++Zqt5kbi24K8AzSE/A181EzFnWilq3YjFZeFvF
+x8Dt4UPxHen2g4bIMjXShD4sUW2D1T4TICHNgC7JIjdBon8pL3jbZ6A+qbeh
-----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 22c93ae74d2..c83861a003d 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 273a7fb9c71..b0f73f36288 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCgS/2ChYNEt2MA
-TP/1SejpgiWEJewGNXHGlUy7FBFLAHom13m+UmMXEi+UFIVDQmmrGlUqhvMIRC3X
-7ubUf3r/tRwFltflPru/iESRtQ/1R8Mo5sT9z2CEHf4vQDbSUWvGNIboY1tKJYBc
-PNBP6XeZIVweyhrUa8pnsFkh+qFjLqsMvJ0t1YqBtw/X9TtXsRf5kL1HOX53Ydwz
-hFGKyg8hNaLblcSrcpHLuH0tjwpcZhmCoHixzNzkj3z3ZvfIgPpjabsgFW9lWZr8
-pALAVOyxZR4WtqZExwLVahgT3IELrjgBR3DnqKMmZtcgoQa5gdiL8cU6QgENnw5z
-wovCEStBAgMBAAECggEAMcspNtBOlJv67u78W6/X4CGDkedNyCf17eAW884qCQhe
-6Y3pzYs+KL6HdRJiyx/oPzRw3EMLX7f+HaOipMPs613RFJNlAVtZawfjdPevu1vN
-bfkxnD49Fw1SFk92OCL+vZU3ixzCEOhRVVW2x/wYIMNSIGZbqzzIpSkMpxd55prs
-oLKqRVXgQuWBmdIQXcI2L30UEo2O3JICMLhu6qpdodWN67GumLRXbuegy0/KDhmg
-r6kTGz1BBH7ljzXe3md0UuJnhVECKPbMFrdePxpr5CE52hfOmYJ9j1jVTYO7gcsV
-1Yz+2r8MshFcnuOaU3+o+VlDZNHBQ6CR1oJ6GJBGIQKBgQDT1LPYFx5rMkjqfJVl
-IabVl+XBZOnHxOsL/opXX5x2NuKDSDukmagmR/fb6c/cpF+bOw0yUt2ygaTkWFqN
-vxcxC1rRRy1nKlP/EZ/UqhekvIuGYG/mxd4jVlwy7kLN7n4wgGhEAbbMXfaOMx8r
-IaAE4nbMXXUlQU/CWfiPE05IVQKBgQDBuHVHdyNL93WIobj9kqJqmY9f/CUXkpae
-Rn+AjjO0eh3PDiniX0P3oj7vpRG6bvgZAp4UZOpVZU6EBbErb3eVqCa5qet7+GnE
-faWHdqFW9sW/6PUgzxlF4h1NxAf+cZU8oxCqRffIB/dhi9kDA6yndgvGgvNcpfvI
-DPVpxP0zPQKBgQCYdhHO6KzTGIkUhAB+nl7WgpIxxHDigF9v7Y8iXcVd7BjRxm5v
-BMzaaJgDZuBdfMz3C+RuoOfBr7+/PbxHIw8NFJAT6jfKddOo1MWFqbqErdN6LvS7
-UxSTuHd5jLT2RL38KJ9iux0XMFXhePfo8jWa7mf0pRtIah5+0oSsbYe9VQKBgCMK
-CDyK8hl1gw7ZoapL8ZCygdpssxDWdOPgAIPyNKv6QpYHC9BkRtjtwdB63QAJvlpX
-vNwXfMNBdbgvh2JB4TFynr6KW4uq3Qara1tbO8eNDyutKVlr3Dhls8MzJ/b/+Gxl
-WkhSK4VE25wLPY9sBLitg2e+m+IwK6B9p44gEWRJAoGAS8t3NA1A19q3lMXvHrCA
-1zg1juvsXVfyRn5I6SLEQcvrZn0ilRBdER5wxDoKbwD6vbwzYBfiQD133aionfWf
-OlYdNbDsatlOLwlw0eTqJcOltanRjTORhZk6+uK7Gmg53U8MUu5WmAWdXDN+Hftu
-d7U7GIJEobQkaK39Ri9u23E=
+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==
-----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 93afbca357f..e2446c7b513 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-----
-MIIEtTCCA52gAwIBAgIJANeca+IcGRYyMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0xOTAy
-MTExMjU0NTZaFw0yNDAyMTAxMjU0NTZaMIGIMRIwEAYDVQQDDAkxMjcuMC4wLjEx
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAKBL/YKFg0S3YwBM//VJ6OmCJYQl7AY1ccaVTLsUEUsAeibXeb5SYxcSL5QU
-hUNCaasaVSqG8whELdfu5tR/ev+1HAWW1+U+u7+IRJG1D/VHwyjmxP3PYIQd/i9A
-NtJRa8Y0huhjW0olgFw80E/pd5khXB7KGtRrymewWSH6oWMuqwy8nS3VioG3D9f1
-O1exF/mQvUc5fndh3DOEUYrKDyE1otuVxKtykcu4fS2PClxmGYKgeLHM3OSPfPdm
-98iA+mNpuyAVb2VZmvykAsBU7LFlHha2pkTHAtVqGBPcgQuuOAFHcOeooyZm1yCh
-BrmB2IvxxTpCAQ2fDnPCi8IRK0ECAwEAAaOCARgwggEUMB0GA1UdDgQWBBTARSjw
-11XRyO20azXNFGHWRfe1GDCBwgYDVR0jBIG6MIG3gBSSvJanI0veWekoO7RCWr33
-9p0lfaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
-b0B6ZXJvYy5jb22CCEfYLWJYcbspMAsGA1UdDwQEAwIF4DAhBgNVHRIEGjAYhwR/
-AAABgRBpc3N1ZXJAemVyb2MuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAbQo4Yxsqp
-l38TzjkrJjNqFEp+g9hnGC/wWedqLEpfleWF3l7poPAYwDaF+TWaO+/gS2Kxl9XY
-4AFy46NgPFsJFMoDiNKIGGCI5fvJRm66Dxg7+fq35heogYy7QH70WhzCIKekYVMZ
-vcYZH0JhwlXNwsHWnQBKGs+0t1e6ab3CZaTb9JmTdjMHu2s7rr6+vLMiWahIDf3e
-Ea2uchlwnEYa1qGmMYngMw47cDbEbUUjGw9jkJxbxIFMujQe1d+jXlvdkhRujh6s
-yYx8TPJg0DHGdXzX6zVrV64CWQx6nX0CNLei2UnuIqH66gUvcUBi5qcxOglQWfkK
-iZTFYZYdLvRn
+MIIEyjCCA7KgAwIBAgIIJwm1PF8sj8gwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIwMDQx
+NTE2MTczMFoXDTIyMDcxOTE2MTczMFowgYgxEjAQBgNVBAMMCTEyNy4wLjAuMTEM
+MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
+aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
+CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA9R2oBOyC3GnHp/VWutn+nReHQ+Rfo2BeHH9btGjSG29ED26hV/c3UKCucLE8
+lReCEsl/TOb4fmSxYhB2ZRCbxwkjiiXsCCT6t8K/ynqbW89rrLyh3gv7EJw7qtAW
+RjAnjIORYfKI/L3MbpxFKyoUmdditULkn8fLC7j4xi81YXoW+WMTFCLo4gdLKzkE
+gxTEL+YrkS8jd4sJaMb7em+T86S94+2WvvP99lwVDV7pzyi10bU5iIWB7eOc9kq3
+OLU2ZlYq+EMGKip3imSDOGXDpYX2i564D18o+DWC6ST5eq00ZyFIOrbVYLHi//zb
+opt2Dk9PRStVn/y3HsyslXvDaQIDAQABo4IBLjCCASowHQYDVR0OBBYEFPCLDuPA
+280BchZZp71Pkq3F1OSSMIHDBgNVHSMEgbswgbiAFP8rF2HxgFwRsIcAU0C99upS
+zrdYoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
+A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
+BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
+QHplcm9jLmNvbYIJANCpYBrCeVqJMAsGA1UdDwQEAwIF4DAhBgNVHRIEGjAYhwR/
+AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqG
+SIb3DQEBCwUAA4IBAQDfNYwu6eHH1fvW/tVM2U6/1oPPeLSs/fKauALjym2bJoS7
+I+AzW+Y+sgbFslxgOiZ8XPK7amcU9r68/gYW3Nm8rGXvQ8ywRp6ru4/xJVDqJzcs
+g334ni5py1Pw2dP1dZpRXt2AGNoBwjaVsA3B2KclrkkIafa0is/pUp9NL0FdsrYL
+EGqlC2puCbdL8nzVUd5crDNDzeQnrWMwIFDEuydr/Og8GVETPhzK9RgLQROO10Iy
++uqAJaVXy0T8G7fAMQPgpA9TtKsxkC6CBk1yDBpE9Qzfp8oiH1Hlil7V7a5u/Ofu
+J6rVwHRPbe+q4qGwIpP5222aLd1VegrHplazJ4G7
-----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 d992833349e..068b222f9b5 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 c47fd5a097c..262e04e695f 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-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDCNWHSaY7Zwu/i
-NToXfCyDyvQH0PyJz8v1C9qWm/4psnPcXA/Ctib9Sq+bowBiCFma38whpeQvTguI
-c41DLfWNIWpXhXIfv7wKlWwioIGTHfPCZ46yfMxD2uRb2KXz0hozF8T7h3pC2G/t
-y5cZitM/8nSs70B+MnPFA877mwcGnqM6gj2b7BtRLnKdLJGE7FFFYE16DMdMm9Ex
-Ej84q6aDDKXa1P7SdoRTuN3QmAKDVOREqxHNvTfv1tqrfpFv+9PI/qGjJwqzmvcN
-E/1trNMRF1DU6JqvWxLwlEUP5mZ46u40IsncI0Cfvx3rvPW5Uypd6zdZR5jeoMat
-jukUrd7BAgMBAAECggEBAJ3EsAs3JY1SB35Er0SU47TNEyGmbQGnhZE0aAciAn/t
-MKI7R7JuN45dNfvBl3YMQn7GgBZ1pcGoLUZUWNXSaECWfMVM60FPiXsvmAEpUxoo
-ovWzGwF00JvvHsReY7KHZDFNhgCwNmpHWeZcFgvx81tno9E5K7NZWSMbzPIpJrQA
-jpDGFb2JKuQB5t/aV+kMusDNTD3Mr5gwbZGz6DBcQJ9uN7NKrPX8YJ491Sdkh4lS
-IsoGJ/DzzBkJAubRDCJ826ilkZ+5L1DHroC/18bxkXohqMmHKQpPyEf2kFzJovrH
-bu0UyktzGjJsvrMavDCVJO/iHvqeMQqBHMtOZ7peU+ECgYEA/JVzfYIP1obHxVMa
-xxNrt4RoXwjVkygqIhYz2F1Bh+95nd6DrNulz9NcmR+e9TQoe7cV0DQcQM0Tgpn5
-18QOb0AloJhQmajjtuewQNMk922DQPLMdSVDqPtG6F7R5jAJ/g2T7FxH8xQ3Ck6o
-d8qozU5LQ1vwb5Qzd+8R8iIZUP8CgYEAxNXP0zOtYAAnxNyCO136I5gT1Z2t7SWP
-PNjGWcH3XeA+yr0HCd+JPVErIRV62Ird4HliFdQenSMzOfzhiGDB5SSOtnecF112
-vowupjizq5NUgAAJq4OWJrfzzwAe7Uei1/iv6WJ66kXVd6r1uLHD6vFbBm5e/bQz
-pgFUNpGdED8CgYAiwYXkzVLUmDNBCdBzeE6oMAYUnaiV2T8C9b8olJyB0ggQGyBP
-VuIYGONzBpDe+NBhRa4wuhrxJ8b5f6qLcCT0VgVXdd4RZtX+wx7TrLo3edBHzaEo
-tXn79KerLfEAFbgqR0AFlCUqY6u3NV+lLDPSHGXq3OnW0LPMWw9DHEITjQKBgQCA
-JmREMSTzl6ZMuPPhCvJMMjrXnO0btJRpHQkmbu5KJDE9dYwblXmYfjwCMiXkzaRe
-/Sgq5gt4au5zFn0PeU9DjGWNzpnFbIhezo2gktIHJsig/WVOUUF0u9b0MjPwb+9J
-hROicwdrd0PfwWJxeOsBD1of+cPGkYf+0GavkGYdqQKBgQCc8IyEYhfWXmrxUikA
-TwjGTfWsf7fOVoP9NqV3/FG391QSPW+cLduI04vOdlDJmdQPyqjjWc8Q0lTba+oC
-BWe/fgmZruRbQ4KcKlLUx1vOeeKOyzTBvfPSgOdex/4lcw0ycHz7qoTN2Q7XSsJO
-RWItyNU7nrh+V09fKNiC/1DmZg==
+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
-----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 730c69480ed..941a58fb5ba 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-----
-MIIEsTCCA5mgAwIBAgIILu2xOMQ1AOMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MDEyNTQ1NloXDTE5MDIxMTEyNTQ1NlowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
-A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
-cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wjVh0mmO2cLv4jU6F3wsg8r0B9D8ic/L9Qvalpv+KbJz3FwPwrYm/Uqvm6MAYghZ
-mt/MIaXkL04LiHONQy31jSFqV4VyH7+8CpVsIqCBkx3zwmeOsnzMQ9rkW9il89Ia
-MxfE+4d6Qthv7cuXGYrTP/J0rO9AfjJzxQPO+5sHBp6jOoI9m+wbUS5ynSyRhOxR
-RWBNegzHTJvRMRI/OKumgwyl2tT+0naEU7jd0JgCg1TkRKsRzb0379baq36Rb/vT
-yP6hoycKs5r3DRP9bazTERdQ1Oiar1sS8JRFD+ZmeOruNCLJ3CNAn78d67z1uVMq
-Xes3WUeY3qDGrY7pFK3ewQIDAQABo4IBGDCCARQwHQYDVR0OBBYEFFLNk0b66Rnx
-8vtJgF6a5+9/nwY8MIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIR9gtYlhxuykwCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiHBH8AAAGB
-EGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBABw7dWrhymCgUKIS
-HdSkZlu4niovnMd7nG6I8RtwWfLeEv3g5oPhl4mkNWTqoMafnHzJieZy0fG7wli/
-qwalJK8TnK9Cc/8VLZXhZx/f91HFQrtxqYM8JdE2yfu+UglzX4VlBZi4EJjehqAR
-L5wj6XWxzpIrffAAOPoo3ScmxoG/CAlyoDUL1qSvyeTHY5ie9apj8CjoPRrAKRpw
-y7Lx0WMaUR1k6TRT8YWb++5T7HK98H63eQdG8DCiSpH8g/NarLI0K4dtvUlAycS+
-dfSEdpaRG3g3CnsvZOHbSFbzptduxNMIB5CeyzYMQhM48cFUqefOd8sDPzGIr/Qv
-fu2onRc=
+MIIEyDCCA7CgAwIBAgIJAPYHKXnkaizoMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTQxNjE3MjlaFw0yMDA0MTUxNjE3MjlaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
+BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
+ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
+Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AMljvNP4DcbFnkcOJp/syupKybr/5C09OfxXjCS4IctGr/b5ZUJomn6PS1wOxcct
+7w0WDFwsUQNydBhtoYwHgVUH0o61GYoEiB8UQCinZkRyYqKDmV5AqpNfplw2QQPW
+fMnY1K/3lr0zXY4ZOuxoQ1X2oBt5H9bGONUG/cFi6thWOFr+lL2vLXQiOw6MUoij
+taNHLTzagHsrqk95DAWHeT6XC3p3rNsLga52Us+qLBDX325tv2yFP3RvbAWV0zaX
+RZHJximKcsme+HWdBNjkeHOzZfiANSXsG4u7mwx+VeLNHAGOvYk0IgCemXeF47z1
+PXIMkRB0YySv2EZQccBvoNMCAwEAAaOCAS4wggEqMB0GA1UdDgQWBBSox0vShZuL
+04jUCIRtXBUJzziz9TCBwwYDVR0jBIG7MIG4gBT/Kxdh8YBcEbCHAFNAvfbqUs63
+WKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
+Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
+VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
+ZXJvYy5jb22CCQDQqWAawnlaiTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcEfwAA
+AYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG
+9w0BAQsFAAOCAQEApzceaQ88XiwSVoxn80e3CdYiZONWJ9TONX3JRV5Jmka+KTMp
+PIm15/c1RCRlcaDDNpqGWNia+PEHWn/zfDoFUVPRUun7x/qZGbISLFfevEb1H4yB
+q3M60ULxhJlyGYMKUW/jhrgOI+V/41HnqeQA8ohwgas8JLE34HjtyNJfeThXZY0D
+FlAxkRzkXVBdsV99lrM4fA3gFc8HHuPJlPWYBrfKdQYWa1TB9NxV1X5Idb0UmR1D
+3uBEMDyo5nyX0lH7wi+7/0W0sMdX7yrrY129t/7Z0Ne9Dm4ueHJr4IyV+ES4GYDn
+QDpZwX+kHXqXUt5fZa6UQNJkvhV4HYRfmGBnNA==
-----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 3df12fc9f20..406c9f08998 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQChEsUs8NND7e0c
-88mUVJN7LHyU8oJwSpaDI48DSkkWwnILmJWJcvNSqGHECGJ5SNNP4TbbfOJjaX54
-Zn4H0jxzLk6HddH8Fb81Bpg2gJ9c2GkNSZ1GAOB5q1BA3H1qvnAPzl8byEE4lIhE
-02TEPlTs+2VcMGH7tTEUVjlBwCH9hGBustB2snJXgDqhfJmm0MawuiX4hGcVR14X
-zNvBZe2m68JPuRFSZxI2F9hiBJlcIKmjJvSxl5J54K18VoydlJYtEL/HUSu2I4zT
-ZQCQ6guG2HK687ygbCG/4RJaVwSErkbq36UPDC+Ge7ZytqC54c42g9oHDG0/AfNK
-2WgAXhCjAgMBAAECggEBAI8H7/ecUr47hRb0lMgW4m+6bVaGkrXMRiNlbBVr3cNM
-H6GUeRV48gEwbMB7AZbZyGtifighmZbVkuyvdrLTScKuGCXJxhGn7gbUOE4NoXX8
-5ixadkI3fR4NtlIieWxUd4ZRp7sv9Fqd6vPTE+P/xcI66yMWA6xUlaSNfIKabpSD
-k8eJBVbTHuBJv/CwSKtXdLN1hS/Pd//uikCg+u4jmepDTaeo//wSUyGhDc+9XRtH
-yATLPP/izI/vMtfBWyUr6Yq5LaI0ckhjme1hquuRrdmX6ltQ9rK6Xnmrnpogi1u7
-XahU4muav1W+H1N4UhuFAkLv8oqhsCrtxwd8Gn+IOsECgYEAzJj63ZYz2zts2y0I
-PBMYbRkRyeyKrc32qR15BRDW2gneyIEUgDwhDzlJF+ngwOyl8H25O43Zw3PSTLnD
-iDxOzhspPM1hHij6bMyVv4KIizHpn1uueT6oxRKaiTZv2FaO/4/Aqm8E08I/MkQR
-iw/9IputQXKjLyax2yw7kEwbjdsCgYEAyYp1Stasj3VIfkoZxt8U/b9hBhF65Qqv
-1lxNxSIOxLlE0zBtmWwzZh85WV9eb3lmQzMajtfnobhjxnxHTr70z8zqzOqMxpoR
-TtOtoJzwTUWv8FaLy6l6gq70m987D/kYJXfKdGci/QdyEq7QRnCNfkvOY9ECfSfA
-20SgiyoWFtkCgYAj35Lk9WgkQXglufCer+5xeprO3+W08c8U+fD1PW2ej2p7l35j
-uadGRxIU2lIpIZU65KBs28NZ7N3rzAqHwaNDqimB2rTzl9XI69o52QZd+aNv6KBf
-6+elnkxwUJYtxYePMcJjX9Hl20I/awX0bxpATjGDrzkDlHJM7qWG+IFATwKBgQCD
-4LoHkpmv9crN+KcNXwRZVlWipuWH4opU9mldSX/ocmL63oGZFxg7Bst8E8+zmfi0
-mEgUmGrVg9amFsSCXqnLIAe0tvYPLtmMfy7qHkeQCL2rwrYPOoMT6G/fXx9CwHhw
-bAZqTOK0N58JYqKetR+hOPGAl0/Nnamw0SNMbOmvYQKBgA2cGulJInV4y64VqhZu
-OXAeT+rQ4347LKexhvjZjTFOE0vQ2VB0yhOV1rIGGuHorJcBMZp+ev+Wa7RbBtox
-+0MDCSuCI5aH2bhhnUQAVhWOfB7eudLv7XcJuUqVMUC5Ih/rLAPYXz2I/MCip5ok
-W2obEqnsa/tJUzeGnyO73Du1
+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=
-----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 ae69e6780a8..ee6a9a654b7 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_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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
-BMIsd1bHGYMyWPT6g/NhPEOGRms/+yo=
+ggkA0KlgGsJ5WokwCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBnNlcnZl
+cjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBpyDNOvyA0QxDwxYOINcRB5BZL
+LNZiNSaYxVbH5tcXk97f9MdxJgUSc5aCxT05RDX2J5s1g+iSAztuFozp8QO8zOat
+MZLPfTpC1UbJ9dyXJm6x0jFq6ccKANQ6NsCCw0JjR8aDCW9ATzm5KSu3MIKGcend
+d78xv8IxoRREPt0s9HgzCdPZ8zDFQDZsHsuaanWakPpWEA+ibOWVbhcyc/LecBMQ
+EPNr1DNcbuuztqn6NJksDp8SKy4jDaxRmMhELXyn11rC+HUFxxxcQSKGIAH0mzuo
+NgMXh09lyLyqFRwwDBMcs3lDVcUMCqtfkbTKeP5EYTwgDjc4fzW/aqAYW6ST
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca2.p12 b/cpp/test/IceSSL/certs/s_rsa_ca2.p12
index d450561a0ac..51b6747e4c3 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 5997733da75..5cbab3744d0 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDj3HVS17LPyrZZ
-2K/HaoaRBGbA183ErYAAm3zfdJDtGbH3uQ87LdmaEEfF6xA4QaUsMkkL4WVfM89+
-dbR0FAfqztV85Vc01K0PEqiCbrAb5AtbFEvUPua8GdYKuMLgR1rz/bGObELMw+X7
-fNg/wkWtAb7cndxtKwk55McsARrOR6QHZ75tB88ze9MZoYwstux+3xY5h94d2jkl
-qc8TGJMlEzGUyNVs1WqC5DbBBcwHxAvLskV2ZBd1aBosmW6LwW5IiOK8RJP//Wv8
-sEhuhxuF3XeGHj/WFTjO++ow6ijgOmV6XK5tLQISH/3B9F0kaT1NsXgCkenU66lf
-LWNzgXInAgMBAAECggEBAI+/6CBQRdWDXFEIO7TBxo08SprESmMW1dcMQNY0Eq4R
-9M2EaVB7V3kzZiQ9bGkhONPOEXk2RB6wb+mm1iYY8Pm4bMSzZrXEqj0FF1vZ+q5N
-ysA16LTIzgXDAt6WuxKE0aN13Asuz2GhALkMhNyMcip4HHHQAVy5tsNYSjK/q6qQ
-JKO0WrzEZskg+Wtoj8ZksusA7gSNXYYE+4LJCef99PQxjFw3GdmzuMn4FDowLJaZ
-qGpcw74le8vBUBs9l+iNr41KVVvMOax2k1mDdjnUi7RSukJBw/qkISXaUeDJgErD
-NvG8hM6jVADXaUBpq7C/zcDyHjJKJKt4/rQ2HCH5K/ECgYEA/MxxKP4yuK1uLIIs
-8lXdX+oXpPP0wfRLQA/ZHCotfYciPBgXUQFnkZTWbYUQHyILMydPHmaX8s6mFaBU
-yvhJHCziiuH4SVVROtaQeGqvsIJPV+9l1xTtvhv1oHgcXHgNU6FuPWcb20PtC3WK
-FNwpFKPLeEAySXFIaA3UiTC2/G8CgYEA5r8rq2NoW0Ysi2BUegttebw0BZGQcnLq
-cobE0yzUsGR41zxDz38XOJbE062Z+33EMht6swi7Lya19P2d+S1CHfeNYt38Fhs+
-hI1LEFu/dWklxotoZB7ao+49c9AmnPhMqX9NXu4nRvCashpeCMn1p+52BpFWrGXB
-5B4UgvS8MckCgYAiMgFomyH/Sy5pBN7RlP3R+JdkL7++8K2xJ7OllKr8nOfrmxKk
-WX1J+wkaXXJ106QSMlIIebY6GOvsZvixT+6LyiKGyNRODyViwR1fvIaxaJ8U9QQg
-mOsj2SJbp4OmmnKrCl4gHi9tdH2/HBImijVgXluqk3x55MH3mU9Tk2xdLwKBgGYl
-sttIQmZFhmqc1kjAzlHZst3UNrGzlX3lkzQ44F7F24jMsOgmRs1SUQe0Djp6zmOw
-Ln0bHGIfLOWrcEdidaZ2dCyUQIg4v1BGjDhNpVAAoCxogmnwDrILQUEHoFBUyvst
-0752hwSsdo7phT82yHzy32TA6jGfSloFxubCGJ2hAoGAZpqKeB4rI8n0qJ6omuVe
-ThgCzVuA11TUrtvAh0iWyHBqNxFbxFkEqKiG5RWb0R1yEYJR3l9/n/0KYJ0iWSPt
-E1M4u0mNPFMcnhE9vDVX3kpJLOgJdO2Z/TakbVjY4a0GhEyeeAMolXUTI0XTyP7O
-7rZm8Tu4JtJI/lktZkQGSSY=
+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
-----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 a080dd22ac8..a16fe079d78 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca2_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca2_pub.pem
@@ -1,28 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-AOPcdVLXss/KtlnYr8dqhpEEZsDXzcStgACbfN90kO0Zsfe5Dzst2ZoQR8XrEDhB
-pSwySQvhZV8zz351tHQUB+rO1XzlVzTUrQ8SqIJusBvkC1sUS9Q+5rwZ1gq4wuBH
-WvP9sY5sQszD5ft82D/CRa0Bvtyd3G0rCTnkxywBGs5HpAdnvm0HzzN70xmhjCy2
-7H7fFjmH3h3aOSWpzxMYkyUTMZTI1WzVaoLkNsEFzAfEC8uyRXZkF3VoGiyZbovB
-bkiI4rxEk//9a/ywSG6HG4Xdd4YeP9YVOM776jDqKOA6ZXpcrm0tAhIf/cH0XSRp
-PU2xeAKR6dTrqV8tY3OBcicCAwEAAaOCATEwggEtMB0GA1UdDgQWBBSeFZbzOPJz
-4c/VlWVShOoFn5XTmzCBwgYDVR0jBIG6MIG3gBTu5bRnL053Kz/sxZ4TnSA+vZqx
-BaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAyMQwwCgYDVQQLDANJ
+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
-ZXJvYy5jb22CCDOZRIjfzvfFMAsGA1UdDwQEAwIF4DAXBgNVHREEEDAOhwR/AAAB
-ggZzZXJ2ZXIwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkq
-hkiG9w0BAQsFAAOCAQEAX87mYVxpzmDbqPiGSNgPwaJnytEsn1lFuaR05Gn+QJju
-P63fCEWoIS3xqc0q6DICSMXzQaYpaBbHeYYWYfeFQ2HW8+E6YFOR/9LnrssPnRh/
-IX5CtSFr7zrwb5bduHpNXXEz7/ozycdMzLxCvo8ea5+jikE+4gWHh6T8gvU1/Fay
-HvAU+s2L12/jy1lH5MEuX4Rz/LxOsU2YmxFKNtzXATteChBlBmNHt9LYq/sAoJel
-Ds7W/KZDgTjgelWNFbJi9nr/BAf8NgzQK3/0mWVMtWMVZW5IbH7hjahpSjJBKtpf
-v0gfVqzrRzBYEbJ8pEz0QcA6IFt3rYwpdLrWO5T5Uw==
+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
+s7BIMkk=
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai1.p12 b/cpp/test/IceSSL/certs/s_rsa_cai1.p12
index 50e5b09cb5a..e852be2a652 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 8b206b66ea2..2d87bb0a7d7 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDjYCHvawd0zTRZ
-/xRDyv3jiLnTadzhrm+YZxto67rm/6UBRgZfk2ls4jSkcZyYxEFNC+PZ07m7woL3
-4RN5/MoDYnKMzA48IWQ0+mI5VoJP8x2Mcq8SfEk0501fL7XqQ22AjpVQXI4vU6eg
-jJBa908wM4jwOAGDuFHkf1+zqnjiaTFqiNL+gzZskbBGwUAuSzuyjfEAQpRjgO61
-78kj7zGwJHkms5eXYloLp3VhOx+kn2kJ9QdRYM8sebICXUS0Uwv5y7ZfRsmoL317
-iutUqeFdWrNoKIZLdW/I0PXP5LpazzRCwFgHZ1gTtfXh84LI2f1TImqN1EUulGgs
-lTap+iQZAgMBAAECggEAdfwRP+IC2XoN21FAW7k+q03sVybMphLU93kxQO1pa6pm
-HdYPQpMElqp+dII7pw3XcLplvkdeTm6tdSDG8XrZ/I2eMS9Fh7AwBkmSpHweXIwj
-3hg4flgdyKTpgiYIuInKjXXvRubwJOC8z9OAqKNB5RooybXWG1qOrAnoSBuCZMEE
-rce7YQ2K3JmdgPy36pldX+en+b/dIXQSfu3scdAXE3EA9IixUyoGsQjZJaos3TKe
-af4t9G2vCIsFnWitniV9hKDhcB3GZhEiUL18xLYIBL33MfHY51f3Fv1I1vtkLDSd
-H1Hatc8tfBloSMgUC9gG3tiF4x6vkiUkONOiHLjQ/QKBgQDzEy+tVySZje/o6s5/
-y53hJP7jxJjknG9EetegJJt0Awiixk1Wnfy8ynFuYq7za0hON8CY9jfrvWapgb0y
-g31Kb0dEQq/qjtv0E386vPbf7LO1oOvgRwvXvHNl1PTwAQivQlMy3MEzGy9efKUn
-eMbxebfejj5hVlqdorbxrLMcEwKBgQDvdz2d0ppJaiowuspEc640Xp9R/zznA8HR
-O5DC3m0kCTvu5+N3Pl9BGxA0utEjmCCg6Qo1K30N0GTlxAFFRrHw4/PwvtIYyT+Z
-n1TunPZ1Edi2nEwzw/PPS630KLRPxw0wSofiSLlBZNhPm84ZKJUq4zrFAIWtZZnl
-iKCSU/QsowKBgFL0c0r2+HinJf8ZU0vt032owIw+5ebvNFHsknYGyD65YlMa1f3/
-gOd1N2zypL5SGKUJBeOt87uyMb0bl9QLZ9DlVS8IizzDcHFFzh/fqWkWQOZ1espZ
-tML1f3R7TvQxhiM5wWcUS6MDXhEi/MIRx+NVJNkBNmzFqbsucrzbsWydAoGBAMWA
-Lw2PuTh7mzh9ln1Ge5Mtx3E1deGCs8QBwK84DAQAqbGtB2o9wwpLa95RhlQ5EBAm
-pAieSZGvIshuFC4y1Ge9WmBgwZ83vIDTbJUwWATOJ1LVLfQz1U5POLV7LNvva+08
-Sz5ShJhuuAlQk3ckhYLNzpbUi2wrs/Yf7W9CVszJAoGBAJ/TP4/eg929PRtdyPEO
-LGbCVWLtlFzcftpKLP6oQv7hvh33Mr7gb8DQKLnFfzgRYLqS5veeaKqnmIPxt3U+
-cyKtLBsaeNXYL5+EdnCIPfbt1pRHSF9ZOzJWdxogjK5FdbmLmzq2uSgWCNb6ChUe
-Nq2qQxBpRgfoc+EbCBeNF8aA
+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
-----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 a13159a2e58..0e61054312d 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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
-VBH/F7T6rUM=
+DQEJARYOaW5mb0B6ZXJvYy5jb22CCQCF0pH+D816tzALBgNVHQ8EBAMCBeAwFwYD
+VR0RBBAwDocEfwAAAYIGc2VydmVyMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqG
+SIb3DQEBCwUAA4IBAQB6zQZH50qkUfkYhpZ2T3heU80TW9xGoSA0LBwAlHwci8z/
+ITv63iXWtNDRJGY93DPYe14LvQBfFZe0khkvvf1d3Nv3/n0XxYiuz3wNOLM/fKcb
+xm9crlQFWxQOGvWojXbMN+c3qSWBEvjXENHTmSgoRyfy7C8fd9LVhO+0wk+DuY27
+rZ6yWCu8IowCL6TSUEJUSYBTOH0M6WZ6StGLzZChW2SVWpyAZGDalP+//aX4M0qM
+1m9BckameRIytnEKQIkX1a1DT/b8b9v+JHzfUVC0NmokMepmEQG10MyDZ6xHkSeG
+z34hYCIFd037quQRHTa9jkty1n4EMfQMAHgmOM8/
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEyDCCA7CgAwIBAgIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
-SW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL+F7psdqISmpG9p4Q2hPrW57gmzJzbtpBOA
-flAAdNByheX3OL99VFyelT4CPGfj6XmFmaJQL14naE+j9RdH9U7ZasxLSyNbt0r6
-jpaVfr+3WzCQffnA//2m/EofLmTS2BLFpPP6ONuC8fHRdR/vMEEVZfyMW++WskSE
-ss5fOOFDQeKnPe2pOYjxfH88ZJWGpyd9g/YJ/3ZAAb9EBhc4rYiD1YalYBxizXNK
-ObduE+5bze+aGraRr6N9Ed+D9Fy4Ade0ewyz7eWm1GhA3x+f2BJKmuW8/ij0DUJP
-3hzXXaqZWuVsWMm4kqa1z4tyKx29qVL/IyJKp92MZfmBCxsz1cUCAwEAAaOCARkw
-ggEVMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFA3cEk3Z3Nkk029mvLtysb6oOG18
-MIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9oYGUpIGRMIGOMRgw
-FgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwL
-WmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGEx
-CzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIR9gt
-YlhxuykwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAFLa/1Ik1HPC8Af1R5PXgRcImznsMc5X21zCibNOAcYn4KP7y
-pUgjpJOyd7g779l4IZ5PEWK8ilEPflNWxLv2p6B27Oohyc7MAKVsAxkBrhj0dY8M
-Y7WyvDCimxppGD2xcXS/6h5jiYBdOpAmH40GvEnDRMExDg1MRJIgoV/DD/nG9wyx
-brMHbzH2mxsp4jEmHAIdrrCrGf815Af2aR2vIWXt3B9b+e56KSJG5Wa2sj1fEYPu
-FzQNuhI0CaWFbAxKRWHhVWelPyyjwxa0RRlqijA2ldjSTrTDmd8Wfs7Io6jFVSka
-mzJ0SUDf4aJ0X2lty9iE8XOhHwPTmQBdrmqlww==
+MIIEyjCCA7KgAwIBAgIJAIXSkf4PzXq3MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
+LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
+VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
+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
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai2.p12 b/cpp/test/IceSSL/certs/s_rsa_cai2.p12
index 415fefaabc5..78034138bbb 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 b25664f7cb3..ddef23306b2 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-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDSMrag9OEk2udi
-D37YYCLed6U7Fr/nhTp6EYL5un3PvpYdOuv0HGN6EuQj4g46cuKA6Yfr0qMK70lM
-2G6knaUhQUChh51M9tAeT8txVd8Z2mnX7tR5zB2loUm0t2ik6Vhlgec9gdZYHQdW
-igtSl5gbsQtaqqdUSSenSMaa91bqJZirjmr3P+aJ/LoUAYczu3P53mUEgbwMLX9I
-/lW/X0u1pFg5zE2xUhWPRSYiuqlpuq/ZvWLV3ZFk/uJNq28FPjmxzrmY+gHS02Q9
-JmjbegJuuzbiKDLjpYZfCkD3XF4NnlxrKdKmtaUPBdIe459+IO7PsL131ZPQ8ROZ
-soMlQjXjAgMBAAECggEAf0Q1Tz71Elt3vOek5V1Pv2KxqBUeHA+OWFpB8vH3OtEq
-EoiaVDLcCA1oFFHKS5lDisnage4GyZgXyW9BjmnkkT3w49w4YWEOoUuu4fAcJIsZ
-iqQQAa6URLRi7AggU7j0zIDagWMbZD4vMzZhpKAkeJ+5QCwTI/UnDSIDHdCjzx/a
-me/9Srx2almq0qbgZohc0lLJbuotBiUZ8oyAs2fYVaohi90lhVELLqozADitzR6L
-RbijbrtBxgnA+lI/1EVoK7bEonNOX17qRJCd1LDWn16uKcZ1rjGoo7Y3Qnc8nX1w
-dwZ0TxAPyUpBvfED4a6LIjTFnjxRzLyg8enPOrlIAQKBgQD6QDT1VVBHH6/AWbUC
-DXtc7GmhdndvaGcOiS8fefX6MwUps04wpulxa0wO0F5zZYDg3gf8pjHhinc2M0I/
-uEogTdaZtyUoqD5T4kT01hMFgpoKVG3AHuDvr5OHjt8HbrpgxomK+e2PtUI5ZtZK
-lMw51ZCjZyMkF5t59nE4MC0p5wKBgQDXBvIVdcuxVSOMb3MA7xI8dF/wjOGnlGF8
-KHBTln3jR/lAWEGCzi+N2HrwPDHMRp+jZPlDP5Ns9HfvywJo28jEba3nJtaZC7w6
-PgKtLIiRDNFles7j+jEI6/YjKJo/XUb9Xn26vHGWbQCik2Od3+v0Cw4XDWGcQlM9
-rEUAZimspQKBgQC6QdOozejEJxdeaOZKMtKgpO0x2cSnTON3dC94lAO6RwMOuH/3
-wiN54Uxosjm6VdAIjfkP2HrDzZVQ5/HlDztMs+KH4kJr8l0BfiWovTTHIx+XlKNj
-HRh6DQoXGQVyuL1LjjmNENv53AUASEQymnEukn/mvrrvAAseSYiXM3RJ/QKBgQCy
-XX2UVZk4qVIKnSw9exKaeUJYDNTmKIxQ7E54193nGX3lZRA6jAQgWpFoE9aPB4pG
-hGzL3sHQ4F1Y2QJPrvi0D/LwSmQ6oeRqP6QCuG00PPi5gAx8Sb5BE1KiSXzh0OMh
-Ky+KJeTnDdY4BaDdhbB5SG5QqvXsI4xfHTZDpXsuTQKBgQCH0/sjyhclBs2tFK+m
-lDOrADbo+7ALOWLY0UJsRxXjrS2Gt6amuTl62T8hxSpO3EJ2lVZrRYyVRcOPp45u
-lz1UgJtT3rZpXOj1RGzJlS2LF7UkWo+VmltH9eL9TRy5O+4SNadbZFTyLSYQ1QLJ
-mn5xYGYVK6KPtdOmyEpafFJ0vQ==
+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==
-----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 63f2d5da456..883197b2f51 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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
-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
+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
-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
+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
-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
-dDr7iJom6GjAGWNWIBOmR50HGoM6acw=
+AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIALjJL3tTAVYwCwYD
+VR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBnNlcnZlcjATBgNVHSUEDDAKBggr
+BgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAdS64Wgxx/ZM66NKKjMDBkkFWLzOJ
+hqC9aIQ1QrD5LS13egeKx2EuRwVZdAV5dRha7/zpwBi9OY8rs9+jfZVnssM/73QD
+3ae06/IO8OMekCEnv103EEIQCWHEU+Mgl1YfVyPKH0STtjHRYto+ryFpMU71pLFa
+cq9WBky/7ftCmM04IJ+0ncluHHp23/ojkdkaA0fKpBGMA0DGUbigWLY76bH6HYWx
+h2JDcnZNtyaglHeKUf37338yU6njAK9mgQRMXRtzwXbm2YcaG0nJwcRcFnek5E9S
+t9vFlNmmsAit9FK0ol223zFbx818q91eo5tOIGvphdEdVFXmCMLkyJGVAA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEsTCCA5mgAwIBAgIJANiFYSTmOKdNMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
-VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb20wHhcNMTkwMjExMTI1NDU1WhcNMjQwMjEwMTI1NDU1WjCBmzElMCMGA1UE
-AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
-EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
-RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA46cFbP83ifuRm7cI
-3J4AQ7v9yXucucLJSO+hLGQ9P2ibOvxxRj93q2XxQFoiC1HN3FAxanaXRvFsLkru
-RrEnKarEdsjiNu/RSpSXUJR5n3YqGvHEmUDKUB2a6NILQZm+Lq1cugnA2CJ+tjSo
-4zK/KdbLWjnhhYi034BNR/FY3rWZ56Z/a1vOK1+rKkOM1o3aq4zlGARcUP4KpE9G
-DCUCS3Fj27yhROxwKwo+mMDZtCyqSZXWIa/k+TUE23uBGUFcZHrKbWSW+6RBhYti
-AgNy8Ra09CxxeqSR0t5qbXc9ThfUbKPpynp3OUPGQ3Adu0KQQUe7rh2+5RTZpSOs
-tv9wjQIDAQABo4H1MIHyMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFIJAlzpOQAzi
-Sl34+NaO3e0yV+cuMIHCBgNVHSMEgbowgbeAFA3cEk3Z3Nkk029mvLtysb6oOG18
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQADggEBAKpeLbKpfD1QAgje
-AozcGBUrg54TKP6lEoGi+Nceqa5xandajGCbkYL7qTHo8pseM1l16+7COtNB2uOi
-NdFPxJpXig5IFavX5DsJAKeo4khAPYJPAI6Rj6OLoADDXnkFc7N4lFVPuhIUA7/U
-Rf73fksdcJ8o1Hi9cWJPVIzZ2kz3l/BIPFBtcueKX81XpTVak69dDPpKg6Q4LJwR
-JoWyJ+Md7QZPuufU6hy8ZLRgtMgrmRugcZ447+jvJjhVEMI4vSi5di1mLtZTQagX
-OuWRPxUaic03lNiUVYyQh0GFnZI+QjHFV2G/MvAAEYQR2SHzwaFemC6dAGomec8a
-E1AMako=
+MIIEsTCCA5mgAwIBAgIIALjJL3tTAVYwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
+MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
+B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
+LmNvbTAeFw0yMDA0MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQD
+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=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIEyDCCA7CgAwIBAgIIYqQG3+EAV0QwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE5MDIx
-MTEyNTQ1NVoXDTI0MDIxMDEyNTQ1NVowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
-SW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL+F7psdqISmpG9p4Q2hPrW57gmzJzbtpBOA
-flAAdNByheX3OL99VFyelT4CPGfj6XmFmaJQL14naE+j9RdH9U7ZasxLSyNbt0r6
-jpaVfr+3WzCQffnA//2m/EofLmTS2BLFpPP6ONuC8fHRdR/vMEEVZfyMW++WskSE
-ss5fOOFDQeKnPe2pOYjxfH88ZJWGpyd9g/YJ/3ZAAb9EBhc4rYiD1YalYBxizXNK
-ObduE+5bze+aGraRr6N9Ed+D9Fy4Ade0ewyz7eWm1GhA3x+f2BJKmuW8/ij0DUJP
-3hzXXaqZWuVsWMm4kqa1z4tyKx29qVL/IyJKp92MZfmBCxsz1cUCAwEAAaOCARkw
-ggEVMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFA3cEk3Z3Nkk029mvLtysb6oOG18
-MIHCBgNVHSMEgbowgbeAFJK8lqcjS95Z6Sg7tEJavff2nSV9oYGUpIGRMIGOMRgw
-FgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwL
-WmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGEx
-CzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIR9gt
-YlhxuykwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAFLa/1Ik1HPC8Af1R5PXgRcImznsMc5X21zCibNOAcYn4KP7y
-pUgjpJOyd7g779l4IZ5PEWK8ilEPflNWxLv2p6B27Oohyc7MAKVsAxkBrhj0dY8M
-Y7WyvDCimxppGD2xcXS/6h5jiYBdOpAmH40GvEnDRMExDg1MRJIgoV/DD/nG9wyx
-brMHbzH2mxsp4jEmHAIdrrCrGf815Af2aR2vIWXt3B9b+e56KSJG5Wa2sj1fEYPu
-FzQNuhI0CaWFbAxKRWHhVWelPyyjwxa0RRlqijA2ldjSTrTDmd8Wfs7Io6jFVSka
-mzJ0SUDf4aJ0X2lty9iE8XOhHwPTmQBdrmqlww==
+MIIEyjCCA7KgAwIBAgIJAIXSkf4PzXq3MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0
+MTUxNjE3MjlaFw0yMjA3MTkxNjE3MjlaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
+LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
+VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
+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
-----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 47b01719b43..778a1cd13af 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 bf33cbc2b76..95b7608782a 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI6HA7+Og5rosCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNGvICSaAKptBIIEyC7ulkqXgVeH
-6B9KT7sv6WcdScQzq6KMIpRaKh+qIhVxlcU3FyiW7NPS+r+DLHvXXXiFGo/xdkEs
-SjfSILPk9pPr7rtm0494ZChD26XDt5CrlR5e1gHW4Ag3gFbocRbluKLqMm8QBliZ
-oqyvgFCjMa1EYInwGs7SqFODiaw9hJmaIagc0nY2DH/5V07oi5SZ8PWq77Q4un19
-753/Iwp3gHgy3E+cH5RFjkdB8o9bssSfN2afPXmVNKbxeElmGlsJqs5C8nGldLDi
-enYVXo0TMUoJro4OmyPoevBqf3FkFR1N9+T1zgRO99dt+TSvWnccxDQcl5eps1qn
-LytPsIqvR3eeWX7vh1i7evuVg0QGw9GHAh3bIWGv3RbzZERKEQ35SWfo3WOR7g5S
-4b/7ZGJKZeeV2TA1Eo17HqzyuFGgIyCrKpKwIjTFMw+XFhXpZcjvq+120EsWqifD
-Zucl8Pdtax3HS3kYK/t2Ti0mYM4bNSrybF6ICuJUzneGvgsTlMwwXMB8NrRFMZhj
-dHeWQrwdDHQULC0bj6LTR87Wi1P4orxiOqwvpFspPjU23Nof765mhHrlta6iNcTy
-sblZN3zpSQ8YQ73uvlPPkM5OcHVmtUDk9de1Sfvc0uPPNXNqfTFag1w8KSaGKP23
-l/vXhK3gyPgQtbX6sI9KNjjXvsxvsebyFvjVg300nqoPV/s0g7ekWhIyBPJ7Kq4R
-gXZRFWWms029N4PFrV8zSYpt/OiHpz+vfYSTrnzcoVZM/ZzZLybX5wGAxSZVUVgD
-YHAYObEA/tEFOkF7YhCRkbewKhpDDDOlSYOj29AeVcG04Ck1tcKQv30+AaX/GXzb
-8t699fq6S7j6YOKgpEOojWQsK9ZxK6ighFIGLwHg+SHUUjhhbE7VC75d/Eozu+8t
-cVjsIu15UZqeKjTBWAZvzWOy79ZFyrj0lrJC5p1J47J0jxkC7sen0j/KyDmiy829
-OTBPfm0wfwrvba39ToJjl9QVaeatjP3krtd/Kh5xEinXV8WjX1tZMrBd6rRT+iFo
-S6H/hAWCDrPo0shZtSDoMG+1w0YpX/FiEuJaZfRpCK77e7D8hGLn3cCj0d/I/ubw
-Kfuwz4MXx4DgAehGdTtSSIhW6mEDXcDgFRsR3jbOwTwoG0FYfBWWPP4+4IuG8UEQ
-HtI0IA1NdUfvlysXexw/2aPe+MRXba0GfMgvaZgNSn2kQxFbBVjkqhxIJORbEXqH
-NvD5OxwIN+ZTdV7UaBBN1BMCyKE5P0zpbv5Ph/JhJLsllTgwG5mygKnuGzpKROhH
-OiO9b/Abn/IMnTZlzzyBG65jo2npltAyZWqpgmOYjx50Lsw1clXmL1r5eJyzrUv7
-Gw7IPTueI3xBVnzmFYxo5IHgcsboH0pVKMzh+ybwCdji+xEjWIWPiRZbhIpP5n1x
-xFmxL1ciMokz0IQDMz6QAzwi/LPZFUEaBkMvfUgEhJX6te87MxzlMgXiQsx1MjaF
-KrvLnzYenkkqP7ExowrNholVwXwn5pz4hGp6xbN8seDZm04CtGN6n/NC9O7ozvD+
-0kqdKHvXzLWbz8EQYZc2CppVFlVZzM4ownJv0CUi63PvB/Wfvb+mZ/ks7yp65Xym
-h4z2vc9lmIifOwTT8J4Lbw==
+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==
-----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 ae69e6780a8..ee6a9a654b7 100644
--- a/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem
@@ -1,28 +1,28 @@
-----BEGIN CERTIFICATE-----
-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
+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
-UzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMTkwMjExMTI1NDU2
-WhcNMjQwMjEwMTI1NDU2WjCBhTEPMA0GA1UEAwwGU2VydmVyMQwwCgYDVQQLDANJ
+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
-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
+ZXJvYy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkewo0/CpT
+g+ZALLmYxf/UFlBtuvwDcjHlwFmGEMISuItNiCdFaRjoa/vHamQiBrMpYUG1ZyVO
+feiPdh8vCU+nT+4tIzhe66xvyu+aeZ49FZwLy7uPk2eDJI9ojjY8gtNx+ax+b1gw
+LjhqVjsg3peAQvhGjael385ELVM4ODDnUTp4bqIOne1yNZX+XMoUxrXdYXPM4VbN
+Zm9OXyokv6ZKrWKw2uloWYYcgqkELOcnl5qIxOT6dZTdjqtwDudDMv/4YpOenlTn
+WJimxXO9sQmYoPtAGxoOtXUhsONcGuxbBpEB9GJWc5GuON8+0GyTH47DxvkWQTnV
+3KOu/wjIjTjVAgMBAAGjggFHMIIBQzAdBgNVHQ4EFgQUFFYkmWlrrbP7cg5NtNye
+qH/dsOMwgcMGA1UdIwSBuzCBuIAU/ysXYfGAXBGwhwBTQL326lLOt1ihgZSkgZEw
gY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYD
VQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxv
cmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29t
-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
-BMIsd1bHGYMyWPT6g/NhPEOGRms/+yo=
+ggkA0KlgGsJ5WokwCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBnNlcnZl
+cjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBpyDNOvyA0QxDwxYOINcRB5BZL
+LNZiNSaYxVbH5tcXk97f9MdxJgUSc5aCxT05RDX2J5s1g+iSAztuFozp8QO8zOat
+MZLPfTpC1UbJ9dyXJm6x0jFq6ccKANQ6NsCCw0JjR8aDCW9ATzm5KSu3MIKGcend
+d78xv8IxoRREPt0s9HgzCdPZ8zDFQDZsHsuaanWakPpWEA+ibOWVbhcyc/LecBMQ
+EPNr1DNcbuuztqn6NJksDp8SKy4jDaxRmMhELXyn11rC+HUFxxxcQSKGIAH0mzuo
+NgMXh09lyLyqFRwwDBMcs3lDVcUMCqtfkbTKeP5EYTwgDjc4fzW/aqAYW6ST
-----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 9a819011247..fff31d6eb33 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 3df12fc9f20..406c9f08998 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQChEsUs8NND7e0c
-88mUVJN7LHyU8oJwSpaDI48DSkkWwnILmJWJcvNSqGHECGJ5SNNP4TbbfOJjaX54
-Zn4H0jxzLk6HddH8Fb81Bpg2gJ9c2GkNSZ1GAOB5q1BA3H1qvnAPzl8byEE4lIhE
-02TEPlTs+2VcMGH7tTEUVjlBwCH9hGBustB2snJXgDqhfJmm0MawuiX4hGcVR14X
-zNvBZe2m68JPuRFSZxI2F9hiBJlcIKmjJvSxl5J54K18VoydlJYtEL/HUSu2I4zT
-ZQCQ6guG2HK687ygbCG/4RJaVwSErkbq36UPDC+Ge7ZytqC54c42g9oHDG0/AfNK
-2WgAXhCjAgMBAAECggEBAI8H7/ecUr47hRb0lMgW4m+6bVaGkrXMRiNlbBVr3cNM
-H6GUeRV48gEwbMB7AZbZyGtifighmZbVkuyvdrLTScKuGCXJxhGn7gbUOE4NoXX8
-5ixadkI3fR4NtlIieWxUd4ZRp7sv9Fqd6vPTE+P/xcI66yMWA6xUlaSNfIKabpSD
-k8eJBVbTHuBJv/CwSKtXdLN1hS/Pd//uikCg+u4jmepDTaeo//wSUyGhDc+9XRtH
-yATLPP/izI/vMtfBWyUr6Yq5LaI0ckhjme1hquuRrdmX6ltQ9rK6Xnmrnpogi1u7
-XahU4muav1W+H1N4UhuFAkLv8oqhsCrtxwd8Gn+IOsECgYEAzJj63ZYz2zts2y0I
-PBMYbRkRyeyKrc32qR15BRDW2gneyIEUgDwhDzlJF+ngwOyl8H25O43Zw3PSTLnD
-iDxOzhspPM1hHij6bMyVv4KIizHpn1uueT6oxRKaiTZv2FaO/4/Aqm8E08I/MkQR
-iw/9IputQXKjLyax2yw7kEwbjdsCgYEAyYp1Stasj3VIfkoZxt8U/b9hBhF65Qqv
-1lxNxSIOxLlE0zBtmWwzZh85WV9eb3lmQzMajtfnobhjxnxHTr70z8zqzOqMxpoR
-TtOtoJzwTUWv8FaLy6l6gq70m987D/kYJXfKdGci/QdyEq7QRnCNfkvOY9ECfSfA
-20SgiyoWFtkCgYAj35Lk9WgkQXglufCer+5xeprO3+W08c8U+fD1PW2ej2p7l35j
-uadGRxIU2lIpIZU65KBs28NZ7N3rzAqHwaNDqimB2rTzl9XI69o52QZd+aNv6KBf
-6+elnkxwUJYtxYePMcJjX9Hl20I/awX0bxpATjGDrzkDlHJM7qWG+IFATwKBgQCD
-4LoHkpmv9crN+KcNXwRZVlWipuWH4opU9mldSX/ocmL63oGZFxg7Bst8E8+zmfi0
-mEgUmGrVg9amFsSCXqnLIAe0tvYPLtmMfy7qHkeQCL2rwrYPOoMT6G/fXx9CwHhw
-bAZqTOK0N58JYqKetR+hOPGAl0/Nnamw0SNMbOmvYQKBgA2cGulJInV4y64VqhZu
-OXAeT+rQ4347LKexhvjZjTFOE0vQ2VB0yhOV1rIGGuHorJcBMZp+ev+Wa7RbBtox
-+0MDCSuCI5aH2bhhnUQAVhWOfB7eudLv7XcJuUqVMUC5Ih/rLAPYXz2I/MCip5ok
-W2obEqnsa/tJUzeGnyO73Du1
+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=
-----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 ae69e6780a8..ee6a9a654b7 100644
--- a/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_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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
-BMIsd1bHGYMyWPT6g/NhPEOGRms/+yo=
+ggkA0KlgGsJ5WokwCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBnNlcnZl
+cjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBpyDNOvyA0QxDwxYOINcRB5BZL
+LNZiNSaYxVbH5tcXk97f9MdxJgUSc5aCxT05RDX2J5s1g+iSAztuFozp8QO8zOat
+MZLPfTpC1UbJ9dyXJm6x0jFq6ccKANQ6NsCCw0JjR8aDCW9ATzm5KSu3MIKGcend
+d78xv8IxoRREPt0s9HgzCdPZ8zDFQDZsHsuaanWakPpWEA+ibOWVbhcyc/LecBMQ
+EPNr1DNcbuuztqn6NJksDp8SKy4jDaxRmMhELXyn11rC+HUFxxxcQSKGIAH0mzuo
+NgMXh09lyLyqFRwwDBMcs3lDVcUMCqtfkbTKeP5EYTwgDjc4fzW/aqAYW6ST
-----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 395ace649ef..18a72318f49 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -1514,16 +1514,16 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
const char* authorities[] =
{
"", // Self signed CA cert has not X509v3 Authority Key Identifier extension
- "92:BC:96:A7:23:4B:DE:59:E9:28:3B:B4:42:5A:BD:F7:F6:9D:25:7D",
- "92:BC:96:A7:23:4B:DE:59:E9:28:3B:B4:42:5A:BD:F7:F6:9D:25:7D",
+ "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",
0
};
const char* subjects[] =
{
- "92:BC:96:A7:23:4B:DE:59:E9:28:3B:B4:42:5A:BD:F7:F6:9D:25:7D",
- "8A:8A:BD:67:CA:23:2B:5C:07:84:B6:BB:B2:40:5B:C0:29:46:FC:00",
- "6B:85:D1:63:35:D4:EC:67:3F:FE:BB:7B:93:B1:72:F3:ED:14:5C:ED",
+ "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",
0
};
@@ -3815,8 +3815,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:'F8 0E FB 30 3D B1 D8 11 E3 61 3B 17 AC 1B F5 6E 0B 98 55 90'",
- "SUBJECTKEYID:'8A 8A BD 67 CA 23 2B 5C 07 84 B6 BB B2 40 5B C0 29 46 FC 00'",
+ "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'",
0
};
@@ -3825,8 +3825,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:'4C 7B CC 45 FD CC FA 95 74 D5 F1 8F 5B CE D5 B9 64 30 31 9B'",
- "SUBJECTKEYID:'6B 85 D1 63 35 D4 EC 67 3F FE BB 7B 93 B1 72 F3 ED 14 5C ED'",
+ "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'",
0
};
@@ -3947,7 +3947,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
const char* clientFindCertProperties[] =
{
"ISSUER:'ZeroC Test CA 1'",
- "THUMBPRINT:'82 30 1E 35 9E 39 C1 D0 63 0D 67 3D 12 DD D4 96 90 1E EF 54'",
+ "THUMBPRINT:'10 8D FB DE 94 EE 36 AC AC 3D 58 48 46 AE A4 28 C7 D2 49 A9'",
"FRIENDLYNAME:'c_rsa_ca1'",
0
};
@@ -4061,7 +4061,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
{
// "SUBJECT:Client",
"LABEL:'Client'",
- "SUBJECTKEYID:'8A 8A BD 67 CA 23 2B 5C 07 84 B6 BB B2 40 5B C0 29 46 FC 00'",
+ "SUBJECTKEYID:'15 60 69 5F C5 27 48 7F 25 99 3F 3D D8 2E CB C2 F4 66 03 53'",
"SERIAL:02",
"SERIAL:02 LABEL:Client",
0
@@ -4074,7 +4074,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
"SUBJECT:Server",
#endif
"LABEL:'Server'",
- "SUBJECTKEYID:'6B 85 D1 63 35 D4 EC 67 3F FE BB 7B 93 B1 72 F3 ED 14 5C ED'",
+ "SUBJECTKEYID:'14 56 24 99 69 6B AD B3 FB 72 0E 4D B4 DC 9E A8 7F DD B0 E3'",
"SERIAL:01",
"SERIAL:01 LABEL:Server",
0