diff --git a/.vscode/settings.json b/.vscode/settings.json
index 64701d2ae81..a072134dc06 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,6 +14,7 @@
         "Browsable",
         "istr",
         "ostr",
+        "soversion",
         "unregisters",
         "Upcall"
     ],
diff --git a/certs/cacert.der b/certs/cacert.der
index 6c405e2bb27..5084c114ee1 100644
Binary files a/certs/cacert.der and b/certs/cacert.der differ
diff --git a/certs/cacert.pem b/certs/cacert.pem
index d8e6eadf574..f3ee44e139c 100644
--- a/certs/cacert.pem
+++ b/certs/cacert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID1jCCAr6gAwIBAgIIUmyVFUPQ9f0wDQYJKoZIhvcNAQELBQAwgYsxFTATBgNV
-BAMMDEljZSBUZXN0cyBDQTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywg
-SW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UE
-BhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcyNzEx
-MzIxOFoXDTI0MTAyOTExMzIxOFowgYsxFTATBgNVBAMMDEljZSBUZXN0cyBDQTEM
-MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
-aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
-CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAy6/rqeQ+McDn/mXQwNGk+cNftOIJb99Cdpl4dFuMzD7XBK36l1Ijo/Ro/d03
-7ZJr2BzAY/DlseyuvX9qXeQ2jsvzwlumNuEv09ILbCqn27rGt3Gu8RpvSt6ehVic
-PXJR3dA/TCZW+iK8WDmDOWtD8DO9jSiN0+qneWixCqWFX5DeBFQoORF3dIjJa62B
-LLPaWK1EW01/6R/Las92NKRqXuQ3TkAT1bpsQBjrJFNGSSdwwcteGGpPfzwSw9gW
-IuKuS4f0/xZVx6rG9Jzcxm/J2owidhZqqKEvaNiIghMXax6Cldh9Iq2qUS3FS3Ye
-T4ZuT/7cEVGu5RPyNnTKgGirhwIDAQABozwwOjAMBgNVHRMEBTADAQH/MB0GA1Ud
-DgQWBBQfsKt279iGWWp5DRYKF9f9b/F1+TALBgNVHQ8EBAMCAYYwDQYJKoZIhvcN
-AQELBQADggEBAI4qKKqx/edLOQKdcdH+2QAxrmsnZDSMmnlVGl51WBatFw+9GskH
-YeIabYdihTx/aDbdoLW5FDVYQQEfBhnvo7uwfhoYR8DapuPFCfeyf5hED+FIpXHo
-jVgeL3DrTccPQX3VaCu0ID5FN4EA3Jbp9/Kt+uwQUlHVeMrHQNfo4En/yoJoJowz
-26iWrmi2ZdnxuK9WZ0HhENODLp86oNvkgqu9iOR5vJVcJOtKMAiSHmemLOZdaAeM
-7UwNTu+cYTC6N2LH31K6qCwJkk3YJg89uCKhd6YkMZvmQlTrnqM39Hg+V8LKl3x/
-2iDrWoik199Rh9p/Z1qqitqeOnWK3EzNevA=
+MIID1zCCAr+gAwIBAgIJAOEljxS7Rxo7MA0GCSqGSIb3DQEBCwUAMIGLMRUwEwYD
+VQQDDAxJY2UgVGVzdHMgQ0ExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
+IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
+BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEwMjIx
+NTAzNDdaFw0yNzAxMjUxNTAzNDdaMIGLMRUwEwYDVQQDDAxJY2UgVGVzdHMgQ0Ex
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALwDfXcWkEV2F7+RCDCuZ3csXZBDKVb4Q8CYzcyf5+Rw7LymTEzwAqCbr6wp
+ZVjAgszrfh8/j2BET+et0neXLvAEupGBOEDeHWgkFmkbAixif5pakYSTq4IzRhHd
+nj/qqDtEuP7yImSjDn/P+fjonRgg8p0lmoDuAleZfIrkAjdT5ishI3Otu4FgCoCw
+E/Vm/Mydka0ELddwziyb3Ra27OtwbBTsL2Db6wjKccNHSm+idQFN875tHy243FL8
+1bsyQxYE6Qt6aho7TpORJ8TavpQBDAqL9CYW1hpM6ikzBKhC3eI/5fLpGVY0QgBR
+AU1P3tyiIcmeyDKzNMvc6HtWqO0CAwEAAaM8MDowDAYDVR0TBAUwAwEB/zAdBgNV
+HQ4EFgQUeYltiMNIe+n7TMBXCMfftqLdCbcwCwYDVR0PBAQDAgGGMA0GCSqGSIb3
+DQEBCwUAA4IBAQAdyoZfklBNQOuUoulsEmDAMippkKlxJluaYjZAGFOgT6Sv3s/T
+q/Ps3bz+pQRQ0LI6N9BTuaYjFr9d4Dhp4GGoed1AB1TdQOFUwnzLFt3BLOI18ZNc
+1uvJqv9qZsGOm0PLvOFKQu4+btoeVPgXEJSui0wkeLuXYoiKPlKiYLc16l4pJunm
+yhaYO4KVAkBSp4XExFm1sT2xhtTGKfOuWT7ORYwWtaWqidx27Jj6kESFuhrizddm
+VAY4ejoM1Ya+5QNs8kNICfgMWzowBSNNJ1K6H4f75LSxHahNjgM/peRRfaiL58wj
+WP0OHvX1jopVQi5z3NSGC/dVlV+xZVQ7fqiP
 -----END CERTIFICATE-----
diff --git a/certs/client.bks b/certs/client.bks
index 9b27535f405..5fd0ff42bc5 100644
Binary files a/certs/client.bks and b/certs/client.bks differ
diff --git a/certs/client.jks b/certs/client.jks
index aaf78692e41..dfe4b4bf905 100644
Binary files a/certs/client.jks and b/certs/client.jks differ
diff --git a/certs/client.p12 b/certs/client.p12
index f2aab608a5d..347b44f8365 100644
Binary files a/certs/client.p12 and b/certs/client.p12 differ
diff --git a/certs/server.bks b/certs/server.bks
index 7b3a17cc346..4424e638a09 100644
Binary files a/certs/server.bks and b/certs/server.bks differ
diff --git a/certs/server.jks b/certs/server.jks
index edc43fd1d74..617770f0976 100644
Binary files a/certs/server.jks and b/certs/server.jks differ
diff --git a/certs/server.p12 b/certs/server.p12
index fbc2a61fb23..453a34ff424 100644
Binary files a/certs/server.p12 and b/certs/server.p12 differ
diff --git a/certs/server.pem b/certs/server.pem
index ca1b44cb78f..cc65e765937 100644
--- a/certs/server.pem
+++ b/certs/server.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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
+oDX7wvUrX63AFk9QVbSAuzk6n9jE4/Ti9YB8DFLF0/BI463UxeQQyXUlf+JK31CZ
+aViQeEX3j+EmVjZzmhFjJ/M1nGE2jfrteZP7x7XL7E3+SF1S9m76A6YqNaV7NvwX
+b1ycyUtGfjNwTuUNiULYtmqacSWJKw1LEYi9oDG4t+dT2/unq3W4D78hF3yub7Sd
+1QPOjQLBxw772mQ0TnG6fTGwCzUjg3Fu2AXSjRG/OAoWDtNygUI0x+tL3LKsilMX
+I3jP1crFwKJ0LjFU2CFyX6Ox7zJAC1tJPF8RCrufjUarfCPzWuknt+0E63r2yGQo
+1R9Cjko11nKF8EvUsZnn9QIDAQABo4IBLjCCASowHQYDVR0OBBYEFAMvlT8ZAU01
+WEaaw6DZ7pB6F8qcMIHABgNVHSMEgbgwgbWAFHmJbYjDSHvp+0zAVwjH37ai3Qm3
 oYGRpIGOMIGLMRUwEwYDVQQDDAxJY2UgVGVzdHMgQ0ExDDAKBgNVBAsMA0ljZTEU
 MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
 B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-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
-x+P/Keu4P/M4IZLHdQiYgSbV9lFe04z5cBo=
+LmNvbYIJAOEljxS7Rxo7MAsGA1UdDwQEAwIF4DAaBgNVHREEEzARhwR/AAABggls
+b2NhbGhvc3QwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3
+DQEBCwUAA4IBAQCDVb8YeArBZAaDO9UgG32GL+4bnw/x3OAVKnSg8ShaoW3LbWcq
+wYmdWKcdshuB9+Og6/CZ4II0ju4B8WveH2aSxdbmOyxqUIYCKy497rNO+u1lLuOc
+Xlmh04g55+K7i2vOqRg/TFoolNajQ0YmqWxPU8NB9fT+GxQGoJ2lPzExAsMfbD33
+0t6lUBCnXbECu5P4P0sUT61wGwm6syh9oMnfEZxqkepkgKUq3tID1MziOb1ynAU8
+Y+V8vAHAlRvlbdnJSf4VmbkQZKfLJeHCNfIa1/4Y9neKkNupqeDWvNWgC32MExIQ
+hexjYfPQtVJgLgtmfzq+NlXk1Xxb1Y51ku3D
 -----END CERTIFICATE-----
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index c8429610f19..de6128a65d2 100644
--- a/cpp/config/templates.xml
+++ b/cpp/config/templates.xml
@@ -27,7 +27,7 @@
       <parameter name="publish-endpoints" default="default"/>
       <parameter name="flush-timeout" default="1000"/>
 
-      <service name="${instance-name}" entry="IceStormService,38a0:createIceStorm">
+      <service name="${instance-name}" entry="IceStormService,${node.ice.soversion}:createIceStorm">
 
         <adapter name="IceStorm.TopicManager"
                  id="${instance-name}.TopicManager"
@@ -74,7 +74,7 @@
       <parameter name="publish-replica-group"/>
       <parameter name="topic-manager-replica-group"/>
 
-      <service name="${instance-name}${node-id}" entry="IceStormService,38a0:createIceStorm">
+      <service name="${instance-name}${node-id}" entry="IceStormService,${node.ice.soversion}:createIceStorm">
 
         <adapter name="IceStorm.TopicManager"
                  id="${instance-name}${node-id}.TopicManager"
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 1c2fcd3e49f..7948d54918e 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -365,6 +365,7 @@ Resolver::Resolver(
     _ignore.insert("node.machine");
     _ignore.insert("node.datadir");
     _ignore.insert("node.data");
+    _ignore.insert("node.ice.soversion");
 
     //
     // Deprecated variables
@@ -488,6 +489,15 @@ Resolver::Resolver(const shared_ptr<InternalNodeInfo>& info, const shared_ptr<Ic
     setReserved("node.machine", info->machine);
     setReserved("node.datadir", info->dataDir);
     setReserved("node.data", info->dataDir);
+    if (info->iceSoVersion)
+    {
+        setReserved("node.ice.soversion", *info->iceSoVersion);
+    }
+    else
+    {
+        // Since the node didn't supply this info, we're guessing it's a 3.7 node, but we don't know for sure.
+        setReserved("node.ice.soversion", "37");
+    }
 }
 
 string
@@ -958,11 +968,8 @@ Resolver::getProperties(const Ice::StringSeq& references, set<string>& resolved)
 map<string, string>
 Resolver::getReserved()
 {
-    //
-    // Allowed reserved variables (reserved variables can't be
-    // overrided, in this implementation an empty reserved variable is
-    // considered to be undefined (see getVariable))
-    //
+    // Allowed reserved variables (reserved variables can't be overridden, in this implementation an empty reserved
+    // variable is considered to be undefined (see getVariable))
     map<string, string> reserved;
     reserved["application"] = "";
     reserved["node"] = "";
@@ -973,6 +980,7 @@ Resolver::getReserved()
     reserved["node.machine"] = "";
     reserved["node.datadir"] = "";
     reserved["node.data"] = "";
+    reserved["node.ice.soversion"] = "";
     reserved["session.id"] = "";
     reserved["server"] = "";
     reserved["server.data"] = "${node.data}/servers/${server}/data";
diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice
index 0e7b2578828..894f653a237 100644
--- a/cpp/src/IceGrid/Internal.ice
+++ b/cpp/src/IceGrid/Internal.ice
@@ -373,6 +373,10 @@ class InternalNodeInfo
 
     /// The path to the node data directory.
     string dataDir;
+
+    /// The Ice SO version of this node, for example 38. It is typically used to load the same version of the IceStorm
+    /// service in IceBox.
+    optional(1) string iceSoVersion;
 }
 
 /// Information about an IceGrid registry replica.
diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp
index e61d320d407..26932a90b2b 100644
--- a/cpp/src/IceGrid/PlatformInfo.cpp
+++ b/cpp/src/IceGrid/PlatformInfo.cpp
@@ -383,8 +383,16 @@ PlatformInfo::getRegistryInfo() const
 shared_ptr<InternalNodeInfo>
 PlatformInfo::getInternalNodeInfo() const
 {
-    return make_shared<
-        InternalNodeInfo>(_name, _os, _hostname, _release, _version, _machine, _nProcessorThreads, _dataDir);
+    return make_shared<InternalNodeInfo>(
+        _name,
+        _os,
+        _hostname,
+        _release,
+        _version,
+        _machine,
+        _nProcessorThreads,
+        _dataDir,
+        ICE_SO_VERSION);
 }
 
 shared_ptr<InternalReplicaInfo>
diff --git a/cpp/test/IceSSL/certs/c_dsa_ca1.p12 b/cpp/test/IceSSL/certs/c_dsa_ca1.p12
deleted file mode 100644
index 4399e57415b..00000000000
Binary files a/cpp/test/IceSSL/certs/c_dsa_ca1.p12 and /dev/null differ
diff --git a/cpp/test/IceSSL/certs/c_dsa_ca1_priv.pem b/cpp/test/IceSSL/certs/c_dsa_ca1_priv.pem
deleted file mode 100644
index a5a6d5b9667..00000000000
--- a/cpp/test/IceSSL/certs/c_dsa_ca1_priv.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEugIBADANBgkqhkiG9w0BAQEFAASCBKQwggSgAgEAAoIBAQCnzt67PnmX17/p
-UgOe7j0V4VkQRPapuDrkBYxS3EGlmQJmLudbBX8vvOrdVEL0dZ3/4kouw4Z3id7K
-ipO1SbZ+udACKDYJzE6eKgG1oao7sa4WKdlhuwyuRoTltzuxN1VeMoQWfdKMWxt3
-+sTTQzd+bgoJOccA9zPnvWAuGOCmXP2rPYJJFJq+82CE5WHGGO3mEaq00xcSYmrS
-xXB4GgJP8JY0AJ3IuykqMvxDG5/8wPbEVcm+kOdpnCcm9Jpo9oEPxtfeEoWPzVXt
-wKMF+W3/4mVA5L3DCWMQf15pdyGzokpSqgekWmX8fp2GVAhpmRs38o6QuZq5SJ4Z
-3Uh8CMHXAgMBAAECgf84YRsWNFf2+0wgOXvZpBlGdMwU9qqqqyH9h2TKqBjw9GP4
-rs40UzPSWH2nsmHlmwur+ivvjft3nO5ItjeGsEiX5qwc50Bz1EvOevCHzhSMylBz
-uoR7XnQ0SctSlfAzW/NIYqgpKWDl/TtaO0wYFw2TnD7LV3Uudor1OA3VdJygQV4W
-l+ZMS7ezRjFw0mRoE6CRd7FLqoTexEDTWrUcW5CuvH/ySJTqm0zU7WEYZntPgQDk
-tNbiXO65Eq7H4HVBOGSd/uz2UCVONIx+DnIfTi/t0PS2byp5qtFp0ef7tz4ll7Cx
-G+I4M2zeKPd/MQpdhTdalv0/HY2rLR75HGCOlpkCgYEA0pFR5zJXqE+PllM++/gd
-fsm322AczBKPc3/IwZTfqO/s46DCq03oD0rMDZAYL2gOlUitdbKnicazkT4g/3XW
-8CY2qC5uXN8ZORge8eoIPrRpkZYGp4PWVkrjmW/0f07JFcAmnC0VifyWjlxdHU7s
-NfWn1ncaYnJlEZWtWAbSkoUCgYEAzAO68BIemeRN6KTRYDYMIYxb5BdcEi72ufrl
-hqi1RNfDRAe3Xp0wueXTRZXUe00fc9uihYO6Pv02Hdb9zu5uW2ZB688x0OGCpAnv
-Zuo0FNaMzXuRNBtRv4Ow0mLD1NEKMyFyTjfdPvIxrDj7LKXN7bqd1kv2dGHEOZw6
-ZtsmR6sCgYA07VQR8eR4qO7lkS0etoHrcZamLKVwYiXumSsEBYCmfRAlMy5bUqzG
-0z0xF4wMtnIb8fWvxOU5y1ktY9l1fNA28tQAOBODgoxbfoWgtvu1jzGN55DqoEfK
-zu4gjjR9n3cJ4Y+S5/4m/fd19x9sk37qHUI/tRZLsodXATFeE/Dv5QKBgBH4niX5
-oqJxvv8oTZ1JBYaLA6ky+ZRMeMVnOYLEJ7uZugSrHVcDR8CIYzT0/tOhtoyRI17Z
-fLWBvpugTZlF3YjFmDb6eGvrAYQLsAADz3SqdZrAMMlDQs84/YF6279KbriUUKpd
-N2sNEJ0YI+AJ9vri/nZbGKml1xAwF+DpmxSjAoGAE23jIPXo5y4LGXgmnSrt+YhE
-8h19FV/VHX5QWfJ3MNavzDYD3RT43xG0BS0XfMms6+H397/SO44IhOGlb3sTiEH4
-pJkGGfOArihzXWcYpIjWsb3qvkEFTez59Z/EMoWY6cJcGY020H/qrjIFMCOGKfhm
-jFYdtPtGtOXVSoBrTxg=
------END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_dsa_ca1_pub.pem b/cpp/test/IceSSL/certs/c_dsa_ca1_pub.pem
deleted file mode 100644
index 33fde3343c8..00000000000
--- a/cpp/test/IceSSL/certs/c_dsa_ca1_pub.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIIISBb3DvYomswDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU1M1oXDTI0MTAyMTIwMjU1M1owgYUxCzAJBgNVBAYTAlVTMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQ8wDQYDVQQDDAZDbGllbnQxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-p87euz55l9e/6VIDnu49FeFZEET2qbg65AWMUtxBpZkCZi7nWwV/L7zq3VRC9HWd
-/+JKLsOGd4neyoqTtUm2frnQAig2CcxOnioBtaGqO7GuFinZYbsMrkaE5bc7sTdV
-XjKEFn3SjFsbd/rE00M3fm4KCTnHAPcz571gLhjgplz9qz2CSRSavvNghOVhxhjt
-5hGqtNMXEmJq0sVweBoCT/CWNACdyLspKjL8Qxuf/MD2xFXJvpDnaZwnJvSaaPaB
-D8bX3hKFj81V7cCjBflt/+JlQOS9wwljEH9eaXchs6JKUqoHpFpl/H6dhlQIaZkb
-N/KOkLmauUieGd1IfAjB1wIDAQABo4IBJDCCASAwHQYDVR0OBBYEFJnjTTWRb+Es
-7hy4vpnCMZmhD3hvMIHDBgNVHSMEgbswgbiAFAL9G+lvTpaPDA6ZYY9FSGsrFDwx
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIJAL/ehwUYP0SNMAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEF
-BQcDAjAXBgNVHREEEDAOhwR/AAABggZjbGllbnQwDQYJKoZIhvcNAQELBQADggEB
-ABpQKIVJTdTdPAkAgn8OTdddzC3mL3rU5EEkyV38oZRbSDGI8Y0Yj97uyLKbN4Jd
-/Dt8Qyi5dZ5UWtWjSyOSZh7/lFWOxp6tR8DWO7Q79d7LNI2gwVPmsJQGCt2zAVwn
-Lw//01uUaWN8SkbJLpFnyirt9HYKL8ElcZFJCNQfCRkL4EBjXGCZ97QEXtlScKVi
-qnggs1DtsE62Ys8VN4WZ+3ptljc/+7pvLzpBxLz2vTRvG2wE6/Vm9DbDkaJouvyd
-rFJ9e0HI44jHhr5GJZKJs+j60lLWN/lp8zv9dHCX5aRg6W1cCRquj4SjQHGacG8U
-MWjf6N1f3fmiPq/zfAayHwE=
------END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca1.p12 b/cpp/test/IceSSL/certs/c_rsa_ca1.p12
index 532009e9a3b..7315d3bcfcf 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_ca1.p12 and b/cpp/test/IceSSL/certs/c_rsa_ca1.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca1_exp.p12 b/cpp/test/IceSSL/certs/c_rsa_ca1_exp.p12
index b34fa7dcb1e..2b040063636 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_ca1_exp.p12 and b/cpp/test/IceSSL/certs/c_rsa_ca1_exp.p12 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 eda39edb216..afbd59105d0 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-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDz64PMKNJZ28pp
-rzayjourgUAfXbCpS3eeRvPf2UgXaDRW6YGQuTrAdr1HH7N1/2AlTDJXsdAXTc4n
-DcXso/AHd+Hc6ZeZSCG0z4rQnodgevl75MvJc62XqrS31XMxnIxPEy8cAjSn7IhU
-Rz86GaiaLsCjjPw2CVoJ30UTXVfSmV/gR0vlDhBWSRDPSlDkg7yov2/TPIMdi5vH
-QKHkhZzps9ZyS9ujLzu7dmhxnxecKUPUHq+UoWACtyEs+V1fWbISdPa5s390Sq03
-dkzYw4CUBRis/R1stBLm+VjXHd76X4Ab7I0GF6QnjMXPd/oBEAr6bVqeNSiU2pJs
-d9zD0eLVAgMBAAECggEAJcB3lV9jESfQp/NHoLKpwNlgEoq2ZzloMd3S7HwtaXwG
-D8aTuFHG21d1W573MGXeXF9y8jox1g2DgO1jiwjjg1Bla4LW5REyMFEn77p9guv9
-lZSXit4lybHQxxwY+F59o9Z5Bdl8i1nzTrH5QfWLMBPY2mddeMKRRjJhd0oM5+nq
-P9qPh9U5pe6bZiPGt82uzl1TU7xqDtUuPge4Z6y9ONZ5ptHwMBbt+1DMOrdCjdwZ
-fYwAL6Jc50i5jW99+CYfW4bEUyYEfBTLBM3k2auKQHdjz8b+rBIsei/4QRvXwkmK
-dIyYH9aSd5gHTfrJbyUepXIwLqFsg22fxFAd6uNBSQKBgQD7CfNLZQHj+qllm7Td
-QWIWb2b6vnjZSIIokyFVz6ImWup3389W7WeXjx1a7bPDfYBEs6yGntcGqpZfb0Iv
-2EeY35c/GldGhP409LIrCEYMgOUEWpneBnm9eM48fKOE/NzBMzX6I4qDHTfTu92U
-7f0X31MtFNwIhjnerTiP96Ok3QKBgQD4vYx7c7fqR5cuJr1DPY/P+tbT6b7d8x15
-jvGcZJz5hkUbiAquHPIFbGb+887T2tpnl2Hk7SuV5Nd8xEHqgnf6yFgSHfxOfGTD
-/IElM3jEcKsHbVQMj6RKM+aDm7kkT6RIEkxxES/fHp+nbWSWrrMGBTsi1WuliNKU
-vkJ0jem6WQKBgEIhLOX/ha/4qAcMLWjbgGtIjWggJNWYNDFcELv6JkzURk+ttYDA
-qTlTifgaBfDJbrCqZBhSX3JyHYqmVFkmMDYlMEJ/Pd5lylFI5GZRl6JTkgDDnSTP
-r+IpoKpuauTtd3mtc9qg4iwH1l0AcC57QuC3A8IsbIoSUcxG9U93fLRBAoGAPjrN
-xqTwwkAe5oDyoLvqGtJapLG5+rU0DpFgiQvy6cpZx8WFRoIfWpQAQJCmkgIS2g/Z
-gfiECwAxmRlQlGcHtUoiHoY59TjRzOaDONdjw2GcqEMF4A6fv6C0bwCqlRcHtrA9
-R5xRKbTzpGON4tTaHQt5/AEA6W0NogDnh1lpvCECgYAf6lRiRHFWemLNUlggP8NY
-LzGCkRFxNiZnZrkRGlHQc8x1ZOMVZz8Csx6Y2y6TCZedr92tZ7mLa8XzgR3mAIbL
-vJTg2mYF02H6u5ljt+XRkA2rWFbg2ouDj1U8LfmlNY3U1ETH3KzUpCVObEWqe2rc
-yF8iRmDSF/28HETrPazCiw==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCzVcR14Q6FHupc
+0TyY4eeMtWVYvYMXsZW5a2S0Ojs2dYQHPZZbduUTvGu9ENHF16sZQmnn3fYPXEUE
+BjwLXo4bXIAcj5SOcBusFeEMrJOz2XN0ApaMu9QkaQ9PHurgxRj5z8Qe/kx8nrvf
+yU8Z67jM7W9uKL5NRpOqnduwpRHs2lF1XpH765vQXwSrsqjRfLGP4clA4QgERc50
+35SpESo5wIwofIuR5CAM4QTSPC3xylmEa61xdvWk97gVukA+AvJbrGB8dyfcRDNj
+VDDveKyV4hscmOZ0UBVlXhnofGg4RZ16lbfALyUaFJJY+tlDhSbmYzJjI06txuTs
+oqJweS2BAgMBAAECggEAUbZ7QXDuIkbvZ6JpF4obbNg8WP5k7JdcjvN5m8tKrqpG
+Idx0lbFreJ4qgyfWRWzbB7PkuKNA2kfjJI3Iry+C1cHEl/7uJCa93R/M/u7lkBW9
+Tvdc7Lwq0fpS4OzH/emg0zbReIPLix7yoOnDkp5/AlUPqGSFLYXChAPQlcDpFX+y
+aUKyGT3vV1gFrqV8GLkk9Z05dVlK5Jnuo3wd33o29G7cdaF8J0GXJB0VDYHSzAaf
+Wbs2jWVLHLaNZQS9mfLzrPnXx01vcKrZIT4O20DQ/BDzPZ//pTUTeg07pI6FG2qm
+zX2HD4cE4fDdKQSMO8Pr4smySlze0VWhHtk79yoHdwKBgQDrl/GCOTOv5tv4pS6B
+5iSdVudtOBAWltNGNnfE9mD6+hLWBwmT4moJIxUTTSGvK6VopcKTSfsN4Idq7mNr
++4GQj0agBOCWtK6ToxBGWP0Lk3eVsetg3DsHgncNzQYLG3ErXY6icOatcKrMN5UV
+3lAPcktNLd09N7deiGLI9szOxwKBgQDC3ljA6FK/YufO971HotP5ICuxE7xlYaB4
+7dFlgkJT26w/FCYQ6dkH9dpADSO3kQkqbN4SXn03iLA4V6IuAgp6nQPLqYCJbfcx
+rsH/UIAyPn/5/ZKWdaJnH/3FvQNgzcXFdlmsmp3qFswQ2Cp5ord5yYsKrx+XaCj9
+vm3adS95dwKBgQCubX7H1aYpFBnFDDdUwZpWS6Nov9tZfi3KjEU8tNW0vDX59Jfo
+v/eV8D2IXtETqpL62c8n0dxot9ZLG1jM+BdDenDlxParXfbrJA3Gp9giG/qsAGCv
+BB9IPhX7R9Kzoou1eb1DE6gWvZYXQQfGeyR3az3JVK26x2eiPAQ3mlKkvQKBgGES
+sDXQxb/PPlisst6nr16v9vPsN/Js8qqrFZ+yhuYNTT3TBK9yPoonn8Q+h2dfWaiH
+uQx/g3MRpW87wG+Y1q2D4CspUf2kCPr36m4MJQBigBABkG9hRDiJCDrj0HX9q6KV
+NVC1aSr+lkNh267iLvH9Q0VcPamH2rukjEbCD5c7AoGBAJPE4jMaJ8hZklAkFSs7
+3OTOVttNFjM0EkKQA1JsW3zFPQCMNRPVTO8xFM9QRK7o8cXDBn7o0zhYmXnIBNtZ
+hK8AMEaP3sj62oxthIXJtfuXaGwiHxs4b1YTuPibhVjAKMNkMPm6Luo3dePBXrdf
+HILdXNsyGiNApCy6iHf58R2R
 -----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 972fb3766fd..42f366b62fc 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-----
-MIIEyDCCA7CgAwIBAgIJANM8bgbmPbKeMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTgyMDI1NTBaFw0yMjA3MTkyMDI1NTBaMIGFMQ8wDQYDVQQDDAZDbGllbnQxDDAK
-BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
-ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
-Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-APPrg8wo0lnbymmvNrKOi6uBQB9dsKlLd55G89/ZSBdoNFbpgZC5OsB2vUcfs3X/
-YCVMMlex0BdNzicNxeyj8Ad34dzpl5lIIbTPitCeh2B6+Xvky8lzrZeqtLfVczGc
-jE8TLxwCNKfsiFRHPzoZqJouwKOM/DYJWgnfRRNdV9KZX+BHS+UOEFZJEM9KUOSD
-vKi/b9M8gx2Lm8dAoeSFnOmz1nJL26MvO7t2aHGfF5wpQ9Qer5ShYAK3ISz5XV9Z
-shJ09rmzf3RKrTd2TNjDgJQFGKz9HWy0Eub5WNcd3vpfgBvsjQYXpCeMxc93+gEQ
-CvptWp41KJTakmx33MPR4tUCAwEAAaOCAS4wggEqMB0GA1UdDgQWBBTs8KUrZ7/U
-nC4PVvV9dUwvz5h0nTCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhrKxQ8
-MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
-Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
-VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcEfwAA
-AYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG
-9w0BAQsFAAOCAQEAW6XL6QFHkrDfqJ0X9SpoDqzxfHImq9h40A2pkQGWKPclIalS
-6mx5izlFs0p2t51EJGyMhoFWajbNTUNBk//18JEJAV3RHldMSqTSU/MUVmaM971d
-38vgmcNngw+Fnlmj3904cYNvzzE3iHwjN150TdYgSIWXeBvrK4Ai13zY/8hTr2c9
-LjzjuMlhtF3GvegjCBchFX1Ux7ss9Bb7iqi0+6yViqjM6Kt6B+wPOfz5kUjLdKkV
-TKVRL8XmYGs6uaql6lRzXZiAhC9YMpI10v0PtxesLOgNAVsLxo7zizd7e3KTzMVL
-2l2xdPOP008A4fJloXj37y/Z8a+QS4rmmB0W2g==
+MIIExzCCA6+gAwIBAgIIUFcBmK99+bowDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MTE1MjYxMVoXDTI0MTAyMjE1MjYxMVowgYUxDzANBgNVBAMMBkNsaWVudDEMMAoG
+A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
+cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+s1XEdeEOhR7qXNE8mOHnjLVlWL2DF7GVuWtktDo7NnWEBz2WW3blE7xrvRDRxder
+GUJp5932D1xFBAY8C16OG1yAHI+UjnAbrBXhDKyTs9lzdAKWjLvUJGkPTx7q4MUY
++c/EHv5MfJ6738lPGeu4zO1vbii+TUaTqp3bsKUR7NpRdV6R++ub0F8Eq7Ko0Xyx
+j+HJQOEIBEXOdN+UqREqOcCMKHyLkeQgDOEE0jwt8cpZhGutcXb1pPe4FbpAPgLy
+W6xgfHcn3EQzY1Qw73isleIbHJjmdFAVZV4Z6HxoOEWdepW3wC8lGhSSWPrZQ4Um
+5mMyYyNOrcbk7KKicHktgQIDAQABo4IBLjCCASowHQYDVR0OBBYEFNHVq3pPmr9g
+ywckIuERvShuiz/iMIHDBgNVHSMEgbswgbiAFIxegempX8ORk3njKGdAR7ytuN2h
+oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
+ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
+BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
+cm9jLmNvbYIJAPf+QvI8GkkVMAsGA1UdDwQEAwIF4DAhBgNVHRIEGjAYhwR/AAAB
+gRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3
+DQEBCwUAA4IBAQCEjFn2K61sIZZcW/XDReYd6TWU9JkwDaQ6+u+k60/fxqgl6tZa
+pzb8/s0MtZjYr19SExWkLgGDHXuTEPKXG5KGsKofQz2YyagSI5UgZr6C8UvDTqPH
+tKMTOlToB4DKyENdU98wgwrXcAIIGERtyNMpkq5drOtU5YFiwVjqQ/9oL/2xxZk6
+ZgmJrA/tumyXheR4FnGGRxxe0eST4OOFsqF5E8kL6ICNysSDzo/aofhbQ1ZKrRsz
+yvAdbJBUEnwyBGo83y9wdgXdn7GVviVW4bDwElD2ddtAgWRHPf/UuVuUcsOonQAy
+03Tt34x6nnjlwrCvsqaK2JTA5iFUvhwhFUxm
 -----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 ee3ae6fca58..9841234ceb2 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCtjM9H7oMbiev6
-kJpUowLkXvm6zOMr0DHyOL/++Py+yON8rwHSLBxdtHfW2TOWVNw4lDNPhuChch4i
-oVDo/lK+UM1m5/4wfBYtF17ZBllW7T8dwld4H1Yw4Npagae2Deq7gsSVEukAEMaT
-AHoTMl7zDXnHx9oKpupQO5ScUtQB/Uznl4KLvTTfP/J+AYF5ZAONrf4+AD3rgGNS
-uew33pAKYYnq+fsDJl1lGAZAsqYhqcU2xgMNMDVkKqY7b+CipO+BQ7K4uoA3eruc
-s9D++bGq09KEdgMY5l4uAtL9deiispdRhSwpp29+oB9FWC4sr6zxZLoZaTTSD4Ts
-A3rAxu6VAgMBAAECggEAHLcwgeanV1poCwa7nnb1bst/NycZDIIPjZRRwlK44Sl0
-qIf9fWTSkbefX5ODO2PRp2PwJH+88cGj1leKP277SmWswtLuhl+1vKLCDRdFl4I8
-YARsvCG1PXOq9XBAC3m8heeidscQ+fOMo7yftkbumnk3lfSNsZcCLKHbGk2DKkvV
-DASqMrlye4gP1sBdX+EOSX08gsMIlRHnkqTy9Vk6np92yb5qfiol7o7oczBjxy3j
-aN6pDRh869EaZER8U2B6Zv3FgcCDLUXQG5OwQRRPwXqO/i9hTPeuhZbIw0wYPKMv
-eFOVcjmt1QCr6sFG4ujOUL1M7fLSAR8O/dc/jvqPwQKBgQDKrRMrVZXU02/jUZXA
-xWPYAUOT7qMu6bEJeovmrnZ88O2++fMx9U86ToEmzrNsiUKKCBkZU9gGibQNT3Zh
-xuLXL0Y8eNX/RYEhrum8DPgIcIc/n5dADaKGZVuyU0581XTlCDJBTDixiGJEVvHV
-o0iNE6NculOR3n5HA6hdB74yVQKBgQDbNf81rEj//0mgTXkqQURgNIo9K+KsEzQZ
-1f7Zq/zplQzmKaDAaV8WdwCpD9OcHzmZwApciq0hXzL2EgojFFPnVZGJpJ8yrwLO
-K5OWKecnMAizhsP3kdTYCwIFrD2ir1xlbJZRZLc2KHe7dqMrL+fvxQXsqqFeLrjG
-2sIGq4iLQQKBgQDG5NYc/p5M/zmcAOJPDOaQgZ0JvXRSg28C+En2lVsd/WmysqNg
-cXXQqF3B8bLOXlz4DD5lRoyGzfft3/8ysPTHa1Mn4QVQv6qbnYUu0CNQVO3FGB5b
-84V9ElbMR0iM5QUUBdkbj2tLfaXBnvkwSE7Yc18rjoaYbZnKouJEeWbDCQKBgDs5
-SWwM0eQn6pJem/+ohnqfd0Gzm5f10DuyrxnL95Z76HI+iOmzDjeZixoh5n/lh8Bc
-O/BonwHHIJOOqCJ2GX0Ehz9ytHgTBGUDLOqDA6p4tcEbBdLbGXAM+UzjDfvn+MSG
-I851sXH2WPLSyJ6gYL9MsZ8RMmupn85Jx+XZbhiBAoGBALw4bL1n9m4sHFceeyGg
-s9mdGLoRpkaKGfB+A/QI0U5TB/hEd1KYYwaqVXFQXeKM8zxCOc/9kxWZQGjOe/Cq
-a0zkFsfokEdSBN3tZUIVaQ0XQeOaZbqMf0VA6M9h7xXT1SDBR/ePnScy5vGaphVF
-r47YlUl8VzHYE8E36XH6bLGp
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCek4IC1zEXAd+0
+yZB9LJoXWGN8rx5zbFA963cFnSAJik3T6/4XEBHojV/3hbZQRE6gP5fIQBPWka9x
++dVx5iW9BdLxfLJfro6+AjdwU7MlXJQt1gOggz+bHIMwAA7JYbMjwPeQnzAWyvk/
+S0OcwPeCd+oTHDKzaxKy6Bq0ikeDWB+HubKbeehyc21GNr4N6sOzrBsaUhfi6br7
+8v55+vA3wbMhljnzhTB+Xia/QNmqf4uHUgANUjHnXWwOl2eIXvrtmqSCOPblTfhU
+Zv7rKQ/cQe+Ic1KWf/CoknyKAOLxUuV4tK4tm33gRhBdeqag8MF0cUCfYdJp2dIR
+3DMYDFLfAgMBAAECggEAITMu4Btfqrp4tKgSuTJSXJrj0WH0lSPTNPOMar93yqeL
+HdhlzTxPE4ot0mvLPMjgUUqfI4zO2niL6+frmTofIpEKlgaObdvlBMEADGNpuWPF
+nkcVYVC5S2dPzAfnEKCE2fJ3om7BqbP7NRYz5Ki96THj7vZTYx8CvjQ8Cxp8WHIR
+XXe8o884bibtpKW+tYnoyE+6/tWEMs23PqFlI9WP0EFOpDGeMAotvC3pr7IN/muu
+VESXO00uihBHJ0k4ZL69OQAIm4rh5eKysTLsoWZOsycFbTrSUDudAw87kH7KPk2L
+RE8L6qK0pmzCSHdyUH+gy+vrXwjDq9ptND45fa/C6QKBgQDNkOQJ49reBm+bqjP1
+4a7dRCzP0d5K0tD1k5w6PPF662vVKkkREtp5cx6hdZu7LCfBk0imjwuV9khBz35s
++IfmPIJoWEbeXH5gskhY2fGFg6TSx4baIX3FMHMzTV4odArjl6Rosd82KF/ZEqgb
+qgfpzryi/11tDCuA/aQRw40K4wKBgQDFe00aQb7dsWB+nCcjiI7+quSsYotwg/r0
+msutzsuPH6X8A5K+wov4uv1wLLZFbEUUfbZCHg0cDvTwfar/oyq5IB7wvUZrbyVL
+U23tgDr9fepTNdPCAQjdAHK/jKHuWwevJ4b3aFHtSGmzePx4a4BkWiXXw0cCQ6bf
+DOD8XwPs1QKBgQCOJj561FS6Kcst4sGxqxFnssgmIaNNLIERALUM1K3L6VYU/vut
+0dLAHyo0ToaVJRCM3JNlkg9Z8QfAcoKjSi13uaoYC8td4qoFpeM/hd5tDD6C/zSy
+TGyTWlCfTkXpRW1uOqOXPkDzS3IUQsF699YnCS4KrPnm+X5v4XV+TzKOLwKBgE7M
+IjnF3gjLi/s5B4zwIk6PlesK7ySYJPyQ/5B8oVCcijiCnH0tV3iJ9DJcROZyiyXf
++2dqYkS92xJSsnaKfrObk3zvqTeZA8KIqaZIskEPiv5kzfftPcIhOaggz0QyYmCL
+Xxk9MOODL1oDfon2KybfqZXsP1sx71W059kLeJ95AoGAPRjFWP606dVEm4PgqH3R
+GFU/cLAvhmcy1MV4tj4IVYld2DG1C2snK22mMCcJzRju+XCAttcd+gamuF/xPJ1O
+x6g6azzJwG7jEu0QDKhQB3um0Vuy2PBcFNWVsTGlw1iC9MaDtcE01O/7FJwlWVql
+sg7QMDyyMyq70KFrqka4qfY=
 -----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 97b53fdba13..023c822616e 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca1_pub.pem
@@ -2,27 +2,27 @@
 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
-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
+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
-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
+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
-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
+ggkA9/5C8jwaSRUwCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVu
 dDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca2.p12 b/cpp/test/IceSSL/certs/c_rsa_ca2.p12
index ce37aefbe41..678daf50327 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_ca2.p12 and b/cpp/test/IceSSL/certs/c_rsa_ca2.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca2_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca2_priv.pem
index 0b191569027..744825a7c8e 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCQ0ZbliASJBzaW
-vGSM6LTQCj1/jPSHLR9Tbu3dQEKwMlIFUlstw+oOaO4SGbExwFNZ6yc3s+DqFJD7
-qJs1+izvnZG3ZfGEy0AMD5sQXC4qppWkw6AyQ7DtzT497VG0DmX7XhU3pDCUBh+/
-aeUEi4UWBLKunP4JMkab60nZnOP20P75Z/MSUrGQfqQvmMC6ywap9L27FAdqZXZH
-wBbB39PMlWjQXys/9Ih8eqQYdA/3Q4LRraW+dJ2CauStacv1cASrD9h3qhnYgc2J
-qSJ6TRPqlFhdT3NkTco7jhK0mJxLeOxJHJoCsQpAxCHkL5lIaUZiNmE/WbpteoSf
-R1etMwJzAgMBAAECggEABuw19JKhdjQa5xlqDGsCsF/k8QgkbPfPuQsi92zJzfwX
-JqZOsdaH2u4nf0RXekOG2H62DmLHZs6FNbp+x5WbeKLazd5jgrpn5+EGbmxG+rFM
-PabqWAIbXurCRcSRSh8BagLlLGvpXzzBtMKTo47QgFfI0Nxer8La/uYVpCpB+CY9
-XeLSy68+RTUyLPQ1cO8eP1f6vlQZNQKIFLbggQad/td3K5+RkPLzXLGHNPW1nDQB
-Wk/tBEb1g1qv+6MGTvF7fWZYSX5Hp/+9grFTioXx8vp0y+zAMYVx7h+4ayCgC6ih
-wdFtVJLVPRNanC3r0M4ZsdvRk6hD6tOeqqlVmjtL/QKBgQDKtG1AOnl0BvC74Ss3
-eE4PKRk4/4bvo4scv9SfV78VpqlPwtMljm/JuP87MMEGLkgco2sFnuTvDPP4UsqL
-u51IL5I8YV8XdlDMJ+NU2tKRRRNQZMQdkvQ9J+pzpltdlWvnzI7ynFkoxNDECNbD
-wY6vBRgRZqc4yPs79yLY22QqHQKBgQC25P1B/m24dF2YmDZmj1mcNBFLJxnpldFk
-/egEPrawOBRv2rpTXLzYLcnyOnhVcmU3OReMX1sFAq3gWzGGh+DWbEclGIVlbUI4
-IvXtjwOaeQSR8Wrl9GhtXZe6cVC4SzGbBgmlALQZHMkowLuIZXrnHwAKrTJl7wE5
-oB7qzP65zwKBgQC3EtmRJr7GkfYeWbEkeh1WB/JlzjLagESGBKNN/nvwXAOSrAzz
-YH+KGvE5TkEnCenLI7Tm8KknVfWKk4unRB07MuvKaM7va8ZxfJ0O6EtBNLfK5hdR
-9oVsLn7LULY4AVnhkpiQebD05zz9sFX3mvr5C4q/PI1O9gYiFIR+gzcl6QKBgCX5
-1jxlwBKU1vpgYKtbCJhOl2irbc36tcfqkMqQ2w4sFtJC8H1uvCeHGm+ZhHL5ldqp
-mCIlipi3vbLgPKBahmz/fqZNOSWeUiml2LrC/1SL3E8RecjVvvk2fdLQxJn/wwUV
-c9s3Ei5Es+AqZMYljCeBYFjXLafMwMxeWw0WE64xAoGAQyssyhQH+pmoqfBbffUk
-xsKvfw8DnU4clgVzXJy1BbAP3JKtdG4UHemzK6A9TR8STLcY6YKGNJNEcJpj5Sdf
-4aD7kZF9+hHFo6X6fNP2VT/GUZ582bUBYsF+t3JQgC9YFnxBl4NHclGhsf7BfdjH
-sB2idyE+WNyGfsYMwGiS+EA=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCmBMTd+FPgajb
+LhMhcGwL3+00FTlkKECM2uJ7+52rJWYydcGa6OHZlLslJtApkYm1diLZceqFTjlk
+YTl2Vi9Xfy1X3RJgJ9r+wc6oeV6j+3CS7T47Zs/ki9NBjW+lsG7WVCyTYyBtmvpr
+ZGv5BZL89zS2uvNKslDJC6WaJFYGfNRIV3E26JYF/cTrpoPM36t8EmuMqKGoBPjp
+2VBPtgE6zqga27uz6unelTD8WuK+LvzgpYlMpCEz6PgyyNsEO9DSeFC/WV/AZot2
+vDV7gzRGDtFy+V1GxM8rFm0gru3bvxW9JoJLyIsP8EmJyHS4VHRCERlv3QFXOV6/
+0ddKs5Z7AgMBAAECggEAFZhc3Zc7OOCRxakqVFaulu7F2zbTxKq25yrPYaT9zWV8
+HvN0heV8UvIvhqL1DPfqyWmP2oPK2/pfYiVsBBbycApcFNki1er2YblOXuIBP7+C
+sbuEYYE6Zwmhay/wCPo4gq6at8yTZ7aAPfTKCru0oUAp6HF82HhLgNQ7D40iwttb
+u1gE3Cp7hRErD3Sz28Tg9dqc/kfhrVm9XGotMjEnvQaTdLrBqa1j2RWPjGEcfeRR
++W4jP/OAVdT0EmNx+FPGtVBAmLKEgk7AMtfyxZPR9nlcZH6nmdILtvlFQ5kXa+oK
+q+YoFduDQac5+MOU+rO9NowehWPiNjH5Cw1661jnAQKBgQD4sPeBlsyG558WfV0v
+HoK8ePfKTfnSgKYTWdQa9OlTnlZPqQqzjZDBGmV5lekvfWW8fRNvlVQAK8YnFZtL
+UtvZCOmrLRq83fke2JDKLvyRemfA4/jwQ/0YrtsP+MIoMnmd3SrAi8vtO6C3wNOz
+D55fJkReXVE7aCNhSgoOCrTdgQKBgQDIUBsvky38eqv5IrklW4O7a5a16QN/qsCw
+VjSHddHa1cw0/SAcBZSSEGmPjrAusdnVteV/VN79ii9Z2Uv12PJ2rOgpAUHeBkAk
+FnA1/VffgL0IidNnQbpRiOdoG3y76TYH1vGDurib0TJDHcPx6AspIGYozdLseUT4
+0B30F8Tp+wKBgAlu/RSHWd7MLna17rD44VCw7gVYi992TdZyE9+p5qfrW67N5MAG
+4LTSgYLpMt1ATnml7PTQn00aW/vjj+59iCVldyetIFSFvwtyf5uLyLzj/ceNXkYO
+7izfhSPH9eV8dKyOVS7UnrmzB1exEta6AvHtC67gr1Inkx//pP3/XfkBAoGBAJy2
+Tw6BTtDgB/r5N3AKkJzoJxhaG+qdY/KQ/rebbXqPGRu7jItfskQzouI095EQgyO3
+ErzzYSFqInFglxTXjZla3KZ33Vgd+8A/7bnPYhfxV/J+IW3+9g0j1iaUmplIcoTf
+nEM6qYL9vxzTBKEUsOaT+lih7gojNdqSt1xn3B5RAoGAa20HfXVJSEoT7Y3Bw5NH
+AB0xS/L1Ub70oCd0kHgTNVB2XtucZmgkIb58qSHM0K9UTw6Lv6mgr7MJ9yTY0NO4
+gJofzkMNsaodPpyqU6bDXws+5smVxVRjIUK3Bl31N9vf1++REjw3M+Td+0hFlpnt
+baYTm6sliwS2Hc/GGy35t7g=
 -----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 c1560e10e67..3217dd1addf 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca2_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca2_pub.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-iRtY
+JQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQA6mzKWN+i7UWR8Dug0
+ZnbLrJroGj0LXpwu5hNWdfhYPyt3oMOQVV7sfrWUHnNgvybbW+QWRp7mox2/Zm6y
+rwYhL3GrWXjXarIn1eSrtxKoWeNrjgzKUJRHwnnItHD8Rh4RpIJ/SNPwu0luUrnX
+TGlk611IG6pA2O1KpEefoD0MI60I77sXrYUKn9RHoKwmeaibKpoYEDBhjxJOt5j1
+3FnmuSEtHS6fii9AWr+xmU8kuidpmLqDbzAiJI/bjADaSTohW39Rjur3+WEH0lrb
+54L+cqWfr3k1HB2nGMRR1VvFTDENmgrJKpDMG66i3hcMHdhF+hUEBxZnnrSkURO+
+wnWV
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3.p12 b/cpp/test/IceSSL/certs/c_rsa_ca3.p12
index 7bee24596fb..c6094d71d4f 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_ca3.p12 and b/cpp/test/IceSSL/certs/c_rsa_ca3.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca3_priv.pem
index f79d7824762..8a74bcde37b 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca3_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca3_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCnJcqoYaq589Mt
-0gyelqTdrH7FJ1bP2M/FrvQp96cxedB8L2gvLoIl/xQHe/l2MD+dPnIQhDBf/PsI
-+aMErbuN90xVu/dWbvGiNpkob1lJd6DEHPbFRrYWnqgOTObd9T98PH332pc+lOlD
-5hbQjio3/0n0q4ou9INbmIyytf6ewMx/i8SLyDtYx0+IqALq67HHZq36Uq+h7NEx
-h/4WhYvsFHUKLVz9EgdgrQkrqJKv02hWhc+AP4UZKhjd63uxB1d5338UHDfeeOSf
-pe72PdO+d/gEY7ddi+B9OZm6Hpnp+ztrP9b8Ma7+6WoWm0+DmDSCH/sRlYUC5TWw
-NJr9J4VxAgMBAAECggEABrdwjNKb4ywGlOVHZ4oDJvs6/t4lUWXTd4yfuB4BBG5y
-L8NR6u9yAGffHKvhKtwmekGboMlHDlxilApAADyg+EPzN9C9UCZWJGAQSH0s99RM
-TAUj72p3f7Ixa52we0PTIMFniHGquTOPqhBRY2ELFkP2a1QHUfq2WpRnNvk0OZnS
-GxCYVRg72M7UtNgSjOgj7XCJaLxuPVVzXpBTqW5XEjeLnCsnzMq4OC4O3aLf73db
-6EnwezaBlAUSfSoBfP6TgRTtwich3UUKZLzD00tAlJXIebT0Wv2vWCI2prRujVvr
-I4tLTXp9oZCP3fB39WYGCRGsj9NXpAbEOo8WE2oPFwKBgQDWn0npoBTQB/EKMnmM
-IUS2iAU0p2FIqChxucO+Fg2OWV4EYrqwxRUbyGrh0ndhm8C5nT7EyvHVi5g+yUxD
-i6iV5E6YoXGA+eahQpMwGPYRgiy8jYNE2fVbEthtpX49zG5UyKJItA0BSiefQEHg
-FGvSorrQvZVNNQAwanHiqQY9JwKBgQDHX2McUu4wEBQYKoHtoLVu3rW4Ytor8a4k
-ElvG5yVD8mdUJqsz7Xmv3pxb99zOq3KK/CwWst/cHu5k30E0ECwcQ9HZ8tj7+CsP
-VGf95hH3OvI7RVsFmLodnSpqcrd4eOGR+ENcVqXC8NytYgGReGjzMO7l2Cp1ZiIL
-BlmG2WP3pwKBgQCTMzsJfl7n85pxqP7Oin7LRm1zmJ1TrOnYXlWPiSaRDGA8V869
-sN5yaLpN2gFBNAcyB1Rmut603QJ1hbDF3wKok6cIbiogEMYKslOrOGOEzKiMRe7T
-iT4L0dgZE9mK3yyI//a2MK9+w/J6+iJ0Yu000aGZy32cL47KpicoE0+RHwKBgBTJ
-dDryxpTKSF4QqIVPGTubCtVTsS2dwCtQorMFTJReBLn4YidC3kog6qqIGESQCZxG
-GI6xTbfUncR0poa4HPFBfPK9aDQ1NsAda85EG6FsSu81Fv1pZBZMWazJkymDaPlg
-Kh3JhvThShDlxAYXyNF6S545QIwG/wupONJffhXHAoGAeZ7TTa6JXj9POjpisP17
-2S+m4zJ+iiqXHby9QWnv9fsuMHsqyMt4RkJa5EhSFuUmaOoF13QfgZZ88r3nKiV2
-XvrPElq86Z+d8Esg90mluz6qf2dOGcvFs9fTnkiM7S/PfrYUKgX2idRLUHPjpobH
-vQ11mH0QR5uv/t0Rgcs/3Uo=
+MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQCu2o+Md1PWgC8S
+ScUMWDzu8GCCx57o7I1Cp/s7+nguIb41DHLxPjb7GMNiIuhSKRxw5WILdlHadl7r
+IS0mRY6bLVS366kM/ZaKhUcECjTEAFItAidlnYNvSOeTz6wOaSpnO0f9GREXlbCE
+jgOPSOvns1NpYesCZa/v2vMndnb+li+Rma/C44m3RrpQrAOrCVRE72hCITK2G9Ap
+Hpv5tsgmnK/re1mrA9pBMSKp0lyivkoZiyAd6uhozp28Yh6c7deE8Hd5vK495pin
+38f6eVrq5ejy/2iFRBlHuWPLfk7g0UlfsTSdW3J3FXoS2dDpwX3p5BH16/6JETDo
+ZO3nFPsHAgMBAAECgf8wnjfXebOQNs5UMC7f4sBUafZr2xWC9EM7opDbqCZOIc3w
+CW7VGaYBcVWcltJfS8k/muViSoPsUeZBHZtY8aEpsys4Vat9H7/qla/6zK0lGGYe
+Ham/aN4i5MV/U/lUwqNNhUV/AzN3oSeK+cNJcRSEKczwUdVMYPnnoCgqiwvRA3vB
+xicnVWLJEMUjokbpGzmtEvj+EmAhsfn/e4bXAC3GOt2ruQ3qz9KTDUcEwP/d8Vbj
+An9/yImvPC9HG+RdHe23tnQ4SpepcGaZSRRGx1cN3o0ZCmV2HuiNEikeOHaPykTR
++YJ6Ta3zTZciNQD1bTBIzM3x+qDJM2vshi+ShjECgYEA2x1HrIxwB7OcRk+03ocL
+tOEH9Xmdq/za+rBSEJoAVhCnpKO32xhWniyRYwoISZl5IDu2gCP1Hh+2+qQQImAw
+MDjrt4Vjth/erZO0AqJkGfZBwWALFUu9Cak9neDhOHZH5M7TNcUtKk1meVTBWrMa
+vvI0sUapISNHK/c6Bsn9IckCgYEAzEnfQEj47H+XIIzBAnzZfyarPuLWOneb/Xtl
+9SBZhoL+1qv7FUhJeHwQbKcyTkT7gxUjBCdf6kdLHIKAyC/1KgRmN4hjx5H77EAh
+KK1GCk14yDk0Q6/8FgfVvWPZHhCyN4pu9GPOP2c2YEaB5hZe8Qymjrg2qumCpvx6
+nDjyHk8CgYBNsXYmoq1erbst2zlg5jWqb1hpHDRiNYhX94lBxbl0yvcGk96vW1Pr
+RhZPLdF+d2LRoRq3GQjjI4+4E9B8v+qWTriWHEAc5fQJTCQ6AubHpd/u92U2qeJf
+uJjWkFSLtrULVqLhoAbBxywcvYbJ6FQFfNBeQ5XY4C9uUX1LxvdwsQKBgG8XkP9N
+b4h0jgOWZ3Np34Dkz2UgR+19k+eRjk1x7R1X6StmVOEq8UFC/k+H0LR9kOSkvukI
+XIFziaYUVeIHKmRSBiAW3GPvwDamXSHYsGjz3kXLzd8tOYHletdGEBDodXH8pv/h
+sowKHajXTtaHvdOJ1J1yEdB5saILVMXVtdzDAoGBAJUqwh6TZGU8M/8xCkGNf1Wt
+ftdNmNj33ZgzuOsCB56LFE2HheKabXh0/8gR4Ad1IKsF46u2NcNFWAAJxzU+O6KS
+Z5ssgjHdkgMqkkaW8hSLEh3DctGOlq1TInwXMIMpEsZ6cTFoaYWGmhOO8fyDJZo8
+fY1O5UFjvwbtUP7GWmF2
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca3_pub.pem
index 94680231209..1bf976a9c42 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca3_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca3_pub.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-cm9jLmNvbYIIMzs7dCK159swCwYDVR0PBAQDAgXgMDMGA1UdHwQsMCowKKAmoCSG
+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
-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
-lG08H+4bASM=
+EwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAAbZ2T66zToh
+H7XlDFCPcPIrzzMEtLUDfc16QJE2QC5R5l6DL9dceNTi2Uq+rAKJ3BDJxguTvQD+
+eLLsm6MmADovsfXLOgMRcfkAj6J5wrKjtUcar0nbgb7FNoFAr9oA7ES37zdF5Sa6
+3mEeNdDnEAhnfXdwWk0IKdv3IQpcJqF9NfhZklNg5wjW8ipP+Yy49iN+ByhnNSm6
+9pYYx0aziXGRJA/SdKuiub42RKstImWHAeExFrBPrCj8fkc0EUtPZcmB2/NXcJFj
+A2Q0P50e4k+MZS1L+Fc8S0Iad86yd9T40Q+G1LrrovCUQ2RjKadhpO2xukK29QJ+
+52tBTXv8G3g=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked.p12 b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked.p12
index 61f38fc2744..17f365d4f13 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked.p12 and b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_priv.pem
index 02ffadf87c3..26fe8faa6c6 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDy/fDTheRgoP2R
-SJ7DY1u/5E6xEwpeX02/vImD/RzBdRpDBgkSsR1Y4QA9G87OUlaFOh4OLyyve9gE
-ci5MHASM6vn40ms8bgjxJbTUWzy0v6PT36eMGTmVASFZB2OJzIVkgz+rrU+GxeFz
-kyhygopiv8VJtQgkBieZLjQgJ+wX3E2t5ybBS3uFHWiH2HuSkkXs+t8OlE+KKNKo
-/1ZFmaeCFfyA7JcPF7sfmh84zdOcJTyejwfIlAVb98aBl2Krf+E0ciQVB/gHH5l8
-L3daOvYIjvLvmuupArofgYqXSK003KZsULjSwhQ4n6mC5s9GbY5Pdwwxh6Rs3/yF
-wncEgOhpAgMBAAECggEAB9a9wSUg0L+aaBuh1SD/oblTLI7PsJ5+DjRrDBExr0ma
-A+JOKQZofiiFogyjZ3zsG51cJ0FjikAb7OP+FSh5bef0RNzZs5GQXXv46tM/dxlD
-k+wAJk3eBK3y2ttl9tkPm8ZI9It0jritfqJkFXJoPBB+fdOgPc4RBikIBEC/DHOL
-DWJKiRnhjaO+h6vyBc0TSzp8vJ9DVJI4Xdo45u67vYCgp04C09cS2sYmSS5Dkaoy
-ymDWvAyyTuZ/aMWPS8rG60gwQR9CW6RGm7Xf3e+PagXogu1iZXZfhL8v8fBitWRp
-GsRtHqZ+4nGpN7L2lQO/HOP3BRNcuc/HqJmHd7k2bQKBgQD209Dd4vu4hivgAnb1
-k3eSZL2IVMaV252bDjZgQd2YU4pcB5BK0fZwnwsTDuTHb3nnHPY3KFLGa6UN+Cf9
-V4eNiKEaMCiFNNpXxLPbPD2c77hpU1oTH1b+3s6D+YNKLzAD3yrDkEYLjTvA1bRD
-ixT/hRswka7BM4hK0sboYBqxVwKBgQD8BaLsdN4tLHXDS1K9UKfsrBVWDwYiB5J9
-af0bK1NPpMcV3O8P7ohx36KPL+wa4gkrQANhlFYT57mt2UI/KuOI91AQyFTLnRXh
-vuIfvIMbDflSRQ9OhK+PYYA1AEuFJZo32mKixEM6az7ZYEk0C0V1jTmmXanuJiyH
-1IAvxuxcPwKBgQCNvu5/vk5YlZS0vDWcqedNBtVhaW3xuYE0/mBzvt+HDtKyLxXK
-IfGok21EsJTpgzc6ZgNvgZSnpkHPV+d/MbkCqqf55hYfCU8qgCfZiyrG6VO6CMf9
-m03WaBWo7K1c+ORWFN72F/BhyeW6w/8VmtWgN8x5g/Abu4BVl93qrOYnWQKBgHle
-GYT4DxsAI0JGnvTux7/Ra4EDQTfYH7Ln/O09oyRivUGJIVOx0uHMChQcxv53RmUe
-scInVoDFgoT3cNDMzcDjIRrD7xoTbztE2s7f0N+RjjURbvqoKYfKM5zSpIvdfPRS
-5lduXtXeWekDVp2KpAulVFMLHk/C8IUFUCoyCRevAoGBAIRz6ePhSrCLxv3PMJAj
-gqasGO+/nmeZaURLl3Hv3r+Br7rF1PMiz0AWSuh3l5q8WUY2AfTVP55Y03q0iG3w
-xk6p49dpoF5wqP+uG2aondh4gWA7BVTFh6sZN34tVbX/tx3Nd0o+scPuQepD0xER
-WsZibhh3Ovp1SQKrfs+NwDEn
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0RFpyi4llsuWv
+9kmJGThgd4+FOGRHWfCRRrTAos4FPRXwzg0Y3n4ScaDsPPuRX5bZTgmIRg5hk2/F
+Dingi2CAEoPu7Uy08GtPf1Nx0vbdgmcJTwJvWthHA9R0WSs/1tPWr6n2jkIybfs9
+Jsy9onxd+QquU7CqejYlh5HOhZXfLY0dic/NIKse0CSYe/9p9upj1LSjAnp6SyNn
+7FeaTsWhcERdnGv/pDoeJtL24LO/I8YXg1n+NEGRsoZJCmnCmPo2LElOAkCZdn/B
+695iS9PW7pP5jwgjOE2wOkuETuNzqQqWpy1KcussjYXskqr9kqTEMQikL/YiPcG8
++PIlwr+XAgMBAAECggEAV+OVl5BJomBZFPQGwUWfE4VnX4PxfEow/JuVB/C4cpxo
+RJopj4z2uaZV16gZ3TRWN0eRZTQG0fMQxOoVZ8l8eKTOV2CyC+vF3iINfIrnWnM4
+KjUv0jvgA6ut2zYYXI0whlTqEHAmfTDbE+MFYpXEfgqsdvcNxOhF2wFgiOjfe8oH
+aNpccfBSNhZQM97RD2g2FYbroIwEd6ja9bJEH4PsJBw5WxzA2KJQuLmD37qCl50y
+QXcVVv5+ogHdBV+2NQaQSS6x+4evL+D+tEeIolwPFzB99LIJpfHSiAZUhQeQuv/W
+rZiQ4Iy9JzPPxIrZF/4YN8YRG2TVq6VcHIv+sfLUIQKBgQDiLVJGFBIQmh+oaI0t
+qZEi2fHNmwz2ffxssyAF4LP+JN2PVQFFOZpMwxRI1IOtiJXhJVqJ2nzllQ5sZa4e
+LdTnJNl1aPvtPntYXvsNckqsE7nfaVcpKZesQVorvAapuCuLVOgeKcFDQMq4fuHv
+kBsxs04nbg+Jddf0iBM0zWM2YQKBgQDMCVL0z7qDeQxEW+DCT5NwdZ7Gru8Jr8Z5
+eZWcia5c8bdORj6jcpLW7Rddr7Gv99SzUaiReEl/zdThnVzeEI0uuQZOB7X7CSmD
+lcxb1igW6mAXsm7esNoHKlOr2vswZ/EQLzmRtGFY3CyRVBRUtVoPZzAlur1u3F9k
+3lYJUH5I9wKBgDtwW6nNBn5UcrNoXom8gUbebdxxvfNdYqQSYv0Ic2T7vTo4xa+y
+lqlLrx4As2Y8ed8EWQnXYHFZPcQg6KRHuSbRmVBwuZw8il/L/kAnZBZazMM4xM4t
+fw2m0xKhREMAAnmIY8Phh0esVFouBiRWA7+I9qYIF48xaAJ8bEe5HjShAoGABy3k
+z1xn0ax2tAkPlYa7R1+8IH2TR6H5t9iBXSqzCe4vZv+twI6NgCaDhfZiqDBuOYkM
+B2JWI7sYXH/u/plSfmxgPmqjCpw967VfpXOZoYTJsMvEfu12Hn5sx0VDRWbC4rDm
+s6vHKRtGLi7pMDnZW2VkGk/Bzp7OdHwmRtmgN+0CgYEAxBaQhJWJWUxHPTKT6L3R
+k8hpnLg+pB+U+esi0zZTnxPtP+ls8YhwcV/fHB/RYgoRMwye3uPY1hr880sDMMP6
+cYAnCkZiiHusCdtphU6E+zqVvT4mPdjFFc/r2cZMxQXfSPfni0jp0Q84G0oS14pG
+FXaGq6QBDqLFcAo36kkcoDo=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_pub.pem
index 0d103be1b6b..72f1eceea20 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca3_revoked_pub.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFIDCCBAigAwIBAgIIDWOdbRTyI9swDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU1NFoXDTI0MTAyMTIwMjU1NFowgZExGzAZBgNVBAMMEkNsaWVudCBjYTMg
-cmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
-A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
-BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA8v3w04XkYKD9kUiew2Nbv+ROsRMKXl9Nv7yJg/0cwXUaQwYJ
-ErEdWOEAPRvOzlJWhToeDi8sr3vYBHIuTBwEjOr5+NJrPG4I8SW01Fs8tL+j09+n
-jBk5lQEhWQdjicyFZIM/q61PhsXhc5MocoKKYr/FSbUIJAYnmS40ICfsF9xNrecm
-wUt7hR1oh9h7kpJF7PrfDpRPiijSqP9WRZmnghX8gOyXDxe7H5ofOM3TnCU8no8H
-yJQFW/fGgZdiq3/hNHIkFQf4Bx+ZfC93Wjr2CI7y75rrqQK6H4GKl0itNNymbFC4
-0sIUOJ+pgubPRm2OT3cMMYekbN/8hcJ3BIDoaQIDAQABo4IBezCCAXcwHQYDVR0O
-BBYEFMD7rGoH8CoJuZn2X772BEWAMJhtMIHCBgNVHSMEgbowgbeAFHe0egLdUvhu
-GR+r42ytSFEH5G64oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMx
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbYIIMzs7dCK159swCwYDVR0PBAQDAgXgMDMGA1Ud
-HwQsMCowKKAmoCSGImh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2EzLmNybC5wZW0w
-FwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
-ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQAD
-ggEBADgGhqe+LXYXPBHRn3E6VkPWQvsE/b51fFyytoTcke6a6WvXHLb5KuLhdzMU
-jotmb4NAQDqfslq+MJUXcHHFLi/3dS2p1/mZBm797BEGbSvwBm2N5O+FYRjbKgLN
-l3aPncpqIfQ1EfU+gy+ggPBmb0Ssjyvz0lxn4fBjA6m4FwA4ged4S2dfcLlpKr9x
-wZfaYMovPVgs/AwHIrBB0veClDiynrvBlIc9OYYbB3RO/8TnkhtKyBGCLqcCEejF
-ddtSvTH1aHA9NW0tnTVwGtUP9NJjKLohcAxacYJ+dQeXfrD401XRClEHE3NNLGjC
-wzFUrCwDtHy1FXmp3GeKL/pOW2c=
+MIIFITCCBAmgAwIBAgIJAKjqZpTIWSFnMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTJaFw0yNzAxMjUxNTI2MTJaMIGRMRswGQYDVQQDDBJDbGllbnQgY2Ez
+IHJldm9rZWQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAO
+BgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0w
+GwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALREWnKLiWWy5a/2SYkZOGB3j4U4ZEdZ8JFGtMCizgU9FfDO
+DRjefhJxoOw8+5FfltlOCYhGDmGTb8UOKeCLYIASg+7tTLTwa09/U3HS9t2CZwlP
+Am9a2EcD1HRZKz/W09avqfaOQjJt+z0mzL2ifF35Cq5TsKp6NiWHkc6Fld8tjR2J
+z80gqx7QJJh7/2n26mPUtKMCenpLI2fsV5pOxaFwRF2ca/+kOh4m0vbgs78jxheD
+Wf40QZGyhkkKacKY+jYsSU4CQJl2f8Hr3mJL09buk/mPCCM4TbA6S4RO43OpCpan
+LUpy6yyNheySqv2SpMQxCKQv9iI9wbz48iXCv5cCAwEAAaOCAXswggF3MB0GA1Ud
+DgQWBBS4sVPYW+4h2A3XclmTSUIJiaRcZjCBwgYDVR0jBIG6MIG3gBTLqp8sWC5R
+2KkIfe+lQDFecLhq5KGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAz
+MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdK
+dXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3
+DQEJARYOaW5mb0B6ZXJvYy5jb22CCB5kBZmwS28KMAsGA1UdDwQEAwIF4DAzBgNV
+HR8ELDAqMCigJqAkhiJodHRwOi8vMTI3LjAuMC4xOjIwMDAxL2NhMy5jcmwucGVt
+MBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVudDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1
+ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUA
+A4IBAQAkjz1gciLx0WxruhG8esbYeh0JhxHnzxgOa1KeXdv9lEGfgQY3F34Dybl/
+TKvyjdtyHGBVVVek6ofDaLhW3lUIctdI5DYD8lPOc1zOWJbIGyZBkqrNYyYc2n0r
+VpDmWI37d5U8Amm4iL7dT7VtFp/YDHj+pLsAVzVUhij93NhWMHYQmq4Uf+jdPS8i
+zPa60/Dm/sFMzb/kvz3BBbJsJlDcTa3yL7Dm40ttJ0pdD1u5cE1sDVwMxqcFiTz1
+0seE+InjEzdGWjOQEa7gxA9JEj/DOhFKViBz1Y/m449eLkglHnCGUjr2lInMcDqq
+3e5RzEo0xx4Ho+buCAlpI3JGhvHz
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4.p12 b/cpp/test/IceSSL/certs/c_rsa_ca4.p12
index bf3369e9777..1144c4cff7b 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_ca4.p12 and b/cpp/test/IceSSL/certs/c_rsa_ca4.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_priv.pem
index 423ed32b2b5..21eaa553d4d 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQqbH/vtIkYgV/
-Sh4lO62sbQtRni+QI0YI2j6hCp+lUgcz+S3sa+Hs2gw9IKzDIYNh+CmYBaAbGN4e
-Q/EGNYWyzK3CBwIVLmcgfyJGS7yX2ywEV1XuAvaNrHQpOfKwXKTclSZrqJ3Kw4s0
-NIcmpAaZ/2/dzcm7fCWQnIU1XxDilYJc/hbZFaCE0X5rik0z8anSZpj3w9qiZ90/
-SP67Di/YjWGFuoWnpsVuTDvvL7KeEQm3HnSZ0YJ69Il9BHcXPFf43W4xXXe9typ3
-/tUQ4trA9ocw8E1tcDTu0pr+49QYE3KuHl9hWlSu5jWvq8f+I6A+F5gfiDBWMNMi
-k0lko0L5AgMBAAECggEAAOwP0fq/tdjhDAG4gtwWdye/QbmOSEDhLR04RH27brBD
-6+I17IFzQj1dNHtg9ckhLSA69a7WA7lnK8od1hV5UwU93vQ1WwFGKInwbwbnOivP
-NkYUh/3I4nsDYe0poa7X46svWql9hrzpuT0NPDqTPglDzZP8eRh9i4gOr8mZMQcj
-+cq+BHJpCuvfWSg2FpGWWxsVpSLvXqzQVxjhcJ9ayCZujkkYMO0RQven0BiULprO
-FSRX5tO1h2NDWS8Jo2dgeN9iO3ULXYmuHx5CoI5uMA5j6p3c6L5b7aULxHhqP0M2
-PXn71DyRHOx0nDfonK09Y9dvDf3Bfhv6CpjjCYUMoQKBgQDxAO6JjG3aGycnCCwC
-1zFPQHmtBiBf29TF/zSCgNCzYml1YyUB5EqOXnv2FzMHE4DJNKJ0RcxfilTwqury
-0+InAO2fozAeBY0RDdK3tfaAA3/l1VlzWR2NsSDyQjnRb2uxYCRq6BVBmFMP0C/h
-P/sEdH9Q9Y6NdEwbIRhTw6/i1QKBgQDdpZdWys3bH4iDmaJ45kGZWNbKlJvgZGxl
-MrXPVZIcgolphc7XwmqHV2ZwUrdPaMaIHKrlB1Y6C/TQEhL7Pn+YClTxrIh3grXO
-oM5kRd5lVoCA+7tNIFWYVlcXx94TG16ebwfepN0Cnidij/pIjQrqziuQPN+TLN1C
-/UrgpP/JlQKBgFR5+yMDsk3NTsADwUmNnJ8m/n+Dsj1nlQGCHynPdVgrmsOm6QXs
-u6WDwPfV0fEdCPt+E6OmA6lJl9R0VL6hPphlXuWiEe+0Cmp76eyzP6BHmcE6M4yX
-JCDSgbXpONMMtzcJeDpw92JyvkrAssfF4XsCSs5aBInYxgSMaTaTVUexAoGBANN/
-V1HyY0xcYp9w0qAa1y3En/DerX8JVIWcRfB57tpVlVmj3SP02EIdHBrCUzjq+caX
-1FqHDbiGAC0rkgE8OfSSp0uVHwMrLuDkgQ0dvoFkcWqiyq9l00dx29lNVpNU4oy7
-1f6Vwm7lCx/50xG3xFsaMGeKLqz5eoiZugFycMGhAoGBAMQLUto/zb3in1qevK6U
-d8lIXN1bwpywlpIIAW1MVRUbpeiaZ6Io+odsCk/piVF6JoO9R7HlLr6u763dICaG
-W4T8CncJO4iRVRCIl7xsUU5EiBk5fuCYCMMlrHVExhnr9I0cvSHFmwbVTsASLJdJ
-62g2n7xxvqsR7l9/AB+JomY1
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC1HIuwqVUl3KAR
+W8qci5cJG6wlfzYMvh7E/txBoj53e9NFhMH+id2baU++uNSn0geIa72Ep3e4KoDI
+tOMi21bL6PIeWcvLwsXn7EiUYl+nPWCIg7jSrAwQcA9dtGvFE8oLfo98fOqRLTYs
+HqY+fAkwxpHwYDO5nYSUiVbClMqrwGmRxSWzACI6qWZIKu8WI2CKEon/l96Ry8hA
+Md1xWy9pTuGBASybVL4F0itw3EVoLq0pm8qSD82us5W5YGk/keBXmGDbEr6ep3Up
+ddG3lXxR3FRu+XTwVLLE1Mk4pKsCQDEtLHi8PjkFq0uDSh3eD8hGrjcXe163/LnL
+YEVO3n7xAgMBAAECggEAChGdtIMdgD7dSUnEoGJkUbXPosAJRbkWJdaTcTSva14f
+d0hzro6EmvzGWbCV5gSXtZ5jyWm0DrGSOlZQIGJ4V1rKhyRv35KjBQtOV62GatpP
+MRe9oTy+aPWJ7Sg4K5s3it8M5BtfwRV14wsLLAMiUatgdrAqgAHBWq6t+6BhCh5O
+2zu0622sz7zdButeWDZFjE6/EUVwu4m4Jr+z8T3wDT0Kym75UVqVVljs1WK0TXC3
+FzqR4FHXUA3VP4tHyQ4pXyUCU+NXG2w12ebLCzsFxnfbhY4pQ9muDtvdv9oKpIzH
+VXLZJYEN01xkjeSgzZuS0JAxctJLMy++c9gs0yrOfwKBgQDpVttN2zAmQGqJH3G9
+1w9V1ZOGNRKTTlJGKPQDmLycT22P4opGNVmcnUILqbrVGg9tMn//TVXxMZ04lIT7
+EhUG0AwpO8f+tZqielcvIpuPC7msZd+zRGWPqS0tAs0OZMU+eYrxxHOvHGkL4HPr
+gTomlubnLnaQJiHTByUi5KXSfwKBgQDGszueE/w7iSV7DaULMZ1rzT4r8dTvkrLU
+KL9CpV8kdgW2aWXhABKep9DJplnGk64pK01SSO0trxGQlaA2HryDJ+Ts1d+0pmJZ
+DW+4rX464Q3TCsYoQOTHqL8R9E1oFnol8SH1rR+jWh6YtVaERY0gZQ3jvZ1qKqTc
+L5Ug2FkWjwKBgD361EXZ8vA2LBZAQ/YpKemi0YzUjBqUs0XvmuFZsL/UWUXe5tu/
+UA5Jt0Fh1D7GrVJUF6u43xsyEpD04l3Ob8dfe9t4BaeilXCTDpV2m9tjQe6JIOJ9
+SHzgcx+BnvYzzjDKGB4gEJpy8XQ2KpRjvw6BBtRhgxzHBDUJsNOT6HgBAoGBAKoo
+dSaDYN6vLPy7C5qRa4kU42gImdxr2V7cYiW1rstvkqbKjadoQ4nAlokJPxpR/7Rb
+08RilVIo+TbDG8cc/TyoHmA/K2rtjY1Ld2BEmrPbZNZVBKsWH5VnyfCbMOqxTPtP
+C1DzaAOgulD2AdgWI6wZPhLIn5R6XmH9EY1mGKy7AoGBALGeBowNK5USevn2kgPD
+SfSqCvA4PMZQC+PhNqqAtuROhJOC3bdNXoXUGWGQX8v/hWeBTOf/xqO2zY4IEq8n
+aYNOwCQ7Pb+UF3oq9vCvcQSDIf7BGZgmemvLNH89HNCg6whSuwhhLubTY5M3sEwn
+wFORHL3gFFTD1h8Sxgge3o4V
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_pub.pem
index 7b99c7eda0c..ab1437585e0 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_pub.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
-neiaFu0fBCKELwEW
+Y29tMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQAF17CZ
+SKP0v8ul5ODENOpyDO/IvBdRGDl6hqfeB/28L9dFCrEWlCKMYzyTb8itEhwkjV6L
+66hK2otk6FqITl4bon7Or2+WrhORAkAGT2teV8b7M/bfZd0RQafWJ8kwbX748xxz
+7DeFcTG4kUE2Ms+OFCenVyfaZh0tZIcr1dCtK5DqrfwwrzmdZZsr0ymVOKFZHeis
+aR9rbutjdTjR/74+sDfNmUjkivXEXUN7+hNQMhW/nfF5tuHRXw1M88EDXX0LiII/
+Da9aObjMQXWV9f8ZSOzVqmk+zXqydosybRI8nBPSpYRLl+i35FlAhJGHFnDMl4wC
+3zqxqaQ3/qXDHMXB
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked.p12 b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked.p12
index 2ba036c9974..4a2502c6762 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked.p12 and b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_priv.pem
index f60f4c210da..101f613d76a 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCBF2s0aWJn1A/
-2u3KYh6VXydKgJAvO82/BwH+aC0n9onam/w55av+r0zUrlAznqKOUW9moif47E+q
-EPdOBHdMUmmGPVkG41167vO/ytMA7kfR6QoE1L/LPR8fwZNxGozQoFtS+XXRlJV2
-7QGgXhSSAHfGo1otqNxZTP+wCy2S0BwYNMz7jbTKabUa4AJ0wjHOSlHkPJT/iLDl
-rZlpHZy4h5Eo1Tsd7Hx406x0XkndvcMcW4QK+k6XnxyVH/UM/F+QxDWi960utXtv
-eGw7/RpNojRf1wtt0EHeMhwDWysC5/lKDqTdh755T+Aq4iRfg+P3hfhUtrjD7066
-k8eNBvEzAgMBAAECggEAWIquh2JrpdlHQcTzNSO/KlLw9u6iHnQv6qhTkBtR1EWO
-Vu5N1sxKSGIO8ZaVcmFIdSOT7+Y70L1jg8zXV8rw+Ks5jjIsEVksvaAULChvUCLu
-Ms0jrd27o5BCxnbMh1bjAYjU9JJ04s7owQvbbKjSwWimQMgmrOS9nqFlpJ0NUMyN
-GmF+rjPjwqbP3QV+XnU57Vn3Fhj1evHTmfeQsSrz6FrWzZrxHzilx40QRdTzmOeK
-RhFEFsiMPD9Iby9Lp2/3BUYgw8pZbKNRQpG0GMsTjyrwIB9nxen4U1bwgsO7FPR3
-XrqPuTMWPVPNHrDtGtUMwUMOdgQ3GkOYxfCRBT27pQKBgQD39790cw3DZjCn8xWN
-pjpdwfQyZtomVnJBweGr1bZSFMSn4tUHnWXbn34DpUDDaGaP+iSRgx7djSCi/1ce
-LyVtHSg/vZS7Xt9pspeNDrhvyMGJuc+JD53LcNpmBCd0198bnzLrZkheM4AuQsGy
-7cwBfunNaejVmsqrHf+OjnCUXQKBgQDITTx7DT5FXQ/wtaXNKXgzI3yBCorH4opN
-iYhc2/6uhX0iIUdYZWhDga7Zq+d249VQILmWudsiHbxKJzqVM2lfr2Qv2BntKyEO
-HSWQa+RSgkEQlRgepuuZ6osmcMQ+SqPT1dGXK5EOFwiba9FN5ziRB5jabYokhDjw
-AALXRMtCzwKBgQDI41eiGcver51fkxm1BiRm7MjPRHAbexFZoJ8ZPSxV1yly8duw
-LZ3ljZLjlS+gn6XnormZgWayCrGUG9USSRPDEEoZSZeDLNtGoD8TMgfN2BCjaXtv
-CM3HkYf9+gOVL4Y6tIDmIJkkaAjCcabHNMt/srfriI/u7Vafxs/RSCiAqQKBgC5w
-0fQJ1wVIFXkO9LlDwy3ALY7RvemoWb6ug6JcE4mtQ50VMDCLmogEWmD3nXwQSRYB
-8GXFA8y+LjjXLZsIR4c66DS7mw9FL63RDjOVAGQs9R7+IpCAzSFrowWvoaB7t85W
-xfiRzlkA+Cro7adtU800gLksKppa2cSzi/UTazk7AoGAO6DAT7Cp0sucuhBWZbw0
-x3gyqxyJnIjrRf2A65ur6WpgN+OneG+V3mdze9SO9yzfCahqR8yfYJNt0bgH+Gvt
-UY1J2r5NezsiZtCP/tWee1kJN4ZZBm3t+urXm0+fZNTvo+3J4s17jfaPDAneQjC/
-d2C0rSRDhGPMHU0LiKiWM4A=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCqcsu2NNQ0zEUH
+Gl8ZN0yyUGY94KaZB20PEC8cUQ7PKtmTQXG1tEyEQCx9j/7e5uo3B1hre+NVL1bu
+3jfOT1ZfBdlta/kdy6kabAf+o7ayliS77rrNnwRwt/dSx1ixqF6TXfUHSH7cJ7GM
+xa+Z7hSTWrYOp0Lti2LlBvXAS36LhA73C69Tm8dYtqlT7+fH48SwQ8QYBHriHscF
+4MPWfqX74V2YGBBnBQEI5daiqY7Pge9hsAU5W1SF3r4TVIMg27wxq1XvJgTYSKUD
+jMTl8snSspX+VvHNC8eAH7Yf4M8vZaEmyV6HMyTIfTyv3J7AYH0ibfM6u/1HEjbr
+YUVYsl2NAgMBAAECggEADICWGg8FWVTgY7VJ/QucdK0UCsoT8XNlF8h10Phn6ZQF
+i797PtSmRiixre+zExhR9rTAH6yUwxzq6sniKWzFWfv2WlUKQhnvSFcppCjPz+9w
+BPIgwdAkeO+6VItduwF6faNT9tnlwD7ctZ9fq+uvY62XXzsvXBHJlu4FqaCzLzpJ
+Xip7EwjnIyCsu5PGppbe9usk0tIzBUduCEvPyuvTC6EFoZ33wG4QcxmXuwcsOy+Q
+nFReLuAD3XjpQmEEJG9B8gKWrSh9g/paT9VCk1ZspQZH0c0C9bfvSfT78aXJBIPz
+7snfcuAuilXnuXzDNRqG5Xa+jBkcCXnGLu/tTWwZ+wKBgQDrY2bW8ma8JIGEqgUY
+eubfupo81Eu5rnd+fZDm9HoRSi8o1vjTQB/yH+RJAp0MgHDQpAM3OzC5KFD5f7aA
+DNhKIKwyA5ix5Rzu0mhz1QbtYk0ldyI4K+BNIgZLAB0CISCMp63QiwkdHiyYKIJr
+U6UzJm4Z1BCzqi/uzkMXEg1mPwKBgQC5X6o2Dby6K5BRL+Zgo70HVKblNniC8Wmp
+cDu04bKMni4YIiAQ5GZ3yUps1dM8ZKVVQgY+uaIbpUyxxz5WzWMjx1EwubELEurf
+8xoPM3OboCoMOAaB8I6D3l6iI8HkGVUXVTDP1kb6b5l0Vs0EmumA2QOqv2+j/JI0
+emn8jK9BMwKBgHwnXsvK6QMdYi8eGjfyQyoIW2fwNczHSAGwqygWFPhfn4Yz9OQ/
+s1nbFman+Tvp1xdFGukb0DQpHqSqhxD9NWvL1ec/XF+gT+Vrl2pZFyFIMxaqwqLM
+Ca/FXXpbofFIlcl6e8Q+QV1ZV/4dh8SiRsU25OW8o96Pyl5z7pERlX2zAoGAd3uj
++IdOOClQMiRPt8aSVqFHmcJMVwpH8sC2m1ZGgcCLMV79kCXHrjn+ULxaFTlCH/wY
+jmGUjYE0N/qWwdhMqIkWWfO2m86ruYG2MEoXoB3SPGH4P9TP50tzb8rgdKenYwy0
+E6KnyVAZdxVjvC4lh7lZVbtiuC5aBp1Ip1H+vGUCgYBgZAd0lm6IT0XqUF0JOFvQ
+ECZ66UjwkKIYnOt0L/LHFltnCleYkmWql11NxuA7x8AAaBQqT3w/Hy1oyqV1/ppA
+pWnCVu/oq5EzegReI02yPpMQ1WWPKio81gp6r8OdaGyT8zzHKd7kSL4Y20qXVk1/
+ALPN5E0/HXhVU52IiBsDnA==
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_pub.pem
index 6a9abb70397..3796ed3ca7a 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_revoked_pub.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIFUDCCBDigAwIBAgIIYuaIxIEtuCkwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxM1oXDTI3MDEyNTE1MjYxM1owgZExGzAZBgNVBAMMEkNsaWVudCBjYTQg
+cmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
+A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
+BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAqnLLtjTUNMxFBxpfGTdMslBmPeCmmQdtDxAvHFEOzyrZk0Fx
+tbRMhEAsfY/+3ubqNwdYa3vjVS9W7t43zk9WXwXZbWv5HcupGmwH/qO2spYku+66
+zZ8EcLf3UsdYsahek131B0h+3CexjMWvme4Uk1q2DqdC7Yti5Qb1wEt+i4QO9wuv
+U5vHWLapU+/nx+PEsEPEGAR64h7HBeDD1n6l++FdmBgQZwUBCOXWoqmOz4HvYbAF
+OVtUhd6+E1SDINu8MatV7yYE2EilA4zE5fLJ0rKV/lbxzQvHgB+2H+DPL2WhJsle
+hzMkyH08r9yewGB9Im3zOrv9RxI262FFWLJdjQIDAQABo4IBqzCCAacwHQYDVR0O
+BBYEFBp3pc2j75BReEegcBs/1KIu+sZsMIHDBgNVHSMEgbswgbiAFEPaOFOZpNkA
+WJpo7SKE4mYyPMHSoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDQx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbYIJANHr9QHB66X0MAsGA1UdDwQEAwIF4DBiBggr
 BgEFBQcBAQRWMFQwIgYIKwYBBQUHMAGGFmh0dHA6Ly8xMjcuMC4wLjE6MjAwMDIw
 LgYIKwYBBQUHMAKGImh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2FjZXJ0NC5kZXIw
 FwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
 ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQAD
-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
-oFThpoDp8Gpexkh64Xub7UkkSNQ=
+ggEBAEUeujqARroYQefrNZ0mJdHJijjqthhgYpFsWaZIkbP/H3/2L3QIBnfNgMY0
+HHlYs0ATgzeTD+Z6LjJEl1x3GBe2l075B/wXHmSKolDicfxxKxWEBxQaERpSuRc2
+zhPlfprEbJwcFsC3kDzzvVAwiK1Uq2ximvaXuFTn3e88/w1+huwIZ1C0iuz8Ueox
+GNNx/NJI4wdszCfuMPznxygxDysx1UUe4ww0eWIe+/hRlDH6GDfsQG0gDFf9lDJ9
+4gwfqDsS474/FgT0t6KqC/C1hsDs2Aq93E7LDXVVuJfmcXsLgaX+sXfcY1bBFGQj
+23u98KWc9dDsRl/KGC4bv9MvN0U=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown.p12 b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown.p12
index 6031bbb4a8d..b2f60f66035 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown.p12 and b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_priv.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_priv.pem
index 07d5c2d1818..18767c933db 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCzeDarjt7f4OOM
-MsWhPGb92JCENWhfhrHfAoy3L5HqzRhNQlc062KkZemdDnmUpQyV4NxqDRO6fsZX
-tu6Cif90+UZ42kB62w+j/tSjwM6IvLCLR2qX4Jw1i15N2OB9gV129+6D+5OFGjZZ
-JYcpfWdU8K5M87vwshZFD4s+eKWjtbGcHVuSLfJL5EOub3dSL+PTSvzBHs+TrYLX
-Qqlqv+lxzOvzE0d3RjEcKJbzia3nUHXw8oQ+2TYHA+uQlYnJUq5C5gyYGD5+0JHU
-K2rHvERAxCxLXeMhbEEt6LVL8/8OrTWGPL0PD1/QqYZN48d2alkk+s/BHLmmixB1
-zNw4Gk5zAgMBAAECggEALvNfEgihY95YiR/rNeAwbW5PeFbkhEEfnWD0YSQPv2aC
-Wgvl9pEx0CJdOFpGEk4PedJGt3POWna5+s5/nSTu8LIZ7pniToGqmNOc224gWgNL
-CFTZnPwEwblBJYp8SDkks2/vNRYGpMaTu0SnFIKbGsyQPM9ytmhQjSag3eoAI1B/
-Izwe8fZw2lXKNWVsFNR//i3LXlC37AtaBDjLZ7t0oeuMGpXK6kxZtDWl8l1ZqGkT
-stl1txlB52YJw+WWBMHT60qIdvO+FPzJWiB9n/FZaPFJEAlw9Ag/JDd0ak9fmYLd
-JVHTs+1NTBd4AQgpe3mQIDbSBRFJx31jpmqyUiKawQKBgQDzfYJJPXWtzPqk9qN5
-bdvgS7UGveG1udcgwVo4Fd8VRx3q+TLlOxhMdf6sORbEoUK0/uSGpPHWutoJKeKX
-7g5PoPXkxRgnH4PjwOol1ZFwKrfuk3Kjw4a4URR7FlcG6pzUVbyH5cmPOo3sxoKD
-T0sPtditreBoNly1P8CP7Y95YQKBgQC8sK0qdX0U/LcsYosunAlI0QHJscVzm4Y6
-6Wo/XO2qFZFdT29zF2JY7U6SQlnELCqhKFQCwlavsZQ5TaOFlVSTO/6F9bpUus0w
-pvWZsMSSj/9mYw5Oh7OlX/LAtzELxwi1wjACqqsyM9FE+rkZsXJXdUVeLQwqmtKl
-J5bWCVZ0UwKBgQDsJ//UHyrirZsvohL9dAK8sVDbQBEJGzy+hSmGmhfq4DXxL08g
-q0cu6YZe7WPaw/kZ6NomiRYRyNot5xThfD8fFiNHha2eTF+z5uhyV4gevR/14cZf
-dQVWATWXCBzSFXyUKK+ZMtJh+02ppwLwbliD3UBRewHasVcLZ9DRB3yPIQKBgGwi
-fDrW9gXvBjKDjuv5NEDstq+WF2g3eueMGP2TDgjpL1NgUKiOgCgiZ2Leb39DKHMP
-H4YtRWyOwjlMyyek+sEeIrE2r8AbBbiaFior6ZtstptArVRH5KYjpITY91yehdlU
-HhuJH283zvhPD4Ev9i004bok6tIHxCwt0f17gHZNAoGBAMeJXCDS5875SrXecbIE
-8B/xb0W5iVoGn1mU5vrGaHLg5XYbjZviCC/h5Ax0wEfnRTWhVeDhmPnS91ZoFuYz
-sxGvLn/IziRgNNg2kljO55gs6CpzdyWQfNjNNiv4RrDRYqvhNVuQEZVL3qcFvPgc
-pmv31qhZnU0PbFK/8sDF//VE
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDmMNcpq1nxNHXY
+0LJRM+bjqxrlM1/fmoq3ocui4zGkzOD5wMmBi8ic610ZfXZa3/SXCzZkR0moXKjl
+Q5E05wY7wrGKmSiB1x7xzdEmaUiO1/7Xtfjifk70XW0oQzDI9d2fbrh+ekJaX++s
+yZa1AGl94b8PwDXZIr4QnXQYDKk+4FenL3JYUd9LBU4F/x1Cqv3G6GyN+Hvwy++A
+yvj0EZ48T1pmGIl+TSp3HJem9d7eybM0nz6h70ixUasMOs3Ifkp8V/4PsQaXdV08
+y+ZjQzoyftznFXjYXDzBsQH4eQqmB+RCQeW3UcWmbxNFK8kNIC7NKt1XVVWfjH3z
+RalPJrmTAgMBAAECggEAUBEB7iUDUmJAcWtZ8uO+NkeAQePmP6UGBgx5g81Jqbx3
+rnePv4cq/uXhCqo4njBS56zHPQcMyEp+lswzODb5VJUKYx6V19/HDC1eR+GMEt9v
+bYGGseVkOhw7CSuhzuyyKy/8bUXCSaQf/jZaPNgJWXdJmUVulXm/qZDS3kCdJ9iA
+zbY/mBeMbM1vTgW23AimJqgx32vZox+FguN4r0fqBCtpdWLCYtajue0cciHZvdBD
+sqNG9ymXjcbGPKD1u2p0YoI0JYRlu3IBg/uKcKyg09lzzefCQpzXWQxgN5G9vjdD
+3cxsfhsIihl+WjEbH9EuCy74Z/ZSDzR720d6YrGK0QKBgQD3Lo1Q/HoDFu6zShYQ
+r9/WYoiHSXNqJu+NtMZx5Jvpv3mA4JjmAIb+Dn6b28A2DG49njesPNpCCji9KG13
+epLVmI11Uht+UgwAJ4UthEGC7k2AxFYg3UYxT29lbg6w4MDbo8DRe31/NPbbzNJ8
+mcV+FlqcfYNDIoTZvO8EdNERsQKBgQDuZx0NuAIxSpnaAYVkk6cQMrdLgcL8rQZ7
+nFtGbWCn+HWK/YfznNkYhOK1cF1PNTHoOjW2vgrN0sYd8gGWbNLKoLp+3G13KG9M
+m8CwhkxDM50fvxhDYsqCn5RHvzzQX8ieeEMHR3xm9BPUZmoeONRvC+qcG+LFe2am
+JBMB+PRsgwKBgE89BB5PIYn2AwVEnbgxuS7PnXbJDA+edbLWnbsLDxQqxneTCFDL
+IHs3CE1Mb9yjtX9ZRf2X8Fu1TSUOXbEsgP+qDMbsUFX5VVGDWcUSnbGsVPoPdpDI
+fmT2Uv6P/nOjSQ/f+cLttHhf8Tba/SrmXJIj9l4uOjL+UNpAH9ss24yxAoGAQiiV
+VHhLC3jDZ09iwD2FcCZS3X5eKRavJOCIJ+w0lYiKvg6LitxtFrPR4j4TduaxOdvl
+ihgFEYc7eZXuQNtkR90AxDHRou6yrFTQzWwHf+Kz6Np0Fkc1Ibi9QofcjYr3Nprz
+JvL8n+l+E0R0kHx+3240JixK6zjKjLKYH8UBt5cCgYEA5ZcfQNN7ijrOzMZxLcUf
+Z8onagTqW3bF2LtySMofO2pmM4cdn7AL7xs4jBLizqPEeKK+Rd0DaHCmTluWWmem
+F1IySrtA6mWuOSRyf7bQsftU5PDElrSiRmMh3buV+2LERem8fIlGqMTiGtIzKzvw
+aBNeP3eNtpubsvNDK7gDobY=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_pub.pem b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_pub.pem
index f6bf288e5a5..ae6c91d9165 100644
--- a/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_ca4_unknown_pub.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
-nHLIk2q/09Gn63MKk9SZ6gQRn1o=
+ggEBABvFqNITTGoCGbCG8NYXij7E8ft29NpAevfLaG5QwHVjRp+ndXKqIqWHJ1BC
+ADETGQPJmv0AWtpf+r0uweT7iACjnSf3xjWE2+ATUr3LHwI8ZAuLomrHKYw9pFYh
+j8Ztc2KKdGwEWZY5G2MAGzX1ryGj9x6ed5JCVe2KahDcPuGNtpFHp8J8cPOHeol/
+/IfYur7vtJ4hjMPdWWUqndMS1W4FRnEO9MXMuHCqhha2RbDXR2efGYEdiJVP8WnC
+uonNFwDX5f4cMRzrqbrjoVU4xdrdRg7ocHKeaYCUWaJddLzxF1F8AN4ajBGrNtkG
+HnximmcX5KFVHsWSowJVwj/1+94=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai2.p12 b/cpp/test/IceSSL/certs/c_rsa_cai2.p12
index 589cc2ad4a0..01b2868ca19 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_cai2.p12 and b/cpp/test/IceSSL/certs/c_rsa_cai2.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai2_priv.pem b/cpp/test/IceSSL/certs/c_rsa_cai2_priv.pem
index 44ae1425600..56a25def01f 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCRHjS/sz64gjW2
-Fa99PuctpduLByAFiE+4EHet7nLt4qkctEMQrYKHglP3y5HAwBNcKVlNI5oZRbO0
-2Mo65vPy6KQb7Ir6dvqgKxXaTYFcbeWK06O5/1aQGzB6vzOeAZjJ68pbZLm/2hKr
-7UkjGjwJeivZhBRoz2ZvEyvWGEXm0mBimg96Xm7XLUcMovgX/f8oMWDDjlxuKNao
-QGMXiTF5ziF+PJq2z3Z4Q5u2K/Vu8zaAMyFflTEmGn8ee4MaD7l/6NeA31sVkv8t
-5zysIaHpjzIJzmCkMSgYebACVdcjwiiycwt828WigixuJexKcJEdxGN310yDCT+n
-K99G5dttAgMBAAECggEAIKqUhCyUq1MARTc3dDGTN4bU10Ro1GX9T/lA/4GkFGGH
-4OLBEAGG1vsi7K5B5oo2MXJLXF5tw0+Z5tVAHKc9dcohmvmRxVTAEQrx1dzJiGVi
-nPAMNIPCWBkOvirJM0G3w4hU2mLfn0y3FEWLR6ARsK50LXgaYgeBzvIZVY3MOmt9
-GHTv7f8NZMJM56SD18EiaffaxpPaIsIEvflm/PLKM9wsc97VJnjdfQDVV2hRID9V
-iDv3L8oEP1Kfo/N0mfhy/vWpqM5KPODN1LM4zSkaIxkFX/m4gtU9nsnU18ANnfPy
-2ToudCclrAPv3luBOLmWDFucIa2aIqyvCD2ocad/cQKBgQC5XBNIPwG2dbr1Zero
-WNEJR3m9i0Fy4lGJMOhWeTnJOiAebpCXlLlHM7GAqjmEMnpNdOMCFi5BQ9ecTQew
-DnGPn+2xsOHd0gdwNORtoIRvKY+U4PMQBKfTPb3UE5UUhQe6lSDHDzzr5hrxTuTA
-XwmM1HTSkkt+TQhABrZq19GLdQKBgQDIbBoFNZEM0tYYhrRAtlWtJBXt86ZYjSp1
-SGJdxbJXueGzesl39PW+cOSzLRjg7Xk3w80kqWdsG6Zc19YwXMSpaY2Eo2/wsWo2
-Cd5VL5+JJaZKNCSmHtVoZLVSzJhs7kybQ5NURjx0FE2M77NuU1DBvRZTzOsM9pct
-KY+9zAOpGQKBgELATs1Yq1Q6534SGttbiMPPsp64tHQb3oMKUtE5TL8TqJds97Mu
-wt5KVmTgaGAcEYEtU8bfl/624MGP1/Hl8a1oSaAQ8/X++eDFm3GDOc4SaHuT2tRs
-6Mcg1+i0uJ4wHg1qQOiOq0DEl/VIlQZV80l9BSkDuB4evZbZE/48BGE1AoGBAK4x
-RmxAolEC7hFjAkc8MjrJokWt/mX4S26j+tqFePvGEuRrU69uuCdM93jDOVxFCZXu
-F95FXh4X6f/Hl+Fwv3x+wQEHC8OmbymIajSfr4kDsAPOTgwTwGd7IB1WtSP3+Zz4
-npQgd2psOvrDWrAIuaepMD6lW6VorPwTo1rSdlwBAoGBAIfBImFKMmXqU3n30uq4
-FfWlMH8tJpaMYzCM8Ey+E58uM0OELq8FtmhxcymYlA8VfqKaohDEMPMrmfR15n9B
-w1lFXDBxTGpQfXk5FM+mOQ4qptNIFy2FwJfINH6P9h2zhyX0wxlGKzDq/BSI2P8K
-1ZdES3BogwD4So48PEbF8NIy
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCMFPMmfZFlx0xA
+V4+FuR76miFzd4ImQb+gFwrDxtTgAc0d6Qp9qxHNX2mSMl09/aHkh4WJm3w5KJRZ
+8PpVx4pfGADd7P8P6EEzHbdnT/V15Kt9wYUHj6LdrOGa9tjJ+Qqf6etq/etNM4aS
+3q82Ef1tpoOIVp9PpXNinoDqRxc4/U58x5Fz7hUKzkXMuCEb3JxdMhH+h1piJ3vP
+gT6yOgj1g9NXC1dfr86qTu5G36P4xNNMpXxo2tXZP+JkmKzq96pFt3G/s76dXpjR
+FrnbH2i1fAaBHYDJbdyNardk6f9CiW3DnHklMEYhVO50swYG8uk/nVlGZw9BhTjn
+8y7lDof/AgMBAAECggEACwyR+0MkFBxkU56BQXtCSfw2gqZc1TCr16N81vr/Cn/W
+rBlk5iTd5Bs2naOSvqBO9zjugjw9HNl3DiF97wTGUZoRydXdbn9G0t9xFAyQbQQ+
+HjUeWmQGS1uzqQ0q0o+Hh4KKoUDpbbvDmlN6ckmr+cymPlUUZTj39EG4igIhskrZ
+7eA+J9AstGOFYWN6QwrYOzQrpalat0mAdh39+hzNYqmBh/y0V8LwzbEqM5uvu0MB
+Lrw8f7lVWejEQezBb5euIZC4FbRuYX9xo0vuNg4N9v3yBIQfCx+OeDB//I/4cAz4
+b/8Mr85Xna5YWcq0faXftYRXEvBwRHltklDIEyuIhQKBgQDD+0vEZryX8ISxjiI/
+WUzF8vE71QHOgDDt/7ZCagm9A2TG9XAu6B2G4/RZVvpZbg+dtppS+lxlHaQy2osf
+mwYez9LueHnsxxQs7s7ja5CjR7SYI/sZUN9iPo70sK+1064CpViU5XkQLKtxRQQU
+vK9X99rFhVzeneE1PkcWXC10BQKBgQC2+y7j1ZjeC8psyzp0Zun8YIlnv65D9UlB
+VQhEBV+AkiLNc9qFfjfeIWOLuOBEf2PYdfduHL6UOpq7RtRenAzGwJiG5vJ2ZWbG
+z7S/oY7W7ZFrskhWAcFnHE/KHpc2SpIy9KbLjIeSx97Mke34tL7SpXhkVjAjpg7B
+FOq89r2vMwKBgGavKlmzgqkRalUlpagPf/xPeDnjN1kdLYXl73cI3CVeu9TLEIZj
+M+VTVtngireExUXbQSys5PBOAZRrkW1z6lcGiPxNv4RiIp4QWfIqj9QdY/A7Gft/
+tithn8FxOf9I8+mK/Mi3GyFwZjuo76R14GF1CfloEOrLSg59nP2IOoCJAoGAOMGg
+wbq3N+igWS6Qaxqg6U9oT239N8cVedZOQgsInHC3qtKMrWuBGL1yixxFM/nvlmzA
+2r6/vmqPJBfMN6xfqiaDKRTpkB/TyUcT4XzTOYdm2+jo1wSkYL8/YIosjQKEZpnM
+QsbMJpMoYHvDPKmTpvL8bOLu+5++Y9WBGivOmlECgYA57bj2bfOrUjiv7Nl0lftJ
+7lPc8sZTA6su3H8a8UKTIbP5lE9eEQIUqJdRgNMlkUeecypO9DaGjbGaklOf/n3M
+fVk77b5lb9y6f0J3/OIBV3fXEFTObN6nUq2GbGz4DfNbeyNqOGV2Pz5RfJdL+ALo
+VGZu/r9MiTHfExlETtnYgw==
 -----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 19d6b41e57e..40b0e11a9ca 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai2_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai2_pub.pem
@@ -1,84 +1,84 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIJAPsFplxafcOCMAsG
+A1UdDwQEAwIF4DAXBgNVHREEEDAOhwR/AAABggZjbGllbnQwEwYDVR0lBAwwCgYI
+KwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBALV+YsGip8MY1yqzsBwD8x3IT26W
+XDa3sseis22s351U/EQdAF1C2zKIRzTY8LQ3oyOT5ut+UJ2v9rOQSA3PI/2p0xVd
+/34svL9o+/tqADWIOPgOyPOGhZ+2SQg38lJ+u+UU+VuRiFHSfdbARRQFgTKJDpLF
+jpfEl7MRX0+UulLdJ33B7nu24JdZFD0vfUImr3WCD9zssF5bqBjWZGCuM8zr/dK9
+Z+0u0V9Zyd3LGoMsge7c8uajLBlTlcITuHyHiU3d92mZIB67JvS7qV3lp20MKdta
+a5iObPZCsv9tx6ncsanTcu+kMa+vi4V/3/dn8+V4cI3e8j0vA36BA6QSrLA=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
-BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
-MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
-B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
-DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
-BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
-bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
-CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
-OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
-dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
-Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
-6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
-e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
-WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
-Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
-MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
-SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
-9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
-ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
-1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
-1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
-g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
-92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
-JZSn6IpfkLAH4tM8WHSDALCJZAQ=
+MIIEwTCCA6mgAwIBAgIJAPsFplxafcOCMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
+VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
+FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
+DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
+Yy5jb20wHhcNMjQxMDIyMTUyNjEwWhcNMjcwMTI1MTUyNjEwWjCBmzElMCMGA1UE
+AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
+EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
+RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w6jJO5vS39W0lsd
+qwEigtwWvaUmPMxeWJKJlV/4ig51RbtaZDUa9eIpsIENtF33JHhtNat6gl4wKrwZ
+Jgk+fEEWF/9ZqZXbcht4T/HYsmD7egWkqbA5VVqrg62lXMOqV4mSwIl5sxIMO4k1
+iouT7hR53s6F300nJv5o6vMKapMNXhxBxDkSOMJN2C88TVebzSI/hMb4iNs+CMTE
+doKiKsN0lQEpPDwoydJRB3RwCYIvdGH2JOtAXbVcKZqDyoIi9dolMejadC94V9m5
+GXs2y7i0qO7QPEWjPeXvxnUZvrEHLS/6HxKhlQLYsP/rTs08X4TQfj9DIvfOEIL+
+McRJuQIDAQABo4IBBDCCAQAwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQU4DL6E7Fj
+d6n/7WfFD0zD9m1XsLAwCwYDVR0PBAQDAgGGMIHDBgNVHSMEgbswgbiAFCgrCn9R
+XBPBR6yEX3923g8KoS2eoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENB
+IDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcM
+B0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZI
+hvcNAQkBFg5pbmZvQHplcm9jLmNvbYIJAKF/0S3jU4zlMA0GCSqGSIb3DQEBCwUA
+A4IBAQBAc5mLwMOWv0vgHNEMZbmjj72BzcsmB+7VGGDBgoZ8vfz5ZbwBWMUKIG+i
+rG1MmH94WAI/OWYR7uIZfPxjnE1Jzvu2QefwwimvXThhj1z7cwjzwVdyIRmABQLU
+KFpr+YNLMjmqDK5k4HcFg+jWGj2+1BLUYB8ZE9AyHR1Fge5VO8PJlPNWedL5m33M
+kodPdXF8Eotn3gygY9QOS5fKDeG4Ds/ADqkAa+e/zt2LLX/V7XtCdgKk25tKgNNo
+7noLaSfnp66CofTGlRa2xAOFH0jCcdGQ7H+/CZWR6se5I2TNyFblr3NAEge29mGR
+uHRrX5GqieKNkGyxU9KPeiPexsY8
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTBaFw0yNzAxMjUxNTI2MTBaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
 IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
 LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
 VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3.p12 b/cpp/test/IceSSL/certs/c_rsa_cai3.p12
index 80ca4bbe141..68d356bfce8 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_cai3.p12 and b/cpp/test/IceSSL/certs/c_rsa_cai3.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3_priv.pem b/cpp/test/IceSSL/certs/c_rsa_cai3_priv.pem
index 4851de80bf5..27789807028 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai3_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai3_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDBxAMhgg9kMPnx
-Qw474Ndg7r0qxjUkdJH9QAhe/Nud0snTFcZXvh9YZCsEpY6IDovsP9PJV+MFR5t+
-fNmjOU5IY2z0M5JoOmT74iLx4BbDmrx4aJQBZg5ecu7G4JF/v5a37nW5wXVoeUe4
-0KlbjweolaE7z6/5DyMxOWD1TmnpmctFaP45iQP0AJ5vAWFYOhqdlPkyRIqLqDRC
-RkWLA0jhjSykrNWsq9GUfBDK5YbVt0hipcrom7Hn0wYGzWdbgDTphSUSB+d7cB9B
-cp8KPbWsSJK2SMaYk25KdJoYrwC8GH8kuaQLIZyZevRuPIEzb6RkeskCzzk+FTuB
-jnYmakMJAgMBAAECggEAIV7HVkI+sdfgd80/Wo8csLA1CnSTyuk7ikS4nFlKXloi
-0ZRusgZHgjLQGM8FZsewj9mnOQYGjk54iFZqqfpw0bUz2rO2C3bBFQMrVwIrkXjo
-7AjAsqP3pgr/tecPj9N4Wsl542metYUrlbfz7tWJcV6Bo9ofGZLikfPqj5y3T1hV
-MSc5CddDeOdkuVCKc3S/pvx2Jj8A+yL4NXVTcwfEB0E+fDCpsOKY34JoYFGbYVay
-vgakDRAR9cfaImuPQ/U+SoxwKfgjwz0BQS54C0H9isxedvRRmVX5ONTsxDps9rl3
-y88XUpL9IhxpB5LNeqLhwP4I+dED4LYUiBVgO1kdbQKBgQDqjz/1SrKV3rjeW2+n
-RRRGKrdKBriLqsRUA81RghAHtQh13sXKI8WQYuu4haqDg/RFecvXG19H0sn6WsE2
-0hKmCleYSTQNfT/cv3mxf960ZWAwi4KrzFbt2mnIy0Eq0FcwaCq2ESGaTstS2MpC
-SHOyEUL9Hnn71tCU+kgY0Tid3QKBgQDTeizouU1xonhB45pxHUDl0rK+w7r2uhsg
-NotlN/4LQQFDhjzrdktJ/00QFlNc2CdAEKeBzNBKlLx5kxf2deYmV+Oe3Rv2RKR1
-A90x1zFERX9yh7RoAIKBuTzYUaNE0BdH+4fA6/hcT+yrY2F4vXFkyMT45qcAizx6
-y3rpDo5VHQKBgBMiMFNwDnVPP8FTsB3y8p5uqZjuR2uNOIqp7LuzYl9ekxwaWgQN
-OvZ2O0hIDwq/XtO0Bb68St9vAG7drFkudbr5qP+RKR/YkbcOH30tMxuAEYKkPrqI
-5qZsZKiue9hkOliGhsVnTFhsCQXvDUCu7FEgO1iufcDfWxBsAimUF4w5AoGAKRWH
-O/8j6Huj2Ukaa/c+8Gcqip0D6YLmWi++jP9/vzf1wuSFWUk1/z41/nYX4+WqWmvh
-3vmnTZXvt7633Q2ylKhmdCqIkCNtv73sbw5bZ+QIinuKtNnEgOc3xt61VV0H6NgY
-24X8ThLI69L20LodGXNXsPM+ZoCmU0TMsBI/3JECgYEAhY6vc7Slsc2NX7oiT7xX
-pk/hoUG2l6G78EJyODBNBMRHPJYFXfjHyOYfH6EvWZ3/NemHSA3zD3XirOvJeufJ
-meWZ/7kxNW4M2IfmSs3oSjaGBTdvKhjxmAmIs9yKaR/qWqE7lXzk6pdyGIuTKxRd
-BYBeMMOSGdpV5FTKL8rmW6E=
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCsRZDJSw+UsT20
+jiEmNFKvEA2syc+hcEehbXXKfDmpz2u5mLJzWedqoPzLRQE73gZw2Q8Wh4mFLRVH
+UEt8oSrpnBlmWDUhv3kCN8HPtYZJ9oODhAyEWidQLUmdKcuHk7lgFVPQNbn4LSbV
+UYH0SD8O8mK6xxX7fJ6NpgBJYj8RmaBdQseYz/Cf7FBye6xoK02l/4W803CMxeOZ
+fAJiwfVZvyNtisTrE7yWggLMtWQ9cLzi8WtL+LaOiJGykqNyZhiFYOoCzj1xQW8V
+GQXWt3v3z6obLKnu+nQqbqFRLCiItwESUOo6bdBx/fgO6Hca9TnWkxdR1O6lPiMW
+t7fjjqsFAgMBAAECggEAL+kW98yO1EEo0pa2pGvn1PUngHcN7i2OVlhdaod69/2O
+Tasocgk+YXrNY3DZA3/flbHgTtk6B1Y+9TrhC5O9HgRCUiLVAAJC0rmUBsLKyrYq
+5EAsxQBXr6Yws2tkxdtxMkYsLZtLkbho9Om6tSgElZEWoTBuLid95xIUQVR4CtoU
+nUssSC+Rmkqy61aNKfF1RCWGNguy2LDsqvK5QupkmAdslpXQ5BxLVbYLN+xOAPN9
+C7r/BXRZAZ6u3CZoRBBUvxawQdHcgo/dCO8/XY+XIMj8r8Ae3bMwQAnWarYmuxyA
+WVSPQUiG+BOkeSom9scnsG61Hidoa1AAoQB/nW10LwKBgQDT7Wjqq4hgGoCNlEc/
+8x6oJR8AeAVqI0uwhCba/dikXUB3E5hEtrHWoeoidBCXJHkLIq8EYm18UG0sYy5s
+qdkqmtC5Qv8OSkTaMfNPhw2sVXD6C5rf+tYrVa6SSXx8TChYwMY+YbSM0Sy8hkef
+cefdQI3OzH1S9idNrtRj4LFFdwKBgQDQGPf5tw8eY7i6PIx3vishGF4W1c36Nw6p
+i3McJhkK8xkfbQW6ueVrwnlCGKUq2PgsA4z64AemZK4md0it04hfz+1JOvyNsYpD
+mEm2qj5GtOMhSP9Fk9ha9ekO3/UmS434RllFqS7LETxdIE2/XqM2oHqcjMdovrHg
+ISVpGDEiYwKBgQDEcpgEoEjkPOzZUI/TWbwbRX29Y4QxZNJup7GU4iYGBmMRflpx
+p6CmQqTUlx4h3K9PgTEXMV4oFC1/LdkE5VTnR2cftFjVmEbGs/LEz33/N5xoTIWe
+BdithtkxxWjdl4L28otRnCRPPD7p6tdNl7rEv2g0QB4T3xWDzwIWK1xn9QKBgQDN
+Ib/YNh6+KzkexK8HHrvvLNEbG3mnDHz0npVDCz8mbwq10seSEMvZ1OOpRxgRy72f
+zYQ8jXidCqQtIOrRBzNol1PmGzJ4DqooBcesO9eV5Zv75LRWhu4AhGZQFm7XaCUz
+t00rASIyZPQnLL/XRFgJclpLVe8ADvLS6HmzRniw1wKBgQDI1u0+P+QnP/7ogaxk
+37CeF+0MSIi28uSXoLt4VAIU6MAnnKtvwtLbb7cJhvmZKGl0HXHdNcYDz8zpcAMp
+LC35tNVVA/ZmfjDodADnVU+uysmGcGXtR7GVGoSeBFCmjuzRuSRxUyTL0In/vdKJ
+9TjGLriXp2M/CgVrF402HzevNg==
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3_pub.pem b/cpp/test/IceSSL/certs/c_rsa_cai3_pub.pem
index 8001f0a560a..ce07e32e3b2 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai3_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai3_pub.pem
@@ -1,58 +1,58 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-hvcNAQEBBQADggEPADCCAQoCggEBALq4O6hgv6RbTKaq9+UTV6nqz0k7zcOOmBuR
-1iHmR5/vCMgyVhtjbcWHEMcaevw9u0eEIstktLjzkT1eZ0otD2NHX1J2xc+eU+2G
-fTNUybxTJ0W/ASwRT1msbx03bTI8DhGRKK2NaJC5Kkm8Scnl/5Es7QgUEPk2ZFv7
-8W11ddB7dewR74/uclWIKS3IRE85rkFacKGbUiYxGcKBpjRNyV8m2yV39B22TUXG
-KzRBokACeyE4IIpDTV3A0zemdvgj/IAegXaHvVTsbGQDxF08tKOWFwb7cKJd7YwL
-c9lLwA8q365BxdoA+cEw2C3lUN52jdPqGdG/btHnM3fXhPcmWHMCAwEAAaOCAVsw
-ggFXMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFAJWd3z26jD3uzXjbmbbmGnQ4n2x
+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
-OjIwMDAxL2NhMy5jcmwucGVtMIHCBgNVHSMEgbowgbeAFHe0egLdUvhuGR+r42yt
-SFEH5G64oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNV
+OjIwMDAxL2NhMy5jcmwucGVtMIHCBgNVHSMEgbowgbeAFMuqnyxYLlHYqQh976VA
+MV5wuGrkoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNV
 BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
 EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked.p12 b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked.p12
index 931d7664bbf..33dff18470b 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked.p12 and b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_priv.pem b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_priv.pem
index e02718144c8..a7fe166899b 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDKW4vYEMMFlGAz
-+i4iigCRwPyF1DORRYlqpeXu9wINcihN0OnQd88wKzcwmvl9t6qrl8Wp54HTIvwk
-WQx+39xYuYyIQJpTo2X/9zQhrgaxBhs/q97c0rCmDbsK43ZrEPa9g4FrYEbjvWiy
-rzx7VfAjPN1XchgHfCFqPI/S9uSTOkvfaAX52vA8vNlQWu5Xn93UjdpN9Cqby8yR
-qYet1LhT0B5aQye+oHL8Ku248xgIqGUH+w+kLSJPZMw+KbBX1mz5lNP47pBf+kWc
-uQZXFyHw7JViEXTMQ4Xwxs85bGSNHTsszz45Oh+qirq6BrXH4pc7gownqRO5ZGkL
-aclsatEjAgMBAAECggEAFzw/c1NVZAjJ/8iMee3OVpjKG38mtARqh3g+IzFx/GOX
-yiZLZWMPGMZVjiYKsMtL9Gu3HXprjKKvQL3dh/H3e1Pu6t7peYzBE7eUYQD6XA2f
-R7EvTrwoiXX5J1e/9gJFerRPbNS/abtgJWhRXGNym/E2BH+hemE1SwgM3Fn6HAd4
-zMyVTBQfK6ueAiC2ck+iqid9rHXQYeWPyxVFN2apQcrPXeLqCw+oreYmQ6JOWodE
-eet76kadEAu3A09TRzfIqYI0DX/RxkMxu4bAkxgAAuyF5X6H3GPuoOgV28rwN4tg
-LxsgP6gaXZICK0lRErqHwPMZ3YpsboaCJf8veOAF7QKBgQDr/pqHoF83vkopdv6l
-NKCi23HS94NzE5YdzXinJ0/u88Pm2l1U0z6eJyF6+nf4jQNkt9L6dPJ/uTI1xu9U
-RhfMgBxIxZ5paSDkR7zgIhsDPov54s3pG7SNl8ahVBUxJ91RCmM/bVPpVgusb/Zs
-jtLs3SYK6Hk12G4YJ+HD+T6ktwKBgQDbgvnio2SIpy0ZqzHSUXhW54FDpk/kze8U
-q+v3eKMqgdfvbFx2Z7cjO6rRfTrSTJG3xa1bxttzAtnheLUnkJ33g5LPZXYy8pM7
-mlVlJ0LgUFmVOFG/eDUC6/kpjRz1qC3jU1kQGkXuG2wNurOceNIqQ68U1Y8WW6YR
-9XQpKwBC9QKBgAhiCus2bytzvv6qE3Ga5PnkAa8Uy76Su4pjeh2178j1L8hLiXUx
-68+CZFYR/6D8oVo6jWwIK3UOBxKR9n5v3viMtHSBUJc9/MUfJz5u97atyhseS2I0
-cb113sBsVDRiziHK1Ku0Hn7zZ4bAk2hXynZPhMJub5/SCFcjU4m6mNcRAoGBAIY+
-w7PnWUR5eQuJtx541K/RRSyqOZIkn2J1AgqGrMMCRZ0XGDURmN7jTsRvYdnbGgLZ
-0fue0fa0d6t8ts1LlFAbF13fHzppP8Hj0PXb3PpyKVco6lW+niz7Q5Y1xtA12lp8
-TquaZcoI2zxKQi4fdeiDHEARm0CBLD8vbar/sVlBAoGAewu5KYDJjNZCr2S8nS5/
-qGgu3BMTLnp0Uu0531JX51UjrE8kO4pp6gIA/tP7KHACToLGMApI86Sc1mQHoB/z
-mK5ZfrfSaZAqTHf6V82MekUQl9MiWDi2rQBq56cufxjA6SwMJdzb1KH29NmRnUjT
-I+4aEy743WQKBzB535ImpKw=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDktnvo+iyrEmJH
+Ouv3zMqG05M5aZLEfsBw4VhAKgvjeg1pq4zXOxQLGRVgHIk+ZpeDLqGR2QeAPMit
+Dxmbj+TdpkjILad6qghJwy8wjZLx2rvWKFESeSyC6pa3kqNfvfdveK7DMobpnfci
+JehCUilvHqouJUzzU65N44RlSzex1Rn2AWqs1hmnNd/3LCttNrXv+mTJPf97ZK3n
+CpqE8G3Hn2m9ayOPq2/84zNMGUlRYKYc1A7VzYg4EqPNJIu4W8qFyjH3pm/szgqq
+Ic4AmCGodAHkhUnJApvGF3lu4sct3xt2L6GJ6S8Kc3o5Jnttmm9JT4vTPx48dDFa
+WbLwFaUjAgMBAAECggEAYlRSUYe9TI9K0XTznkXdjLnJwhUxlGkqM12uo2dwVQxU
+V+n5U0+C/oJ6PigGmV1iJnQV4q58GxYG8OBdEhR7QRAMmoOGTaZsicnwr98uHez8
+dMZAlMCj8mUJB0N0GeWCS9qGyEUg26+eYIALqvfH+I4mfFBtFPAVMEdw1FvSRhGY
+CDV43Tu6FQg5CQv/mMu8KWRALoxkaWRiW0+Frup97cns67b8AshAxjGWR2BnlR8X
+l119iJcrX3w54qiAfEoqNxF4J1wfbQsRBljjaE1aznzBC+yXTpkQUwsKAej2gkkd
+SNPviuqBVzC+hc8KMWDWbYTMXp2JCUHt01qislnrAQKBgQD/jUV7lMnTmvkQ/NVj
+RCP/Dyr+xOmnlnvPKxcyD8bMHOa2eZdAm8beTXSl3nwTsM/r/Ad967X0Xm6wulZU
+01NbRIx1RCM4ApNOEc1+Y6Q/XgO3oOpCLqn5hS2Wq1HalAUsraIs95ojK8HpnLTg
+qrzbeI4J2pQZpPRc+h//zs28OwKBgQDlHSnTTaYCu9NucHsL3Da4uK8J+JXhEp80
+gaO8NMLh2JZwx1qTfaqtwZT2c15F29EC5pqosz6AT1KZ+Hi1CLKbJV5z713xCRks
+X4tRfftFCT5JUCEIhNPrRAIwkM3naSe17OJsAUgaPw5n2PDOEt2BqK02DmJDL3Vx
+ns3HXTR0OQKBgFxOMuLIg34jZAN2z7zjR/1BBU6w4ZTfDilubxpuCGiBp/QRR0jW
++6YgZBnlmvuhyfh7OFmLYlW6JlE/fR92lY1J3VIeInqAs6RnWcplQ1aAJueVAAiX
+wl2WdTkO+Kny/Ut+DC4h4VMC4y/2on7kLQM5MFTu1r/MjVdoIVbM5BMxAoGAHMyz
+qzoBeip+A03kSbNetY2RgyFaRbZ/iKwbFtdS/+ynzHliq1OKltjUjr4lxYZCGak/
+G6GcY6iU64HOOoNjYBksbEpUdq38GhXQf2fko+Lrj2+hF18K/HHKDKzHFSWktjuW
+opjupU3z053zdxPsABZh33+jXmqiyqt5lmvi4hECgYEAx/mCUDMiaJxgcgkrN7Uy
+kiJJdpMzxBEkDISRVwn64KoUucV9CnpbUqvKfEXCFPZSIO9+Eyl3MtRbrcssjoPT
+6QffvBUOG/SPenD6rv/YDHdtDUaZnFH7gjybDGseWs0jQYzUAcCRjokxoGJ1PW9m
+LPoxvzD93S2h9+zTmzIZUZ0=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_pub.pem b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_pub.pem
index acd39d3ac93..cc5b1aa7270 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai3_revoked_pub.pem
@@ -1,59 +1,58 @@
 -----BEGIN CERTIFICATE-----
-MIIFDTCCA/WgAwIBAgIJALkeLFO6BF7kMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
-VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAzMQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb20wHhcNMjIwNzE5MjAyNTU1WhcNMjQxMDIxMjAyNTU1WjCBkjEcMBoGA1UE
-AwwTQ2xpZW50IGNhaTMgcmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAta
-ZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTEL
-MAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyluL2BDDBZRgM/ouIooAkcD8hdQz
-kUWJaqXl7vcCDXIoTdDp0HfPMCs3MJr5fbeqq5fFqeeB0yL8JFkMft/cWLmMiECa
-U6Nl//c0Ia4GsQYbP6ve3NKwpg27CuN2axD2vYOBa2BG471osq88e1XwIzzdV3IY
-B3whajyP0vbkkzpL32gF+drwPLzZUFruV5/d1I3aTfQqm8vMkamHrdS4U9AeWkMn
-vqBy/CrtuPMYCKhlB/sPpC0iT2TMPimwV9Zs+ZTT+O6QX/pFnLkGVxch8OyVYhF0
-zEOF8MbPOWxkjR07LM8+OTofqoq6uga1x+KXO4KMJ6kTuWRpC2nJbGrRIwIDAQAB
-o4IBWTCCAVUwHQYDVR0OBBYEFAq6zWECzJ9c7abmyffPKMpFQ+bXMIHCBgNVHSME
-gbowgbeAFAJWd3z26jD3uzXjbmbbmGnQ4n2xoYGUpIGRMIGOMRgwFgYDVQQDDA9a
-ZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIElu
-Yy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYT
-AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIRh5KNnNRZPMwCwYD
-VR0PBAQDAgXgMDQGA1UdHwQtMCswKaAnoCWGI2h0dHA6Ly8xMjcuMC4wLjE6MjAw
-MDEvY2FpMy5jcmwucGVtMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVudDATBgNVHSUE
-DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAbXTH5lMYq4YlTt5AOXZN
-9L7OQvBwJdF8lilwjHq2akhqkHIgqMBCBZBvQ/rWUSu1kXFAhx5f1MR6X+Od2Wb2
-p0C0BqtnN1Krdv0ySEsa9hGnVGN3a99VwDBs8lfisJA4NCGWWMmQgSZ7rKNOlyzC
-w1BhhK5v2EfRqfOYTX8EA16myKUK9u24ys0uXRmZNoTIM3QajkQeHWR3wGZAeiid
-W9xWIDS+/SDEl9H4J3BjcUDvuM/bmmZflwKeHVzYAsu6Hku97a9Gc+wpbpu6dSr1
-5FlFoMr7V5UeRNTGlspUvhn+swVSUr3geKSOgG3/NWAjuKCVk2xw7fd423Yy7d9S
-GA==
+MIIFDDCCA/SgAwIBAgIIVWuFhqsbj38wDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDMxDDAKBgNVBAsMA0ljZTEU
+MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
+B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
+LmNvbTAeFw0yNDEwMjIxNTI2MTNaFw0yNzAxMjUxNTI2MTNaMIGSMRwwGgYDVQQD
+DBNDbGllbnQgY2FpMyByZXZva2VkMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1pl
+cm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQsw
+CQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDktnvo+iyrEmJHOuv3zMqG05M5aZLE
+fsBw4VhAKgvjeg1pq4zXOxQLGRVgHIk+ZpeDLqGR2QeAPMitDxmbj+TdpkjILad6
+qghJwy8wjZLx2rvWKFESeSyC6pa3kqNfvfdveK7DMobpnfciJehCUilvHqouJUzz
+U65N44RlSzex1Rn2AWqs1hmnNd/3LCttNrXv+mTJPf97ZK3nCpqE8G3Hn2m9ayOP
+q2/84zNMGUlRYKYc1A7VzYg4EqPNJIu4W8qFyjH3pm/szgqqIc4AmCGodAHkhUnJ
+ApvGF3lu4sct3xt2L6GJ6S8Kc3o5Jnttmm9JT4vTPx48dDFaWbLwFaUjAgMBAAGj
+ggFZMIIBVTAdBgNVHQ4EFgQU6GuYyvna0YB/1NW+yd1eU0HGFMQwgcIGA1UdIwSB
+ujCBt4AUscqer66YznKoDrPpmNNf/gv4YhyhgZSkgZEwgY4xGDAWBgNVBAMMD1pl
+cm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5j
+LjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMC
+VVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tgghyO1/U0Oe96DALBgNV
+HQ8EBAMCBeAwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovLzEyNy4wLjAuMToyMDAw
+MS9jYWkzLmNybC5wZW0wFwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MBMGA1UdJQQM
+MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQBLVV5sAXh8A++4l0QFeEYo
+STjNsJp9MUIGaVUGUuLbgZwMgiyXvS/qHKvHoaFzktttj9xsBHqNEmlMsTdUqnnn
+iypYoDCX9DB+OzaEdz0EG9VTMcBl/qIPpH25mCQ0MfrEc3dNHokAZwhk2OSUJr/1
+tGCFCD32kGqnT/bGgPbmEu13X0wrD8NOY9MafLBY4BNiFLNkNXYv51frRbcF7/gI
+djHNHrXSZ8gsNRIHpNzniyxM84p/AzUthErYw1Q9c6ZmhBfltnp6ectlfRP874Fl
+SsLLNsSlwlq8ZL5t7vglOd0ulF7K2pY4WyalCwPRIY9IWcoHPRa3XlRnDZDaET5B
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4.p12 b/cpp/test/IceSSL/certs/c_rsa_cai4.p12
index 9b4b6258cac..e364e4ffc08 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_cai4.p12 and b/cpp/test/IceSSL/certs/c_rsa_cai4.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4_priv.pem b/cpp/test/IceSSL/certs/c_rsa_cai4_priv.pem
index f5c156d6b3a..21c5a003328 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai4_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai4_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDBqX6tsD6jXIW2
-QftuiZRmsNeqyGhUjmsU7Mcp0UVH/+MzzPkJUoG1ZWbDhguhxWzxWVXJ4f1/LsTO
-FLT0RtIxwKCfCDL6ey5MVRHsn0iIoh6aECDt0RSO+hQTpr34b4LA83TLAKR3Jqxo
-G7FQOTVmK1DFYg8xFJe3btjjru5tkYwuBgfpnexLojEcDf8kSEZKqO3bBZ8t0FGY
-36zqEDQTp6Ui62hDpCyTUx+tpzLgev4Tu+4yg9b5+mftpiJdjLyYfI5Un03NcAHO
-vF0PUT/U+8kmcjhNldRE307rmxAMfkLdDMIHWyIq3oxMoNGtZfoRa8oDNb68jbCv
-dQl9tEnTAgMBAAECggEAASA4IVBd/Nsj19xoVssr9rDegBqsKJmvW67ItaCG05VU
-P8/YPsqhAGn3f/l+hdE9AeYwDn1m2N9vu3b5WlYzEKD7DhGhIj2nFkCEWyjN5iVz
-Ihgn6NoHUZF4nmigwBn925tOuYNmcV7jL7PBgyLiAZcM4Cjix7lD7IgTcLdqoW5t
-l06om21EaCkf022LI7kbim4Fk4tEOAu6heYgI76lFRV8ACzSSoWOiM9NcmB8vNn3
-6kFYhBn+FdxVZBMQcuXGyxLA4PzSyUkgxwrQ+kxIOIgW586HuPuf0eZVJNZ9ABD8
-vsiV0srZRUWCDvlpWFkeKq8ycsJklFo/1BIvaXPjkQKBgQDsDDpwLbG440n1vXPZ
-xITFt89dXJwIISrMzxc62bMaNQZ1WXwGslXAjziomMRtZaBGW/FycKps6Wj+uWL2
-04386vufFa/6Hw7XEWKIhPxNm/VD2FvW18ieGGHoRYyBRpHWTMjmCOGs3a164lf+
-+vVBz5ws9F9bYjE8H67a4DpTiQKBgQDSCBg/p9l/t/IcFyF940sNUJ/GifDN78oX
-hCPM3Blajkpz4RJX7iIJq4UgnqxE6pcC0n4J5yKHDkVQvbMHR/703CuiJkYn7vDq
-Hw036Dm4kCqCr+T5o+5EmpTjgrFFKWAexnfcaYeGsMizBdpqCiZ2is4uOJpcIgkE
-IuokG5gvewKBgEruRs69cqFCZYQAs/n5DDzHcKguccmS3cdOJg2kddpn4rj1ww1N
-JzONQ2shs5kWnZ44KZkucqtIHPBfYS8BUR1sapvBgq9flJJpDmJP9NeeHml/EQhO
-T30AOHRHP6b6A+mHTm7XeuwpIpzTpSNn/tr5UJZkrLCRpxdy50rLyzghAoGAbEbU
-CW0Eyb0Qyb56+6VDudeIpxfR1rj53Gm48xG82FxmsZqklEQltAqClTB36wdtVn0h
-kQVhXXLT9S32r5hELgObUvqcTFX4SRo8/EdyCl34LGt1heUnHqL6gteLf/Y2oWb7
-v9t/jMZykShBU01sSsyAQn/XxAufzkwZnQfEyyUCgYBDvLIQPZGQJfiOOaabSpCY
-lytUrg+zA6w04hTn4UYYXXVWv9mJg08fAN2iOKazL6WgEI9VKT7zy8mNyu+/w5B5
-OA+4lLPnHrN1yr5eF9nhe4qrzr5hEwVREvlTazvw9vMofVYnUG54e02JO/xlsg+Y
-ae9tt4rR58u2SDBSJFHNbA==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCcrSoapbBee/fa
++9jwRS9DElp4ujMv0zj2TbO21ftRB9BQqEcpEFdafl3c7xvOPlPUQzRldVv7pcNp
+zZpoys9o8nUtCSzIaYnvBnrXUUoTqWpwqZP+Whji9lxOsuuEeLdgGLyLdEGhxhc/
+I1tdR+q5nmsnAS2ni1dQmIyGZYue+e7bAha5ps8qZr/YdAA0fOCgQFKq+RrK8zkf
+W/xyXZJ+bNl1E/jB3VPWqG+6LfrOf1GOMx9DUoYyjqfoDHFx+O9ciigz+Zzxi1JQ
+k6i/UGPYs4SNrZ9Be/lqhdxVdUA90c7LfHcSE3JPFDqnBogZL5gccBc9j6miJDVD
+xjAdjMQ9AgMBAAECggEABfHB+7HWn7cXX80XXYJaeTJ8kUELSSC79Ahdra2vs9LW
+kgDYdlPi5JGP0R6XUPtnZdHI7qKFw2X2JJEC7z/mn6Y3UOacttveOl3mEj5Iz7cp
+TS356fgUIqRTOz8plWSZHIHDwYy/IrqnziLyx/a/DpzWluvCBi3QucOX7U9z/SuS
+Mr5dXX+R3aPP3bEId1loGfnWV5heRMeX+AmpWtMiOYOSA/74x/u3qPwLHadc7QDO
+xEKCgg3WxaypRL5wKkpgP+YzmukZ3APgHa50sfEInP7EWPT6wiwJHoaiaRALeIWK
+6ZtIbTUEsHXxR9Rv6HmQ2BV7NWXMy8BWxKRS1pwN0QKBgQDOS/FwmLv2X6k0TO0h
+hyEzFlZ1rWBNVWvm58awCOXo0z8C9CCR66wzKaeC2fEptjD7b2yoPU0qQxOYPnsz
+Xue6qtBHQerWy3LBzTse8exWMk+W0e111sa+CoMdWAjeBilYeYWQODTKrtt3b/7u
+23h2hIAQuKdJZKnKMkeGJ6zKKQKBgQDCbLkFr5HNzjj9GudFmAICIQ8m64GmyK4B
+y4R564CDC4P1IFPyJAbZdgERw+1GbVLWtIw3PFiQwCC5Iz1yGF19+HY8djtgrHsU
+cf2Jtb0n88YqMmzZJaVLlZK8jNh75ejeL/gH5qRXRVl6S0oil+hPs84fcm0eIxuK
+1QzZHwRT9QKBgQC9p3+tvhx/Ie7SkC4o9qwE5XJS+TNhpThvrYEx8Nw8sYhqVLlk
+rT9AQfkoCOj3KfHaFdPUz5aTVds7yaVF0uhC6ipUeDtHgP5dQSorBsn5bINS6mfe
+P7eymsNzRK3SP+Pe3Ml3jtSpyRsmsKW0Pbx/aMy7kqboiEy4AIVUxkDKEQKBgQCv
+bqkYv04h1SXJBICQZFPTlf71EGYBl2yjg/86f8yK8lYUViJJCEcB65+VZyPve2/W
++jzXDmWf3yznwSuNivy5UPtnHQwA9EFutlie7NUMesNhifR7j6Nx6znnVnN0gIS6
+D7CPeIbrlFDjr5HqWwWs/UJNT9Oz8NvGTu1z8K/YDQKBgDnKoTsfITbHB/huTJgd
+o9GTscasogwF0Xj+AJ8hPPjXxRQDDwfKmSq7UA+mdxUyrwmuUSzIOSzwrRUaTBH8
+mBp6coV8CrIZjqg5CJfrWcmb6ZpJEkkFPdGNFWXkaSvdrMlFaSbZzHi45tlWmw2g
+FdNmpROqLIlYCvv1MjYeIsL2
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4_pub.pem b/cpp/test/IceSSL/certs/c_rsa_cai4_pub.pem
index 5db169a13c6..a791bf42f56 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai4_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai4_pub.pem
@@ -1,60 +1,60 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked.p12 b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked.p12
index 5e8d3f49e77..839d660ccf9 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked.p12 and b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked.p12 differ
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_priv.pem b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_priv.pem
index 0ab821e80a6..db1ce3b501d 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCn5yS4xInouqzJ
-KdadQXgBI/zfH7p4Fc1lAx+6l0Sm5qCznfI4xr6BUqK7J16w1BDZTIm3jC6s7UjK
-jiTGCZOzFS7QKSHlJ5EOlYzSSJSdGN2P8Z8l0s18FJSb6lF2pW98sqP7cixG53Ug
-pS85qVI2P3nPW4y1V5K5RMy0UAaU5S2fgUaAbLjugAFC+F9uc2UfPBT1z2kl/1Qp
-pXuFyUR1e0y6iXbLvlJqyy2UQFkULCniyr81t3PhqynV9ctpDxCM7579Ub6pQbfS
-5sp+yh5+AlG1A6I0j3yD3MH7IYd/j8vvOp7m0op1ZBFfy8NvD9w5uNHONgXrYBP0
-OiC99f6zAgMBAAECggEAN7ZY1v5QDGs0viMl1VRN74Lze03Z39LMLoJU2uMqon7Q
-QAlewDwiJmM3IAa2QtJ7LL9ayw62xiaOCrgTt6qh2cBjoiqj1pfEaCRzb6sptN71
-VbgE6NYD3PIvRXUAxu+qCKR2CQ8fZf+TO9vTybxHTTzOvGFSVTHTu6n6irIrHOhN
-E6lqPYsxho7rGL6UA9M8CPWqabSy9k+noGgsnUldbNsrc7KT8KVxiQlCLje8gLPm
-I37i0Ji/eZKPkQxxjzScmpCUuBf1Xf9tSAmzqHlCXNfMNyn40Ny6KJ5U7ig/SO9m
-/Vvy41jZOu4G9LYzUpAfwg6lbb4PVJmhxcK4ojXc0QKBgQDUmpEL+OyTJKM3s9rh
-P3Q3nkx8DsuGxdlMqQC8Ar4DyacTl1Y+pbIxtUNyFpZJxDyhny/QKfkffNXl8WrP
-abdHEnpwZTHSgMzziyDbH8KWdKRn8d2HKtdqSxDIn3V0RA2QEelCggWuHcLrHRH2
-70ztIWmGFuctS2IT6eflO9MC7QKBgQDKLMUepCk1YMEaXjGFN/nhwi5x8YzPw3PG
-MG34rza7JbxYawK4yByhX92h1V5nFMl5cCm6VfACAfgS/suDSeIK/S/N+6O7NZux
-wdENOUDOMruVoFMBXVTFkYfLWKUEsQj68XX+S2AN9At0WWi8CE2JeXkwBeffig+V
-Y/8jmYK0HwKBgQCnaHJwX/lBQCc5lGj01vdXWFHXmfrPS/l4sNdANFSVPPNPrOof
-eG/hTl8mdfyvZ1Nq3KNUochl7/GqF7hITHEiCL3axQQ/QmagG1yqzs51lLFknAIZ
-DjYDn8o+f7mH7JJVcJUhZqq8WPkEE6byr6n+S0IBcQVmGCbJkXSlf77/XQKBgQCj
-Bw0BE2FDcLzmNVR7V1MBsCLhsOVaWAKQq1bSdP+OU/SX29q7BGrJ2lMO/857EvEQ
-ItkTL980zz+qmZmkSbykHdwhnqw99xGQenjH0AYpABHxqvGkJQ2JrzuwRs/yg4t5
-R6JdJ4zSU5u0+7AQCCX2GGUXy3tZ76t3TMZdf5k9AwKBgCW29LBNmMFg6hdJqyaN
-v+0fqcgErRuPcmfCaTi4F/rRj08U7OvAroGaspJnXS/t/Haqo+vKD5OZ03pTlYUP
-fzgR2xt03x5mNDxa2oVPuj8Zxbd3m9sBmYacKFkmzPGVRtBn2UtKx4xpJ3lRDuJa
-BvQY0lc6KUSgKjLIfkMy0fg5
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCee0H/9PJUPxwo
+gE02/Pf8glwkISesRVpHhcuOKT06FI1Nt9Klcnd+ImaWk90a8AdUSb3/e/uWQDKO
+hQK82C4JH40o7+81gAWmo9F0MrpgBj/yc1x4ZLYFeBJKPdfAgXNonGBKf750FNv+
+7BH69oLffeeP/TNdPAxAj3MtP5cL7f7XVM5O+N6DK+TVIHRuQDe5JXnirZ4Zpbjn
+CmAPMhsk/MG3DqoL1359w8N1dJsVmP27BYEdQN4TRNWZr0NZBrZ0EGX/qmF5ktM9
+r59rw6yzgZzvmcO/8XYeJwla1743iUe8Cq1pL3aLlmB4g3U86y60SU3dgSxlDr58
+cCNqj2v/AgMBAAECggEACk5tvl2JnNz10dR2MQtGfU9k+pyFXfispFYZJMedybco
+cVNxCX1mM/e8wDIhgOz3LQ4WoxTHCcBnCUmxIeLVK5a3sV/ZKJuIwouIxYu+/xuo
+8PV7oAC8raJfXiCjdUt12+m/gVjJY/cvT2a+zJlXbX1cn8qRmpCbI1+w19J42jen
+1JYxiGXqxMKq4CrqsfFBlfmnKXRvYYtH3NQnagu3IixQeQ1C0TFJeoOhlOO9fgK+
+VdkgozQQl3lGYYKEfUbjKxaLGwMc3+98/KG/TSA9WlTlP3RikSjMhR11TcVv/rEX
+XCD2Pdf1tT8awO8vCXWGz8clbfkUuBv4PY2pjdePEQKBgQDOBE2xoZ7tDSX89Yph
+c/kDi8ZFkeoiwzeypvxrawLxTKE3HManwXyuebnRZpgLOS1E98SdSD8+t/1LGfoi
+g4e45IKQ6Zo0EPJ84XK+3Z7O0cL5Pwbw+GJlarRqkvk5C/d7ww64jz+9W1NBgrHS
+9Zv8zcvXyzhucHrPViRIEmVcqwKBgQDE7olTyCx2pWOCjW3HPkaC6NKVEykQD8C1
+4DBMcgWG9CQfPkbQxOHria2tysmtqycbHWJgoPJ/jKlWMc704NNqhXr1yeMDx7+i
+4HVXyxQFAqVRI3Dx68Go6aDYfXae3txGbu8UhILKiP2QmimSYfHWKWfimlzDK2/A
+7XrhvbqF/QKBgQCO/T+rrYCwCXM3ankcgLDx/B6mhMscS6Cp9+q057ZIIqa2qNtc
+7heKxePp6ipXh9zaxJmLjOyQrIU6jhIlyGL4OmpBCFJGFwknEhdhUFL8O2z3L/6y
+W8N3nqMQYWhnZt3j4ZOjF5Hm7K8RhhPEV0JoKbJ02ZEWXi1vINvXxiTiNwKBgAUl
+uv8un0Lmpcg2zCTGEu+/CCoPWyZpUv8uAfUtkclqPjt21EEGtGUErz54q3bXn2kN
+BpJCArSkx5RSLvelnMEPBhzAjyd9JBwsw8RssXREEnAhfgVExUYV/TdLaDtU1esd
+YTBnGkgS9pW+AdIqrziK0oVQxZXwX7ZqPqkB3Ys9AoGBALqg0he5Bvld619XokjM
+bm9vipp1wOT43FZd7Sax1n08VtAEkOJ/Bmwy0MomJj4tYei345C6tzShYQ1Br52Y
+B5k2vSQ4qGpdzSsbOPnFo8Qp5mVDRWl6tjU7PW96HaMNqW9dl5x1GO/i+tiUyNWP
+7eJ+UV8EIfwUKbFJjPn58phV
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_pub.pem b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_pub.pem
index 054b105367a..21cfae1167c 100644
--- a/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_cai4_revoked_pub.pem
@@ -1,60 +1,60 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIFODCCBCCgAwIBAgIIVpz/zZFtSU4wDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDQxDDAKBgNVBAsMA0ljZTEU
+MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
+B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
+LmNvbTAeFw0yNDEwMjIxNTI2MTRaFw0yNzAxMjUxNTI2MTRaMIGSMRwwGgYDVQQD
+DBNDbGllbnQgY2FpNCByZXZva2VkMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1pl
+cm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQsw
+CQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCee0H/9PJUPxwogE02/Pf8glwkISes
+RVpHhcuOKT06FI1Nt9Klcnd+ImaWk90a8AdUSb3/e/uWQDKOhQK82C4JH40o7+81
+gAWmo9F0MrpgBj/yc1x4ZLYFeBJKPdfAgXNonGBKf750FNv+7BH69oLffeeP/TNd
+PAxAj3MtP5cL7f7XVM5O+N6DK+TVIHRuQDe5JXnirZ4ZpbjnCmAPMhsk/MG3DqoL
+1359w8N1dJsVmP27BYEdQN4TRNWZr0NZBrZ0EGX/qmF5ktM9r59rw6yzgZzvmcO/
+8XYeJwla1743iUe8Cq1pL3aLlmB4g3U86y60SU3dgSxlDr58cCNqj2v/AgMBAAGj
+ggGFMIIBgTAdBgNVHQ4EFgQUBXgPYa4QqufZEOHTxf61VEykzeMwgcMGA1UdIwSB
+uzCBuIAUyFjOL29lWgNcuK9sMmg04+uoEv+hgZSkgZEwgY4xGDAWBgNVBAMMD1pl
+cm9DIFRlc3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5j
+LjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMC
+VVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tggkAnFz9fD0ZLW8wCwYD
 VR0PBAQDAgXgMF8GCCsGAQUFBwEBBFMwUTAiBggrBgEFBQcwAYYWaHR0cDovLzEy
 Ny4wLjAuMToyMDAwMjArBggrBgEFBQcwAoYfaHR0cDovLzEyNy4wLjAuMToyMDAw
 MS9jYWk0LmRlcjAXBgNVHREEEDAOhwR/AAABggZjbGllbnQwEwYDVR0lBAwwCgYI
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/c_rsa_pass_ca1.p12 b/cpp/test/IceSSL/certs/c_rsa_pass_ca1.p12
index 5db1aba9a07..a81351e7099 100644
Binary files a/cpp/test/IceSSL/certs/c_rsa_pass_ca1.p12 and b/cpp/test/IceSSL/certs/c_rsa_pass_ca1.p12 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 35049957313..57c6803326b 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIlQpVxcRQ+ZECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJNu0k+VDPNLBIIEyIJOSZr/q/VQ
-acsny6H0/3cwaQHPKZlHtMFS+hn+eki25QXV/yytCyxKkOBlpqQSBylV/2bMufE0
-oSvI9dyG9xklpnvN243T+hHOop0pgtotHa4qCyyb/xmD+dhJNMsfHV4X/5KlUKgT
-CEQNp8vEKedLgwKYd7pQYnBjDAk+zJTxEhtneTHomvKgwftAjefyLNx/ODklEPBX
-gU2Av42WVgFxdn26w2oEzK+S1PDHD9Y+mW4KKHPcx7TwYMl1FOJGuO55GqRS7pwL
-EpqFG4l6i+j7DEuNJK1SXplRVIQqrSMbuLBRQe0IvJIGsHgcHoh49zVgyiUsyi2K
-F1gqKxJnpdpCy7r7Uh4ai+Gtp1CRtOa5d3D3tzMC9++QrOA03G1xBmRnw9atRblV
-aNk8eWPvCje2Pv5YDryat1gKhX47TeBZ1bhmh3SDOxClTTxajAK7+f9H5qF8wPJZ
-owJ80H6NsdOYG8NfwXTmQGUOi8fWPxQNJSb4kyqJkYT+8vUd5laPrEj++2HQEPlg
-QjWQPAyqNwOwvsXNm2PjtFgvOT0C4odiasI2+upnDbrtB4Q/OAFK8VBuTAcsyhWw
-nvSc1F4cXgJ/pSiTIGQIVm0HXOI00LvVQGqzpjLzEiMtzPeFcxdmk1ahHElhDkY3
-KqKlTukYZSmN0PaL6lRTO9x2W108izCMOyzBNwU3Ku19vfrt0o/p1zOF1OzBfWPa
-D5t5Cujxey9ah/5ysZ2vogpEuV3y61CiCZdVR12uae5yLYpRQa14PId6NxtwgxZa
-536EL9Wgr2m6BITVf4gNs6bQejGIqRKEv5ANUXxKqd1XMwzsc5u09QbAjIRrfA1/
-ax/+oGbsd7A5GpC62nFjSPVUVt2O+/RHeVf1N8vTncDMRefvkVMZUZDdWUvfyvK5
-ZdYeepeDl031AG+uZv2d+Or2mYaPPMU5d2+BIaRRiKHhS3hd39KlnY+yk0TM4Fx0
-wEOTWrmel+19IpmR9itGh+v5J9Mra0e7p9YADcIDUUOzvSn/aNZELc5N58ejzpxA
-/UyQd0RkYmX39LNwwyTJ8DSE+Udvcx18DylC+Vz/eNi+s/OLxazg07Ccu5Xje+QC
-lPHdi0OfY6GN5OkKxTtcn10oQoX7ZC9n1hNYAjQtysdMMBbFc6ljAGFYP5xwWM+t
-79L4tg27hJGlE5f5PUKVC8rJcOMt0Vx5MM8JFcy4nJP4j8d0hVvLoqVtJgBuMU9N
-WmKhdwxU16N/Hqf1X0otaFn0ebgaWLCpbIlAjVviqh3Z4cqPg2D4ugXgRl65U5Yo
-3sTQXxDG4Gweh4x/pmLrRm+vDxv5KfNuHQuidQp6eEU+wuQhiXsbJPUHpXQYHf2W
-3zgeQv4jh2/bMlRGixJIa1cIVIdTOYefXiYpbeXfOTMGBI/146HnBT5E3FC/O1hH
-ateI0DDQRCVHuSv2JBojWBVkOYywaKsZHN324BWd24cc7uCziYSsRlv4Cb7Yn7RH
-y6m7yCPYJrQzsq5HKKQkCkZa4xle7qzgqEGictN5rtxaUd8vfzaoz2J1GCheZpf9
-iiG/Icuz4tVKHU5tAcg+WjKhW3k+DdvGsqMglCmPfPnN/Ugy/spbnDRsn6DOL2Wt
-z9NodHbVXGdtnfwJZQd6Yw==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQ8s+TM4Q9W+myvw2k
+LpmTNgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIdPqqweGeEsEEggTI
+zj1obJkuv4QP77Rr7Tk8QYnADspzBQ2xKGFMMR/prizycD4qx+Tq6gzgztfgQLZX
+8yJoJblBhr3RC4UwcKOxQgbN1/hV/p2WEau2aXAe4qgUutxiiDsWurHUw+v+34qW
+489pdK/wqavxX9GgeTrMTSDYSPX+02wIpq3ZhzoqncnFmnudQC3x/JrPLVxzn+v1
+qpRn3F4DQpfjPNMBTZ6r5bH0ioKAClZWgz7NnnjUCVIHv0teoDm4RZz3tl1govcp
+/eJ/pjTy3ozln2joDwIXA/IFy5/aXZIlC2uT4aibc7U7vqrfElGC6gYikxt7k/wK
+YP1o/wvXb5KcS94GviBR5ngPQfWMnEpnXtHxc6XQ9+99OwuMKDF+3ztSLO791KK4
+UblTFKofhAoU4rhJP3FAz+e0vWfT4nxPTCePt24L4NF+qtHMfraHzEQUrxdyt3kV
+VxK1iu1DWHprB8nJGWyHrcVToeapsi+q+i+h9DpohwdR0pduwcyaOryQvJpbsI9f
+Sf31I5i4nCARj6M6QvGrdRNgqSn0UBU7s2lJSJVI86zECF0QbDYAlimqPoZU5sun
+vSwjaKtoJPVV6qveXRkR5GEVGdIewzWlCA029NorzTXnZsBrORLtteBF+DItuNXc
+NQ/7tz+5Ch1/59NsvwTkDKTj0t4HnEaUv3LsxGeSVp9sDaox0H4+pXEa6uLUf+CS
+7R+J2gdnU+AQ/e+ZvidDbwxDz/4OYLVQeFlIaDZJW5NevKY55atyast5JyWi3mDx
+zr9lQpGo+QfshxCWDp5jIGySkvBT8wooybEAEyLjSzjCieeYs+i7CA3loRP4HT+s
+5Kjtnc/tPQEdjr9b1HvfAg9s2VcYXT5bfpsvL/GmND8e1xmmofV01RBd6vde78Ha
+hT9+DSp01tAjmbCjMKk0/vRvGQnuGmRI4A98FwKpeSTlDO1P74/3IVOyWWsdRacS
+LAyka6ZvjNVjvDG/5GmLn7mnRWAHop7XkQp7lY8TjkSHzNyAgCOIwe93t0/+fMgJ
+nP0tf691Lke7NWcRW4yUnHkJqzxf4VkzGT3E7HoksvTWfDI1FPcqz+AQdF4PXlcp
+JSq+T+0gJPri3NbBYyqD3jOUuEEEOBoLrH7xClYBNzjKrcjQ/jogdVtCi4L3Gnh8
+ctW4w/ExU3K8Ubr0p9j16KfAx+dN/wT2uvfJwVBvqzjKvz1m+BKR0ZE0KnDnAzGr
+G9Cgxn6RGf+XreQw8slJOjfIBhrkpYxm0Pe67LYYShQSBNBwY18e0xyJNyJJnhJv
+0c41NZxf4/sM4hLJv139fA3cav2cc3OBJOJk8pY8SMsdOCaEsgoccUaQZcNFYaJS
+SB+kfqcJP6M5eH3q81TEddk8kGJhubxK0rMTzOBrWwGfRSi+EGG6cjCojBmXvVEV
+QepdvIyLNEz5aNxBu1teIpbuJ4/UWqWiIOt8mrCFZYchb16G2I5IwTPTWRmBX8bB
+7eEFMwc7ZtIeD14c1ZRUudOHHSJXUQW8KUu6dYLqvxm9OTBOpEGNVCGjIyhlgabY
+hUvou/SDVuo2PmYNmXOf1ZTm1XegoSF8eKfs0iAgNRQ+kMBpGbaZj5Lh0q7CLKGL
+pyzA3SaSaf5fvAs8DFqsFYSWXpKK8RTb
 -----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 97b53fdba13..023c822616e 100644
--- a/cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem
@@ -2,27 +2,27 @@
 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
-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
+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
-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
+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
-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
+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
-CCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQC1g1/S7q/ltczKsyrfunvBiFLJ
-ndFZAGR6SMHZ87dpkS8tBjGBWEh47CIY6h6Sj4IOcgJwNavP/BLZd8dgU+q6LcOR
-4cQt+xwQFW6CKJitOObfkq83fAhgZz6k9nxqcvn08TOW3VI/IHweFyRMsO9TiKON
-4HUSLzhAtJcyNhsmZdsVokNUJg+thMvVU+0Gp5YrtxBLuoMb1Qi8qjUwF3QYB61T
-FIw/7QJP3pWxDZWnDYnVp9AoPg/AAMBqwxJGp1jJ9UHld8aWn/a3GzDbVk2x1Jb2
-cWGivl22r+G/3FV3ulKh4eBaWIpGZwUDilV3phVeJymuttMT+EM/4gZMlW1u
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/ca.crl.pem b/cpp/test/IceSSL/certs/ca.crl.pem
index 6e80547c0a8..6f31c7283ec 100644
--- a/cpp/test/IceSSL/certs/ca.crl.pem
+++ b/cpp/test/IceSSL/certs/ca.crl.pem
@@ -2,29 +2,29 @@
 MIICPTCCASUCAQEwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNVBAMMD1plcm9DIFRl
 c3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
 A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
-BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yMjA3MTkyMDI1NThaFw0yNDEw
-MjEyMDI1NThaMFIwGQIIDWOdbRTyI9sXDTIyMDcxOTIwMjU1OFowGQIIRh5KNnNR
-ZPMXDTIyMDcxOTIwMjU1OFowGgIJAMhPhesMBkMaFw0yMjA3MTkyMDI1NThaoA4w
-DDAKBgNVHRQEAwIBADANBgkqhkiG9w0BAQsFAAOCAQEAErQy5/1a2sZBCD5PcLzJ
-3mP7a07gszXf4YfwB7AwWAWMVIm8kvJDcRE+EAMCtwdhbS86YlCMfhDB+Hq8hlAQ
-zDzPqwcYlWSCy44ZuaYOrmxDwk8PDye0fVNQLdcdcUm0HdopTpO8VtB9c/oFmLdo
-nFKUpR+CWSgMqgc3h+RPJQOVO7NtVST4rAWaEdJ0NC3Lt39nfVI9Kgb/aARZMWjq
-7ND3BqiltjXP9GJA3fYaptOEK9XS+nBDmzoYzP1Q4IwioJlOKN+2n6m/AoRXaYnn
-R1LnKVxNGgGFdxTegv4tjlBhVeKw2lEXA+zTAo8aUGMYmafQW4KNDL6dOz4KOcyv
-wQ==
+BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yNDEwMjIxNTI2MjFaFw0yNzAx
+MjUxNTI2MjFaMFIwGQIID5x5xqvy6WgXDTI0MTAyMjE1MjYyMVowGQIIcjtf1NDn
+vegXDTI0MTAyMjE1MjYyMVowGgIJAKjqZpTIWSFnFw0yNDEwMjIxNTI2MjFaoA4w
+DDAKBgNVHRQEAwIBADANBgkqhkiG9w0BAQsFAAOCAQEAb0kd/l6TY+mzUMkg/vOt
+4Ei5JimBu/yt4WLX9+ff17ES/NuxYY+BIs03kGE5uycx1xrJ/qXeiJQ/cT7JFZDR
+vi1yWyekZidgNJCBdAC5k+7Ze1EOO7DpnJYRcOInAQzFQuXyFbVTb4MruMqIX/nS
+TviMKoxccH1oAhE/3717ZFdu3+NypRqM9aX7RY771RNF+003uLtFOdXIkDsINpz0
+7DrI2nWrbiZ1LsI5Fy2T5QJEEErWKfdNo3KE5m/ifIbUmVWml/b33P+e0hGmqgcy
+2QOAnbLmtWH5WGSJ5OJWs/V7vSUbqzLEK6O42KFPXnzqsf8Sq5yqM8cbEwXpK0lC
+Og==
 -----END X509 CRL-----
 
 -----BEGIN X509 CRL-----
 MIICLzCCARcCAQEwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNVBAMMHFplcm9DIFRl
 c3QgSW50ZXJtZWRpYXRlIENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
 b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjIwNzE5
-MjAyNTU4WhcNMjQxMDIxMjAyNTU4WjA3MBkCCGItOxHiE3EZFw0yMjA3MTkyMDI1
-NThaMBoCCQC5HixTugRe5BcNMjIwNzE5MjAyNTU4WqAOMAwwCgYDVR0UBAMCAQAw
-DQYJKoZIhvcNAQELBQADggEBAG24O7X+D8sBOCJUN2UtCbKoHtra5F4WIGKE0LxU
-Yd564KgTEvywhlPoIRdewR8mnL2n1Mp8O6TVNS8gRF3UcCPIraw1h5wAr3y8XbXV
-cuRYxC04NmEeAaLDoNDYaFQUcc1Y80XqXhEdQhLAjZX45m26zcTHNgnuzIFWl+IH
-5sR9Kz5N2P8ytDB8VczVcTMJ3I7aHUTD8kHj2dA07BEgPpV7BusVg3zNb2f36fgj
-Hdc+qc3B379K7phWfugzXEk+IT0V58tUQjly1TzcltC5UhS2OMRs5eWgTKki3hnt
-+Vqf5naZDZdjMB8nbcl2Qh6NmUz0oxNC3g1L4Bex7/qAaiA=
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjQxMDIy
+MTUyNjIxWhcNMjcwMTI1MTUyNjIxWjA3MBkCCFVrhYarG49/Fw0yNDEwMjIxNTI2
+MjFaMBoCCQD+yjWHDyrEMRcNMjQxMDIyMTUyNjIxWqAOMAwwCgYDVR0UBAMCAQAw
+DQYJKoZIhvcNAQELBQADggEBAHhN/DdPstBhM7WLy0l6wrqDIfwVGOsK0g7b3DNl
+gWdEvV0suxcuX3ssLrYv1YUoA7ateFABs3K4/p/gaK+CffyvSEzarGpT0y2ogWga
+7f774P3v6D5q+1P8DYSuYs4DEKmyIJB33gX0ZsKV6FT6cium2CNAQmcPIKnrp/ft
+Xmtk7inxf2GVivIlVBp2MqIafRakLeorUyoNFqT/3ccMx2t9cPs4OU+xAdvWqCAA
+AOgZnMNEVjqCJ0J2CFFFe+nkIDr7wAbqVu7vvj0udZaGrG5zDTl377D/Udue/bs4
+RwFbbbm+dq+hU5+pJthsJjO1wMfXW+VyaOwPYB+F1PyGKog=
 -----END X509 CRL-----
diff --git a/cpp/test/IceSSL/certs/ca3.crl.pem b/cpp/test/IceSSL/certs/ca3.crl.pem
index e7b6b8c3e79..b3262275bb9 100644
--- a/cpp/test/IceSSL/certs/ca3.crl.pem
+++ b/cpp/test/IceSSL/certs/ca3.crl.pem
@@ -2,14 +2,14 @@
 MIICPTCCASUCAQEwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNVBAMMD1plcm9DIFRl
 c3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
 A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
-BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yMjA3MTkyMDI1NThaFw0yNDEw
-MjEyMDI1NThaMFIwGQIIDWOdbRTyI9sXDTIyMDcxOTIwMjU1OFowGQIIRh5KNnNR
-ZPMXDTIyMDcxOTIwMjU1OFowGgIJAMhPhesMBkMaFw0yMjA3MTkyMDI1NThaoA4w
-DDAKBgNVHRQEAwIBADANBgkqhkiG9w0BAQsFAAOCAQEAErQy5/1a2sZBCD5PcLzJ
-3mP7a07gszXf4YfwB7AwWAWMVIm8kvJDcRE+EAMCtwdhbS86YlCMfhDB+Hq8hlAQ
-zDzPqwcYlWSCy44ZuaYOrmxDwk8PDye0fVNQLdcdcUm0HdopTpO8VtB9c/oFmLdo
-nFKUpR+CWSgMqgc3h+RPJQOVO7NtVST4rAWaEdJ0NC3Lt39nfVI9Kgb/aARZMWjq
-7ND3BqiltjXP9GJA3fYaptOEK9XS+nBDmzoYzP1Q4IwioJlOKN+2n6m/AoRXaYnn
-R1LnKVxNGgGFdxTegv4tjlBhVeKw2lEXA+zTAo8aUGMYmafQW4KNDL6dOz4KOcyv
-wQ==
+BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yNDEwMjIxNTI2MjFaFw0yNzAx
+MjUxNTI2MjFaMFIwGQIID5x5xqvy6WgXDTI0MTAyMjE1MjYyMVowGQIIcjtf1NDn
+vegXDTI0MTAyMjE1MjYyMVowGgIJAKjqZpTIWSFnFw0yNDEwMjIxNTI2MjFaoA4w
+DDAKBgNVHRQEAwIBADANBgkqhkiG9w0BAQsFAAOCAQEAb0kd/l6TY+mzUMkg/vOt
+4Ei5JimBu/yt4WLX9+ff17ES/NuxYY+BIs03kGE5uycx1xrJ/qXeiJQ/cT7JFZDR
+vi1yWyekZidgNJCBdAC5k+7Ze1EOO7DpnJYRcOInAQzFQuXyFbVTb4MruMqIX/nS
+TviMKoxccH1oAhE/3717ZFdu3+NypRqM9aX7RY771RNF+003uLtFOdXIkDsINpz0
+7DrI2nWrbiZ1LsI5Fy2T5QJEEErWKfdNo3KE5m/ifIbUmVWml/b33P+e0hGmqgcy
+2QOAnbLmtWH5WGSJ5OJWs/V7vSUbqzLEK6O42KFPXnzqsf8Sq5yqM8cbEwXpK0lC
+Og==
 -----END X509 CRL-----
diff --git a/cpp/test/IceSSL/certs/ca4.crl.pem b/cpp/test/IceSSL/certs/ca4.crl.pem
index 4bc36921783..fcee3d23a03 100644
--- a/cpp/test/IceSSL/certs/ca4.crl.pem
+++ b/cpp/test/IceSSL/certs/ca4.crl.pem
@@ -1,15 +1,15 @@
 -----BEGIN X509 CRL-----
-MIICPjCCASYCAQEwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNVBAMMD1plcm9DIFRl
+MIICPTCCASUCAQEwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNVBAMMD1plcm9DIFRl
 c3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
 A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
-BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yMjA3MTkyMDI1NThaFw0yNDEw
-MjEyMDI1NThaMFMwGQIIAo+VBXGcQdUXDTIyMDcxOTIwMjU1OFowGgIJAJFLSHzG
-3e+0Fw0yMjA3MTkyMDI1NThaMBoCCQDpVZScbqc+/RcNMjIwNzE5MjAyNTU4WqAO
-MAwwCgYDVR0UBAMCAQAwDQYJKoZIhvcNAQELBQADggEBAKO7GHkGdrh+tnVdgShn
-ecnvX9SHMRFndCeXFg+l1mqwSUSzgIxHFMUIlvnoSarcxzB7SuhO/aJbuZ32BR7P
-/J3c0lquN6Y6qoWvYr7MbRORrELLIMfgtTbdARgUU7rSYe8lqS8PhoFjRc3SskX6
-cLJPbYSmfF0DDElR8JYppFDAecs31aKMLwmnneckPCzwv3x6ztbg0AsmG3kqC1eS
-9Eb1CHTn2H0NUtVDoqxyXl4go91ziZ0ft1NX1SC3rZFk2sQhHT3tLASNHTIQIs2Z
-gwzpmCpWa85bSDT4A8RgAfWobvy74vlXRUsBUwpX4q/RWe43Fekh9zAMixEKfSv/
-4lU=
+BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tFw0yNDEwMjIxNTI2MjFaFw0yNzAx
+MjUxNTI2MjFaMFIwGQIIFTkDdI8okjoXDTI0MTAyMjE1MjYyMVowGQIIYuaIxIEt
+uCkXDTI0MTAyMjE1MjYyMVowGgIJAJxc/Xw9GS1vFw0yNDEwMjIxNTI2MjFaoA4w
+DDAKBgNVHRQEAwIBADANBgkqhkiG9w0BAQsFAAOCAQEATGIlrkwrSzC7zEIKx3O9
+kgBAzPCKAqUNRWHKljBd4yA/C7NVWhGnJZ53u0KfBBIPQq7HPw4s7TiGGUPrPgj+
+in763Yw+jIdPUJfe1yJd5HqBSV8TwwEp9ibzk5EMR1kFLPQ3EToxOfx1ZxaP49Uc
+FgrwmMLr/+W4sg2ggrwqF3v5w4Gy1PSSTP4/U9qdWwEV4aaiSS3APdD5oUqucP7A
+9pcBPoW+hDn0sFWSPsJcS/0lnfmig3w2gIc4qS8CavK33szPTy1QhGrLW0yye/3Y
+NS6d4cnsq4075xnj24UV7+LjjijtCpRnLHfb08UzuouFocA2tJ4X4XGmzujxxqpe
+AA==
 -----END X509 CRL-----
diff --git a/cpp/test/IceSSL/certs/cacert1.der b/cpp/test/IceSSL/certs/cacert1.der
index ab5fda48f8f..9c70958b4a9 100644
Binary files a/cpp/test/IceSSL/certs/cacert1.der and b/cpp/test/IceSSL/certs/cacert1.der differ
diff --git a/cpp/test/IceSSL/certs/cacert1.pem b/cpp/test/IceSSL/certs/cacert1.pem
index d60022cbf81..e82d05efdf1 100644
--- a/cpp/test/IceSSL/certs/cacert1.pem
+++ b/cpp/test/IceSSL/certs/cacert1.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTBaFw0yNzAxMjUxNTI2MTBaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
 IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
 BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
 KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-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
+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
-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
-CqVhexCqbwVNhXvKB8r/cOOC0Hk=
+ggEBADlWzFkaRjhKsbDs01fLUWtYj4ETEtEltdosWq3RQ1F7sPx9MCG7K4AicV3d
+dk8VSvSgkSgem+LzTOPuhrNnC30Tu/5wUFdiTttm9HmqySArD9XMGmGCLJRhKiJ4
+TFMyXt/aCWcryvvs847MX6onm8QpgYbtHucEsjk2AaC9Fw2nt00fkTztx5uhzlBB
+2l4/Km8Rbc4mCeyXUlnXLmlzoT0bAzxON4sAlxb4r1EiFM0y75P030RNljmw8g2T
+HirfFNv3/KS50/TLt4rYRiyzKlmd2zXKbx4rFCDrvvSCEhYUsMjEeORvqJnfrCAG
+IDIRYd2chTD4y0y09MX7GvlLkIU=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert2.der b/cpp/test/IceSSL/certs/cacert2.der
index 5746375c6b5..23394f1749b 100644
Binary files a/cpp/test/IceSSL/certs/cacert2.der and b/cpp/test/IceSSL/certs/cacert2.der differ
diff --git a/cpp/test/IceSSL/certs/cacert2.p12 b/cpp/test/IceSSL/certs/cacert2.p12
index 12f17219d6d..44462d66208 100644
Binary files a/cpp/test/IceSSL/certs/cacert2.p12 and b/cpp/test/IceSSL/certs/cacert2.p12 differ
diff --git a/cpp/test/IceSSL/certs/cacert2.pem b/cpp/test/IceSSL/certs/cacert2.pem
index 10397ca11dc..9e9bb9e7f11 100644
--- a/cpp/test/IceSSL/certs/cacert2.pem
+++ b/cpp/test/IceSSL/certs/cacert2.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert2_priv.pem b/cpp/test/IceSSL/certs/cacert2_priv.pem
index 8815fd59466..124b825fd54 100644
--- a/cpp/test/IceSSL/certs/cacert2_priv.pem
+++ b/cpp/test/IceSSL/certs/cacert2_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDqBs6RfYaDQfpn
-MkTneFyGA3x7zcEzTgb2C2lKOkgOygF2ztGIDvy7waNw2MV0oIJNjAU8/ugozR3P
-zANvjyfCW+Lt130IrXuReoWS73SFwfh8/FMjwiwMc1Q74TeSpRtU8RH16xLwmW/I
-qpRe/Qoq97Iax/oFUFCoh19J0YFfrs3SVB4SZObmfHbdmmzKghemmA6GmNxA2h06
-C25qCBF7S3qBa7tM3ENkOUHe9qS+8FRRofDGQ/k/+CmIZh3bjoPJVWvMKHwCE2nl
-fxAwNELVK4/T6WGyybfH0EFr24e0HCUG7FOas6v+Q/djaKhUWjS4CvcierX18H+t
-CumG1vIXAgMBAAECggEAGJAmVkxKi179cp9qxAYfZUwwYKjel7f02xZPiCRIiTot
-Sn8NVwPbsF6ep6rY7r4kxGbnQIOwx7eKYtO9oz6Z+bholSDXqsrVUWupYXFoqtwK
-bMk/ILMHVIyLps1OEUJAdXs9W1u/sn59pnOLpydVTd/kUxNHlrnbUr+tV14kqhoc
-x817ixPsoXD6GCN2NDencSpXleqK9uO/9HJilNEB1B3kGBHITwFgmy7b5fqxU0T2
-ZVNTYyyuiGnYLB7V0TGftnUtyOGc59YNOxI7CyCbiHb35xWpcy5a1viShPsh7r/2
-AEAFO0E34O+bv9bIKzOxAK15WmqvE4NlqaPH+4wQYQKBgQD6+wQH3tgAVftJgaHT
-gh49ID4UdnbhGSOorVjX/OSFAO0SOM7o5r9oKrD1YE1Te4qQyafQF8JkrvHp9AJt
-79X9kN4WbuPommPLfMvrN4umfKIg+9EHeQjhh1Gw5eefUxUJi3ARbZR03FWa3Eb4
-YDE0cKSduivFJgtbHZEfiFrYIwKBgQDutP1KuvBnVRjKLEaqkCxwQOnaS5mWRRZR
-gla5Sms0KJok+QxbrHavyNxX07di58J+uDH5vAznsTcN+9awRF3UxOm0BB6ZG3St
-gH0gZ7nHuac9/UDfrW3xS9SBCHJik96WfMywtiLrbaxjZXF6r2Oljl3Jzi5VQ7hX
-CX3/A/EDfQKBgBgkTR70sJJXsvQ/I/HUclQu5cnSG11LrcJr6j/cc57Xl/ZIwJ5m
-k8LRWHRB7y44k/uZair6HhjROzPl5NXuXAcoCDTgNcwKDc9lEbhuf2BkXLQPhOvT
-GKeY/KKnesA4na1tXDpQ8BbNmu5qgekiV5lTvIHvhoZQQodhMLR3yUVBAoGAaI56
-S9tqJbjObO/L3DXeYSTtyaJHmdyVFArFNc/0+Rm3uu4jjZwTOJgAe6/OqdHeDWdc
-7IiEFpA3Dzb6KKcpemLuAt2zEVlHWB/pruIALA2TxcFCQzdR6tlOMV6jy639V2k+
-t0BwNzMIyVjLxfNA8GlVh2l6Pfq1qdoMiEEPtnkCgYEA7yyve+oQZp2OQcL/5qnq
-gtpNVnK8E/aFXY16Ctj+sj9PTNYmvcknAal6edwnUIeXMGtgrdut5GCHxFiGm8SV
-RzG7vGJ6QWUvW7/83GWtAw7AOMLoZcbsc4sXm3YHNINnAxf5fGNgPm0Qro6a7sFu
-B/QQysq9BMtL+XjrOwIjBoY=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCkhBJOi8+Tg4x+
+jqfaE05tKShwaZLpHPUg/BWzcaSlxPznTh6jWTEsDP/329lOWOl4Iq14CLD7nimp
+VdVuZNZg4itXaODDC4lWjJiF7kRcIo3o4cGJcjpWKV5ip4RieKxC58qCTwnDABSu
+odmPx48ufVzBHMrhAIHlb3B13aK6DbymIuWPKqvMyPgGk5JK8V3A42FuYWWQl8/3
+xAIEmffkH2G5JZ3mJfw/YmobPa++dIyurPezP5IyLwbOfMVtkTR+QS6zCqYVyz10
+RIXhffmAYURz89O3yb0BkfzlhOjNp4oigFLG616xnofZgdLu4oOgg07FGUYy0J8h
+TQNjYI+xAgMBAAECggEAChtWV+lNQcs5mjF1DLfV6sKLX53kxBnJfL1v2dvNQ8/T
+wk6xdtM3wEng1HR2/PyyWcqLl021YxKG4wZzu7n0f57gDxkm1w9Xixp3vkvyetSL
+8kwi4dOY04qWvVR8P2PEIBdxq0q5bKI4eGKsunawjFMa8SmDKd/S8GpFtuqm9hYL
+vdTOTxUi5sleNzhZuZz/VNcAjL3B5uiJxDelVTi1O/IcCyMXBbkwGR40UmS24FCn
+LfM37s05xZJztHfo6u6alxWkZ6pg6F1SPQVAHQnA7vkqHIPsB1+7BffEVqCzk78p
+ONN/L7AFutztCKbOeGT/upEMlE+V1LpzTSwtk9UfSQKBgQDOMMqKL3JQLxuVFdmI
+/CTBkFaApVYVe20cIi6mQhqkeCTDs7EJHVOeEOyQ06eiYND9RJZe5oJOvHr5ARvI
+ItYiMryJwwIjAI9z4uanYcrPU8SfUlaUFFjNoeIIsQKMeyaVKAryI8tVwT20YLlt
+CbTcUtO3nhawgNaFyahLDeJnrQKBgQDMQgpXSllKReHitPbOFOGYq8whSVZX73Rl
+WEEVzfYKROfp5Kiiw30PXuyIPwK197Y49GlI57XG8XoGxUvgTAsfVA4wF8wyqlr6
+unbA94WZFQw6y/bjge0smmun4RAutDpWl1667OlpLkRz8/n5qZH7ODrUioTvAsj1
+DJrerKoYlQKBgBA5jKaFB0TCADSiDIUX+jh1CCmFWRnFpZdSJUOV7gzFG3d+205x
+TVQh1suqrAU+AxP64q5DCzvw3uhbKvl7rEfyoB1jB/cDI0amMyo2qsPXvqAe1Ys/
+cqFzvJqceyvcwPN5vCrDoEt2MknQVqb63Y18wwYu3XA0Iy1R6flF9WvdAoGAJtio
+ftF1Cdsgiq1AAxGVliOWPv5jnXW8/Uk7l5oEIQ/Zy3HhYJMtRa8X7RGOwmzKCyrw
+mxz2RU/HlWIQfCf6NYsW566e90PO6cBstWZd0i9elBAWdE5RfRohP1xeZ4N/VNiU
++5fzDD3wZt0PvZuyV8Tp62IsxggRkAlFqvPLpcECgYBdflYD7vQEqICPX9C1qUBZ
+C/e7UK2Uby5GVI3MbLafEkdgSisIhMBHg7AttH9U+mBN5guT6VglozcTGqGBMgiD
+67AJ+ZdA0Wr2NRtFMrbupWSCJqq2E0vd7BnUgzWlFJZPEDWiETTDA2JGXCMn0dV8
+zQCdwQoVCSJa0AGrJWrFsg==
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/cacert2_pub.pem b/cpp/test/IceSSL/certs/cacert2_pub.pem
index 10397ca11dc..9e9bb9e7f11 100644
--- a/cpp/test/IceSSL/certs/cacert2_pub.pem
+++ b/cpp/test/IceSSL/certs/cacert2_pub.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert3.der b/cpp/test/IceSSL/certs/cacert3.der
index ab16670f5f9..7ed3eb88c27 100644
Binary files a/cpp/test/IceSSL/certs/cacert3.der and b/cpp/test/IceSSL/certs/cacert3.der differ
diff --git a/cpp/test/IceSSL/certs/cacert3.pem b/cpp/test/IceSSL/certs/cacert3.pem
index 93473c321f2..6efd0007e05 100644
--- a/cpp/test/IceSSL/certs/cacert3.pem
+++ b/cpp/test/IceSSL/certs/cacert3.pem
@@ -1,24 +1,24 @@
 -----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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
-B3XK931kxKvtnJOWp1zFXOVdbA==
+AQEAfRsUhJyNpz1xDoP6ED1xp6FQeo8PnhV1qe6ywJPIByerV4hA5LhfiSxInIKD
+5GeTYEE2bisiespduFLs4bdajJpflm4gqvzCr4HtG6Hi5nzpHJzfnBClaQIN8J09
+or7n+Doy+LlsMjRIuM3OaQg5OPosCfXYLw+pYZY3Uiv4n0XFSrtPk1NIUn+7ZzZ+
+L+qzQlmvFLW05LJU9u+z3Fa0btpj0eb51u9nYyCiwiaR1hUh+33wnuzbIupQii4R
+g/MoNYRU8U9svuNMai0p8LwTi1mdPpvUmKDi0RNW8hRlxT1pItpx7EWV16aqYOhz
+qpAs/G1RQ+DOOz7msig5GZh4AA==
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert4.der b/cpp/test/IceSSL/certs/cacert4.der
index 7d7e790a172..efc35e942b8 100644
Binary files a/cpp/test/IceSSL/certs/cacert4.der and b/cpp/test/IceSSL/certs/cacert4.der differ
diff --git a/cpp/test/IceSSL/certs/cacert4.pem b/cpp/test/IceSSL/certs/cacert4.pem
index 52956d05bf9..4de17eafc8e 100644
--- a/cpp/test/IceSSL/certs/cacert4.pem
+++ b/cpp/test/IceSSL/certs/cacert4.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID/zCCAuegAwIBAgIIRwT6LywO8TMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
-Q0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
-BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
-hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsb2Zd7YfAoQe0yqQf9Jln4GgXw/MTwIJtNSsXlzCgKFez4sNvZTO
-zZDXEGsVERnrndwDO5/Fh3za7HhAXHwd9cmYiTTkMgQZy1dHyCx/LkYrLx+sLGnx
-BnhEMh1h79EdU3pKq6WRFbxpsJ5mWG0yaSZoVUzhz0WUDo1YmAisOoYFEtOwg6PR
-VUX/mWOHo5jlnCsLK6Ez5Uw99CVctNgfbHFTdVIowj6YKMtiFccWH6q39qg2Zvzv
-RLvYcT6ZsN9fnhDo8XdK9L7BPrUaCkBxTUbiljwIkErcbwlQODzADUuSYEQGsPjn
-R+eg/AD05uqBQfX8eXxtX21Yujb9ooy1+wIDAQABo18wXTAMBgNVHRMEBTADAQH/
-MB0GA1UdDgQWBBQUiznE73EGhCA1WDjrJZOvZumR6jALBgNVHQ8EBAMCAYYwIQYD
-VR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOC
-AQEANU8ZhUyK4zjCGZoea5zYtk8BLot8POj9c+kCQHVmyeH6fjyuxICudX0dY69n
-myHvI0jhtxiHd7YGEYE6OeWeCOUHn/8v1unqbDWFjBmYLOgoNVQ6UhfcF9gVn6cp
-356nTTcGmz7ZvhloqQb//6rKk1mfq+6KrCrMO2qVRmYtcV2blrhHZj+4flmFbn2e
-ldsDqOwLHinFpvQFnr7xnBYyGMISOl/MM89PQRq22Ob313qExLe2G7VFMJ7SAEET
-qeqcGKHRlF01EniJ9OV9cnJH+uzzsmA1GRZltqpdrqcDF3z7pmiePFO+zFdSqDtv
-zagOFOzlR8lNDB0MiKhXWZx61w==
+MIIEADCCAuigAwIBAgIJANHr9QHB66X0MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTBaFw0yNzAxMjUxNTI2MTBaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
+IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
+BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
+KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAJ+N1Oss88MMrJ/4hpdJPnJUdL6jW76j9vyfWjr2q6Tk5qR5DKCC
+KjgDwu42tm1CEzFGg9zLVkE67Sic3EpxSd8dginToirjzuTZpbJbWILHtjfJVHb0
+K0Ro8AR9S5wiBDYQepBn4ZPycop8HQ4rjAD/7GCrhv6d4ORbvunJckkn62lOu1Bh
+VkOP9zNxRzDYEuSu0rONnENCNSvPQHBw2ADmLcHObhIijrd8DThQsDshUT/3iRRK
+t1dip120lhFr7Qzw2LTu/Ltb/jFAf3dmGy+8vwzxGf1xK/6LvvFR+amRKUULEI+P
+lXHFBXboSO3UnS+Vw9AyBvbOqQrrUVLE8i0CAwEAAaNfMF0wDAYDVR0TBAUwAwEB
+/zAdBgNVHQ4EFgQUQ9o4U5mk2QBYmmjtIoTiZjI8wdIwCwYDVR0PBAQDAgGGMCEG
+A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
+ggEBAGBju33VVz8vDWCUl4i1u3kARuEW4ehky3U7Lf39j4j4beXleWZ8++hnPW34
+ONE/mPAi4kOzX66IY4hDccIWrWCgAx4VwnBG26ZEGGTwv2UbDlLmPUcZKbZtyF0r
+WWUFo7+hekuvpWTr8pXj9jF5HyjqNXIHqzId9i7AblwufmJusz5+TJGroDz1ILmB
+Gp+27fO62J8xzChFCSv+h7cYwPt8hHE7/6Kx9NLLpLZw+D2FyuOMUhwW9Cg4iE1j
+zabbbk0U6QFhstKGIg/nsKzlKzqusHttHfIBkf7iuftqCN0qYfabiAbDVWcwcil4
+8UYP5ClTbavdHRC/Y7Xd5ODgKQs=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert_custom.pem b/cpp/test/IceSSL/certs/cacert_custom.pem
index 7326f18a4b8..09e6b8cf8b1 100644
--- a/cpp/test/IceSSL/certs/cacert_custom.pem
+++ b/cpp/test/IceSSL/certs/cacert_custom.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIIDvTCCAyagAwIBAgIJAOoqt/s7o99aMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNV
-BAYTAlVTMRAwDgYDVQQIDAdGbG9yaWRhMRAwDgYDVQQHDAdKdXBpdGVyMQ4wDAYD
-VQQKDAVaZXJvQzEMMAoGA1UECwwDSWNlMQswCQYDVQQDDAJDQTEdMBsGCSqGSIb3
-DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMTkwMjExMTI1NDI2WhcNMTkwMzEzMTI1
-NDI2WjB7MQswCQYDVQQGEwJVUzEQMA4GA1UECAwHRmxvcmlkYTEQMA4GA1UEBwwH
-SnVwaXRlcjEOMAwGA1UECgwFWmVyb0MxDDAKBgNVBAsMA0ljZTELMAkGA1UEAwwC
-Q0ExHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDOV6+603e2PI4gtqHzQUSBcIHc8ch90OoYPP0R49WiG2r0
-h2XLAaSW/lVCpri+02kkFrIHb40HmToUJT3v8MuHAtm6iqmeaQ6PBC6E3/fcRcq6
-xhX0ZUEpNe4Dh/2E5M64/R2XKmLd4yMQqYijizlW+jVThh4Tu2DmXExLpQZ00wID
-AQABo4IBRzCCAUMwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUE/pyZ/40BZrJPmHS
-kda6A2Ubipowga0GA1UdIwSBpTCBooAUE/pyZ/40BZrJPmHSkda6A2Ubipqhf6R9
-MHsxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdGbG9yaWRhMRAwDgYDVQQHDAdKdXBp
-dGVyMQ4wDAYDVQQKDAVaZXJvQzEMMAoGA1UECwwDSWNlMQswCQYDVQQDDAJDQTEd
-MBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDqKrf7O6PfWjAUBgNVHREE
-DTALggl6ZXJvYy5jb20wFAYDVR0SBA0wC4IJemVyb2MuY29tMBUGBCoDgxwEDQwL
-Q3VzdG9tIGRhdGEwIQYEKgODHQQZMBcBAf8MDk15IFVURjggU3RyaW5nAgID/zAN
-BgkqhkiG9w0BAQsFAAOBgQA62sTV6Co4pXyZ+K1C/IrBNoutQyzhjF56Gu09mf6y
-WsuzgkjYJKx/5JnAGiSXYbU4i3ifym797Xa+pbDB9tZD3Wc5rvpRzExK8x3yC3wd
-MxKIo3RaB39sCDPR/E0ypq+ayQK8h4aPfjIK8JSr+nVGQgxeR3YZDQmY5j5Mk5bm
-iw==
+MIID0zCCAzygAwIBAgIUfEIhOcm57nEA9uI9dWyr8xfsObwwDQYJKoZIhvcNAQEL
+BQAwezELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0Zsb3JpZGExEDAOBgNVBAcMB0p1
+cGl0ZXIxDjAMBgNVBAoMBVplcm9DMQwwCgYDVQQLDANJY2UxCzAJBgNVBAMMAkNB
+MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEwMjIxNTI2MjFa
+Fw0yNDExMjExNTI2MjFaMHsxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdGbG9yaWRh
+MRAwDgYDVQQHDAdKdXBpdGVyMQ4wDAYDVQQKDAVaZXJvQzEMMAoGA1UECwwDSWNl
+MQswCQYDVQQDDAJDQTEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wgZ8w
+DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM5Xr7rTd7Y8jiC2ofNBRIFwgdzxyH3Q
+6hg8/RHj1aIbavSHZcsBpJb+VUKmuL7TaSQWsgdvjQeZOhQlPe/wy4cC2bqKqZ5p
+Do8ELoTf99xFyrrGFfRlQSk17gOH/YTkzrj9HZcqYt3jIxCpiKOLOVb6NVOGHhO7
+YOZcTEulBnTTAgMBAAGjggFSMIIBTjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBQT
++nJn/jQFmsk+YdKR1roDZRuKmjCBuAYDVR0jBIGwMIGtgBQT+nJn/jQFmsk+YdKR
+1roDZRuKmqF/pH0wezELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0Zsb3JpZGExEDAO
+BgNVBAcMB0p1cGl0ZXIxDjAMBgNVBAoMBVplcm9DMQwwCgYDVQQLDANJY2UxCzAJ
+BgNVBAMMAkNBMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIUfEIhOcm5
+7nEA9uI9dWyr8xfsObwwFAYDVR0RBA0wC4IJemVyb2MuY29tMBQGA1UdEgQNMAuC
+CXplcm9jLmNvbTAVBgQqA4McBA0MC0N1c3RvbSBkYXRhMCEGBCoDgx0EGTAXAQH/
+DA5NeSBVVEY4IFN0cmluZwICA/8wDQYJKoZIhvcNAQELBQADgYEAIN2orUsIVhzp
+kgQbpEi1kY4q5fEBbUwQo6lrD3NdOXR++ApthGNSvUDkiN57tnVsoxU5OUZSvLnI
+HJfGi7ohqtquqoqwtFr4mcj7xhuKLT4ZHolUBYJUFI65VdSULNWEj5y2uXDk/r9g
+jsizx5uMjtWYcTpnZuoLydiVAvcTJ4g=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacerts.pem b/cpp/test/IceSSL/certs/cacerts.pem
index 98c04684e28..6adfbe8ef7d 100644
--- a/cpp/test/IceSSL/certs/cacerts.pem
+++ b/cpp/test/IceSSL/certs/cacerts.pem
@@ -1,96 +1,96 @@
 -----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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
-CqVhexCqbwVNhXvKB8r/cOOC0Hk=
+ggEBADlWzFkaRjhKsbDs01fLUWtYj4ETEtEltdosWq3RQ1F7sPx9MCG7K4AicV3d
+dk8VSvSgkSgem+LzTOPuhrNnC30Tu/5wUFdiTttm9HmqySArD9XMGmGCLJRhKiJ4
+TFMyXt/aCWcryvvs847MX6onm8QpgYbtHucEsjk2AaC9Fw2nt00fkTztx5uhzlBB
+2l4/Km8Rbc4mCeyXUlnXLmlzoT0bAzxON4sAlxb4r1EiFM0y75P030RNljmw8g2T
+HirfFNv3/KS50/TLt4rYRiyzKlmd2zXKbx4rFCDrvvSCEhYUsMjEeORvqJnfrCAG
+IDIRYd2chTD4y0y09MX7GvlLkIU=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEFDCCAvygAwIBAgIIJfNaIO8KiQUwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+MIIEFDCCAvygAwIBAgIIEUqvKSq6HcYwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
 BAMMD1plcm9DIFRlc3QgQ0EgMjEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
 QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMFoXDTI3MDEyNTE1MjYxMFowgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
 Q0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
 BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
 hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAjjBH//K6wisingdPFFjFan6pK85DLs1CyqpOhlyMhsp7WzgkGx6E
-uvYUWdU+f89uaXI13n8SiyxJ590KidkR+pdLOb0r5vKH8o/P3xoJIy76c3fHV7Mm
-iVAEaTgdX0+qIR1gM3CxtxH848Bas6DOiVJe7drwza3qs7HNmQvPmUpdDDXLII4k
-swsV2a29d6/oF/oy9J0FQgvDuopsCEjMVQ1xhTcbFDNa9uS9fHv75KTXpJZ3uKjY
-V2dZeM3oakIx0eAaVXZrRAgcFZ0sJtWzaaNn4S2Em79XpjTbbcq8Yg30o/G1xVDj
-3f4yS9NheeCkLM/b1ri+8TXxqHePPjGBEwIDAQABo18wXTAMBgNVHRMEBTADAQH/
-MB0GA1UdDgQWBBR3tHoC3VL4bhkfq+NsrUhRB+RuuDALBgNVHQ8EBAMCAYYwIQYD
+MIIBCgKCAQEAvV/5rZwjeg9sT+8Uof5pZPctLCgwTrhM1c8fpDlAEWaHhNRzNGDe
+8mL0eNW+07oV4Q3bjlrxXaQq+V8CD24Utnjmnz9C4+Kswr1KuZsuTBa5cPyg2wmq
+km5BYy8mmKZbf7NEq0lMyTBUpK17UDeUXZXVG2x0q2bvcvpnXfbrcaE7A0rzEpd/
+6Obcs/81u+II5h4Dr6dWL04NTFJy92vkgOoELMIZJzYvZ8Tz804izydpL1sTzpRb
+wuTyp4yctXPqBg5MtbboQHkBO99u8u0hdJRBiN/16QSlKwTCq8xlon1MQxfrFMir
+JsDzHEoAj/cZCA/2bSnv6nFOcHCI6UAlBwIDAQABo18wXTAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBTLqp8sWC5R2KkIfe+lQDFecLhq5DALBgNVHQ8EBAMCAYYwIQYD
 VR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOC
-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
-B3XK931kxKvtnJOWp1zFXOVdbA==
+AQEAfRsUhJyNpz1xDoP6ED1xp6FQeo8PnhV1qe6ywJPIByerV4hA5LhfiSxInIKD
+5GeTYEE2bisiespduFLs4bdajJpflm4gqvzCr4HtG6Hi5nzpHJzfnBClaQIN8J09
+or7n+Doy+LlsMjRIuM3OaQg5OPosCfXYLw+pYZY3Uiv4n0XFSrtPk1NIUn+7ZzZ+
+L+qzQlmvFLW05LJU9u+z3Fa0btpj0eb51u9nYyCiwiaR1hUh+33wnuzbIupQii4R
+g/MoNYRU8U9svuNMai0p8LwTi1mdPpvUmKDi0RNW8hRlxT1pItpx7EWV16aqYOhz
+qpAs/G1RQ+DOOz7msig5GZh4AA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIID/zCCAuegAwIBAgIIRwT6LywO8TMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
-Q0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
-BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
-hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsb2Zd7YfAoQe0yqQf9Jln4GgXw/MTwIJtNSsXlzCgKFez4sNvZTO
-zZDXEGsVERnrndwDO5/Fh3za7HhAXHwd9cmYiTTkMgQZy1dHyCx/LkYrLx+sLGnx
-BnhEMh1h79EdU3pKq6WRFbxpsJ5mWG0yaSZoVUzhz0WUDo1YmAisOoYFEtOwg6PR
-VUX/mWOHo5jlnCsLK6Ez5Uw99CVctNgfbHFTdVIowj6YKMtiFccWH6q39qg2Zvzv
-RLvYcT6ZsN9fnhDo8XdK9L7BPrUaCkBxTUbiljwIkErcbwlQODzADUuSYEQGsPjn
-R+eg/AD05uqBQfX8eXxtX21Yujb9ooy1+wIDAQABo18wXTAMBgNVHRMEBTADAQH/
-MB0GA1UdDgQWBBQUiznE73EGhCA1WDjrJZOvZumR6jALBgNVHQ8EBAMCAYYwIQYD
-VR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOC
-AQEANU8ZhUyK4zjCGZoea5zYtk8BLot8POj9c+kCQHVmyeH6fjyuxICudX0dY69n
-myHvI0jhtxiHd7YGEYE6OeWeCOUHn/8v1unqbDWFjBmYLOgoNVQ6UhfcF9gVn6cp
-356nTTcGmz7ZvhloqQb//6rKk1mfq+6KrCrMO2qVRmYtcV2blrhHZj+4flmFbn2e
-ldsDqOwLHinFpvQFnr7xnBYyGMISOl/MM89PQRq22Ob313qExLe2G7VFMJ7SAEET
-qeqcGKHRlF01EniJ9OV9cnJH+uzzsmA1GRZltqpdrqcDF3z7pmiePFO+zFdSqDtv
-zagOFOzlR8lNDB0MiKhXWZx61w==
+MIIEADCCAuigAwIBAgIJANHr9QHB66X0MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTBaFw0yNzAxMjUxNTI2MTBaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
+IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
+BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
+KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAJ+N1Oss88MMrJ/4hpdJPnJUdL6jW76j9vyfWjr2q6Tk5qR5DKCC
+KjgDwu42tm1CEzFGg9zLVkE67Sic3EpxSd8dginToirjzuTZpbJbWILHtjfJVHb0
+K0Ro8AR9S5wiBDYQepBn4ZPycop8HQ4rjAD/7GCrhv6d4ORbvunJckkn62lOu1Bh
+VkOP9zNxRzDYEuSu0rONnENCNSvPQHBw2ADmLcHObhIijrd8DThQsDshUT/3iRRK
+t1dip120lhFr7Qzw2LTu/Ltb/jFAf3dmGy+8vwzxGf1xK/6LvvFR+amRKUULEI+P
+lXHFBXboSO3UnS+Vw9AyBvbOqQrrUVLE8i0CAwEAAaNfMF0wDAYDVR0TBAUwAwEB
+/zAdBgNVHQ4EFgQUQ9o4U5mk2QBYmmjtIoTiZjI8wdIwCwYDVR0PBAQDAgGGMCEG
+A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
+ggEBAGBju33VVz8vDWCUl4i1u3kARuEW4ehky3U7Lf39j4j4beXleWZ8++hnPW34
+ONE/mPAi4kOzX66IY4hDccIWrWCgAx4VwnBG26ZEGGTwv2UbDlLmPUcZKbZtyF0r
+WWUFo7+hekuvpWTr8pXj9jF5HyjqNXIHqzId9i7AblwufmJusz5+TJGroDz1ILmB
+Gp+27fO62J8xzChFCSv+h7cYwPt8hHE7/6Kx9NLLpLZw+D2FyuOMUhwW9Cg4iE1j
+zabbbk0U6QFhstKGIg/nsKzlKzqusHttHfIBkf7iuftqCN0qYfabiAbDVWcwcil4
+8UYP5ClTbavdHRC/Y7Xd5ODgKQs=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cai3.crl.pem b/cpp/test/IceSSL/certs/cai3.crl.pem
index c6eb562a2ee..9dcfa359a0e 100644
--- a/cpp/test/IceSSL/certs/cai3.crl.pem
+++ b/cpp/test/IceSSL/certs/cai3.crl.pem
@@ -2,13 +2,13 @@
 MIICLzCCARcCAQEwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNVBAMMHFplcm9DIFRl
 c3QgSW50ZXJtZWRpYXRlIENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
 b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjIwNzE5
-MjAyNTU4WhcNMjQxMDIxMjAyNTU4WjA3MBkCCGItOxHiE3EZFw0yMjA3MTkyMDI1
-NThaMBoCCQC5HixTugRe5BcNMjIwNzE5MjAyNTU4WqAOMAwwCgYDVR0UBAMCAQAw
-DQYJKoZIhvcNAQELBQADggEBAG24O7X+D8sBOCJUN2UtCbKoHtra5F4WIGKE0LxU
-Yd564KgTEvywhlPoIRdewR8mnL2n1Mp8O6TVNS8gRF3UcCPIraw1h5wAr3y8XbXV
-cuRYxC04NmEeAaLDoNDYaFQUcc1Y80XqXhEdQhLAjZX45m26zcTHNgnuzIFWl+IH
-5sR9Kz5N2P8ytDB8VczVcTMJ3I7aHUTD8kHj2dA07BEgPpV7BusVg3zNb2f36fgj
-Hdc+qc3B379K7phWfugzXEk+IT0V58tUQjly1TzcltC5UhS2OMRs5eWgTKki3hnt
-+Vqf5naZDZdjMB8nbcl2Qh6NmUz0oxNC3g1L4Bex7/qAaiA=
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjQxMDIy
+MTUyNjIxWhcNMjcwMTI1MTUyNjIxWjA3MBkCCFVrhYarG49/Fw0yNDEwMjIxNTI2
+MjFaMBoCCQD+yjWHDyrEMRcNMjQxMDIyMTUyNjIxWqAOMAwwCgYDVR0UBAMCAQAw
+DQYJKoZIhvcNAQELBQADggEBAHhN/DdPstBhM7WLy0l6wrqDIfwVGOsK0g7b3DNl
+gWdEvV0suxcuX3ssLrYv1YUoA7ateFABs3K4/p/gaK+CffyvSEzarGpT0y2ogWga
+7f774P3v6D5q+1P8DYSuYs4DEKmyIJB33gX0ZsKV6FT6cium2CNAQmcPIKnrp/ft
+Xmtk7inxf2GVivIlVBp2MqIafRakLeorUyoNFqT/3ccMx2t9cPs4OU+xAdvWqCAA
+AOgZnMNEVjqCJ0J2CFFFe+nkIDr7wAbqVu7vvj0udZaGrG5zDTl377D/Udue/bs4
+RwFbbbm+dq+hU5+pJthsJjO1wMfXW+VyaOwPYB+F1PyGKog=
 -----END X509 CRL-----
diff --git a/cpp/test/IceSSL/certs/cai3.der b/cpp/test/IceSSL/certs/cai3.der
index 27f0fab5474..ae882326628 100644
Binary files a/cpp/test/IceSSL/certs/cai3.der and b/cpp/test/IceSSL/certs/cai3.der differ
diff --git a/cpp/test/IceSSL/certs/cai3.pem b/cpp/test/IceSSL/certs/cai3.pem
index 7ca6e994d35..4dfbf06b729 100644
--- a/cpp/test/IceSSL/certs/cai3.pem
+++ b/cpp/test/IceSSL/certs/cai3.pem
@@ -1,58 +1,58 @@
 -----BEGIN CERTIFICATE-----
-MIIFCjCCA/KgAwIBAgIIRh5KNnNRZPMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-hvcNAQEBBQADggEPADCCAQoCggEBALq4O6hgv6RbTKaq9+UTV6nqz0k7zcOOmBuR
-1iHmR5/vCMgyVhtjbcWHEMcaevw9u0eEIstktLjzkT1eZ0otD2NHX1J2xc+eU+2G
-fTNUybxTJ0W/ASwRT1msbx03bTI8DhGRKK2NaJC5Kkm8Scnl/5Es7QgUEPk2ZFv7
-8W11ddB7dewR74/uclWIKS3IRE85rkFacKGbUiYxGcKBpjRNyV8m2yV39B22TUXG
-KzRBokACeyE4IIpDTV3A0zemdvgj/IAegXaHvVTsbGQDxF08tKOWFwb7cKJd7YwL
-c9lLwA8q365BxdoA+cEw2C3lUN52jdPqGdG/btHnM3fXhPcmWHMCAwEAAaOCAVsw
-ggFXMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFAJWd3z26jD3uzXjbmbbmGnQ4n2x
+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
-OjIwMDAxL2NhMy5jcmwucGVtMIHCBgNVHSMEgbowgbeAFHe0egLdUvhuGR+r42yt
-SFEH5G64oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNV
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cai4.crl.pem b/cpp/test/IceSSL/certs/cai4.crl.pem
index 842972c91e6..235ceb62662 100644
--- a/cpp/test/IceSSL/certs/cai4.crl.pem
+++ b/cpp/test/IceSSL/certs/cai4.crl.pem
@@ -1,14 +1,14 @@
 -----BEGIN X509 CRL-----
-MIICLzCCARcCAQEwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNVBAMMHFplcm9DIFRl
+MIICLjCCARYCAQEwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNVBAMMHFplcm9DIFRl
 c3QgSW50ZXJtZWRpYXRlIENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
 b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjIwNzE5
-MjAyNTU4WhcNMjQxMDIxMjAyNTU4WjA3MBkCCFB2+gaZg/DmFw0yMjA3MTkyMDI1
-NThaMBoCCQDWiHgDH/6TdBcNMjIwNzE5MjAyNTU4WqAOMAwwCgYDVR0UBAMCAQAw
-DQYJKoZIhvcNAQELBQADggEBACF8WBamBXVjflktbZ9P8zyB6Cc8IXbA1sMKviD6
-fJ0yTWDZJdjvzyKJN8edZi1FrIML14ADqYXJqX/2W3puKswtsLoFnkb+MU0s+DBV
-Pk6QY7d0fQGoQS/CDJAYqqHisLJzM/4mpv6T41DNuzyUQwSYbi2bAbxGThh7uIdI
-A2y2cKK+DZK05hvVVwKkLP8it8JfHYmTGPDxNfSwUhOh12e2KKxg2KwJrAnAO0hp
-G4vNF9g0qT2zhQ7TxfJDqN3sKnqjpbuVXJeiUqxA6CBDOwN7D7fbFwZY1ee1/5t7
-MDJhfm7xNGv0G/uQq16q80whh1P/WzXM8BK5KS5Ltk+vHLg=
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbRcNMjQxMDIy
+MTUyNjIxWhcNMjcwMTI1MTUyNjIxWjA2MBkCCFU3xV9k38mLFw0yNDEwMjIxNTI2
+MjFaMBkCCFac/82RbUlOFw0yNDEwMjIxNTI2MjFaoA4wDDAKBgNVHRQEAwIBADAN
+BgkqhkiG9w0BAQsFAAOCAQEADGMiDDtzPGvKE2Kybp48tsWnbNM6QQJ1B7hMLvEG
+JGSIMg8/uY8L3kG+G4V0s1xqtqGImaYQRfhifEG6rVrRHgAB2EAqeqnCDatKzthl
+G7hL0Ci+NeE64Hoz9s8TBvwUkHDB1HjybC5zoo++zro/XrWboSDsCyyspyt6ipVy
+UHtHwO3AqkNn9/3atqCPxbFXHGqyBsMP4bSXhqsR4DeAXcbM7WXt3oiVXti0Jo1q
+P2OPGrQvAvMyAI3DEpdaLcPaNFHMHASVgZolmDVa1KEnh+NurJGTFG8Ox4TGvnNX
+IMrUA0A32bnSRTDoxl40vVaXgKFFn3tpWEomJwwCO4WFLw==
 -----END X509 CRL-----
diff --git a/cpp/test/IceSSL/certs/cai4.der b/cpp/test/IceSSL/certs/cai4.der
index 67be15d8924..76f6eb01eb0 100644
Binary files a/cpp/test/IceSSL/certs/cai4.der and b/cpp/test/IceSSL/certs/cai4.der differ
diff --git a/cpp/test/IceSSL/certs/cai4.pem b/cpp/test/IceSSL/certs/cai4.pem
index 42082a50202..0460ad36570 100644
--- a/cpp/test/IceSSL/certs/cai4.pem
+++ b/cpp/test/IceSSL/certs/cai4.pem
@@ -1,60 +1,60 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cakey2.pem b/cpp/test/IceSSL/certs/cakey2.pem
deleted file mode 100644
index e512a20a222..00000000000
--- a/cpp/test/IceSSL/certs/cakey2.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAqigVgb6DdaNIiylgLXlwhLt3/r62PaHHW+tCBmslKvOF3gRH
-rmix7Yvgmy5GlXHZpNhWmvCwnYEXTd7TF8gMdVnjTBOx89eqzQv+vnl4wGdbpE9y
-WQVre8UnPlRHNN2XHSrMth81n6xoaf11arXRvbNp1ORogZFOoj1vc7nlYXkOdTPz
-rWfqYkIHNp5FW3ishv65Uv1ta3WNShRFvi+R6IOdX4SCGEtQKooG257b18AEvH81
-WgDOtcsgUjdvPnBKCdRm+/Uk9QykyLMe/v9u851JLWJoemjRLWUeoUv1i2vRA4AJ
-hdOz2rE9HpSKjIpntGbwVWmdF1TFwnaNx6ACdQIDAQABAoIBAEv0FJWTuw6Z0ln8
-IChsWuOE4y1dZ+/e9SR8wT4oObEQfyL5eh3KMhI9LAdZArzW0zYYM6B56/yCkSp7
-WnL1I0qG00U0TWzxSha5Uf8oLdSEzo1rwTkniDD5cmkKKbbZawjj//kTuVYLGZim
-QPFfM76gBY+4XUXo3Nbi4Ysg4dk9+7rVxLGXL3f2loXp/4GCJjL8KJ42ePyfqhzB
-cAm5oVBj069QKPtvPal+6F5AWVtUzq9IaQ7X5lvg3qKItkl84tLK/Fu+QS7TmA4i
-3lHHmS2W3dwDv4HRbd2OlqqS7U13lymRChtIVzEPzkYh3GDUjL5NHa/oQ9KKU1Kr
-L2/zRQECgYEA242Vq70ON1OlCN7n8G1AyYVfrsXMpJWm8qB5xgMzD1+W6LezXD1D
-bgsHvIOmR1xfQT0u8+VJ/r1mX8wD58uMLTXFeFbWbNzL5enmJ5Y9qUgV7TP7VA7O
-m7UJSwJhX9mzeU3BubsWEtYLObtZ2NYqAVveYUaybizAxSgD4J+6FWECgYEAxmdI
-CS7H2NVmLGK73g/lGvwj2VU+uRdl/S1Kpf8xsGO9m4NKuxkAxJdJbZCVVIzlW5Z+
-cK65dk9ieOloXC6xh4pFpofnbC37w1Fyh73Vk23jAQJd9yk1pVViztUkBukSGrAx
-jANa+/aReMpvyllYkAudKJwqil/E+UvcLUJ6MZUCgYEAtEzlqQ+s6Qqr8Uj9OJjA
-J758AU8268JqQ749wrtF504c5ChYB1vYUDqGs+15VAkrwKu6L1kRFz37IJiubGDg
-URBjhpvpo6T/XWRkOgZLxQUJ3K5fq3wtd/mIFC10Qf7KQMf2W8ykJ/vXZCXTdxsJ
-i+wiB8jDJ29hL4fZB1KkwoECgYA1iFqMd73eiL3XzhAou5syq8O0eWbCJEkVhen1
-XiT3FgJr+oHod7eYU8WxNWjFdnrQOowFNW+/N243d6r77HFkQ+/FHjhYHRQoQEqp
-y5PcArNUa2IVNV5PLPnLGwFsh+iloNLNl34uK/pWYDDHpVHbE/ckpPZpfau1JD3V
-THGR/QKBgQCPqpElKNNt1yJkwwHtW537QP/FQWme0JX2kGbASnM9EsdNMt/YULNh
-MG4o4xdRsD4gg00UCvfCOksl5IIY/VuYCg65Hqp16DrA8Fq8Jupd+nzwM6NvLmAU
-KgE/G+m+3XNxvjYMnbu2LxHjLnEMJDYfXg/MS7TzHc5Uu8zkRT5Q+w==
------END RSA PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1-noroot.p12
deleted file mode 100644
index c19bf88f79c..00000000000
Binary files a/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1-noroot.p12 and /dev/null differ
diff --git a/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1.pem b/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1.pem
deleted file mode 100644
index 33fde3343c8..00000000000
--- a/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIIISBb3DvYomswDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU1M1oXDTI0MTAyMTIwMjU1M1owgYUxCzAJBgNVBAYTAlVTMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQ8wDQYDVQQDDAZDbGllbnQxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-p87euz55l9e/6VIDnu49FeFZEET2qbg65AWMUtxBpZkCZi7nWwV/L7zq3VRC9HWd
-/+JKLsOGd4neyoqTtUm2frnQAig2CcxOnioBtaGqO7GuFinZYbsMrkaE5bc7sTdV
-XjKEFn3SjFsbd/rE00M3fm4KCTnHAPcz571gLhjgplz9qz2CSRSavvNghOVhxhjt
-5hGqtNMXEmJq0sVweBoCT/CWNACdyLspKjL8Qxuf/MD2xFXJvpDnaZwnJvSaaPaB
-D8bX3hKFj81V7cCjBflt/+JlQOS9wwljEH9eaXchs6JKUqoHpFpl/H6dhlQIaZkb
-N/KOkLmauUieGd1IfAjB1wIDAQABo4IBJDCCASAwHQYDVR0OBBYEFJnjTTWRb+Es
-7hy4vpnCMZmhD3hvMIHDBgNVHSMEgbswgbiAFAL9G+lvTpaPDA6ZYY9FSGsrFDwx
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIJAL/ehwUYP0SNMAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEF
-BQcDAjAXBgNVHREEEDAOhwR/AAABggZjbGllbnQwDQYJKoZIhvcNAQELBQADggEB
-ABpQKIVJTdTdPAkAgn8OTdddzC3mL3rU5EEkyV38oZRbSDGI8Y0Yj97uyLKbN4Jd
-/Dt8Qyi5dZ5UWtWjSyOSZh7/lFWOxp6tR8DWO7Q79d7LNI2gwVPmsJQGCt2zAVwn
-Lw//01uUaWN8SkbJLpFnyirt9HYKL8ElcZFJCNQfCRkL4EBjXGCZ97QEXtlScKVi
-qnggs1DtsE62Ys8VN4WZ+3ptljc/+7pvLzpBxLz2vTRvG2wE6/Vm9DbDkaJouvyd
-rFJ9e0HI44jHhr5GJZKJs+j60lLWN/lp8zv9dHCX5aRg6W1cCRquj4SjQHGacG8U
-MWjf6N1f3fmiPq/zfAayHwE=
------END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1_key.pem b/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1_key.pem
deleted file mode 100644
index b8e49a2eb27..00000000000
--- a/cpp/test/IceSSL/certs/db/ca1/c_dsa_ca1_key.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFFDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIApb7CXKcDjQCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECM9FfNbxdTh6BIIEwKVmHK+vM4OH
-p3IL0fMAWg2mddiV+oGdGPpd6/IhIH0/HFc9/hygQLZA5SLUIjbhv0kT79eChw8k
-ya0ml/Xfxtk4jKFuVC6KS9LgsHzOCch3Wk/kK1qiru5EUlbXIo2qACeJzNIJCwMa
-Kj1NKWJFxjsurvpbAvapMrN7/9ehq71+iGo2GUvDfH5eZhQkmtt3Q5z/hAdkUBtm
-MVfQrDb0La6zasWrsrnJnwbS4CBj5SA/5PFHsdikZkSnQScFQ9CjCus6mFgvBmM0
-XYlPWluvcFQsXwMMlA3uWilm+AJkXGoO89gENgkz/HXB5Ed5B5o0mj5KDMOeO1uN
-vOLqCZlYDJhp9t4ASRo2p8yrk+7ODDSACm3A4w+e91C/WfsY1Cr1OPfn4MmuAjj8
-UBuMCHNIdUf9YNtuowdnZeCxZ+jO/Tig09/ft3SubmzUo3H1poCb6n3Dmm/4L4vw
-98xWdYcPm3auBtzBDOmA2eCIqu/mUXsK42MfVlJOyAdnkfpoTvkRFz0HjPnXqasO
-a40TrNn9Gjs5tzISjIGGjeIW9Pda5FmckrgVgftGfuRveAJv2xSCZEVMarfqST77
-wSlVnhuImEImXEQrBzbdkbxe9hE2Zta6hlN/oAforAQEm87JhAtpBU1N9LtSFk9u
-KTv8Y5v6ex3ofGSYQx9LXUhaLYAr6D6SqPdLGz1+u5hZBJe+r+Wr48Wurf+8F+3r
-60cOlN1I9ViXA83f9BOQo391Swek87zqhTlu2ly2UxxC44zHhzHmWq4Hoe4OZ463
-XgoTln3mjHeBE3vWhKe0buroNfENKYhE1ofN7l948H3XMVpqxE2lp8rCm3ESHG08
-9PMnmPO06k7XWv0djNSrF93rrTvZpWLeDAJXKrgp86010Qo6VechuHCAOFrItTOx
-C0FFKc9Eah1lQN7rcIPoqEeo7K3sk8UP30AiSs7Tge9VeEsg2K6m+TW7kYgSBcRi
-0M/SmUwGQES0COxBSNg3sPaGEet4049VrVKGnwh+RukNcreRO0lexx5tYWQKNg6r
-Kpa2SyTTgwVfn66+FgezdYGHX4HBQFOc9FbeleIXq2TWJZGSL4bxa9jvSacOb1XI
-m/kU4oXFKm3AdVcCTdW8lhehQ8CwizphdNO7/xLxupE7brWj0VOZ1h+8p3KlDvjA
-FC6yVZiZATmcVJFn5MGgty+twqdm5aCpBIbdxHwArSeiPJpnfGJfn9JeelhvhonM
-7UEMOpRLxahsaYRP4BBZqODuES2jwEB3YNEvUzhU0THrAflTjP3TfRtMBpJzhqHF
-6TSXc6ehbhFqBKCa0MPTYmIhF5cW1zxA8YRhTEm6366UemxXrI2Y0G4r8JFc5qP4
-pEzKChM5LJxxCorllAe72tLJ6MSr4VIgc1E8cEKPKb7c6+TvYLqGSlh3gsoCBE4F
-rByOu11dkEr+Uye2fBuTsOsD+E8riliSrfntHoEuAqsojtzYNhXkw0TwthKsDAMl
-GUlrjkJx/fDuo7Lrs2fnMEVmATea/NL+jU3jBPGn6t3bXsBYtF1a/MQH8qB58n21
-O7tRdTnJEKxsQK18/EF7ke3ixUOcr/Ft/WOW+S3qtmMUuQzzB1WFxq3FUdeJIXMX
-DoxYTSN3tzg=
------END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1-noroot.p12
index 06415b4a6b3..b5e7de82b4e 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1-noroot.p12 differ
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 97b53fdba13..023c822616e 100644
--- a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1.pem
@@ -2,27 +2,27 @@
 MIIE2TCCA8GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBjjEYMBYGA1UEAwwPWmVy
 b0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMu
 MRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJV
-UzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMjIwNzE5MjAyNTQ5
-WhcNMjQxMDIxMjAyNTQ5WjCBhTEPMA0GA1UEAwwGQ2xpZW50MQwwCgYDVQQLDANJ
+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
-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
+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
-ggkAv96HBRg/RI0wCwYDVR0PBAQDAgXgMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVu
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp-noroot.p12
index 9a01a339321..7fc712561d3 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/c_rsa_ca1_exp-noroot.p12 differ
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 972fb3766fd..42f366b62fc 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-----
-MIIEyDCCA7CgAwIBAgIJANM8bgbmPbKeMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTgyMDI1NTBaFw0yMjA3MTkyMDI1NTBaMIGFMQ8wDQYDVQQDDAZDbGllbnQxDDAK
-BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
-ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
-Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-APPrg8wo0lnbymmvNrKOi6uBQB9dsKlLd55G89/ZSBdoNFbpgZC5OsB2vUcfs3X/
-YCVMMlex0BdNzicNxeyj8Ad34dzpl5lIIbTPitCeh2B6+Xvky8lzrZeqtLfVczGc
-jE8TLxwCNKfsiFRHPzoZqJouwKOM/DYJWgnfRRNdV9KZX+BHS+UOEFZJEM9KUOSD
-vKi/b9M8gx2Lm8dAoeSFnOmz1nJL26MvO7t2aHGfF5wpQ9Qer5ShYAK3ISz5XV9Z
-shJ09rmzf3RKrTd2TNjDgJQFGKz9HWy0Eub5WNcd3vpfgBvsjQYXpCeMxc93+gEQ
-CvptWp41KJTakmx33MPR4tUCAwEAAaOCAS4wggEqMB0GA1UdDgQWBBTs8KUrZ7/U
-nC4PVvV9dUwvz5h0nTCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhrKxQ8
-MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
-Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
-VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcEfwAA
-AYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG
-9w0BAQsFAAOCAQEAW6XL6QFHkrDfqJ0X9SpoDqzxfHImq9h40A2pkQGWKPclIalS
-6mx5izlFs0p2t51EJGyMhoFWajbNTUNBk//18JEJAV3RHldMSqTSU/MUVmaM971d
-38vgmcNngw+Fnlmj3904cYNvzzE3iHwjN150TdYgSIWXeBvrK4Ai13zY/8hTr2c9
-LjzjuMlhtF3GvegjCBchFX1Ux7ss9Bb7iqi0+6yViqjM6Kt6B+wPOfz5kUjLdKkV
-TKVRL8XmYGs6uaql6lRzXZiAhC9YMpI10v0PtxesLOgNAVsLxo7zizd7e3KTzMVL
-2l2xdPOP008A4fJloXj37y/Z8a+QS4rmmB0W2g==
+MIIExzCCA6+gAwIBAgIIUFcBmK99+bowDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MTE1MjYxMVoXDTI0MTAyMjE1MjYxMVowgYUxDzANBgNVBAMMBkNsaWVudDEMMAoG
+A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
+cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+s1XEdeEOhR7qXNE8mOHnjLVlWL2DF7GVuWtktDo7NnWEBz2WW3blE7xrvRDRxder
+GUJp5932D1xFBAY8C16OG1yAHI+UjnAbrBXhDKyTs9lzdAKWjLvUJGkPTx7q4MUY
++c/EHv5MfJ6738lPGeu4zO1vbii+TUaTqp3bsKUR7NpRdV6R++ub0F8Eq7Ko0Xyx
+j+HJQOEIBEXOdN+UqREqOcCMKHyLkeQgDOEE0jwt8cpZhGutcXb1pPe4FbpAPgLy
+W6xgfHcn3EQzY1Qw73isleIbHJjmdFAVZV4Z6HxoOEWdepW3wC8lGhSSWPrZQ4Um
+5mMyYyNOrcbk7KKicHktgQIDAQABo4IBLjCCASowHQYDVR0OBBYEFNHVq3pPmr9g
+ywckIuERvShuiz/iMIHDBgNVHSMEgbswgbiAFIxegempX8ORk3njKGdAR7ytuN2h
+oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
+ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
+BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
+cm9jLmNvbYIJAPf+QvI8GkkVMAsGA1UdDwQEAwIF4DAhBgNVHRIEGjAYhwR/AAAB
+gRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3
+DQEBCwUAA4IBAQCEjFn2K61sIZZcW/XDReYd6TWU9JkwDaQ6+u+k60/fxqgl6tZa
+pzb8/s0MtZjYr19SExWkLgGDHXuTEPKXG5KGsKofQz2YyagSI5UgZr6C8UvDTqPH
+tKMTOlToB4DKyENdU98wgwrXcAIIGERtyNMpkq5drOtU5YFiwVjqQ/9oL/2xxZk6
+ZgmJrA/tumyXheR4FnGGRxxe0eST4OOFsqF5E8kL6ICNysSDzo/aofhbQ1ZKrRsz
+yvAdbJBUEnwyBGo83y9wdgXdn7GVviVW4bDwElD2ddtAgWRHPf/UuVuUcsOonQAy
+03Tt34x6nnjlwrCvsqaK2JTA5iFUvhwhFUxm
 -----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 28ded7ab324..4ac33222d7d 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI2KEIUAdYpDECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHLBpmDb+AEwBIIEyFQc4gxif/Lh
-TzIW9cQma5pAPGbIgIjb6R0WSqseoonLct53ioNv98qngtotHjfyLDKPTKmSlhj1
-LpjamTV7iD0hPDymWol2H6BET0ulWaR4WRym6BcnqK259jfknN5tzB14vb6sumcF
-QgvpLJjNHyi82AmtCFDPrsB4n72jzAXXWeToESlrubk2tYhDRNRD4c3RMaUg/h/J
-cnKblMEcoQQe7dDmbqSfHX0orn/JBUzQ94XpfJmpTBuNXWpHUDG3/ACfg2GhgCV5
-8Le4+xLP0fCJRxK5HE60uSO+1Pqe+bLBK7/0zADeaRsQT6nnw3hBbCwzSrMFcVwv
-bjW07JEeiFHX/QXDhJF/FeR7ofJZ1q/wypCq/8u3Pmy3bTtKzoXWioVgzDCoye8M
-mF8f4pqbrwhLl1pWc6cqX76UcSpW70u3ceqooTvybsP2mAV203g2VdXUVxsAVVxE
-xvriP6cfErD+DzQpDYaoyPePwuH8MzdbpO+zibsHUnu7hHX8aXNkIK+1UkAGSliQ
-KB9D8cVB4Qqm0X8e75mTQYI/Z726FxaxUBP1S4ydW03TAriAnObQQMBp554i1Vrz
-A1LfFuqp3mVFheGNZ4yI/mEkduu6LMHbrhfsgBwdkJj6CKWVnB+NpfHzuqFl/VSM
-/GC1E8qksxlvIFvLPq7UY+iy+ycwlzmZuPE8NSTcuA6/h7R+igKEgJSQGnMZ8sSp
-7j4I4ET/sAcY6iUHGytg6cfr7eeoAfgWr8rJozuNKd2Lmkv9cBW0IAqUTLVcqmGN
-9+Gh6X4fF0vkFakaLec6Srsh+fB+TvoQ/JJ5BeHlDdmkHgd5flUYFgsbtDBvT4Ud
-biyPvamnYBbJopDG144/pCtnVOoOos3qDz20TUMAyca80wVDD9sX3t4VgoUhbKqe
-rwfFOjwSjVF+Apxj0xAFJYhIVydmXldPa9fTvYBZW06BSk6iGI7xWj5ScKvgO3Jv
-XiS8gkTIfF9gBUUbk8sM4oUk3UIL0QvmoH8N0sejo+DXHTDJer0Z/fR/JnDzJZfH
-kQgZUZAxhMG8B645NIDzarxm/IGkc1/dAU09W/2kotS25TJm0QnsyfCBUEsmy359
-s15+7WjSaXbKHqgmtX8YY411a10BquhZT9uV0V8/DbfO/hD+2TcN+Si1/0ULPlSu
-GG0GwobjbGjmSMgsxnuFQYOxQ5t4k0WmvMI2mlX2n4/zlQ1gDB9cnBOS/DTtna2E
-nU5tU/lh11G0UVieVg53I0cdixuOBfS3EG1yafysD816W8R9WzCz3tYCh/ELsaeL
-Xhe5UxgoMn/jnsUviyVDigHgTv9nLO+9Nn9q8fOOVktrANmfK68Hk8KY1vDqRVCo
-gA6MP59OJmI0k0ztqQN9A3qzizWrMi+iMfWQWLdf1RwlMA/yONHmCCaM5xeuPuRi
-jtYe+n2qgLSr0vlSCMIfwE3E3dkf9mmdIydSOALvacFJo6eH7Ea/VDfn8F0X7M6F
-54kc1cgU3r3t1b5jFvk0uSPpX33ynOPfFqLnWeFwozFbJHhZA7jKU+NTDWaIrkGf
-oNPezxP1eFMPU2qM2x+UPCqPnhOIP6iHBeFe2fEjeRxmGMADk/i0mpBnGNskRQwq
-z6Ojvi5e/qg8P47Ii4UmUQ==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQCEH/wCeBXaJv4OqB
+gjCDuQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIk76QANUTXpcEggTI
+Q5/VmC5FiVLJcFjQaWiTo6dmKD4NwVszcedJWIzJBNadKih3dDHBLt5Ni55S4u/K
+B7xGAUgyKm961TX5RnPIMSArhagn6wh0Y2VGlSO/nfS3Lq1LvEr2CzjT/ohmiS2S
+zDXCSxV2jWdWkdPdWM8M8uI2LUj25gsJchl+9yp9QGf+Nbolc71QDG+qZCLGtyMS
+Qi5QywM3s8mO1nr7317Kohzhp8XbDuan8WnEGwjbLe18X5VBKU6u6xtSJ2HJ0SGG
+WnHmgk1qJ82+oSWqlZj09yyUBkcSoQJWFqkAKMNLuYdkCBcXdhk9ih16awmoygpX
+4FgXLEXaAE3/Y6llB0vuLdhrG0ySMiJE+mDcSQk+Wio3fm/h3lsDtvEI+TWnhbnx
+5VRmxb68KxvNJKpynPnw2kF2ugCD9bnhVz/72CyDr3pyZV/nQvACQNoTFK6TtXHz
+BLViblI1JmOpW2G9DiqyyFUk15mVTak3rKL9eCWdJxn4wjtsCXyEfUdtFV8nbh5L
+reqIusvTk080Zei8k35bDOtNIK5MPgRzPSmFvGqlIibjA2CL+7GjQkAdyobN4Kgi
+3STV88GrvmqFxP1F+P6gImyvjFkKI11wRYRe5RQfhJzAbxE4GResl9PerGa46mbJ
+oQWvey+rsunjsRjp7jFG1bpgBIoi4wOw9WviB6ZFQibxJGJtE/AnZW5YJD23NBe8
+bZMHVgubcDXeAjQLOKC0xk3qsmhbZXcnMSXqJBDfe31kYJpnsFZbsg2StGDEEoTU
+xFTvH0YHFRBFrvFcfYy+GeaHpxKrkWiqoBzFAp1GfOtZld/ZPTlrIwAdzbqi6wgL
+c/5mcRVY9SDjE0Wo8VU8M75XdF4AH8lPb0EbPfm/kIc4fLHkJxbQW9BH5+wbW+92
+uJkGHRxwYEXw6YReDg0JHWy3XtA8W57gmhMLdiM4fLyKH1i9R3rHlVq6Pw3ANNl2
+u3h2a+2BzVV78/TkVszPQKm34GVHbzD5JtpeehPsXiXu6yqTNbgGghUrPTyVe0h0
+pY7qgiMXYqEDEpzbwoVYd1vlAPf+z7/wG8HthUvw26CDxwj5zc8rZne8JLlc1bul
+BI3xH53E6NPVDix//wflWtqVuYuCj0mkO85zUSbi7n2Of+YaM8vlC528H7il9t5m
+/TSF5V/HGbXSpnvr3YjASWqo6l4mOrQcN7YUX1U3sSCfzEhD+gP7KRrmaF3eRm+b
+qgGqcGyvyiKXn+gZCzl8fIfQbreib4X7K7ae+FuWwcIC1kwEWDoj1mmRoqpRXJjr
+wJO4uMIePpZNbdiayWY0MTXniiEFfgqCFXQ9n7SayeqTWNBBPKF+TPQgo6O9UjFt
+mdZ7P5/Ldix7c9eSM7Z81kqBXW7cjy8rAVhoYAV0NdE9nwgaNcOUydxSBJw41A8J
+hlZWr542FJOuoQ7XQR/7mIBS+38sdvxENSee6a97B9vGvqHMDwotNJHA9f4DEh2m
+lXXo+TEWuF2jIfM056jojXMejwI/5r+B2BpFWOpk9yo7dmhtZdc1E8vYyGy33rWg
+nPxdqUmpAzCmKwK8BvuXy5w6d9Rs5UaeG5hwVxamtUUawHk63sD8nTRyCRQTvnHa
+8NhLiKAczpBkE7WO4r7Zac+sGM/dSQvB
 -----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 b8ace2ad612..6b714597390 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqWU4HDpvKycCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECG38he6x6tfUBIIEyF8+7Jjy4aMY
-aWedjqd3Xz9FUk608R6x6ykyKYXzDpS9EYSq3IBLkjAo3UgGlBGnvLdM/mYZPyyL
-E2QNNUBTPxzyf0y3bJl+FKSbARefxDabxommtS4rvHuCl/CSszV9QXr80MH5MKEx
-Ti4lAvI6YbZGSKem89r8WzX+JLrpw2tUHml4Asj0g/zui3+OrGid0iAwUiOFRDPD
-LHVFMIZmdhNSmoVWYw9FGwderAGe+XeCEr3Sj2YRnGKi3kXSoGHb6OqPyh2T5KUz
-mAt4ssK9Jmw2rn0gW777BnDA5TMGZC+2X4U8Bp1vgBnDX5gF2+MaHQAmfir3ZnQJ
-cksSk4EibQMUCBjiDfakLZc1jOL8O81zZOBPrSEqjNheom173+Z6HGPoxYbJw4i2
-WXf7PDUaxUH51QDp+wGP/yIiviyj1cLpBJCgEfpHTrIEL1/8w8USR3d7Krz43179
-zj3WrjiFtmzcYdtUD4UT+2JCtT/DobfgKBvFnOuCKNIzhhU/ebEDDp2ROlHn9vIz
-cCDdAWgl35kCkIXbiYDs4HaRxT/r+dJMWag/VwfbKYOsNp9bEsLgcm3D5lLIIw9j
-OEwLTxSML3KF7+P4a/Vf0d4ual7iV2hZrTpBWDWyDBK7rN6yxxg5dNXLcM0Xumyq
-iltoYeoNrGR+6mAvo/+HIsfyeNjS1ky8cQsQx6mu38m72F9jwcCtWREsg6j9RLKl
-p3kLlkriBglAibHW/ionwla4PoVHj5ehHSGSwmWIW6oVVrSdiwdfweU1cjZF0JKu
-ziwhLCK7CFjbDRPw8Y4qsSXYFLzMhD540mkOVPbmD6hZpKP91uZHKRy5HQ7UH/P4
-IpjU6ZTYO0l8Vf47/g21HK3h8r5WcdkNIeMRrv78AoVeah9r+l9Gb+Bzga0rWTIC
-GzegEsgH3bz/T01T6T4rLE53qhO1+4Z6DeqFVahcC8rXRC+bJ7g7h+z5zljLsRfQ
-qpSf1Cmg295Jhw5F2LSxFQCrbyTnhPmyIsl8kd2dpxRvByZAgnCDSqKYv0uo/idR
-N5KaPGOY+hQxcXfD2qV7id6VFfL9ucdDfs92n6kvUaf0kObGN9/L2I7Mg7QRdMW4
-2vyIZ1RU0VCs02xZFWvRHzoylfnIXwSCmFppDbyLEh48vyuRelDdt3MtMb9etWst
-tROeFFLm4T582gY6BurSTbLRcsCE+z0gxQ9GMowzVrzM2/xzwfOO3VE73wsYOU/K
-00177tKA5OhmqG9MrUZOcN6fx1nTIjtR1FSUqPe1C5DD7VMNE4K4wyg4qNGg9wio
-UOzGsMpaVB3tW5csfJm7HSNl4OOnaa95kZZqIEwqi59TdGG0ok9/6cV1VR3vZohK
-oCVbDfHllA83N0W+TMnRorH0n2ON9XpaDLP67pASn3gTzSpSE2INuB+a1k1rb5l/
-ucgVdwZebIpOLPbYeaBM5qWd2C8XyhZK/uzSvm1wFCaUVh1di+RWSpKsy3/iiINr
-vkgHRxEnbTi/9b0GvA4uxFRPbF41AxZD8dgPTZtA1hYGDZykowuv5n2YHCdcyKHe
-5hHpKnkijTK/5TondamR3Kl4DnXvmqj9X9CSDarv9rBTyJwBnxmAgTB+0A5ODPge
-YwlNVIc3F6v+OVPLOdroyQ==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQlen6+BH+fxVluFDs
+6C36fQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIxLwtJpeoagoEggTI
+0vLK6hIJoDodMq1pm9QRW2vO1dSdyrrrKzDbxI9EDZ6BOsieguj4wJN6SGz75/hq
+IWBENdNwGKB6Kxv+75CiVNtGNffVUG3+yVYeT6NTB7tgIufmmhLOD+pNYrWcNeEx
+VjMJlsEPw+puRCaeKOqyx04dlTgvVzOB49unMGgeTAnPa5YIdiY9IqJnudmqkX60
+imfsxM5mvp8UnpwbepD0jJg71LEdVh7RCCWZ+VpY4X9rDaAddHnjzKo04xXikwBY
+LIHoCpFoLdwU8mgm5Vwo1EUueqeAmZ2zhP22D2F5+jWFj86wLrNaN1Wwoo6bXbvB
+o6cHz149rHyr2HEUZ0GL3GBEeMdS1f6BY7T3j/Uc9QtQ+2b1XUwFhmEmvSXb+DGX
+5/TOx2WMJB7CDKpkMsGJy6Q5J0ZjzU6AZszXxx8cBMS5oKWOwiTTRKcgbRiFEzT5
+UXaZiGLX903MsVbjYinIGzwhpySwro/mBhBtjPYBhbLC34ZJKdMMu9pI6/KkoYRV
+Q7O/pBHPf5atfqcBRPb3lSxZNx2enfCABLdsLJvfg9OO0kOL3mwvqHWtVPN2xGGY
+lzDNaFHm1I+8BS/X6ls001pnT5ZLen7SEM5bhUWHJcJO0tsaARdtDHdKPMXp+z14
+kYqq8OCnEAXJPXlYTzMrWGZ9kh9P7SAHguGJCjWms8zL0T8h4GaGSy6BA0Uggvoo
+vs7Wk2uyCN0kcpsUOEm1wX2VpN50QTZV/LgG2iyFXY1dK6EZmrVUaw7Ke3UXE1ni
+i9nlhkpYo4vuTWdj26a448kJQF3cG3eHlRoI20LVwR7l62x5BMDiLQNB9CXwB5X7
+ZlCC9krYNWy2Wfee+X9CCq2EwVvIpfvrb73jEQVqS6dpcrQ2UKkchaRgZSdQnTpr
+VNSf5FIKnU1l8Xjtu8KEAgNCob/1HlxeCh8eM8QY17eVEXC/Kbauu6d0UYattPnW
+zwv508sKYG5tKcasBKlHYsuFlMGLKYVBrEvkN5KJqXtJxqzYi6g0mfT/1bxJEqNZ
+1dDg9jVebgzp31DluX6EaMQ9lqz3vbS6pD2y3IbiJ0jBVS/UZaJAibGHeSqXn9WB
+pL2Gyr7hlaqY+u/AsGT2+YRjJCHp74u0nQKPthAGyu0+VnkdxLcRyfo/e/mFgyUW
+sKLR/6LYrYksZanuQXlDGHpo7FxnvhzZyHojaYDi69CL7tjpILnJLPXpxzkiQjg8
+wTrpmbL9OwDsqxXDkOTq1eKe2p15ViHP096CE7Tgb6AY0jlwoCxLX//XABKp+cI3
+cBLUH5Z+A3VtfJdTG8NPQAhqusyNVAkwGgqzWKPaaUCmKurHTQFyUn8o/PCyWEpR
+QZ7ov2LgO07V2AtJcESR+LPh8YAmK5vIRZyvkR6+pfGD+ZlG9Rl2G5f/GsMAqy5X
+AkQCBSl14iAxEYJBD09L/jDIkJl58dYUAvSiQHcIrz+evp0GpHR6gO8DN+q7AdzK
+Kd2Zx0ppSz3ZNET/B+DveyeNyNrOWW/U5ebWWoctjoNE/fuaMGecVEbktBGQtqJ/
+thQNNc0l84rAdt1GQHEri/8CuTmymicSRnwsWIBPnV6U+JqnEesM9iTHujOphDny
+34kCn8m2Bf8QPbhFyKjtGt0hO1pGsnOr
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/ca-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/ca-noroot.p12
index 0a60e958a70..b6fa30d89bf 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/ca-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/ca-noroot.p12 differ
diff --git a/cpp/test/IceSSL/certs/db/ca1/ca.pem b/cpp/test/IceSSL/certs/db/ca1/ca.pem
index d60022cbf81..e82d05efdf1 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-----
-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
+MIIEADCCAuigAwIBAgIJAPf+QvI8GkkVMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
 VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
 b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-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
+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
-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
+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
-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
-CqVhexCqbwVNhXvKB8r/cOOC0Hk=
+ggEBADlWzFkaRjhKsbDs01fLUWtYj4ETEtEltdosWq3RQ1F7sPx9MCG7K4AicV3d
+dk8VSvSgkSgem+LzTOPuhrNnC30Tu/5wUFdiTttm9HmqySArD9XMGmGCLJRhKiJ4
+TFMyXt/aCWcryvvs847MX6onm8QpgYbtHucEsjk2AaC9Fw2nt00fkTztx5uhzlBB
+2l4/Km8Rbc4mCeyXUlnXLmlzoT0bAzxON4sAlxb4r1EiFM0y75P030RNljmw8g2T
+HirfFNv3/KS50/TLt4rYRiyzKlmd2zXKbx4rFCDrvvSCEhYUsMjEeORvqJnfrCAG
+IDIRYd2chTD4y0y09MX7GvlLkIU=
 -----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 e9eea92bd72..5884f059bc5 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsPerEDeZCFECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNUfBwahsuPOBIIEyN/fT5gtNh52
-xYDmEQmTHY0xXzddN8jrrFyPcSZcvcICk65QyvlZny/Nu5tc85DlMjg7KKRQ8rcY
-ARsrrR/dD+8Xr3E8z5YeFHxuoE4KopdjNnvFx1bFd1MSOur9ge3CdRm7NU44JBiF
-3kfg8JnGrFSIkqwMjOzLoE35utuW9kIDPJoX6mWxOsQAgIQAHsORjYiCnPL9N3/I
-YgPZcyIgvFnNQ7WdylLroHgCu3KBkxhgY3rmVCY5vxYA0pMpZynuxSYhZZtmOV3Q
-VvxHBhe66kJFAw0G94iCXGWHSTh9oZSabr8uaIsQI30shpW/713wBdxbgnQ+5IGN
-JjWyvTcL3gPcxfV7InaPK3GftzJgYygHIc7awtqBAq9O+mv0OoLLeGQaPau/XZrx
-Kn3AclZpyaDFSYWrXlWtIiDQTB0KEeyA8uAvzJJDabb4ZJEvJ+V0lKZjaevqgvLu
-VA87pzuNunnyTrod9XAllZyhKvoJKh8vM/QBPSQ4ESnKWcIX+oPCGz8pNmrjSJOf
-NssrvrnaGgkAtLLlXOkzBQpc4USL0bb6XvwXKGKn3v9Qikh+J5ufewaGN3cOKb5b
-xvFahIIhwN/aw1DfXEEPVzFtwlAoyposS5kmcewdrZbxVE9UnWRVuuqI3ztyGicl
-cIJ9Y8L3bhSHUvP/YJfs0Pr75jjfckMEMZAyClHgRhhMyHt/0vqgsxWE71UKoPPw
-FrsUN97tbFeOPgPGh96RddMD9zo361n2O0yRh/uuM/Uk6JPS7iCvINDR0A/9igDo
-IS5KCCkrxY3KwO3PbEaavhHE7LK/nF5XrIofUgRASZvXEKflAtQf1mdaRWYIAyQP
-uYOw82uR+vDNAUI5OQXGyfwQA5Qzy7ADcqKtOtD0G07wMb3SG5yL3HWqV2LyhJ5w
-e/X5k2m6BXGAVO5U7Z4f+kdKIfIPsJUFnq0mT+uFm3T7U+NrrNvLVkRehHIPHKOP
-p1eGGfQ1UgabisPl4Y5xl5ya0il9HeUiGH15LWDXAo9mH74155Gdvej1XH6nveyE
-cDc/GDP6yHa1t86t6mL35hEKqstrz9Bb3JAlxTi65zM9RXKMg3w5WcJYQLiRUqUL
-D7IUVhho+wqIBCK4YDoXKNu0+dagRxmGjg4jfdrCHFrg+hN410OhEDyhxD/81KSE
-R8/8gsJr7sFhU123BH7mGFOjDrX9cy2qhfZVzkoEfXXGzRR9BDrnxCw23P0NX5BX
-FSy7cBBHtBsEHyZRobOLHPGzsx5YpabE1f93mkhktSYerDBeKKhwnyyXJizqB7a+
-BsuWKhDcjN9srQ02l3UQ4UPLh1mc2H7RoU4uTdOP9btcmpamgraWzzKBvU3l5zNC
-S0Vy4Db0s/4ha/0aUSqAYzBmrZuf/KCHbAeGOTkRUqpvKS/XJcTrz/co57Vqvsre
-HzX+GUQSpCub8C9JAn9UHMopNVPvJ3RhlM87YJJQH+I09/TZ3kVVcJuRlSyZBOMd
-NM/OndUcY3CW0kflodh0GwIvOIMUu922uM5Bezc7yFxaMMeUY6CygLOw0ngIVGDw
-ZRAIvgid5dyQLODe3mzENwBIh5hwZCM+ZkjluZz3dzm/1Fpy3JrqJy5EQsOma2bI
-wKl7lRpo1Jg4i3YaAZ1soA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQs3hTLcEQQPy6cQdv
+6h0ZcgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIn0XPWay+HbwEggTI
+DNaT7iaw1TOPNAnVNN62zKUKyO3x94N4goBP7ezDlL6msmAeSb/+vM21ReNsMlJY
+kTFjZGnBggTtabzTFIVP+r3/2rV7n8FZ4b2TiN21WdbK7iKeh8ZgSpFuJ2janRMJ
+Eto5fuhuv0D4wPmpvf38o7NOWnKYE5Ei/JcPzNCxU3kDXE2POX1YGdiHklTlVVrr
+itVitF1a8rA3rgvIJBgPNEEGT59NPdvWfbPNdTdu6AzRYcNV9qTGxzdUqBIThLB/
+vxR1wNTsTk2ybsSMwWTmg8hldG6vpQE4f8O6QxUWktS1xSL8xSyUXcWOCPJjSFsS
+mibPIC7erz3GBKUVTvzHjR/DEHPQpOH9+sVaxPv50XzkWvnattmB9rxYvc0ZxCm8
+XLdSqcqDBxnljOjKlrLeRGVZGX5c3r2JK5Lr+D5+6HSdPssu/9cB84XCYkjRNAoW
+SrkZF3Uvx4PuDP3IrLJbfbbyWTDAkvAoxG6rjkhbKUJHujm951urLYpx0/EHcNIL
+8AaiAkgt59OCi1HuFbjPljOO7xvDMAT7VZwb8q7zMtOLZ5WGfsn75JQh1CtlK5sG
+/oS6ej6pzYlV808T5QbRIkjI8i8Av7U/R4/OlXm5b2ifYYpCldCl8qI6pLZqfHR8
+B7G6vyP/6tHjy2QqG1AKnIWUexX5l7UJXBecEji1RVq/eX0Z8gvi4RMNUHjsgXom
+cpMRrM/kEPVrc4ibfVo8ALKJQPPRR+54aQpE4JlU6plDh7VkGL8Rf/gARbqj5jQ5
+DG5CXb0/NKVDV8llgeYr5nsvOfBsAEYioFuJvHBCrp389oaE43Z9SzaX/MkA38wC
+20BwajzC1yoOnggqtNH5j44PN6Rjwn7LFEYm9cV5nc+2YtE1mD1YDkNqnl4GRPz7
++WM5jzYGlMIGxJB2EXd8+8gD5I7itEa1KebUOcqk5PkUqo0wtXC+8v0mQccHOifi
+KkqQN+pfULkD82erF6NLnwh9r1KhwAXizqJ7pRtr9Iwp6bjpvvkPCDak5qKDjlDj
+yTSm0bII8W0uwZnEY8ajcg3KElrCjIecyO5/9Y809si/jkOSx8jrSY9mCTQTa4Uq
+VVFxoFmOvKu27XpzYenRIIipKliRZrJaEpYp8kUHGoRhjwrxp4ZCXSA3WMu64MU/
+6eA7gOpPZw4lZcFYKFru90t3qMK3mLG9fgUJYe6fJJbBYcKuapysh4yWr68t06a9
+xqwwVfGAwnDtoMig/IQu4CHYhX9R3KDdYHNOIpWCeuDygVQ23ChnazPy+aSMuN/i
+rpiIdnZHytvsBGNdDwD1ni49A+WZ//XpCZv+mq5k9tOox571tqmdH37U68R6Q2mF
+i5UWVtFNcJqNesiKzM07j/rJwRfiX6EvjbXOaA1Vq0vB/HVtUHZx14Hw7ioAYbv8
+VLZLxVfsI67ch6WhR2vDRgvESb+cWaxYmb0s52GicxLsYy4/ERs5ICMP4rgE08oF
+Nzy948hqcws6mkDXTqZImE7RKaGPjW2iabG+k0CI28M785i3SR1N4Dkz7Aql4wp2
+z6l2Yre1lF1pC981bUxibl6Vv8aaWRZGQk8cgVYVtu+rUElCHPhJpHE4u0rvb67H
+FsCvehoSRj/YH0JTfz1SrLQWRvLBfV5l
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca.pem
index 86da0a8abf4..07075dd27fe 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-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca_key.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/ca_key.pem
index e75f03e4a88..7f38c12f0a6 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI7CvqltD264cCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDT1u3O/WXX2BIIEyGBeDVCwV+sa
-w3KQvLBLz1+UkU3ri6RIZ+5LUxYzFOiGLZE4UuXzAgy1VBKuOjEDH070o32f5Ard
-o1EfwB+z1R0dHyzxvS5hX2kYREELERnei+DLjqTK3cBFM/fXKi+Hgk4w7TrhCQS2
-12qcv0FyKsx4Xq/pev+HBUrlNo4iNdLXxSoZw5fo+tOszmf0wpAuNXp4g0XhaO83
-YbAL5NNrGBmKbnWIj96u2wxu5s6Of+hmcP2O9zRcyeiJexoEq+Pmtwuc54maYH/1
-FKeCzYnDfPw9j/shmSLi45ov86nQrezcjH01s5h99HgI7oGizK9ptRzLc34dvTY0
-UHTC7ro03DrJOULBkfPxj6gTlPZABF3Khgv+amq6mtBA1ucJ5ck9tqG8N9HawOn0
-PRsemSzUuL4lZGa3EntVFrBJ7xh5R+cUeblOMPxAmrVETNNFOHbO7bmwpCWD+6Rt
-Tbhqhwe+d1h9cpbTkdwcjZO1fPoa30ZRAYLlbxs9TutODSDv8PIepvLy0A4oeQeq
-xPZomKjWPOViwiheXtfEyG95X9eVJm5R9X4S1N8P0NPLAm3HZEkJAz063IaeT3FM
-1J0yk7eYe8t0pLI5IOH/wA55vPvgM3jAyjwl9DwS5ArgCZ0jy3gDiUD4BhdICV1g
-He/GDt5OQ2rbHDBp48k0pEPmNXxu59vgBGhBym5omk3oo/vWPvIo84OkeS8ecuax
-654bSwKxE9GgIykqF5b/bKskC/nKmkWDVR3MFT7DoubbtveG/8XW7yY2aHSbZMi/
-F9CjsywwnX9LjhM12JPUvA5CrbFNMP2HxZrHGs8+WZDYPJzVOENbjbNe4nQo0NWM
-qbKS5nDGOKupAGqlqTTdTuaWW5xYM4Pb390v31eDhQBMiJu30KzGPJi5T7Lyyb/H
-Kph7aI1eXCWlEvYiOBtkJkjompZp6l9hbURswYyiTRpdVURYUnXpEoP++C+3TVAi
-93HqJoE4NHGktAaLpy7l+q8zkvpHtnxJYqTADTvslMxiop8FEzT/QkQ3yyT3stJ2
-4OLASGa9H9OdQm0aTw78IqifCOiq3QFCbpHqTd2RjEQ1QukmKceVZVTyqOAecDGU
-Be71vkK9CgB03FtdpHW1QD3IqaAlv5X9mVIC+rK9oTZ8Ue+ZPjjiHoGit/SwoFJJ
-3vyMLScXHhrZjOFjuJW0NcbxffHC4IOPyuIMLSp7x8zS7ViZiRjNzM7LnQ3ktpQQ
-bMUIQzLZ0HSIoE+u5skpIgcjaw4kKf1xA2K3QXDusMj8prxGFnjvx8U9N6mag5xd
-ClbEJa8K0nJlLDu300rO4ZOS7V60sHDMII7n1HoYxwcyDMjiBNb2/lOmdnCQCkt0
-cS2vwaqrtwbosYhQKBv8yndLk0Ik1mnAK5cot78vy0oUfxhIlSZN6I/1KtjC+a2Q
-XvaPY59IhMCrSVCM2pUEAnmkRNqMBKNLtWg+fxoc4LK7i7Uph440s8BHJqv5puCm
-Y0CJlIjrZtjWAI6OTG4kfQ3676pNEqHdf0Xu70NMW/HkeUPuPM1tw87t/hssyZDn
-NRW7IMuaAFODfQIr5iAz75UnrKyuqbfhgyM1hYKQvoLuYOGI/2O7Byuh9s082yQf
-RbpfhUfS6kD5Zq4g5sB63Q==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQtYRuiMr2GJEN9ccT
+TAS2mQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIB87U3P/08ykEggTI
+9kvVuANHddf8QQoYYCDnC+IMAOxvrsFpuEQViZ+pKRawSBJEF9dJ2ltnoyTPv/mx
+ripurzfIWaXmzZ00DzLqFboGaDj1IL0pLGmaDqXa+Vb43rWxEsP03r33eZughfYD
+qNuNEgBpyvuXrU/XPmlc1tAugTbv/dnoCHjudpy2Yh5U3a5fnxCFJ+uvnvN7/Y7r
++WpeNkT1Z6phzS+W5orLp2oH276we1zJ7hByL8g1V2cAIZeWCC5xp/ofwcYr+wTf
+tRrLO6ixuQo+ayWD/x9CwYegiHjprw92nRhC8nk4T9pXeqlCiqAu/qHOt+0XhXVg
+1pjBPSR+bYCv2pY7ww+/UQ7T0jBp3dMjQPKt/qs0c85KSdr/l5yxHJRe91vgZs76
+9e+ubg6A7CaRoui/Gde7hDeMam2u0xVfcj+zh0lRCXEba1QphvtVakoLF/Nn84vy
+AzHmkw/7GInnziJqh6e8XhgtekWMwBfqM+v1Au50x0Sa1SAOKUH0KRedsEPszxrj
+cJZwLS6ENBo74GlqhWsd1GLFFowB/W3k+leILnz8BTgmh6YykmekBple+vYbf3xc
+brMlXXCSJV6SAdu6SwvBIn4pkwTfW5sTB9RAHrxDetBmi3VS4luqldAeVSAkJcS+
+5/CkZ2wumFXwR8YyAxcNwT08f5ep4n7lpv/4BkzndzPhumhx1e9FsZkkg4Pt6/pS
+XbX7I9DTScVBaeTzW1sFkd7M/5QJMJPCL6sExyqcCmQGa4JRzfczQ8SxXrLOD/2A
+TB9YpnqDySRAplqcczBvdj0mSsIWqshWEIe7GAeFdKB649rVhQay/vGy3aN/Hq0e
+ziJ0gJRh2I+bXkFmgQ196/lAola4/sR0uHC1sIu41X+FwyQQbXT8u2k3LLA3iprj
+PelnHcxnbYxUkQHihl/w7y9+IONc8WhXYztBYR2zpYFQcsU7v1QxHhp1zXGu4axZ
+klPl0wnMQDhlxMAc/iQ0NNtJtZCjeCFsVvoK9hvioTaY73r8njNmXh56UYrHAZMw
+HicwcYG9so1Bs2LG6IWz/obv4ReTltsGcLoafOZOJn/mDl/o4vpMlO4gI1ksUqhA
+C2q9Oz1vZBpNUhFP+4LdtU5pBV/TkHds/c+U8EVaJBHXtxRmYwTQ1upryx5WrqMn
+ReAA4JlwKHS48KfxKZf6LhtvGU1NuNiSc3gJXD/2Dh6EIpnn+beJPPxSNPKY7qeE
+yPzrBdDVGFBDE1Iw4vB48sCsrxHpnvibHL5wfNgujrAx91NKvSG5QK+HgTsexqyg
+bPvX4QcksoWF+tu3mbdr4AUNm4WwOeVSuDeXR7aciv4pEh5gcHQJTCysuYAG/P8J
+h1pyD54OdLc1zG1dYJRaaPCO1hi9cy+bjTi6l89Jf5RNIeNqHdg2+iybiKeXVhtg
+ani4QNSEoVIByQIi/d8fBg2jFEfCW8eBi477KMmEXpf/41hDkWIxLzzsgrauL6tH
+4NShwWBRiRWESzZ1f0/OyUpJu/L8DV8kcdNi1nN0BqxjPsTjuRADK5XUS/ABf8GN
+mixNe6hzbW2rHxGxc66PfGKnwcjGUCrajXZ/FDtkVzlxpQRWDZTfDImDzTTz1LBy
+o6URnFMxkcCjbrgKaAl4gR1czFYLPUbu
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2-noroot.p12
index f34c574ccd4..7e8facc2982 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2-noroot.p12 differ
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 19d6b41e57e..40b0e11a9ca 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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
+Yy5jb20wHhcNMjQxMDIyMTUyNjEyWhcNMjcwMTI1MTUyNjEyWjCBhTEPMA0GA1UE
 AwwGQ2xpZW50MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAw
 DgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEd
 MBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCRHjS/sz64gjW2Fa99PuctpduLByAFiE+4EHet7nLt4qkc
-tEMQrYKHglP3y5HAwBNcKVlNI5oZRbO02Mo65vPy6KQb7Ir6dvqgKxXaTYFcbeWK
-06O5/1aQGzB6vzOeAZjJ68pbZLm/2hKr7UkjGjwJeivZhBRoz2ZvEyvWGEXm0mBi
-mg96Xm7XLUcMovgX/f8oMWDDjlxuKNaoQGMXiTF5ziF+PJq2z3Z4Q5u2K/Vu8zaA
-MyFflTEmGn8ee4MaD7l/6NeA31sVkv8t5zysIaHpjzIJzmCkMSgYebACVdcjwiiy
-cwt828WigixuJexKcJEdxGN310yDCT+nK99G5dttAgMBAAGjggEwMIIBLDAdBgNV
-HQ4EFgQUhLXWUA4DRPeK5gni6kWaehmR+wUwgc8GA1UdIwSBxzCBxIAUYkpRa4+R
-mVoFOEEihzPVQYZtPB+hgaGkgZ4wgZsxJTAjBgNVBAMMHFplcm9DIFRlc3QgSW50
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
-BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
-MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
-B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
-DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
-BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
-bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
-CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
-OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
-dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
-Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
-6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
-e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
-WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
-Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
-MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
-SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
-9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
-ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
-1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
-1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
-g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
-92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
-JZSn6IpfkLAH4tM8WHSDALCJZAQ=
+MIIEwTCCA6mgAwIBAgIJAPsFplxafcOCMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
+VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
+FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
+DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
+Yy5jb20wHhcNMjQxMDIyMTUyNjEwWhcNMjcwMTI1MTUyNjEwWjCBmzElMCMGA1UE
+AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
+EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
+RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w6jJO5vS39W0lsd
+qwEigtwWvaUmPMxeWJKJlV/4ig51RbtaZDUa9eIpsIENtF33JHhtNat6gl4wKrwZ
+Jgk+fEEWF/9ZqZXbcht4T/HYsmD7egWkqbA5VVqrg62lXMOqV4mSwIl5sxIMO4k1
+iouT7hR53s6F300nJv5o6vMKapMNXhxBxDkSOMJN2C88TVebzSI/hMb4iNs+CMTE
+doKiKsN0lQEpPDwoydJRB3RwCYIvdGH2JOtAXbVcKZqDyoIi9dolMejadC94V9m5
+GXs2y7i0qO7QPEWjPeXvxnUZvrEHLS/6HxKhlQLYsP/rTs08X4TQfj9DIvfOEIL+
+McRJuQIDAQABo4IBBDCCAQAwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQU4DL6E7Fj
+d6n/7WfFD0zD9m1XsLAwCwYDVR0PBAQDAgGGMIHDBgNVHSMEgbswgbiAFCgrCn9R
+XBPBR6yEX3923g8KoS2eoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENB
+IDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcM
+B0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZI
+hvcNAQkBFg5pbmZvQHplcm9jLmNvbYIJAKF/0S3jU4zlMA0GCSqGSIb3DQEBCwUA
+A4IBAQBAc5mLwMOWv0vgHNEMZbmjj72BzcsmB+7VGGDBgoZ8vfz5ZbwBWMUKIG+i
+rG1MmH94WAI/OWYR7uIZfPxjnE1Jzvu2QefwwimvXThhj1z7cwjzwVdyIRmABQLU
+KFpr+YNLMjmqDK5k4HcFg+jWGj2+1BLUYB8ZE9AyHR1Fge5VO8PJlPNWedL5m33M
+kodPdXF8Eotn3gygY9QOS5fKDeG4Ds/ADqkAa+e/zt2LLX/V7XtCdgKk25tKgNNo
+7noLaSfnp66CofTGlRa2xAOFH0jCcdGQ7H+/CZWR6se5I2TNyFblr3NAEge29mGR
+uHRrX5GqieKNkGyxU9KPeiPexsY8
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIE1zCCA7+gAwIBAgIJAMlLJ+8pTscWMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2_key.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/c_rsa_cai2_key.pem
index 42f0b8bbc4c..d48c91a5bd2 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIQFiBlybXb9YCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHJ33WPApMM7BIIEyDEtZBzdiJN6
-AMWKjalvZFjCLyHHn7NXWofuyvAZgmbBrsIKvP+gltEcEdzcYvL/MSp29ysBT3ez
-szvBTeJ30Ht6b9BohfYo6bNq5b5R2cnwcwJBMFnSHl7J+hq4E5OLwX4QygUOEL7+
-K3I+AvkwdzCieKHxt0nT0FEf0m9ld6k+vVb9pd9Gh69+WDbGKv+729+70qmcDpo0
-QzuwxFoToh8LyPpuHUm++FonDYPy19KzIqtsuLQ63vzlwCsVRFmVKnhIQz5nk/rW
-i0JnUDeLIV4Adtu5wkPU+/0dMj8Eq5nBMWyB7ZEvD00/FT9yq1oz6C6ZLCXuoExi
-erK7lLVPnFeUgMjCKgyUXaV/Qx2Oqm6m4MGk0v3rJrYvAb1UlU3PslaLbl3HT3pd
-vNPRrhpBSrYM9jFV6LPf1DWrDOjVDz62p2zlZRsf76bwKUC66QR6APV7vJG2nBwk
-8tk1DN8t6SpGLYQ2+GiBkQ/436X61pNLeuxoQ6rXMvVtpwL/l02LLRYi0o8Kq+Fy
-y7Tx3Hm7MUujpx4fSCeFaWyE1czBl/xxoOC9pU/uUtfzDBw2rThX3wSpB4QPMZfn
-Qb9nXee9OEzJVRKFI6JJwP3b4H5Hhr66Os8GHrfK7l/npmhaP/3C6Jahx3JKAq7r
-fFmoL7RWtg7h9rtpXB8XeM/vGHHaaauZ4KOIxH+hlofQwiGemTS1Iu/VQBx+UQ/N
-eR2T/7ckEy1Am0L3YraEOpLb0wBQ4PNlCBfNt44LfmwG/apG5tbYVGB+RLMMDyEN
-jN7Wlp3Fq8ZlUeh53vgvUCo+HlH5OytKEA4fRTWDKZedDphcEWnpvBfmlgZ8S1ZN
-vpOyLma9T/V62kfqDvU25sbWVndyHITh1d3hUG8HUac818Kxg49l0p2Ie/Sb9zoT
-PdzT8petdtZOwy2Xr6dv3TuaqEWg+gglZe0lDKd78VhkHMqvvGDUmhk+lrBWYA/W
-Z3NVzPqfii1RxvoUHmAGKE6smXNjEFyel9agL+zFKAeqpfHQveGxVDTSH5TSXGJd
-X4L1SHLyo6W7YBAYPUl153Crqctiu6hziAEC6AdpJ7yTTnXY56atvyDAZXjBS+DI
-LD3BzBWhQnPuSalEecHhRtNJDSM92OSaOkEjTpJM1rRrZCfBM5l9fmjKkQzeThP5
-GGOrphDiIJuqXRdauMqBKcxfr5IqYWGLEra9oI6WIU+07AqAolA9JmCMdhvLgxFj
-DLg5dE4Sa6vlPNBvEblZ8qhxN4nAotp8l9uSvpgw9jhHoDSq2799VTnW+UmEmrCh
-HbvYdKTzDGEy3cxDvMBkDVCy9pfjTPu03mLQKz1cSggyxgb4Rmrb/VR6UPWcVSv1
-5hiMkXXQPI5RodhNKs0LI0Jl0WgarjomsEsE9bFv/gwmsyhqh2K7lwGE+ctvxrEz
-qY3kmYEYSDaYWFLyUzy1pBpcbwsdH/2HKWKlKKaR3tQrM58xq6ItSw2MyyB+gF3u
-mvHAOv98bAhpVhOpg3onqY0m8j1uHSK+v4muyDg9PWM/2KVx0qybxubNCapMf+kn
-73fbgQyajVAm4wHLWHC6NvQZxqEse6/u5RkFV7KjoqP2easkz9dkBkGzFE3OTOBl
-zu2MmAP11DnQRLeul4pviQ==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQgf4lurIXnsplGU5L
+ssSh5AICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIrK8rj6TNksoEggTI
+cwopsxengfFZUU7EPF8T/Hq7RVoMiQxD7BwFgeNkM3Uj7c4PChikZN3GZ8EP0gqd
+G0oe1jzZ1gaB0km0iLe/+fBjpsgvgyn3iTpzq+I2O4KiZSyMt1swTIIg/EsN6A7e
+sOFSKErWKpA5ByZp+HUdUPXLONUyibtnuk2iVyA3/BhXA7z2ELmTFS+xlSHC5Lh9
+Iu8BrP2Q1sgfFQT45CQag5KbDBEIMASpGWpvP9JY1fMvCpDcom2C6q2LqSgT8d/K
+MA+b+JWaPJjGNBoECen0iE9pZ0a1b1RDDb3vcDSWDBHqksPduhUpL4wfWQfb1MBE
+vZVDchvOW9j/kwfo2QEAPG4PIQ6xsNi8sV2H1oyNY5XAmKtvyHdzDyYKSVvCgCyE
+AnAJmYoym4DYvTL0tP9kCGubfGVdVbnlJexABMgsjYoYp9+AIssBpzT6qQxcuX6X
+fh44VgfsYsCkwvd099bJX+/9kgDkvr36qnIrP36SXRQO7z+NTF992yLyhrApbvK/
+qdeVA0wSnV97+bZg/4eLxZTxY79wW0p1YPP/NQ4iGnp68X9H1w4KcOMCzUxyuWel
+kTCkZCCDpVW9Ac//EQNASzswOQAvNb+nL8mom1Id71xRT1hz8ciNOkROHT/MmK6t
+1B4ljtnrEbTg/nrTQVRePdb1iNIui+dw+OPR94j7YJrSptKHEprXhViu226Eqlxc
+pFmyhgCKmCF5o+A5wjQjIpmoUbAoCF3uILwcM71AOv+rbKx7EBNFTqvs1t0dViOd
+p6qF26Jee1toWYp4ccuQcCyri+stdoNAy5gArf1mqnZHmN8NpRUHegJqKwJJna05
+4VsRUqAbdWtBFSZEpYe10JCoq2YV8iMVDe3MwErbH2NbqrOmIdyNRoZzbbH1TJK7
+cW1BGEvqT2YmuD6icGdWPQ8K8YrGaLMVXfUT+hY4hops6U5E3wNfe5SwhI7EukM7
+NKYaPl6+xFO5j+g1lfhOf/0uWgvHnz3uwbGg9tcSbSPEnHmqciQXNOstuOtlMu/h
+pSpy8hhytJQoNoYTOmYPr939xQxc5wo2I3p+Wa/HSqQ19JK9LEBWtM/Um53V1vx9
+q54HqDK8cQxMwjN3NtGrOE3PljtNxqJjQkwXG4G6EYw+3ujChNX0UtCZYBtdqJw/
+YjVkrRtjk92uA2Zvz3zfF8lSoNZP9HZL+JoUcbl2R0VKXdQ98kzqP+V8ep4t2QWY
+DbZPiL9PuwF+qtkw1AveEGDxpJvghaeH61UmKMJkTJTcQzUuoK1I+vSy513AIBOm
+8vrsmIRJ/Qr1RR3dIsmPX9azKtS+QLwz8qucNDQb8IqiD7g/bCnOqPvD1icsVJa1
+0oQxhy0mnp1XYQLm2W51MijHx/9RphGnkxERntwBAOkgIEaHivQeNd1gFQxEJNbb
+nOFfMOsk1aqfCm14rXPbTtmIFGD6bHsMIxN4EMaeXwlzQZEp6rLzA1ZeJ0gBpUPv
+mEvvNHBuDrY79k2jJC61izA865uyynVpNOTWyu566+CXI28eWhPPuJ0J4IBAXglL
+vESX8iMmDHgGsWREonl0oKY6s3WadrtTD2A2n5h6AWhn76WSZ57JTR5+eHYgV/rS
+DaA9DoWzBpZLCgvXCvCxXIf9bAW8Rdgk
 -----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 42e6531c89b..8c89d125843 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-----
-MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
-BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
-MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
-B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
-DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
-BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
-bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
-CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
-OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
-dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
-Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
-6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
-e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
-WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
-Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
-MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
-SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
-9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
-ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
-1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
-1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
-g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
-92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
-JZSn6IpfkLAH4tM8WHSDALCJZAQ=
+MIIEwTCCA6mgAwIBAgIJAPsFplxafcOCMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
+VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
+FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
+DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
+Yy5jb20wHhcNMjQxMDIyMTUyNjEwWhcNMjcwMTI1MTUyNjEwWjCBmzElMCMGA1UE
+AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
+EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
+RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w6jJO5vS39W0lsd
+qwEigtwWvaUmPMxeWJKJlV/4ig51RbtaZDUa9eIpsIENtF33JHhtNat6gl4wKrwZ
+Jgk+fEEWF/9ZqZXbcht4T/HYsmD7egWkqbA5VVqrg62lXMOqV4mSwIl5sxIMO4k1
+iouT7hR53s6F300nJv5o6vMKapMNXhxBxDkSOMJN2C88TVebzSI/hMb4iNs+CMTE
+doKiKsN0lQEpPDwoydJRB3RwCYIvdGH2JOtAXbVcKZqDyoIi9dolMejadC94V9m5
+GXs2y7i0qO7QPEWjPeXvxnUZvrEHLS/6HxKhlQLYsP/rTs08X4TQfj9DIvfOEIL+
+McRJuQIDAQABo4IBBDCCAQAwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQU4DL6E7Fj
+d6n/7WfFD0zD9m1XsLAwCwYDVR0PBAQDAgGGMIHDBgNVHSMEgbswgbiAFCgrCn9R
+XBPBR6yEX3923g8KoS2eoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENB
+IDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcM
+B0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZI
+hvcNAQkBFg5pbmZvQHplcm9jLmNvbYIJAKF/0S3jU4zlMA0GCSqGSIb3DQEBCwUA
+A4IBAQBAc5mLwMOWv0vgHNEMZbmjj72BzcsmB+7VGGDBgoZ8vfz5ZbwBWMUKIG+i
+rG1MmH94WAI/OWYR7uIZfPxjnE1Jzvu2QefwwimvXThhj1z7cwjzwVdyIRmABQLU
+KFpr+YNLMjmqDK5k4HcFg+jWGj2+1BLUYB8ZE9AyHR1Fge5VO8PJlPNWedL5m33M
+kodPdXF8Eotn3gygY9QOS5fKDeG4Ds/ADqkAa+e/zt2LLX/V7XtCdgKk25tKgNNo
+7noLaSfnp66CofTGlRa2xAOFH0jCcdGQ7H+/CZWR6se5I2TNyFblr3NAEge29mGR
+uHRrX5GqieKNkGyxU9KPeiPexsY8
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
-BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
-MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
-B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
-DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
-BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
-bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
-CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
-OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
-dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
-Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
-6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
-e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
-WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
-Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
-MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
-SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
-9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
-ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
-1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
-1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
-g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
-92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
-JZSn6IpfkLAH4tM8WHSDALCJZAQ=
+MIIEwTCCA6mgAwIBAgIJAPsFplxafcOCMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
+VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
+FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
+DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
+Yy5jb20wHhcNMjQxMDIyMTUyNjEwWhcNMjcwMTI1MTUyNjEwWjCBmzElMCMGA1UE
+AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
+EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
+RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w6jJO5vS39W0lsd
+qwEigtwWvaUmPMxeWJKJlV/4ig51RbtaZDUa9eIpsIENtF33JHhtNat6gl4wKrwZ
+Jgk+fEEWF/9ZqZXbcht4T/HYsmD7egWkqbA5VVqrg62lXMOqV4mSwIl5sxIMO4k1
+iouT7hR53s6F300nJv5o6vMKapMNXhxBxDkSOMJN2C88TVebzSI/hMb4iNs+CMTE
+doKiKsN0lQEpPDwoydJRB3RwCYIvdGH2JOtAXbVcKZqDyoIi9dolMejadC94V9m5
+GXs2y7i0qO7QPEWjPeXvxnUZvrEHLS/6HxKhlQLYsP/rTs08X4TQfj9DIvfOEIL+
+McRJuQIDAQABo4IBBDCCAQAwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQU4DL6E7Fj
+d6n/7WfFD0zD9m1XsLAwCwYDVR0PBAQDAgGGMIHDBgNVHSMEgbswgbiAFCgrCn9R
+XBPBR6yEX3923g8KoS2eoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENB
+IDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcM
+B0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZI
+hvcNAQkBFg5pbmZvQHplcm9jLmNvbYIJAKF/0S3jU4zlMA0GCSqGSIb3DQEBCwUA
+A4IBAQBAc5mLwMOWv0vgHNEMZbmjj72BzcsmB+7VGGDBgoZ8vfz5ZbwBWMUKIG+i
+rG1MmH94WAI/OWYR7uIZfPxjnE1Jzvu2QefwwimvXThhj1z7cwjzwVdyIRmABQLU
+KFpr+YNLMjmqDK5k4HcFg+jWGj2+1BLUYB8ZE9AyHR1Fge5VO8PJlPNWedL5m33M
+kodPdXF8Eotn3gygY9QOS5fKDeG4Ds/ADqkAa+e/zt2LLX/V7XtCdgKk25tKgNNo
+7noLaSfnp66CofTGlRa2xAOFH0jCcdGQ7H+/CZWR6se5I2TNyFblr3NAEge29mGR
+uHRrX5GqieKNkGyxU9KPeiPexsY8
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----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 6eb92cc83cd..afcea67083d 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIrjk8sikRDiYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNaRYzIXuyYDBIIEyD5VQQ23kWko
-SDHoG3i1/a4ASv2XWsLaWmT/mpesk7YjwJcp8d+loy2CvsCRWpG9EenovV/xWUTU
-4m1T2VqNNRHwA+PUO/+l3Q7gSqWYNL6P3VWWH1NDv1g9mvHKfY3kwCtRczUWACyk
-DkMtyJgB/ioEWguOaohANgh83xZb5/lEJwcWo5XRG8NCwm6AVZmf96Zz6sYFO6OF
-zwj/zucVQmWB8Mcy4PKOYcN7ytiwjmrM6MsStGDeoJDLOgXZeIdgRaVwHeLiCFSu
-Jw3HCGsjzJS2zGxBetaEVzANyEirTTxKvW52gYHK4JAVi3oonvyu0y653jZ2NnUw
-xUvX4VZpT9gmYFsj8vw4Lhz6oa+VpdHO2/JP9UxfkqGzZNUgGnjS+KVkGMZMsdxt
-2XMi6ykg21DtjKBDv4cwTDZXWG/bsJmHeLibVnbkm8bJ9ZoH+lDFiyjGRNwt06Li
-hqN2EfqhbdsfyFjZ61y4G529O1fg0MDW2d6mFXi15jdmPTHhGmYRY2M1Nmzlvlkh
-QIPKdqunEb3wWic/Je/wFv5eQBttZuMKLTm7AVxjZVNnL6G26co5QkngV5cYA8Am
-BHKImxgEdzQNjJw5KNcMQqWflwv0QESBHaThxotfhL2zvOsaTG/1L9MQ4ztUS5GO
-cw2xJHmVc5xOZpVR9OlztHMjbn8MxqJt5gJ071eLZMKNaMQ3h0k+Q4VozSbQ0U9y
-mS8OyqqZ5uSug17RWTWmmP4UPF0s47aKBTb5DYZD0VRykxBV2OtYWQ/bi9oftsq9
-gpFiHgluqewb7N+uHNLaxlBOcsQYO6R5WoAOzTSGRZR3q56qT41qLNnykzG3JmHJ
-QFfYdpiiKu9AbXiIB24v9S6UtBZL2jQTmZ0cS0DpCnyN1JyjIC1YS7/KeIIOMIWZ
-uc6R0++c2Vqr5iSwfiBUPRpv5B2MEA+h2x2Tsvg8MSjLAX4hQyDXyFt5DeUsSSQz
-yd3+tHqg1pfLWI7OIzZPCZ6MYMaw9t747OHPwg+lVhLmmX/Ca70M8AUiclBFc2bB
-+GtP/xguSKBaokX2xLoiiQxSIfDwJ+3WjVO36RAbKAwNZwM2rzfpCom4axPgyHLg
-RLr6dk1W23FmPLIWmr8ovZ39qr8JClmOgpIMtzr64i7C8EWZsPKMyN+L2x9AdMaL
-qJ2rWL/mraqcRB1Zllk4Ibmuu9SxJZGKXfvxvqX7BbJUDSA+AjfzBK2dMzriKyRm
-lekw+DAthibY3MmXRNi6f3s4HxXX6rtG5WpvfXKX7nxA6HEHGa8y8RCDPfibgVbr
-uwbnMCYc6HC1Fj81dazQ3tMv14lYJd97mbu9AIuBuUds1k+7sXce0FNXGD2Oi1Bn
-KTF4XASx8I4pAWzM06w7xRraXc5hHYZ7tE9fjFxAzLlIZltDHA4AMkE/nar7OtT/
-fDlsVJiTr3D4NJkSPCe52BdgiijZlYKl9Tsy+iVpXiKdREptm2kEiK+g12ZzmT8q
-Vh53dO9ui1049K34FQoiA20viHYerrvrrK23hdVROVdqGdGWnXsSSrtz6j0GhTJq
-mLw8I+NZbjh5h0ROdq2/uGvnvezkiUZa4MWbbe5ilSY/YgC7pAdPwmwMeU2YyrWK
-gDPCWUGkZyp1nx3VXFH/Cw==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQeDLL30K7G5ZKikaw
+qvhKJAICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIBvr12O/0/00EggTI
+gIBz09prVWqiPTN0VU9kHOAnk0r4NZIIuG9XdzIHWHP7gEWZEwOuZ0vMgglo44Pt
+2JQI1F2yOKDiPzeD2Lp6sN+2rok2x7a9nxOq4fRsrSXyMe5jF72zG0wZ4NGE6aHB
+a7tW139Ur+EKEJQ1G/CKcn2go4riSUsFxmXxe3t0X0fHTs7uhGlyqrJoEulUsHNB
+e0q/lldLUl33cx1mexVMbj92B+ZF/hD/s/zJtY6Z1HLs7TnpZ+TrRMkrSLqhqyjE
+5TPBto3yLu6ID1TtrUPHJ/gqquHNyxvx20vG2yCow1xCPDFP5N3tbm2fPbCABBxP
+gBz8fsjzOx35KIUU0ywyUzO0jGe2EG6ZLz88PN1STcRCsJrafLmBFa9BJ7u9bJ2S
+WMqbX9PAq3umjRg8JwAe1R35sDwBTNICiobB6kLD/Lddj3GvSRiWg3pdfDorhfjG
+eNQJhrJ03gJ+BAquicCcHusrdsD/za7lwP9vU/eQ791s0veo4lwQjMQFxB4rnSTu
++FG9AQAY9PuyicXIZC4czEhMsKatabD9GB7keJ/RdPE7c8VHjPRyJmmeYRq/GmIB
+24yqYB1SqQDEPCZjHtqvlDs9Gv9XKrix4dXiVUIFH2QFXnXZe7J7AjDWtevYtfom
+121GYw34v+LgBPajFOmyA4VVAh/eaHi0Dq18/lzAMn41H8gRbb5bUyjB5yI2v5zG
+aSFumfdQh6vIaMOa3aJKP/jKbUr5VjNVt5uqK3lokxcCeiHDgwqIp3rY05hKr5WP
+CBUVxlNQHQGV9UUujLqI8Imno+9m6Pvca20/22ykrqco4VNAZHdq1/UsvO1Z12gr
+H4KoGlMpCu+fQVw5nsd6LNsrgYLl0uzL3sIMmYDMglJwEuLmjaYy7DxKIS7gmqs9
+C2fWTgxlkMsLLlGTbHdBuJaneGR+xaqo12izwpDuuHP0eXfFX6Os4QjscoBqKRc3
+yoRw8xYyAP0fmQMvSudtUxlODnsS660Rn9mu+fBSKShqp05FQ3aiauhXhe0eQnXM
+QFKpKF/ifMyIg8eo8gDUp7zyQN4UDVM3x5AlJMdG18WirjyGRXBpzCrCTHWq925J
+uhQjSZ2yR7na9ZP9Nci9Il0/BxNAegCkX5CkurC5xWcKFZEYsMJkHILBdHec644M
+8goBgCyZRk1Cc3b8wzhEuZP2RikP9VFksbQiPwkE1VR84vNey203tVZ0oPLIT7OH
+Yw29gCvbCqX/N0n8LRXQ0IrS+0ydlMfJhDKX97a8ve4Qi0JUNbit+6e2tNSVtt4m
+AYFeAkOg8CyNIM48r2HFjTcXRUZ+FHX5VfkrmvoDDTr+Kt5kRAzP+PJfMZIXUTjW
+mZHJHVPL7Sgk6y1McUHK5lfkuM6bhU4o7OJ90ewNv3jxOJOZMUZlHRhMLoRvJh2/
+L6wvsuq7dz9gB78J63EeY9uEXbYd3WE1Ph8/XuuMG70rHmkEfjCY7Qqv2V7Pbhg0
+IUhFDfCoY/2xtcLMuQ9k9zfBCamUbcH5kJ9zxuwayd1pVqrJRDXSkJbmi0R+Qh4k
+6EXOC3WU7jgHNZ/um87Dn3V2gBtpH0OtJPhWtkz5VMWvfw4/WyCI4ClPlYDZgJzV
+GTsv6BMyxjr3KyfyAD/hyzXCVR2t/vWu
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2-noroot.p12
index a739962eecd..c06892e4361 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2-noroot.p12 differ
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 7479ecd8126..050fbf020f5 100644
--- a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2.pem
@@ -1,84 +1,84 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
-BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
-MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
-B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
-DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
-BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
-bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
-CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
-OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
-dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
-Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
-6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
-e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
-WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
-Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
-MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
-SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
-9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
-ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
-1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
-1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
-g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
-92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
-JZSn6IpfkLAH4tM8WHSDALCJZAQ=
+MIIEwTCCA6mgAwIBAgIJAPsFplxafcOCMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
+VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
+FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
+DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
+Yy5jb20wHhcNMjQxMDIyMTUyNjEwWhcNMjcwMTI1MTUyNjEwWjCBmzElMCMGA1UE
+AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
+EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
+RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w6jJO5vS39W0lsd
+qwEigtwWvaUmPMxeWJKJlV/4ig51RbtaZDUa9eIpsIENtF33JHhtNat6gl4wKrwZ
+Jgk+fEEWF/9ZqZXbcht4T/HYsmD7egWkqbA5VVqrg62lXMOqV4mSwIl5sxIMO4k1
+iouT7hR53s6F300nJv5o6vMKapMNXhxBxDkSOMJN2C88TVebzSI/hMb4iNs+CMTE
+doKiKsN0lQEpPDwoydJRB3RwCYIvdGH2JOtAXbVcKZqDyoIi9dolMejadC94V9m5
+GXs2y7i0qO7QPEWjPeXvxnUZvrEHLS/6HxKhlQLYsP/rTs08X4TQfj9DIvfOEIL+
+McRJuQIDAQABo4IBBDCCAQAwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQU4DL6E7Fj
+d6n/7WfFD0zD9m1XsLAwCwYDVR0PBAQDAgGGMIHDBgNVHSMEgbswgbiAFCgrCn9R
+XBPBR6yEX3923g8KoS2eoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENB
+IDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcM
+B0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZI
+hvcNAQkBFg5pbmZvQHplcm9jLmNvbYIJAKF/0S3jU4zlMA0GCSqGSIb3DQEBCwUA
+A4IBAQBAc5mLwMOWv0vgHNEMZbmjj72BzcsmB+7VGGDBgoZ8vfz5ZbwBWMUKIG+i
+rG1MmH94WAI/OWYR7uIZfPxjnE1Jzvu2QefwwimvXThhj1z7cwjzwVdyIRmABQLU
+KFpr+YNLMjmqDK5k4HcFg+jWGj2+1BLUYB8ZE9AyHR1Fge5VO8PJlPNWedL5m33M
+kodPdXF8Eotn3gygY9QOS5fKDeG4Ds/ADqkAa+e/zt2LLX/V7XtCdgKk25tKgNNo
+7noLaSfnp66CofTGlRa2xAOFH0jCcdGQ7H+/CZWR6se5I2TNyFblr3NAEge29mGR
+uHRrX5GqieKNkGyxU9KPeiPexsY8
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+MIIE1zCCA7+gAwIBAgIJAKF/0S3jU4zlMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
 VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
 b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTBaFw0yNzAxMjUxNTI2MTBaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
 IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
 LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
 VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2_key.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/intermediate1/s_rsa_cai2_key.pem
index 7b68904cb27..aef04e9f607 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIpsQXF6x5FAgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJNOGri6uoajBIIEyPCSnk0ZQWcV
-q18M29Lm09LOGbMjPDu4iu+0gYXD1reZOtKkxokj+WOPVj/WUxz5ZFbE23WU0Rnc
-INPsQKKfsqptY21/vUNylWT7m5FNKBl6ZkuiC2G+fyJsykpnY+G3Cyl+QticXfSu
-2cUdBoJaVWQallWOrvGls23DO5m5P1UFHmlloig16sBhSbDgpLnDUqPYz2TdmhQH
-8gKYL23XQUGpidS0+VASrNA+AMkFU919cN3U6RnEv1JfUIB2R4vxLVhI5jqzRGDW
-K6XqxsYdRWJ0CVRHhF8dfOJFGyEEhi5pHxuTQ0kysepafU3ZYNNurhjuJSdiPhFG
-zJmGduz4/HL1zFqrjjztry4mok+QThADS/41GDt3Ta1jIHdtifIkU+2xLwys15Dv
-sErr7QNkr1ylFpli0iadAb5U3kRlIs6mFmiiHCRhDw8f2+XOFv6iZ2DfzI1ax8Nw
-rye6zXuQIbHiozI6/p1Bew31kK+Q7IsC4ucz1OmBx3od6/NlW+VQ9jO5AiVCqVFp
-LWdqpOBXFcubKdzuxPGPT8Ci8iySpWLRaQ1TToqJOGoxzXyhxZ+9JXj4E4nxmA0N
-xJJZzdypiYsot0zDsGRO9aLiiqx80qiIaHUkPck3R4uS+VAxiWqKPY+340W/vEem
-mQHBpAiWQuSk35yUUFP4YT9043Z8H3iB4yslZMMH7I5likfSAwOBedqFbf8hBcyO
-b+QQ1zou3SRRIuxua4aFKqFHwopw/btjOd/xaGhcW2rkQ/xcsAcLlOmmCK2N6/Zk
-08dRm2bQrMNzcSh/5YGiJFPWZgP1CuBfdeida5KjixbsIXyD1tWwbxZmtZdma+iO
-lEXv3iiNpzoEuqD2luv281/mH0JiEd+y6mrGw45k14I1tK4unMbozoZshwPKTnl2
-yubGNH5Vao3/XZmqjGyOo/5HAgAHXHDHWQlt1MNM+NUbM6JF6e0T0lDnBGxTDswh
-N9kerNnoiVNwkr1UR83l0RclH9Sv9f8gfdqcdnTtY+sRGp+Qddu7OR3fxmH2TQpE
-Sw/wXg62b0FiOYZLCLwzsCbsc8gUuZDoCXhohxNUJoraQnBYWuO9z47ptOaIpoxJ
-NgEHEY0ptwP/FGd+iMUcK6bYrn+etRQvD4G0mqT0Dy4ubcsNOQM8Xz1S0HK+3wjO
-VL7tJgDcwJscW1DbB3jxHGVfaTBxk+qKps4kiaXiwyNK9KorKfoXpmhv93rPtgfT
-A/I+eVAttCjsCcpkotBglX8O8Xe+HfxJJXuWrAQBG2wLa0SzfxaOpOXoqfPxR9uW
-hGIR/mktTKtt/E3QKFpKhivCrulBKMLSQ5hALUtjmXWH/+vt3dUZSXFVya+5lmfE
-RMqJ5e7dcihS6ibqj0e8BMzDvtskgUe/UkwdAoZiLcVL7TVPnewdpKvL+y+73Tb0
-CRDCU3I4f1jhWxOB1a3XmVyZxP0y1wSAicSiN67cNRWn7orACpj1tk0CWxGdVxQY
-e8D5jV5Fq1bXKJWDiVm1SCNO9nYXZkPWAU1QrHBJpMIw/KvGINSx223Y8Z7ugCdM
-HumcHk/679R6wEv8V8IFHAM8JsUZC6dG/MuyUDvPQF/HSu8e6W5d6WnZtDdqEOSe
-O84zQ1zibd0PRhI9Ax5+ag==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQhUjvx4xoz60pvObZ
+XbMbmwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIfFlVGOxL3O8EggTI
+ugrquCmpkZhPsOEHCzMokqJ25KEProLuQyxWg1j2YqMGcpMbzFJTkPAmNrgAc9Z5
+rGWNWTQF8G04QlTvlXoi7OtZIu6XVHJH5+TiGLcLotORsQYMc18+AnMb6QZuxoeM
+j0J1aSfC46VNiNvJfYL5U3XAjSJGY/3Kk+TN5PEhXHi51GFA2fSsL3gX6UUND5CI
+Pi4glZTt6IQ8XU03iZfH3P0IN+wt+WddFLDKxC84YAwEZWDZg65hwMWDVrtQm/NE
+uqxn27xYvGx4FSvjjtH+VzGFfpN720agFQIsfKzf5IipaLJdlPfmCBJoGGJMHi+q
+AGEQeBzzMV3KztYu4uTyCxLBuMofrnZdy5vUpc21TMyWKDFGTdJOJMZFoOgveff4
+L1waT8oWwKq2XnUymjf+uRdoZAqG6HKx90q7cIy4am3bq8sZq3LB96Kua2Le4cFN
+BTz5OXpv/C+xoTAI4AMsnkCV8YoB8DgF3rg9Sq+RGmhRgC0x6KohwRNfo8N1T9vq
+hPpcn23ytcK1k0B0LwTDxe5ZIGdudzdtYfSTZ73g8MwCfcjoUP7NcJ6S5nswVNaF
+lAlASokxXugsIz1p/6ihDkbAgPriLTdpsj9HGbP83kkVq0g42PV3C525AFNmYpu6
+9BYfdyktq390JMWESNJH+9cUrD56QPomqjzu0Pfq5u5mR4s9EC7B8HmKKMa7NBqM
+JMY+nYkhqSRl3CJyc14BJCc4V/95g3SyPORvRXR4Ad2K3VAHVAgs+A+ndnuJuDSG
+RGA4x/XVneskftyIcWYSGVDroibSdExfXZ2HKUN16Br0rYbmUrUnqSuadkP4mZJZ
+AI4B4YqAf+rjmvera+iW79YgDSwdK+Wdgb8BLnOf6rZIPT8UFcixsdtNKmjcN3uL
+LXbuIy4+CogIkRE14WqjE1ir3VWbSzeuKKWki4+I5DCp/Z4kzFRBbd3ke8J0DOJt
+tHxs3nZcwE2VCiwOLwb/auvMXpR9Ego2J1szraEa0P8AW0+s5atyscUi2zhZEDpe
+MfzSb5CeLE5nmbhJUiyF4T/tZVmG/q06xKvprjSIn4CuxYwGF5fOrhBYk7YUenFU
+uOLyfvtCD3ej29gtP4s4m8RtNfdHjyqhNQ8h8lgHaSB4RSR63h3h/ci1aIGVLUur
+dA8wgWKgOyWgFpNbylIxYh9bRFNRgb6cpJMm37v1lJCtAhmZIQO+NqbJIRy7CdDt
+otqHlm2dldIaXpGKSPFwhc6QxtRJa+iv2IRJtDZi/M1VwGfRwY1Oww9wX7f5vBLx
+o8cYrutBW1GmVrgclV8/lE7nT9yCyeqh9101tfB4iIuyWMB4FxveANxzY4JrzVL0
+H06pCcjuWD8LJmE2oxtUjYQppWdgOxEGOFN2fYxyMWWRNzSaeq/aVMP4BG2CXSBm
+p5xnDyPjIf+c2JAvP16i7i9BZU9G6M7QMBO+b8FhzRYvDJv1Cu748IB/sWkW9X63
+4JwQ5cbcx6F4Y9Oc2wckEFEn7Ra+QnRlOW9MZyX9WF5L7elLYF7B7ghOJbzKfMB9
+Gc0GIOKBiLRvxdanD87IPiJwV2WQpOk7UOCMh4ueZyKwtIQsL/x9stpZ0hn63AiF
+eJ3aanGT+CbMewmryofRF0uNifhEC4VC
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1-noroot.p12
index b5ab25f1dc6..c45df6a3eb2 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1-noroot.p12 differ
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 9720c8635db..4a34700e022 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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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-emVyb2MuY29tggkAv96HBRg/RI0wIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHpl
-cm9jLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAFoEtSN89jmjQa3d+/27WcSdMl7yo
-CtU9xQr4A3rde1N21S/MbQEELkS9HfPag9FbRNi3o7K/yHcNSHHzq/dEz4wFWELr
-Arkn+EDHe5C4TmdihSIPeey/QdVd9E3r7PfdOFsS+Hoi5tdINreKVxfwiceG2lVj
-y2XRHrmulhiDIt/QdSxnDFpH6ppmiPD/+jl35dNhqgqeMbSZm8S+bQXHxpEoSLlG
-G6eoKLOuLU0TwrNBfT+XnVhKDR2GYgGyfbG5eRX0hgPmSGxEmLtrZ3/tUsLQk1bV
-9Bc6xLXNotITjJbyI5W4PuHlnugiSgQyiwVS9D5wq/8Ld7GUbv8WI4yNJQ==
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1_key.pem b/cpp/test/IceSSL/certs/db/ca1/intermediate1/s_rsa_cai1_key.pem
index fd6529f2b39..9d96616fc64 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI0Y/XnG6EmfkCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJBN+9lRyrQmBIIEyNG8smJ7umfn
-j7FieSSbLb1I+KplJFODWzFJkNbSQ6t8WDKOVBbob4mnxvQuiSqA82frYBE46Z3j
-awiqfI3BMEgLL9fa7HRZiyoyQl0xx6iPrQIALEFZk+6FUecRdT3PMvARyiG276gL
-JvFxtHqTUu+hSWL9xesbtI+MAQch0uJCKb062yo8esFRSUk6KpsuMa5BiriKtqq0
-VMR65zS0rr9sqXKtMSqW3pU7+COhOc79xuEfLIPNJAP3b3HLpcaPV9IpH2w+SLwM
-M9TlJgHjuiP6AolodGCALoaP2nBurycAC8XqBoFXno+JP/qwsXTXnlfeo/7hQGGp
-XkVpoKfjuvLJhENmJw+ppbMMYVHutX11bOW/i2RWlaQuf4BZipZffNYBKiWKb6KF
-tr9uGmHdp3CX2p7CHHD7ibd4h5erpcryOme1Y22XMGlJCCle/yl9YgRe7T7HWAbn
-FhphJeSkMyTR7H6fSXbQzYTa+H1Bh/HXGnJ1ZBR6kUgXq7q6CxUyoikTtF+Usbdq
-o6xmnaEAEjrGgkmOgLUBoZLNKmE6tplaI4Ao0KkGDtgIQaw+PoA9Bd901kyboUT3
-m6gAr4FWWmTHt75Ek+Zl/eSX6w3dACteNE2gPF46TcIWdnVg/euZ5At2HsYWd4Nx
-U8w3RhvM+hEBK1Wi4FnrJQ/Z8BMoNxaeyCfQgJcEzDcmxhEOWVdgqS0UF8PYVNzY
-2eC37Y4jTTZ8Mg+4lGbZlvSG9w5gskCXHCmBDQl6k91ytNmfX1I2T91ZI/wmZ96q
-YMSLFS3WQ6gj2+a+s6HBRk/YA7LM4wy0L46mzlizKr+4Izfxu/l9XcxigDWniFsl
-/Zir7gdLnHPEveJkdmBiN1dTCYUiiGOxWKZ5dl1njXLGyBCkF3KHUKyX5/BOtgcB
-sbue+8cgE4dDOzLAH8Nt7eC/emeNJ2t4gQ1HazKg8iIj7J6zSp5QKrRINQd26rGp
-s9IdR3R+PCdlYpPqxW2DR8dOzJ9GrfQU+EYcKyeh/9oPibHEjbgs9G4WhyIUOaBC
-b4Eoepfmlp44L35bpedNAx4VptYv5HZxj5fnXM2X53nW3FwjF19BPbE5AhRiTcbh
-q1aRpBwm6pvkIP88y0MxY+lOf69OGuXeMJhzB6zr5PA8S5WTkHgHgxTYPwF8hd+d
-NCkQ4xH+S3XRkl1jJctqMwt0xdpYzrEdLVd9WR+7klMTV7igL9qAvoVy0gtPYEdm
-JOokC8P3m11M2dI0WlqgKOA16+Oe9sZBi9hFX/WFtq1s5ceAlhAQj/whEhC41mex
-ki0+kQHe8ZBymOMsuOrVbYsBmUiCbecG1AlDExm/BJsadipvH+YmlLpYpcxCqUw4
-Hy8dckRp7veXIr3sSz1efi0Ob2NlOCkuoNfcAuaZTh9QH0y4AB6lbueeUQXid/yO
-IdNofZi8Tp5hvxzs5KyQ5HEv7+x27bk37ef9DYDh/mBLt5P39O4cgRud291SWx98
-xlI7T+je84Hj1F8vxs7HNVMtAeff+unzbKrJQZg0UJNfIZ10OJJvj13IteJokxCP
-Wz0D068aTeeDzTHy0DUuBypqRju2Xe//da+0Dce5JzEScDCPy9MVXRSDEVTMyaoj
-56vrMKK9lgd0HnhP3SLfag==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQ110gAFBf2RNlOj0w
+5LCtXQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIkF8X+8HML7MEggTI
+WouJpUG3LIic1ZYxQvBMpGvrhCiLPEa+142vdjG9420zdh1cqH1hvvd/GLodEoDq
+yn1Kr9c+2vTjCxmTJDKElI5OUWyTMEdYpPpsiu/wwf/5rKKBvXNQUhCmb7MbSb0e
+0Z4VjA8Q5nujBtWLb46q0gqYoEEatzRI3R1hzVcgFtl2ULKbTHFkYMIa5hDxYTe2
+BbHmKW9ciM0evk2XbuGNKC+fFWEpTrfqWFb609WjoDxYHxsdJ5kLtgGmaLcfTKW5
+atcvb942vuNrV76lLk8Ml1spqTw7nCYRfmpziQzWIFReU+nuucEh1hDPOfabHyzF
+PuKgvuLrCbAUf8Q3qMLY8VxtkCgbsAjY8uE2kRqR5ufjqE2BLFssAdLg3KMMuYym
+n8hD7OMBuft4ff+eOhx2i3qZGG1wW+qB38pay//WtPYNJH/3TNL7uKeAtC4wch+O
+shdOM055mqvuzeRPYdvUKGhCjK0CbJrWXmn49Mta6cuQNubEvtIlHd1B2yV88mZ/
+jh1FLyI/8Ke02FpMBV791znTowGTl1LdLref9O5iotrSozvE/eYkx/g9b9xl1oa3
+Bk1u4LXf/vr3oL4I8tIZecbSqc3iDDs+Cdtw6m023yd9VDDY8PwMOP3WeNbWkY+2
+/vXiPKt21K3Ra86CW3fTr0UsyQC1y9kT1a72JcUbjbxOrKEzR5gRhTK3dGLaU9E8
+wNetwagkS2ETSHp8QLtNSt7zVKGalbrBq9LN9aXmwKbePfDsnBn12OFAdA5VUvdp
+vIOLlouI19w1mFYjWtFsrOPyJYTS6ijejmNr0mblMQZlPaZvv493i3CTOIIBINOH
+O4+xVxvPN7ayzbYoffTdvzO+6uzx4WUrkTNniAvaCkRb8DXbIyYY/70i2xGUg7YJ
+lreGpY4/m0DQHX7s/Ec9JhEJXFv8HlR9ZiubYXCIMSWnokaCPLTq1mT+T76eYy2O
+Zv3Qzu4GwVL8NOY1iTTxMqRUD6IFw6HfcDkQbD/w6SzbH7It7DYCC+dA8e8FOQ4P
+jpAQ5gHmjclHu8MHedCYMlMcLcnBHoTr3rpRsl4g76cSo8KBvrW59jlyJ867aLTI
+y2GZF5wKyl0w0fg0sOuoZXRMrD23pkU6qGrZO4g1Jo7sifA+XhYyGmHyHw9Il2Tk
+BG130dHNZ6s7mWJBBnfSmE2b8IgffC45IB0mkxp0I3fQ/fo76o8Sms3ERoUvDIHS
+N39mRie6wHgbnjSVrBAFGxtvnYVJgr9EmIDJypMziyC0K4zTWcy/YhkE9E3Tw+YY
+Nh39j4ofZ/cklo4lBGHFlLwk1QY3E0ZQiVZXwMUzDdpEUmvmb+rVucaNKZ9Ru0lb
+jbXGyul7iJmTfmEtEbRleXTu76wIH6Nr0RVo/bK2ZyunLrsIePbJBk0T3GPlEmLP
+N4l0xx2FvHo+bvrLIwvx0irM5A3DDxScMaTpcxB2NqXK73Jdcq8PXNYoPgHUpWm+
+aagjNXZUZGqNo++Chdsys/rF1JxQVaXhwQ8I3c+dhbOkvRQ/YUxWgcKE0GdwoW+5
+vzJfbkVQWPIaXANpyHKBrI1delpXELOvs40jne1x0LSv+lS+7e+qCUSNmifNyzeP
+NPPT5IAEaniIOGJInMCDiKihQfSFx4Gb
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage.pem
index bd9fc76d4fd..697c18bf81a 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIE1DCCA7ygAwIBAgIJAOXw5Ny/jB/eMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTRaFw0yNzAxMjUxNTI2MTRaMIGVMR8wHQYDVQQDDBZBbnkgRXh0ZW5k
+ZWQgS2V5IFVzYWdlMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMu
+MRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJV
+UzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCeZ2Z7PMHEp7mXzkmalZX3y2Sr8v7UGg5eFgPv0rV2
+IiBJh1Fvmm/KQRJfzRWSsfzXvYg1gBhekwQ+RUuVi7PcViey0T38TDaJ+6GlTRMG
+l18EeJuCRP4n1wsW9h1y/t7IBOYpULHu5QYkwhjjggpOvfkljFbkIEyWLzMkLZfd
+PVBJ8ALRZstMZ4UjSJk/uR6vnhb9+tUjdMdN0wOib7025LnoKWlxdQGG5C9OFrpU
+QCH/McTjqycp7ZI8hmz2R9P79Qn1TRLrmImenSBSdLBXRqVrNzUN5HIC0sm2ATgQ
+AhoQ2RWz+twSghRXStHRCnL3+n7yKJG9c8CK7A/8yeAXAgMBAAGjggEqMIIBJjAd
+BgNVHQ4EFgQUS9DsVr9gVOG+8UJHTLM3LoaimFcwgcMGA1UdIwSBuzCBuIAUjF6B
+6alfw5GTeeMoZ0BHvK243aGhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tggkA9/5C8jwaSRUwCwYDVR0PBAQDAgXg
+MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDwYDVR0lBAgwBgYE
+VR0lADANBgkqhkiG9w0BAQsFAAOCAQEATkvDlrd5Vkz+dAQRHisHZ0bJ2C6YalF8
+0apZjov4YmjrSr/jux7nzM8wVvo+CeANQu7QWRk1w8alhNDCuXKF2A3dL+ZZBnrp
+wV/5Oz7joj3bkltROUCVlI08XpiP1ibJy9LyreLx8TPZRvnTdPZz9sAS74pPVaev
+Gq5p8w2gvkomIrw5sDEYuebvoY5tkcAIronXOoQYoNWRhkQjSMNzB+Cyr3Ak63/O
+YCyL/Zl4eMAUtsmqLb3gnwqvaB4AI+YMhHk1Ga0gFQCC6wh6lye9eW2tJuZ8KTV4
+hSEs9Dlie42GGfnp682fAvqB2dQ9WJbWOV1ObsBRUNpbt9Hi1+/KmA==
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage_key.pem
index 16005d73941..49fa4d7b8be 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_anyExtendedKeyUsage_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIb/xKqM98QaYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNpZsAXGWBF6BIIEyMcphzW7OZVJ
-z48cUbyxHZ2s+RjtJW1x/kHjVtBQMPNuybEv3cXgPNxlAARY9r7w15AFJaEd8jDK
-pf3GkmVRpitc6L6WeDOPRZEf+Fqnl65UUJvkckhkuk5Am2nfMidNwOx4PuZOVbsL
-qqSxMZC3n6RrEIs+RW6v9Uf3PUyk6pAAuA1dwqzQu8LK9gEV4AuiGmYHZv2Y0KHW
-Flym0Ya/ykM7SXrZpRe7yw8AjCEeiZa4AU01XKPDnc2TF69DH2jx8xwR+fIb0qps
-u/jjhMNAPY2rdYJWtlAWN8RPuwc9rV7sBua/wRmGb47Fzkh3ZBMwMG6oIu+E5t5g
-zLBCMbG1jCisZyTDAFoYCF7AO6HvXI7n6E25w9lw//uWBDZfGTHejSIYVPOf6DvO
-HiReMp2DUUm3T8I5Fm/AjMFYTzEw8U3XO+tO3jX+LGKM6u+achESNx2NlW6zgQ+J
-bhTBRlXFTji3af9PugPWEkiHclh2sRcbjhn8mgNb3q0R94BYBaq1I7CSkXZWMM8+
-ltauDS+8zsny+HQKE3zmojagk3pXl5tQMTxOBsyA7dhwtEyz+gl8o05/lHs0lMjx
-YDyWKHaHyY4+rrJMn+w9JCknqnT4csDR5NhAq8bNO43Hcajj9/WEjqiz84jczknS
-1I1T5A3IvYjb0lMicCeNd/KWTG9vt5lRKhYG0PbBPogyJAdGJG2608hj1R7MAiAX
-ZJCcj58Xoo15W7g7LlKR+CIPoViNtrfV15jLFNlb06ufTxr2Gtc/WyWTh/4Zjqr0
-iulLBy7E13+ybqm/BJt+0rhZ9SJBZZqunyM0GqPx1x6p7jNYZk6t8LxvyBrjQb8K
-j3kuTsYsM0BK+4LyrnZ6YeJc/gXxzRUY3VxcldhGGEXuJE6k8YU3mqYOFw76E7Ov
-vIz00xG2eYS/TzXiMkO95sQaC6MKeN1pXH1aeAPcGJ/i110d0O3r95q4oHirj65H
-TvKDxFYxPlTZfezrN7uGzmOtD+I3cnuBn+RU8WVxRxCIBfvCyS4UkBfpmHsqaOBy
-szlEVf3Al6PupCiQsgOQnNoHT+98czn+w2qLN/Ihxm+2tUh8RC+o4GyRd99Yoc/Y
-bteEWj2LDXtTjYQ2zPjMKJnl/VeVBr1CsgrRitgrIl7GMSEC/amC3y8KJm4jJAKE
-T7+5fuM0TXjvusFo3IpEfiX71DghGsn/S57j3TOOtbUCeooStYPcOf4Th1IF2+MC
-odjNidUczqIxICPv+zGS72iHiXr9NuM12z5BJUijUojCD/t76sT/VVCAI/2Nah1l
-ccI+mGWBFcDu+VMoX+J1q+duGB05yZ9G/a8rJ7hED2AicHm/iXsl52DYmTGFakbf
-CGF9zDRF4URCLwWAKNdPtNx56WfC/Y9H2K0Wlafwe2YSPOz6BbshTCq8Bjgxa/cC
-ux5VryCg+X82Dp2jWt7QpxFbeJtmED5qX9ZkO5KLhhAF2vOP7NWVB9s16kV2wKdK
-IIqMUeMslE/7TcnHNQTnKWLOvcXqqUBpf0tqMOsvzWRmJ5M1imo2dA00zWC08ws/
-Dxo7dyMKXLFpGsvgGhLS80WmTopGuOwuURUV25O0vresLlDsmL3mJeCxBCQu28Rt
-7gUwIBxT1FrQ9AIZ2qwf0g==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQObvzIPcFAzj2p89J
+cuIWwgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIsqj4T3c42lQEggTI
+MyWNqpy3qfuvD3kNxFBSzoBvpLh11lnv9Br1TYPb2YKkGvmDLZkfoi++4/K5oOJu
+tCLrbS1cSR3Sgs7b3R5izEVj253fO/Ow9FStx5F+bk8wppISjvT6JkTRUEh1ZqMv
+JIkrpml1UixquLJx4+4+BRqJr6St7Kt3DAjK02YBMRQ8gzZLSQ0gx7rKRo/RA4KV
+DovHjHkcfYGZrEQv7X1oZUWY3xXH1cOsQEyVORv3GAmb6YKgK7TR2t9VzxOyuiE0
+k+rvVpCdK/0YNT35iHCaKgMVyPidrhbIRa34s/7jNXvWyxg5PUSFzWtZ9M+mWURU
+RzkPi45z3S89ZucA1u4k1HzGgmMewf2K6QUwHPnkL/9fJh7VKv09QztEPUH7T6R2
+sJhfV06+WG/hvaVTTOaJ+uwYWDjqo4NbsWZAa8lJMfDJx7yDKrP9bYW6JKoLfhb6
+dh+adtBywrHa3lVYXH1ngy/+kfXRLo3i7XMYmowC+YKFEXZm1xMotpkxGZgpbSrV
+Xltm55r3JKbiSy7+2MQNLgf271J0UMTrzY7HS1h8oWX9DPvE1inGJHxg2+qC0cDs
+0ZsUIXXplDkgSSHkIh4Fsj/WSMqZAVEuEuVDoNfiQ5GJChehJlvAjK9AdOuFe3Dm
+h6iSL/BA1a91sDyc5eFtqHbBpuLzFcl/qG0ulAEgo/U3PnVwSUTPjhe9BMz6s9KG
++VP4ayusBkdn3foOL3q/J5a7Aj0mLpSUJqYiI/1dFVT11BlYKCjfu+E/+A+8QC8I
+wz49SlhOq8UizqSt5zG3ET4zzkUjR+JaJqzO9YLakW3m/Vkg8ispCGJ2GJB8MUs4
+PNtKDTz8mSWQlsLmq/z6x0SZBaUT1EsJF3VpqtmfSv3WlOfI8AfNHZ9em/ISvij7
+5eUggiRhbSD/DD13/ZK/PEhtInAcwPlz1WOa+q1v7l/FfMVK4jCZyJ03H7C2BYW5
+zVbTKVEUMH1HIpifvlbdsNe7A5CEvw6FfWWJQ+AiQSeIXL8oXftyWoSQDewttRLi
+u1WlbBHYTXNLd9nwKmPLtxtgfz9RaJenGeTtLFf9J8rDYLPltPyJVfozyvETSDPp
+sI+uWvNo33Eq2xhJUFtXrlGXmfxjdI+oomBnS8a1RPf6aEOC4ia+GPfR+00SaYLO
+Jo+KY1ipMRTM0b0TJp1HWuGujVrXJdSZCeuMmQtSQrlu3zHMO/LDyV8hkOyX4nQ0
+P4woERzsXlwtfB9pRCkoOMjvloyTs7H7LWWOctULo1RmQvTulvA4d1r44rKrD+wT
+zyLsW8WxdjQowywHQh2YS7ixmXcvrnPpADClFY6F/8gFmwowxQGWg+IpwPz8h/3s
+pijcIUD3WlaoiIiWRfjV0IfjsGAWGeKRd4TMnPL1QuLKRPPTF9zkJbeozjJtZJKg
+a8KIjtfOpk4VKh4JrIFR0rQYXDL2OCxwB4blj/zTVfcciE9pHhaVPxntCWHvi8oq
+seCt991Py1UtI8kh1h/6NvFP21prStKgg+t/c5+4GsWzTUC7aCkwvtjSvNKoxE/a
+tpCEToZtoSj9YkjXHlFItwE43QRvedWwwFuvQO5sWzgRsXCa2S5+q3c32JInGEY4
+kDIgvbc8wnZlzpmDJIlWMsTWR5DVaD8S
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth.pem
index 45e70486abd..d7a9e2b062f 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth_key.pem
index d13220b4ac1..3728dbee26c 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_clientAuth_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQINeb7qFTwQzkCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNffniNugxRMBIIEyCj4OdLnMo1u
-PT/K2auE1FHLdd0k1tlX4uTrqBF5HxTvPzNFerhChW9JYP7OIo9CJMBRtX/sxmCY
-sy+kFOM/pXoZhlEeuw+v4XzhPU6WDQ1W+1uCtVhmhUEGXuQFNJCfFv9IhCfQs2of
-SICtlZvVxm7qIgHvd4leHj6FvgHGf3CyCyTKO9TsFb4RCxFND7bURvjeLN7cwiBy
-erBJycb0j45iG2mwI/FSgi4qaRKZ5Ad+Yh7TaKzWama/g46nQ/TYcjfEZSoKwULg
-wc8wcJpUCzd9ovQ5yoLhjLUZVFwjMIpGbOy5DGXQ94t3hPkQDSfNjSchX6lah75D
-awp8iM0FVhGJww+QcAbKBaD1NX8qdyDCd5vHhejG3BkLfWQrw1BZLdRbUNF9+ALS
-O91IEAwCP59a4e5UmIHCu0WLTZ47D36eput/vU08RnDRjWPekH5udCVJoigbje2P
-Yf+YV9LBDtY+eaThKvmqv3scoEwYhgkLv2buW337AA3QuNlAc/wz1RdRIYB6hF89
-/x1sKdX0fUrMYX2p37MKw7edJT+WYBG9eEX+DhKIeUxEorgetIV1qj2lYWlzSxbk
-xC1Eru9DnYdhSC0GllTlPgsck+jgdL+hNIV1lydFQ8KsFlpY8hMySavCVza+LNMi
-c7htp+dHRYqvMG+7ZZFsZU96/e4Wic2O1NVYLEarzAUdfN6BvSphnIP9PMFCFmW3
-xw7HVp3NX0wedcLaw/uGDz2nJeOrG8amemhbMlORRN0dsTe5zgxwcq8iJj/T14BZ
-BhtrpYQvny+FPXoizFYiVpW6c1npXHQS2lvHzvS8KqslCdshbNHP4Pm96mE7wWnj
-4QakcBZDvoJjb3vLbn5VCkcNjBPVW0QvvYmy9LfEAStFG2oxFy8Jr6JHPvOXWnfl
-hJI/4ENSFTmq/mRf0oz85QtERgpohnEsyNq7P9XOulP4IKJXrV+VO3KGbTuuBPgH
-dwsB/tshf2c9i6BOhjlHovg0UKbAUYPF4cQnfcBhdhSBq1UkNf4B7FJF0AlXE8s8
-SbMumWR94S+kfujEEez38boNBTeh48d9/+T+ah356x6bbkRZLAlsG23MSVbRv9NS
-h/02A6ifuAIiiSG8OIz+jqM6PfLxIAFNZM6T5WPe3LGKk7ER+NdeBpxG1cDPHsFc
-fju4NHO95L2f6qjmMgeTlwXYpZITtbKw07RQPgNG0Pm/WbWqphHfikzK7LkXwPAK
-oB+h7u0I+xwyh+u+EDWSkFv+CSPck/z3r16KzZjyiYPXQ/IYyJcxT5Ut0PucxtQz
-v+EE/+iRG6qbhcYx+qc0fkaPGwsiDVAEOJuHbVa4/XOZtgdxsRyjFVztPwFvsimL
-WGi2I6y9Jwccex6xDnae0usdLwUMCVcRa2xpTCllxC0E8kc5PUkHmZQ4ekjYKwkE
-xfUR2RtpJk0Lw22gp90WIrzOPeDxmpxIT/f/YYnbMWegxJaVS2U0k4yOVY73TEI6
-/qkrLW2HnQqeQxkiK3n0psh4+hL0VaFQ1X5hFalQr+KjPzI6e1DxewufYxPKCpWo
-XTQ18QkJSuQ2brL7pcJB+Wu6MQVowtukvkcPXnzRaz4Da/9Rk/bgwSAU+FdVJT/4
-U5EV3oVpppFfewU95KBZUQ==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQQXw7EzebCJQUxO2c
+nml8QwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIVhgO/4Jzx5oEggTI
+r13FPaQ059g/NceWvWsybluqqQ8FwEmyJgvjFdK21Rk5Wlo0k6fZY6EgYd7/rgh1
+uoharX4LT/mSzO2suxMy8Tw7QzVMbig3MsasYOWefoAthLW01smhIXGnqjaAZ7aD
+ms/tBKS9nLExbrMyxAjJlw+sMufUsOKSRXOE9LGMYejoAJzV8v5G7zt+MiUBsafa
+E1uy9OYzckes/W1qwOY4vv6TQ5XimZ8mHoKHZSBR4LL1vo31oamtjo5wlv3mb03j
+3ggsykY3XU99yoGEPbBzbB4YVD1894nIP6u/qmq96Zen2LtxHqVCiLP1m3c52Qbx
+rZ11Q3vXH0PivZ67WVO8GOBI0kqwIrGx8rgw6r5MNReynI13iORi8A8dFjh0zErI
+JSsgHNOXhLiYgjtbXQBZq3xw0TTG+/dX5yPuK5VqH46gtNjHVAE/l7yCsHjL6JBy
+cRKtqPqLCU8aOxPp84haCR0783vF9AdUCHFfJ+xMK0CEXxK39ZRRSs5hawj1Tw+C
+TL3s550liqoh6tQlXjqPR2ELSbaG60nUyK0QPWvsfpihPjEPJuAsaGVqOoVxkfZO
+k13/EI917UYV5LU7H1ijuFdj/OeAiztqV9pzraF9CfBhAMArsSDwDNyUi9yYT5jm
+1tIkc9V5bHjt2qCvmwgLELnNBwbhDy9LdE2Mma6ogv6jtglfQU9zX17vmIVp6pk+
+UtoD7wZ+lJ17VGMw8PrDPrYBjCJHF+ru3P4e6EnIqqB1pxzyAE4qVhDWgmccs4Kt
+giuARmfhYo8X/Exy+AitQKluXexs2ILgZFIc4AfeLa2oWjKIrQBBsF75oOqTLPq8
+yAJSoyB4k7vBhRiqQmj+J/ZUhVzgZQfJm2kW24zAe+iJ7W93HVQ3kt7KiAlwXH2F
+N8430qmoLLjVPZ3JmUF/DRVZKpXnmP0VV9qMj2q7z/L9xXzFHhF6WAjURy8DpukB
+s2EWTALo+RxuxMHGRG5qA70qHOOb75dIg4oA1xjnpSwQiqhgAHlJr0Eg6wo0PBW8
+ubxL+EU1gMoTlqJWUFXFtIIy6bArsqLoUPcy2gMFyeCFwof6Yidnw724XUNoXLwn
+w9bej2beBzO2CPguBVI5+4iH/9U9fXS4PyuFR6y8mAkfBXTKZXjUawlmKMXv6ZEP
+JMbGWNRVy7WeaUpGUomLRKZYMR8MHhojB0leg4XdzesdD0S9lXYYqPs2hEwz8QSJ
+e7M+zrnWq2sOoFGLwwJnhbDviTQCkQxPtKfWm540xyPZFWoCiGnLHtMl/Q69/6c/
+vo5IQmtcNI5h7Dzx4MkCp8rXzBVVzTnERLsvdBCrtVIE9d/DCKVT5xLVBOSfk3p7
+9jVLS4H1a3ImMKk5lLUhb2NqjG/hRUD1uJm0v/NbUqyNthsAT63UlVKaKtIeMWXk
+JLKueE7pPZO0lICIKzppI2xSXHuiXbUr0T0B4FnzUjhszIm8IKzjgYSuL5loCf33
+IOGQ1NODwZ9c4lVBlfNkSNiryC3cpvVHhPSRdtXzz4cLTd1Ptojj5k/YCbi+pL0f
+SvkOHekVcytZyi9tBiFcGfnQvMj9k0UYvAr8TPDe91xsr79myi0Cz4AOfrKeIVDJ
+RLNoSKpyoznSmkL07RtIzD3cun4sAzf1
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning.pem
index d4d3eb9f5b8..856af6b7ffb 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning_key.pem
index 2a9f5263b60..a0c48a7860e 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_codeSigning_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqhkf3X3uSqcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFtwmECyP7JbBIIEyBw0oPIo+n6a
-UwKqsdABDOUEhq8fxwQHuzrJDNbqNshlOnCway1pAqsDIHHBjw7Xl4rNOFWwYjUl
-wQTs73qj0DFda77qS3s9PvJeUctip9uTI6jS5BNgmpdbh+9bs/hl0YaAIw7NNi10
-fNEQCODHIKkB1/RKF8IOHjpSbl4F+pye52P4Oi3QHz0sa5KslPpuePg5wBjTh7dl
-tENXPXZViOKYcQfmTioaZ0bksKblWRTopHn/gThPt8/vsxlQddPdI031CrTSiq6+
-WeSCSVQxiGiy5dzCtziZwtbV7fXpwcrcnMHn8iZdreQWjuGfPPj8dOR4qcNfugTT
-/xEImAmcS8I7Kd2O84MsMIWv9Kj4muKw7oJ90RcnG0Gcwf9/fu5mYOm4Me6/z7Fz
-QBo6X/zVky1gB8Pd2ADkcABwHxVxXrKrvdz8rmB2XiookrjJjAH0EYGEb3ADLLsI
-TMB7i2pQnu0/Tivy/tq6tAzQfkf1jXwDL0yaX3TPcmtB+SmWxnfq+tGflNVKZnRy
-iXdygwpvH3JoJyc10BDhBCaOKe6ihT7Hjt72uvSOOxcBuSryd2/2+76ByBn6jTSY
-PuCgXQqQprAel5xTq3rNxgM2LgSGs2ChB6eKF9d1dg7NtEYiAMDqLngwb6n4Os71
-Oj1V1SQolUgMrH3JnkQ/Fx75o8LBStEPxyuWh/SXCiwJ0E2xZmlu+bNJDuuymFh7
-UUUbcjcDdPe2gzzrIjH4bK5uYIUZtN4A8T/hNNOrdJaxf/EFJqbUBoCmnKI3SwqD
-eK7uTmNTBjizp0v1OXxjJDgYmrq4SkUFxh+cp7xRP0v5sBn6ujWQcZT+d0kIZEmm
-K+CRdOegdd11ZGRJJ3mEbxQJ+xhD7Uf7EDqAX0d/yAOM2byHbpF8lb5/3SaCGDFg
-tTwbthblaWq+4RQYR0svF+nqYF4cl2gBFmaKzgnC8BJVgR/akE5nkm3+9kKtOIGd
-8bPCepcnlTnfpA87gLP7xj5kzHYE/I352u1Ug06N6kdO6284+IAEJDDgEd5bUhR3
-I1+ZXcfVp7Sd4EuSEL5FbKqF81rM+MZmdB1drSO5ldrf4/xQnGCcwuKTjjPckC2E
-VOA1GrFplt/waRT3ITUNTBD3K5f17wNvQkhdJ/M0QLlPekaGoywMqVaTzSeoPkw0
-j+FAuw2lc0AIxwQ0VO6YlaesE4huB2ln98G2zKfhRW8RtCDVlDQ6p1FNmdep4qQs
-VWIUkkqZK0uI6fTUcnjFMgOLeOw9eQYYhsocEeyKr4brXwNvfnLyLMrRuCwPSKgL
-5RRxNrK+3IObSyjq5A191qdid1tjnqRbD7sruun4gPKuLVwva+56xyGsIZFuVPbg
-TcKdlUsGpR0ZcC/5zIyhsQioWrLckLbEXWv0UnznUQ3rOrPTObcYpxaEXnon8soa
-mFOXiuuu43E6uwN67Vt9+K9vQPT+H9QjIUwALQu1N2VIaXq3ZFBFfs9r7DtkTU6J
-K0P4oBivV176Y82Mv+UEoUU2ckxXBn1297pK64xafnJg+EisucDqQxOfeeuC1UEN
-/sZV/A7nnJdRNh3PVaxI9WG/eepu22TVlXCzU91iVTNl02EXiLI48XqWqlK+jdRL
-TAj6YTSwu3Glte9RrWEAnA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQxeAGPi4+mS4NaD8l
+2ldXCAICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIWelHxtdHZHwEggTI
+FgjAtZ/WVR7k+98+mAX5OVFWj3gQaDsSAq05wVxQacogTah8y8w4aDwvPNoPpQY4
+fjg5CvwX5REapZ0Uj+uUkoqgOGghZDzYgB5m3zzPaqv6t8c6xXjMASY91/DEeSGp
+el1MV5LS8aMXda36Z8JnMD2p7SHih6GQ6gdOEY0w2SlZ3HK6ZxNbaT+ZQE/OqiOP
+ox2KKdGNTt93s/XWqMcW275i4B20xzkZWC/41Np5U82EVky+Ymzqf5PG1ZBPUDT4
+q1gwJLaDx30M5JeXDCzOMWouBEWK/+icTMcow0OGnf+noxw9o/HPt8kqXGgJwbXl
+QFZDS6xuuJvEnWyAxiFCuyhK6FCLMxM/jcQSwEJ331mOUpWtP/5HBVXfJHlfA/LY
+qqCALMUNAqMRUA1kzoMttETZZog6yp7nZ11Ula5OK4pUhLrheHp/EUupqEtL6ITT
+1mRvg3cRXzMyBX7o+ixEaRvOyl0TStclPTG6f6P4fE1ItEuMZxvSwa/JVYscLa8z
+1K5r+4XhVl1aj805lH443wxgN31GKczLfJStBMSPHO+LSgnaskMmDo1MTC9Uxzfz
+DY6/J0AQ1jekR4jM2RkiyAaGczOJsOR6Esko+NPonehNI++/KJtF5irDzzXuY9Jt
+/j32qUk977dJJNA/eLf+ZUS3YLo5UHkOIE1OepmhqCbVNXtLYhPowmBq48o72WOk
++ZzcO72KSioDy0bOA+3hAb5pAgAYR1KG2VLB8umWgpFGr0F7HVHHWWsS9pieXHSY
+XzGbMvYnxTod4eTPTjFOindte1BIgOfXpQJ3pUQxfs4tr0QLYt0KjnG7ycqaK53b
+dLinpdb7CjvjjGpn/zGVmrOHkhbQu3pNl5DxkGuqiA/iGRcLNn/x8uvZbBY21Q9n
+LAbeJnm91J3ekpnngs7qIzpNNnTp3dNqqmUMckFwcrsWCczTVgVDTfsAocyDPSej
+KpEalcbP0GFmkA1Uep6MwU+hRwKt1K42YrSheim5X0HVIxgHu/zlE96QJ1H25vxz
+xqwDAgWQI/8qpmp3984vQ6l4ZJDn2PwWmk5Q2Ehwthx3u+iEwM6g7kI2olKPhaIq
+RqU9KoeSV0kxv2ogYOiOY92tb0y4oyPNVcleiIdPB7/nkNME194CX13/CtX14DlP
+7ZkfIpluCy66q5n5GK6oioNhChdkuKY+VlwByUmx68Ug8BQoUlvU5LpleeAfamb7
+s7itM+cVTku9IXHvZjOY4xj1fIW+XAIn/Uumpm4/KHmdOZHasc33Ba7SEpVJedy1
+nm/LAdxUd97xiire0Y3Vzkz4M4vWXXl6doPjmIZRns0SagqbHltQez2WOM+7qRLD
+lv0ng+uYVsAUoXADo4VkAeKM6FVQ3Y4Zi5Nn9rRw+gULAgz3JOB5zRkKRIy3Xa53
+8e5zai/sRCdkjjViy+M/X+YIBRqlMJNQ4OqkTgHKVJATKaBwkJdQdohzJbmqwsnw
+6W2z+Fjz1uMVtZPLXWQPcfIZItICSgP4RzIfNZDHm5EhPiWLAX6juPyJAFVuvOX+
+tSD/e+aT7/zy1hlDxV0B9ciIDBX/0uJGnCLafWjksHPkbz+ZWcWFBYpmKiclkdwG
+0tZWvbR1EgM1KxteSl6d5EHk/NsgNJRJ
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection.pem
index fdfccc387d2..35a17196086 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection_key.pem
index d8268f6de76..13f95b7df8c 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_emailProtection_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIpYTWE926fJgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHwfyWmQHBrHBIIEyCzeoK9JJazq
-Z/+l49SB9WNN+Ltk7PQCW8klt5FtR2nkVPK2fKdltMHf2uFgb/TXKx5nEvh6r0NB
-BVtFD+E7giw7VXqdTERDgPxUzo0BCQPt6ce82WufvPy8GF4xT5xuPkK9kdwzrTJ4
-Yeuv7l6w6OJQDxTVycHAK2ixtzUrIcwch+s91nZ/uFFiAKjk9jSlvwhlvaI91EpK
-fE9GLZRRuBECPi3UNtA1TmxUg+Z3YvLeRPWdqdOjICam+gM3+L5jOpEFHmARXLbG
-dsUZ1+5vmhOwHbmtZc5ztOucf/B/qEuC51i4tmriDHdobTeE14nFzY2pYk/t7ezo
-4t2fSEy+yUyBVQ2VC9t7WQV1doNfogZmFfLI2PtTnbn2EHi1NiiOzf82HQ4xAcav
-VNSsx+ScOPBILMwNOXryIvzBwLRFdVnuqvpUPLmTJhM/IeAiP8GaxaLbWeCoof67
-4RXKcR2IiYn41kq0WtbdA2HwHMtt43J3FPvb53cAZqOkETJaQPCzKEBRl2UUZEok
-9zLpgoIOmUMxxnGcjRh8pcLpRC9B6TupUOVncw6KoZiIjbpTLcwVIsJ4mP9UuBLJ
-1pqYvTJn/j9T5Ae2I3nU8KZLJwKikUXTcUcSR+kqVBiVpqZPalzDB/harP2sjCYD
-T+z2TBSMjtOhtnCAIOMuAV2G2m5iknFSbdB4I6c/3Bi2+2nytXYNL0ZMCMo4ms81
-FXlQBS3JVK3mjKCGIW9VVF37MbAbn/vagsZ45qpllUwygEHi8Dovvl6o+aHa5fTw
-AzNtFykLnsmVU74NEdAlyumw8iuVjghWwVIzoRetlXxL7WWYD2Z/nC5LsbwqqH45
-PjgeQTUXcvHezCu6C/6s3hcdInYIptMN5GM31W6psUSGWmG6UH107m+QdNblA+cv
-1wRAyDYRCPhR+DU4KV06O5uYvI4u+Nz36azEQC/cRVCgLZGDYmehQRW/ZAScOoLI
-1bbA4TZWcWlZoAgj/kBkuaTw7XKoAbQecERPTsHPopmKFxWEBeoiRdGatjOuzHw2
-R5KxGU9HU1WUgu9FzDyLS6MLHYBRmwUuW5/7Y3uzqN98QJmMxBVmzZmXvoM9aGm5
-LmxB0A5c4i3bIu4lTovyYJTGD1vouHjyhA7xI95jV2Fle/ohFvz5bEwTGN7jZYmI
-FBXpbTTm4CKNQKg4ST+hq6EHIO3qXB34QYAFdGYqGnbYBQgCAi78coIIJbmcb9O5
-X+SovSNNbezF9jWxdpsdP+V57GkqbP6n2xa5BaB1BgCBW5BwKZAMcKs/xPqnKkv7
-9At+lEZtxQzlECdsRDp9dpQXLejoxFaPyWeOEWY403D+D5FJndmBEt4ba1m2VlUp
-Ohf4L+K6m3PZOsI3XZCJ7vaEoPGCQ336Dritzdsr+DYUZciHTqsnJ37EcZezgnGR
-J39e4+dYQHN3VgJzjbyA3xGMFQTJ4JmlpaqHTSCKm8WLFVQqG1MTwjWo7/il8cw6
-Konm2VeRYYvobjZO7INcUZFXO/FFRE9AIrxn1Cgcq+Ekw4JYv3uQeVYiercMol3j
-kD2QFd58Pmwxvx2gkGmQNfw2ubra4KGpenH9GPl8tb8A3D2E6wttQQ2Eej2ffeWf
-8NAD/ooG0KhnCDQsYDv9kw==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQK/J5Rku+UiTBLamD
+oHAbWwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIMyH0jGBtijEEggTI
+CJMjggY1+TP1p9wwyxyY+0t6HclLhU7todEYw2fn+I0ltu3ykMddiy3i7T4jh4Lk
+mWWDneh/FzdyN28HGQ7Ni4LtoX7JocNoPsjkP6ApmXMBLtdtwKiexVgcSvnpIO1m
+lKmHRuSwlCa3zPZbbP/GvjvKxA94DBpuE6yMJYmDQeXfVgijIRq+1i1pUSToliwZ
+9PvyhzU9WFVekWDS/a9Oxm5efxynFss+GKI98Y/lKIrFsX22Gon9c/b4nCTesoX4
+iuK5Uj+buBgz5nG9pVMSQJ4jIup4oSoyF9jJJoKS8Ib67bo7ZSVtygdSMtFYZEAp
+JXXDi/S1jyHZJpTgKLEW7MIVR0TDk3Rmk/SojfOkd++Yzw0CJYv1xg1xHLCU+bhY
+xeWcAgglczpKVQuzOMOB7xofzqOXRNsEiCsu1n8OvBPKP7pEMu4thbtsDxsyPHM/
+ynFljjQgamLCEhS05mWtnw0G8kp3gntpU025EkOAVc4EOJ7Ck+cJkYVptonhvPHo
+rO3C1FXrn7Ln61ydotYiaADa8HwUg7VEXOxNgpE+t5RRWfBDb0IRV/ycSzzhfAqT
+wdoh1gPtdLc+JS+gK+z2+HO+R2YK47u7/SHDmhqwmTA+Pcmw9pjJuB0ctkZoXQz2
+kIMAcQ0DLGj7gAyBsdyDSiyp9gnZgrxY0FdxwCGaztvx83m/ajCWbI/ePsH6IahX
+uymJ6bhtP0bgQVVwU5S4RhfmkGizz7Ebh12qFDKDT2EBvRLaOsGGBByflOOm9mME
+iI19/MVWshxfmpTeV0wlaYO9xu2seFNHrARzOi4GmEbxCOYme+K898KNfC88iCiE
+OWiMepeJ5so1/j49cL1Qwr/ZThtDZZ9KN8XUE080Fp6H6i/l+2Cs+ipJ2/QHV12i
+5cJvVtfjpdIP1Yj+i+L9KgeFG+xjedZNWiFpIu+pZ277QK84M+RJPyFvaIKRDnwF
+bs0qkfY/gtTLXIS8tpYdxhqe/oZ3dDZMKXG0OG0A+5eDFelNKJQfH8DBllnrRJ/P
+MGyj2nan2G66QtO/hXLdUlZAXMkrh7ArBCEgwx3o7bhChqCatLBUsTVn31OfZ6nT
+9CSLU2p1DSThEliDh+B9aOyikg7icwtTafvY3Hko9Cy1HFW3NOllB7DN6sasPEEP
+/5QJz4y89zPPgJaXqRSEeigD0s+Y9V6Kr081ToETZi1JL7DESRn52ObpRrcY+5fT
+t4tXVDxSIICTiizU7sDsLHjhpyvdeLhpiTRhuZOA0rYa9tHG+MBFngBbYlgxJyGW
+/DehZ9ZFzKHpQyxQOtvBiHoIbSBECGi0Lddr1Riy2WJLdpjVfFi+1TwJfFbRKzpW
+RYbQyzTUd8vtCPdSDBjuHr+/h8C1Fz8DHfq16spFHmD7ewQBrgHLVgNLAf3Xdauu
+bpAJOQvawRV3Fypy1p0rvOBNkGGoXDdmWenomzIAqA61HfE8g1x3I0cTs6dNEvpB
+SrO60eGATla9blJNNTCZmCapBamQK2mlnle4v6TYcZ2n6ZUGfRfAMKfyOjA3ZE+/
+znJuJ7cS+ONW2ffcfbCH5Y6Fa2vKh36WekMUlVF6b2qCWS/xADLwS6UqgBtfGXSU
+U1eF35hkmwdtRa/8lXYcHbsjTo27Km4E
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none.pem
index 36010f5ed77..df7717e7776 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTRaFw0yNzAxMjUxNTI2MTRaMIGDMQ0wCwYDVQQDDAROb25lMQwwCgYD
 VQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVy
 MRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYO
-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
+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
-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
-/HM8tJ0=
+b2MuY29tggkA9/5C8jwaSRUwCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiHBH8AAAGB
+EGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAA/sjKrv/7Hw190C
+iAvo7r8DuNh638EwoFR6LIOPbNhoAWmFl5anihwFa9tBgokjcX7MtQ9aU3GztHAM
+IEyEaE6qm51GGZPmHT20fpIU86GbcGqmb5s/VqUtwH23Ei+DISDetbQ/Kn/A7CNB
+rSCGUF5Jjigcfm+lOgeg8zBtlxwfFRltiU5adP+3K5tJ22X28bhGZ91vKhmfodVP
+SoLUa6BvijAS8t0xpqXI6xzVJ1h8VFKTBVTu0oqk4iV/nUclBxZErh1qIP6FrgR3
+I7twUrtnpFiSyQDJaxhpli9kqdhygVb1isWs3bZnkvXHWwxAXSP0zYmKahW3dXI0
+ncUA8FI=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none_key.pem
index c2df053999d..ee688ab9829 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_none_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIbTAdBrGVpYoCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOIC/nWETqCcBIIEyG/0ynPGPKJs
-oq0Cz5M+rfb0fsDQf1fyf6Dg8UuGsMt1Aeadu3VWttHBRPvcmKZsFsNOAScnYBwd
-7W5uHoHvjbMfwF32U7acq4a7vLFqZXQfzPwYXvv1/MHgtDzplZwVcDpiKtXCfBJn
-PyKug4eZX1cOfQ6pL7Fz+HHVJyiFg/QXTBVgfEi4BGdmfi/DuCOAQscAicVn6Ej3
-3WcfbGd0UHDSa/Je96yBcluLe/kIwjOjQ9UFE8Mk/A0MC/4rTe3Tz1fBZVISmZTy
-9KOkQv+yjuFUB3+Hsv0Eig4EGpuzYnlxKoX0Grz73D9f/Dsv/lv1d/92NmvIzg5c
-3kEiB0S7w47NVBFH5NZQ7ajAymzr8K99+tvWElTAvpBgSzqJqK+a3WWuEB749Zti
-8sEp14SbM+byASPIG0AdORGxuVNWbCb6ZSQxjfZaLPpApPHtG4NzCLTNg3PPQVQp
-a+eDE4N+4xEw9gNpQyVzRevcCHkJWoY+w/heQIzP2thGzyKLGqn92LfJvPYmZzQ2
-IClmrVHVmZ8ZM0dPiXiCJrW9/zrJ4E5M1kuNTmYODxGH1eayEIIVtr6bB/QLLDlx
-Jp5xBcHKF286p4VX9NkiSk0VsY+pheiIdvJKKvrLF6ZncAiKTyoqEDSHSQdbZBFE
-+YX6rd1jXTuXDpywpQ9VfQALA9VZyCCdndlV0NujFITJxzGXXE6RM8nCaPSAzuod
-HJa70KufU7g+ic2vipMrmKVrpBiLM0rWYFxmrn5ucI7VzIAnS+9frnw3zk/av18a
-QNO/5lcAT5s8poZFWrQTFRXDxTeHSz4YJAQJQkL3HHtuPszgFV/d9tKJjVJgxcYi
-YZv41hXHTDwhDJFhU1ZF933KWuC7QHHeCI5gP7tRDze5pq0n4yNfjNUjE8XhWXdW
-j/W0sZRmJ3NTn9zJ7FlAlZTD8zkhU1Syb2CjsCGjBqnjkdib+PIXyombj/c4FwlO
-4NM9KR8t+gqcC/OdQGVgAx9Z3G/2ZTz2rIIq2A7dYbB2NyVcEbk/Hlc+9pAEcZzt
-Pq3fAZ4gHS7ms81GWIrJcaSEeefKfjiMFiQfEI9EAvT/T4bqK5m7Br/GFAZVJ899
-Hksn5PEzvVmTHTbzeKllGpTdxpeaFW753x98LjgGrP08c9pHlq7WMPCasgyUZbYk
-A99OBfdRyR1I/lGIM4zN72H+2+EfMlHhQPfvBB7w2wmM/smjQk6PgbW3WYlquq37
-BvH9Ww9ihpXLnoLdueuU1F9DW11f9M7X6/h/W1kqDqJRwS++r5N2zcFp9wv9rs/u
-vCcTLZPCkAbsvpbwc8Ry1cStu/Ifvg22NTLUidCKn7GpOilRAWrtaDngHcnsmpG0
-JtJz6ZxVh7c51hL0dNWlaIYUfw+S4sZfpuF5BpzRegNKhtCR+EF7nVkdojQwND6p
-8zwhoe6og6yY6KNPu1T6NBgXOlBACapYmEuoMXuSW1squM4bSrBnCX0BEZ9mrwix
-nJ7zQyoc3X7H3smlgtvIvvIIC6RLRZGXBUVRYaU5A5PsV1eWd/NSB2EDXUY/T7Z8
-XgusDcBWVJPw+M2qURRZWlVN/leheeHbSbtFSzxNVTMvepjK0FoCuuVc2Je5+sh/
-i9C8jMeOCw+EsxKRNzTViQ==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQlRjeR9QgS67yD2Ad
+rEFDZgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIo6k9pa+/LG8EggTI
+dNOcriZwIe+NbwW56NZsxsY6IuL+Ts5jUL1XXRHb1Rj2+vrAl0RcIrV2g5ScEOa1
+Eab/RuJ45slTb5Vahp65lRDBjIXJputXGJERqNsC+YjzY/zjCzvRTYLIy0nar3s3
+J625VkGAPG4P3fA5iwwkLPAMqwO8J/zu1GHMkJdYPVL1SsXkoFr91pT8FwlAMRMh
+hpkeY6TSSxzsWHp15dRWcsdW357YhkWMWZPNE/gNHZ2hl4QbKdGP7rWkS+5pW0EA
+mbneqy7QsCDSVdsU6A2RDYwJvdUCoH47pQlvmK2KidzLQxWDM3sL5mF45FopiwAd
++S2uhvBAmBQ6JDV57k7gSmUy6EyhO4uSRgc/M2FIh+moUO6/+1VRQvjSFIuz2TTm
+9NzyBVapyycG5GsTGmeyG2W51l04SVeG/tuUMtOeSis3+lWuxRhzO8oi9R4gThNq
+2mAo+0GoOed8JXdldFOHFTYiptFgkHxUmQ1HwtxI5ig1qGkJW0kudkzsuCK2VMw6
+5eCEZU7UV0PT979WbhajaAQ10xayG/wF6qEiGGP6yF/P9nr6L9vyqDIwbFFhzQgC
+zg1aTtHU+FeOccq9TPHq+mUhjilryev1cMa0YYB4yThhMJ53EnfSZ6Yv1tobT+nD
+ki1evkghisT8PhSvrLRzAv+byEDbKBwA6fyXKOFmqHriUwummENLWCU8YMzzY3HT
+1nkblaN9yMqUcdXbEgZ8EGNV480j4I2p2YYoNTKB8mzr2NA86qpCjWEiUpB1lXXB
+OU4QvRmQY8lTaEr81ZTyy2tg5+EAmqHTZ7JEvcypr+htAx2MUrg0FL2lZ6NaOPjU
+0xerMCF3m0BljmpgcGMp1jUb6Tj6QUqLvLCaNy7FWfL0Jd9PYvENiXoPGFn1h/JX
+y2fGfjGnWg3rA2r+FEfOh6uQJt1lNOsqNahpYh8UwJUOnh0UIJbWVtM/i2Mukn58
+GEjxLRdEKUO0EkFvBfpKz0SiqYmmVBaLr5+0mxJ01yc2o4U+ptwsi9gzFTeYWX61
+2AADboFR4chRybXA34mz7p3O8E/RtSh71TPHM7a+KKatOgYZhrc+KVNbsFBhhCIA
+AVMp3v2xCh1XQOgiBLYdu6zOuNGS/mp9RuXfHemMdMpNlNIMoLhNH8MZStWv+jyI
+EWOlhBuzi+8BqNUsQ8X5ip10TSzd+sqeFhEPfBpxf0eWdWWq+iYyC9MYMHJwx1L4
+flIvdWNLS+B/eHtKY+HrAfTinu1FFfvAiiUb7eMRddY0E7/C/7dsTpKqesO2uSim
+/k7cacCGWB4qfBU7OGrrB36XUXPsRKkGGKrl0qjlKkq/qz1rXRMEe3Fn2BMG3F24
+JMHj9NFU7wbdBHy7Jtyg9PeSkH9ScM7BTpCVOe/643u+5n26ks5d57CZ6bhmCBcH
+2+RiYHOhPGo8R/zBp657dd8BOTk1u1AHuOH3Bb6Qf+tZNY3Sf3dgXs6AjiSWdWKA
+Rl+k34dyn1s3/4yra83q6D68HWAVp08F/CKgwcuePbml+F5mP5TObTxwX6sesLjw
+8B9jPVOJi7cpyaRjBFc8CpFRCLO4bgj6P1QNIChMYv/QT0JU4MFRKGO1Y5XzT+IH
+1PUIuNNfrCn/2RsVwEuceZ2I+xX4lH7M
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning.pem
index c7385ed836b..80911687af2 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning_key.pem
index e339a65700a..a5a069361a2 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_ocspSigning_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIByN45ND97Y4CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDWwNADEMPXBBIIEyIhWZZXALVCA
-d9AKKBK4oXDvRKBKnhFGaKm7uZNeFI4hSO80O18L96BYl/GOSEKiNaxSydvxqVX8
-+KxCAz7XRF7wldKYdB3JjhteSYxgSJO68jH1E5hmK4sSCfLxuj/ieDXpo4IsjsgO
-bq2OxyCVfj/qxDFJCjpwbm2i2FeBy7xVBz8uM2kUeDwXS39aDzoEgcMjVh/al0ra
-Ow5Fb4GoaK+y0fm7nfcdckSTZZ0oUVF6jIsbB38S7U2Ctlns45Xk2u+Ji1oNEV0b
-74B478KUqSaxeh1dBcwBql9J3VCXVVxRDuxMTHvmsiIOurs4o/SqT6rvWN6Rm3lK
-pXX+qY+IAjpKDSQ3rRF7gaJip+2bpWni08d1ETl/9NGh1Yeih7yoxT2/gfIW7W/n
-1fwE6em+JXatHpm+b/KKUyEhAvDpDOW7cWxpWZMm1XGM7hC0kQ6kSUMQH/zRc7kb
-qudLD/VnhOIvtWQUHevFtTO0b6c0+ds4uz5UEffiJyiMFNVCz3E6U3YGlVR+wBxM
-tOm5Rut/w5FGsGdQ2QoqwEKobpXVuO7t4S9JIcaqF4HXFARSEUDCjL95+Jn1Acal
-bGV5Sc5esqfkJ4iUKN/TRm8txvFN3RjyPyARykuaWP2yvEXPZupL5stlJAX3432A
-HDs+Nv1VEgIVCKgatibh3Z1w6xt1P6r88O+4+etXCfZpsJvCA67cZZyOCVNT+Nu/
-NBCHq0SnkGCwhnVRf3BZdpbnRF1OWWuD6WDEmtpvD144LJu9tvohvTwCckoat2cd
-Gl4Slm0KT9IZj81J/rjLwqedl8gQQ/lMGQqXfBpeIiirSu8oCMR9dLEYUMwr06OQ
-xXR+JK2rsRgBt2n7b41apkfQNpSHzuzZQ1NVZZwqcSVFi5PeRL3kXHYM92+6OYNr
-O4lT+/s7iCBnF+iUXg5PHxtBuuRt/EuTDGgqWz9KEOvbFvS07K5FsFAK82186Slt
-9QzOZBCPyoEdWLFQl0QDgolf5ATQ2bNc1EhpQt11w/jxVuuuCdkZdHm80efx3N9x
-hbShhXfYMrcqzCikfwJyNxyXXBg+8eZS9V0TylfjWigSaI1bTqzOdWztcVhgFdUP
-W8iqPs95SyALeAGlgGDvQqlZ2mJtL0hw3Au1qtPxLxe684ruxJH1v9KfiInOCbRd
-ILoRrtjuIuYgr51w8GVL8mC1bbmBgsuJguKTZ1isCTD/+YhEJW6RCBZ3wFtCC2h5
-auQZYDpTC65RpIJnCB1EPEePGGo1ol/bGu0UMnDlr3woaKm8hmWYB5+QdclQIR5G
-fZgxjRlu+vOB1FL65LIZpwd4dWdbmdTPLxHSEFvTvDYqcK1c7mg8O/jgTJa5SU1o
-KXm18eEgHeuqTvskieIiv1vm59rGmNlFJZq5mgQwCDcLZDbJcWMj/LmfbgaHOaHE
-48QGsPx+fEeIN48z68KVtsX0AVv3z1bg6StHJ7bnMidoCMr4wAHccIgsimLBN5PT
-BVoOOpAevxa8QTK6fBsN4hRy87x1tbf0AYggGL4M1tSB3/n7e4yNpwPJfsnkJ0ri
-wkm1IzOQm2v1QJuM3xp9Bdp/JRb2dH2JXyEMo9VtpPUBjOG6yovJrbOyxcLq1kyM
-Bwb8C0V968nHOS3W4YIfnQ==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQh/kKjmr/wXFDFmf+
+XE4hTAICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIK7PBNSQFG5sEggTI
+012n734NjAKmRpJi6cJv9rzXKvk2C//0HhfWR1iBWHDrqrZmvtEIQt/vTrqg6Xyx
+cURHDj3lixaRQ/GEdFJKGr/fsQEpuGqGQnhAoYWnkDxB3QcFn0zmI+DSiHWMi/6d
+Vkd2LcXhEiFELHI+PVbQLEFg2I4QkA38h2RHYQgFFOnCKORoqYrSdcogwnp0qBo3
+9vsnWYaRHz/fObimrCpxRi3PXJm6yZ2jfWrh0aM5/AMCdi+PUWNvRKHZ14RtQBRb
+RfZxsj/PnTsxTbc2FmSdGG+BPzpoNR2kutjLmHrIySA0F+NjYnmuziBi75vkrXhX
+haN8b0Ws+VLL1QV6nFz4t1pDQSX7MPv+7quSvXBWys7O7QPYWJLD+aOkSawVfyRL
+IqpFK7fiHoZMvwouskGJNfSS7D1gV0m9mZH6HWFRzz75GzZkH7Ay9kHjWKbCEMyp
+MAk6lhDZQrAdHWLx170+z9I/IDe990DI2kLaIJ7lzT4NxR+aBHwQ3bLBloOgt0b6
+vR+n6f6x/LfSS8iP4j2HA9pbPfJezkVd5QmNxIWD9fQJXq0W2NAR3e4MRmv8SU6k
+9WSVy6qvSaj3Lesj/UVOQod0GSABPkmwRDdprc5WhlEU4XTH46AtIxrFjk/O05Oe
+ZVvgfYlAHtEnxAEtSs8LTy/LwbxvHYMSQLM3++Ofbwh5rkfGdi9R76teaC3MBQok
+3aR08pJaVCZGXVfL5VCVYAJmZsZv89TcKNEZcmK5H/OjyMvjrsPkvWOELD8AtFBy
+11SHZU4PtvOTYORQ4Or4lhiRV55u8+6Gsa2tNvN1XIynIyEenDqC2tew70ANk3hc
+unaVIhCg4KiOdXXN8i1EXk0EKIKvQ0Y2KC+ksLvA2aL17Z0Q1LH19mp3Q7O27rQ6
+bKcK2tGcdtdmcLeI/CvUpU0vZ82FGPZDXhX6GnF768SNMA6H4XmRt3qHFH8L5BRu
+wnFjAcfUO77m8ZuuXSXQCetsERhmv95+7rvvBdtfJ61YrjFOeGCaxDudotQoylZI
+/fs5gLDEgEmedxcJObfUFhCBl2xi3DBOeHIRUdu+cx+gBmOzz9z5pmD/M6Vu/gPL
+4Z5QVOE/xt/MG2oU/bZUhKWH4IDB7pobzqXdJItfHyRnMU4l7Qp4jyxp2BCKmiYm
+O80odvicOtncGUAeKsh48NHsIRsctZIbRUWqdDr8beG6GC+tVp22hF133S0oTuoJ
+WTKCC9LZYAqBD7CKLOpiJwvpSiEVYhrgPKNtLuxjbwCWwlnAGX95mTcylLQHTmki
+LWVWgiBFmrs67bQ1UlxorL3IOOXq8UOPieMDjUPpdhn8Qlm/pT04Si8S/fd/oUAy
+YiFsbIF4X6iJqSs6Xo8jGH3k+7zPc6ViteC2Wm2bFz79aid9FZfMSlHjdNsgpSwV
+B1qwv5Brrqccx984l1Ev/eUCj3tT/BK093AwlbXzKTD6iUCViN0FMepOGJqXmHIZ
+azHu3+siI2rRCLns+2K7R/aiJupQ/GU+Z32dHqf8r45WnwbMiih5V9T++ckHnMFr
+x/1wFkPTxvBWhO7DnBbPwxMVsY2XJBaQTtOC+nE72cz8lxkQ+XjBrL0kpZtAhvbx
+9lAxzcI1/vrbTY54Lnn3116W6U3L0FNx
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth.pem
index fe4e4457618..4b2111c9d81 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth_key.pem
index 1e65804635e..a640aea1ca8 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_serverAuth_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQItOJurCaeswoCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHlHI7grA3FmBIIEyOxdYobmWHrf
-miRwa6+CDXCoeuez6FMjAzh/rRe9e+6DM1ZeKl1QJB2j9pvNOZvtYJoNUhPbw37j
-vIEGZHkhjbPaA63Mu6AmQo2D8N0VO+UL23WHmAwe5OTEL/HCbqW9nEbuEvw5Rec7
-LMpb+C7sIkQQu9lJYOPrPca9WkjKgX9YH9tlZw+gW8BhUuLSQzw9cgu31LNohSci
-i+RIFO74J2W7nRrP1hq6/Pp600xwwWhEEebf/71CPz9Wfq1tRycyv9YASGK8DkPA
-FXJbJtuSW8hBYgL8lAq3XMi37ATnmnalSLuUzkIhCin7mF/NCw1OVu25jYEOgFOn
-FOY1lFa17jLmKrq8Kki22fh2jBR4x7wdb484i+LprVzg/WVygmDqCHaiYrRKkllL
-e/WaYDLyE0Do5grSHFt1mb63XUbfO7H8hUf/K92D4Zd+qDzXzCqdHh+q8EJ2AOwh
-bmmfVhunL6vN05LkpaU/1w2Lw9gQ99qgNDy9p2mG8HGAFqp+FuKCGo5CQb+TSs5i
-lNZV6qDSO4hMLV2/f9g625I9dv2y84xLtw8ITDPGL3Cq0MwyTEG+xc1GRX3snuVa
-ZfqbC76yNqZhT7GSEImz16jEbTQ+Ucw8IHaew0Ynf4hquCeUT++uuQ4qyV05x+Fd
-F+vosRA5mF6J3BUW8ymJnl4wiQqmRF5+2dODTEaQl5Vl99owcCGcqM1d7PO3L9LT
-YOSqinXM4dXQSOCM1eDw2jYZ/GgRc6a5SyXwac7B3x7R9tbZ9izw9VrT535QnN3g
-pUjWHKxsa0u4zj2Y5o7cq0+AUbpDckeiZrfu3IC0OgBSBzDH+n+GM3k9+/nytJ7n
-0hvDHFmnKMN1CXCdS3MqsECOwFAE7CfS1L3Gw7VUqSJe51tx71oFsUp54VEI+P8e
-r+qpTtWdZHI/PwA+0Dx4kYErUHQqkXKIrRuRX5opLXbTdK5sX/stbix1XlA7kU6i
-E5vrteLirnxg0O7iqvWoIdN+ArPO5hW5NAxR1H9UTCNlnVAC+A1XmfO4u2tMfuAV
-73IPOX0TIOWIoS4PC2NnflD9NmzYi2HxoBJWAhHtmYkhVD0dAbSLP+V/smareUwX
-W/Oj3RpLAELi+MmAd4LkeZnB/nGh/qX4//nCrdBWvkiyxvmzLQD8e80GNG/g4I8h
-4aZhdvzkB0zjdc6EtMGE0pSb6OaH5uiCQ24UB2fcSMGSqxUqpEMLVdbwYRSJc8fb
-a9n6BmwTAWBia9dy5wlXP7uUvdrXHDcDkrlAVEc4er4egow/91XTF6kv/rTJQ5NI
-/mvdQVoa5C9yQF/n4BwsseU1/oGaWm+n4biXxTXqpChv0vBX7KsmlR3/lRC5rZ7J
-pgTcUbpdpwpHTf4V2/2Frsu/Ok06VShJCt/CI1/R3BP6ptmHzwzc3ss2LaXKIdRS
-M5mcu/6fmBRdtd41jchyKvKaAslJbLeM6mQkjgVRhTg+zg3UaoGUKIHNkuZ8B1JK
-aQn+Sd6DsqM8BMSSzJ2VHwLZFvJot9cvRDF8WlLNfl/cFGgWQg3cnwlvO5ekEdvI
-UqOHSM+FH8ETcv0VnAkqmQ1VrJ0I6vjR/7bNSag07N5Wc8ExQz+pKSrDBfFKkLnN
-4BxGH2gGsYTHS5tPVSpRuA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQhbs8ssXLATycSfYs
+ItjUrQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIIEIUHQYvGG8EggTI
+qxw0mAovlLbZ2ZmSxoc1n6uwbp43IfpaF9ZV3P5zmNxfi8ueRKNBLWY10slL5xWT
+GWU/vT1trpXK52pjEZ7Nd0sP6Z3406EcESDrIH3o0i8ydGddXU2MkevuyFe9ttVv
+GMWpEiKR/bGFMEgUIW7PtTQH5BwoId7GlOjRc/B4a2qGI1gjwa70IyZN1pq0aKPM
+pPzh0OnBF2Y9fGfHPeFkfHB6auaIZyZVh2xTpC8n1+F/u+/Mpuwg6P9+6zcDvYoh
+1whG7euvn5b9NVb4YqP4ZC4DZVLJIKa6/LCmIl8XsZP1Anbhz7USRPs0N/KwY33Q
+cnfn6OhKm0Zoz2f0OKpqWfP4hleYIUXhvAm4WZlnUtaMwjslmx2T7m7cDy5zjfdf
+vO9laLYS5c0L9aj4zRPBY4JF/dziDe6VQOUdcPj8s1EPS46z8EuguPDI0surkZWo
+grXVhoTVolNpIilY8Xw1uTTwxp/sIDkmlBwCPtEBAX30Uv7D94+Uw3sERBSFWmgn
+eUbwzWEfsnlCVgfvF+YEj23KhaVnHNMjh7hjLEVwkmf7meMtRDhTDebD9i4NKtR+
+fTmwMYJc245UcsUOUi2JwkO+5la+gz2zDDlwkaFO2GcyQgkjpg+p55PTE8O9+hZ+
+PenNC3GWGkACNGYnUpzHOf7SR4OCLfO976QuAQt2LwGp8UuE66WGDgJ1K8dgApgV
+qYWsQqVZLDZGNs783edvhTveddqzJDiuAoQMgJdGGqu8y9ON7kQDddPilj9O3v21
+tk21jY/YeRbQn14M+6wKw2zFG+jKUp+DxhCMjWNd4ox55y9+6VZINS3N9vaBu9gO
+XTB2AtE8NiSbY9mZeAnt61fUeUmDy8Xx3VM6ZZpxK1WI0ItUu3vTquUiTss5FDFA
+XdpnDd6uaCbUyOZjBbCo4dANRdOkSDoNbE5KlCRt+FAVyZC/3gC/5RWDXzzzqguv
+cmEsncmmYx2zAeu7/kGnshIAuySibRxggvRj/BBw4dUc5/XVJjcjICVzbQXeocTD
+LqQyfdU33uGMeVcc8osMiE+U1XIo8efXdYoSfzt+J8NwgMtWxKsUFAz7GQeQtVbd
+mZgDD+9XN9ujQZjU8YursfJrT983xva48S1fEj+xvqp2dDEXniknBOEi2EIGWx5q
+17px+s80dLzO8sOBLDA4hwMvYeAgg6ktzYxeCAX7raazjcRfURyCey9zblfUn6pP
+4LO309FZ/je3zZX0lbeRQwJ8PXWyVGOiEu+6lspS3FmnqaZm+B2I+fffviLTyG3m
+jAlBPIgSZEli3JappDqHwX7NpHPbAtmAOpwL5gusLlIBC3XlNpqOE0cSuJVUJwKq
+9m3QumSaexmYTZTE3wPjQ0IaiPzQVrQsZzSmDVQcUqV3wz0QY9YXrjP9RO2UCnS6
+LpOe4r/DfzbsXDsjHQ6a59/opT+G18Nk51lRvx68/hm26ow6KlQjmhhFne4uCtux
+1hChGghSIlc8AmINDw2lesykXKaUGxb7+r38TlbgCqPw661vvaAdAO0kbzokfPHT
+HHKnCcH1Y0BUu1XvSw7/YiQIlIb0CubvuiXg4AREt7PL7jM6d8AuCcgmMGn29s23
+eVSyivUbUEWpMUQxmwsNgukAL5ENpomK
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping.pem
index 74ba332d449..23536cb28bc 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIEzzCCA7egAwIBAgIJAN+JSPDHKAY9MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+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
-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
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTRaFw0yNzAxMjUxNTI2MTRaMIGMMRYwFAYDVQQDDA1UaW1lIFN0YW1w
 aW5nMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQH
 DAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqG
 SIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping_key.pem b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping_key.pem
index 669d4b9f7c4..b914733d620 100644
--- a/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/rsa_ca1_timeStamping_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI2yT4cvxloAUCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLXwSHQ5mfMqBIIEyEv5qmN7+436
-ScLwpzLyAMUk3+hNbkqwa/muUBrCF/fKdDwEUBX293ARny+1ysK6/yoMenhitJhp
-pbWpDBDPAezv7SkTisuJocOfvaDTcMbHBznQM5DqzBHoHH19jqtzEddxmaEjOEfc
-1qdLcAlq6eb1IU7qG0w7To/4P2bEUo3iVbMh/ath1PQ4AQ2u2pxoiq+XmvmlCIds
-T04iDDP+fFVu4aZKDSHQynWTorbdkjOAX6wkM1XBtQqS1l7XVNsQhHbRMBmyMNHN
-CCPUDc4ulbUpSYoGZkFkRIUMdyqRCNEUubqptgI61FQizlIP3QDVxEP0C/68NhdO
-tkKbKhDs+0AZ1sJUvfvuviQdHnwcAkvnUZmRQOc1woc174RgSbs1lshqTE+93p80
-L0z/oq0lRI+OQV5rZ2k7KYrkESrZpOyirZKufcEhQPjkh2wILft593r6DQBVelGF
-ghN+GloDtJI7R+Zo5iU7EX2aYGVgOGzs+C347vyzORikb9GOzbyNk44IpQ4SAvo7
-ftgnQ6inj7YJ0K/oLWBenPtrAELRkJjN/DtU8nUAbVtaIdBCvEmuGcQQX5iHHAgO
-wICF1n9Gbzv3la02F0iiRn8494waLP/EOl6MunCvAD7wPNjkZA93Fm9NePvVbSFZ
-qd0COOKmzy+iVjTbDUYuODFG4PfsGzqmpjCZoSe3pSU7JEq6u940bDv4thNQgsuV
-gsaOlOH8FMKW3X/d1WVWVXy+3RLNViwtWXsDVp58xbcylO99KwF9XzO+SMIeKvEc
-yS4dxtka95y5qU9lhdmGPITELQRDEnREXSuZCAD5c9ipAI9YTPkK+T/ZjuYW73Qr
-MCARjjnw0OPX3rg4z4WctcfHg0u1fIqFb7OhCrh6WQC1WgGu9P2CJrXBeFgbEg4h
-MURtSVQzp/JOvCshMaBJNG7dQMmf8oXAbuu1EjJ3dxa6ujXrfvIqvUKptwjpR8G9
-e/PQ7UkkyqTHx7JJ+vLUa6jopvExBBy9TpiBYTuyqWLlT8AwW4LuPICnI5zF2w0m
-JJtcLPTo3M4nnjbuLJ/PsO+wugvFmSG3ffOW5WOYCPtNwsFhrdEVAGi4VIeXLZ3+
-2auoOdbwFZg4RA/eF3/znZe8jKIwa0z0GgcnoxVDDvH0CagXmAOvQPD9/WpGWu+Q
-vB+7GHDigOrkWhMM9/Qz+8y7AsUoKDC5t7lomE6oQ+TSNmel2iIkwE/yCSszUXor
-FwM9GIYqp3fuXIfdA7SaLjGLb6yQk0QZiictxUVo3+bKhkji/vlZnM7Gy5D0bWha
-8cidpCqFvHL3CoNFMdoE9lCDxFZp2MlHko+sd7lyE+fb/q0YHh74IdVwQyCl1KAL
-4k3CeNEfGy5/twfrKDa/ZN710g+cyk1YotD1ieI7Ew61teQdbayZu3K44Gu8Sxlf
-ujq3daxL4Z4L8q73URfuVGOlUf7MSBWhEAuls7oTEb9p5hz8wiLb2KjVMM4KQcn/
-K0LK5OQbepqEg+pgVwRaUNelK5Jk/g3819wy0TTIU4F4nT0dR97B9i+8qhovBecW
-WhPjUia2+5I/wMVNLPqltlysWdGccgx9qNpZYKcudmhoQ4i62LdYHUddn/YxpMlk
-0+nDpfp+fj/vH5CarsUVAA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQVpRWsrII0qfuNzS7
+8y19vgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQINeWCnrxvqNEEggTI
+C77u4DjvM4zSkChKh1SwP2qQ/60FS88QXZJGp+4XRksWW2ccnBmqbVrzMBNl/W9U
+zUtHqAQ418PPRVeGeJXfH1OA0rBcZBqT7D9rkw7rmqWfQIz9MYHch/hhtJhEuWVg
+Uo1vFgEpuxVYFGzCF5b5qQ4XlpakWm7I+P0tkpUND1WZ/ckYi+eEn4LaofbNu9NY
+dZpdRlVkeoeNlHx5ZaCCC49ZUAcVGOintnlHdsUJRLrF03Ufc5vR9Vk3fDybaMXX
+U7LkmN1ttDeQYKfu/M/DE8DFAYt4dIPZ45D7Cfr3CV3e92CVA9SjUDXaPmmdlPPo
+lc9Xe1UjKlftsdg2qcq74B3EtKUN/1rYI/4Ot/oMtiodQ6RDLPJpmTt4HfRK52ZG
+cwhiaq+EBJedjtCVGF1AMqQmwTHKymZivcNq4b3At2HyAFNukX4bNrhUp4B6PVqU
+9llccJGmPhPExdyBqHwBiWLMNeLgwRcPuO5tIs41Jeosv36qK4+H8c7Roe8FHjTy
+tColrVKIRSPgES9TGMcV3/eYijdAeZbUAF0OtGVbqy9g0yMgAVS3BUrZ21LSCTQ2
+Msw8LvzruGhgcC2sphNdJ7WH80xMcPzgR9fCxu+mAQMkOvuZ+hRhQt6ObIqYqK9e
+LqPSRhWhxDQkEv6yno3w3iepLuza85Uxh1oUEH3501JLGOtdPImEIXUhb26NUyue
+DjW/M3DtAVrdHtIGXKj10Q40jzq4d0eNHMVa7YJ0Jjh7Xlov5VJzzj6DcqBV6LjK
+3+ARTrsFIypUA3HvFxpZdLfbQoVApMwOfyzvm9FH2NIs/W/xQGY7vjf3zI9MysYB
+yC1fEwSHYVjEW5OJWO6D7Tvi2bYU/NroHD66BC3OnYzsQtRv+ucXKppgstg8gzY6
+cVSO0nzNSRjJRFaFm18GkHBUa9piLDWIWc9LIP13TB7BbVpUmMr+pWi4UWbEv159
+0NqV/0z7TSrTGYSnhufu8ME2F7iMhfOimATxbEpx0BLVG2V3H9BzrL9Dr7m1RvSI
+pTkZp2omq0pD2U+wulUrfUoNaw7frQQyjVFB8bR4HRtGLp4UHOZOqebdhVqso4zA
+stMYPNtYJy3oVMA3HDcDj62x3SvIwnLJZWm77mo40OfkTWVjjXH0va0wa9JFVdNm
+MXh/+9cLh01A8X3OOUmwRaeXyApk2uFbr8TqCcbyVIpExCQTUfyHddoyjjm9ZJrL
+a4rChKs/Fab/CHNW81HkomodcXdoohMYccvm45jpya1PYmvp/CRzXCPj5SzAQpQa
+KzId8fAZTznHbYMNQsYLsyBrKf4qdS5dN3MwOGcXN9WgJw7o1wenFKhdPhGLctKe
+dp+KQYbIAFbks2t0tLFR9dFbgIkmJaEbGlFveWPbKxDLpmQbhAikGzbHuAnETGiH
+lLQOnvup4os2/NN46bP74x8RJCLc4sGX6aIuWZccvMjRi0C2QZdB+Txx5oQZL1VI
+jQJD/Vh46lR9zsL8us9Z0zpHeEFyj9hpzdPMcNGvIzZb57htQu00mI4q8Sw7lxTf
+KvoklLBM0ZdHVdLstscZj+oLcoOoP7ZN7G3alfNl4wO4hftn5CFuiPNMBhulI3jZ
+EVL3seSbBDVvydR1VtLzhgcLJoS5fvND
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1-noroot.p12
deleted file mode 100644
index 6ab6d6325af..00000000000
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1-noroot.p12 and /dev/null differ
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1.pem b/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1.pem
deleted file mode 100644
index 225476631e6..00000000000
--- a/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIIZgilCUNqEA8wDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU1MloXDTI0MTAyMTIwMjU1MlowgYUxCzAJBgNVBAYTAlVTMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQ8wDQYDVQQDDAZTZXJ2ZXIxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-qdycpG6Pbn33zhR6QFZmJlhDTN1tNsw/1g1G7wcGKVSQvYmzeRuRfEa2MkH38zcq
-4l6OD5rLVJU2RvUllb/3VXfjnXquHFskPW9o5t6qe+wFFCuK98/n3CiB7ni/hf7d
-PfJZgTy6gW82onz3PS8J05NPPEEsZSNurm1SzlFPlPoQvAF1l3jncaW6IMGuv7Kd
-5LgJnemMCGAw8tEDq3TMGkXoLQfjsl0/dvEU9j4G4w/oVJzylrRgtfo4yX0Moh4d
-eZkS6B7/Y2yLEoWeMUSzFyOuLAQZkSHiEs77TzEerulKk53eDuCZPEWJlKRNSIqO
-rGGK3YSp8fmeULcdOwJ7+wIDAQABo4IBJDCCASAwHQYDVR0OBBYEFOXiBxEvQJkn
-NK7Q92HfsDKP3FAcMIHDBgNVHSMEgbswgbiAFAL9G+lvTpaPDA6ZYY9FSGsrFDwx
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIJAL/ehwUYP0SNMAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEF
-BQcDATAXBgNVHREEEDAOhwR/AAABggZzZXJ2ZXIwDQYJKoZIhvcNAQELBQADggEB
-ADgNjPL2pPYvXdb4TaDiyf8AZxCnIRclZxYrGaY0H9ZILnONHzO0WjIJt5nw5vUi
-cPSUVNVojMgWcFm38K73treYq30gfikjChd8QX4MQQ/f3dUp+DJI0ffz9znGklMl
-atS+j+HrZozpW3bFN6f5mWQJo269B0sBQOva2kphU2cPTM94B6EY4udEl/lSD9Ta
-VrsIZu+I4AF3mZtN6z2elhi1FHrh1+0aCPVlrHWX5jJCg5KUdITNKV1blWXK5xLV
-kLzQJmJyuQo1ba6lUVeGaXTEf9CteyYJCQhYmuroOF1xtcT6YeXsE/yE5nQQ66fq
-2c2DEk+QRiSNYapb5OVU0UA=
------END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1_key.pem
deleted file mode 100644
index 21d8e0e364a..00000000000
--- a/cpp/test/IceSSL/certs/db/ca1/s_dsa_ca1_key.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIvBOYZPlqlfYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBogRgkFDisZBIIEyARf++AP/1Lt
-T8QZ5IVgfEkG1OyCubJQARYSYWyQMVKzYjRb8rgiyRYRpDx0uBhc8JRso8okMJWG
-m1i7Xl0IoZA+olkT1313/l9ZHO7DicUwuZ8tMtpJFK9YQir9a7f0+GOMLyEw1hlo
-skjEfhRW/6vpyAbqQaPydMdrZbW54XR7F+gec9UwEI3P4KQ88J7T1OnsW5aes5wB
-ZQZOMtCHWDWvZn64/eu2fn3V6m2MwVBj+JZy6dYuu/6vJIhYGXwPH+cfGIb/xACZ
-5kc4VlwC32lPROG3suRtWxGZRB1cMzmYkRUjNXrtYFyQEvPdVR2gvsegfQL6qm4b
-nsfY2SkV/rjbH1EFUERGhLZg7i+s7mA7RukOuc4l2R6BuZHH87orAvWg3uXNWvZ+
-M/bP1+Lyv8T47SkccXugPMXJPgqKP/YPCP9qG/mLHhkq/OMQ/tGd3hlqIJHAKNBS
-mVWLCy+SEgzpkNIOXIE2b20kMOXLuJTnO0o/TvJ5I7oPL0pxgf9y/ck+wd+Bb9FP
-Wtbg5zMKQc+GR7jN9x24dSu5OqqDksJ9RuoKe2lVelkk5PB7uQqFsNTvE+l6YFQ+
-x5UQEmOFmEUJ1Vzkucr3wpA15FGAVZhMt5UZ9cxqB2z380lWdmXlOQtmtKGA4eSw
-8ScT1UkJuzuy3Rib5DyRgDKvPFx/qekliC1GOdITPWWFr69SI2X+54Xq0RdYtVWH
-3QR/kv8vHvqrSoaRjw3bTn7PUAnSgR2Z99+Pae3kyyVwiM4q1vW2MWqNrW2TnZQZ
-NGG9pXY5GR+uJ3xIO+3QZBR40g/v0s3SFzqySARQ/jlMPRv69OhuA12hmpGX/KCU
-mP7Fg/Z9yXSBCzYgDNHN1cHsQua4Hepq3N0uI9gkPfQKCta8abuFg1ifqMXKFaex
-qVFNnlIqlPSwS2gSwo6v+gqCPtFmTX86H13LeB3MEYap/VyRAZMH201k6bkll425
-onIzFmerpKpJcR+fU3/caAGhzgjsqAm/yAtvU+b3YoFUVbI5aQN0/8EBW8LaB84M
-eKFfxBi8kKHGlGEo3ENsNvhx5cLjfYntfawQ45kHM4G5YKT+++/JScmzeUa1y7Dx
-raWz1gI5kuSkq5+emTw8vHt+RIuETpIvwD3zk/zxfsbjz00E/HYlzgXsxTEymQTN
-MYE2omGnphLOmx/cF3oI0qm5k5h0J2iIoOhqDcC9mbOQ8pcu0XPo6GOWhdy0qkL6
-JHyTVEiXknJibyz0Nn7t67PxlobZ9G+nXGMPGNvOdrkcuyj0izy6hHOyFAjItQe+
-/5F/1HReSQx37FyewhEsyrxV0mxZa3eGjXfY20bTcjGe3iDG5S0nQETjNtlgPscO
-vsbcxyjK9LbqJWreXQtnrtr45SWivXeEONLuc1s9EM19mZryMmlNgwy7YS+Se5Xo
-wX5gmDyMJvEfb5BhvL3pBuQrgkhBvGDr1W04qpZPRXPBnCGxLJodHyiHvPKQFDSt
-e/P1iEW+AsMwxIPTf3kleg0gLSsKZfQUoTm/3RPb4eAMW0g/TLMMBMJpYutkYXkX
-e7KV0oaK0KaFcF80Xj8UTQmmSIUgDMPVOm814rIaTJs7RgeSidilR5jmB3mvTuPl
-tR71ClCavSswLN9AHAzPAw==
------END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1-noroot.p12
index 01be57a9dfa..56c087ff969 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1-noroot.p12 differ
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.p12 b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.p12
index b380039dc4a..ac0fec62623 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.p12 and b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.p12 differ
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 2d0f4276151..cbe5364d663 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1.pem
@@ -2,27 +2,27 @@
 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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1-noroot.p12
index a3f35c34f8a..b45a2d83247 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1-noroot.p12 differ
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 c02a05b0ac5..ec9e45f3e94 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-+Q==
+DDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEApDzODP+JEwWXFF/0MY5r
+2FiDsl0gZSh8r7UYQkYl08+o/yoNqB2RJHjEiiTOqrF959kkgT/wa5O2rQEcVtPJ
+QU5XCBjmb2UIirNLm/TbexuZXRnTjFVGS+9WfJX4qxC6qJ8T8QVzbmXJmefB6iYi
+8UjMEhMIxO6s4UXgpz5FIAnaxNWsgHKoGCCCdtqlBqQxH8f4A24ee4x9BcPQtG4f
+00QaM44feIVSBtVAHKq0dgDCTPKG8ibc6knMjXum3xjUL9jTzOrqrNMa9wu/4dmy
+UDbIVEz/xv3HIBwx/HjrmfkPsX10nBbhOZYoxS2mvwAxcN6tHxH5mXsc03As7mrC
+2g==
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10.pem
index d1f5c52184c..43d7ce47a4a 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-BNVR0NxbzV0=
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAG3NO8RVjHi5
+mbmtQ7FSLpm11mmeCYePgJUT7M/7o4zsuKzn07RUZa2vgu2ddQB7qu+Ep2nq0BQd
+Q4bTmDCmna3ihj57OorUGe3lbel7CxsCLIkHgmZhyLj6uI8bgOWGxq4WN2qQmizh
+/M3sPh5/+wToul+Ke0YGq+wI7M/uCAtKWCO+CHZ8d2GXywHySf2fELoBp8cEtd7U
+UMGbHPsxBX86AZJa03soHvVGbpf9OKT4dHzFANCyTZn41dNbiKgmiYCePxPjFegs
+eMJGXMGuDZvty3ta7faj7dS9EVzLl9Bwpm1+mnrIGny2Vn3Qy5E4eOmZWkb6blsX
+cgPlyqG5YqI=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10_key.pem
index bffbdf405f2..3e3328b30d7 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn10_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI6xRMxdaYQFUCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECD0YNqG/kLTkBIIEyJpRse/9SBiG
-dGbLwx63Ppvs5cbYLPRR8PTQtmpO3o69CbPaWgTEN0q0yiHfDCpsiA+6Ng8Bz1xh
-TN040U62qKhH/ua3I2C3Io8zThTFg4HXzBYQSKqgtxBGotbTKgl/oy8LwFLqZiAL
-lhfAWIMmcrusAHswE817/QIje3+xEwOJpJmsCRc7T5OqbfJ5KsS65JsUyRwslg4N
-M9Es7FJhVqKcbWzbeZlQ1xoZp8GSvy2YAhmdIISvbLGcX4EbPpkmWv8ejeycNFpu
-u18dZcRNnpP0ebeCrVXVmi3kBCn+fb7F9KVBXJrbvEbUooComHzRavrxUxhqZYjr
-Mu0oA6NNpf9GicG9Mx1YtYYtmCvKJxCWVq/508t7UIpqySLq79k4knY3u1tyl1Jq
-w2GCvQx8t1zKIG6r6RlANmBLh4A4gfNssAg2ZLjTq3rae4etMqR9t07R5w0By/cV
-lBWBE5eOISffFy65sLGKDQMbY1UVbwUZu1XiwJI6sDgUyd2cGetn5BFuJ+MAElZr
-p5y/fOG+8hOBOuUXp0oZZCf2clWl6kfXCuA4h6KsW1cReXezkc09LNFJDjkToWHM
-t1Q8BNOO8ou0+Pq9YKkP8OMwJFZAlscqXmGrMp23jcMZNugngKd7Ivi5jiRKJ1Ly
-WqBSnG6mXEuW0Ln4XirAZFMMjH2KwCosuJ2SpNDlvxx7m0oJIM9x7E2x+YDSKhdO
-K8gSz3hZD+IsWEq/PGYZA3/pUkdqrVhumP3uYMB4+lzrEUH5aa3tpUHoY+tj1yuZ
-sXBqFYtfUY27Fpps63KeDnrRVno20QdySzjucUSAk/vrJ9MRoUVE03bsTWrGOdmf
-eX8grw6WAHFPoqPEDi9LBqUCfbMEL3YFryQYkgwiUofuQWtb4iwf/wsa9uyi9AiG
-UmL/4dD/dAKESq5tgrTcr4C1hqmb9GhKWwtCtqw9KfLvaGaQoLKDFQr7tQgeFkFz
-pSyHnMsMABN9bjq9ngZPkRs2XV1gn+jjzJIsqq/GsMWBBFZN1rj/bDZKwyV+AWQV
-TtIcNRD/0Jdej+u6bBprj8V6xYK4q5PRxPNw38Mm/lr+Dq4fsHCJLJ/NuXGG2b7W
-39ND3eCAFXvDEOHa0q/ZMiH5ZZAEKKLGBME55qrmLWnivnsyoyRGQIX9GPtyR3xP
-9ymp/txylvggHuzTsooJZ3oxYS5D//jZyLG4J8MD3KUVmajBIvIdub5+rOOZrGis
-3dsyK8cgqTPWaASQI4K57dvBqWGs62BRCWR4XezGNj/TjoULVVZkqNgQwcXI78x9
-aQO4P4EGvgIKfXHP6Egw1xlIphm5bOsFLATwfnZc2Ccb8dsvL5E96lxLHJtg4Sop
-qIfZbFHmfny4zOWp363XPFbGPaFjy/myQYP5gr0eoSsZ5YmAI/yH2lsfK7B9DIcx
-shyITi0nNPKM8ly8aAe0QBS5TjKHoKztsvY80Xt3clyzzKkIJ2VasWqfUhiytokX
-INtyK8kaaBuqfUfYTKBSFq7OBLyYD8VMgUmxNIjWNozvvi5RapsaNC9YBiWDZrxJ
-vo1v7HJowN4eR4Fg3Ja/7H2G5FCpb/K37lm7qxTVDaWMEARVokpZzJ+mvebl8Zbu
-cuW5e8NEw+l1SHorqzihxg==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQH50j4aFWoN5cUR4W
+23uwUQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIpnpYK/EbfLcEggTI
+5Lip/s/V9GuHbA9YH7CryV6zZOtFKEDNfcT+x7niFvPb/DXWUgenpf5Qk8tUDPTv
+WvJTfjUrVGZqOLrBkP9TjtOetRSR9NE4IDEI9ESt63Hp8h0jmCkQgwNE8M3IrAE6
+QdHuObP2+cRwIhWPz9aMDhri9NDCMpXyb1XY19WT7N8OfOAD+1uWB9VXyYBsY7Xx
+zZ2KtjdT1ECKpRyHNM0KS+XvJr0OY54ip9D1urefQ1uD2nzcGmst0EXu/4VYswT7
+Svn0iTfitRYnUnXua6u1Ob02Hg1CB0xzvGdNP7gVHB97ARcG5mWD0GiTfOOqZaIp
+SfPcMx0HmXrVj+W5XGDiXdhwU9wV8hL1XrsX2MO4bm5aae+gf97GJWPjEpenznPX
+Pov8BRzO+gIWjxictOcpRD97yNy/NrysyvpxOvFE7uDR4o4Yh6HxGwug4Qu085tc
+sOr9uwEm7pTJEv5CHcBym0OFnK20tlibepzNyZwy33LVJtTb6LJpEq27WlEI89Dh
+bPWMRkHD6UthObdl6wqaSXg4hmUK79kwqPiW5g8a8IoS4CkTnoV++3ywmVKXNbi7
+sCnES0GM/Nhm0Rui8zA6eGpHNbkp4cPX/QFdoC9cKW48bd3rI/ClXKRMMWNYoKGj
+6uuqRX6JHccJpwVi829zBBbx0qCpxTo20MqrpnMBB3ojMxquVQkATBqx7+kUTQOQ
+HxOQAyS9gaNP5zomWpDSvHDs1vXRd1VGV2pYAXQZ3djTUiO/qiU3U5QuOXd1+IsH
+INO9z51l4S/Ywu96S3dSTYrp2eDfCM/iQ/ANIFDC4knCYqvGSF3G1qQh+3VqklT3
+3+JMqRKTHkbbSnyd4QQZEnUJmCHBPZQPvUTstJAV57ANjmuyuzCbB5luhZLyUoM0
+MYqDt2ewfsjvA49PG+zAaDQynYbhla/WJvM5IIex8lEGyL4n34ThRRlENgr11L9b
+9o/RHshgKiu7CV6Ci1S9+Mol3tbujAei8GXs4YiVHgVE7kCmnK/s9LMBeIRMyNUA
+f0buZOv/Ml3VtlDALLXBCSmLoYpf6ZBWqg99sVMY4SW22b6L6qcX/JegC34sP201
+XIVXkkrXoSxhtAtWhmaj9I0P5lvuvfSTbquVHU7F/96FdX8UD7oMSNXIAah8hG18
+bXcTWWi7MnjX0o6MEV0DvvEYDrvaAS1WsTghHzXY8eUnKmbSKIvy4Lv4V3hPQnXh
+S6di1TE55ZyxacZaZ5ioZEoNvovS5pmja1PzwAg11ycVEBnxASKrZKrw0vdyLYE3
+ndRqv6A8V4FE9XEhZV7KmgQInsg1jskAtTaMuAnxH76+g8js5pqNHS2MrXT22M8M
+76I2INlf7mhR+XwJWmBMHutLflb9XFUOJNBTWW2tLZojr57cA0GTP/wIg7bNSrCX
+pX+0+aaHHNY1m2+RD2RBoYcqzefea94JtMLrVM5AEFDYrZXRp4DZc6LXivvCUxU8
+YXbSB/yDsqu0TfBI+tnRq7sVSb4rlI7XWFZTCCQmQiOiFxrTE4pGy+DlfejctMwt
+wSihzw08+OeBdNZacobuA7El/8SKbDm8py+OuyCSgJrr1H9NTEV1W1QYpUr8U7qD
+E9u6koARZ9X19G7A3OFSABTkrhVo1qwE
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11.pem
index 9f8c84357e2..87ec1ba8fb4 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE8DCCA9igAwIBAgIJAN9yWOwaa559MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTJaFw0yNDEwMjEyMDI1NTJaMIGIMRIwEAYDVQQDDAkxMjcuMC4wLjEx
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPTbuatApcb0+VqUdDypjTqF4Eoxot/OKmCC5ewP0Hg+TnbEuQf36btEP2DE
-dBucMgOeD+u39n6cfbYx/Cbz2FTG4Sz9DuoVGtn9o4FpZDEEWq1YIwl8SirWunKw
-1nnpK2mB6HdjI7MTjpB/shJ7qfCjbhkgMGOjzSeT63VrjSCDEmgwymN6OQF2mUjE
-oDJmmEtyPpQVd7HtvPDrd2XyFYXcXHNfO31ii1fXRJR/Yo3uWxWtkilTrBj7+R49
-IPT5g7vF1S+BtnNYB/ciWm1hRvMbhBBwjIwtN1VSiLyuRP6jg83Pd529j8XY41N3
-n5L+XtGYR9dPDMFxLB2E2lOmZF0CAwEAAaOCAVMwggFPMB0GA1UdDgQWBBTXXnkH
-ZZ9Y8golGVkPgCpJ+eHYwzCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhr
-KxQ8MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
-b0B6ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwIwYDVR0RBBwwGocE
-fwAAAYcEfwAAAoIFaG9zdDGCBWhvc3QyMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
-ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQAD
-ggEBAKXO5CCXKlb9/nLaL/q42P27EdMqq0m9pnMDYPeFeUWs24/LRyMTCjwib7VI
-IFI1fYmzpu6YUNf3hcrAyqLd/9UTPOh7v246T3dyyG7grLLvpceMOlnntmUOvKRf
-q3f6/uLUZoFV7E2lKBDfTmSlx4YAOw/qFzVbEcJtXXGOOMWM7Z4nQfY6Utn973hU
-wOh7k38qt5El4E7mGztJDZweOtPAF3/lCMsYwgDVetsR3l3MCBwU3Kj4q9gBwyoU
-KsYRJkt2i8CbjSF5UDiFezXvIrgC715kzAqvsvLePkhbAV/fhRnSWNUe/SwM8S80
-UkWErlegn01vn6z8oORY3JcWnwY=
+MIIE7zCCA9egAwIBAgIIFjtws1dbUwcwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMloXDTI3MDEyNTE1MjYxMlowgYgxEjAQBgNVBAMMCTEyNy4wLjAuMTEM
+MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
+aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
+CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAqmabBaHG6D1Km+OEsJAS0XrdBDt+yZIKV4pjsmy3GQ6MXw6UOL+LQJsAj0zA
+sNUVCwt1x99LAOSR4eLbTkicYD4zaUJfll+e/LvBX+0nxpNp/pHhictrnUdMAEKw
+FeLwOg7KKiXLio2UDrQwU15vVekzen9D7hXIc0M41RiE/LKb4if9YkpPR6aC4G3b
+3wVA8ZuU3DUR1uF7Y1DbkceOByfRJUFrlrrQorctLHr0x5kYTEZfw8jlkoa6u6Tv
+LE8cOzJc2WtERFsP7ixD6YdKpfdcIgwJ/HSDKL5UNuBkOy6TKeUYNzpH96zpfE9D
+KZs6hPNlUBPaYNR3WpGekocZUQIDAQABo4IBUzCCAU8wHQYDVR0OBBYEFG/4ewSM
+fffooj8mQCPkmnRj85XgMIHDBgNVHSMEgbswgbiAFIxegempX8ORk3njKGdAR7yt
+uN2hoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
+A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
+BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
+QHplcm9jLmNvbYIJAPf+QvI8GkkVMAsGA1UdDwQEAwIF4DAjBgNVHREEHDAahwR/
+AAABhwR/AAACggVob3N0MYIFaG9zdDIwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVy
+QHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOC
+AQEAQO+DvsjvPvASXvKU60dGysj02EOO1hwOadh3E4y5r9NfeomQdaa6j8vFlS/D
+zmOYDeJvxT/Ra9QxZMVSaJ5rOF6yYxgiShHQbN2VjY+3ZDVLIZiXn5s70HCVw4hZ
+4m9y7UViv738tiUPJkjT/wS5GyTrhkVipJ4rZ/bYWmLld1nHuCQSPXS1L9Oh63KP
+bZ9LvYH5D4Km8Mtvm6q1fvcD2gc1J/fmCbBDMxcH0V3A2lIh+BwYOgnP96G/eesC
+6LZkSh2vPhxC/5lq5yQ1tOd/O3LnOIkyXwLmgSXgwe4sYuQxd4rSDY3hRLbkyW4h
+cX9fph5+YaokAgZsCItEuL+xCg==
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11_key.pem
index c074e83d47e..bb462b6fc15 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn11_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI2F4b2Nab6cACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOeUwJF0XM5EBIIEyBM+trAqE3c4
-q7vqwQ1qaqFRUzERqNcZn5tzfhv/aEjrqSVRAI8+SMdKlOXoxm4rKYp7olfdWzxZ
-iiz133L7qweXK536d3tPQ+4I8KrvhIN7OFdrf14nPWBVmoVhsXpOMAbNZRj1Z9L4
-rpEOKmvM1eKC36vJPN3z4DYxhEynLRyGjW93TbCSmDCFCwpfBvQW5VIxkJkZC3zn
-IuACW0wunZG6nUjUBuU8PlPCZfQKUxu75Wqx0X9pI4hOc83hjELBKWEZHhEM7Ko3
-2ZEksLrH6H6mc/42H2NCYz0XRkx6zNk0bhJO5vUeIJdCej6FZjk0YsncxheYtaUA
-QNp+GOisWOgsJLjwu538ppZB5gSG9+LfATdkrcA4o0lYHfnGQJcKtE0cX0HTmUXJ
-LGgAx7OCtjeNZcpZhLW0WF/NDZF5lNxc4RbA5W9n92qip6B1zQgfo94WG4qcCC/Y
-Q0ntWISVKJQ7o1UuIfXTNdc3GJ8USFbo3L+2MPeAf61pGj51BzsJY/YuYQOCJVRz
-5yTgStKHoEdoDjhusv/IoBKcEWvyfpBUv19CcQLy6j2CHhiJMUj8de3wRWI0uVkY
-jt7nrfvM/iNC3lWPQ/WoMpFEofZ3h78ZtWwerXWQw1Ej0wyb8G4Xt6jzbPxnHrOs
-PLEHxJ6N2c3mFmOvvIuuYvPIMaY2VpdDI3vDhm9YA0qiiw8ymII89noclOUE3rsW
-S9MWZA/t5n6vba3OfOGT4gpvjh7N+51UHWDZpf7cmQXFLnfefCcSu+Y8mPtGdWVK
-QDrzblQxzRS772TeoPia0dRnbrQxOZ2vI/+h5Z1Z5tbNtYcnVU7SLr4R+wNusr1g
-E9g/62aOxUS4AR0cODYJS49t4lDZg/JHYD6XGGCOv+A74IPSA5CEuZnZrDC5t+ab
-Z4awMc/IGg15njyB00E6SdVaQFcHfOjaov/M3S778vAOD0wruPgmTR8XBGpj9QMU
-GhT5FVgv80anYb+FKB6KG29UWdBjVd+HhD6Gd//hZV8s+HVPLqsk2YVzYc86eSVI
-KAETrFefuEGJqMocm4Ex9ZPRqT1YdgGUcY3CchAIxWrVGGrmMhnZcfWdqSrTRrZb
-kRImlhKsrRkmbD4otONVp+ZTbA1cccH+NEmiqxRUUk3PqjvLm5252nvqShkTyPql
-ygJ1wEd3HHM+KY0TTjqzGz95M1JtzqkG6R8rx4UDvUwlWL7SJioAtS/lE3//AaEB
-WZa8eYIpgjZsR8Fgf5YBchVVnHkR6gOraKbGJlbvd4LfnAxa3qrWi3HW2DkaN4Ho
-vOIV1yacP13TSGzDYD2zM8FKb+C2GHsQgdmBjoDntNvlU7R21RbnfAKA6qFesJTS
-VV9JIT8GgmPEohRDkIk9aGzy0b2JgI2Z76Uum4njFRpHdx0rEuz7Gx0WfSCZaILl
-IZv28ylW/UjZsuUzAAHdYQg3dqaYtYxiCmL42c7Fef2D/1RUs2H8sY7qDow3URfr
-7SUtVTMZgIq+gAuG5qJ35rTcQqlIX5yS//3hXg0maxIyfeEqhzXIsAapfVNa2FXp
-zmZD28DqMg46M8QGDOl4jP86bnzDmyy2CmG06Uubt1FejLWzMhgnzzUSsAfZL2Qn
-dutq4zeBM6zYzf+LbhC6kQ==
+MIIFHDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQp68pPpt5GZturhJQ
+55VTzgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIv7b3/cDLLd4EggTA
+rZ2ujlCn+x7jd8m1x1Icf3Onts+nNym4G4xfo5UoQVfymD2RoHTImBF10n30duYh
+uYpkFI3FRebKPLNn4k6ndViyHgl1CoJF72Y2RasiQk2qatsUMMvm8tm6tevMoXMx
+tYHZK/C8ZuKM3gufuxg0bOLnjHFCKP5rKkAZRvwxQaK/Ny/w6BgtMU+hmEpgl3GH
+cnXihe7vLLFMh4lUnCvHKamT6+qNk6CPPFxI0C1PAU++tliWbmP6vqrUyMD+QLEZ
+3za5FsritNk+xDo3q3YfZZ8XIMZXl0oDGtNd3dip3UYo6apSix9Uk2+TtM0pfQmN
+ox9mR4tHTjia4IvoW1Swo7mLQHYRkFomx7PP/xt5RhSQkB1OYw6iNVVLxW8lOZsP
+RIWppimm5cre3y7GsqpWp/fFSmmniAtyOqRWRcVtjihelzoqIfOsh3cwhWRRpBxS
+3H4go5dcBcX1K1jJoyGrD6hsZtGId0dK3Lf8wjpVJWVCJFjjQ1h+bJ0uUn/KmNQe
+cg4ro2HM7xGUDsDsXkTTdmDVNElHMfbCzI1liL4H+AzbzdTlAPZQvhk23v/i+QUg
+nFNT2M/++N/TLT46PEFpI1YfpSpkOSv0bpjg09WY1DQvJKUEWltcKTL16nfBYM3G
+xU50Z0b2SoBRYq2+QS4yl4NbOEEPR7+CMOro6weiyNeZO/XMwyVezelQeDS9Kqux
+YzHlsBQRqEjRRwhxVAI1SRbn2eAQsX0qzPjtpBrg0ai6yZo7FYBqwUYqe3oaV/2h
+2m7Fg/3cjrnk/dPh4VXUpmPKWHuB7zEjxVENf4G054VNNi9G/LR388pwBhF5nHgx
+GCQv6bw9Rst5FCiCBat+RWf6If4SKwWFLjFYIi/qQy6j+zr+Iel0kKkwJ1uxhytp
+EcedTI9yk+ZvVU5TBlLzxDPcvJ6s4Q93Vpqkngijn5YFB1jzXxza42z0fEvNo8lJ
+jK4z83prekDLc/szBw4IH82HysmpBdvbdF012EcHqVcMLoPAOeWkd2veulzS+B/3
+iX9ta7Gy5ZyiqWZL+wDllZEhwdEId3saiu62auCGIqj8+dxfpTqn3QmolwlEKpf1
+WP56+PTCbJLTQ7KtdBl7JDgUE1+7UliJsmWFDF/7UFpdaK09tZgS2/BLosQnMYFg
+KxrndlOUiwrtRgtP2ZedtPwRvlri34yHGTwcC2wK8CjOG04YCMwJTZi13st6wqrv
+Jp+MTSQbd9z5D099TQBc6bOY/+x0iiCJ1hvVFMMltYeB/i91npRF0h/65y0k9r6p
+qNaOO4IHZeJmjd3IfwMGVcBC3OfOEPxCCl4uoipAKCN3dQStTAFoV1uZ/B2StUZ0
+lCWL4xxjy86uRRZ983ZNaJMtsV1LLYXTT24tO98gMrmHHuk2DzlFsWh4U2pRnhjP
+c/DhHY8P0Fm8BBIy0tf8IB3+JETffBy7sUTYitBQxdh887bEf0azJO/YRVRvAIBq
++6GKkaqBtzpj31eJrxs3YC0RhAozhGaaACDhvV4kU9w7Z61PM5a6p6rENea5piNB
+HoujDD3DifzlHimm6RVat7c9pbQucXYm5gKFM0IZGBUvQjZX3xYdGbqMqIzVFHak
+/PspCpbxBvQI4neJ9eJJBQ==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn1_key.pem
index 0798551ef53..30659631998 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIwxyMH9gviJECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECK3/cZ/KDamQBIIEyPMkLOtBUx3j
-3rQIppE8WQub3UlyOIimLuxTURmeW/88ypfOgQnsao1FExH6DdjV777Y61vw4FSm
-EXYYlAx2DvyQO+n9JfJmnmyvvpFArEXITkqeAOqR4O0tVQRpXMcsyIahTe2kDm7R
-3LuQgpgn0WJVQLMk6fAkdrtySh+AtZMHuR1FCzStbl8UThqL22L1CsBOek0iE0BX
-Vp3OuV/WAyKNUfZaVHldv0gE/R5HRA04mCM0BwM5bHhgSBpAWHn09fp5XKLz9Rj3
-TbGM6WLzUjo4OtckIZCeLx8MEiw5jhINVE7oa/SBH5CGDi6J0IYDYx7/NH2zF9d8
-57z/TlzyACWb2pNV1dLq+G3SyM0YraFrqrpBtmzL5iGXiaNvSLQuCUGV8reMxy00
-Shjo2XhAfBj3tKrAz8CUcn7io7plVpCyViKsqXgpoKZN6K0+xUteV2AJrVlF85W2
-Ksxo80zAUecmjjIkjR8HoA+Ak7iy98TeU8oSAA57zQ00/Q3P//pIuP6Yd+OGJmc9
-yF8T0V/xBgnXQ7xumkTHYRWUt+E30f/Y8Qf8d3wx7H51tHTL0/MkPrNzyg1706zO
-JG9qzacGC3WAwMR6j3Yk1B9nWLi1F74eXmtbz9O2YDCdjyG0tWhiXi2jnrLyBeHa
-QQU4G8qTG2O4vPf5Xk+61s7eeGqrUrdiQgwriq21Y1Lkogwy3zNcIbaxE/JGSIcd
-sgkOKhLn6FjjMG1gfeQWgvUcdaKl4XiZN8+EI2TFXIhMiqwPKU78cJa5G30euhZ0
-kHA7ezwQIaQ+YGMt3W30FNsJXafrmzduGuQGzEKuzC/iH0c6ddJEsuSU5ipRlWhR
-pZ37GellID8w9n1pgnPn72IyqWtm/xgJo9DU1gC5dMm1XkQM6pLQMRbnORDq0hP8
-pCRFwZlgk6LNWMkV3y8pndFSdni2imGamFdGcqayGDYWj0+XkiGwO5JCCt69oFFc
-qmZKK1Cc2BYVl8nF4W7FC0K5kcVZBA9cpcHXKMayI9xVTkmC96ErO5YiH5x7JYTu
-AiJLM6+UH/nOE/sur+hZc4pBmiNnQ/Bi/5vvnQ0k7HJ25ncshzUbGVn9zmC8BF5s
-vEVkhbsQZH6HTEoM38fi2sM5Hx8T8lC72pZnlC5O/gPRBE5pJBnuec4Inh+5iIR9
-1tf+/074Z0B8v+IJarU4Q8WwN8IVk/4dPrRsROmYih84GFA1SPaVu7U6syrXxK6R
-oRiDiDy+gD3XgF1Ts74hLzq1ippzVRGkHL2ArV2sFHeZrtNlOU1WI/VFEwKcdo0H
-6dqNeH4wI6vOZefRYf9/9vvZv/9w8a5TshjbyEGgSya1mPkVsiP5/79E2AaYas3W
-Vcq2w0EkZZneqJLt6FK9h4xxdI42GJuSMt6SIJQ6qFp0gWrV+WCmU5hC4S1346GK
-sXC2nIAuFjiPvbs5dVo0PUp6zf1XEMKo51d0Czyd8c7ZIjh+SFAugzJkqp/h4zph
-uxPjOqkJ3wlGUkxUYIz0UgZFBqxiJJNEvaR3N7ipTYVUyGMkFGRRzZa++tP1deKy
-jCH9Z+u+9o62yZOCbfEKbb6GKayXinbiV7tF3fC6sP3JOqcMGWbQ66ukO64UpwFK
-rX1YnU2QLvPo8zZPm9o2dw==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQOVWzbsmq+pfYDOWy
+TOjXXgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQItGQ3AyH2q14EggTI
++az/9kM8PqMR+n6WLz/NrfwCODqdZovvekVyUCnYnCLfCZtxxCAajOb5ag7bVdU/
+U3AIy74uoN+ye4u+M8WoCExQyLgV79IA4N3pmylMnPQldnuWeWAfpjx1roVZRHXT
+64X46E6k2Bz1QdVrgqKsrpi+HuelLQphEgKNtitvNdkhrPEzNmfX6rT9jQ/MAR6z
+iTIguHQZjkxTvZLB0oSQXqSJFrVgFgbebYf9l+0dl+JWfeaWnVQUgHVKj4PXNVuY
+sve26Ck5QDRoOdIJ3SPcgDF8Kb3e+NGLRUoIaUO4WeYG0lY6k9P2NFBNopLTsPqZ
+sZXfeFR/AXO7pYvmdRDsOUZUARJcZWLGMnnd6JsofsAV15HB6W9+hqvfqemp+lAu
+nnwMFSdqEKDrnj29+DRGTKsA891iKKF/XfdYpNCFoXVv9Jipv9Vvx22lFNwdTKtd
+smGavKnY5PhjJTqY8cgtNq8j/JkgJS00PkABXUZMluZ1G5Gd8hA2NKzLwIgJoH8a
+Bq90OlS38VNg6YR6Tqhgx7wSbwyAN/uqjtBqEsJBveffR2MUcS6BeKCD6vga7XZr
+3NnxCxdIlEcmRPKxLiA+uALf4CxEGFdr0oMNHf7Dp7c7OAzaLKIWKqvxAYf9R3UO
+89nuqsI+0Oc15as7AL4Gx2jZsXcT39QxHxyrWHI2FlMReTvrSD+Sx5GEMc/kJxPt
+ceegnkLwTVLx0JVQzjThE11WZktqZoQvPBmMikkDZ7E91WiQrfoOx8hMqRcbCIWl
+KOli4wdRVi2dw51UUxcFzFbcB4MK035fiUfktKjcWbXvRs8ypnZm33alDs4XKtzC
+JzO10zdIt1usja3IvqSoIEGpLPyidCwqXbaG9IPUKwmAUAkTtupz5u2yczehz4yu
+M/VfiSMOau7Fz3CvKRGG4HdhDD0FNhh6QXUBRkoNL0DplDaceZ10PkNliS84ar1O
+8sOCCVEpWdxWdgPhdptLrSh4+PcZjlJ7SOWJnK1Du/wWQaOM3kARsb3VK5RQ6xFS
+WcKv98BQ5w8sZRrztLW23lGutNFNaaE4+uz/kqYyyIQr1mnOLJRrKE1ROlE1DMJm
+U5wdrXHfwsljh1qZBSpL39L8TMaQ0R3e9DAEMO3VP6jKIULjRuAThf+h2X687LK7
+0qQU1/oDKWNkKKH7a/QpEDX+elKJmu7YFI3kDAfdsaM87xvLOebmzm12J7ZEqsa7
+uy5UX3tq5bbmaJlG7m8dZRt2N9h0xGl97kSt2FYe1+DQbwvtUonAY0k1kYniydhT
+AtPCwsHLsMrzUzyUlUvGGcQQNlvgrF526Q9fa94F8KeJTu26EuqJre2ezaT1+FP/
+/YTK4dbJI0i3L5IvGloLc54nuuXJFSgaGdogbebUqqL57U9k+j8O7pBo41oNjC6A
+bGHHLKlXy1UhSSXL6HFZ+lmqYKZdz9/m4VczF+3lysKbCkLUE+zrBTuB4Xib7iJw
+sW05Cmx1lVpFezs+LkLlWMGiUhWOn+qvQzaraT0ag6TDYZqLnD9gayiyKb6QCr63
+wtpr9dKLq7bUzoPAZzGA+wyLsDckN8PzCHGXBHndUKAZeUh9ojJdR6flrRSiqlz6
+ZjFIRJyWhOK8wZogrne7rnCV7TZpU/cA
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2-noroot.p12
index 8dfd7941b50..3a2edf3a713 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2-noroot.p12 differ
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 25dc126d0a4..b21b1bdb6c4 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn2.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-9juO
+JQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAXekWkYt02spjoFGLl
+aNaEEpy0av9B3Gri8e1McwRoPbti94JTOAWwNS6GPbPTRMHQAIObItH3p/vOEsf/
+Ra2+fNK4f3HYCakAbqzfW2nX35TsjzoNU4m9n8UrQA3kUO2pllORZAxCtg0N4B0I
+3e6wf+dcDgA+ttcrmuPGVf1squUmrvcbicxHMzGT118GUQZcboAQZrPa+jGjWgoq
+ZCghTFvbsLp6s8HZXAVFuUP1oim2rEJdT/vBrCd1XTuua03PRap3HXRpvw0w7HaR
+QoATFpVy3jius5UVWuAG+0kK7bglVz7UtpYyUbyHN70TrQtry6wgLLtOJGDumViK
++afT
 -----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 51515b8455f..4c7f1eafbc5 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIfQu3d0VTJigCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECElCQD83DmULBIIEyCBRHq8U3Uym
-LbucIS/ZCTVNAiowba3tIOGbfab1NG3l2hv2iqckoYCPLelPIQ4QTHUZXkBWVAsY
-uZxGRkFZ/yhRJZqRYHZSt5XJy8bsObGnif54Hic/if5jcQdOdp+IioZxht+R0+Dz
-sQN7Kro0u/qwQSsVAQkUWIAmDIMd0s/RE359H+WwOqS+Losq6uXb5IosiJMmX7E/
-Rhzs+ufZ/WGwChatZ2EmthC77U8TOXKHt4hU880GkUmrsLPGY0E5ZkiTCi2yEM6v
-v6Q4iOpa0SLomePn8248RlAdA81/LYIQJJ8CGXL0u/VWEA82CDbcG3LY994TfO9+
-Pb/0MQJmRejSkaWeTbfqZqPFx/WPVkNgbbGqkPif/naTm+ZQWCZjUG6Fa2gcCf8+
-WKZGRokDdSgJWb0gt7Bj+UO9+Wo0aVPKxCOL80+ocH004Y/lXi+z/qJY1/pOkhob
-sV8HHm6w2ek8Pg8bmIfiiSzJw4U8f4QIskD4NpAyKznoE1unkhH2zK3QCrbw1HRW
-yWjeOSabox2m4VqUXSE8n1ODrImuBHEHq+2aiT3Wbd0CCHFI2HqWJ3+xJ/I8kAA5
-Ef61vQWGdHvcgHYuV+bLq92+pbpY6lYJDKIETdKOXqQcA3OjfgOzWFJXAPOJlCxR
-OmVqxFtXzLNNMku9XlT5LphgHz9HW0sDEpmqb4ycsYYa97VAhNdvRbwOHsjnlkIH
-CmOw6mfwcmfzvJdsu/40M1h9GT3iJdEwYV679WLNFphyM8n1XEhWtUPxqr7iTcZ9
-Nh3z69AnSeqfeNRKxRa0LH2n5FJCcXLt530qimcPCpEJYs8tnb7ROxJUXxCsJOZy
-l5rPxeJoVBLaow7O5fpq+mZ+SQBwZTsUcm6x7sDWf4Or/CuY+U59GpfhA+MiMHdt
-KJvEk1dt5DlcUR+ed4Zs8oLm21m9ci8EWZfQgPxhETBBJqYRlzCBf6bEEcESZs/8
-aCRzKyEJbrQX4DcLQvADO2hD4vLWaw8hKyhwhk9b9qsRM2gOdrQ4SnH02QBRodhw
-iFM2tDs+7/J8tHD7/ejWNpELg46UI99v0RVSei694FafAcMMUk8EpwXU5aX/pz6y
-uHVCYf+qM8SR/+kfgDfZhzGauJAdzDnFwRYLLPsXkh12fRB9SfPG1gXYaUsnamQi
-DVtcdtoYRYPcVjOb6KDezF7rm8Drloqj3AHZGJ7kjfYJYX/pubQHkHce851IKnCE
-vYemMhRYIZ/DlHpyDTQfr3p/DtG3TCZNNK192hG6/MW+J7rXVD+5EKYxRHMFSWDp
-psTMo2M527ZqzDSchBSouG1QTpJVqZvDMo2t49FaNSrNaSSKdAXe6hwhlTn2f54b
-XcuZr8TAsMxZx3KwI4eb+vxNJ8w8rCXsjLiNI28tHAMBoL7BQCAP0YUjE9lRbV02
-mCWVjnZfefbFoadLs06theKsjDhgTsVR8bgfpgtjNSTtWY0ChrMoyoGFqJCkJjkd
-HNz9WhkAj3DJBf2B5PykDfL440i4mRYKH4QdUv5DjWJoQpc+WytXgd9jd6BRK67g
-Q12mryicaHIoWjxJH9ycxv3FXNr9KnnfWEmUJM+GWTtRJBrE5t/JpAbNc/BM8KnC
-hJT5/+UF5SrEohqbGzVoyA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQ0/PUxAaRzH8kQjEd
+oPSTwQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIgV1qhXM/9DQEggTI
+dTr+mniPs0sOYI37BQZDkxLE+d/pqzNohdrUGpetLiwkr83T6YScPK+O6oLHyQxy
+ijWt6y3HTCl7f170S+beL5Ag7GAfKpJmuhcSAxSoqCUyYlao512H/jEG+LHe1HvS
+/jCy9kZWw6u2t1vWPFP+goumLv44u2dYGta2haKlpruWMlqzTOLG6do9a5YN02q2
+t4TOVORQ7WdxZK+4SnBvU6uZR4KX84IYUmTscP/An2mtCuTvHdB/HXm1U4GEPQN/
+GIiQ1HpP8ta0vuwPrnmAUlWoHb4SKL76K+JLnExDa4lIf6pxo2pjhTu+XlHu9i3u
+nEaSsnfElED4G0eC125iKMAv/KbdU8hIW4X9RSSijgSVkpXMfOFQ2DYti3gTgg5J
+Rn+ixp/aCIkpr6iKfAGNlI3vZFDW3Fkv7WwsrdwCJTZY1rWo4Xgm2Gj4m34J+0/+
+IdGsGZuAXL2Y4HnA4Znqx3IvBGZfCyDrYoISnCPbXw+75kQlgBeURlQPRXVxwkR9
+fLZzu2Uci/F6ioL44vEiKys0wq+g5HTr4lwBTglQjQJttOFjcgjA+RYHcFQ/L7xI
+hWa+cyjzhK4e1d0pzHOYfAoOABEcutsXcoL9mC12dJ4gDX8AVkdruUcr4JH7uKkx
+uTON+UNme9FDSYjo0EayvMpjgUJ8Jt+iin0tXqvPtP4pKJeScO9XqBgZ8c55Uyy7
+B3pUDoBpWE7nFF6aTdrygHK3Qx9E3rLdXJ3xzHNTu1V1r4EkqkgEMmTp0sFIzoBh
+VycPrSxbbJMxlH81BUocORivnb/EoXcsZjcv4e/yFkDrLF7IiPjxS7cb7O98w8Aa
+JnGYvB7G2NemELevX2NVLHwQKNjIhZzlTd7Rr6HisOuCDHAz6SAHCGvjifZbKGl8
+z1PZpDk0In/oFE9uOK9mxdq1xDh9eZjKZi1VI3mB5/HTRqiI+s64CWyDPE87CWkj
+WcXUe9Gb5GqMycZHTOfF5thV4NHt7QFfLMln7SlmQqPTs4HSoGrx8wV9VpV+nB6r
+RiDu9fmCXLqKWby3675C0lTl0gtoxMbYbCSTgimHPN7wLjNPQropH9DS4Hy56mkh
+2TG3aJQ9O6IrXFPhGu9wiE3cY5PD3MmzHXhYfOuwyrvYozlOJ2EEmhMrtfH0ci1p
+2TJ2a3+WW7KiciyRL6rzxSc5opYacQsyCvSRHlh9au9ZTYkFCvgg8BbFW+PrwClc
+WhG/ZQQQj3QZe7JbeGEXIR7CmPcyRFvc51UEZNS9fE/aKLn9AuwAb9+6ZcATjw9c
+Rky7PWcK06W+KppKB1kUyM8a6cN+08TT8j4fjb6lLX5LOGSPOJSIelpSkCd+Wp+p
+7gPtwmOFcfiXOmK4ZCzHU4eEW67iWa8cfuWAmLfDTQ2VGqjub4/eWNnFx6JMgmbs
+neAF1jux6jvU2na+N5hkY+wuDwnXnAosso+TlX7/p1ZllCx1OQqILKowfJo9b8AR
+tt4X+mJNIlzbVyNq+t1cwAt/pxGOn6zgPwWGXLmRT8gKTXc4cw7IPO2fhGCtIU+H
+778pPV4MJEIQovfYlKsiVNYklhQCkEQvHrC4K5AuX854h5dTc7pjyXQUaYwDXloJ
+ihX9VhMMm2wqRaFxNFsF1/i1rHMmkW2n
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3-noroot.p12
index 1f338037fef..fdf88a98745 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3-noroot.p12 differ
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 8acdb5b42e4..e3a61035d49 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTFaFw0yNzAxMjUxNTI2MTFaMIGIMRIwEAYDVQQDDAlsb2NhbGhvc3Qx
 DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
 cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
 AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-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
+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
-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
+b0B6ZXJvYy5jb22CCQD3/kLyPBpJFTALBgNVHQ8EBAMCBeAwIQYDVR0SBBowGIcE
 fwAAAYEQaXNzdWVyQHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDATANBgkq
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn3_key.pem
index 69f4045847b..4976e65ec8b 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIe+efLvwITtoCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLEmQwJL2KeLBIIEyF8BFJ58fYDL
-geoaW2jRwGt+/JB7L1Tq7zH1rnkzCZRPSNqTikmLWn2HFnnTTzffNYCszksL0/Si
-T8A6Jbd/i3WWjt1peDJsLwZOlSMcUzpyuD3Nah7DgumDb+gvrttgXOvnwamXeupe
-jG2bAHCUQ6d/FMdqEla/BIqpSO7t5xhjP1KnY5gkl0+y9qXlecFlkm5132ryak6N
-eXw/8bUsilHduQ1IQ7lr06GI1O3vBlGMxjUTmCQ+9IR35qj/T7cV2TBnbHx73ESD
-ior9QAShFFRoM4dHc6oec7EwEsxAY4IF2YzhfqEXLoOgMxkkzrMuX3xr+wDJ1E8O
-zxnF33ahr/FodKUirXRoazsjrGzvAV4njt/EXB2Fg3cVB7o9Incn5QkIpOjj0NCf
-X2NysoN9xH0yXatv5/VkRgU0nupSz/YBz68qE0P/K6b3QAq71OigQwdUcqUWDN0g
-81SIUfGY2Tzbo4NvsepY3oYmi4cCxqXbl5/s3AGO5pAalVn9KYppIZtcpp1R/hks
-6c6IiNDnDpp6fg3kzF7PY9tI1+MhHWsEF2dzt9qHRTjKpiyMjq9RXsPl8/drRit8
-KA0IxHxPTBc8mZL5th1mWauwETzWuvz6aAFaWfeQU3HNXm92eeDAdZKRwjDUbTpe
-i7DY6ZsRE5WK0clO97iKyMpMtU3Om5zvKUk5dy1w9R1z3tqSlkbuEPtBzXOFnqzn
-A3Vs5v23eX3yuGWhpNKOe0py0med8mMJq8VpoFzuPqShrLsuaRJpBhC2vgaFdhdT
-8OJ3O62Gvn9WlSvKWcCnS/x7ZZXDVgs+SEnd282WbT+rqnqezcJa1z9qzqmpXGD1
-KIbas4ZXxeoTfi2Ter9/mSR0Q/ItwaCQT0/PzfLJTdTZyK3pk4GXN2GtovGc7OKA
-f0ti/1O6hW64TwqhsOkRteWDfSAbAxkh4CwYy8KXrgmkzPn8FWiwCa+HkudhkSmK
-7ILp7678UjvP2gjaX7FdcGxZDgwk+6Y4gVpxHb9137Qbw30GJHBQDhE/y2OiCvUO
-pJljOE9L1+jJ0P3n5Xgxs4XFg2LLzBul7Ia7KZ1T9qtR1eKvN+MuuxFf0CORbxZ0
-hXqFF62qBx1bxwrFu6pvKvM/4XqhYfTDWdq/LnNN6luia7L9AnylErvzgS8MoAqV
-H8SPhxIoIbg6PnWurl9ShVVBJmyByB9PssiUNmzI67vAc3eRMPNdLM5htCq6WGIZ
-1/LVWoOunTOJLELAc79TBiYh79Y4hSwvfErquB1yrGYGkl0O345vcnTdnrPaknGC
-oIBGHKr8PRsE0Q+7UGdRvm5oqOHI0BvtnyHmdxCl/lhNoAPc5Za5u7ELr/OBPcCx
-s4y5Lo4JVbAn/5eR8cmAF8DmcqN4tO8YgR5HI3vNYkbdnFVhTGW3LijymAUFMkR9
-4BidzMxJ+DLHgqT9ccAMVIDd35ZqkyIdYAVuooT6kujmQCLO81Aw0ROCnF9JgCtz
-xgdkAbprPC0moFEA2Ngp9YwGljcq0ERno0zILRwEZOqSZ6Tk4i3IAQyx9LP29Uyd
-RbjEsqljFZREA8uH8r/0wwWYM612ygC56UbhBHZQBJkAxx/YRbxEZl5v9uRfAQMN
-o6BlVXgVUxt3IEEnAsmIhA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQbGf/z6rlD64EpnXP
+3uf1JgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIp0PnqTQHk/QEggTI
+3KpWECLQE5V9NYTVGMaRYAbUU5DWD66mYDOO/WS9VYSiuuY91x6AaOpzJ6pZgK/l
+kItVIS1ORn/mais6kH2/TX+oUzciu7Zq22sBMzHEUjF9ckq61uRtFJR8tFv62S3K
+SQphr/kumB+vRCZLZB2rdsUj1CN4j5g2jNgja8p4NnDygoJyLpFGzYzt4rzkRSzE
+5uLlqycPhZrBKjB/CkxAES4SgG5qcfaqfL0v6HQ1029AQOdEsCWyK7qL1s8j0U82
+VCVOohV2qVcqgO2g91nfDo3vcALGooeLx/zqdtDyh1ezXolVMnvLvv1QCnwtGMBc
+eA5/sTZ3IHVclwH9X2yLt3whZlufdD3or0MLyIl9eoOS9EXCRpVkZIzxmF9gsbxI
+hnlSEOd4wdjJIRCo/yR/lNYx9e3HPaLhwzkufmWNG6mV3125WpfFediNl+lhPGcv
+H/BvMizyy+q9YrxbsfiH7PtI+MNFzVijb9WnGnUhvIh8V65MSy8beO5r4KE+7TqD
+Tcaz4SfpT8fi290vFas3izT7jU8Aq+b6PKk0GWJu2f6JYbbyM98LdN1dYTAzdsPr
+u2n0Js8AMWTnl+ZmidhdwZKHmsdMQNWqZV2DJsP2dWUcFK+n/SNllu6o9AXxljOl
+k9qu+X1hB2GWr4H1M8vFzNMvE+Smu1v3HP5+u8TBdkH0B5uWzHcFQJHU3QKsDOL/
+vGYQ4WyeU5tKpymqa3umAFg2DCpnFL4s/PTdXkRLhsmzwSCZ8VHF+2pJLRIG50wP
+phRdkCRGTOzLgR2mewxl9PZdeHC+0rCX7HFTAZUMAXHdLsSHKoCgZKNj5gA7crqx
+B3DIUiPZqnqJJShIsMzfcboxBQAqRWDwDFNR4FQgjx+2UYCMECjemvoCUTGIYcqj
+YYdAtBwkeYDo7VU33G3xMcTXtZwOb1YlTWQMWs7aiA/JPhYkThs4baKxaJ5nz7mB
+F1Hf9EGqq099BL74HE7q1peUTdByqg4HyYcnCIf+er92McVUUFUvqlDEc9lVqiVI
+8mJPYYxB87WuhxxrAfRjXKek1/4RSnRoHcqgZgnISl7UfvP/UHIZH0TpUzUAuV+S
+AC3QFkP4qAuW8+Ub9C8L5/bckg0XEW7Sro+X33OdLnbNwiGiHkawiNBHp36C2ARD
+rVhy8x0YwY5P+oZg6FwdGKKLQRUnTEyosNc8DSmq9K+5iwlpDQkJNLoYzB1Jxnih
+gLv9e+Hbb73e7R5lnkI9fUWFo3nuh5Ml6obd3PE/w2U7XKcXW10iR13kDBJ3bRkt
+k+lYqRJs2ZwynUKkzupC1Jo56m1mXRrvVDe0Tzq1Ft7gF4JlXfTfZYxAKjExUuXm
+twv2RWF75cMT45kid+LrZfLfgsTd7MCkOcPKOYMSHqowEVeHI5chS20sB3U0RUFD
+dUV56ALJnvXhngKX4gtP5JhA7K5EgNcw5eri+47SstdO/kZOXQbMlZXxe6qRYgxZ
+EF/qKJPD0i1sEYSIcm6F4jwHjljur047RiikhXLrT1JZLORFdEpkHoM59ngtyeeS
+kw9BVDCCACQ8W9BqDjEI++hvdEOpddlp/7qwf9m2aMCq337kYPVlUaULKiTtS88B
+mmDmDePorAgWkrUFCWUZWvl095IiOsMd
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4-noroot.p12
index 5d41135993b..a3c2cc3b7b6 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4-noroot.p12 differ
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 b7004a8c6fd..3141b28bc11 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn4_key.pem
index b6a675689b6..7b88c883e76 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIEe6TV0kkdaMCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKlS2mtxQHjUBIIEyGBMceOnl+Cn
-HFhSvHobHXn6FQWVeCvG5y3Sle6X3JdyOWxKyOSTGLRQ6Zjdg3l4k8LD79LOsRrl
-2k8jbqqaHmGlpuRGqYKnqwtR6HV8iaZp7mTCmB9hQLH6U5SGURpqlL1rQAHc0r2f
-7NeyGlSIYR/tawJo5in7xpDJsqpnxHgWLEX4LQJvBB0wOmwkNe1XWZgh0EzOtJJn
-mOboj5yugelcV+/Lp6iRrt4Dz3SAW7YVIu3ZZunWbPqGioiVHb+oTZ1BD1iDbJkp
-yiEmDoJRzasxl0seJoyAUaZRwNuvEEYHFXYJ4QfrTAEEjxkdEfZUjm/r5JYNl49q
-kEPuSRJUp3Pea0YjYTs6Vg1W1sFoUS9CufK1UjTS+3HGYE8HGOk1A9jD6yUGegOS
-txTBcXcEIKBubSk06mQKbxpcrf4iaqpSsA96iELERNuxA/In2z5j33gHS/nOdNYI
-+mdNaFznvPbjGYXFMJQWlNguoIdkYEUtp1NW4+sB3QgP+LB7QW3uBADqlz3Q526x
-KKrsYfjDT50kDYay2dNQ68FmXW+AN0h3+yJbU5SA3zEmnh5UXerCqlutO0scXvO5
-J1/YENlhzHctKYr8uUpZAbnai0Wi6TSUmNf1uNanE+r80nBe/PAdj3rpPmHjVo71
-B4p16NF5CfNo2vazHI0mM+t/Do5yXuIkTBw1acdmVhn7wJCix+ND2HZfG1lRsLqN
-JZq82GlSaUU4Ae5BRpI5p36k9JFi/kIXXP0eOsf6c+D3nnpu0XUXZDX7TZgHL/Du
-ehrlwx2t+02Rkd693J8KIsEj3Y0SqXXT9bpO4kMq4popUudvNiRoa3++XKJKPJDL
-omBtup9JZl4nTSJWaW9xufOWHamlN2ZRMibIKjWITBfWJjzVZRn2H2dORCVH7H8j
-HKAJNSczNZGudGhp2KNs9mO3XJpayWlNFZrfy7+YlFVyRAAg28y6wiKfzb75J/6i
-hMcD38phn7sBgMyFR9LcwV+IcX40SZUIp0FwMxlOkuXTLrdHkgCwmiPSaE7lty5t
-IB//ssL5H8+aMInDZreA5G+w5M0gihtgayUxSsaE0cBaB2l8QPGFMhuMnWINzHxG
-TIX/Mn9fltxvrjJdbWPmRxvZHu1xb2Wz+cnQYIVT+6/sJYYLwN2ZMj63zxvS22im
-HL2jnfrCpay1V3AonPI5ExAd9B3mT+5Msv3jaC4USBKye3z/asneZH+khedSy3V1
-9Yh7lv54LZhgGWypOM0wugtmGA00z1uS3DMsL7IxNLz0P83tuNSqOXwqzNh57KTj
-MlDRZhIaeEGYp3/adwffO9QTFg0v+ZoThP6e8h2UETNyquE+tgr+WFO9SZ9aTiAv
-EQdtdJscpjPqwzFiDBwKXFUfJdEfbnzcPtU9fLXbLIWEeC2DEx8djCrgJ5rTMba1
-bBwsa9LaKgPoezWjTM90oA1qk5J4u8BURvZtu12dDQI8cxqXASrUMY1JB5RTgx9K
-6TynoVJHGHluJKedu3zSTNTkRDTJAkWbeTHg/gvbv+mV6rNpMG7v1oAhvLd3oLt3
-JqPKjn8WnPShoM0CJfprJ8romK2F6zYis3we6XaK1bAj8123H2yVVObRAig9S+fe
-+XRNxrxYCoQR8mi34Xn4eg==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQbWJhiWbido9qp/YN
+XniiPgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI4Boi/81K5oAEggTI
+L7nYGQLZs4mJoCFyflMExujg+NGsC0yvP/XFj2NXR3ODWr/9jLth/TtmsuZnoVwZ
+N7GGNnRTEpqdLDEVxkTrDaPc7Ebv38PxIJ3q+kPj75b4Yq+BgYFrwlJ9hVGJ3a1X
+/h9GrZq/J2urMCOs93Qo1vR/vAxz3gXh+4ZDGad1QNXZFlcfxiK/BQRPSmA1FKdz
+oJGxLHtN4b0yOz9FvdeC91xHpk3o15ZAimQBjPNdCn2IBS3YoF14OCaCZVKcZDFn
+qcunxwKFnXy+Pnv41MXGMdAP35+GhdEVhqCjaKtGCbqdnqdfmPTYPssr1dGMrI/u
+RwOqUsHP58u5V0HAAnMxHPLAhRYCSvwEDZq+J11ZSh9BEMpujttUEPmL5JPvQ7H9
+PK8Emvh0HVD99EsOfvEVQqKYil0r49hOzGOK2oQ67N2woKXLnsLqmhoP4g5AzqS+
+swnC53bQPfylEB4B3HsPgwJit0VuvhoKmYJlK+lifb70GNSS1XcRxkKdbFrdSrkt
+tOZjC7R5GX9WZYvdf7pda6hmq0PU39uycjxxF4fm+o7MYushnk4oFqooB+4RhuOW
+LnQSfTNhWg1BjuvGo+4GtqKOp636TpubIW+PYj9HG7Drej9mszvdYP17gUz8KPtB
+P/ldEQxeGy9Sc5u8tYsVts68YZXKWXZwBCOy8S/nzuVNTB7+qGM/9eitdnYTO8t5
+US3lKbDDsnlHFfcTEVrKCMxwBF/gHyRSRiJu6n2idVivTCyzhmoKvwFX85PhYRVm
+028flZVuOVKo75+iYq/qXkT0Hck+p0IzONr5QaiF0JrrN3YFs8xBBFiTZKVUq919
+DN6Qt4Y/GscM9gbXPmWbECScxFrsrntehjyEgSzNGj5HW1ctel6eBt0qWvXn68b6
+c4h7Djc78Xk9BT+l7MeWzXdEDkHML4MQtmwEqpMFo96HTpaMcgyOZWeYuACIxMZG
+HhjXR9ecmDLkC4+WC7q/+0WrXGfyNb4wJZDwB9DW2aYbxytUlsFTW00jgTorNI5+
+opiJ8iSyNJDSvi3EbQM1YM+rcBqshqFimP8HUcU09X1fGIovkW/2mRG1cFWWzIqe
+g9F3igtGPeYVsvNhcjmGfaozeMgN8sWVgNdGG/L37nTgdQdrhDJUPNrVybpo1ynW
+iNA5NYUlDiD4U76648z3XlNRl3CzHmthn4fcXoyllgQLDbEOjR4REv5bLpDgrP+i
+rmZVrNsMHULbMBFKZRJEVMMRHT93ls/Nl3cZaQV1ey0LuKCmWc1DdLBQSTfM6QUq
+KnIld2sL397895S5a9HvSqpcWDaiW5qQLmDDAnyOhW2g6hVC9WeBjg8CJUaYp0Iu
+97AauxgGJbLe9xWTQHBKz9QD++tkLrbedXA76r+KhGgSpshPYKA0TBUcWVxxhkga
+l4DCx0/iuYZCwd7PpfdLj3DhE5lI/iZnKHqlyX85KRfj8QFlBt5lqzXaTKSIex2p
+qa7UAKRwx0FBkU3afX8jA1QnfU+enMpdKvW1gABut5XvKIgAjlVOxs5LGDr5zz6f
+jrXUVDfiEAiz++F6TTVsgdEjIgPapCNTiPCSv5i3fsyep8QcKE2qD9hQPWr/Swfq
+kmBx06YDQ6E6eJUOZ97qhB5qnL6HuPBb
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5-noroot.p12
index 1aa9b93f8f2..7e86af6bd0b 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5-noroot.p12 differ
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 2ec6f75ca6e..5b320de28c4 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn5.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE4zCCA8ugAwIBAgIJAI5ESrgpzLqUMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTFaFw0yNDEwMjEyMDI1NTFaMIGIMRIwEAYDVQQDDAlsb2NhbGhvc3Qx
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMHzWMn2O/UuyZVPXU30wjFysEJRaxh/1we4/wc0PWJ+j55UozztyDWP4ldA
-/QK1uJThkfOIjOHfyOC0fGhUad6suLCyfTqKo8Qhr7ZfUXdpVvfFOUofFOuIhASc
-6jr2qSqBqTvNEaUdJmDNoDLJJLKv4E/3yTzFfUAs+dsZYyOYHu+e8P/JzSCE49/p
-ESuh7Dz7V5kHJKpAwLFo5+yIYjXO4pUpqkLhLtC1wnwpFY4qdc4r597kLyonbbB4
-H2vafwjV5+fvQxl3uvajRLMa5l5wLssGSp0cZ15wqt7tKZt36I7X1nS7wxRkm3QB
-Oi38dDKr26zk0wogaGh8pnsp2pcCAwEAAaOCAUYwggFCMB0GA1UdDgQWBBSOVYMH
-MJ98UjtqBEEtuCShGV05HzCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhr
-KxQ8MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
-b0B6ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwFgYDVR0RBA8wDYIL
-bG9jYWxob3N0WFgwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTAT
-BgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAegVzsrawU1JJ
-0qBh1A4DliBR7zliSG/gL5+5R3kztVWMm31LJETni3g88yZytuDUZsPdsoKavt/2
-JDg4svSTLYN+nmK7g9JzjlP0ReYqWz9Ibxrq8tiDy92Z9ikvLi6xO0lN6MXcZmyX
-kpkPayGo3Rllx3BUM9G9wXX8tLTWg3LRl/EEZ+LJTFRpkN3teR4jy0mKFBA5NdDd
-jSa+CSwGPQO8Jyyo1T+Fj0baLtATL+92Ja6RZwzJnEMTwaVcL85oqQLM67jZiEb7
-xYRUd98+qY+qn+6S7Yn0jcVl5sF4n4m9+4UMHMlgECmsSvDTdH1xJwSZT5LNYjct
-1pETtVHB7Q==
+MIIE4jCCA8qgAwIBAgIIKNbSf7cRU1kwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMVoXDTI3MDEyNTE1MjYxMVowgYgxEjAQBgNVBAMMCWxvY2FsaG9zdDEM
+MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
+aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
+CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwZlDNHmiDsCGx/8QHqypfArWTdifIKyOhid5rniH8ywiNgRl5t8p+EAz12Fp
+c1NveoJXAHjPgApM+L3VYnzOAxuvmMEYZ8LvlHa53HCibqCU2Xc+f50dZlTONO8g
+9uQx3/M9hWSMT48Y4ajDaVbndrEpwsOW5ho8hdbelKsrWm+6KSYg0d2KzERVhP3y
++xKcFnBB97QloCQ63It19kI67w5ZTxKzFVaFNK+TW+TYqdP3QyREcWqZQooRMGfS
+JiLQ7jYJ8ullBO11fKRBZoW7jRvnHdwJ4Ajz7qzjchteuMG505x5FTczNxkskgUb
+jtaeqrXn9ApEUc3K/eUNDaW5cQIDAQABo4IBRjCCAUIwHQYDVR0OBBYEFAt7X2tH
+8lTiV3UL2otsGzMMikfDMIHDBgNVHSMEgbswgbiAFIxegempX8ORk3njKGdAR7yt
+uN2hoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
+A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
+BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
+QHplcm9jLmNvbYIJAPf+QvI8GkkVMAsGA1UdDwQEAwIF4DAWBgNVHREEDzANggts
+b2NhbGhvc3RYWDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMG
+A1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQARZGJwe+2Vmh86
+xq0ebv5lkDLiVGSIvqIo5KdBjQwxQSsyzNAPSkzCmJFL9rdCuN7iQUysGFt4YEmg
+7V/oJarC8CptxhZdXIc0AF+MwUI4zQ1SJe0CHaDPnsjfzAHgv01+0MfAYaGBzpV4
+hoNN68aR6sxYVAxMYMIZ5b7T33F0dY5hpfhjuDRoRdR3YkAJyzJeslwL5o5g1gtn
+hgtuiHGycmcLfMTNLnBinbTWL6qmJcY2YhgBP8XCU4xMOwhKp1lYe6nTvtJWyMsl
+mmXIRx9Kc8mLGi6Ior/AJMqTsNwH322fmuKyAnJ1LH6YlGitY7/3+DQ6Sz2sLp8M
+7D/E6s8o
 -----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 c78876837a2..93922899106 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIvVOMe+Wn8IECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBdv6TLSAEBTBIIEyIgFltlyI9xN
-w/FsnChz5hX8XwP1Rhdpgo7PmWgnqlomZnxgc1qaLXjMwJXKvzTiIUy4dW0gaijF
-P/HdsZIsSrvy5F/nD6V2w4jxZfioTYiY/QFgvOmAarlwaQkyjTVocKxpEQAU7UHf
-KGrkqMwJ6W2nE6E6V5uw0lrxvTrs5FVcPDPhl/J0zziiDwTWAnO2TyLe6ew126b9
-BRWA8EpP21LuoH8KSamu7spXa1t54WUbgga0O4Zl1x1/G5qcXq7dtlA4v4Le2XhL
-2yapERsGWGsHI3uxXnMgkGqcPm0dU46Xi7wVEwrpOy4X+7SKj0/UDXORhN4KrH+u
-LrI28ASNpGuAr5XFNvoQjCZla1N6zjXsKbsi8zlpFJ6auwIeek7tYnE+RKAu+WAm
-4LvEU/UNg71EiGP9uVYUNlXRgCbE8pgmgs2AffO7qG6C18Z8V9ycAYT/DWCgZ8vt
-d9WW/i6NuyR6t+GhqOECOZRxqAv0JBmu4oxCVzaz4X6z8d414VqRvhN3K46Qr36v
-6B5S9RWICkBN3Fb0Y3F+wyYidESa2nf35mwofGjw7MRlHbtLkIaats77CzaRvwFs
-NRaNYhQb2MILkAIrHMBzxjQy3LjcM012ucE5ilab3wh2LMheBxjd90oF1oIE2796
-pWCNMjKMkXsTdUKf41f5Hytq7FW34eWC8jOCEkECQ0sQx2cTVxGQSXUGPH3POBeD
-6mJASfojNZG70ssgDjeeY36S/5cXlZe0Rmc46uAFyxRMowPLPDKTrWGZ8hZP06N0
-UcBSEfpgQgX7Duot2ErqhCLbWRF2oM5AdoIlVTh6L0DxN0vnnag/xI4XKJVhsOxD
-YkptLnPD4Iqe03RFVWaFEpmPHi4Ln/ub1Q8aB++nloPlyIEHuKWLcVz7aO5O48RA
-r9SZ2SNvdg/OYPbwERW3jLKjU/t+KT2Dug/Sn2CCUGrGHXdpnBdtR/99hVnFUStX
-3etwMpFftfP7vTn/X/6PapAK8BNtsAZyN6J3LPVhqVdJOAr9IvK61WAV2ka/6LJa
-d846aW8cPYCoq1bnB+8Gyas+h6vHT2d24ybMZN/sLsG/HJNNjcigWnzv/Wayegcy
-OEMM/SHLCAHVXVUYLBmyA8yzKor7cmkIQ+sDrXfhlDG10ZBq/BjjQ6sTm/eerCiF
-AketPskFNMNpktd+epZrUdYBfgVnqsTzzBuTb73N2qxRp3QHcoAE1VZEmVwhImGb
-2CFonJoQxKQG+aozq9QzoQseDzfyOyELaVDLJ5M++JRU9f65nA6XjRjFf9kiomCJ
-Igy3hwwWKlokdZKYFyVK7Zl/AN0qHwRpzuBG+KGJBeECBXMPv50SWYpI6qzXpPaC
-/TgTWGT82g6ACGDrUejDjIcO49pQioFG6JyANWdXi0gs5++r6AwfWV7k+p3Um8nb
-uLM10aUCSIiy1QsHYxzn4u9Cf7xb3hrEW5/qE9idfvHPzoGUq/Kw8tDqTkFWlXXX
-A5uwdB9jr6/wVnBgnkpCynNU/WshO6jPNCm8KB62eM90uLbYRXJxYvIboNmX4fB/
-ippxEmBcGWm9VOtRgNEGk3aGURZ4QQ07tUZRnZuVqfR4caGib2YY2BaC2Tv6dbfj
-5rfvJ4hq8CeV95jTOedhHQ==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQJGOwcDeeWRyXclNM
+FUsEagICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIAPhUT0DSBQQEggTI
+tfSEd3CWmOE4fsNY4z7ikM/ZeapMi4Mj8rSH0+WyKHabHQR2bh8QNlJR+JEveeaY
+3k5TwhwDiA9zNPjVwzWSbMFpi0WgwKt78kyblpcTinAa6Jj1PNs1pJYaeENc8o2p
+wvO9d+n8w3nFMWlk+oX5yzOH0d7z2YSv8mMmLcEXYZ0BMHDmBeBcV15u6QZ3nJSs
+qIftk0ij04ojC9pscxQlfi84ABc4aLXc08K9zCO9QdyQB8SOfdtxpLMeTzGCjHZm
+Wybti2TGApU7Opbp22udj44csVrjhxx4J0cVAT8Kv3xHzUcUm1ZNIwp3QZaUMJIl
+0YYsWoDls1X/Nh+8Panybsa823zSGbC/1ywcPvGvDTORG401btW6dRjqLfR7bigj
+XJ8tSnXUM38tC+8LIHyovlVcMNT4rQpKrDkBCOe/T9K1H3Sio5r8kh32F3UKx2Oe
+juDzTeCUMF7bWkaOlu9jxapX7lUZjb3FGD4/NjGfUOV2ILjMTu98c2lX8oSUH9yb
+tnEsdzIPBBwY/yQcTiveQwIVLnMWHjN8bC+gwMHKiutnjA8rT5QTTZRunS8XATJT
+r8zrzPy69AXx5JO1ZwbOgittMO0KSszUj5uST0lTfwcFkP77zB/I9dQERHW0r+Wq
+5KemO/ZX40jaRv7QnNIEu8G20UQvexFIOrDZZk8aSnfGZzVvFDSic7aqPMdORohv
+RTMe1kwwd/invFOs0uhVq1qRcAgwcgr2YLj/kR0RPBgsgtRgJOiMXA4Hrvpyd3X2
+UWLDpwPkhwtfnJkyaLvGA3mdl3o37ktKzinJTVjVwhGm9PPNXkQlZL392up3UwCh
+l8UTM2x9DgQXlng1DWSL461iRT87SdMsEaA9+N5kR27pxSyQ5Ct/xucffg4mDdCv
+LXlfOdDlfpz606m1Sg7k/8X3NC8zranxmyf01byBtom2rRxknLXnamvsKvxxsW2V
+dCYEd7Q2/toAICKPFlZGCkmeASpIB+B5n7SM1TgfaV+apCri/WkKmafwE6wjzV75
+9xnxm0NLJuHvvE0hcb5FUxSXhldm5H8QlEDkE7B7Q3QVTdEKYZLWOH6SnXnTaXMi
+4KgCd+gEiUf8oQGPcUnrnusTgaKgAmVsJLpSijXO9AKptTNDS6PyqGzkZbFSGeEl
+suJgTDI86CRDoA3BnS7M0nNyROWZK5VW+eHRj4q20w3TIto3XjrITJFd6op/cxBD
+tdTTjUhaPpRWnadIdT9bm3ThjoSWmWCkcK1o9KnkK12718tlpbEbEZdQLFuQv+WY
+z2+wo1FwJWPkyZX0l3mcMIkfRLuifWV9O0I7fzDf7chb0eem3gWYc5vK7XmZ4knp
+6Mwq4eCOZewHZlie6fe9Y9CZhHrH91LMMYEXpov+HPVOZxplSrrblPOdzvTSwhac
+zQzRuP68ocQi9VachFPCOkzflnG2E8kby6dHLcznwPCXrlRpGJjShpDU7P2pGz+q
+iG2I6zdXr0Bcz4Zk+DZeRPYz4R3w0rgPXk19MoP64d4Ba0RTMiiEy2XbETMZZ4ID
+DaGqaOBaI212CcHenSFyUDFOF1KSowyA5t2RM036GaG9zoihSvJMk4RTy+t5RlOh
+2L+5aYZ7leWD/nXKpn7lWKUO+ws6jpNS
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6-noroot.p12
index 18996cbe674..97a5ae9ba3a 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6-noroot.p12 differ
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 9a747bc617b..c1130b6f38c 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn6.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+ZXJvYy5jb22CCQD3/kLyPBpJFTALBgNVHQ8EBAMCBeAwDwYDVR0RBAgwBocEfwAA
 ATAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
-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
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCnjEcst7jYi2Vuq8jcwmoCojoB
+XoVV72bxPc03Aa1Kv5RV8fadTJvuW2qdMPFqyqpWDyGb78er0AkaLXy8GZbWuS2X
+Mu17Y0VklKc9mWyhe37ceXCkiZGe/ttnvQ+Ruzj/QbKcX3LEBZMzAXYyeflnsozy
+z0bFyhSgqPU5hFUIz2pGt2f0y2H6D6Lih6V63xsmmQhgMG2+JFplFI186npwyt2G
+Wyufp1xYkutdReiHt3pLRTtKHx6L6px7OTC5pTmIJRWXznRXDIL1hbi+UQz69DbV
+uJL6goOopz4fp+lAiEUmdVutHz2mV5Wvugjx4eXFsfw0PCqGzIvwPHGIBak/
 -----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 84cee57a310..64aceef7557 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIhrnsoh7nVY8CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOhfa8h7gdMsBIIEyBjE6canJVl4
-iHoGgvyW1C0zikvH5+9IWSCDbe9bVOMj1CxNgsbAPSHQ1RyIAuN9/mNzN6jMlbgZ
-0/WuziVGs4KS1PK9bcaYuKCs62oFP0ECsapG6MmXww995xj0fpTf+HBGKq1b/uW9
-07lLxQ9XK4Ki7ByrvitgdX5nsGXjrfAGAuoR9uPaXrI8Ufi2araQLRkhto/cx3ne
-1Jm/Vae7qD3V1ji/AbbjoVLooY5HKg/uNeUcEak66wmX/qUM1bsFVXkFlpHqOHd6
-WUSdLbS5h+OH1mFoCYGf543aYrck1lva8D4TpsJFRGKjCaqPGSHBDfqv2zHKtCOU
-3i9X+A8Kz+DlOKcqI4VPEMMCSd1rPvBhBa06CUH+mEFwqh0NtRLJclDY8xc/bB2D
-GRaQ/CO5IYlOAa2/cgy9YXB+umlCZWXQMsOhAR8NYNZxLLWlkK5awMDVvF5Ppj/E
-xfvGTQtTGE00zAjvTxk0vUmrJbfSdsidIU4C9HIP4ztgrbvHo6Vk8SoCDHF5qi8i
-aTWkNqII6VhT7kcsmWXF1vsAnw8J0o43ELiZuFhey+GXNyepKzes+0ty+Hls6MWy
-eX4myEAGBoCltWExUyFBAkcwUJRpkcGlqm13qanWGK1pVxzfJn8V6oFlGARTxn5d
-X01Ru1x/59mnl59QKiKph/GTgtmCS0BH8UGL4nex+DbI/JLZGvB57UVTTy+QZOna
-ysUTphy5u3PKAyy9K+K6jBnYVKfn/b2a4u1BnhWjnuT1vuWHqGSK0gkIilHZaTyk
-cwh4/IFfX0Aoci+w6P6BT6yUE4d45hU/g8jRQh4S5wndZ4jwEMQF8CuDlOyrp3le
-gnVgnTrd6Umo5PrkeYnOw9dGvWQMQpyOfIyj++ABuMmQoIGKEAHRCajW4BUQgwet
-WhGpi6qvrnPQt4ZUBt0OEoVJetbPfvDCn97wNcfbbkoZEn1Jp6WNlORjQppVbGhk
-/djKyFqPCx3l4UvESnUmdN3xQkdIRFzpq9L1jRHgQ6JfhbpOfZuyNP85JAqhOVgs
-GwQe7UnQ3LSQmNcbBHy4Kc3thjYCKoWDb7w+LylA+xtAPhdjoDcQf9Y+w6wRDbka
-FBgnwaxcydSCQgUjlC5Ok8mDjy7YJVQtEbnGJEULxoZzZVCodRwJYRCC8uREpMy7
-JSPhf2ye0h+nmyciosIw378AEZokZQfnJtUks3CEmHYzsjkmICehSpeA7Cxx8F9d
-NBAZnVTGvr/Jx5Ji+cWwz7RPIRxU5tz6nHAmI1mx1gSDYfKVDG4GbtBdUMSrQCBT
-e1006F8YVG1Lzs96qHyOtCCw4Z4IFWY/u0MCFGVxgwYGz2+LuID/mQA75WSU/wsI
-XtcubtpYQB3JCS7xm8fdQAynKpYMF9Y+YMmWz3S0EvgUGiOoP8nOopNtYaau+ck3
-u7/Tq1eQ+dfZdaxvoeyE5mI57T16eOZOnCgRbZaVzMZgOSDo7MWJdAgSAvKWlfIM
-bbSxEpd5VGtV8op1flNNhpOARgAYdbohfBHT7IOLnzpdH9GvvGUOsW89BDX/mTu/
-eYP/VBUzhXVDcptP6kGphoiIOTxhII65FaRKIgTtVqFh9F6XcuOLQse/sQJY0gpb
-wTMArjA4Irq/5SRxMpBHzQ==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQv0o6uDywAoJyzAQH
+PE53XAICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI4veiog+idHQEggTI
+Jw1TFYUC6TzUATJZsVNctQkzQf7gRWPcA00byOAFaZ8kbjge0wtoU3bhATP9oOnW
+64NGyhzxs4NM1IbNGZM8tyBN7hQjAQldLoSTOAB7DKF3wzdDlt1jTSAlJLCJ28Zj
+P+19fBoGShEqT3yobVVk2DBGfAVQm3U4Tx5NUUbb3hS9qXnD4BKupHHNHvGgDgeM
+QTiJRDhXm/FnfAhHy1uWD4z1uvFOGln0V3D+mieIykTi2vlU1xb/lAtoopZ9HmcG
+Y6lu1gE9/DsYcur1cGncDE3gxgdBaXnaZaHVdIM2raUl+PivM3GCbj2lAVkvSJWJ
+yf2UFmSp1PyZrIFsQCTQzOngLb5khgZH2q7E5p6SmexXfmGisNA2CLG4L8jt9OFf
+HrzFTcxH6WaNZcJvPyaEbrNDZ9xJRdRyW4rzEuzLlegUTsuZS01ej1NFVyN5VrQM
+ibxo755C2mOvmZrtAVaUI6Mh2k2B3kWKTT6kVrvcBMmLBRgfc4htvJbYG6nkoaHI
+IpNvr7eMAQymqO5jmu4dwsz1yIrgZxzIWsRHMoRMsndmzSroehqj0TMT2PaqIO9F
+xEeaC0KIB6tJN/6+JCIfDCXHfUC3Nwjqae4NYzqcl2B9/n09Vyw79dO4ikjgtcqC
+qtEbQdykEaiMXGEYkZT/gfI8eIRzmFq2DnLM0lPYW0Q8nPEWxyMLyezPTEQOrSm2
+gZ5qohwq3kN153b+NxmHMF32WJtlZtEo6S0uaHlAd79xotZystRTAkaqT6id7B7P
+GVjOvBbNqe+ewKkSonNHvtqDHMSb5EbVKc+WSNGILBonVVExgN7zAKQocbakFrYu
+UbC4cAlqVeKLxlpI+jdbgkbjTVOl3kulSXrFfbg5nIX7bzHMcstPQSj6oX0e6bp6
+fDqQxdSPWiDMjjAY9TCG20Q+Dc/jCW7fIzsV9vv4yxtEUTsGGKWwPc85QaN/9WX+
+k5axzVdXymCiuL7fUjm+eFWMtdJnB1vSqUZh7Q2VPSZ60w3Y8m+aVzu2DIPtGCeW
+Q+P8CqND/HqBxLJJTK+2EtXYNn8ZuCI8edA8U375CVyx1KzxL/fbrBKKq0x4pjQL
+yvyO7VbA8QGmXQMZpMiryfXfm44JP1/ngj/C7XQXHdYwjNh9lb0+iZayr3sb/rML
+s3eimMDqrU/NnVxa6g79yc6t+7sOO09yQTnskqGep2py9AiwdC2kVZXEw42keznu
+xgU/ahTpmhzv2V14OFZ3QRsDs/QwUXYjRQGZ9sNnAiurIQY7yAWrpk1yLnb4JMQN
+MS+5EPKtmBdloPZCEEsPgAhpeiiWBaayBjN4MAfYVQ84kICRdLgeD6iFqDoZVDqm
+kvcnm8MDR6UenGu0QHlzBF21ga4SxLXJsTSeFnRP58VZ2Ki2cDVqDdcfvMChmixL
+Ba1exRQSvJ+7eFQJBiSznlMXSO8avCz2OUN2k6spMwd5jh+VspPKe0wWN2impNR3
+AieCQw7s+9KGMih0mN1my5yEebo3mydhQakVrE/evZeoIXeOn4Xz3a2tl1e3kQvc
+VgK0s2VEWCBjE+rqXtGTrTbnFestKvVDjUSN5/OPtlUaCy4z4X21PYVK260S7h4S
++NB0+rCSjFy+0VLTyJfgpDG8UB8m7Jgf
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7-noroot.p12
index 1a624db5a83..d2b2eedbf71 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn7-noroot.p12 differ
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 9f7c9741f93..b57045668e3 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-----
-MIIE2TCCA8GgAwIBAgIJAIxy88trofTnMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+MIIE2TCCA8GgAwIBAgIJAN+2LTd4vljEMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
 VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
 b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTFaFw0yNDEwMjEyMDI1NTFaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTFaFw0yNzAxMjUxNTI2MTFaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
 BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
 ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
 Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AM3kvC9NCzzKoK4Gydkf5RLqPqiN9HfUpYZquoQniV9IjmQ8/rfXF6J/64qy3ZFi
-aR+g0qYPneCfskUmKLdv7sTCiir3iIuURGO8MYuLTyMX2AEGniHhFUQH4RhuE/tE
-zHdIkDd6hAN36/hYIjWgPc0OU+vlNyAUi4sm0j0f7C4SdTeX0zXL+IOxh2Qholvl
-6blEk/zgcCX2JVSXJsDPJinZtxQXFwUBJBV6Wl8/OPAxL03CeHEDpAtcDJd5KwI0
-qrMHt7///8tuUZejMaDPjzMesHnZI9qZfEEoCGb/NZnBzTNfEVaZ3ucZDvesELeg
-iK22gd7687w+ouCksaaeKM8CAwEAAaOCAT8wggE7MB0GA1UdDgQWBBRSjZebN11j
-bdgfZMZId0wEKCtBpDCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhrKxQ8
-MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
+AJw1Dnz4PJ2I3kUn+1MZXlEag3ijm0IF2WCdH8ekIg5t5yXb0InvKP5RpWHFaV/w
+tEwENCHfb4y+z+MFHzNlENng4WVApDbGiUdizEOkmoDZZWEGZ8ckL222Mk6E2Qqz
+urQPAFtG4RY/yjANwkUM1iVpxznl5XFjix6MeoWJj9yBFdcimMzf+x9K4jPyRC9z
+LqBTJRZdtsChJcA9PpL6YjWY6BS7mirWv8FR4PK8Z9PVLTF0RzGT5ZCqlS8yLWwn
+hQBiLwKM2N4RP/QI/iKDIva98abYyoff9+qTxsgDXxZ3mCN6afuMFsBD2+1WxJwe
+eNQ6r2dskUN2QfeLMy17DHkCAwEAAaOCAT8wggE7MB0GA1UdDgQWBBQhJcGr/IFP
+7GrmsICIrEUft9d4pTCBwwYDVR0jBIG7MIG4gBSMXoHpqV/DkZN54yhnQEe8rbjd
+oaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
 Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
 VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwDwYDVR0RBAgwBocEfwAA
+ZXJvYy5jb22CCQD3/kLyPBpJFTALBgNVHQ8EBAMCBeAwDwYDVR0RBAgwBocEfwAA
 AjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQA9p4yiNT2xVwsI2IN3KOp/43/g
-tmKf4K0WFr8Lbl8ebT/fMMoAUh2oNUMIO61Am6bdGtt+2Exg82deTqzJ7C6xGdHR
-u0kB3B4Mmub06qYsxxsIEce6gf02XxvVhpsSA7goxZbLgWNX+3NgUchHXO+ouGhB
-4TVa8qfelv0/i5K46IVGQqTvi9uGFCFs4OSsL+bjWEDMwQ2ViNm8nwVzLsF2vpG3
-9vFUZmDrTHjWgcSlUkfzpVpN5GpsU86wFZuKjdOprg7ih/dxunXRIWP06i/sD1+8
-ZwkbTXWq2uVyaz2cykHmTNBm/3uhkvqZUb0ndte/EPsH2UUwa0+qaF9hZb+z
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBnGI7/d4AOsV5F6RIYhxxd41b8
+PmJAlbelrR35ZLYC4Wj8h5GeE0WMgnV7NQIEDQcQShCVWZ6nwTbKrAacJeZElrC4
+pUJskrGajsNZFYEeK/3vWYeOfv5i8mOwoJtv3yAXFJEgIF8zc907gCp5dj5TPgbi
+W46PczP6WckyVXLhvnuLj5phf/zDHmL2dt/ATxFC4gAH+KkX57jP60Q0lLShhYEa
+w0bMOU6qoSMxlq/xcADiK8eUih69Wsb7KziSyGuQ5WCFXxfpWn4KgwrFQu+WMk2z
+Lpu3jrDIGVgEqzBWLGRgnScRdsndSATD1L2PUykG3qBfvwmQAAbYN0coQIdx
 -----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 6ed59d4384a..013f0bd4bd0 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIkHrrhxnTMqoCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKjDko07mmAyBIIEyOzaokoNyQ6r
-c88Q3ebYTvNjHHV9R1wETGeAilb9U95MphNu1OAg20T+IzNHCB6zJClUL6pAOkus
-XeRydYx4FFtGprKM3a8oP3t5jgD4IKi7msM6N0ezRfRqJvesQI2J/wlKuVZeV+RX
-rSbav3FeGQKRsHioP5B7Zpo06X44F36acxg3lj91jaeFADTRXH7pp/4TZMRhGE0f
-E+0YOvcOuHyOACMGzWXUmi3eWzvsfMG5q0ZIMZ76Scz64pK17JbQiBOycPefmVNC
-p713E53hp7xSbD+QztzOKeHy1iOeClU4h0DKnWAJXG4fNFZRTutvZkwrm7g9IHRy
-TVvkwkbmhPnA7UstUQPEwjX3M14Y61fX2r/1XhCV8sDDZ8Oicev911V/QaFqACEY
-VUHoWe9EfWkJ428JgrJq5TXhpDwBJ5KmOUi76iOMZ5iVlIVazALRNtGsnx2GP4a5
-hzSr0ZpeRqabt2EIg6Ts8B61ptNdy8ZSeBSfdVwkBBUlhU6wV4D3owKUWAEuDrkw
-9aYkXNQiOplK9xHkFclJp3Ew12Z6KcIEdRKuIufnrj5HjCeLV/qrcoLduluji6si
-dBImKrmRfobeZ359Si6kn3iU1JKaXT0d8B11nl9cxNrshH9XNa+oWf1xutUTzx3+
-GRHM7KEx6SJJZ35ZBycaqJdWIMNZymBzNkfzFqAzYiGAodRifpi8g37LXfU17MQT
-8H9Kc0A1c8MAoU60wYBq1abIjRA/mBR4z8JvFHMDSsplhF7/PmJ60izy9avGHcfg
-nwhOb7VQWQYj1Ujv2JOh7u9barIVw7dOTMVIulEMU8Mzdzlr/3MU1GB4lvVBKn0G
-dTObwr5R34wUt7epJUQ86hxKuMSUjQrMG6jy2zj+dVgb3g14YBzzY3EBtMHH8L4b
-vODxfh5XUmwKiCR47PNaxPu/ChB6+VESUJIoi972Qa89d21r8woaebwNeOQg4gyr
-EJqQ/DZKUv4NWo4xvJb3iQYC/8FWy1oJ2ZF3XpsuUzyw8dvrfdEAgMDP/ty0J4Ro
-3bMNE/bKopHh6j9ReVc4iCglzxRLGk/7SPjLWIj+IUY84YmMDslNpggi4jW1hxZn
-joHPIoWrwiCpRxcpyF+SOVfqXnu31LQSdvtWWi8cR0Viu70NDbWyNWQaRqiO9vjM
-r57IBE4pgWfxVQrEJ+TOmIJHE/TO/Q4HrwxcjBTVphV0yK9/3Q3m0VVeBP5svuE+
-cfBjIVAkA9TyQoTzgmdrnXcm4uRQmymGZDx43ojC0Pzcu1vPQy/LDTbQJN+noeIj
-9DpzcjSuddK3z+o8HjV6pvB56tm3SjBBOUQr90Woxyznb29zofTqFtK//4c4+ob7
-mHIgE1bjn7wNzkR2UhWXXYQQvo+Uqq38u1ji9akpy1/bWdkdB86izSkiLiEzbiqj
-SCHbWIAP4RIwHQ2Fb5zDrKAtfV+RYOlBdlM0ghobvdlwZ39H92BXwLgyvxpqUejo
-JlXRHQJmIHck8V3dJbt4UPnjrhiP9gqwZhuHUmzMopGDDNQzeOD3/mZY/xyGdJVD
-a3HhN0CISG2FrDGuvKXfsQonaLCkiMdtQbOUafrQRbVgsA0ZffxSomeFGRBSr2sV
-4m1TJk4KyusjLtSp4JrnIQ==
+MIIFHDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQQlEk4HeaNHmM+ZfL
+b0/m/AICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI0hL2fikfLSoEggTA
+Vv1iEzMj6WqHrlXU79Z8jJ/hEOdDWVo0pNagnS+kl3VnWYHzhFyRlHfiGVe2/Jii
+JBB2ftcVoB7oyxjPG19htfTS/Tojum0nsxy0LDYAJqAB2iGBUZhDbA5HkbmpOF1D
+dOhXwa5aeKNq5b/HSOJX/0AS/Omsrt6KyG8zB9/uNOIWuWBPiF1475XLAIvRYgoS
+xtsWh6/4BFDdm+5RuXkG5SSX4+CW8t4knE8t1Af4RWYjAS08L8Qjt4mBhhzbELH4
+9BRcPv5lj1UPlP9NYoLdoyhmOizHEF+nF1t81V1pQ1QrolFda6n/M6fdkrbhMUZ4
+UeOBpBvLjKK8wSqi3sAEMNdoMpmcMRlXN5tk/MCU3Ruknr0VIj/6pzihsZO5kCYP
+Fi7H31OKfjSlWHnF+h1ZsZtQwQukG9HEtx8OvrTRjKDPC4Pj19zRXHUGR0hK6I+A
+yETdV9muduuSLOvXQLAtIhHZHEczv6TRQQIlr3zHnI5zrEZcbCKx6NFzdWCDCa2f
+SIRv5ZgyHIkjcAsq6gi64gY5u5sYrgEaxmVnjSEW+rXzT31ITPb5Eu8jUTbOmvec
+g18M1C5eiwOct6hf52I7NoyDszgcDrsVafm1JL0ACN1IWB/f+ktjF5aGHmAZ3hxH
+l3i8bXOz2Kjvn03ycwx697W8qaZPhhdr3e4MUWWb/nUB+fi08AXCSM9kWn2Z+WsG
++6iENiIuZegezSEyTyyExwPDQL+yy9r3PdpVJVzJ19422jjrrQHtRaVvBr75E5aI
+LY+fcM1QTsQ/AYEqT5WwGDB45E2ts5AsbZJ5Yd5pidR5UbFmFbUqT/MqTLEbCoVU
+/IL7qJal84wQDYL50RLSEtIG37KTuwFJnHsf/uAV2oZ+szn6vgm2rgnKC27FoVBO
+IUI/As7q1mxcBLGiQ94ktIeH9BcGqdQ2J5Rhz0TF/rfyqec8LlO5wixtdnSwVEgR
+ieiXx9NSuTyhHFWHU3Sts7OBqu74rvn4UrilT+hG7K6VStfB0cQyNk9Srk5c6XTU
+1FK7EhOuhD9V72FF/lmzJNQ1pChuI1HWMTlHo254dwdN3zvAPswFZRGYZwNhFZpd
+U4ayb2XtFyQP4mNIvkl/gcjevrLSLDvCrMe1WmjTqDWiPFL0DxwFu3vNvp9Ug/7s
+IQNxlCTXYi0kpeqn6eDrN1DR6JFDieqgYwvM4gvEZ2MRPQE+rPCV83f89VfKPna0
+mGLpZWeNTxWenAqArngbF4CDgXVrdNYEmFgkTBxG7IhTlXuBExxLkDU9QIHm365n
+VLWPEy6IAZDmf4S1rzBTKpHZNRcpJsqeEOU22pvgtNX54JlNTFadAl3lStkUhif7
+dAtLKOu9xiA/v2w4nzNr4HXklJleb3mzPPzvl3x3vYPo1qu08sy3IwCEgByCZKgB
+w0gcInr+axbSQg9STaTg2wbj5yArRwb8TaUTk632sWWaE0vJSbsVjGqgtXhjnUfr
+TDINkeMDvVXqzX6lbMpRs/sHrDXQ2nnHmPZinwht1sSIysWHbokr2d+3ZRn9nLEJ
+ODFRxcAbTJ9/HZBKgP40GLAA9Drc2Bqg4YyPuCPceVFzwOMnH5vEUW2pHKC4s2BS
+qAgEjL5tk7hr1ZWNKdiMvA==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8-noroot.p12
index 8aad45ef1d0..dcfa4974647 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8-noroot.p12 differ
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 24dbd726fc7..aa0de5a7f97 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-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn8_key.pem
index 2d2cb8233c7..d7cc5e8fb95 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI8mbGXpT0v/gCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECN0dm/rZy/qIBIIEyMprTfhd/qOW
-RR1OI42uq5ZX2XedU6r+fNUwDP/IZ6b5DDhRt6xtozboNXMbc5RxCOgY1VUoOdi4
-y9KU1zM8wKu8CaosWEzoxqr3x8dFoKQ61UYBAnGOHpvq68tVaZ7gGb9l1pwgPDww
-6P2btkvW75KKtyefgtyh8OQ0FY9QWkWf2IIOIjapX/8Q9dRpORhLfXTxItv0ek9y
-bv2PcD9ENOVawyTuytIOK555hJSnOclbSfkOmc02POCtkOxNnGSnsQAJARrBXEu6
-PdUj//EGKp58h6V62l1u5NkhetXiY8iryCqQNYW0YGL0VZy8XQsPmdfOkdBqROJf
-decQCtwo6qS/eIdAbsF07P+elSbzGIAGnU2FVgRuTS4GlBSa0jrftXM2msupIm9f
-bmcgUY7RkM7zOWfLQHGt078KwwgWCXTcVtnyPXs3VnV8xS2kyinvfk7e5ifOiIVk
-aGTDMbCLp8y8xvManL8/sZVEGKE/VLbi9igFzFMYKeVvogY4GqwfBvC81gK9+VwT
-hqSX5rqhcsQhFneSjf3fSjD7RS8NrG6i+jlZJi9WGfUdGQhkghnsqDpZr2NQDvIJ
-TlW/ss1IfKxSiHzvPvNOYcC+LLT7+VUHZMs3bGeZt+aw5HEgdyLHHB2NzOxPfsMb
-xK8/wgLRqFEa7d4S8eqUduxDyh2nw1VEWtjYLzGiJRAjDUFDAEqrXBGhe/2XdYv4
-VQT9Vl45evExVg7/3Qd4kytg0DGwIL8DLVBPVZU9OziHk2iO8rYHL5nIGdknnjMu
-3fWONLWcEF5nR37NLw4GZhYR2zFnQa42uSrnpxEmC/9b0iHPNwcjEuavwC6ZleEQ
-iz2nhbb4ahwps1/XClaegxriut8X3pV8bajKy6HkfM0PV4aeMSN2x/+yr1r2O338
-BOEEK/G7ZO9Ncc7Yu0ZqYF/UNe4cHkZASUjwkn43CCvea4Ee3ekrK33DICtzl+Z7
-cLnRMFd3yX2XddrOlJaUfRCZiH5su8FJfAoc3iar9YIPG0csH7ELHx1W66JYs1Dy
-TEXKT6JH1rQOqdAiPLpnovCH4bx3Ik/I1LPVuEulGnWT0wMph7feZ8yoYU3AXEZK
-qwwEi8rVi6F9jIcjXWblnO/p+xRVySeHjGmfBU7XszvUBvkrr6SbpKmWwLDoJt+5
-Oy0wVCnb2uPMRdhDI12B+d3Tmjb0Y+PSX9ke3S+FJ1Dk133AT5+4nOIPftRmKv0s
-wL0+nEku6IBcCwobJq/Q+QQppwUQ0F7uBSRSzBthe3z7B3i6YCIyMKmKA8Vmm8l8
-b0LlL4BkDy8jlxGCSktlIyTRqYsyIaXDps0qmDh7TtLEGLYNU1OU/rznVqd0mxtt
-VZE58w0NDeHskt/e98f8DFfB+b0JGRbWaEdkPGA+68SnXZ67OUiFP6OcVceQwp1W
-aFMkpANR5Y5FOkLp1UHXpbkuzIZ2KUKSInroGt3XWcFxLedM2UnXcjVmmP+gROyr
-XQjU8nXIcBSI9gGJ4h/rXNv2bcQqMxgdcXL6xLljsT/u6wDidknvwxvQpgtFw2Md
-E/3SPPUWBX4dKQxEBGcn/O6mQkzlIgl1mbA0XObxrCeNAW+xR5SaSAXflgdBw3kO
-WgQJEEgq+eCQMRmydqPybQ==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQvi7+dkEgKU/Nbuyy
+CJHesQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI1bt0xnuRl0EEggTI
+InU8wJ0oGZGhYhShBR3VILApJ0SUPcRth8Ys5b1oU11vUEl4RfwzewzJqCyMcRIG
+fKVH9s4wMu7zz7RVZEd0KVqjPbrroQrrJCYD1+jU1wBuR+v2lko/fgfxWCBuvd2V
+TZuoiXRminbDUKb4WgAyL2hdPQg1V3kOxVAy3a18AYqdEmHb275bPUXlRdT4f1y0
+76wuxbR1Q0MIVcakMJuG8SvKIUPn7z2k+wVRyLx1VRhJvpa7ODJY/ytkye9SZohY
+IXfaGtyRo5cKgu4rskG5fFyqgSvZ1j+hOjDfLDbhfzT5QpBDitP1I8dJU+o+sJGh
+/JUbbH1fdOKqIN22pxZcMPUvg0N+kOOiLr1gXYY+rt+wEgYlJAld2vWnXuln+ALe
+VN3q9J8w+XbNZz7MGSklUMcgebpTGvTTbsz8H5HH4PdbWigY6X47VGcCrTDWoRVw
+zcKcvKdw73ukIYrX5zt7qhLb1jR/Mch1N/R7Ss57QpIaF5cK+Z4eQpuSK0JPY8rs
+9ajzLP/GXQScyVz1z+FqWdBCl3zFoUZ5Bg9cGfiisIKDqAd0A3kx+QnYCfLaxcQC
+fXKkoR5+nH5NvPZPU3sw66phqu5609xpgtukvm0eFLx1byingS4f4izjF+2doZiM
+QK4tJnVbizayg6gfB7qYturbR70wpTHybU+m5/eb/m1eaXfLNPMypE2erKylpNZk
+rAbcPEkWH1ZqqHt3n1RSdc7in9O4fL40oqi6j/RD9nsNXWskxl1J5zhopZHQT4qw
+lNUhroB06fzAwlH+qEgw4Bcb4c5IHXtW5o0sPwpqOxI8JXzvVzOkqkeG4w7HNOV3
+eM7Db9dHYIcqkasrDDpO3r7MGVSX8rbkaBtbBfv7rcMp03I/UKlN710QQj14qSPS
+qIVderkifhtEH5eDPdX4y5C3YsCZr63rJ8ZIUvAsF/QNDJX1XK/kYkNfWamuhOBM
+K3YkTF/aTlPallVKJtTFd0JePhy9gB3ITPi0tFQ/Ymn2tH2D4N9Ypt+UoSkMWgc+
+bxLG3ObASqHd6vXTjLwBebWSBjzFcpcddGv9orj/384T5MKrpojwGyDd3ASuahbR
+Ja88fneqFPNM2h6KtoAKTKSKk01+C4cDd8OHqUVPNglbbNAZw+SOxAyRoixrmpny
+GKzsESQGI79P7GBtPHXGOK06SCbhhqJ7IjA1SMngAx3CO7kOu1/2OC2yzvleBee+
+z4tR6GFrtY/5Khijw+3gMay8RJSxd6KYTeZIXOd7qmQcUtWdPWvPZ4dThVvtbs9f
+S2wRBOPUQIpk3meBd47YC3P6ynmR+J37bA34o2OeNjUAHhZkxD6nmf8zWhm+oBSd
+AJ68AOIL5z9epRdezL6EYiTyjj6AeEews3qKJEJ4UQP0bQxtdXggw9DAbVQztMHH
++1813K1TD+HeLRNJI84mcL1tkpffLV3SSW4Z6yYVTKULdgnTiPDDFi45DHf1IFXz
+lO1Z8iiWQlTjv+yBtnyZ+JCowIVDrmbkODy866YcIYCmbAZMJ6qd9/f3qBN6kwei
+lV/AOCGB84nzHM4gocwtnyUHfvUeQEfndPXdRjR0LPucaNqvPA9bavz4h1mtX/Ps
+7w5FE/RraCZLKgP3P4lmCM5DCxHLUREs
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9.pem
index ce1908c69af..ab09ce01e54 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE7jCCA9agAwIBAgIJAL/GYaiOoAT5MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTJaFw0yNDEwMjEyMDI1NTJaMIGIMRIwEAYDVQQDDAkxMjcuMC4wLjEx
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMPKfqKFEtwq1REfCKVTNIiumQ/4cMaZR3iG8zTJLuQw3Mlll9f9PYhnUJ3z
-iw6N7rsHcPoh8W+oHLPKnME/0O2HBiX1ejzViXhrJbU5E2/Btg07pqIj5HWPs1SL
-bEVy4+BA7+yca8a3B+U4aL0oVeG1p/7KQ9CEBpJMpqKvaI6PVAx0l4Z7c/bh6t5C
-ULEcZdlDojoR+e/IEteN3MUz9m9v8NO+6aE8G+JsXMylComrrO0+3DjcgrJ1NPzh
-7F11ouha2pK5z1QsHPPcHu+LvCiKEYLeWa+mGQph2Ac61PORTku5By+QKJygJmZg
-QZ3739Swb7Am9CUalnvTdhZg9S8CAwEAAaOCAVEwggFNMB0GA1UdDgQWBBRJu1mB
-7RWxVL7yZgzu0e0vmJQoHzCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhr
-KxQ8MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
-b0B6ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwIQYDVR0RBBowGIcE
-fwAAAYcQAAAAAAAAAAAAAAAAAAAAATAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJA
-emVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IB
-AQB5c7rBRsJjaRUJwb86V+JPTdlwmjQyjO6WbTq76wtsmv02UaMShu03f15sYQSa
-72OMOXOpeYr0SvMQXjlcn2nI5HbK1tRNNXFaCQ3qLIehrdV5Vv6Ow7t9DO/DSC/j
-LxLSkObaB+XiCPJB4JUU0kzvDBkRHWG4im8jUXrg3rbCQpZGBdc3wdlC6+vs01CY
-Lhalstt2wQEm6qfhY8xQyWvzrw1NdVdB2KXSJD0sc5m3g7ii4sOY1EK6aEmIFtC6
-ccnbNGwA+cOTdmvmowZS67vb19jc8E8lXAwH7ZBmAMxDybFM21ZlalXMfAXr1Ft3
-UdgNaqo6TH6ZBo/5huB2Yqso
+MIIE7TCCA9WgAwIBAgIIc3n72ZhEwyAwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMVoXDTI3MDEyNTE1MjYxMVowgYgxEjAQBgNVBAMMCTEyNy4wLjAuMTEM
+MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
+aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
+CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAjmqsh6+F9j688ko5xotIRcCtfqEky/G+Z5zlU0pTD4JLkRQ6E2NFXCuCWhVd
+kNotNKNl+B3YQfjDbAyYxzdZPvZv7Z5W+0B+c+wyfbreV/epcX5eqvTr48v07oai
+iLfSNjQXV+T1fGEa0AqJgaUkPwUQDNVdArfdgYWen7I57BMfJnG4CQC2ukpoIcQh
+BZavlmXgaNrvYAgdliV9SWVMUZu7x6yt54/dd0guyoPu5EikIvaj7y1CnncEFX5r
+WFwvhkV0vGNgKGMLGBX9Sr36dItq1YqOLQZe6XSV0Qgw8WxLMu7eJuFm8DjCioHv
+Dy9qnWFVC503nB72xMpGou+zLwIDAQABo4IBUTCCAU0wHQYDVR0OBBYEFGtGPltv
+QG8BhaECaJEOV8RQi9ZjMIHDBgNVHSMEgbswgbiAFIxegempX8ORk3njKGdAR7yt
+uN2hoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
+A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
+BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
+QHplcm9jLmNvbYIJAPf+QvI8GkkVMAsGA1UdDwQEAwIF4DAhBgNVHREEGjAYhwR/
+AAABhxAAAAAAAAAAAAAAAAAAAAABMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6
+ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEB
+AJ0JpRKkhC4wpwROg9PYZ3iYoPdu/7EBvudQvPVmIQI3xcvsrgozyHufUZE6x21I
+9FCRwMCg8+HpF5sZ+QrP5PthBaZ8hvUo1JknFogJcS7X792Z9BX9mph2os0ZdO7N
+dPckFehj7JB/ZbI8UbPbQq4KdIunV2YmCI9eRJj9rW5Ay5RooSVwnkua9YTNG7eu
+p78V2itWalBEm6y5X8xoeLy8tyfYDnDv67b7iwmwTUg+Gh0jnLNDLpknMwA/0uI6
+sacKA7qzQ/+DJvmVpSF82nvnKNIWYdMO0uXh6RIATyTfdB0WJblum4Zn6NICngsM
+/vXi4BbR/rrzL9iQ6lfh6JM=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9_key.pem b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9_key.pem
index ec648ef5a42..1eb4994abbf 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_cn9_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIQOdQaqqqaEUCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLzPYulCZtmaBIIEyN+NT9i0IUhM
-x5Wv4Gu1uozVPNdi9zJQH/QhRhYokESvVNslz/7kyqQMq+Jbphwhac+++QfoIxcI
-ZXuuGcr74nu7uNAeZTWcqU2DPUKl6aLWUF7N0tD9j4aE1yL7mWDSImdaKFPItxJx
-qZK6GsXIpnaLh4DNNfsk3smcfcIsrl81xwZ9U9/7+Atw+qF4kiC+u4GDPjyxVIod
-9C72ToxLQFrZSxBEuNWOjnuh4iEPGcVk8xAeT7qbNYZKADNJWmEzR6XhP7I3R0a0
-uvrFa7B48/UTZOE3W9UoDc0hfjTkBp6RJaQ0YFlOTm04NHt0F2JGz3eYE308xWRh
-EgnE0Oj6k7EP9V9dTtDcWXVb9tFnJlDmP/oDosDsGAf4X6T8oHjiPqr1cDc8DQnr
-/xlzcKSrhXNIbQt1AQS1KFvWG5YZ6+b2rrdLXMZJYG7wNrY1FGPWUEodFzLVmFYj
-jXKTwixQKS5wZZKkRiit/fqf3uYtHgc/EbZ3EyBFinOBRdzvFb7u2QZKIEiBBe9K
-DyVYvXFW74HhMAeWY4jJm+sj3rCkTIReW1sMsL09s6oMejigTngt2L9Ri4c+Cr8t
-BxClqdXvdCGaYxzhwoUmKFnV5JyOcPCQsXWovzqN5ZNagcI7TKUOQog7r6nxnqSC
-whsdfC93qAoUSCB33ubJxURiIUnS1YFb18pLbzfTS3DqkFJfqckSfxUMlMkQhWpN
-wnC2FwxPBrVfNe7i4+muU0g52MIjD+TYdkCblF2oWtDzIBBUqtA4CMYVjY2qYEC4
-le5ToIhQWR+TsbBYFapbmeOu86D2mem45/SWLtrAgqLOmUasX9d/B5u23aGyObPg
-F8giscpKdMiF6D7AXVa7fsewwx5mq4z5VYxr4mCh392h3w0WSEpbfcTe9HPD1XS0
-7NIjk0tjATv/t7pTgxzx3yY0uvURP2K8wrDytJwI09cOX6kuiWQzcbm7splrkRyE
-0jIK4E7nam/SHg6AzsMmSeMpgfwlmjIfcyHmKtszS0/jH9QOTR7Sn+ocJHa/BaFn
-s4mlwywjuNSpDzqb520Qk+vYQg6MUoyhXDJKRbEAcJEp8B91gAOqZvThVWpYMdia
-Ky94JVky6yyoPc8fEJxBFrk8khHd49IBiLIFl2MKrJpqPienHOq4Ex/SGv4jMBFy
-/EORFQOJaVpvHxhDJCOxmkZ0QGK1XhWwFO5cfR/uKXPrTPypQgRy/9n22OsIztdl
-39w+yY4i8QUgrx9sfoLvFuFLMq9hF/LGPv1eXs98i6/jLh5e8zUAI5uku6o6eS96
-HeTfxKYFXhMlOBuROD7r75uFgtsBxXjvj7AAlVq+gWA8PGSKdaFQM4HhndXiY7zU
-abXk2jZCiybHRL8m7ig/wBvvDldZEH86Y2zD0xnqSlaIN9rxl4w2jmc06TilB7c9
-dKB3Px9kNC/aLw3DpuBq81Cc6QvO9nQk81X68FHtFOrN/rTWHJsyyN5+pCxoEMa/
-/15FkFWzm0H/pUYIrZb2DpHk5zoIkE78eCs7Cr/dDVte0Er6SnWiicJV/4H4homj
-6b8qeXAd0NTXUE7Z51YI4+XRM+scJFg0V1yt03fBdwN+lf6dZahsuN0h6N9pN+CT
-F7jXktH1SXJfwV+t8VpNxg==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQDHTs5sQ8yTgFtrvm
+xraxPQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIRcIjrXl4nf0EggTI
+KKtcHLH9HduDSVMyco8BJgSnjrPCheQpz23K36JBezR2PmSclgbkVoQl/vZCpnkw
+P31mY2Q3qAG4iry+i3WKtzcCT8xmLefvQdWtEjIM6liZQVNG/yOt5NF4mLTv82qo
+ix0SKbvZpggFHDwwe4VdWipSelHmkpqQfs7DtvTjUCeIzxq/2RkZhyNf7H74oZPI
+XiTADHsVjb8iMaTdNa7e+XJcGYq28H9dvJRCiIceQQTABq9iWdV6rtwZo46ucJ8S
+epD0NZFiRjiF3pozKdjfnWR0a6LbhFTSTXKW9JYd7c5a+gQc+nQpW2WMQixVTQ3I
+O65MWoHFKimcVM37u04OxN7G19lrbf110Q9TB5BAO1rt8ox3Y2W8yd519h6g/nyx
+UA6TZr366kYJbxRjp3PtVJWfCUqJxCriCDWKOYTPJpQ5zLNuRHxgRBZPw2qT8u4X
+s1t7vITBH9k7qSS/JyGIi7/Z/O8UAadiW6Pz7CtsEKLyInZa3C5C/WXdfsblfjoM
+XcVMkove7B09y8Hm+C0CTBHTZcUFMqTBmQzOHm5ShFP/ZhecKu+ni/LMl+QTWvX+
+hyf4O4a1MIKz/oo13EjFT3ytmbYSrZjrD8MfFL4ro9Nhn69IKKAw+16bE2l5haKV
+cxwlD5YwHpw9atFuJfwf4jPFxEZ+7VFSxvt00wpfHe0VgTowsSHBeFyPiSDUkooN
++NEHcVIOT6C3rImnHez9T89fcqaXGehK2EwAiYriS6gtdTGH/FbSYiVkcK5b5X2N
+Y2N56ZYpN8qlg5IA81UxhvCvIPAsGgdqU9PA4EQx96JSEu3ro+nqfp/AtxleOn7t
+ph52mIXCTL/fWbUMXjgGN2n1Gn7rk3LmT9dmcLwJm09Qe4pUHn0QFqSmQvZ+JYGh
+hH5gLKrMLrgdiolH41R3enGA97k8VodCrVA548zKN4FFd4DS2XXMEQn2939qFE7t
+/ntH9SJalaKYzF16npx/QHKEpK593vGX9hoTK8HV8DmdnblNf9sL7Nu1dNZIx3/C
+YrIg+qQGoaBragcs3D+aNKQQuKR62tRHA8ezM0/WB0AR6ua2dn3+UxLxIJJmR/PB
+jE0z+wYiN4p7beqv4Tuzob7hF4ptiIy8EIicWNhipF3j/5lp14pSRFv97i3O5QIL
+EUeEWW2brxSb3+hEj0Gzz/eVL/ErPKPPAJn63isGwKdqQa/b12DGwtYY1VT9BTp1
+IPj0MV4PIr30ww8UsEi0C2KIMM2CvJyKJJn+CXHc4Zmu9gAoi/QpdJ34qGSvdw2a
+hdYYa9KT9iTGWJzrPdcumCXO2i9ZpwPM4WTNsogWqKWaZrWLZgDoZUW7+pan0NKC
+/MiOK2WCv2ZcJweZbBUstpPiQ2gPjz9gD+FaZXkvRZFmeTtdrvs3emWOyt0q/I2x
+jzvj+MCmqjKr0yUIQ5jHCH5SMidhq5dm+wdMGvIFav4gOVje7JiWLFwUJ1+st7OI
+EtHFJdpYTmfla7X0reOQ9dsNOVfCSgBpQvOVQnY0Et4LuNhWsJ0Lgu6Dbyxpn9P8
+T2yuR5qHEmjt4dOPA/Dm5Q6uRlBWypYqeV7QQyDtWp8rQMNWkPblCNZQzLod0lpY
+1SRPgvdphA6ipdJPsKc+0Mfl5+0pB6Lz
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp-noroot.p12 b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp-noroot.p12
index 4b835a75748..4b7630bfd10 100644
Binary files a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp-noroot.p12 differ
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 38e425462c8..f2c12f46d89 100644
--- a/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp.pem
+++ b/cpp/test/IceSSL/certs/db/ca1/s_rsa_ca1_exp.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-XDhHjM/CWJCaxceZgxp+TuvawcMSxUpaTSz3uw==
+9w0BAQsFAAOCAQEAf0akT9bHrH7HBr2roajPzZ6jDcGPihIE26rUidI5GgxlODnD
+cpCIujLs+a0hc3Nbx0yOGNPbTBJ19Ho6NKQvHesVB41E6JQg0M6l9eY7myCXFAMj
+jx17brJQnSjVoUnF4uN1lrV0geLA3teOhI69CDL5/UFtVxly37/WflzSRabtaY+c
+3O93lO9GtxWsSq6LP5j6MIMGQRbvf83xKAEiF6Yau9C1L/MY+k91roOHvgtFHnfF
+e/0SDtY38jpahRL1cZTOLUfd/tjAwA9a8NutV79+wl9CjDiEI5rzb2yFHu6sZYsK
+xJ4hG3mhVXdR9EPm9f1PagQPYGnPGGN/W+dRYw==
 -----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 2be0024dfd1..2ec358dbf27 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIObZP91BhbcgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOulXaosJAz7BIIEyLh49DvfZK4l
-c78I22HUPJ3tYxiQCvFtb5HQWqTntp4ltrimSYN5K0+WCdhdEanM4gVnEm4WBuY0
-eXCbw3GV6e8qAPuiQstFHO04RCJ98orS5pkIhW+j9NNX+mbt4kJfSYIuDw2kyXHy
-Wyot8cV8QRj7xR6XT9jiTzRk9k70+E0uqG8ewGMoMIeD3vY080/p5+VzlfAQerOe
-M+RFFrwXQ6fNPI9OC430FQ5gK+dNeknbvGDoOUopl9pSKCO4ylYcf9PZEMOUodxs
-bNtw5iljO7D+gua+tedUjxgXmpMbbuGrQbP/E02hchVoaha1pABn45mb10HTVljX
-eBGG/knQLyVh1jF2RXQH2/nHkbZvlKOH3721vjExqfMBdmb9nperJ+A8pPQBCAle
-eU7n+TvmE5bYYzeiJ82h3AUP6DDofUtNrtVEhpNkCd1++uB/K4ThzMYhWLcU+kza
-o4njN0jXDhOJkvYGfvKW+WMQdhUj2HT70SiRO03jzbcxmpcmNoCs7kG/AjorQk6w
-kn9uDGYueZdm894HP2zieVPuNxZWiebwxNHIwUmu8dXFM4Eemn0nTlbz2eILd7os
-2IowoGR5HsBHP37bA77wFpKa+bmbcyih9vrES0grE/CzeRSuy4zK8H/ustFmWsQV
-5He/fMBduJcKFm8a384HVUPe7F69CDwU0S241cNcoS6UgGkbz2mxMrwoEh1tF/Hf
-P5rmj+6xZwElULJsiuyZlTo7KuttDKGdzw+hZxaZo7W+GjrgUNilnIZXFWp8Ogl/
-omEk/c/7FQjU5AdBfeABkXCA/dEAzyjCrL0aZVqSN9d1/nTclFzPFGFNW4/JQR6s
-gzp0lTw3N9ZDJxOy8ruYxFG8m1gPtDSJW/bIXzXi7HlgnAjhwMkOfcSciI/JJSh4
-6y6HNNVxgDHSP/iqrCf2SO5Q7lwp8rU1I1zYQHKJr0PAEkJLFF7OUO4ccbBWHDoh
-G60R23mIFL4bA3iEHcL7CDPfYoZqlNlduLq6ilb9/bCw8ZvM1XxsYJIAOw3OvZyx
-CjZ+GcG374dSUW1ibnAp90jw7g0obMuoNwvRDu6MnBZQVi6XMnYzHokCKGTNQ+ru
-UShOgABfcjE7ITfM3Iq3yrBG1DyZ/L3vSXq+6HoDOCrKG1xJydpn5H14K449cdRU
-uzbpTPQ1yLb4w3iJy3JPlX1RbGkfe8lqmD0l8LBWp7zBeDWaqVigF9ocZ1OYSoHZ
-2aR7srhfGt0uMHviXDlIi5RttNJ2UfWHhvFeKh/bHx4hHpIw5bN6bSdr9wmz6MdF
-lSIgju8UdzDk+h9c2V0UdnmT+VAvqwL99AIH1wPRrJ2Ez1/BicygrvGhK8Q/BxgQ
-Qd3w7lNUuPOrtn5tRDqjmOribhxb/LiPyNfsOFyBiP7cO04aO0joZQqwZrQqrJO+
-lItF9mCEwooebgBxIbc+1z/vfAPbTv8V+o50Yyiu6/xFKv1ObrUW3JfBKrK8a1u6
-uu5wBb+wFaAKbBdRYxRxQwuJyDYKrTRQ7gyWtPo2WAmvmcW29EEuIBqvQMW2u9wO
-XKOcQeKYBpGN8El0a1eoZ8Kok3vIzpjelyEHfOd8RkIq+qwC+Jw3/iNjpSrSqkzS
-gpCglhiIdzhDgKPVW6q5Bg==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQnREPetaU9LBapFuW
+tkIVuQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI6S5LKRlxqvAEggTI
+rk42DlXSbZ7gI4sUmXHn7jRz30+YKDPO5O3unjZW9yiACHArRiJqKkD/gnrqFdR6
+Kg60CTG27Y+IftGrsqZHrEM5uHPLOY7E2sDEBey1LY5c2IjIqrt2va/W2LVoTxwr
+xsKis25Z2gPB+sqURyLHLMTFVuDji87pG+N3o+o1MspJp37ZkEkRzc7A64D19Wbn
+X+4P27JlWi/vClx7BWsR8SlKq5xrDzInwsnwYyUEMdIMQONjFOkSQpBU99c2l4Av
+GHX4LZpmggps4IfyHxNW+57wLTG2F7GiEWL1TL5QonW6Q9s/IH9unH1cJdWZexXu
+Sqg/W8i1Yt/EGns9JmmU1RehqKBEuGnmw1S72PMFpgRFC1usmsAz/uc7XN/2Payj
+CfxRb52r2K4Y244W00wyW9k+Layw6ayaUIP7UgFQb9at9Fq2ZiHh0JcghyLUO29+
+hoZo9udV/j+Nmqn72BqAB9HBCT2vkcl8rw7vaVtHLf9obfwlIvUNs0bGst2Are0s
+yg/gyuy44Qpzw4qa+yaYA4StBcIyYb1tNAuUPngweFhikRpOI69SaD2v4LZOxUzQ
+Bs9nmzr5wqtMgF2sHNNSI6Y/SrjsCEPh0zyUVFSnAK53tTCj9/fJ+hqNhxmVMvKk
++rAlsrl3u9yJ06FEbbBHE+COo92Ks4eqWqibeXymDa8j4lj9/9iMxNdLQ+Tm92wb
+aLy892x3PTSQXa3Uq7ORPn5W8/NYX5qJoX7p3ML2F6uGTRLeh2G8Gtsy4Nc97txY
+VKiA+0fnUG0yIAGkhbuZ1CWCsvDYx2TI/O8PlRlvzYIjGBi1oT5B5r3MmG7aYPRQ
+GcRtLcezt1NUQeWIgwKbbNKnuAaFIL4cCN6TJAA7F86U0EfLw0IIfzfSyf90aVe9
+7XJ4yDzmKZ97ZEwO6UWl3RxKqFE/4JEuzE2wnvtlqKzaFbhEpyNR49/tYaYxkR02
+qTPnsnWAsEFi44xSSzEVhUCiBD9udriEIA30Kh6g42Ix5a1/BtTrUsc8zI3UsWsu
+P65/vUS7Fkfw+Posjb11JAs1vxFQxhlv/IPRlMZLlTMiJLB6Kf9vAGfmkJ8WU6bb
+H3mQkLjQnGIilXHwXGwt6aq48G1N2QKqYcHh2OgRXd1yCMP+yFaQPx5m4+uVN4vU
+D5pgudZzVOCXZaKdVTXPi8JCA45B2/Ah9RnwMA4UWzOSn2cOMDxrcvOGmTeAzak3
++YZuE7pzGYMRNPgApBvYcgv9PNGP6w5x8jsB2B4rTf9S/28oCA2+IJcRJdSQDSMx
+GQgtDjW5/ngZOsIWO99vB7WGerNm25HTqBn6V4K4NLpyvyyYyt7tfTkhSMy423Cx
+rrMRUwucrI9YzUHSsHARdfZjSjS/Uqj5ffvnZ+gqQh7BMLRnpriW3/0Cu1a1UYmD
+AXLMCYZSaTkQiKPSBu7MBb0Y4Mw4FWgpb9fNYv7tN4CGX95DJFxL5jiVi9jXpuAO
+Dyp+4oVaW8Nw/Mf5ZkiCnyZwfDVnFZwhQrEJJPB4+NLyKZR269WdCr/vu0M6d/xr
+F8OutNXuaHTeRurHClDWh4rO/n6pBYt6nl04xg8K83kQk+ux1FI21u3kH/D43Fzc
+KpN9qxhg83HCe35nW7GmNS5vCTF6eriF
 -----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 820ca8f6d2b..dc3ab6fce06 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-----
-MIIFFDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIK12saaqccf0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBwzlDkdlvT9BIIEwBwc6ZDZ5K5V
-c9CHZgy/OWRjUvZirqvH2CeoIUXFbqZ4TftBcatSs65hn1LEFp2tGur9yIDH0O68
-gIhpC5AT1MYahqTlfzydeSFtqLE/0BwrWq9qSYrOhrG09/fA++PHpzbcPaRBPROE
-3n8nJMy1IUTi0gIXkHB5JA3u8yC6YR57eNJibMBQ+/iuQDAav3Adkrw03bnE0lyq
-8bQEhXHQJAdbYBJ6/NR1KAwa7PxarOEk1Bdf9yL1tXrCq4IoLfz6GyhKDdnr5CXZ
-T4aKgLWbQnZTAf2sEDExvopdCOysmgXeTVwIW4Dk9RVWBkwAFyvqkLB/4LP7c9cm
-v9PCnRGXHpD+Jh5RFg/QI/v9tJIHLkUFNqQR0WLrRBA96QJzD40xI8oz2v0FMfiU
-mR9+7p+V5MLhyvHrO/85kacdAuIbMB1Q69SX4E5x/pXNH86bEdX9j1e2UbDbGy0q
-aLz+ejqWknQPNFxHnOQs/gQ7zVB2Ib5y29EGEVdjns68JBSBd7qWI/9lyYXXK4Jv
-eAoXd2QFR3NS4znJ4MxpSg8GCgl0JNWBDvwEUGpgb8+2PPtgOqb2W+XY6b0BWzeA
-wokCCIZ/AePLcaIgqGFK1RBMxWzvuMjdgL4lnA0y9TEE+IHgT30F+OP5L2JJ6Zdr
-Mj5OndtxjKzIbjM4cYmN1DZxD7fvwaPwXD3GE00qWzuwlXj0F7RSFl09VvE4eq45
-oK20OvvR5AIk8Mv07umCxbhGZSHPNmcppEGMHOt7PRENQRD0EzSxF/xGbelstH7T
-bBCoAfOeQnvZ63ZCbWPFtyxRVIvnyincdwmEVzx2YWmlUCXLNQHHWft10RWUZJ2z
-j+KACFwQmvKA0YkRYMdPxzhikBKEmJ2cy+n8GxxXPSJGWKTkc6DpgqafKEFz5ICU
-n7cNOLYqIYn0JTZrWpKFbMwaB8I9nu4peWNYBowBrAFqJ+nA3qblrZoIhHNRLcMk
-PhQruL8PZMQz1R2sVmlAcuXlzuL36U+kRpxPgs/9Kx4kQ2ymsBtDD+17T/deil+L
-rZzFHeCg+w1NgMNtYhK1sXXjyo5ThCiqt8w/XytCNeztM95Mz4TjVGk6mMDB8D8q
-gFGuyyOprT8f2CdGdKP3vkfIDA+hPz3kOd+QQXQzG8AABuroltqRQzUEr9L7byfy
-9sp9vYLrnQ8IrujPqld/OgZpKkUmSNYle2u616sEzGRrRLdWIedNiVziB7Q2EaXN
-qmonjYcfbzIbZghL9ccN4v193MFqVoI0sZCcLTCtF/YQBjge1JFglboNjty5lv2q
-6Tjya3XWRmo/Hq8LyOVtgJZ5dCE0r9lkqRwT5NtkiR32Yd8aQWXNRNeMf7BvXyIP
-TP2UiSmZvWbA2pLt6tkr9Qas0frOxUteoSuqKhBQkbqsBOa9cX4cf1eUhgYGg8sJ
-I44HggINahfnTNIw+8P2MiGmAT4CrT4bUXkOIBHfVkyPfgTpZZsswPmyOewI5T22
-93q3Lsd77sB7ebWwSMdAk/KlFoFKLjsidsJ37exFM3oRPvDjOeLCEe7jN09/08nz
-B35D+bGuX/wfizHfxZzsgJLbrvvnLc30Ghlxgxvg0OoCmgwuyILnKcZoFW7gr5Ea
-XfeJ6Fy6iv8=
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQkWSCyKLxI1G1wi0S
+alMJkwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIqTA2Tjzn5lUEggTI
+SquMYAZAcdtaUI3KVqALbT7zSakBijG1DahDsBpbwUNZANFShZE9lIgwR0eA/ECZ
+/xoes2f2uZoXS7G0v4WhAHqNKKKSfYry9fcQRa2ZTtMscCEEgjFD7gvMc1/Ys0tW
+8k3RlgYozOm2n4oxNoXuMG6dA3eNoe+rsN+LkjS/o7qzu8aCTgofv0J3KSEAY/tg
+metYMcEs2+ZS2OGM+yg1d60fK5oM0025938Hgv/fo0NqZMp8W5XVyLqwXtWE7i6h
+qDiNkBghzvVF74+2JNwmff1z7j1SjluIzyig5zj6qOka7+rg8nzXkLXE7ZoM1jQ9
+01Mmsre79k5HB0Q9bW1XTS9BhHsUOjm5va1po6GlbNT25bxfhisP930QRs/oeEe8
+keHVyI3Cp738zldYbtfeZZmg7Wxn+tJpl2zPuHGVmwJsgECKsGJH1GkDI7zfuYoY
++7k2YnUoVHO+vbH+oiB8WvRHtg/yDldhQOB8qjXVuCdmMhA3mZz5d3CYG560xLFe
+vZmBt91fZk1AxYLm9xav7QuNnsv2dOrN8a4QJV2bgu9ajQuZ0XEvgJsjqoiSRoSM
+g/vIxQX2QDCu5pnW1WAjnbt6PPHWW+CK1voVHK79SG8EJbFPKq08OH5Wa0AJ3/Q9
+1WZfZyHXLOmXk0DB6mgxeHCIZP7oULDrFY6V+NBVtc68Zcls7tZsJZOEGXIPEXFn
+axF8V2otpON/VHvHtcXfgu9Vj6a1henBLEGCGvs9bZbbog0voHULy7wM2PUIUYb1
+5BMrf5cNzA/UV695pFkeBv/HfR6e4Y24RO4/RRIPvx6Yy1wdPcnRZMaLsT2D+sYF
+HN4u4Kv+gSaTbn/VrpVuL0iIFJW/vWv8sVmPasJFYuM8S7zxDMoq8LRJDYHaHc2d
+2DvDWRH0fGD6atQKnqzjIhXzkEQ49fl+FnOAK4cbxUkxISOu6qwQ/P7HwH9xdwrY
+D4pdYuho37rY3sVmsz/8vUqKowPCJj7d6fb9cvZnMQS4n9WAinGwR1JcIBgrRzQo
+twQbvXER32+j+mTGg0LFM91qJnt70dxj2LB6CNzUgUW94piFNBuGJbgofixfRIU6
+RFUNJCf3KupHs/9USsQBNjskrZmGECzS5xeyk0VIaD+cUjHqSvfHHDRQaARLhAur
+Gkgodiq0RvpV53NSzT1FfK2vHgChxCiWONfpPBbI7FoGRBulOsQqFSLXRlEVooTo
+QPI5d8MmXSRQvGnt22RHQDlwZLTltOXfxK3eAThbmSq2BREFVpy7hpDEjYZxX5Yh
+lHFg5g4t2ih67a1Lqbsxacitypr0pWSupE6kVapEMZUTkjsJNiGg9TiV+dBFb52E
+gGm8NYYYg/qeO08ZLgCt3VAi1KSYkWNm57YWlYVabrgoR44TkRo0GIlSd86nC0nD
+S3jF7+i4G8frBukdxwUIkfqgttcL4ah5Nw9ZCn6dIsXnGRb8ujEJrjmlO19qfOn9
+sKd/J6kzTLyMr7Pmvy5ElnnVckxmnlqMWR4VsGdrY+KK1QVcVvI1FKjEWqydNOTU
+1VdEirhA4iDaJbcB8uWAwk2yP8wz8mJFxEAFlskXszY9dfKZSgk7qIglrGn39O3V
+dF+anlm1AAPcgjjl5wmT7DhmDL8mK/Zd
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2-noroot.p12 b/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2-noroot.p12
index 546460d30e1..0a36acef487 100644
Binary files a/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2-noroot.p12 differ
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 c1560e10e67..3217dd1addf 100644
--- a/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2.pem
+++ b/cpp/test/IceSSL/certs/db/ca2/c_rsa_ca2.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-kNGW5YgEiQc2lrxkjOi00Ao9f4z0hy0fU27t3UBCsDJSBVJbLcPqDmjuEhmxMcBT
-WesnN7Pg6hSQ+6ibNfos752Rt2XxhMtADA+bEFwuKqaVpMOgMkOw7c0+Pe1RtA5l
-+14VN6QwlAYfv2nlBIuFFgSyrpz+CTJGm+tJ2Zzj9tD++WfzElKxkH6kL5jAussG
-qfS9uxQHamV2R8AWwd/TzJVo0F8rP/SIfHqkGHQP90OC0a2lvnSdgmrkrWnL9XAE
-qw/Yd6oZ2IHNiakiek0T6pRYXU9zZE3KO44StJicS3jsSRyaArEKQMQh5C+ZSGlG
-YjZhP1m6bXqEn0dXrTMCcwIDAQABo4IBRjCCAUIwHQYDVR0OBBYEFN/f8xeagPAI
-czKwNinrv1hUBXW+MIHCBgNVHSMEgbowgbeAFPlCcsRvtabDvmXBjPdOWlsOMBgp
+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
-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
+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
-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
-iRtY
+JQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQA6mzKWN+i7UWR8Dug0
+ZnbLrJroGj0LXpwu5hNWdfhYPyt3oMOQVV7sfrWUHnNgvybbW+QWRp7mox2/Zm6y
+rwYhL3GrWXjXarIn1eSrtxKoWeNrjgzKUJRHwnnItHD8Rh4RpIJ/SNPwu0luUrnX
+TGlk611IG6pA2O1KpEefoD0MI60I77sXrYUKn9RHoKwmeaibKpoYEDBhjxJOt5j1
+3FnmuSEtHS6fii9AWr+xmU8kuidpmLqDbzAiJI/bjADaSTohW39Rjur3+WEH0lrb
+54L+cqWfr3k1HB2nGMRR1VvFTDENmgrJKpDMG66i3hcMHdhF+hUEBxZnnrSkURO+
+wnWV
 -----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 38358e26fbd..4dcfe234705 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIL4fuaw2D2AICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHg2ZJzx8GjpBIIEyIFlHctM3esM
-ozXAisZLkZroCRDi3OgR4hUpomfDh5g5mzqcFWSE7jljEQnlfrAaHI49Ym3wHPKl
-xWUua+n2PMqnty8VKC5yPrN/q9QYtrwKagEtWFF8TbALc8TGPewc2Z0sQjn5wrDy
-K5EuT+VjaySyCiaal/F+0iWhh56AZmRacuBpq6Fd5gg1mMZr3ZPbMxrUZF1F/RM8
-fvwFEYgRBngprw4lg+/ioCe8b4RyUoTihY6GY4Zl0rrgOYa/sk7rrL9TfD3HK7Cu
-HSRC3b8oEyEVgBBkbrRZHUD5ZzZGOzAijkEsmJ3v7q9+iIbGdtukK0L4AQWqNbSn
-SkyRLUTVg85qYFWXHuzlU3gEQ/3PFUSiX6k8CcQZkPgOswju7FqXO014x/HYivYK
-m9R7ptP/GO+79xEsZBdZE5MePmNBTBcQBEcknExRRytN1NI7APdxPTCfOGv4bsv1
-1/Y7tvSUitYAHi9RCZMNPwPcodrG8kR4dF4/vz7Th4MoNOovSZ6QjUGy13hS64iU
-lWw5gLVkHZkcAEjycPQpdPNtyXWmyGgxxUyWUC8HoyerXRjvfKD7zsRRQkRsOUeh
-P3RbYP7tNlF/pfPZkZMZSP1vPrprBYEL+oVY+0Mfd2SqLGRwITgX0xIctPpNKFbj
-SIeuVwJ43O3N91QB1GK39jg98GNZVCTpwpQlkLq0UeCcjTlogzhwmGDAxBc3F+4L
-iObuHfdFi5egznHDpdHeV1XdVt1c4aFZqCxuqd5vQoaejAzXvv+R84597ENyb4Kc
-pz+Q66O6ph6gcoyJGRnm0YCaB9bM7QbD9Dn1wGL9bOyIL3hnl/UKoN28L0XwF1nb
-RL7AMELsAuFZbNscChVuIDgY1blwIHcYJUwYQ34JrYZgpwLdnCWwIX9KzwhGTp3b
-SMqNHxperQAoecy31KAlcNN9S1MuxSMmV+VXswVWJK1XcFmC6k9RDzuF/zdh0WAV
-ZDUSOvqCDfQGy0z+lWRNYLJMsGnGfmVrWK1YjGn4x7D1i2ZMlcn9Gn9T6cQAU9QZ
-89l3FXoDRWKqkc9gjjYWUGmO+xpDcGGbBJseUq1m314p5H1GHpPbYsAou7FuFA+B
-IsioOsPeWTxxmPfJwSzCsUbXDcm7ZgpIeyFee86BiVe3INtQh7liHOeOToJz0Xwl
-L8miU5EVoH2vrJCigqM1IsuqA6SmgAaxHjzY70Go9bmR9QqyIy0tDPua+yV7JMMS
-QPZeMEXuBNusE0TVniNQc8gUtADPqJQ6Ax49QGGYrEU4r07/gyLCcHUZ+KfgEabj
-6i3tVvGeggG3KVv1/QrEJ5rNrRC5pNlteV7EWG7zTxsA75puZotgp4tKw2qhyq15
-ZmCeOrvn4w8aCNUqABDxIuGJ8y5FTJYLxPZB3X98w0xwrp/FFjnVupMSYEs8yu9T
-DTrmEQtDK6pF9CXOrbSUFPvA4o5mygIQDykUxoc5aibueBHy4F5Dme+7AqfzbTyK
-ryp8NvXboi3KHuE05lsn0woMC1SLksqjDp7as8XBBaXMAisCV8CtIEvTYK4cA2J2
-KRC64NO2c+pTJ1dV6F+TRJR9FTWBUaXsXxCh7uk/eMBdsLmnb53zIwGZaDWrLhVf
-Q4EhhMNDtZLFUlDwhM8ARA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQbkEHxnLNCr7a48gj
+9uZM/AICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIZ4dCJCOs3UAEggTI
++FU8WxXsEZiPs9fIrjQaBQPBC0EY+M/qf0pVquhxt1ApFqLHwybDXiijyET/QDsS
+cxgx82/Nx5llrq2KmexOWqR7Qw5BPbHq1jUUGZjgDJXxLh1VlZgASkRgdaJuN9p1
+KQ7se6AUM+zZuCxiQTYyjF9Me5TvE6JCb0S59newXoS2EB+ciYl97R5ZYsGLsH3h
+Jgs2PkimicHPOhY5VC7xEpi5jjfRlNt51GChRtNujmM7Ac+JVKndrgcSgrq/UAto
+eY0/5ujpNobat4XxPpiseZSgbYiZo4PT7LRahsjN+aveDPPvqbskNjeNmF8MLspm
+kF47u0WEUpv1C44fVHj51P8FqndOtbW2sbB8uAmG2j7gTlcZ+hcc/fD+qSUKTkln
++zAbhi7dst2wak/Q62jV88Sx4OH6L8bgdCMcj8AMikIwCVrHfXxvCXLxDd4Hc6/a
+T5dIFJQGdsipUi5d54iWKHfrP5yxF+KXtd7d4RF+fEXOAU7bXMPD7pj8DIjTLGAA
+hPC5PEyTrAs0+np+51fu1nPD+Wkynl1nfMvfG488yx4h/JeU0rJ6Lt0YT45W0oXt
+KiR84eeBC5hrtn4Xy9wr3VKLIIY+etnRvGg8tYrqr9uKJn6GnCxuBQVrJFF2GWbn
+0G415Je3cA7GYrgGggFktCOfhBKNNeDExi3wB5jhQrpJ90cFJxv6fLVxvdHvHVDh
+BQoEWqxtdXvTA/wSXeA+Ws7qUYR7TiQl1YSAc6UQY2azZm2gxVbe4QsaXDBOBdAf
+5KADbbI1kxQ/Im7NsV13WvDrd/Onb+iHuc0BuWReZVZU1mSeNPXrd4Gr6W9wcVXx
+ch1qqfvqB01vzdLm4nxQNGmwXxnA+zA8MFvWamn2bdurUhTJBiNuUPsnXgoIa/KJ
+AiJ6KtTwW8pRi/x1Z3kXoiasuCCjWwTpc/9sv9wkapAzIva7bIU/PC7tt3fdNF9k
+2z3H5LiMyi7wYrDuJraf7pD+628reA9kjhWQe8jEFx8VDOKqOBl1PCZpAjUKQ08Y
+7HhLqktonhJgJJ5lUsl73YfmcsbbG2G596dQoko2nhBwLy+7uGD8x3PpBFfhke9x
+7fPfjIp+GNUfLfuiJFiWm0jR7tJRvmG+JrPQ8p6lqNs7ldA6S3IUvCDucE7IbfaM
+Co+YzoCeOcFhgaVeAoIssqvLk8s/6oBnbfWtz5nfZxQ1XUMjYCj/qFUVkVtEd263
+WjNp23KysH0nQ/qvl9zaeiz8ZrF1CepB6nA+QePGjrUWEu36ofLaerSBnmEaBSJ+
+/XDj3Oc6RL/uubM9RdCD2OvT8i+GWkkxV6TEcHarnz1wvgfop5o88I81D3YPJhUm
+GZvIMU2vOHBlbqZvDkQ9kbUmv8+/xg+7wLQv93qMXQKsR7o46lQDfikbsf7zMI6i
+Wk3h2dA4BmuJCic7sgHjtoNYLxcVLg3tPceodmoBBJ3NW7h/RJzS4OlWI+dwS7g7
+pzZhX07Ia/O9kMOwXUxxtUtF32GQkDFrbD0XZ6m7r2aCQKyUA1LhXhGfY6+n3iB9
+lU5LiOzoQ5izWNcHdJtwWAlw8NnkcWaEqu/NqsM8N1sRu1j3GVeep4kR5/HP1g7Q
+MCt3ZX5k2Dzd75z6x/We6aDx2A3qO82x
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca2/ca-noroot.p12 b/cpp/test/IceSSL/certs/db/ca2/ca-noroot.p12
index 31dce4c7a7b..f9fe83584f5 100644
Binary files a/cpp/test/IceSSL/certs/db/ca2/ca-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca2/ca-noroot.p12 differ
diff --git a/cpp/test/IceSSL/certs/db/ca2/ca.pem b/cpp/test/IceSSL/certs/db/ca2/ca.pem
index 10397ca11dc..9e9bb9e7f11 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-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca2/ca_key.pem b/cpp/test/IceSSL/certs/db/ca2/ca_key.pem
index 91d451d21cd..97764bc8cd2 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIC0YQXeFX0mkCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECArzt7patIjVBIIEyCQA/f3lrKNf
-ygm8w/5khrPikG9JAtT1UedoSQEqmkQTb4KYHsSMTpicawNfPsxvj0YtUeIEPkew
-rCtPOdV6G6CTLURWIkCPWiTOu6o3G23M52QQ0zFa6Il7iKiONE33N5QF6znN8Fzv
-NZ987Be56dic25rxfPqdNYIsWVZRvTV2blHMppzremmVDNAlJKYHAp2jQI0hp4BK
-czrr3+gKObhj9CRL3dKX2iRfjU/m0p1zz/5qtgQJeTnOF8imWNKfpnMUPROBUefi
-OJ1iKu5FdGCpyA0CqCFKkhPcLxpIZnXfT7YfGPcpXx+NnxXevKIUT+r21YplP/0U
-v6sVy122YfxFhoRNrWYp/AhGYy2xIvZN8YV3IdIvG6YM1stvrE9HG/Z5vwwN3JnR
-gEZdWmFg7f8gT0ugIVve62dfYCfFp5SNgCna+TZazAYVN98uOo8klLn6DAl8sNFU
-dejdhVqbk+sCnImjrzD3GTg5YhMLnuJErQsXtMekfmqXwGT/dwbmez1pJAud/rmZ
-10Z9q7K+rjibTSwK0/M2A3E33Jz0+2fEgUluosaI3bhLKk/hdFhiDROyH/TTK/FX
-CZJvTUvqY+HVOrpCI8O0S69lWPIQWF4tmE5qj8wImRgIvoX5LlRd004S44P9ohX8
-sbwET1LJcvFlAU15g1cBdhgNy49El5cBnIkPx1v6ynqBdNOqNncm4eUuYInE228E
-NaPF02xLQmkD2tBGdEW60Ch98BgGB98Sj/ygW16Pq7bOp1toFjzyx5j2r6olSBwd
-2qUhOACC2OJNUr6DwkvQuo+piSRrprV7T/tsQITWAoH7yyKfeb2zQiIqO+pQVDmr
-zCP2QqOL+R4wroi4VaBu+9D+OBksYB5TK/wt08Y2Q7RrBTItx3Xf5c+ACSBdOVv2
-6Uzflf+a73GGCsDt7czhxhIbfR6N95JILKvuo9mlLTQ8jzjFaZlRBIT+NSRvk3c+
-rmy/rrhIJ6hiUUCFWO/wlT9aueJEF13Km5O4VpaM9s95pfz5hBpxvUGZ/MOfXINY
-10XI6+zVTvBmcoctR4PhX1kvHkkkVHAHj5aWbFeoDwCcRd+SCSqdEUIuLKqxrnL3
-E1blMACbmk2RxFSZK5vA2G8pR4PNhPVJnwcJJb583StHZdLZoKJnA1soT9mNlOHP
-PsJgKU1/AEJMoxKtODuRKhYdXt46gQ1P8KqpI114zqQUAhoiu+j+hR1d5rnW8G2N
-Bwd6BXACeUOEeR9a6WFyizw+/g71PZZDn717z6mKgBParPw7bOnrubllGNYgV+da
-WMhAJYPdXSQE6O6wWUvm/bFl7FgTx9RsK0FsIqTqZ2NPfWTpwXYomgq2XrXxgbQW
-CyL5lqJkM6WOyZ6/TLUtQLELGgefXdUVGnr2WjYhF5XRYwn+2RwcbirCvqqM9Mkc
-Kp2bcdqBpQA18wHiCpEz9q1EIcSCsEDUbGOS5R0boXOpc3EBzf0MuC4ByQpRw47G
-aQ6i3QJiHih26TWEJpCIZ2uUyFveyQ9Kl+vMuPGYexxArlJ2BlKUvP4NOdRHsGox
-r+JnvrcIjpd+32N/B68h8TThZN6ckUqrsDhGXinsogGlZ7zgzMb6pkHGynp7xBa+
-OMC6c0pggqJJMLXkZFUXMw==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQ0KsEUdQJXL0Pb9DW
+tS/jbAICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI1p6aCvGZ8KgEggTI
+/qJpXkZoOx6elkyFjBFj53emK3EVzBl/xZsiVXFCPMtxXeyryAJyCWaKOmJT2p89
+DGPUsXPxTBHoY/6sPIgg1vIf6qWPWi4jtW3aVJb2Dn+YKGbMRS7+E8edgkQb5F8t
+wfU3cM8ILJJWLD1vb36D+8/P78E8/iaCwfJehjih4GzeOfCWZBLKN9LzXK1/zDtd
+GMGLyaSd+7T8iMiyQyzHOa0a7AbqQxiY0RFz45PDN8pa2Fnwt3YL7a0FJHsZDiep
+6j92aChWETEvjWTfvCIcYmvkNhJBNauxFTP6AuKjn1Bn6AbbIw+EdfqSSvvg83rx
+0fmSpA4n9CsXOGJafQFtN7j0ZJhlw8WZ9DWWQotsPEhbF9bF91Og97rsc9PomVaP
+jyviUNuPACysc/0ACQFqJm83jGG7unWv+r/KuCf5CpPP2EdOFTFEpH8WZJzENQsR
+Fb7E/LG3j4QSRTo9wF2sA2BR5wr+/IcqfjYj0ZodFTTLPNGvXEf5+Z+5/KsR2S09
+kwGeQyC7m8W2PLpenVfbrIj8nkAEqMx7S5/lw5rcR60+ROrn9lJCAanNyTOirYhz
+XYKcbstz5VHp+XQfkUrVYHPEpJslKA8neQvFF8UCgHe1wXIRSn7ciW+Q8g/o6GRC
+tzNqhxabUfq/8cRmhMKwif+1/SEoD5pxHe+ST/cLjVILtdFoTWqLXkXimDEJXbnw
+UTNIYf64YBTk7fCNcwCLC8WIw2JhwH7c2hgGPA8COOVLQNAnnA/59yqE5vR6OB3S
+HS/B2ouXNOlNzLAwriEDyz2beV4YuS7At7eyyYOX2ap1uUPPqSi4PQ3XB9d73u5f
+fbCUTIUZcQLXAcIf4byA5XnIHeNlQmJ72WAonBGUGS0NXqNnZyF1CohUo1ur5w8m
+8uSj5vpaHe7vCW33XbklvcsyHE7lL3LtTV9x+M6HpnV8ExcDFeMTHkf8zcbOyMCp
+uOsQ7RtLbL5iTkHBjAsQiKlvAEt/n5ElUGuEGFyuQhrN5hgs0UGAj60aC/+z+bQY
+Ys3Ve8ZnmEB+VZtYbXxI2aju5rBuO5dyz9BBBrSDi2PfC+c5TdrRjwWphterF33D
+MdwwN1SRTAzccweFH1ZlKLcMUwdPECA7hx4yXSiL9twk0O8P7mhpTkQiV7w2ez6b
+BIV0Sc/NFsOLZMm85oV0hc4ZwI5Wh1j5CcYhJthC6LqKXni0jA8SJNGdjp1LFK1p
+wl1aCJuT38p6El9MbJeVL19WZl7CqJDkhGDaW3XgCmUtkampEKfD16tfFVVINTYx
+q1kAa+Iy2op8PKY5oFAqCq5VmidqdTBDUNKNN72c8+NTej8OOF2wfq9YX8OF08Lm
+ZNtoBufFT99NPaviCYcYr0fiIMV5qWh979iajJvJhB8x1ztXq9WYGSkh5PEi4VYb
+wu1uXiphtaYOYVUlYBENKbqWKyGO0kq3V5h6nFLbiCeOec9TK71DSKp93h0P4nWJ
+voUD9gOYP8a+6uV20XMHVNHuFH+RDqWnglHLB27FM51ljG2OAxK3PxPXqpUF0Uj3
+2maFm+gJogy3dnf83sOiHWpVUYb5Eery5tX5wF7nhBE3lBTrnQuwP9ayx+SDxArI
+SidbMmZ7b4dG5wg/4bJ5VXTSk/iaHpm5
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2-noroot.p12 b/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2-noroot.p12
index 65ee8764af1..0b5a63f6272 100644
Binary files a/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2-noroot.p12 and b/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2-noroot.p12 differ
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 5d5f629d669..f1408620309 100644
--- a/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2.pem
+++ b/cpp/test/IceSSL/certs/db/ca2/s_rsa_ca2.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-wAy7uQ==
+HSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAOIPsXi0j2Q230KLA
+36wFSRylHb2qY9vXTRpHBGSzxYFc1NLd6y6Vix59TBe2eVobRar0b3kNbKJyYJJa
+vjZHyegelpOkGkDpbTxdc/u7bjYbq39rINBdWUrokT3fg885SNkUPBd6ubg0YWB8
+UcObkHBbfpGNqOcdOmijEq7/duL6b9eR6q27jg2wdsLTdxlLXPSBG2Sx7YIvvVyx
+ZbK+Gl20HPSWECK9nQbtF8hBuYrWuyLTtAMsxPcT/OMCxVz28/xXmEsmBs/p0Ya0
+X1+AptfZT0BTburiXSrKsDyQMTx3SKMUMfkA2P43NyrqOXuokyB8AAf3zQoLozKK
+YPW/uw==
 -----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 67b2a3bec10..4d6ea8af116 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-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIarDwmohpY4MCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHpAvz9aiEeVBIIEyLM03UDReo66
-g18PT8/thB31zNGRbUFqDJIKqQNuhbzO77+4u105Hjxxj0K/kOeyaeIezsd3HZIS
-+5dLrU58lpaN9OlIaaD8kpb1Vpa0jwuZZAZgDwUBTMAvmNoXZu16gKkr0VUJiP8G
-zMsskXCruPPFqTpXHisiLEob4VkBlMMC7fkF5tv/6K6xN1R/aBohZnreJoMoTz4X
-dW2w9RoQ/DdrBx9uF4buuy454Pc+I2Rg+r+Nh6xcsp1zYq1E6JNvdollbkCXNmq2
-5OYzac1MbNGU53eWTrrLeoHduw3pgWtV10qyqSBdUT+myKfOx586I09FDtQhEOGi
-zeLZeOk8IRJi5Qs/f76+o4T4nLzazWkb1wzQC7SZ5dzT3+GzbN7FKW+iiBuP9yNU
-qlThk7dT1ZvgVzx/GHyX4Kiigm3ws6mK5wzqyoSlQQLQ49Ra4rrcOxOGz/aTNsK1
-NIgiNl/7o8RDo6LhMcU9Uc1rosqeF2PA7CBOuNMdkMz2bHgYaP6U3pDOPkwJ/I2x
-fnuHcERSX7P3COvNu0ZoY0fj/mfAGWL3tjhp0W1A/Dop0rkZsOBrYMxgwYmdJSHn
-IlZgKG4eYwmAm1DC2WgoDFArTTfzo5hv8EwNWTLMI19m9gp5mizf04n3XrKj2Vor
-5yzp5KaoAH8gST8YRP3zA201YlzOoLfMHvg1hNb/kYj2xm8iKkUTo1Xf4u1k/EsM
-a4VU7OldbrYCJzNQb2sgdBUIQ8iHXJ80DBM0uuRD488xe8eiSh2mvCVwsIc3MzBx
-ztzlV4eCPto4/eiBJe7qdtHejOd5jaZ2xAd4CCsNQyyjhccZoAXGx5ODVtXG/QM2
-rBakw3Cf3Ol/IL8iWMv5NXLVSNi2RyTLZzWFwO7KQzdytaWrCcp+2qi/atlCKTNO
-p6Ozp4pmY0hmpiMOReW7afZGegSBYpnIgJLiDC3/epz3Mojocr6ZvjpQBI+hDGQU
-wwL1o/8Jt6ckhm8tpP0cVnDBvE+oOrH+wrf2JeafzKCIG9YgyKWavyEecGvmv/HC
-tk+lWlZAxe6D7dsQUvpy1SfeJUl47ffeWscExzl9GHcGmLM6YGnDU53R5JSRhl/p
-N1v70qkZkBC2DMEcDeeF9XLbLD3qPtYFdu/1ORIZe8E2ySE+4qIE7g2iC4PUVsV0
-wlPemyw7o9+cn+KMkviD4pIHjvQOIV1BPfpAkeTDGgumGW82ly3B3XAJpPOAfaiQ
-8yfGDRFx+rNguDjgrWCToLntXiW8BTB0GSK/FMFrCNNQtf8paWzHNw7ED+5czcC+
-lce0jECdJjta/43nC69Bl7sWb92X6AknA708JiCnJBY2kNsDH8M7gzR0yUlSipJG
-qNksMnQLhB56zA/pmJHPjNsKCLZq5rjbbm/XMDEx+Gy7fx+zJIAm1u+GqxCx9KY5
-jhtPNd+tFx7nZVbaszTIX0QA+WE4zOTvBQz3ur/E/ktzkNGF5xaPKpfdtCs3ktPG
-Yp+2xmnXfJ7HUmaTPkwr3Rxq5W2E5HgNnYYNAX5DlsiyRZ53laEVQDsYptnk3SIW
-gj0EXOK0b+E/brut8tTvEXyQn8ChRvoi5xHIqG9g873P6MaCV8HHl4eMwYfUq/R9
-503YGnMwm5MQFW58hpMH7A==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQCMAhG07Hw7pn5X60
+lnk/UgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI+YhJphA1OJcEggTI
+6hLCVhTUUVYm9eGiDUz0Vq6r14JSKHCunFQ6423fw0YUmKUzlBdGqEG0Ays+LE4h
+K3/Ks5hckWPWAA5J5upe630ky0OHJqon9Fe3bFEjrIaF71Xp6J0bNY/QaBP9k3OF
+tsDtfIVyvIjjgyWHQpFaciIJnGqTqcqSj/uX2GmmCj3HXr97+auPxOFbd+OwR/tt
+Go/j3f6nYgYGL99G7MeWrDrupw6ZEqkZugtQs8khKyBbMh78GrIPF20cpLlPopp2
+g0UvQxrUnMXvDABB4GHqf3BQMsiu1w8ZbDrA7NzzORJLNvyxT0TijnjmDt6mqw3A
+hrrswBZQplzC92+OFgtoUUkmaaLeHe14FC1u+J+Hbqeq+Y4JAJ4vs/i6YYKigZxj
+t4cSShcwIdOb3uTiSAZCvK1A6TCGpECnu8W31i0fNhA3b6JfdjTB3XM6KNqbFoKX
+8d4PMIqzKdee/oP9Tc7p3KEM73cPo2UfTc+x4Q118O7YrXYjb4xDBE6sEBVM1v7n
+WKc5SF4UsnnOicufEna7M53ijFXY4HzvpSaWsNEPiGNa1RhgTmcmFuxU2H3Ew9Yy
+/IFlbd+K5hoOA+ELMLSB+mov1cpFPF9X79fAD52sfdN5lcfSb9KDp8FlH7XIlJJ4
+jvvXSmAUmCNJki3lkQJavElZ6pfeVWEpcOf5H/MTGZqsJR6tvds2vXlE2ee0V8q7
+Ag1l04SgowiRpyH4GjYonUG1IIEnc+oVJYUZW/woggU75ufzplj/itxLzhFajwsL
+kM/8ZixYQBlT6ZsdNx+YuA8mDGjr/a6idHKnasVMVWiSDNH4/yxyZVU0jHFus1pT
+zukCiauv6q9OvNon9MJSj7G/1TphLneyjweU47IZ5ORUyK9pRYY2FEQ8XqBZuGOJ
+8izMn202pnA96Co8YT4ZgAJBoUCPTyvy951dpqj4FDwTWiij0DpPDhAa7oZX69lg
+K8G8b+sldfjVYsne0V0cD4K5bdGR6+69BBZXrZokr2iJ1tskD4z9jfoScS88ZMrq
+pw0ky4BfPVb1AUyOQjSa7ZHKrx3s0GhDEjQbKEPMxjyfe46uhQhgR4XfK2ysVqJQ
+gbisTiceJQPYrpxtD5yCxmxXcyZzllfz74eoI1c+mE0lEMPLSVrP8kopinKOnCd1
+PQRlUlfn3Qby8Q2aDHKV/iflNLyL4D+6IttEpsZH2hP+CsweRG9uNXeaw91Bb7Gz
+HHm2ZRMA6Wp5VI9qTGnnupWO4Nq/V19ahoFs8A3TLgZgDhkKexBC7eeNl3koLOq9
+dJmqBOzGg6If8X7sbnwy9U2/Aze8EDpX/LQ9Ra0lqJ8b/7dfraImB5sfoEI1vEu7
+JOEd9F7nQdrm11YtVqEsC2pQaGCGaarnRmXyxcz00ESRxVJiAIR0K5Kt9xohpVbd
+zAQ59duLkZMtGDke3WrFuSY0TRFNlqRjKkH4w0T0I9h2vVw347+6GLD51xXv6YlY
+jEDHVeSv4WSFkC7xSQ+kpJupxeFD1KKP6sDqkmpMt2lD6YJX+k5XGmVALF2byOLO
+lm/wpE4o3NT0Ba8JuGq1xKd1LYfct6mqd72mZEps0lOxAqkvKjqZbdB5V2CsB2x7
+VWFH+/UHArI0Zpy5dgOh2KdA3BNTUCIX
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3.pem b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3.pem
index 94680231209..1bf976a9c42 100644
--- a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-cm9jLmNvbYIIMzs7dCK159swCwYDVR0PBAQDAgXgMDMGA1UdHwQsMCowKKAmoCSG
+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
-EwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAAR5+UHnX78J
-dOG4MbqV2TIb4oNtaTTC6e86xQ57bFSG4ioxMD0sTmhl8/bvbzFhIKCC6oxUh9SL
-PaWbWeI4UOr6YEFGfsHmmx9nJ8cKoG6pTHNWrAkoaJYjuEf8OhATk9tfH4D1J1br
-s2vpPOJXQFsVZ51GK1PQGO6X3qP+BotUqEKn+MquuJwOYdtkxqkrKvkC9/0BG0Fk
-f7YpQls9r4M5Lg08ZNqBhu6fWixrH99j8HgsT6qnxRoTaguOd9dSYwLmHQOC05gB
-M9aIjI3IkcWGPy+XIbnTkwh5Evj51jfMZMLS/0+tYsLOYG5GY8iEVn/RiQaM93i+
-lG08H+4bASM=
+EwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAAbZ2T66zToh
+H7XlDFCPcPIrzzMEtLUDfc16QJE2QC5R5l6DL9dceNTi2Uq+rAKJ3BDJxguTvQD+
+eLLsm6MmADovsfXLOgMRcfkAj6J5wrKjtUcar0nbgb7FNoFAr9oA7ES37zdF5Sa6
+3mEeNdDnEAhnfXdwWk0IKdv3IQpcJqF9NfhZklNg5wjW8ipP+Yy49iN+ByhnNSm6
+9pYYx0aziXGRJA/SdKuiub42RKstImWHAeExFrBPrCj8fkc0EUtPZcmB2/NXcJFj
+A2Q0P50e4k+MZS1L+Fc8S0Iad86yd9T40Q+G1LrrovCUQ2RjKadhpO2xukK29QJ+
+52tBTXv8G3g=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_key.pem b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_key.pem
index 7e0f29ad970..e708572a3ea 100644
--- a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIy0vQ6NBYTt8CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHYo4smud13EBIIEyPrN7EREiegG
-mNaNufrYuhUjh8FP3Jtk09HXSpDY6zSdM83TtG7szyLkx+DypBH4lIIk2hUtngQ9
-9kc8LIYYp1NhMweI/8s8F6OFlfXXWICHLkBem0fiwUqSENHxTZaAxWs8BriXaNvT
-wPKb3PYtdP0wH45pzgJ92/F4w8JCyMaFtY4362emb71LfnWmazu8Gik3AKy354/h
-3d5lLCEotLDrL50nw1A6vYORyFqVPks8hU5dkEE2uH0vI54T/woMc0ZhaSk2Sff3
-mzYg96PeYnlGVE33/FZ/pAt0KJZBph3a2M870tK8OXqRtLC8G8grySmKANOJrxp5
-u60PNrGW99PSAsjqqOLyj+RzmK8HYCcibt3UsDE+pj8ys1Y1PNzBxnGaNpGcnB7h
-5MiUd/VmJKkOHXAlLRYvHmEaIceFfCD3GV3sGe/dPD5ps+5vGJYqAR02UNZkA1lt
-jUgZhrYcnY7Zp8g1knhENdVc+Vs9Y4+jcjnr8IOQRbjmmsY2/soFPjbxCav+OzyU
-ZKOZQvGXIC5uI4FodTY5phO2VwtCVak0h4WaT09/5Joo38w3Wf6d4jYoC5O3vZdG
-8AVxCYZJeAGfIW8fpC9KgNstdQTmyFuYL8o9XgN0mAj4EBoW6V3FE2kyjuUtwaB7
-VZ+lvZqxA2LmC/RbDVh5aq12GCd2JrhJ0cD2wrBXMqsHglYYFZrQQbA4BsXicwfY
-2tY1V+IM2pObsyXXtStbgF5h2HnlZ/8C+bYfRx2ep7ZXj/89L0rEt6WhnukJ07vh
-64Q+fo9jPFkokaoKjLj1ki9P7fAcgKuyW667aORO6Sx8zqTrDg49Znh5Mu+B/7ah
-4xtfyfjemB4fl6tIMG3w2JyAGbDyFh6sOCCO2GcmmAc9L4U6UKMTu1QyqzI9UQkI
-jNwGL2IBZ7aKEz12Qp0SgKnvnHIHVj/Z24qVRDokksC86u5Brf3YzA8gzod5P3oH
-4B/o9v/XwXkF+Ze1ScTrZG04a8A1jezBf/kRrMMxR0UaRT8rdOWEYcUgrYu4D3rX
-4aRo5s5PybtuACqRbHJcnPnhbopjp+vzSIN8JczKiAy0wTAlDS3JNBxl4Ytcn5+V
-rvLsqQI6W0U9tI7I5Lp5WraDVDo5BIVoJJg4K3yUJBC66o+vursaa6nTzlJgot73
-vIHAZi15blucyrTOWeWFmbURgGL+/Gmfe03yiP8TKCHFlXldfFkBOvmGIAiL7UYy
-ezDU/TBrKYqLwP6wCckysbX2NTnS01SuC4mX4K7BF0gk7mA0K2wHuZVPP6D6MJk5
-wY1POLdywGtMaSZiK1ykO2Knsl3P43m/dmpgzv+n51ebUXYsP2zF7OhTTZMODwbM
-K+Wjp351NHWSUF7vkEP9VEXbBB+6bXZZpqmzqR3LorTxvfSm5ec7VaAchTrCjl0O
-VQOfhXSUNv2hcV+cbLChdV42PG4stOzVo0aDL/9lwsvJaL94mQDFR1Xmot6wlm/m
-F0wlRRQGguHahFmVy3K1RuLqJicol2n6whoiZEUUBAcgXFarGpBmsLSlfb2uCi+6
-MhnvpNPGlT/MqgoactCw+zP6lUzZYwyLqWao5g4rbn0R3xK9dq+KfxlkcXVaFsJJ
-AXkT6Ckoo8PxAgBf+hA5eA==
+MIIFHDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQDiRy+Z+wUk/KVXOW
+80hVggICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIS8AtphegFskEggTA
+J90/Z7afwI7xvTonL1sMQ2JbjkkSh8SjVYnWwPl6tIg8Xv9fv46gWl+9RKo30MK7
+RT5c76nUC81jaLL3sAJzNS7+jucSgrmyxGn6oMUmcErgWtAltg2EFtONmdhpI5V9
+KMQPhZQEFLj2joNODtKiOAdoCEv0CeTYq1eR7BN8GYEg9oFKHuUoRPz49rl3dR7t
+vfcX8rrIhCxGo1w/Py8ztj7r6UfO8LgSDoc0XH9sDIaDZkT812AKuGHdKi7PCv5r
+CcDH+XNGWZn7f59zhMGJAT7D91WgCRXWNMNoDkU1txzO7eJwvVrv9XZ57h/e7F8U
+IvNZEe0FWnvVx9ziegM4u+uFOL3gSpWAMN70e+DQ1ADQd23tjM43l7/q0GGwO72u
+XhlrWlIS++Jt4gXqECgFlWmI8QV52+BuQ0ETNs1fLI5BHzcrz8nb//p/3ltVH9NN
+Tt94tsrjmXHnnYthyDqmGiO4wtN0uNHNlsu9m0u3AoOiaChvP36ApXZCzFGzERvO
+rs0FEQdPr8GHyzl289U1IOdkwqOyoESKm90f1n66EAiUpmR5df+olk3xAAM7nJ1U
+zsXqCo+eBsQX1h4dDcY+FXVAcqbLHFrz1ruL6xdHIr3pNNx87OpDXq3JuQBsPsCb
+w/2AZQ7MuEDlMlAL0sr9KNbe31g9OQFc+fjsAQXNOTFOqj+HwcJC7OQQUYOq1y+l
+2esUQiwyWzdSslhwM2VHpdlIE0XPQo6qyj8coLEXUkZceb5SZInElPBOwE2CcFjT
+VxJvMAEuAYulydBCkteliIxuTpY9/8/ew6L6eX9WYyd3gyyKlEEZpxdgaoWnCe0S
+lPeuRX/IJuR+LbiuP4cjSgxDVzUvByMbEaJ8lDkFVDLRdT2suzKKRQMA0IWHFPC1
+L1FU2Rarwl7A9rO3vRwvK9YgvSAJajWZFxeYp3WORqfL44/uzDBja7Qn2hR+42tf
+ngXdCDOPwgoc7gGNMosdxF4hS5F7OzpD71lkx8bv1HUMXuEUsppHVE/nXFkRiOFt
+XJ0G1+a1gDi4AnpLu/wtj5510UHdUf+GIM4HiIdvnNoHMPLygP/ie9LJWm+rlkwV
+/EWChqn6KJZwaOW+6fRqMSaHqwv/9tbgMidHPHHdLJ39MX+64obSo7WLkQ4kiabn
+StMQ+whtumncfuFyEAwy6IR2Kl9/yVcr99pkCgAub947OErnxoMq7kd66jVioywZ
+D3HAwwP4vsloXeWAfD8uxji927NXP0+EABq9t87t4m58BILxpDICpCdxhfbH2DOd
+tdaFe6tyBSrSHppdk3bouT3D5ijKv+Qk8tyvFFiquoZWeCb9T69HFQo0OvDGKIP3
+3zuUnvHX+b+DDv2tuBdNHGJygN83n41oAT/O7srHAwf8MrYgW5sgxsIl9OB/1UzB
+k3OMng7a2lJbRAEJRhvhQ3jbjWdsOUK9IEiCkqinSKnv3MUYKNuEPiIcD0UM9RCL
+WuqLQB/xI8gvynbMEJT4n2Nj9QXzOlEfNGw8PXUvZEbG3qUoivfgLf80nwW18j8e
+r97uZJDAo5oxY0CiVgFauX734hyd4061PYy7qkBb99yqJuDOmoaJP6rAtSTpc6B3
+nqJZwTuZNXe+6O3U/cSL+w==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked.pem b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked.pem
index 0d103be1b6b..72f1eceea20 100644
--- a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFIDCCBAigAwIBAgIIDWOdbRTyI9swDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU1NFoXDTI0MTAyMTIwMjU1NFowgZExGzAZBgNVBAMMEkNsaWVudCBjYTMg
-cmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
-A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
-BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA8v3w04XkYKD9kUiew2Nbv+ROsRMKXl9Nv7yJg/0cwXUaQwYJ
-ErEdWOEAPRvOzlJWhToeDi8sr3vYBHIuTBwEjOr5+NJrPG4I8SW01Fs8tL+j09+n
-jBk5lQEhWQdjicyFZIM/q61PhsXhc5MocoKKYr/FSbUIJAYnmS40ICfsF9xNrecm
-wUt7hR1oh9h7kpJF7PrfDpRPiijSqP9WRZmnghX8gOyXDxe7H5ofOM3TnCU8no8H
-yJQFW/fGgZdiq3/hNHIkFQf4Bx+ZfC93Wjr2CI7y75rrqQK6H4GKl0itNNymbFC4
-0sIUOJ+pgubPRm2OT3cMMYekbN/8hcJ3BIDoaQIDAQABo4IBezCCAXcwHQYDVR0O
-BBYEFMD7rGoH8CoJuZn2X772BEWAMJhtMIHCBgNVHSMEgbowgbeAFHe0egLdUvhu
-GR+r42ytSFEH5G64oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMx
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbYIIMzs7dCK159swCwYDVR0PBAQDAgXgMDMGA1Ud
-HwQsMCowKKAmoCSGImh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2EzLmNybC5wZW0w
-FwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
-ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQAD
-ggEBADgGhqe+LXYXPBHRn3E6VkPWQvsE/b51fFyytoTcke6a6WvXHLb5KuLhdzMU
-jotmb4NAQDqfslq+MJUXcHHFLi/3dS2p1/mZBm797BEGbSvwBm2N5O+FYRjbKgLN
-l3aPncpqIfQ1EfU+gy+ggPBmb0Ssjyvz0lxn4fBjA6m4FwA4ged4S2dfcLlpKr9x
-wZfaYMovPVgs/AwHIrBB0veClDiynrvBlIc9OYYbB3RO/8TnkhtKyBGCLqcCEejF
-ddtSvTH1aHA9NW0tnTVwGtUP9NJjKLohcAxacYJ+dQeXfrD401XRClEHE3NNLGjC
-wzFUrCwDtHy1FXmp3GeKL/pOW2c=
+MIIFITCCBAmgAwIBAgIJAKjqZpTIWSFnMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTJaFw0yNzAxMjUxNTI2MTJaMIGRMRswGQYDVQQDDBJDbGllbnQgY2Ez
+IHJldm9rZWQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAO
+BgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0w
+GwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALREWnKLiWWy5a/2SYkZOGB3j4U4ZEdZ8JFGtMCizgU9FfDO
+DRjefhJxoOw8+5FfltlOCYhGDmGTb8UOKeCLYIASg+7tTLTwa09/U3HS9t2CZwlP
+Am9a2EcD1HRZKz/W09avqfaOQjJt+z0mzL2ifF35Cq5TsKp6NiWHkc6Fld8tjR2J
+z80gqx7QJJh7/2n26mPUtKMCenpLI2fsV5pOxaFwRF2ca/+kOh4m0vbgs78jxheD
+Wf40QZGyhkkKacKY+jYsSU4CQJl2f8Hr3mJL09buk/mPCCM4TbA6S4RO43OpCpan
+LUpy6yyNheySqv2SpMQxCKQv9iI9wbz48iXCv5cCAwEAAaOCAXswggF3MB0GA1Ud
+DgQWBBS4sVPYW+4h2A3XclmTSUIJiaRcZjCBwgYDVR0jBIG6MIG3gBTLqp8sWC5R
+2KkIfe+lQDFecLhq5KGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAz
+MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdK
+dXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3
+DQEJARYOaW5mb0B6ZXJvYy5jb22CCB5kBZmwS28KMAsGA1UdDwQEAwIF4DAzBgNV
+HR8ELDAqMCigJqAkhiJodHRwOi8vMTI3LjAuMC4xOjIwMDAxL2NhMy5jcmwucGVt
+MBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVudDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1
+ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUA
+A4IBAQAkjz1gciLx0WxruhG8esbYeh0JhxHnzxgOa1KeXdv9lEGfgQY3F34Dybl/
+TKvyjdtyHGBVVVek6ofDaLhW3lUIctdI5DYD8lPOc1zOWJbIGyZBkqrNYyYc2n0r
+VpDmWI37d5U8Amm4iL7dT7VtFp/YDHj+pLsAVzVUhij93NhWMHYQmq4Uf+jdPS8i
+zPa60/Dm/sFMzb/kvz3BBbJsJlDcTa3yL7Dm40ttJ0pdD1u5cE1sDVwMxqcFiTz1
+0seE+InjEzdGWjOQEa7gxA9JEj/DOhFKViBz1Y/m449eLkglHnCGUjr2lInMcDqq
+3e5RzEo0xx4Ho+buCAlpI3JGhvHz
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked_key.pem
index fac61cb0aed..af77306f95c 100644
--- a/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/c_rsa_ca3_revoked_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIGk0jbYDJ/LYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPvNzKt1DOm7BIIEyBi9UJ+yuce6
-G/KjiuUlnqCTq+mhviLD+9uq+QdkWgJQQuJudrsJzfEfCN/GunHPq+8CGqdX7IdX
-XAcbf8fBHCYpWuRwml9nr5FC4/MzxHJ2GHKYT4zg4E6uy7vM8794n8i1GY5HVwQY
-9A1CrvoBoxJRX0pVsGsvr+y7iiAn9Ee8HvZiV7/VpzJn0EgMD/XkaGsW3l3Jl/2L
-ihNKC77JgDudpROTdTbTOYR6FbSFoVz5Ryl/CFoOu3wPCwivBU3KkvG4CX7XVDqk
-ZMsSG/aU4FzprOOv9tYLy1NXzT3ChXx+5KcpcfxQ6ANdzNHtOeIubDpbjRCbjmZw
-7eGrOwRusbYkUY16PJTPdextpczd57y0rdTwVTyH/BBxzT0t+HXVTMr7AukEN0Nu
-vhqJEeY/rI0MXonEKJfI2Qi8bupKbAF/xO3HNHPVelmDjg/KqRMB9ueIyaUvXlRn
-B1s5Cyg0qlKLbiBlZ+ZNFP/do0jQUNVI2qPqrbCt0R6CBRS4wlLESBwmtGilobkQ
-aXj8u071wVP9eBNqP/kw1F6gRQerWddfbdhKVyLULOc9ITEPWY7yWvMddnak0GJR
-yRYpKaIMjg7mKnbtymfN9AUDVKoTJDxOHQOqPpTS83CQyh2W1eKV9fqUT3DfucpP
-XeQMYpmxpnBVpkSUsvDGy93yyVbIxmVUfvtUZl5ylP0u88e8xLGaAvgeQCudxfcq
-RBoehAufK8MqKNj/4BYwxZNqfaRLJjL8RQSD4vgOQPhYQtDeXy+Qi9V7YXF0Bpc9
-eg51oKsLw8E9IHZ6mHAQqhm2FmieoC181sfMMDXeT3VSEl+seeafvjPAZg8kKOKv
-JBJUQcTwoQMaLDpbGu33cTb0wQkqR+b6uqU8gTExzEUQKQAEHcKeZq38Za8rK3VC
-mM8uBZdw/1B+jVf0CIv/vn6p4lGLJzRnsUVJOFoPTrKCMpafiz575V8lZd65OHvj
-s9ZKnzRh6IQZbkvHuLgD8MZbq1fOvswaOnxP43vntjc0HhQF+80YjUFP2xvnWmuj
-WDO3B4IvjoJaAJP7xzgHWrI9r3OyAKlYn4Osi0YPWXTbFmQ2zjKo7vM1hgLbBoa8
-gAYmlGeDT1luyFOajU3jTkA72KrwcfZxQp1A9X4VUP+mqb/NuckgfLqv3ppmKYHx
-9N50nrrO3+5vx/K9WpPx0fySmS/Jusis75fLK0xGteKlvrNlutBa3SmWyVpYFZYd
-Zw7Yfjy8ubara7Y8fMXSXmTUj+1/uVCb7t8YlOuTxB03T52l73npfq59QINTrnZK
-TIg8RXkwKn2978Au3HWlBOv75I6+l8t7R4P6AqMfkjXZWK4Z4eEi80ygdiIxCsFL
-3xu02ClZuhDCL58x0XUyTBpC6/waQoH2vEOGHwgkvl1yhY3x1FX44adC7Q/viV7g
-exLIeHtuqjTqdpsfBOwtGfzNgyb8Vp7xeTF/mDeh9kbmQcB3DwBuo4syz5E1UIci
-IbVw70mzGtS1Utgh6cBACmtk1CBwxtK5UTI13Fq8d7c8WImZvdroMlJ2pzAHsJvs
-15+FpBPpKkd1VikhG+iYJFOLGD2duAh9cC3jhb1o+zIVX7cXcLR2biYegcBlao1g
-GTYsQ6AJ7KWFFoZXRJ7m4A==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQ9TBO58jUCwPUX8KT
+B1us0wICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIQNRLVW4epPcEggTI
+CABrM01a4izKcNrSLYusLw2YgR6kMJFcwPSMraC8dmJ6Ny18HeybVUGPxfMXWmHD
+/MnMo5+8TC0eQ+MXyONnQy++UIWCdYiQravMsU22MLXVUF+vmP9OPtXgmhlkC34n
+MiKhKHMlVoIA7DfOCFMFL8pyITfxhgcURkPMUpC2aHKsgbMbJcizhCqkvOS4jGvY
+2Sb4tBK6jyP6NsxgvOyeofPAjJA44ZcFgcCvCgC49X8DDDnDUHQntR78UqgZTVpY
+zeJuO4jy8ir6By9+XOspeqnRMXBhT2NTcYSatM85JKRJcN3Tz29g8CKcIcsYsljG
+kJ/ERhS0XPTG3WjWPUjCYZpAZdgOtGT2OctUBD3hsnWCuoq95AuSSo/1AUQCYEdk
+JRIwRk+K1hBjESGlOEVlZ1sQp2ee5GFya7aorUGNuZoN9dH/cnZ1wntnDmTj2XXw
+TXzUOQ2rKrGw6/kgGqG+SldpQCtMh0TjWemOXJv2QGKZcffaV6lFRyvVNnGfsSaR
+lLMYsLmob0600iMJzjI3WjY/mgF35pauxiMjZLwPNoZdgKnhvtHKD1KMOHi1IhCG
+NP/RaHRplv9QKCcUmgCCH4L1Sn8CRyh/Ve/j/ChX0gZFaQf7w1UdESxAsBMa6Hno
+OehLRX1a7fg9Pj6oPATEXmpZ9AIxTFUD+43ELh6aDtWY2cVPHG//gZExifgQmng+
+FSMHKyudg4KlABW2/hw15+9TwcueCfb96nbKJiMgkX1JMTTh40JyUJFr9w2KJ2Sa
+mS9Bn6AfQ9BR7QHQGxRKTLSU6gNWxFZgFRN9p/Yqs9RfthoTFCRM3kM2sSr1xVA3
+tjvbPAlrHDFvG4gNgOc4aEbWOZHgaOAoEPndOctDUTWqsZVeAafioEoGw2tgvbgv
+hTAaAZ7rHvm2furPtGjiM/I1xuGMITT5763244ssWowxCfr4/X3uWxF6G2yzhhf3
+7HtnDLqst/cxwDebEEFKM3nQkaUjcc61V2Bx0hPtsP1rBmeoSYcuXL8i54vI6kgE
+K1XP2kldIh/zdsI3ukj8HLAqZnrRhNDuZgWL8Pcijrv+zlPSemlmgHxmMPij6EzE
+HfSGxZaFiHHhxYX+7yADvqV8m9uXcC7GtnDlIXYYUv8xe9krpu4XahJtD1alHbe4
+EZQXFdluYNL2ORFQoAFoQXbTO3yu5MljwWum5gMQhuR6We6Gk3UibzO+SdxLQi7U
+9EenVD+5qvRAMqPwm3NLJPVvGjJTBDFYio+2jitswRgrY0lqzx1mEDtIQ/fuQvDM
+xKOrqRS6kjDFIuGCcvcxso+l37Stb80pl/OhYMpopvs7h4+i/7FbTrfZ03ZrFRva
+Pm+PAkalg6/5DhTHK21XxbXtcZWj5kmxauPsHzE/Wd727B/h3d5r3e+c3P/lMIo0
+h2WFgqyekZc/JhvTFrEWMNKjoaiD1Rp7zpdwKQHfT4GnmULvKa2UoL22q8ErYEUT
+u+1blfzs0j/ebf0lrBVgE97KhG1rC4JS0EU6X6fv0hlK+nhCxtDsv5Jw+Y1vfWjm
+FmKbnuU5MZQdvH7meMpJ4Gdu76Q+cJ+2/J6Ux0OVnZjMnMh0DRZApCqiTgkFFBtu
+jvo/uvSs8r+TvyJVvDOnhOKL+gEfKVD9
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/ca.pem b/cpp/test/IceSSL/certs/db/ca3/ca.pem
index 93473c321f2..6efd0007e05 100644
--- a/cpp/test/IceSSL/certs/db/ca3/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/ca.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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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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
-B3XK931kxKvtnJOWp1zFXOVdbA==
+AQEAfRsUhJyNpz1xDoP6ED1xp6FQeo8PnhV1qe6ywJPIByerV4hA5LhfiSxInIKD
+5GeTYEE2bisiespduFLs4bdajJpflm4gqvzCr4HtG6Hi5nzpHJzfnBClaQIN8J09
+or7n+Doy+LlsMjRIuM3OaQg5OPosCfXYLw+pYZY3Uiv4n0XFSrtPk1NIUn+7ZzZ+
+L+qzQlmvFLW05LJU9u+z3Fa0btpj0eb51u9nYyCiwiaR1hUh+33wnuzbIupQii4R
+g/MoNYRU8U9svuNMai0p8LwTi1mdPpvUmKDi0RNW8hRlxT1pItpx7EWV16aqYOhz
+qpAs/G1RQ+DOOz7msig5GZh4AA==
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/ca_key.pem b/cpp/test/IceSSL/certs/db/ca3/ca_key.pem
index 35dd9c7eb43..2ac8112ce4e 100644
--- a/cpp/test/IceSSL/certs/db/ca3/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/ca_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIh0MtIYLPicECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDTCMok55/2RBIIEyO/985FXAA76
-V7GRlpGkwW8LaDlEEgK14Y+SPJ8pliqXR7oQRAATeJbg/XMSNk4UdKKuZGXAx6lp
-FWKuvTBTm8aleWBQy3IZaviTSB1MB2qvVDblwVuKFfrAlbS5PjhMDiWstNUb45Kx
-bypZCqtxKO8NwhS8QsL3YIk7gkLGhS8AuvkGydrs0jTayOFSAmgkKQe+WgRV7wL9
-wtUvq/GDiDiFxVMlNQzZSnE/3MYAwLIiOB/orZx+r+KeqnY2UiJ7XMnmSGTQkT0q
-Paqm7Tm+1MfwYvuiUUNKt+n/iMAFsFWdVQjOvK1TBADHx5ZhjLfjjmL0ztq8ctYu
-2UxtfvNsXlRKQV2Tjb4rwuXYzIvUr6dFdKPgs19PtLhiWb+9N9BYoiACpHpcWZ1R
-gjoLRt9IAlSjbcfEqpjz+bpZums7lLi1+nhL1hx1mDQ7QVuJMmbbJ7SJzm/PPyvT
-vF5RiAh6R5Ea1V6pRJsOxVsVSQForWsqeaZrqdwmKb83QYf/YwU3DXnSUR8pzgqL
-BYUiRPBsuiH0u1R0Xl1RdRQpGJEs1y8MNC9p6upqEytNhyLHHxh6x3igv1N/5HGx
-S45/n7+k0xQLOOyqsr+WMs6RLFavE2YqXnRZk38OOppCkSlhaduBiV5ZJu68vCon
-5FrfLhkPRtR7Z1Aqp0X4U/7ULZR3q3w4K3+o4rRUt2aGqFeakv6VfekwJe5bjBbm
-lTfSKbZKOAc5ETgSK84FAseR3fXbVbfYQDj+XIv17DJvo+OMXEtLfwmllnPv9OMM
-gvPrUAV1apm6YUEz17rdgdABF+IZ40+Cf1zBqsdt4GjKGZZ3N2AE3T8GnI+Upvfl
-8Cdb6bZ1b650TvEEHy8tXQk6UkFwf2JNKnIfmnvdAlLizGV5Sa7fr2pegQwLXCx6
-6vOfM/meOERkoAvERLUiLutGDbXVNeSVqr/hni0kaWAm4zCUPyhJfn3tOizz8E4X
-2gQPP7SmnX1kS8nUOnsIusr9uU1SVfiekfHacIKFejJQv9NmWVizuHp/cVB48VJ6
-SXEHZUMZxf9ojY8S47ds7wiSlSR/1d9WrgLOH/7FhY04cV+oizh9UPORT7EEFAbY
-viXiLBTPdhg5/7zLJ1oU6jjKiWC/NyHdnahZlQAf6dgnPVHmTNlEbzNKoiypyjjV
-lvBSofITfiIyURgxODsKm5zhoAIvSY3jTV61Tmyt8QK7bWtvvyCld80I+Hr43xAM
-dOyQN133UggUD2wm7nlBwWfQzZLhbQoUWdBGp4yyT/WLQyWQUjCnYUHqTmiznxMT
-GxXlREEVkxO7P3pcv43tlvPlDL9w7OkdpR0U5scT/0/8f9EBisG9FmHw+aDnknq7
-XAxWAXgIIW3YHLoe9cen+3ixdc1yBX7yg3O5uFMmN0JH8N1y4k4owEcFTaWmJBFh
-c1nxwm8U6J3rxfoNw0T2GSyYS3bcfyJprkq0XdAqTVfwI9Z0P3TaUr1BuydvV8Vu
-QWSCjeyu1s3+saTXEXL79/JCyfva0l26Y903GyFfy58Pu5DCBPS286i1mRPEcGtn
-wTJA3zSQ+AJ0WUNTRJL2AzPKmVwGRCk3mVx9FBnsexAMzHZB53oKxtsrRI96EZbw
-+OlGhix7NbY6L6Jrq8e+Nw==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQZUETX7+Fhe4hvSW9
+82Gm7gICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI+pwDI2VNGM8EggTI
+cHLhnv5edE7DDVo/fQ/0q46JkowoSrgngiIgHoLvXbQBHFmO4RuhhRxhiFrTKyD/
+G/IO9SQuPC00AjImqcr6kxdZRoMnArBzCuQYoFcP1pGzYrRQG/hfmxGRXRWNoLjx
+JyOGrYj8qaccNIr9U+8b5Bojeyyivjin9kFQF1PwMyp5WLeqzaiQO8iyDIETqbAV
+srAslwSb278X68yi2+1M+bdmNuP8KhOYpX/phv5gTFVhWrl+dWP0DvtLu4wQFG+S
+lasBZBYwiKeKDGM4tVRNa4j+D7QKoP7z81GN5UAEXyKII4xTbIyl7ch1rpis8UQj
+kbw1ioArRrKw1oYTmEawQqcL+PgRRolQFSrKhD+zECqcJvrJcj9D60uSwo2KMR7U
+n4fa0APp/Tk5V/MS8do4IMiDBlmqq4UOhkyIOHLsgkDcMn7sXpszmO6Pb44mVTqU
+6yQdLQvuQDYG+ADZorN8JP7aHKdBqVGZqimmt0nR8g5QSeKugCo9lcBrBLXe9YMS
+XFFVZqtIX2PPpH/ew32FGiR+4nhe3FMaleeXeSNLz1zBaK+AuoGC0VeAFPxIL09N
+KG2+uY3o0J74QFSrlpBjSE1E8P0BYQGenLBaScPFMbLNFT8gog7HTr0il8apfVid
+ODuTFhGZQRxuhFMLyN/g742ryx1pEtQ1NOKjuPqT1+qimboSRRIT0MtB5MbNIqIW
+BL0z9e9iKqNzik3CYeYFw2UUHcRf1p0xGIaHg7wqFPB5+wf0BeP3FAfhuIcDyHv+
+Sx86IO3iZPEDVXnr9UOnINwuNsczzGU2HSUN3r0kbikkIqDoeumKUNsgLX2lLkQh
+KizHFk8OtyI8s0qII5rU5TBYntraxFBhzj0QKGlyzG0QOoDlQi1bp53PwrRg0/Kh
+9T8Kek5tSQDx1OpmCSIBlDZb746iDiIvXn6Kn7Oq63VqmpKbvjlQNnZaZ6YudIr/
+ewPiDybuxekGIfj1hntCee5OuY+V2Cx9SSuIWSXvrS7Ky3X8qrKLFrC5DQf1qa0i
+SM/dEftq42nx/AtDzc6X9oXU0c6t6cnvjKEsro5KQyjZrhVP9bosnDAPefsvZ+d9
+FsDPq0PfCbQqVzu23O7ROyFZLBvOH6VF75Ezo8bSrPRgP3T7N8fxlCAujOLhiASt
+Yel7xAY2SYJ5KYqnOHCCeu+aGGRknb1MY06OP2ihho+pQPt6szmNBFWvcPmcPlGf
+fQgXEHjs7MixoPt4LJPDD2k5b1RqpFaHDVJ6Kx1qTsd4HhFRFYv9gHbQyefVOUbf
+B0H9Kqa5/ehWLrcIKIY5S5jyGy6cZgzk9DJpIOgTGoI7Ijq1vYr4Gv0TKr4J1jyG
+zH9DyQLEjmZZ6NWDHii94v+gZeNqobJIMSvxaKLaHQcq9szF6Umsi7QVjEeKwlkw
+EIjoFeK4CYYZ2WIW9v1/9cUvwN5OQpO6nOpCnxB4SLUjqy3RIkMe83qjSsQniWbX
+knDzHw6WViW5TwbafBC86/m/pBVvCQ4yozfucIbFdr6XafwUqJTsin+l/cqwZW6C
+MeMYw8IXnqk654ONsD283ldd35RK4vB+Urd0FlHnei0rWeRxx7zE84RRfEZq18VV
+eBMTSu8RqTpHPD1blswFN79e2FcMVyDr
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/index.txt b/cpp/test/IceSSL/certs/db/ca3/index.txt
index e99582bbf5a..6100a77da40 100644
--- a/cpp/test/IceSSL/certs/db/ca3/index.txt
+++ b/cpp/test/IceSSL/certs/db/ca3/index.txt
@@ -1,3 +1,3 @@
-R	241021202554Z	220719202558Z	C84F85EB0C06431A	unknown	/CN=Server ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R	241021202554Z	220719202558Z	0D639D6D14F223DB	unknown	/CN=Client ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R	241021202548Z	220719202558Z	461E4A36735164F3	unknown	/CN=ZeroC Test Intermediate CA 3/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152612Z	241022152621Z	0F9C79C6ABF2E968	unknown	/CN=Server ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152612Z	241022152621Z	A8EA6694C8592167	unknown	/CN=Client ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152610Z	241022152621Z	723B5FD4D0E7BDE8	unknown	/CN=ZeroC Test Intermediate CA 3/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca3/index.txt.old b/cpp/test/IceSSL/certs/db/ca3/index.txt.old
index 366d7071dc2..4e73ef43338 100644
--- a/cpp/test/IceSSL/certs/db/ca3/index.txt.old
+++ b/cpp/test/IceSSL/certs/db/ca3/index.txt.old
@@ -1,2 +1,2 @@
-R	241021202554Z	220719202558Z	C84F85EB0C06431A	unknown	/CN=Server ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R	241021202554Z	220719202558Z	0D639D6D14F223DB	unknown	/CN=Client ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152612Z	241022152621Z	0F9C79C6ABF2E968	unknown	/CN=Server ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152612Z	241022152621Z	A8EA6694C8592167	unknown	/CN=Client ca3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3.pem
index 8001f0a560a..ce07e32e3b2 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3.pem
@@ -1,58 +1,58 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+BQUHAwIwDQYJKoZIhvcNAQELBQADggEBAHTq5kuZdiHoK3wDdhE1A45LpCWdVrl8
+OEVNBYlIainRIS4Eu27kyHssQOQZ8JiPss5O6m7LS4dSWyMLBFQMVu9HfB38pBA+
+U+fla+Qn8kO3wdecTcPENyzx2AbxHL/U0wdTw14sY/bAAnOqqzUMP08AOLNuRFAR
+97qIL/1xLIqSN9Jgc42vcz/EPrjiIlg9uFhQ+akuyqYInzVWkIxkwHeM9MgVLEiZ
+M1yaM2Rmn2QS9gWebvd5wu503IUfM83iaSr2GzGvrbDPyqecC0yD8PMEAzdEr6Hv
+cZIxQSIAuLbWKZ6QIYfUEHsDN7XOVoNV2t7ZRPctrfNr/tIqpJnTP7E=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+hvcNAQEBBQADggEPADCCAQoCggEBAPRw7kI0V/0VJVZUgh26Kk5ufuifE8K4IsLd
+sV4KHZi6ywwvPu0XW4GXXT6HEBAZnAHAtPSoIeRoTRalWa9r/xl6suWkAPzht7ig
+hCcgxEHeX6bn+gvNnwo7zoTAHChmp2M+lvXHlrcLH0zUH0YowfMpQLEBgzqmQtcA
+0ksxAgQho2HlWnv7qs7cxJuOKrRT8/sUpEX9JjIVgT6zT9n9qMIhYbSXPBVoqTtS
+WpLOQ7ANk07GaGTytFPUhzjRMEf8lMeEsIjnJ49yjSwrYSDLw7SuDAgmpTYLAHHl
+oclAbYIVR2P7eO4iis0w9DcAQ2w9O1MfOC429r4jbkRhU6UmHk0CAwEAAaOCAVsw
+ggFXMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFLHKnq+umM5yqA6z6ZjTX/4L+GIc
 MAsGA1UdDwQEAwIBhjAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vMTI3LjAuMC4x
-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
+OjIwMDAxL2NhMy5jcmwucGVtMIHCBgNVHSMEgbowgbeAFMuqnyxYLlHYqQh976VA
+MV5wuGrkoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNV
 BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
 EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_key.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_key.pem
index 00a0c482315..da3ffd14a16 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIXVffr2udIf0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHtR3ymxkpW1BIIEyGeAiVxyvnJ/
-2DYWclaSd6AgMNxa9Deg1JYKXmMla0B0mckkKu1VdVBXdCBNzZmTJIuIF90umuxz
-htOcH9gL0RczN+o5KGPDrKl7/jL8UO5sMUCLja8b0Kr1c5QSL6WkGVmiG/z/8TeM
-chgHviVaNLD0gAfk32EsyA3YkBPEhQGtp7G8nJil6qGI5sV5pWqekHmNkidpdLz/
-Fx8S1NRUrv6FRb/omwl+BSq2dzW6hKi6AW+eR85qntqhC7qRhU9v0AEp/rszBuPX
-1H7PiIyxjI2jcH2MHKg36yu+UjEFvplVsRMVndEbz97LcRblH7leV2SUKSimV6Us
-zWFSpSRd6qjzHrR3eaMvwGBiJFn8a2znzFFD9OHKQc3AP+N1+x+3pksFmPl5itO6
-S7hqOrkpIP0Vp/p9x9IOUma0FXa7DQD7mPM7t+t+S7H8mI8SNVoO4tS0UIaA45Ut
-gDDhqHPM/yeOt6ExT6y6pdedujpPCNH734fyOM5Flw90EPnv0ddSApVbefnETi4C
-V3hpSRemZSq9G6Sr2+DY/ePUD3UpX89gYtgnwzP7lwDFQEbp8fqe1kx8u8eNwzz0
-kUSxkSp9I/uqNeXXWsgfRZ5tSF1lxc4MnAntwZr2Gzu6W2ihiEi7D81qxOt63fiS
-H8p9gFOwe/VlTHn55ZfFtgDEZ2Cx0sGPjCKCzNb+B2BHWZClBllknDS/osteVwee
-vm3ZHyjMIrLz8YZ4EoIeUdIqJdOK4k8zW8BHWAoJS7QkNwYW7q/hn9Jwk8hezR/P
-C4qLLI8Vbp/PRPmhooqQXNmR1HxmqpKW2ViXZVgDlchxWK1eenfOO8RA7oIIIOJV
-P92o8bI7jZPoZ1zhog53EktBWliseZs0v8wLxcxHDNllJJ9h6FukhtQhx3zm1QEy
-P+nzTwvjOZOBnggtVL7gWms/Y6utg4wg+/uk7WenW+Z/CUyV/wY8dnYKQWqX8bBJ
-PvBQUZmhnz2QHbszi8Pn01tUW5fqYDc93JyK5R7EOMGQPKGn+EKibFiZ1qCA/Wmc
-yv1wvf5NmLrUsRLcoB0WT1Nnf71pnbN6Vq+IfgUmQg5n7+BTey/94wymNJfLBNIl
-/2pbFEAdQpH2BIk074Cu0+50yKpN2evk5H9quxknv1IRzICknw2KnZTI/NEIHCH0
-kK4CUv9zBbWJBgUl15asnnT0YMqxmXZ8GgwcCFqPDWQqKMVRWaFefOSWHr2EBqVV
-K/WUCjYj9zAsZDdE93OBohgHFcaEGkWUcRgsQoK5X3ZPHuBdAtrDlTAhIF52XQDr
-m2PbZGYLla6WZ5S//4qHhv/fdl/e7uLOsizxUOdnA5rgPQrmdravDLoa7tvqAkwM
-zqrIpkSiiLYtZkA/1VVRV2ifXcv0JmCVK1eF1GHaDT3YqjKIfaqTyhA3yBWmTg84
-pi/5wjNlmFpumo5CDZNxDVSUrVaraBcbS+DPb0+1F5+JPrNyApGSANhHo5jPAD3r
-nhLYEBMfTpmzWsykl7VAsktSj3zbC0tOsxF0BWxuO0zb3nRx5ezfy0EarmFfQXYj
-9iRf6jTmw61dpT8FOmCTs4CdFmCAjcuCtA8sayTi/orlCmX0xmVAHLl4044yaZZ3
-mC0NfKATKzqg3ASp6puoXw==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQoq0rwcjAuJYmwpFy
+LYgg/gICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIi3qgdVdbjZYEggTI
+Yc44G22HC/iSPJdJHiVGj1NWM43HjzVyvFCKAw0RaUjAu1K/KJ1OzLbLhv+ggb3x
+M74IVye3udhAzC2jr8SKDWL/YrCzeu2dW+UzcJnmjiEkJGOWribvj9V5bBLvb42e
+cYU3FP7DPoTbFTvNoirbEJ2nj4YZ+DVDHytP4Rl8PSZ7RsWGoaNulA16ZSMF5bi6
+00VnKBh3AyjdWSNC3f6+wGITNRVEHzqZoS4jyFqyBWQIbc86hAoks6A2RgP6o6IJ
+3w3pgykhFlVuP0Q9336XJxg6EmdOKejfX1wcjOUiue0CartJ9+J0Ae7t5S+5+Lc3
+T8Q8jI8vnXtmtL9dCAqeSrItp9t3cWSWQosjBMxbYbrMjut1zqvUBr9WJrk/YsUs
+6oDkc4Ziu13jFl7j+Kfwi73NUTe42Xn/V4mrfu50ySA5ydWABqZuXk3WapUaW9Pm
+lwFAnLfC8Zt0YEYmhTGUOnhR+oXN5x7IKDBzSxn0MIGS0nFhzN6IXu55AFL/epAf
+Nw+5RssOSicvrf1c6lhqfnltkpMNTvnFHaStpELWDXRB4Yd2dZ2LYmQsIN1H9wJM
+vSVl3sInZ03HIzjXQJ9uMnhtb+QkUIGUzaa61DVVoeRIP4cjxSOZG60DMEOEH2kc
+IV3Ngig2S13E5iLK0LVqXk90opSu0SEoULmORTuvP6N5NIVx8CVstfdUm8Qb3SJO
+edJfLoVDasmtSbDwzno+alHxOxg4UJFWsnfkyf0YhDlCrMsgFu8f/z/7BBE4EIEI
+oiFBfFIzCZjbmnUc3ivyHxOc4s36+EKSk5CRlmrXz9nDiK7Bx91hPm4j+7I74soZ
+kNRcPzwA3+lZP0UIY7NBF+UQyo4E3I+DhlfZSby2iYkWxp9lb95izMCavH3gUWpn
+W7RWUk1M41/teSHckIs7akfLkDhq8eAEzRYpyVtgIe8+9yGyNKi5YbagchvQyAuK
+7xE3p+fOJQneNez/Utq7XcmnhbHYAI9eExCnGYsnb3Cj/G7Aed1vUIimnTQasaFK
+yJEuUxmbWT5vLbJNxRqpi925O21k8FN9fEtZahvYhNIil+Arqh0DGoSSk2TxxrNd
+JLfsnZMlUnD7mIhVwgIJVX5hgX9aKse4bhK/gpBvuG+iaA8nRWD+SwujWK8j8DL0
+1pvjGXIqpMKmPbBYyueExIGeY1ypIBCnAiENJAwfGG/eWpy+Fi24Yhi3Ss5o58a8
+5LuULfygIWPbVmkyejDOE1AjGAxnW4Dpxk7JYKE9L/ZTvXrnWyqKJD/p1AKmSGjg
+GCg6NMMVVBcP6680gO2YyiIM9WJD1McDIhOazxD7aFkBFKKJMHjkUGqFrl09LUpE
+ui8uNcd9zkjkzb2TgPN1Wgdf90R94X6dBp9k73Y3AHgdEeWj/o5vGVK2MoPHLb+0
+uoz2GUONgEzHVF535IbMTqoUKOep0k8DuA5oIl2wfemC4wOG+8qjtlF7UTtzvB4m
+j9q/zyMiSLZIE1svaqcMnYSzRmTE/M1DqOfE4klP/xowtuLtExcLNN34a0sOJKDs
+7vENOJzoaEuZm0COIuMpR83ljZtVrH2Lvr8nN0O1ik0z6MkqLeyJVFBsyPbP84pd
+nhllwjdizcBga3efdc+hbvTjEV2lu2OS
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked.pem
index acd39d3ac93..cc5b1aa7270 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked.pem
@@ -1,59 +1,58 @@
 -----BEGIN CERTIFICATE-----
-MIIFDTCCA/WgAwIBAgIJALkeLFO6BF7kMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
-VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAzMQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb20wHhcNMjIwNzE5MjAyNTU1WhcNMjQxMDIxMjAyNTU1WjCBkjEcMBoGA1UE
-AwwTQ2xpZW50IGNhaTMgcmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAta
-ZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTEL
-MAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyluL2BDDBZRgM/ouIooAkcD8hdQz
-kUWJaqXl7vcCDXIoTdDp0HfPMCs3MJr5fbeqq5fFqeeB0yL8JFkMft/cWLmMiECa
-U6Nl//c0Ia4GsQYbP6ve3NKwpg27CuN2axD2vYOBa2BG471osq88e1XwIzzdV3IY
-B3whajyP0vbkkzpL32gF+drwPLzZUFruV5/d1I3aTfQqm8vMkamHrdS4U9AeWkMn
-vqBy/CrtuPMYCKhlB/sPpC0iT2TMPimwV9Zs+ZTT+O6QX/pFnLkGVxch8OyVYhF0
-zEOF8MbPOWxkjR07LM8+OTofqoq6uga1x+KXO4KMJ6kTuWRpC2nJbGrRIwIDAQAB
-o4IBWTCCAVUwHQYDVR0OBBYEFAq6zWECzJ9c7abmyffPKMpFQ+bXMIHCBgNVHSME
-gbowgbeAFAJWd3z26jD3uzXjbmbbmGnQ4n2xoYGUpIGRMIGOMRgwFgYDVQQDDA9a
-ZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIElu
-Yy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYT
-AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIIRh5KNnNRZPMwCwYD
-VR0PBAQDAgXgMDQGA1UdHwQtMCswKaAnoCWGI2h0dHA6Ly8xMjcuMC4wLjE6MjAw
-MDEvY2FpMy5jcmwucGVtMBcGA1UdEQQQMA6HBH8AAAGCBmNsaWVudDATBgNVHSUE
-DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAbXTH5lMYq4YlTt5AOXZN
-9L7OQvBwJdF8lilwjHq2akhqkHIgqMBCBZBvQ/rWUSu1kXFAhx5f1MR6X+Od2Wb2
-p0C0BqtnN1Krdv0ySEsa9hGnVGN3a99VwDBs8lfisJA4NCGWWMmQgSZ7rKNOlyzC
-w1BhhK5v2EfRqfOYTX8EA16myKUK9u24ys0uXRmZNoTIM3QajkQeHWR3wGZAeiid
-W9xWIDS+/SDEl9H4J3BjcUDvuM/bmmZflwKeHVzYAsu6Hku97a9Gc+wpbpu6dSr1
-5FlFoMr7V5UeRNTGlspUvhn+swVSUr3geKSOgG3/NWAjuKCVk2xw7fd423Yy7d9S
-GA==
+MIIFDDCCA/SgAwIBAgIIVWuFhqsbj38wDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
+BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDMxDDAKBgNVBAsMA0ljZTEU
+MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
+B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
+LmNvbTAeFw0yNDEwMjIxNTI2MTNaFw0yNzAxMjUxNTI2MTNaMIGSMRwwGgYDVQQD
+DBNDbGllbnQgY2FpMyByZXZva2VkMQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1pl
+cm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQsw
+CQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDktnvo+iyrEmJHOuv3zMqG05M5aZLE
+fsBw4VhAKgvjeg1pq4zXOxQLGRVgHIk+ZpeDLqGR2QeAPMitDxmbj+TdpkjILad6
+qghJwy8wjZLx2rvWKFESeSyC6pa3kqNfvfdveK7DMobpnfciJehCUilvHqouJUzz
+U65N44RlSzex1Rn2AWqs1hmnNd/3LCttNrXv+mTJPf97ZK3nCpqE8G3Hn2m9ayOP
+q2/84zNMGUlRYKYc1A7VzYg4EqPNJIu4W8qFyjH3pm/szgqqIc4AmCGodAHkhUnJ
+ApvGF3lu4sct3xt2L6GJ6S8Kc3o5Jnttmm9JT4vTPx48dDFaWbLwFaUjAgMBAAGj
+ggFZMIIBVTAdBgNVHQ4EFgQU6GuYyvna0YB/1NW+yd1eU0HGFMQwgcIGA1UdIwSB
+ujCBt4AUscqer66YznKoDrPpmNNf/gv4YhyhgZSkgZEwgY4xGDAWBgNVBAMMD1pl
+cm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5j
+LjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMC
+VVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tgghyO1/U0Oe96DALBgNV
+HQ8EBAMCBeAwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovLzEyNy4wLjAuMToyMDAw
+MS9jYWkzLmNybC5wZW0wFwYDVR0RBBAwDocEfwAAAYIGY2xpZW50MBMGA1UdJQQM
+MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQBLVV5sAXh8A++4l0QFeEYo
+STjNsJp9MUIGaVUGUuLbgZwMgiyXvS/qHKvHoaFzktttj9xsBHqNEmlMsTdUqnnn
+iypYoDCX9DB+OzaEdz0EG9VTMcBl/qIPpH25mCQ0MfrEc3dNHokAZwhk2OSUJr/1
+tGCFCD32kGqnT/bGgPbmEu13X0wrD8NOY9MafLBY4BNiFLNkNXYv51frRbcF7/gI
+djHNHrXSZ8gsNRIHpNzniyxM84p/AzUthErYw1Q9c6ZmhBfltnp6ectlfRP874Fl
+SsLLNsSlwlq8ZL5t7vglOd0ulF7K2pY4WyalCwPRIY9IWcoHPRa3XlRnDZDaET5B
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked_key.pem
index ab3c9c72d7b..169f183ae22 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/c_rsa_cai3_revoked_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIrlzAhpThHxACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLWrKGQ1Xk6XBIIEyIcyKYHTSC3Q
-vEiEWsPGvyqWDpluHnk2SiJQzBhcmVuWoo0oQWjRGkAbpHePKcMKK8KGUARFj4Gi
-+jBGy6IdZrESAg0xOM3JTf1aGZ6oARAjtHs0GOAb0PmjcQBYszRCFZmuLklgihva
-Hajq+XmGQ6R67AEzvvewYf1MBJKAnr0k5xIeknFiXSlooHQyiRi3o5l0Z9NrtZpq
-s7UA2juARD5civ6SI5RBvhnAbcZh7gQSyHs+pe8kFkX31JF10KCGbiqAjI+a0yLf
-RMzMpAQGEpfsCdnMWCnLWoYv/2dqBC18P/XSq3xwxWIbYNR3xjNjyxtPzjM/vxVz
-lHekK8vNVBTuNTDyPNauSJqe18Ubnm0VGk6BeMKv80yTigVbjMpLNaefeak20NNO
-w5EQPnhX9JqcGUM00oezGnHSkAb7QL5D24/waICc4AEPKpt/a5mqM75rPz5Cxxij
-Jy/BvCwF5DHD4ER8Gt8xfy/WLblsS/3G9tUPqyRREknC7PnJBJ2ut0hRCOKtRNVX
-AYfnXGPQ9rp5BSA8q0qonrNAp6g5K4dXtkoi4K16Ht7tBImptvaJp0t6cyyr/K2R
-Dye3G78eu9o6Rr14B5qnBcgBz7Y9Zv+OnfpGXtjGaWaxJOOObvMFYQFYeWWrtljj
-zqeNpYkx4FivlJoiwIgyiEp2bc6iRq1fT2n5XszIR3ED0MwW+e5xYxcFOfSaR+79
-V+zlU74LtVdgEtcfvwM9g+q1h6CBMJfxj/bN+OhX6kUuABceB6tM+CmH8DZ5I8gR
-3PdG3qQuyFFz0lNqdE+5nhxpM4WXaiZ9zBADccpLRvvz7fBJHfFizlgz9RxfOEXR
-9IDFvij4p5vcmNO/2cceHXNLKD7/SSJPmmqNFOVqJckNeJeaLHxsZkRaXpYOwdVD
-ccmYi8H4rYiHY3kxxHdh6iHRepqfimiGLLhUiomJRYIKAXnWMeTVACzUWT0Cttky
-ihvYXHZNItHIT7PmSYnQ4P8Ul81hYq9LhqMYtQwJOtnpA1eD9PIS4FQwwERPWcmQ
-J7S6vMUAMBsRviStU5+459Fz7Ycip1LSPD5Qh/QxuGntyjwpaytXop2Xzj1KDzzn
-4ON5uFvxn2oi0DyvgP2BuVJQiZKx9LSvm090dHopbzYonQlfyYySBjLbmBrFA2Uq
-PZbzT9hBiK8MBA2jwvgbMFHRjJN2BkMJfoZurANN1SG/+a1/SXWcFO0AvU74bN6A
-zImymw/NSkUpg4WjhTtE+jyq8a1o5UuAt9GVQ2lSdxKp1qNJHULWodWg+AcueM8v
-CERECsvMV1MW/9aHNbxeggN5m9JKzBdOookzc7jW0kmDNW68j1rNz+UXiQ0vSZIL
-vNXananXi4A0BPSS7NLcxgMsAYy82vc5MUyFe+dWXQ7Jl9rMPkmzxlTX/VzgTxcx
-/Ewig1kaWePxU6+zsY/+7YshLzCfbpHaPA2piQnpegwEYZYuxrDmMhe/0eTllpFg
-feUDyvVASmpQFWYciDiPa2BnwWYvL4vJ6AULkaICMO+VIM+sAVwp8zXoZJz28oIk
-hIPyJ2C1ThaBsrHwy71qpCsu5msYXLpfit5/GQ1O+83kK3hcBrr79puSQLa96Rdf
-UhkptdH8qXFKxPtZjueLWA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQ62nRYj7UEjhMabo8
++jBn+QICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIRGaCggzcTTcEggTI
+0Dklrr9R4s6xX2h81SuvA4jDvz5hHnWAQNdufei72HV7q8xjSH+qgfvD1r7p+j8x
+P1V07Y6PnXqyZaTaiaoz7VRbZc89MgzVJgnhPwCQduDVgM9X/KoMSwhbRZnxenHw
+DzkRxyO2CO/Je+xpEyJVXSM/pNtzLJyquaRIGyZYuWaYMM1oQlSgj+Cl0DxFpPcS
+Gk53gdHyQHKThALJ3Ozptd8cdxDBvrcQL25wgOisBD+YFqk7Evb1kyGJ3IgCTjww
+JeM+H0UHQsIANR/keypohPrFpFWq+/ycO3+dFWpio+tPdfGxnZKVGIxNovmMllWo
+Y6gSCm0gls+RJumKUI8klBYytvwuADj5Mdrfnca7vgwmIjdQMfiNDS8UrlJwVT/q
+EVXI5DDFG6Pe/tky9umWq12utWo7nBFfszgEJU0Q19fWRhR4oU6n1y4RISIUAPfI
+3KntPyC+WlJrl69/0JYckOEMmBhVDqMeMxocXQYEBO4mb/unVsucsQ3LPLxyjA93
+rxFe7VAsbqdb7MiDCkVLA/PF1pWQsTpbu0Z0YmZ0GiIUXOcV7SmUJBUV2XKQ+h4i
+V3/Jm1sHl/pMxN+vsxYRwWDFrA3b96x5oopGpvRCp0MHT7ZXNU2O/he2jvw+pkEP
+5od1z6KgTZNBSK7+K39OjO4vAuRe1mM/8gZ2Av24zMWmUPUKm+eJJhSwjruY9SjY
+Pnp+zqzKJ4ghpqSKfXPbiRf5t1osmJwEOEEMne9PFacWvU0chsLmo6Y8BAfbWuAi
+ngaOG8GfqXr4OKFsgFyeHYrnFSOQLDLBr2lUb+GcgxVTGojUaf0vaMfIXk9hRkJL
+pxkHk2xkByN95rE9P066nQ+coUBXtzU3kv6owGAvlK4er4Fi5bf6I5I0sBPj6n2W
+tkPWdqtOutLASuSyBq4Nn4hkrkPJsw/mc8tkt5lVSa67l/YgETUdwGMeYYBmFWcw
+sI66q1i+rbwiHSYBoK6b4uY/aSAPfPKaTgLl38P/svWEpAno/ADFPILc2ElOazYm
+QTCX1GiFS5ulJ8Fc2/EME8/oUesZSRBgsOT0JPGiWcQWwPjfIOUzpJcNFgxnzovT
+NfN8ocDBGBjtDdoqPOV5dD89EU5YKq8q+osP/Y7lTvvBPArQZMNiIfru3g+QHynF
+lo4wNqHd7pJXV+6MxuTTEghDOYN73VpxPVNwiVCm2/PyuTyqI88e4DwDY7rknR7x
+FKaRShb2hl5d3RZU4CmwMVEnlmfhzobUfxJMMNExp3dqONeYaIlSnRhaxfM7H+j9
+eKo8n+1v1VVZp/aHuORkl98KSQYTmPRhgwysPOwcnlPYmM6/35miOInQkd/OMY5t
+EtJF7R1yMAhFBPrEPoWkLaYgrs8vhkyGepGx8keZ8LsM6I/VBRGmRratGhs8Sh72
+PTEb9tr0bnrbY49bmsmSzSuTDYkcJ8GRWulp02i2mdj91GieOiqLTFdUXydPsrmt
+mGhcftx0LKrhJH6vcWffiSeEHHxfWNtmY9GD5SdYuu0mj9xFsMcHuA9ErMEV3hYw
+C/dx3Zz7khbYMsfSnhtNgWBo58iayS5LEu4o12WiOaByNBc/tcYQU1u/Ev3qhzFn
+82AmF3my9M0XBC21TN9Rn18MN+XYJvLe
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.pem
index 7ca6e994d35..4dfbf06b729 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca.pem
@@ -1,58 +1,58 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMFoXDTI3MDEyNTE1MjYxMFowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
 SW50ZXJtZWRpYXRlIENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
 IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
 BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca_key.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca_key.pem
index d9dafd4f932..265f2ac0bc6 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/ca_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIw+u5fJ9UmBQCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPXQYwxn4HSQBIIEyLXp/CM84qpU
-vyLPp4NQfYB9ew7RqRxiMzUBsz+7B9BcroJNYo8/eKj69FGTKochAuOapsbsjz1C
-jAaMYJcb+vgQMU/ldouFwxvYIm/b1Iblo4L6taaZwCfYbDLOPfz6ahhj2QFrVKX9
-GXUOSaxksmzUUq1DOHuQ39qwGQwJ4I4HJ13ZvFWxiuF1i3zRqrBFpLC2Acx29hgv
-lyfZQTIKf/Reb4W9tzCCwRB8qaFKa7XB8Vx/pYYOw3aiGr4ooMu0tPDJXZ0kQPd/
-pxFUPP1gLHJ4X0+3AoduzFRuF+BZE3sPA7TGCpZqmk+uLkjiMy0YlgCffpnoMZoA
-itOJhWPS01hhqJkRHbKoMfIM/qgYaORM/c0FgIZmZwOYF5qerbE3U7mfC3X6S/Na
-Qqwi8xK02BpmyrTQ1kDiMMTvIFGEd6p16IHz4KD0+2wOr6DjfJAcbS5dowVSPZK+
-3MjYn228MWjPteMD1neLzn56gKggUI8YFwkHA/M+cJ0sVdqD4s7gK3O1F2Zj2RQ6
-JrL+XvutrP/pR0wUvoTnnKa3D+kkadqhPSIlpzcxtRDZs3qiRYPsfwloSdBEmuI0
-vxheQSG6iG8MlzRs3vWJRouX4Wm1QMKz+v5vrPQ7JhS7Py5OxZChXqNEoB4l/+5e
-aGJpZ5nRgeUQA/kmMnPXQZegzEJyQwZvE9fltOTzpn9CgYUkqhPyjrJac5Kzvfrh
-wCSKExvQt9ye1wzhgsW+z5WUDUeEx4wd6DNOM7avAfehOIzFQ1kzmWj4qXiWH/Xr
-N1enJvgVVqI9JKkQDWoD4qVssttJpNE/TRy8UKSN5Tkb2itTRwQdbgZYzF5rXXNi
-6RUtLXGQwfPakh8qLuC0mO3XMFy8sFpB2A7IZw+lncJrEsVLv8Z6gKS3LwMygncW
-89BJLgqZQjXrYb0Z8ilNbvjxbohWzLa2yAeeqv1rRDAqFqeTIv4NI598N4GW4Kv8
-cZ78aG1L4yiJjkmDCnKcLiAydnl5V3aV+8evr8Ro5D37XOu0jNB6ObYbjuF9dJrK
-9VlT9UKqD2bXmAZCR2OxO0ffHiOI37ZjwHi3Kg/sQBy5oqsDrnHQy70a6izH6ESA
-rAJ33FS2QrbkChGwsAjaabblgEjz0tKA1JQyT9+WPWm8NVgjZcc9GQNrsMs0rk1f
-c3IQy4owir8LoWxyCsKAfpkbIug3eRulD7QyDf251lSIeJV3Jfq40bdN6H+Cw/Js
-qTmZne/zk4XAgd/nMSeRfp7khlbiLvaF22UF3HjjLpaMIEP35lEWaA80cSc5VTFS
-8+5HAYD0U2ls2yljP/IqMQJdlEoVk0I3Un0EWWcQUXlmgISIcfYZmHpJraECV8gt
-FP2aCM++VVBqS5O8/fM9A8Q0ppUlkPKn5VFFa1KIiVYgHqWSRgzszSOy0Swdo9fB
-FUpj55wxnKkC6NElJ7QvvILOXKdYf1PE04+rJ6jrA7aEVWUGv496/2nWW+KnYONI
-jHJJ4RWIF2v4prEd+glP4H0Aha/tFK9pSIB1945Q3wBf40Sov5rFZEBMdtQ841NS
-p+PzSRQVwFO8q5gYvuNWojVcvOosUn+drvL2le9qAcSfmLv7n2dR/yDgKbEew1lj
-ucbunUPPuq/9IiW3m5sfJA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQ2V7Z0wdo3hUfEmUi
+5217uAICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIZlzD2XhiTUsEggTI
+QgGlhxbZwQ49YlsqHmwx6cNIhQcRrZZu5inepU3872912+WbjHruNh8kWGEiRoH7
+Re7DStgTzbdWLB4HcjXBVQLhVEutPAGzn9UXLQA7el858ZHONZWfEy/ljinPlymy
+VyHkJyoQqrHci8ZUh67SUjiLA1vxxHTapDPxg28UzGW/DaB2zZMB8IdsPoiLLk7x
+i6NazqwitTnvtTDw0feQn9Z1vs01ANGN1BAbrO894l3lgjeDPhx8ySOPrH1Q99cT
+nBI1nnhTaKcenF6hxNEhtEfrBui0yO5Gm6aiKK/t02qbnw1ZVzpCTSGbjXPdddP2
+t42FXPCCGbYrirB090u7756dSGQkzK9AS3oGi7IX2T2HxjEOjohpG96uPhjQDbEb
+l5hvzBWM1hmDBqMXqizSGQeukpG1ibKejTjs72CxKCM4EsXBwCW9JIYqdurRvVsa
+Ks8GnNRkuNJ2JMorwrYLSSsgFYz8RJFj4q3L7IXWmre2brLgqSL3QHXWiz6JWzRh
+0uyqrweNnLYyg06oJfcsWj6rCIgP1cPXRyTRWRlEw0ta4E9/cb7SX4SAqZ/XDCKB
+60LluBzEGhHCvvOnICsRB8v0kbCEFg6nwreSWXXxc7j1CMl/Ljw50Rg4UJb4Zxlm
+2S8G5Uk1VQ4t570p4KsZRE2vFlj0XSXPU5+kPlG5SGyEBqKxcasR5fZm/QZudLq2
+MzygRmzo4x8bYPc3M1ZuCcSwcFFTyzVtDfPqOwGc5vwDe3RRPv7vkE+cAF3g5WZ5
+K1VeiIOmbmgQoDj4t4LqGGgVuJZtpjH7nMD0mjRVHfM5le8ZNY8BfImFPqIh0S/t
+tgxefeVv8D/CW3LyLmEsZOALTWagQc+LdJBk2BBH2/LkfynszgUcH24nK7sggEXR
+L4q0LA2ayi6mWv1/oMGaJVrUfiwOzv5nLR0+MoNEKxYOZRlOAlq8IjFa/bQHtHJc
+3l1z69XTXyJunOldwzDAXb/Q9is7SDX9bTyfq5HyaiAp3wqqNraNst4m5c4NkFxW
+Ow8dvscyoS3mFI5xlB+z8QVYOJ2bnhGUGabLCv9/pzVxj1A4FUbCEqT3f7lTlqFD
+C9y/WQZRyFH3+vC4D9XDoSFJdF7dGDk2uLVR4/ppiO6IpSvM0sM8XnvpImo3EWG/
+8sy8XcdG0t1aiMG2VveZapO7B3UKn5DrjzXtGZOwU66hLQZd1SN4+UMso6WaV6c8
+BVL0X5Mo+WbVtsvU2Ol2sBpoVAE8ZIWiwTrBflXU6n5b1CHo1GJrrWds0/JkuMbj
+oSxroSnr8H08s1XRak2BhyTbaxvLTDmE3CGGBuyhQgLtoQcPG1CugOOcRIgYXsVB
+VguLeNGNepZinxgvd+YKdWarCiWGk3ruxAWaHTn3MygdVWZi3OC4SZ44Pxr/EtYa
+51jCB7nU1WbD8F0rja3EBU2a9AoOYz2O2cRndS7B6WwSww9jT85DegJ79LYqK9T2
+qUQllT8RE0zGhIcwI3aIFsnJFxhqr/IQfr8ay1Po8ejI9r4Z0/nWISy31cMveqi+
+Rxt38b1BVGvw30J8L4WQBOq6uFz06ihOYRuuumTPjOLYNgF/5zvwb6G8cHzqmddF
+OPsaEc7iIjkABRZnTiO2UFwlNg4sWJKW
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt b/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt
index 87a5528ce1c..408e2e4ae26 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt
@@ -1,2 +1,2 @@
-R	241021202554Z	220719202558Z	622D3B11E2137119	unknown	/CN=Server cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R	241021202555Z	220719202558Z	B91E2C53BA045EE4	unknown	/CN=Client cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152613Z	241022152621Z	FECA35870F2AC431	unknown	/CN=Server cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152613Z	241022152621Z	556B8586AB1B8F7F	unknown	/CN=Client cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt.old b/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt.old
index e02564a30fc..5f3b70140e7 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt.old
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/index.txt.old
@@ -1 +1 @@
-R	241021202554Z	220719202558Z	622D3B11E2137119	unknown	/CN=Server cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152613Z	241022152621Z	FECA35870F2AC431	unknown	/CN=Server cai3 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3.pem
index 03d1869c77e..ca76481f3ab 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3.pem
@@ -1,58 +1,58 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_key.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_key.pem
index 045050228c8..2bf1ab2dab9 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIZswECP3+fSMCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLsWvgyLGJPNBIIEyBLSWJkyuDNU
-ic+0/nA9SdEk2ofod9sIumDeUlTXgtwtX+An8loleEFLkBBFly8BZ89wMzZHvqt4
-6WnGas8VrJDZTjcrHfDfUFeL/wyUkHUZWY7c/tcMArg6/MpvMXg1GdrD9ihdVVr7
-Z7PJ8Ru5AIvy1aHS+vN6QlIB8h0kc9wTKZ2KLmQeQPb9i5JplXcQCdd659TzaOqJ
-WyGyWRkvErOad8latoYU1J12vxpsvEiEzQ4ldsTq5cYf56uZSv7Y1jP6JVSwT7P3
-Njj0w1EenLABqCyTSTynm3x9gjHtoZeKZNvPyJQ+TBxwelSTJGKNz7upGN446LmR
-x4YFiYQ3KWoaVCGhDGrC+30a+lAOseUtHMNKqwYI57t/kvQlpFataf+w598QM4m1
-1WSt/B5D8bplHH5v7s9okcS8dE8TyUwrX6OKju0Wa33/0nZiuhXXFdT4xCM3OMLD
-804b/byQPvwQJqB6lIHfKRqzWrKSwEvBPGS22fGelkNmKbCSjRYcZaBm2Ue2OZtw
-3OsJldIoL1niB5fx1qsUtxuSfYq80u3SRd3Sc0iL+1iX/miKD8sW1X4PCy2PF+gd
-70yNfGk5ze+8QFSZF1ZHgschHSo9RDgeTDBvXfgf5QxBvCcxpnCBgdkNBzCif5tb
-YuOmWvk/eHK9cnMBLcHfkQqc41/HDiu3AvGVlijv8BuF/Wm0YZt8W+zCOL4vseVx
-TxBKrLNMuMMk5r2LFE47c6z1iowMiPbfYL4bMEnx6QeDq1IyXzAFdaa/tTWkasC+
-/S/IFEzfdppRo2clymVYnEY9BVP7jI+TgsoQ3f/FQVEkbfxh2YylzmcEBYrxpy69
-Sif2PhSU2gXg3NWHX/vjGook7kawHexDbgevgR/7C6SkBDEZJ/O2DfaYSq9grDVl
-dYnwPIwfecvm2l6rhD6PUUM1Qtq67hLTPosUtPDq2Rd+r4f1Y2gbXhLIUpOXuMOF
-VsVhi/U+h6vt6kztDfWb2I16XiVsMmB4reTmYvLTUTARJ1DBtoRLJF0MrkJuK4Wg
-OqtBTwg0lTB90D9BSibrx2O1U6PmTsfrY0XGk7z7Ckjc3pSQA1rsYjusgO+AKX1i
-msdhy31Ekb+moetwBsBU74JJDGNtA5qIVpYpbejDfumWutMAB0ZS2fa+3yniL778
-Q5BEAdSIZTDPYrXupV/975egPxXSIzgvBD2NidI/WEMx9je/3A8nEgfyo1buNn1B
-heCJlR2zk0FTbSk/uC2fBASSCGBd6ncGb6z4clgH7ZQKSo4ttJH3siKNGkDBYOai
-WKqUnfq7F3/HXLbkKs8HlWCYlP+tbwO5L73mh7ThAZDTcUihzCSnywQ5BpDjpStn
-9hiaY5ERkFqWAsdF2BsGbZFuyDonAxjzWVHDVbH/broGVn7F76xdc0kG8ZCmoMIa
-5qe8wKGqmO+FFcAZzz5Z9Fb5KR+yROrflCo9svlO77lez+nS94OLbFVWOykNgzWH
-js2OpzGB3yRuYvvlS44L3RkeGMpjtA/99Pr0XKlkvj0ksJQgNbLHtPveHNpiSoa5
-5UKrRCJLL20i4HgZcqwBf8WHidXCOX+NpHivnAI4z/d589PNLFzsmhX4FZkZ5TrR
-PwnkfbAnAqIdKqoRytmQXw==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQL4+Au7b90RqMrc5s
+iYBgsAICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIw/EZveFMCBEEggTI
+VoNlEyTUXQ4UoeXw3CLrsqG2OgpK99SxyWjxdnNTrZ8/mXe/reQEcN/lC4wnRBCq
+OmYxUpYXRDCaWBZzguuMNJOaODqePfRiDW7st+C7pK8JNk4XBfKhj4WPVonxmvtM
+O8N46mAJvyPe539iay3+PufEI8Kj3rN3Y/EFr56YhTzZ/ogZ6fqKfhX8Blw86J07
+4MT8LtaXdyhmmEJsoiWPrPXJqriAAMpQ9sOoSifb/cI/3uM0lETYMwy6W1GZ/kQb
+ok1+undH/YJliuap+yPq7C7Z8fJ9SRy8TXTu/6FsQ7K/js/MUsCT8qeIk0mA/u1A
+Ncx588T+J+QeESVGDxHl0cpIX1s8NltikrRjZsgKUy2FzT2OYE38wE5h3FJJ8y1/
+p7bJt3IwuyIUsBjRkqvsTVvkLu0sX2TI0j3mb4c7GLu2Lt/v/2OX29kQM/YQbSGz
+/XJTAn9BCY4KYlNT0lEaCIdmLotDW31skc+XjKEbuFEJgkVWBPxpWpuHhWEqD9VA
+qNq2D8tcvFrMPl1KSC2WLf+19RPziERzNZ0luQtAB8Rop9KWUALYj9/96OdUlqJB
+rhf0ausr/4JjXI35bQPtyIuLBwy9wEVvmBk5FKiGnaB7QhCRalwLwHBonnOO7peL
+BuFTRcffscn8rBSP10s0g/WYn5gsY+94iGWqUfzEUwcoUiQTqC/0R3RRVtoOg/sM
+AsTuuOyZrklewlNBKElXtIMf0S4QxmLLlIfPW6oY5HGEuvKyNPPZO9zxa2pDu/vq
++SgWmmGCTn1iVpx3ZA0jf9C8Ju9kA/gOBql1i2VJZt9Ue4P9j7F11wZ6G1++jbfo
+v5TPEgJwZYseQfM9rWZT5snvcw86p0PN6vLa1TwpvERjP0nkUpANcZLnxta4Dbye
+4w7yFRgpSS2Rf0JhkktLNF8mqA1Zoyfo8Pmp+KFW/2fI+3bpVQ8g06L+3krrUkwB
+VB5u7xcynSdu/nVdpeS0Rz3CPRnuL69KzFcZWALQRcUCm/dq7c2Uy67QeN9vpwsC
+e0abg7Jsu45q/STtCADQJFLSbcgF2SYttsDhd+ntsgKTr2RGUgVnLDDre6j12xPI
+ZRNAHG+W3wLuqlZ5asNN6PTJ1bKVYmoZ8ZeaY4KESrLKjInN7Az4Q+kyhPeJJFwy
++SVqha2y9ET7WfQqB/J3baEHsFiu49s//tOqmRYiLRsPkMnKJKuQTlkfbjsQ2hWO
+JEI3YZ0PRVOAN6kW5IP4toIYbyXcFNcAvLvdaID7UKeedeo/n/yPqmyHjA4T3Bv2
+zcYhoTiDs0fAO2M0KO3HpO38JTeKeqAPtkNS2sSt2dIiVGRHrgpDSeGZtXJLteYb
+8gjcC4Wus5ZMHYmF3+LVtYOQQqNrhEhizwEU7oD2pu+Ew5la01X4zVYegwZVivy/
+P8xOvNiTtEakC2UhpHjt76/qqa6zXfN0a7sL8oRbbEMpZm1A2iaYnb2sf0JFcrF7
+I9wAKfkoZ5nFM8qvMKq/qly4QZ+rDQqq/PnAWpmRTsvLWPYFh8QulwA6EeEM+9E2
+LUzsjgCGbuRMdnOvqz6Q3CMmYBl2nzFcoB8IN5UsYYSbpZdg7HqAMSY8KELRi2qf
+zJQpbCZspqh69KJ45jhubUbddD+Z5oA9
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked.pem
index f2a7d40d7f0..0f57ef4e327 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked.pem
@@ -1,58 +1,59 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+gQ==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU0OFoXDTI0MTAyMTIwMjU0OFowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
+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
-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
+hvcNAQEBBQADggEPADCCAQoCggEBAPRw7kI0V/0VJVZUgh26Kk5ufuifE8K4IsLd
+sV4KHZi6ywwvPu0XW4GXXT6HEBAZnAHAtPSoIeRoTRalWa9r/xl6suWkAPzht7ig
+hCcgxEHeX6bn+gvNnwo7zoTAHChmp2M+lvXHlrcLH0zUH0YowfMpQLEBgzqmQtcA
+0ksxAgQho2HlWnv7qs7cxJuOKrRT8/sUpEX9JjIVgT6zT9n9qMIhYbSXPBVoqTtS
+WpLOQ7ANk07GaGTytFPUhzjRMEf8lMeEsIjnJ49yjSwrYSDLw7SuDAgmpTYLAHHl
+oclAbYIVR2P7eO4iis0w9DcAQ2w9O1MfOC429r4jbkRhU6UmHk0CAwEAAaOCAVsw
+ggFXMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFLHKnq+umM5yqA6z6ZjTX/4L+GIc
 MAsGA1UdDwQEAwIBhjAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vMTI3LjAuMC4x
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked_key.pem
index 63f88845527..5712df4241e 100644
--- a/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/intermediate1/s_rsa_cai3_revoked_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIi3T7SSFOH+UCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHEiUSdNXn9OBIIEyAZjowde0ixX
-WwGwPIoU6WTjEiaUl9GQNO0dmqIN6EKowpw3R8eRgIcbZaKAG/ywuP05frw2zt5P
-KLGPONjIhwBMbDQr0skVQBAn8MvTyKvBumZx9cWf/ZUcrX1vFmgNNn2v8TLokoVl
-yeQea1eDIKrPy8peqShUAIqGU8D6HUvCZUxHKXxgGAGXrUmDcKsFcpttUJ+L/Dh9
-T66MJiH4M7aluRgvz6q9BbqAam1gpLhbFzlu5B/lRlzjwNkAxNGd5lOX6z8xNw+0
-yxRPGXfeC6uAD34o5HuwbStb2MwjWr//g/j5LWE+s3FjmYtt4RPYdr8Cf/jGGRmz
-A/hW0RGKhQevqMJxRWgtm7S2B7xu/2fcfPp6b/2YyUKY7PW1rh4D6bRWYseFqG/q
-L64eJFbkw/ourLlBnWBiTtnzDdfOwJBsXAzBailqZhiiAijb0oR4EKv94bP/Dm4l
-3ZPTE+jzbYb9ybOTT9L5odPBYfJViv6MwZLXIj2EsdrmSM9t1Zskwqy4Nwt7ZP0a
-kBg4szPelt/xio/sX2pokJk6Imp5uTzNkFMy4GhlUfbmew+sB1H2zEG55SF2CKiX
-gzFSvWNnXbRM3P62FWBu03E0CjyXAaGG3HlTgj5HBUTHzeKvGCFSL7iECTfaYxUv
-7OXaxN9RkGZPki+SjaBATkofwiKsNnLnOMhLDszB9ho3YyYLR+2lCfQ+qLzY0YWK
-5auivaTq9s1gEoDQS3077zR1vy14ZV0uKOvhmI0j48k709j7Qh0Z1vRRSyo5EHdr
-lP1hXku98XYPVpxnSDbgHT/TfOVUoH9lwP7faRP/EQfCDgabWK2B4Tm8L5DawRKL
-A1savS/8MeLlrwuO8yxYpPeOlIpnXWXPiGhFPEoHnN9CaSt34c3siMwoEQjD7eGO
-yYfcpWW+MxCeYXvfVmDtJXBVQQh9cEAe7yiBaFWBZmcZ6y+/VgQPRWCwUe/lidC9
-mjmtlD68baRZ91WwoJZER6H7dmgrV0Ke2AP28f2rQXj63j725YalMtRFdq7zAhmm
-7ShaaMfSOTRko8x2LvQPv1R1Hc9poGxjUCMhDzsDtSoTQuRVoWsKolR/TIriLoAS
-wPE9p4l/2Fn+QxiGVGwYkZBOZg3THZqn9i/VP75flNI7/UvwhojOm11ynfqwPHrA
-XNRzTvg+d7XfvZoZDC57g2TNtA/heFUZodcS+saRQjO1f92bIVOlLYA2ZMjSgNnK
-jtb9S5J+rQJM1AFS6ejYpSWD2mtaE4eO/Yqe6QS3ThYCvOZ2c7IGjGtPKtJZRbZg
-31QRLuuVrcO4lRiYPODR4AaRiwGjHqIOZei5ZUDbBClnnr0NrDsU7v8SL9XGbllH
-5uL9QqwUUjcATE8UKFrmx/NF/1s7YzlWe95myVpzo67JwNHL3G0C1REtiET0dXTx
-L8pv9dGkG4gXfAEoxTIxusX4YGGkQpVOefouiQAbHJio8ul3lMxdEahCkb5jc6OK
-ZcvTeJXtFZBqyUfsNfUWTMcJSxdy9hrjoB2rdsdG0IcZYdm4+8c1/fg5HiOCUt/m
-IEIjCzZ5BBUNwMB0nLl/pTiq3Aa2yaJ/+PXTWEftxL2ggyJLOceAtOF+6Gak59g8
-SF6c3t1M/xeiw16XrrgEOg==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQHtZvSuJhCBZ8UGqW
+pelZywICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIpplS2bSEtAEEggTI
+WjU/knmhb7QJ+1MXXQnjz2iayOpODxnMPO4hTrg2sQjvevE62UuiWylGTkU05M/j
+3O2fvtm9pPPUzFg4zohUPJU9t1msX+3bQiV3DOcih5dFy/oTQ1YPoISNTi6ICEUr
+mdyzAKOToxDvlctmy/u3tb/HMx9slP5dwfr2X4fAZdvLK4ZJtQZg6gLehHGdFc46
+7hqYBjTXUwfTMQy+yXlIiRs0JWcOf+BhmvAvGytTJifKJF9+Mumf8bAqxr3D/qN9
+Ckso0nvNBnwINnxpETJ3nd0IzhetZhk4owpwKZZZHoTQygG4T2u/2E6//C/7qqRs
+SFCvdW2J59oIxR7xjcsXjOac41youk1xt3/j0c96ShQlRffv06baLIz5OMvCcbjI
++qJq/wr8yDEqdpMJzkojkP/HLNYDtENDditP6vq9PDMObXAhAN+worohivEV10JB
+cx07i7QEqZq+S+wflXaJXxRIXBY0sPDAPwkPKTW84WU++hzrQud7i2m9TY5b2L71
+2ngLx7i6qJyXSxluve/lqqV15O0w2DNZF/B7efAIgwteNIHXMycjoKIiLlGmkUqR
+3PlUddSfBAIlLDXTUbYMbED4BT+7sHrkxWXOel74Wx4cphNyFHt2NAmT1suyBlCg
+kGW2FnBCNG/Balh4cJp8Cg0kzTR85V0uYe6KI+1r4tnq50kiLBg7K3TgJx1TtLnm
+Zc7AeQehihY2IDwqZWrcba7ZU2NVlW7Ipo+Ed7kNijoZd3X3Ebjz5Re7BixbfdLZ
+9eP5mvr+j+UnGM0XjZcxiP6V0zlmvBEZiHh+6N8bUIBUEk4h3o1o6VD9gJqOrB/n
+ue9iQeG4hvk5koWk69M5vvcGibO4kMaJ7TMqahWfU/vTgg+/KhDcPLVYIO84MOeM
+ZDWh7QmMHQ7fhDTOcdOMnMJh9cqSGvvX+K/g3rz1WzE89+/6Av4OuVKlv3FG7840
+Z6hehC2yZAU8MsW/cTfI2yrlY5AD/yp+rR57n7ZpWElUHBcTM+QSvEBy0QW2stf0
+h0Bi8jVOCuX2Hnoz4rcvpkCf5LtFuDym6aGjI55ssHFgIqGXjMnKk0zZObT7RToQ
+W2YPnpXd7RbjDs9/BezN+wt8Py0VzbBjMyfyUZZEgN6sJ8wV/bt96sH5drIAQd5b
+wb7jXBgM5o3dWkB4iSxwkqg/9Z/xMy2fDGbvO8aYpw8IQPvtdn+sEsHcqfamXACi
+nF8emRFrkKpxmTmGoqEh8sUfwMr7pgBCInLrU92BetFl4GWOSIEbYVkO0R2/Y1Bh
+9Vk5MOEmsQ4gkZuIAI55Iil4Vn1fDKuIOLV86y6hI2vMlv3otpwp+ONvu1dHEkMW
+qnN1LiC5Io7vBUVSeh+NbJTaDih/mso+ugJwQ0AxDDFV/J8egEbN5A08s1yc+olC
+PXgp2YtzoFPPE2sv1Q33Q7JHcKXDGHEPPadhpWx4dMsUBJvbKvKH4UDiSj/Yf1qH
+x9fx8dJGWX8HBtjekPRfi0pRoGPzr4TidHCROmXriIEi/G6a+A7CylHPrYjGLtT9
+GTe/HrpYkOS2V0DIUrsEO6taQIBe8ViAEHSSYlERud7hEp30WPKr5aIe/JVF37J7
+GOePi7hN4YqLCS5ZJpXdD1SrN1dB+oVX
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3.pem b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3.pem
index ca7dc31ac64..74bf91d6955 100644
--- a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFFTCCA/2gAwIBAgIJAPvDfYCNVvS0MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTNaFw0yNDEwMjEyMDI1NTNaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
-BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
-ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
-Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJx+kuOnnfKu99DY1jEnbrpBRXswHgXHiuat/Dpu8lP7unQyxQLAs2o7BZUgikVG
-mI9e4igdQfsdfBCsNGaQf4uwzbyMzlqntHCfJ0k17dkhTQuGQNlfEG36hOMssUqb
-F4g3rdHDg9WFYXkk1eF3JjoKCifWap3FAO3Vhc/6cofpFgLAT/iXt86ZvdrtRWH+
-dpxWUZRK+Ck9iSiv28JErAT+9NbqksUMDTsH+Rd4gQ7vgkh5qlh2B47iylbp2KBK
-n1iRg6Si8LBnfKhgoHTHnnLvaTfcHXxTNjqFNfi7fEIYnaUk89uhIoGEIaJhRvLs
-y/LhsWBV0NodHgq+LfBHAZECAwEAAaOCAXswggF3MB0GA1UdDgQWBBTjSbb4T3fg
-RCSArYQ8R6ldvhaRDTCBwgYDVR0jBIG6MIG3gBR3tHoC3VL4bhkfq+NsrUhRB+Ru
-uKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAzMQwwCgYDVQQLDANJ
-Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
-VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-ZXJvYy5jb22CCDM7O3QitefbMAsGA1UdDwQEAwIF4DAzBgNVHR8ELDAqMCigJqAk
-hiJodHRwOi8vMTI3LjAuMC4xOjIwMDAxL2NhMy5jcmwucGVtMBcGA1UdEQQQMA6H
-BH8AAAGCBnNlcnZlcjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29t
-MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAt3nCUPeg2
-4NCplwbYeSRe4+C8KohLFWAA+1dWW9rbckOwpmEQ+mjd4xj9OaX/qy48Ygxu18ue
-W7lQsJf6z9rOxBr+kkDftvGNLHe0Y8GIC7wCtazNeKPUEq6S1NRMarxutj+xCiOb
-7MUEO6k/R+tBs+TdzFqdjPlApzrKRwhHdcFJP5kP/Txo9vtPeBv8x+XqhpC1K2c/
-dICnov3Nw+fikjhlDxjUqKbHoOk8sb21ng4gVodPKcQdOFlVidQu11nD6mNlYKr7
-kaDQCANOESFTYP8nKLVxn3MwWYVx0S92osMz0OqnzoABdW6CnSznshYknoU5AHWa
-ZuQ2CKaVV5cd
+MIIFFDCCA/ygAwIBAgIIHl0SuFnEOXUwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMloXDTI3MDEyNTE1MjYxMlowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
+A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
+cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+tA39hgnlfHlLzw07Co1T6l3NGuAkS3lx1il531RFvaNhaT/X11c/6mJm8WYQL/4K
+QBVztxq+GbU8q7dxgMtnelVihnt6Y2e5CWRBWOIimxUpi0mTtVR4BdXcA4kRMhqP
+Ib8VN18WVyY0wiT0uGhlNg/moLp35uw8tO71trUWWaILIsy89+YnI8koWdkJOONx
+s4mH4WOSFWRnadJa/GAw5TlsaUQ+6Qh3nItJfqH1ntMTTO7nHFLwykHAjlAhe9ou
+Gs/1FjO3g9LtAoiQKXFjxdk1BIJttaCxXh0w42KL4y5zyQ3VQ4iJeJegZYdUKgwT
+hUp/9T9gzMtq6vYysDrkuwIDAQABo4IBezCCAXcwHQYDVR0OBBYEFOz7RR1TpiZr
+3RSDLJM5JFp3HnReMIHCBgNVHSMEgbowgbeAFMuqnyxYLlHYqQh976VAMV5wuGrk
+oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0lj
+ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
+BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
+cm9jLmNvbYIIHmQFmbBLbwowCwYDVR0PBAQDAgXgMDMGA1UdHwQsMCowKKAmoCSG
+Imh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2EzLmNybC5wZW0wFwYDVR0RBBAwDocE
+fwAAAYIGc2VydmVyMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20w
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBADJX00wqv+Kc
+8pK6d+AlxfqvpBUeJUaBzLMzE6203214cOt9R/ycHxAi4G9EZO2V8W3+j2OFyGHq
+YrTfBgzUM8/v527pmBpqQBViSBE7kwRoqF962XQ7LrOMCg+CnJ8yZXj5N7RYEOma
+fRGMe3A4YlEHhtqM41k6K8Emc8WzMCLw5g3OTysQOQwnYZ9jST4z8AzRawzdPBpk
+n4mLmOvwdPMkq1weGd4/wEt8u6dMuqgWiHdwhf/V48jJ21GFpzcCB0sYUt/d48JB
+kKMTUKJ8biNu6UxgIws6d1V+dsFYzHtcc/BW4RZjDH4o7+xDpo00dQOa6pX4+o5n
+tKhBeIOiNzo=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_key.pem b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_key.pem
index 7107bc46bb8..539ad792396 100644
--- a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIvj+0k09IgAgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNdqYN985s1MBIIEyDnOlU26MOK0
-/s2FoHUHGr66LPQ90+t2GbYjxnuHroOQtNqIImFaIcvwJcFXIINiMx70CSIFAphd
-b0m0RvvJSvYD6K/Dq2slnkY3NBbQpBr4p3knhCRaVbt5C/R5u8DFx96GlFAFitX8
-ZOdAZUhIpK7WoDHDjmazXQMag0KCDfLWvP7os4FwuJj6ai1nLJj900Lke91OYzID
-UqY/w+X6/CYACI8k36zu7x/5hH3Mb6GWOT3/N9mnMmQ1Vlm41NGVz/EgGwzA5tEx
-6mtXVt0zkwacVOLp6nX/2JZfrUR2HtTw1f9km/2ypbqcpVNHJm1ut+Ozm92MWwQ1
-Z+sB/mRvHvqXRBiRP0xYCfMyn7Q1Bm8AJMHxKgernkZrlPlpvyzuSj0zGEWllpJd
-hVuq9RIQGTLkjpilsB1AXKLx2eAOS9tB8AlUgyb1XT0ILgW/22pyuYBun6eh0Rtc
-2CQWXmxMoKutlLbF7OB/ARtO6yg70AuDvT/2edN5H3CoR6l6ihusjVgGm02aPpDE
-GlXig9deo+WvP3Otj6FDVVYUkI+phJmDBYCuNLKw8q1SM3eD8EVnBVbKCkvJ+oP2
-QYMGkQrbzIJmfsk+yfBvZYKvGcu5vo2tKXHu8T4F2cRbiuB8KR+toec1Cmt0t4vR
-5tcztvTpJ1zprPxl7c6ztjRHWvGyZVP7CTcTgcWMfAhY7e0B9a6JC1DUNxslvoe+
-rXcuysExdltLm3HQUm6dwzRvqoKH/lAPCzYCMs/WgwzqBMhrykrSstnfSExa/GhQ
-mYjcNngBlM+dsILD4wtoyU2p6KJmSjtBY36EL3ji6WMRFN5RT7DhqG2W7wdAoDKd
-A/SzkzvdhXckQauEhRbPpfeog2gA3xbwRrZA4Zrjb00Jw/bzPjQZvJtCm9elfesD
-oivrk2dZ5klDZ7+dxbr87E3Tmajrz4iqvc8wq3wFPhTTPWkPExqVaJCike/0Oauh
-eVbxVf+eSV6SXZjGqPvmVA2AyGSY1p+wNqMMHVkA6cnj0uFlFn8uA3Iyz02UlYpI
-QQhN+LFbadVi7OgjXRRTEu+it4T0j+yRfYl7HpmVQ+iZsptMTrUpb/F4jHjlQk1N
-DHWdgLx44GKOAAsQp13DjFphoNKBJOKu5r/FFSsPVwQttATgHX3paCu6myKvY1cC
-fyCMRoPFkE+zo/B03BTx0J9wSH3kDgA3y0ZiToknhG4FE/M3ibKi81YdTe5sWo8x
-MDl9m8xAdsVOn6N8xkb+iC/TWjiNPpbWiJxJz0D9SlI4u6yVjs4gXxAiBjkGTQAT
-w6NM3kU2QYhdPuWitibcIkq7QiFoyIvP6lhaXjyxe3MloKlE3RaR+LX1osCaXkfr
-dztei/mXxp8l7WK5tBHevhEIlobxfjwcsyGAtbCm64Z4cSsKWicB08/dG4klZX93
-nq/0dJK2qQjcL9JWfOE3jxOJhTOythZfte60KfJA4X6/SAbBUgHTTojY1ZkgO8sb
-xa/stGZXtKqxs1zm0ot9TChVWLuAttq7TrmJtWb8QKJNt8meAAVSvJ1egoDPS6hq
-sRZu0uXuRqsjktomm76UxF+dfGP8z1CylIF8ghBu0jOVsy1rCTNLXsEH5j6G7yMk
-yLR5pebpmjDYc9dIu6lKkA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQxTf9Rs8WS3iIPCzk
+j8mckgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIC8zCtCPxLKsEggTI
+pnN6r49k61w/q1T+hrYaXdk7ZaEKaLi5BM3oWH361K9fWpbzi7vCLgwlwYxsX66m
+1uhd6fPqt+KslXyHsIHvatwKxiSC3ltNwTZO4OiHoi4VbisxJjKoIg/ouJsJNjg9
+nyQ0yQ1yVlKVWZd7v5mEZRvjkh4abxUN0wiebSNDkC3Swyc68VPq8H/9bU0fVWSk
+YRTdzdAZKWHwmPzPhS2v1ZhZLB9i2TVgvzgaId+iAg8kKNXsN2Ig19K+MLdjkeYg
+rrXenAmONz2FjygrFMTdYVjHRCdp3DjFCfsVFH2OuEeOmtnVQS5hC+iFE2EMuor3
+3WWSQb328JDAe3mHewdf49gFBVYGwQZGQ8vj9DgWZy4AS4RDx0zyxlM9co6hrjYd
+zs5Dxcw4BNSoJuNxWNWWBJmcYhUs6vs3bGqi9HQnNAsz6AlMtLJOOoDMNPu2Go2K
+WxW3hJDUbsyWhoVJX3cdRCD6psS0mXGemWRnCoIWBNa3d3IZA6KyucfA2oSCRfx0
+SPkLAfk0koTYsUK0rwAaEmqnYriCarZEvL9CDuLaXaHgDPaLNmufHHCzyuLO6zz3
+oMnIArBNH4yG3XinDUK9PXubjP6WSmkkOn8ydUp0yvXmGeJ3AXd9/VIxv/hryKhy
+Vw5F6kw8zlrN1fPtg45tg4VmwCaXFG3U9mjR6/Qp4abCxUzf6hLtmnxwYF11HlYF
+APCXxkqtpGnsotIYmSusUzCg35GtldWk4RTAdn7W6a0lsCSRimEtRKiHG/ViYM+l
+jkCSUSIUU/xH+JKIHvNLmGs9Vk4OafjrBtDyKXhcP0rd7M6JIq06427z8lHpn4yb
+xLT8hMWJWZFdh5zg+gierYW7ZQfSGzTYvJgwWrJsYrlOV5w237LwRt0SvVtRDog5
+eaB1XmOpAEG4j51HGRNCoj7iyY9I6Sqh9UylK8iYUq4Ow69UB3MMvhcmkE4bLV/i
+nyVBmm6Aoiq1acFPBKK9W++5LnOiZREj9rBP7SlvuJwo3iL5uak6bA5OoNClzeQ9
+ZlRU88PyGTAf6ReRLFx86t+XOOJGhsfwSjsdvzc0rTd12KzSDS8BC9eU9t7aKr7t
+0YixwcUhrYbzUjDnAl4pJqZs+pI89in9d7wICue1HKmoVNLDTD+gfnsgGvXQ1rjP
+pV50HmmXbIW5SgBbDMIb+52UmXVh77ZQU9lpU4x9XzJJ3Bu+R3x3dVkIubPV0lW4
+zJ3r8ScqoMs6Xpz30p8xfWEbqhATdGN+m7RLwGGCrLnFsYS/XOhk1Qx12tp8nWG2
+84WsI8O6v1p4w6b78XG5FcQsia+ucdnFpU8Lrhedi/SgqMd6iYDeNLG3yE4526/h
+/uUnogvbFHflhikg8he54jkqxPVUJE8INJH4Nmbwrc30AzqG8w03/0gS4euxzDVo
+T/ZPNs/kHgH/k+Af7XsEL/m1hFzb9+aK3CvoThf43cylDTnPxa+ts5Rcm7Z2t0mA
+P/K6ItwpKlZjNKjYa1HzwtcChFZLXaXAm7qCRCmZaQVk8ESoklPeNqzNoR0FFSqK
+J5MTr6cNCcbxWvtaWKexvYcHBzlmI2sfhZxnn5nCTMAd8hDfn/KyVTbNT4sViKrA
+eIbm+57D102ux3qBOQBCDguYE8fFPoi1
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked.pem b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked.pem
index 3515c7509d4..a806655bd07 100644
--- a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFITCCBAmgAwIBAgIJAMhPhesMBkMaMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTRaFw0yNDEwMjEyMDI1NTRaMIGRMRswGQYDVQQDDBJTZXJ2ZXIgY2Ez
-IHJldm9rZWQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAO
-BgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0w
-GwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJcYerCSoMQQKj1DBhwyFtVqcH7ePrxMjV1M52j1m4DHggRk
-z2DT2V86r5+jefulhuz49zaYQf0zQ2wK0ITZXVULf6PXVJAo+5121qR+PPbdAkcQ
-0UznGcvnDrxsq9UQCgzLIPM4HM2juy6jVP1iYHF+CjQJAOXlfyrHse+J6dVUwSBX
-qllDOHKd2sVstIAoU92GWroDs5XJrXMi57OJQFYMEkyBWw6DY9bM3rXv9DCgEw9+
-yVAIHcevT70QTmC8MgjwUTAWegB9skfDhbgDi2f+0LDrbcWU3h1rOV2fOHXKVYhw
-/KmEPf4haZ/EYeUDDMIToGEWGMtu6UpE2xJMHTMCAwEAAaOCAXswggF3MB0GA1Ud
-DgQWBBRr3LSZOWWxsK6PWfZppV2BMGu8HDCBwgYDVR0jBIG6MIG3gBR3tHoC3VL4
-bhkfq+NsrUhRB+RuuKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAz
-MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdK
-dXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3
-DQEJARYOaW5mb0B6ZXJvYy5jb22CCDM7O3QitefbMAsGA1UdDwQEAwIF4DAzBgNV
-HR8ELDAqMCigJqAkhiJodHRwOi8vMTI3LjAuMC4xOjIwMDAxL2NhMy5jcmwucGVt
-MBcGA1UdEQQQMA6HBH8AAAGCBnNlcnZlcjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1
-ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUA
-A4IBAQAAFIJLy49mWCeK6hqVf4EreoLNqst33Tjnho8z17ajnhuSHeuzA8nh6E4O
-IGRYCaRpb4KY99oZ2mX017hgj3FjgsOyyFaQxpuYQ6+vSEGEUSEVj872n3jw58qC
-7tLfzBtzLsCnmmibeLaE1QL6J7xvq9KMXgPMe9BfleiFuK4tOVe3fXd1w6oIIv5d
-hefMLpMu4xh7ZZeJz+P3Aji667Z4M/fxFENIPsAg+dbJ95s0hPfTojQIoPElc6E+
-gPyYlQfAZLi+oyK/wLqNvaQvvkZFhyxTXAtWDl8AV2x9I8Yfk8a5Eoj7WxksYnNd
-zmMjrT1Z3K2BUvW7h0DuBUTF73aX
+MIIFIDCCBAigAwIBAgIID5x5xqvy6WgwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMloXDTI3MDEyNTE1MjYxMlowgZExGzAZBgNVBAMMElNlcnZlciBjYTMg
+cmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
+A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
+BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAqsbSdbFBqfi1VZiFrzJJPEgvt1YpWUHGN5KXTVYNo4Fa4oio
+yOpZ1ZgqaiQERbRJIWhQcRpDdJ/sIdCMHsRCnEC1YztL+VFNmIsWfbV+VsO9+yka
+7+B11TMmRcv4KOof0OElqhYHGLspuPCIat4sLB/fgR3oDiIx1MPxPdE/yrGPCO0D
+oKzYY408epLgSWZ8KDmcRZ4SMr5Y/nfm9DPNtCRl7vrDd0WuFUG8e6eNTp7ZxIK7
+0GqnUiRG9KaEG1zvT+7l9B8af0R3xK6v5sIb2i+PJ1bGx8ShrTGAK1cDBY7IqJjC
+UEhXJJN9FlPbSC7tJ1nFahSYP/q8c8+CDKbmswIDAQABo4IBezCCAXcwHQYDVR0O
+BBYEFCzcIl+SehGKzrzHrEYN7gYaWJ3NMIHCBgNVHSMEgbowgbeAFMuqnyxYLlHY
+qQh976VAMV5wuGrkoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbYIIHmQFmbBLbwowCwYDVR0PBAQDAgXgMDMGA1Ud
+HwQsMCowKKAmoCSGImh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2EzLmNybC5wZW0w
+FwYDVR0RBBAwDocEfwAAAYIGc2VydmVyMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
+ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQAD
+ggEBAASqrxgrLwH3WUoE8AFvlPC+2LOwxLGGl6tc5UojGs4LCy0OOE/0l5xUwfK8
+tidlyG/h9ta+0ekZBHMv7x8DnjD9tDTWE3NSJ65Rb8IUiX4jhRcDQfyy/54AWMeH
+B0Yq2IodGxepAf70rH6P9ztltGEVH8t6Ywt79z1ZLbqyW7vmEM3PdIvC2eUt9nCw
+5hp6GRd2qpPhbMUlXSWls2wYPbp9wZUm24cAjFMe/RJY9ZTtCFmxg+QGNTO+ZHHc
+8KLLzncMfSoB8uCbbDhZ0ky0QQoj+d9B254H77Ci+G0aEPQAJO3JMSMLqM0L+9Mv
+IG28uqiccDM8QVfMooxC57ZUIqc=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked_key.pem
index cae3db25349..e965ef1d67c 100644
--- a/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca3/s_rsa_ca3_revoked_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIz+RQjkFfYT0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFQpcZF1GPjeBIIEyG4/5aBxk2HW
-d8fe/uerwkP/zeHyMmsq73AYYlgabUghm74V+uciyjzf10ireoLqh8O2IphKMyCV
-vZ8IcFIwV8sP398jWgLYLN1I02U+Kct6H/f+yuhC8ROZkP5x790iYQwduhBxF9ze
-eqCRARjI5a3SJRix4UrRK8gGlxforc9d248xUQw3BtYtmDByYAzWLTqgmuy+WKSs
-zWCdpp+JUhqpCw87JQ/cxlDq8ZJGicW3DJwuktcLpMuc2TRmQ+pIMev69DSKdndl
-GN7jeYmWar6urZM7bHodW3E7X6LWa6IyYq7LpWM8nSOZ3l5b64zrQ0fEBHink6xz
-sEWfuDKncmmnVXBpI1H7ijMbUvlFxn2sADdP/lA7eTlPy2tL/iSvzY8vgaY6VV8j
-pgRKWxxL/CdAZgTD73C5spu2cSU9QNOdOZwnaWYuymWn78FHbzZylmMGEk7pIc9H
-YqeGus3H7nUiMYZjeouK2aSevXDu+1zXZfgCnBDMUkVqCbA9hIA1y9dIx/sSh7rh
-ZF8qWouybHvSD5etXqw6dUCJfm37mqkQjP4AhtsE+TZXlwqbef/I5j3yqcELxd9G
-bf1XRC5v6Q1sWO6G5xFrp/FMJ6G9GBMNxiz9/ZkXKB7DY+PsqsbwTANoQIrP5kyp
-52mDoyT/IVK6/JhEMzUPThiGn3yawtYptzGI+pi7xT/aTSWcejmHjGuORpRLBn08
-Wo+DCDXEg2zN2BXdamH3zpH+YI3fRlGQGcjsIJ8qAmbejJ7NzbGd9QhZI8VQLIb3
-ql3U0jKDdF02IJhpoh+W/pT6wgqWKIArgRTuJwTax4zEjlfFdnzs4+Ngojlgm0Tv
-kHk8cBNFo/DIR3VIVd9Mx5zbmA9cbW84o0QJ3Pn8Ex+BBfPBLKF8YRo0YIKVk/I2
-g3FAB9gmSNNsP70qII/nt53lqxRPRWQVOintIFS+ey2a5N2bIzyxLZ9exrBGBeFj
-UquOCwIcHgOQ0fp4rdchYghY9tg/Ew1x5OrbIvwzvPrWc+8ctNWMQMnGadeAutuI
-yJPrg33zh7GfZa0gjR0U+a5w3lWdTlhOX7cB7NhmziKuUTmteglbhGHBrrJnieiX
-s5nJA3Eo1Dqt5bzawlNzwsVmbNwzjVwrq4I5POnUV0x67MCYOBWV0gpTZxWoFm2V
-iLpqaKG4vIOXF1RGRW03z0BIszfr00xZX4UHPKjAxbXj0ZX4AS13NXmZpwvxXyN2
-3SojNvnUWxltdxPd0Ilv1OfMFs+Gwn+5eE92qmv8E6wuWwb1J4lXjyqKTOYfAXc3
-nF8KPmviv65MNHMJXq0zx7tDC5S8nNthahplHYCQrHc+4YAzixhWmNKX15J1y3Z+
-mBxg8nb9WEE/WVZRuSWMEmxAXO55zmMdjpPo/FZAOfkPF0IHnLL1taIr0gXyQBPg
-TouIuxDApMRScmcUvq44tV2fRno1U0PSsjq00qi5fHwnRMZnEs4J8PQ7sf11FnFP
-UfE0N8EZV6FZjclD69iOhQR487rTm5pCQje3JDoBaLPhqML9Jvdd9hSuzn4wVvfF
-Z5V9gDZWTuSufkzdMvQLIwJ5ZIqYBpTKQlJpUnxTGZNuYcxjan/W8VWA8IbFiyBv
-tuALvyiaFvr54YDEjtNRLA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQMsQ62WvhnZX0uXdY
+MLOTgAICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIt1qvAZWjDiMEggTI
+DUdED3DszSs6C70rqF3XclnCF4xX1Dda2QgsP6GhEOdKp8i0qXvGmajsoXPKafBb
+I7NbFYx0jsWAcYyrzu4YRJQWIXglsSe46tnYB2ZQ+9AvRmzNieZs1XH5FkEspx4N
+0YhWSHP+AtIOt41XOTt31pGPNDRWq9XsqpjaKNeCaiuaMQgVIJ2aNZ1W9vo0I6gd
+flg3eVaMNXXhoPPn4h+mgCFeMwAs67dNEeWy4rqVlFvm1VqAoVDj3BbbK4xBdscV
+4XfXkFLGjmNMRq3hRwCERXMTUlx6GLRm3pO+N1qTpqRzraU1lrPell2Ff3H47Ah1
+TtPkjk7OXu5jOck+h0sGNOwDNs6q1fqOjf4T29MIWTj0IUlwAfuTjhIZcEDOzu5E
+ThJD4HgEb+fMfuPfz2tLxbnThTJUczOqMQbODMbsGKcDvFsXmIMZgMpO6al5IHfR
+tt5k6cQE+6YE+Y3iDrJ9AzrFc42rgAlwJgVou9HgaKITgPJWFK6dzeY6q8SgTfqL
+4DbHgKjCayXSVHbmjeTZCDKzRlr7hIE4ubCzlY9bgbSJ2YkcX5XuZ9RCXv/NroSf
+nWunQXYOgSsbMSls8ox2n26OmxqOPXoYf1zkezH0GGc5f1VQr+oCwst7TQovOjPF
+m/6or6lmccWRl1g5A+Ace5bTie9osQRizbhe67hbxWrs6MCIp96OWskVkLNwzF0R
+oj9PKtMjPBDzv79lkraM+BnlWW8I5zBESaYIZ+di4cOj6JDjek1Er8Una+a9dlY0
+OjZDfD6rr+JtLQi/3T3UVY0irMeGgrFhgRTeSZwY19C7WA6yvUrSS2vNagfI3ucr
+RQpf/LDr/AFwksNlAZyyOLtHqdvSfAivJm98wOf8rNvG7qEUQH1KNiSjA+/cy/Fv
+qMHZvNt3owFA3qPL52Zhu6fV9WCfzihXAVVDVSOZcqwnmcxTRb2JvJn44vgAEeos
+9Cfho47mILAAbqOqEik51Wttwynf+xs1pYUNxaeIFtDNO0k3oXrTsEohF4TgX7wu
+6EVctvfndY3YUjNxdl2hsIB46aSNbgg5VePUIT03nhJMFPF8mH5azogJBCgl98Kj
+n90jDuRJh4Q2NM9P6rfE2C7V2pF2Gfr13S6eRnFSSSjx0SvaJfGIqoQu2QVmPb6s
+ouZYbUH32FGne4wYPPs8+2sWUz42zjUU8BNNs3b2J2UzegVajufzS35F1eLFMxhm
+rTXKNrG/LVqIXZxLvdXwusiCHdsInlckdBL3DV3AA5IkxENgK3GrCPMcBwAJvEyJ
+gQx1DWlNHO0UOFgDoboO8hJHjcWqtQ1x6otpBwzdQ9l6rPRdXSOqizqLbOFpjM6y
+Pwx6FuIXl7Ot/GUhiI2h1olzU1NxzLxpA82nFllISs1NNiMOAZPxzDu7KGEvrEOb
+yEauKVch3nYauVHmc3Oc+164cJcaxWhRxnXM2FLKNl74HODHCttoa4vvdHBmYR3I
+NaAbZgkwlbrtXaVdgtVWfiTE3Jtny8ldYCBmogByFWiBSsW/hL1ZHFRn5pQYJv23
+7kVbFCn4aB7ysZ/ybZIxLQzcxxnflHqic/U8fVrR79Ww872kJgGA0DuPfPtr1BP2
+awZu+gadSYCpUWHNvf4wBQ2ljF4GPP5s
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4.pem
index 7b99c7eda0c..ab1437585e0 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
-neiaFu0fBCKELwEW
+Y29tMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQAF17CZ
+SKP0v8ul5ODENOpyDO/IvBdRGDl6hqfeB/28L9dFCrEWlCKMYzyTb8itEhwkjV6L
+66hK2otk6FqITl4bon7Or2+WrhORAkAGT2teV8b7M/bfZd0RQafWJ8kwbX748xxz
+7DeFcTG4kUE2Ms+OFCenVyfaZh0tZIcr1dCtK5DqrfwwrzmdZZsr0ymVOKFZHeis
+aR9rbutjdTjR/74+sDfNmUjkivXEXUN7+hNQMhW/nfF5tuHRXw1M88EDXX0LiII/
+Da9aObjMQXWV9f8ZSOzVqmk+zXqydosybRI8nBPSpYRLl+i35FlAhJGHFnDMl4wC
+3zqxqaQ3/qXDHMXB
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_key.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_key.pem
index 3bffb6c61c8..7fad9acadc3 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqiBG7n452u8CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBd1TIKapUJZBIIEyPm+zbkvZ6Fi
-0rM1rqOrFDXzCpiL0djlHFjrQXxmMkM+gQwHp8nUpYnDvvN++KSzgFIKmYlKOaPJ
-aCcfHnzGBjT9IakuT+bBRmfuEVannwLfahtFR7oyeWA7lbne89LEScSlJFCKse1m
-hMx/XUqeUNlE055C2B1Ovz5uyKzVJtLWYAuGl/TUiNbzbz8kzj1SsSDMxVXmDSaJ
-09S8S/vQgOfvJDTZUqmGhJW2G/ydFaDM8i2Oy8UIrlGW2/pUM/s1fUpIFeBR35Gk
-Fcb89Z5RUUkXsF/LtE5ryJkqX0B6seLYYwU0gJNdQyRRj3dnvx5S3+8YwRQcUGVb
-79Gi0aryS7jGE6jCRr+5ZKBa7PQZqCNfliRIs38oqp2lEGYPm2Bu4iFyxM7bJtyv
-9EvPSo5Y1gDqv9uO0G8gd8MoMQ92B5UR0bKjpkdcdQp/BTFZ/cIPly25J1bZgYN7
-fre+5A3k0Od81ugiX8rYhghRNNyEwhS5Nzd70aWs49nA3TskHkXgSqD5EnihuCUE
-Zp9zdcgNWJf0hbh+3mzUX4FtZMaA20qkbu+puiNq/BRG81DcWlrdwo7TmMHzq5BR
-P40JCFLpJYH7GeV3DBZHXWJ2MbpSq/Mp2ZrXBjhVbvDgsrWb+wMjRcgXqTvPj8gb
-lb9BL1Y/XPB6g9XunUvAQLGc7kp5ZyYqdlI1f/uEthuXd1BcDroOtfPBDi0zuFne
-/J0OfSt204uwAyLVLghvt0B4QQGLg83YUk60Nr8XxJKRQe/HKC7sHzRR71FiUuVf
-Ifa9sjQg0cnFfeNOPWa09vvmFTdmcAv8C1vzd5tYf8nMTpz7TVLSjZOqY5EJrFF/
-gjfas8x/BzhFG9Z+fZM7TNJwrZVzVXuU/bxou2IUxa7Y3bSjtjw2nMlaHyiXES7W
-m40maC2K1BnyXggi82qKJfa8YGS66MBsqmWjU57kr7By/odpJ8H5nHwxVFnajp7K
-gDFtakWsuvN0hqmVJAxA4xFnSyJZh/h2c2ZYUvpTLmH387rzwg65RiSgYDvY+8L+
-llW6hIuQQ5w1i9t0GVIzAeYE7BeGdQbvA8aEWJ6vEWVpyp5SeDwdHiJd+fsgn+fE
-8KR2GQqVWX4Sx0hxM0r+fot6Ot3Uwr2NoNMg+ELY00gEjwHlOWf6+wtcTiI+ZWSX
-XNYNBNrIex6letlrVh/VjC/Xl7NnryIs0LDDG2R4f5HZuGaOGXChziFnuTqa9Xbs
-72rcVk8eZ02kIruB2J1ahQcImOpGuOGCnwbPUexFULt/MV7uYyCtRr13ODBQYMOn
-u/G5DcodwSksYBKseXwNqkNdHm86wTq0FVRPtHmrRaCDlv6pWKv9qI8Wdj9TI+Cz
-9MGheXm2HnHC2qVe85DW/CSwLw06ancHBdU3F0KjKnWRAbImZBINqizr6Pz9zJbe
-oEpgbUR/ohbobhkz5VmMLbyAlXUZU+N/iG22DffGnIKpM6HLbsvweh8F7eUeX9SD
-2N5CFcdBIuYAf+K7K9X60Ws9yU+NgYlfULWaN1EaG8udA1tlQHXtua8K89fdQHDT
-ngwrg1JBvK0MhduCknkjWOCdUxeFfIvI4sjHvwvRj7R78QNNtPdzoytLCFp0QqbQ
-Q4TTUO4uhaqd+5+8d87JqA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQRZIuYE50Bh+TqvR6
+NvE+AwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIqJf0YRq8C3gEggTI
+hiNtHIwErbW+EVR4SdneJ2gy9T3yLfLOCLb5/K0FxhG75c6S7rnlJ++SHKUTnXUY
+8ixyQCKSMZsH+3SlVa0aHuUObVRVTOsm7HiaVqdCyQA8log9+buDL5i82H1l3mFU
+xOuAOTGjLGykiiwzS3NGcuHrCsEjlFX6+xrTF7rbJhyD+Ugj99AEZO7NMjbwedrm
+XIMdmT+VZ/wSX/99CzOCHbw82kC9tKkAwio7aa+C9VoaMyXe679YqCxjUiSQCTAx
+9I20F1km2NwciKw8u60cWHwxSYQJGy00scnX5QezCBxCu0HkFuf+hcKhTbRvtu+7
+IJDWoJs/BQ/jeujCHwREeBxht43TbLW/6qtduNUaVb8rqRIaV18D/VGFrDNAFCFa
+C3Shi25ii9G8j90HEM5rSkeV9aoJ/2iOetQ/24xx7qXekKOOV6rJoo93pdMtzXV5
+VOhI31TTQ2o/c635woR10XQ+hw0aK49TQyj4bXXJMyB1Cidngf/0RsKY4+Rr/qa8
+eBW7LQnpGz3ZCGdEqCIuCi7c9D5q7niXfEFDDBsWcH7JjhFL/YrGGrq8A3EJ+qI2
+RM+hXDcxb3MJCMtjtDcDfqcxqe9XS6MOiooDi7AEyKuF5YKlDpafEV6TKVE+bxc9
+cxgBqnWI68bS1djPrwQiekRK3/A2ZQyFnsXlXpEkzY4Y7V4bOogA/zyC1eUXRWVt
+q8cBH6gbbTFODt703Chjb/nS4XC8UYJcfpcRzxAWfhTzPusrcTbL1Wy0d+ITuanG
+pQGXKQSH9MH04rHsamzcVX8f8sf9iHqeZEbDtHqsWDg/aFPQrwrAe5izOZq3yKuy
+jA1UrL0cvBruh3+6C9ana5J1nHNZImYw1KPKuO7SaXnAlFVRcdiHSOC7z1YhEvMx
+KJ1T3phvlZrcJIDTkllxHuL4f7pt2ZB/5u/kGVMWqRq6zhRDWBzOZUftOa3CHCVO
+yDattd3Pt44ZLgfa/Zpa+XW8aoX2tjFIDWmde7Nb2EcfXgf64VCt0jUrRmbVRfPX
+7+G3Ubzr72+rPF4lIT2R2G/If/dk0EabYzCRiRpx16iqHkPgLfENiXpcrDET6NsV
+s/pePP8+zVJlf2viC8/4QlA88DtrxurMq3VxWg3SSeqbIfwFFkotpqgGNUnRV4Qu
+yTkPu7R63bVhvOWIO5wGIBU8kUXImFPPGXoXyDUtXdUWBYexppDJ2QXPMB/68ooI
+d7AUGtwKwK6/f92bngZWnaPOrTFI8QQzEr6SQ2kZqHROYeK7NcidRL2BHY6SKD7Z
+S63uTJC8YSGOnnq7Z/LN5pI2Hi2HkJEzwHU6LCVpCyZkUtJhrvd75O/GR8d7ASWF
+qU2U0RDR2wXQ4j7I5e/g+hYCCthpNMLDtwlpA39IuARefnCZTesJun+uhMfn8iZR
+Rxj6ElGq2giKqcMcsg6H6hda7Wq7Yj/y58Kx90bKVdrhqNw3iC8Tc0sZ5ZPQiu2B
+qxPN6URhpdUtf/zuEckChOOuu7U3BHFlRasmrL4KN6CQSOB5+MW7aXOwYCEevI5B
+bHHY/SCQ4u8bgZI+HgWJxiagbwAhDRL52jHObomIsmVzP/2E47wsfX4foPiXUZs6
+3w0IzzFfqdASwZiYqtH03UTkt5597iH9
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked.pem
index 6a9abb70397..3796ed3ca7a 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
-oFThpoDp8Gpexkh64Xub7UkkSNQ=
+ggEBAEUeujqARroYQefrNZ0mJdHJijjqthhgYpFsWaZIkbP/H3/2L3QIBnfNgMY0
+HHlYs0ATgzeTD+Z6LjJEl1x3GBe2l075B/wXHmSKolDicfxxKxWEBxQaERpSuRc2
+zhPlfprEbJwcFsC3kDzzvVAwiK1Uq2ximvaXuFTn3e88/w1+huwIZ1C0iuz8Ueox
+GNNx/NJI4wdszCfuMPznxygxDysx1UUe4ww0eWIe+/hRlDH6GDfsQG0gDFf9lDJ9
+4gwfqDsS474/FgT0t6KqC/C1hsDs2Aq93E7LDXVVuJfmcXsLgaX+sXfcY1bBFGQj
+23u98KWc9dDsRl/KGC4bv9MvN0U=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked_key.pem
index 563856a2d5c..3a623113ab7 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_revoked_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIry4XwarZQ90CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECN01lzweGb7xBIIEyJC8hWpGL2tT
-8xQEBkbyj6QGKWrnY6cuxSPaXIdV9F+D9xaLjez70Eb/vp1BmXsB3IZaz2ogL3dR
-gknfpV/skLQS4Wmswd4Ca2EdjGaqAay+gv/usAzF77j5LB4d9a+FZ1qk+qNv7dcP
-HAqVTa+QES2Ll+g2Fm7ZPRFc3WguDoLQzcxhhDT8yrUnHcZYSup65axu24f4Q+BO
-CbaKYKmWDGSxcBldSObBZErl259SXm/YrCdBOaPFLD2QBz74lUhhTtrFQv1pce5s
-N6jb+UWk9d1WE/g96llAII4CMyAOqBCwfuWZEuMDSySbmCmGjJ4rqk+rbYoPDjta
-dGcSTBsX1w8fczCmAnuDzpYD1R8ePRZdJ7dpLUa8wBtSHBLGbslHhEvfEJjJ/s9e
-d9vnLlx2qd4ibkrb1TSqnvkq/RLLnhkgYBSjYTw/7XEcqkXt7bFS3Rv6alhARwmg
-2MJI8l4xAYV+dqSplBWfLocBJUuP6Wtgpadr2JzLYDwdiDLoUzUhzt0kSsdl1mCv
-2a8cRKY6UVtZ/lc7gFedBNUbvMJxQq3DUXqpFGlvdUTAle6iAoy+CvGjyPOLiQ12
-kbnM5o4rosYP3rOBACSZNujk+JV6jIkwQCQkFwDpMnkOydml559dYL4gS3x/GQ2x
-vSZ/1mCpQAnZmSYv9/smdUaO0CZh61hMY1q79ZoKAJC8QrPdVUYshYVY5S0G6YAa
-4yL/4TzPoatZIkMCd5yIscLEtAWeMNprFBfJcfvjrVL4O4tOFNHvEAR1Xs7essss
-JmjEzfaHLExZUTQDRWMcGsI6pUzXNg1pMvSWWAKqM2tYwcUe5ShZcoVNCD/HaYUV
-3iJ6Q2O4vfNGnqV0LG3aMOn2mb2Vl27AMBuCOwelm8H0k3kW8h7PABUHLdp9AJqw
-aqKJCYpKBaVUQq9S9KMiesK3ToLEeGQYErmXnVFbU+J5Ykl0+Ys/TTTWjye7ZIek
-Gn9nw9rLv6GnOLX9w/iB+VXaC0k8ygWh4ucceQPW3TVP13z0RL62UI3doDg3ocAL
-cHKjHMyth3NC4F2ZmTh/3cG/dPdIiv5IusW7GMis9MK1v5Cpef7Qa0QLtQwiCjmw
-533G5rjwBlSrkGl/pI+YThWYjqfy41I/Zalo7NyFxLilIkdcgtxlO+ynnpCfO394
-FVgqyFmA/fTnaUh/7kY7dF4+Nx0sK0FzCLMFtX4CdBVh9KDCsPxFgAQ+tVP1gMeP
-vN5PS7azcpEyW83lHxVEIzr919ATsvVDSZ8sccbGfMWGvGBy9/PSm+uh+6UlSGR5
-1fodrTHN1oUX3RKXZG1SltwrwhH7Lg0bfwnnRyunSndEuUWlRd/fFvtNfZxhmamd
-d/DvUcsNRT1TdmNTUVxJSiwtpGAR8BxtaCGHXa8ZhHME+XS8HC3IQExCPnq2AfxC
-ezs1pThgrSVEKon2QtYRtsFRwGv7JcCdr/YQZPzl/7S7tXL5uzJa1InL67dOHOnm
-FXl89FbvKu4pUWHVOUvdmnSXBsRegLapveiwCpN/R650vDJsZZOXd9QUCw3+m3IK
-fQJqBPMhotkZ4/aZu6zdJnCuBeSH+UyJzICqEo74Ox/f45KwjWkd4hoJVyCNpkqE
-udMmt7nSNWLaos4QlElcFw==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQBP+AzwFf/z1xkDrF
+UkX6ZQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI6KOdhlG2vgAEggTI
+Bl9ZLy0TOBXbdUJNEN0XLMc8d1X/bIhO9wh+HZyHWBaJ7RXIBqxq5OQ9fYdGlXS9
+LKzbLlFHJU2Z2Az7Q9yVbJbu1vXLwExLHr3P38Uqz9RiYY/e0QS9XAIdIdLSoiyf
+JLNvsKkWSh3UjDzhcUJUANHI0/2Y3PKWGIj2ifFB0AblZ/G9iTUVVJSJtk28Np9D
++QvGO0pz585nW2TZ6Yw1Ix/IgLu3CVHEbf5jbqlgzrrcV/a10qB19kaF/yzOLLVa
+f41F3S/EtrtNeT4YwrDhRCb5KqKd1/1yWqO9IHDdSQ2AlivDCt4RA4yiKs6cQbYi
+usbbr8kZB2COlBu9edyx4seW8LeE7gt1/xktAcIov3wwfwyvlhItJFkgjtfq2jjh
+aEk3TAGlpKbQCBUDPKbRku4kzpsLtpPdAfM1A5POgFM6WTksMDQsM6VI+tqh0CYE
+8xujS5cosCXSWF9UoaUNrlPpYntWishsmkrg0FhVlluqex55fd8eG33KdzoPNDa3
+gINr2UKAteMg6mTXCSUEElHMDa2n3SShFa1KIVDsMa1VekQ/mm+7llQcCVp65vXZ
+0RkAYJ7TdzORxgJS7nXlfzKUgM/gILhwIFPfDzgf/3WgKBEK42i88qFLDyMyn8PD
+EB/K90/ZIfzKLd47eqoCDBdGdXh7KfAVyhveiKwnMbhoX7I2XpgixuA17RgdArbT
+qGYzBPC2if6HUYw+2759jE2RIonV/ZGkIQk4ffuR1WORku6yZtqcCl7nBJoGO6zQ
+1sN5MPcZZi5WRJTEbHF2LJMw3n9tHUmGRjBCJTl5onfm8TuXoy1DH+6o8SFRABT3
+Q11Hb6M2T6HmCELPKY9JF/fsLe/1MCZym1SUK0dNw3L7GykZFOGorm6yxhPFyKKI
+aURMbWrAhr+kyvxSKPXDQDBSKR05DkVTjd/L00my5p98SlKYgIU6bZLYy3ureSba
+ObX5wdNGS6p5Hezg7sbjP2J0zlM/TVCXAto//V3jyAjsEFazBabeNyOk4xfTVlWV
+fWBWCaBFQYj4WbaAjGNlRakybI6YAwcMNW86N6l1u1AcCIvjAFycr6T1q7Uuzl68
+nAtx1CS7wiBbRGClWlVGxNHb4vVSEpL3ntq10DWPEsSAa1mBEppz/uMLisOB0zdQ
+gCw03nnv5SvkMfoZoz0E2j4SBvr941wwWb8GpOUsEO4p4jxue8FSXTcce1Rr8K/i
+LRGVmHbBjTL63Y/iS4nT14vVB0xrtTPAsC/RxhEUma47L0iV+cPV6TPIrbXuvPpO
+snJXkAF1XRtYgqU8eYPgfYFPt65L48QTJQEM9NzhfeuEXoK4aOflescxsdjpPAMd
+abOYgWTVoDvIqGYdoSYeu3cEZnrhHCBFibnX79xU36BUsuxfSORFp0NF2bFRiD5c
+/s7twaFFhRCNLs4srDU5D0Z9CJSVqLzWpwnS9vO7ZBQPb84Bp1SBFfkSGLnOAjjE
+RpjgdkOW44JpWmYbmDfD/yRmu4qbEmToNrzRkzOX/Tu403V2JcbURvSTx/mUKwfc
+VcLBxRuvCosveo4j/Ihdp4vydQj9xQx8uKvoZJZ2gYhH6pKi8UqZ9zpRce3Wqmw+
++t6v7J7XiddVUsLAVDUJsQgYxukmoOIH
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown.pem
index f6bf288e5a5..ae6c91d9165 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
-nHLIk2q/09Gn63MKk9SZ6gQRn1o=
+ggEBABvFqNITTGoCGbCG8NYXij7E8ft29NpAevfLaG5QwHVjRp+ndXKqIqWHJ1BC
+ADETGQPJmv0AWtpf+r0uweT7iACjnSf3xjWE2+ATUr3LHwI8ZAuLomrHKYw9pFYh
+j8Ztc2KKdGwEWZY5G2MAGzX1ryGj9x6ed5JCVe2KahDcPuGNtpFHp8J8cPOHeol/
+/IfYur7vtJ4hjMPdWWUqndMS1W4FRnEO9MXMuHCqhha2RbDXR2efGYEdiJVP8WnC
+uonNFwDX5f4cMRzrqbrjoVU4xdrdRg7ocHKeaYCUWaJddLzxF1F8AN4ajBGrNtkG
+HnximmcX5KFVHsWSowJVwj/1+94=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown_key.pem b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown_key.pem
index 400752222e5..ed4eab49a71 100644
--- a/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/c_rsa_ca4_unknown_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI2D+aVvBjOaECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCG5u3bAXBzXBIIEyIGJacDhfCLe
-OwxJ2apdm78z3nm2CLjxPbXCc0vANOq/6b8Tp9wUCsqBuu6jrrFJpc2fMplBapLB
-mDDf1S4j9XE1bUFoniOmlFkiBFBRkCLbQHWNCLm/7ok268zur8lycelSj3k12QYh
-5X9YTOFGutehL/oU0fLkgsCIGZEECTDCXoDhUpNISXAwF4Hm4E798I0m94vp1pkn
-tUfFzlQWbJvt3K9BYaJw/EMOcpER5XBVTIDlGYAbBW9sXM0fGT1KgmtT2K9zmyq7
-SyzNPSTLOqYGAUYXkF19uJ1/8VyzhMLaD83x6glv9y90e88HLjaOR2+tLdecwlDA
-grbQoYObfg7iDOMtLoRhLeQ4xyyRxuuQVV/W+y3d/OAOKOCjSw9elFq9kqpjGSKQ
-6nbDoL/p9jxOablSI8ByKLej9cQ427dSzOTU03DpRJQvFw9c2O07grNXRU6Kh/Kx
-KDhaz43++5Hix+dquJmVOzWGav2gGLw348GSMcUK0RTa1Ph6+mxNT5Ky7YK4KfAY
-aHtBhyqdFCC8e+eFxZKoIjgKrNlAQ1zGw4AFPf3pyvvPfut8AOD4HOSBjxXM3U7d
-j6Gh7znAKXCFnJ+61A93ictN+kenyZ2cmrWdQAhP+SrCmcs/Tt8+7dhFs8iShVpQ
-Fy5O7Fa824Gr+FQJWfMJZg8S25Yh4zEKcjsxgwi48QQyAIIUC1ExnTRzZER9u/8M
-JgCpMPyl5TJVWmPX+ZYK/PgkgxwHvm0CWtfokyX/MgJw4KKAcyu1BYwwTaDp4dAv
-DP+4K/UJRym5IMVeCwXaZuXfiZ/NC9amfgZY8aVm4lizI/ZpjsbUH4v+GDsAHltT
-Oq/gWV6PHVWk5VGITTWgO3p6Z0ePsivctGJCiS5dn73ECQqXKOwheTBW4x36RvpL
-rvQibcVbX7r6adXuDf1sj9gvpcIxYOMAF6m5N6x57Clnpq0inohpLIVkwePIG3mw
-pvavturO22tzzMOoUCZaAuiOgVV1i2arhTq0Y9Q7FDUVBnqL68RwG3aR8dnzG9/u
-lyzYgE0uCD9641TW/ErMdiRo3UudrXAG1w1weSPPdCf77GyK5s46fwIOlQ30y53n
-40y7ua4Vxhvi1keA48ciVq2tYQ69T+4gkRYpn/d1E3Rut6vQ1RBKsLA36D+dhO2E
-J/isIDdhuNwTWrIrgSpHmFhtR1hhsv5sTwU9IRHOiwDf3wn2qnveQWDodX2mgoHG
-RpNayewy6ozvrexsmJ9beCtUYTThOSQfmXhWZhiNGj9c/9wbgKR49I2IS0LZsyD9
-kMB+9w/6Nfbosebk3QZHsUUNzfyyX8XpAtjL7FU2VH16mmwY6rk5HaoYSyjE2FNE
-2+3VaosuPTkSahc/bqqKcofamWN+dwgP12JtFw0jPToahscBLUigLqMDGJkEnJYo
-iynP2BjrN4E+taDP5YggdkVtnkcLzLDqosnxkwvQQGnKiYKr4DmZ7c833E/8IyUF
-IeeY5Olhewgfe48j6MiHL43VDbBJ3s4XBdF3ywuz1Scok8TXx2FYp95MkcCtblql
-Fni+tWqrHpyJs0YS6WdyYWkAajhDDVTINvz1ybPVoZE5DWEi3yG+U4gyymrTg6Mw
-BYOBZpPvjR8rUTxXb8OlBA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQwhB+2NjeGD7lZcNd
+gpVX/wICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIYqjH1Ap6Tr4EggTI
+j5Aplo2g8+Wh6r3O+XB/26XsuqtHBtJuHP5YmUW8ZE5pva8z32GbEl/pv6jIXVKo
+Kda75JzWEiio87yG5+25wPIRw2YO7GqjOkCnFPjoW5cTY732vBGTy/KqkjPsbgFA
+XgqmkKyRuXGp+n4kA8VYKtxSb6i6LphFh3mVBCbFBDA9CxgLZDtU7tipgyzgtaRG
+OY+84MqRPVbqyXXDAX7OFJxxYGwmedeLvYAuWGXJ9Q23xG/wZ6CTHih5gR4mEcOk
+Dh5bJjx85r58cQ05RbHBpLI5LM29ubBJaeJV7vKhfPJiwQQEQaLpzzNwqXc8g3S6
+Atuc8XXL3WnfUJkpttnxXYwo9N5NMEClxdpVzD91yuf57ixheJmLJ6QkHrbKT9fj
+Rtb2oiDorQDeJnJnHBy/8oDjm4SLqcUZRc/pER9qSe1CRSyHkbS4dZY5Hejpv4Hg
+u0QQroMygrxTtTnXaeH7p5pC+ZBE61qm4ArshkJFAWpA88E35jlFtvnlpdx/j6q7
+MOJJeGiueNoHe1hSqKl2r34fLMr5cjpfyKIxNCVVDbkU1etBVvtH6M29KeprNZRs
+j+U6Gz9E4QOB97oTTBBM5RRqMWUFdE0YRsVWAQUlyngJfclY+LPal5Mfz4e9kwKc
+/wpMHT+fI5cFEYm4K4Ncysy0MoWNBCPReQ7hEVrSiOmytGM4yVUCYQHt4CxQPg+/
+ObOJgVpCZd7PtKtB0CM3x3388ZXV724uhdrlduqqj78Q9F/JVX2PapBhE6qu2AB3
+WAkChzWqTZ1T+cPw5XcnX8AjBylY4hCPwLY1b6yAYdJwJKqvJ8oBJft3kNAJlYKe
+sRrMq/zSUT6pPSu45Mzq+BD1/ChjwHvEVKD76H4CsmXbW4lB3AvntIX4NOtGnKh5
+60En6QimvPDUZhADNI4SrLbkKY3EhifbUse9J0mavQwlMlf9P7J5JTu7wJ6N1a4e
+h2CeWP450DdnNgILoo1rhPBvbH7zKXAIyltLo/CXhtLWdS7hnS/v+YismdSUqB8l
+bXFoVaTq9/Kd4AJVgarvOPTnGc2SdRoAd3sGD1i3EZH5znp1xzCpzALwK0aZA+RS
++sD6EyqzFpDetAz7jffMS/+NOCy8OhNzbltpy5sD88keaW9yfxHjQFFmHgRMozg5
+FmvGiQVJgHITLu65iCs4s4OBcs/iRAGeZqzhdjr5/PgHZNNzbEc6JoZ5JnTSH/Y8
+IvBZJayN3XWWbV2wAP9aJRkOJdbyt71HiMDKaqi1BLP3sqn1wg5+1D8J9fRAAjzD
+B1fIm6oASYoCq51umSgDcqPt6Egm+lP4Ha3M7rkP0bMpcWqyFUsrpkIZzWmWLsiC
+1N/SO2i9DV1yOlfizj5pXmpQr+NzmJ+Apxug4Kw66zk6eAN5tS0VJCpid1U947Cm
+w51lLqxAQfIEfdc1UG1Hjrv/Gz4IF6ccP751aNfR52gNTrMr3hGL9ll+BGJBVB6J
+AHnqzf67CEdmXMxIzmmaOnr7dTPL5JvDE0y9PsbaCa5STFs8VBcJPSFs5RIrUMjw
+smlyYQfk3az5u6vnj5SbzqbJ0i72aLVHQuAvBnM8QqFpUTQK6BDU3/u4lWD268RC
+i8NwG/l8cuN7pW3SEylSJoegJIfRI/zR
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/ca.pem b/cpp/test/IceSSL/certs/db/ca4/ca.pem
index 52956d05bf9..4de17eafc8e 100644
--- a/cpp/test/IceSSL/certs/db/ca4/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/ca.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID/zCCAuegAwIBAgIIRwT6LywO8TMwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
-Q0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
-BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
-hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsb2Zd7YfAoQe0yqQf9Jln4GgXw/MTwIJtNSsXlzCgKFez4sNvZTO
-zZDXEGsVERnrndwDO5/Fh3za7HhAXHwd9cmYiTTkMgQZy1dHyCx/LkYrLx+sLGnx
-BnhEMh1h79EdU3pKq6WRFbxpsJ5mWG0yaSZoVUzhz0WUDo1YmAisOoYFEtOwg6PR
-VUX/mWOHo5jlnCsLK6Ez5Uw99CVctNgfbHFTdVIowj6YKMtiFccWH6q39qg2Zvzv
-RLvYcT6ZsN9fnhDo8XdK9L7BPrUaCkBxTUbiljwIkErcbwlQODzADUuSYEQGsPjn
-R+eg/AD05uqBQfX8eXxtX21Yujb9ooy1+wIDAQABo18wXTAMBgNVHRMEBTADAQH/
-MB0GA1UdDgQWBBQUiznE73EGhCA1WDjrJZOvZumR6jALBgNVHQ8EBAMCAYYwIQYD
-VR0RBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOC
-AQEANU8ZhUyK4zjCGZoea5zYtk8BLot8POj9c+kCQHVmyeH6fjyuxICudX0dY69n
-myHvI0jhtxiHd7YGEYE6OeWeCOUHn/8v1unqbDWFjBmYLOgoNVQ6UhfcF9gVn6cp
-356nTTcGmz7ZvhloqQb//6rKk1mfq+6KrCrMO2qVRmYtcV2blrhHZj+4flmFbn2e
-ldsDqOwLHinFpvQFnr7xnBYyGMISOl/MM89PQRq22Ob313qExLe2G7VFMJ7SAEET
-qeqcGKHRlF01EniJ9OV9cnJH+uzzsmA1GRZltqpdrqcDF3z7pmiePFO+zFdSqDtv
-zagOFOzlR8lNDB0MiKhXWZx61w==
+MIIEADCCAuigAwIBAgIJANHr9QHB66X0MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTBaFw0yNzAxMjUxNTI2MTBaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
+IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
+BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
+KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAJ+N1Oss88MMrJ/4hpdJPnJUdL6jW76j9vyfWjr2q6Tk5qR5DKCC
+KjgDwu42tm1CEzFGg9zLVkE67Sic3EpxSd8dginToirjzuTZpbJbWILHtjfJVHb0
+K0Ro8AR9S5wiBDYQepBn4ZPycop8HQ4rjAD/7GCrhv6d4ORbvunJckkn62lOu1Bh
+VkOP9zNxRzDYEuSu0rONnENCNSvPQHBw2ADmLcHObhIijrd8DThQsDshUT/3iRRK
+t1dip120lhFr7Qzw2LTu/Ltb/jFAf3dmGy+8vwzxGf1xK/6LvvFR+amRKUULEI+P
+lXHFBXboSO3UnS+Vw9AyBvbOqQrrUVLE8i0CAwEAAaNfMF0wDAYDVR0TBAUwAwEB
+/zAdBgNVHQ4EFgQUQ9o4U5mk2QBYmmjtIoTiZjI8wdIwCwYDVR0PBAQDAgGGMCEG
+A1UdEQQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQAD
+ggEBAGBju33VVz8vDWCUl4i1u3kARuEW4ehky3U7Lf39j4j4beXleWZ8++hnPW34
+ONE/mPAi4kOzX66IY4hDccIWrWCgAx4VwnBG26ZEGGTwv2UbDlLmPUcZKbZtyF0r
+WWUFo7+hekuvpWTr8pXj9jF5HyjqNXIHqzId9i7AblwufmJusz5+TJGroDz1ILmB
+Gp+27fO62J8xzChFCSv+h7cYwPt8hHE7/6Kx9NLLpLZw+D2FyuOMUhwW9Cg4iE1j
+zabbbk0U6QFhstKGIg/nsKzlKzqusHttHfIBkf7iuftqCN0qYfabiAbDVWcwcil4
+8UYP5ClTbavdHRC/Y7Xd5ODgKQs=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/ca_key.pem b/cpp/test/IceSSL/certs/db/ca4/ca_key.pem
index 7abb38d13bb..dd60a472149 100644
--- a/cpp/test/IceSSL/certs/db/ca4/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/ca_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFFDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI06/j00H1R4ICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIw2bT+HV0IOBIIEwF2KBloPkebQ
-qargA4wMn9jSx5Z0wL3q1PZQNGYFqxJOugLIKxLSpX8h74mhPo+LnlfR0eYmPwcw
-ERUZ0LOeAsZFUuy2I58zkJh7stoIhwoH0QcEL+ckPRuJ5vzWaqK4FR76va0oOIhE
-4Q3thI2knQNsvqvx3RbBtUwn2xcy1+tHyrU7/Q74R2ub4B3SdFxKUh1cjyXn7YC6
-K1rmjfiGUgiPIf0KCIX+rREI449z1jFK5/2EXmgvDMMczMq48oQiNlDUYXJjkHO7
-r725x2w1rUDIy4Xc7g+d9JAW/7UHVo4S137IXFjMcwbNy74I2YEWugLRfgkXqA6+
-0hZ6r1YpbWkcEBA/R7beyqLLlTfGuOvrimFeCbq4e2Y3UYXg0Jjk/bHNrDOlXFWd
-+ROlBE285PoIYemwihq/u6EoOeXVmL2hstTVuM2xwz/IfSgAfsHGXJ7+WiXcJ+qP
-R89lERNxYWO809e+CA5vwBCBd53ER/vaT9YPIC8zYYDpcRsDc8s8aIb1VLp3+Twv
-ntrW2VbP/2Lqm2Z4iLY5WjS7rxvzrw42jtYq75qaGX51+P2XWKyiSQmssSG8P1U1
-vVfHCITw+4sbC0QTg2EMVd4BruqXi2v5RNgJnYZ4bw1wvjS+KMIiHVQ65bXRW+3K
-NjxxSxjsyXrgDUnAiSXlFziBM1V88XFgBETmMQZ7FdCElBuEdBrGDZ2vjX4znN+w
-/QoYMW4Ood3roTaKoOhDhpFHL/tDhyufYtW+OyEUandhdh9ju7S9ZwXXlYtFTfXD
-TJVqsyQpvPrsCr+McOYU5mLhh/2bHPxaT5ZipQUv7i2ACT77ENeYIvszzdNp4moA
-Dpjwrc1Izc9elPKkfSgFAjVW5qjLzi9m9KXYdZwmg3DsCaxnBXjiPWOyOFo2i8P0
-uixpCp/qu6GgoK3K8607sdwfLlTxha0gUDnQhXGkS9jWg6IKD+2K3Q0yWyDHYoQp
-vSomai2kHBQOjtkUHvYXHHZHOAlW+STC4ugTKAeQDl2O7f7Uh4vZdheHZgmT+XPs
-oP0PcUyLNGu1uKm+Ytxm6A+JkiJ62ZTghlOIAjnPkBDshVZwE9TTcTpiJo+vkCTl
-zGoxvumsKaJ8gZwIs7WAaUOH6wTaipQlQtC+lTmYdPKiFmFxGVdFn8UfRimbyliX
-NV7u7OGawdHGt2S0up8hVikM6Jc7+rjV4ICS9Q3iWEvqa+J//OXl8g894uf6S28h
-DjhDBwze4fEYMr3pEZYOrfMN0AT7fX9hyCcYrYwv+XOBv4GLEuRywhsRPp/znsE8
-zLZVJjimdcqlIhTClv5FT/oN9F1fZxYBSwCI/BHr2X3YrK4wmluoLu21Urz9nDGp
-BzA9j0PKIOs1Qc1ONi/q6k3eYvSOp1XVF80i0Z4ffu4cPlPxL8ZjR+QH6l0AIlkx
-+7VsYgQi/PsJBbOpIxsGKcMsHVcAjrxy50evWOJt6OsBEPLo37UFnvAy35dIRooN
-PQ7ivNlf/ScttW+IZNOcHaO9a7ep/sOFgRXmWK2uMFJLznGORJBznqPjTGyxhRdL
-zxGVdPqOdbZLBdDULWqNlNcREsgpOwSd+Z3aHj6dvNk2k71QnEXtY5zXS6kVyXaH
-SLCX0sxfiac=
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQIs4FwWRAvUj1w7es
+5ajBGAICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIReylnma0xQYEggTI
+pV+mIMnKPR0UZ1BgrdJyvZYNnJpae3wjxRKML0054BfB1s7WBgStYfKH/X8Tr9bP
+CgDwFd2GhVUeQtwa2uhE1T0le8ya+IGXLviK9NhhVZkBjUbo1f/iy6n0e/ah7nbn
+zK/U5r4S13ZLv7v27BCNX4isl9cppIIQEGBEFzeLYft0JJlbdIskQbLOXWNu4lT6
++RxwJl2FhbvSVhPl+rxH5eziuGvKq9iIUq68vrjT4GieaUrhgfnVYY8m7xbLFC2i
+CLPSkMiFhJHFfs7l18AsNSccboxNZAccP0xslBFh8vfqEU1HDY6IMWt1/cOTNuEX
+ZoH0ZdMDdn6DcDAyHI/MTqOtiDPW6IjCvm9fX478AMoVUygS83y+HMWlJtTZRUM0
+xRjgl7XsQ6IFGcdopq3axX9G1VHisgnU/AVKxXdO0UhsN9OBq+yxnj4ocQByXRY5
+gkn+Krpepw8WB7Fj9khVXGHs7smd3QI+m30ScMtqYKOr/uwEj3v/4IncVgZUkJ4B
+Uld17SvLhiQrNovHSZGsrvd9FiycKerWBUb6phCMUMss/gH/deI54HpXX82w/Nar
+fij377UWWI/a/8KeZateU7uNjYU4yxsmYPGRjGf8LY84lmtxbWYE5jgfFQd3PJ1c
+oALxlXpQMjbQA+k6Tx1XQlcCnNm1kxGbw5eBVz0AxRHblkZ2x66sEGsrYQtgW+uK
+I0KgKXeRCcjIxinA/css/G3JyItePcTQgv5hKwQW/Wp3pZvHUlY8js4Tf5W3RAxI
+tlMReTe2coizoq30Y0LPJbpeGT33DjhoPLLH7Q9hO91UR0TWQUOyjmB1qwZmZL81
+iySE3LnzH1FlVseDowsnARqS/8ygldhaqocAvHYZETZtXiTMJ4qpJzXlWRYZpfZ3
+rKpCKdpm09OKR1WA4rX4OOqq6hwfNaOxkc5IGFDCNqrT+vXW34McA9fdWHymKDLG
+zpGVFUzJOz72d7I9ufD+Qe5nxsGzjMYyuWO+FQXNAXU8m2Dgs3r4ffChMjY2rFPl
+pA2DsugB181Fxo/WVa5KlAVLRIf9QlgQLdGZAZ74g2FK7RATLcXXW/ROiSEH12Nx
+DVbdhNbVMbykTJ1tQncJFg0u+4tK4ssg1qptLm4D8JaQwEI8YNbdafbG0VZf+jxO
+FKobJDk4hbWI8OD6aY2V+P/7d3ygl+sglabfxLAexEuI2I54qAQBBLWhd4e/XBE4
+Ip9W0dvNgUZeB6ySpnBIeTGHsLOgf6mi4SyvzRRH7Yn3G+dSqsM06xp7IPfED8GW
+cxc0FMPHp90ZtozfZ11P4w36GiaBq4Cm9xxCkATjH/EvlZWlleMRRpiNN38YRXMD
+fdLq40Q3WhKe9o+GiBwa/51hsgqvBFMdUVQWibDhL3iRZ2W47KZdu3BO93858ta+
+CtrdgLjtJPbp5Vfr4RXy5Sa5KTr/reiFngZnnVM1C6OVOGzOIU6zVrrr3NUy/ujD
+bZd88iEDRn7A6Ib7C/kPVPcZw/0dUdkQn0ZdSB9UFqRxQ3LkcaGaZo9BcD400Acx
+u3cdttMxTucSqH0DHnJ/JeVsR6jglgFsSGdT8FpFcLc2gaTOCBlz7w39yV8oJQIy
+k2V6mxnyNQ4fItLAptlseGKhKOyNa0cy
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/index.txt b/cpp/test/IceSSL/certs/db/ca4/index.txt
index fdfd5b639e2..03351dfdd0f 100644
--- a/cpp/test/IceSSL/certs/db/ca4/index.txt
+++ b/cpp/test/IceSSL/certs/db/ca4/index.txt
@@ -1,3 +1,3 @@
-R	241021202555Z	220719202558Z	E955949C6EA73EFD	unknown	/CN=Server ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R	241021202555Z	220719202558Z	914B487CC6DDEFB4	unknown	/CN=Client ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R	241021202548Z	220719202558Z	028F9505719C41D5	unknown	/CN=ZeroC Test Intermediate CA 4/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152613Z	241022152621Z	153903748F28923A	unknown	/CN=Server ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152613Z	241022152621Z	62E688C4812DB829	unknown	/CN=Client ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152610Z	241022152621Z	9C5CFD7C3D192D6F	unknown	/CN=ZeroC Test Intermediate CA 4/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca4/index.txt.old b/cpp/test/IceSSL/certs/db/ca4/index.txt.old
index b13f484c4d0..d953efa9686 100644
--- a/cpp/test/IceSSL/certs/db/ca4/index.txt.old
+++ b/cpp/test/IceSSL/certs/db/ca4/index.txt.old
@@ -1,2 +1,2 @@
-R	241021202555Z	220719202558Z	E955949C6EA73EFD	unknown	/CN=Server ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R	241021202555Z	220719202558Z	914B487CC6DDEFB4	unknown	/CN=Client ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152613Z	241022152621Z	153903748F28923A	unknown	/CN=Server ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152613Z	241022152621Z	62E688C4812DB829	unknown	/CN=Client ca4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4.pem
index 5db169a13c6..a791bf42f56 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4.pem
@@ -1,60 +1,60 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_key.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_key.pem
index 275330d2f6e..f0daee84b7c 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIc4BeWIYj16ACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECG2cUtvkuJzvBIIEyNUfjJFmV1nU
-EeA9RXPEO+hOsS9hrQeyDPGVjnYnzqtTux/80kfF0h6PY5XdBN1SlvFF1MFkGJOq
-kG8AbMuRCxO/Y+uyqE5UuphHt6rInbZshrbuNiupaLNDzZL4BLmyzA6BiI5h8Yw2
-QcgL3Js3Ugsg10PG0rdhHUSps/4pcoXgw6kpovFwKm2V0YYCIsOHFuZCu0il7Y8n
-7+e4ZJjtvJ7Gw4WthlIG1nlY09huNx8cFUerm4kepR7mpCwIdcSy8U/nkiH95KbT
-obYAbQpWUogz2vkgXk0k9LzVGYO7wPl9vBn3K9Qd3bHpwU5b9KJP0IFDPOhHhfia
-m8jXWJFDSaQ8ZY5lbFaQLyyWevudvh44iAxTTziev5feYtx5TrjXRCEEAa771Ed/
-lDQqVZvssAOHZ9qih2nRemV23CxKkl8APFh8slHCuI8tBnM9SVy4nsPvSdTDRrj0
-Og/XJCUFE92gkgWt+g61JrSgHaVIEJB0R1H/LBKKTs9vqULb48y5f2R8ElllrkZi
-n2Nzhv/vGJza+oioyTRt5pr6wPErS87G9it8+3VhBSP7SRsF/E3UFGBUcmLre6An
-eIF4BxyUzGZUNWoOXzw45hnNsiUZYfOrmJ+jCj5JfBCUHwOd5SHD25qxPX1ppLHg
-o9YG/CU9D1seRj1g19NVCGqTZlp9y8EhBmsQb+LCkd2jWWXGZxX06mzXOKYG+7gP
-SSpi70plZPXdrWHO85YrWo7fC0RTL5wt8GfX1n5W5gac0dkCRqwnTa6qNr0dpRTK
-YWae8AlJwhQb5Au56XhHlNCGKy96UwNQm2eekJ6Iiq2LBbLnqnM5RrHGjzXxBF7f
-7MozpsG6dvGe74gADUaCokCHiYtCjFDAWi4/1qItP3NVPQop0LETFM7N1l0UtsXG
-IsKuxBo4ls5Pf8URgUIazrH+S3KhZ7tTeh4NLje1B+Z2s0TlLLJKFXXLgVdtB5vh
-ewAZ95h9QEdg3v9+6+HUmtug0vWib5KhABkpyUvQm6yGlf1YViODTX44aXM41Tpa
-+PS60SMoDzCHjWjVgYjGD4MFasKlP+V7Bi0QhOR/yDUAl/RQYSRGy8TqGIuTj2si
-bMWZo42AHBg3MxYB3jB/uRLZ3MQtAwKVFjvjtyFkQXviwIQic/DV1F2BTHsDZh5N
-BCzCw65NS2FhYHpJ3mtoUFC2st4xi9TOwnRP4m+DPefakY8xM/qT12JFwPQkHUEX
-7KOeZkzZt0nT0+tsZZz84n7b280e58RQbEi1vknXcZAXcToLwFTVo0sE1v/xiFbJ
-iaS7E3Xf+G35wiIBxT8w1dw9oI81gJe/+iAeQH6lbuTmk6fluJVHkL0huwtrUK/D
-j6kRBvPKLAPO8FTY6uYoO0nJp0WsL3ay2kfSMftIUkZFSVa7PC/7asLWF5ml88dc
-K9fqy0Q3yoPklME4yEC2vR8I+BL+MM5KLgwXY/eLZ+6vCEO3jb0gmXKKI8eHRgdU
-tknBOgTLm5/tJwUgX3ZaLRUn49XLyXmtcuVDL9OPrHmy1dpdbYhzefA+42s5s1TB
-jw963xPdpY5TN31Z9dmREIxOCWbzWJozcf/MfBnQpJF5KDayF8HIKpJVtmpdcOTf
-71hu3J6WMs99pVRMXAXcqw==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQZvooAjPDqqWHmNZ9
+nbTEmwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIdHLJC6cO+EwEggTI
+CvsleASsLwgPi7/7CiRZh5wXT6ITL4Shxpm+cD+GCZbsZp0I+mumETosN3ZdE/mC
+2RlLJacPbgYcEgQKTZIX+TgIuLjzmTSgILgL5O5tX9uX6APWz6lhFnvITjXt7gaD
+wEA62Xbew3JDTt1bEVqi9iwo65RS2e0NaWnjbVilvuMZzoV+oe4MIAA5zOohkVgc
+jEUXrGXt9NpgRj+3Sb9GBSi/56ev+ZdjuoQ4c1kkIRLbkPRePfTCRlnwmBmceiS4
+yKBozlMfuDvdbtDv3phAC4loYnbFBcDoCAjv1fKqbEetmgE43xZeBBxOObti0ohP
+SFVwYUNu0lzU+NU1v5rh2FLRx6dy5D0Dd/mtGScjp+0Y1mrLcLKnZOpg+zrj9CEE
+tj0yDhGsbXVo67YAzRi5rKcKGgIBX+EPCdrcyoTL5EhFZvOFbmRuuwXtlu+MMn7t
+th+360xLGas/ujC7HXoT1Cr3WNINBz3Q2wB49WOWuvKG+XjpEL3G5uPOy1fiiN9j
+USf1nHsNCwwnrRxpZS5VsYt1nMh7XVO3+LreLYe91L8OC9wwn5wkfjtPBLoeBvrv
+YPEI55I/unHYq3OVdFUHROZkRWjoPD9Uw4mluJ2cxAb3h9tnyMc7rRCyUBrfioGL
+eWki14a4czp8Xouei+6qUpa/VSeTjJYEcuPE8SN9ysVVsLX9rDI0WetWrTEy+7IJ
+ySoaV9rvrzk/G+ziMVjqAMeJY9Y3EHuszj127nm1pgIDztNDtPHpgXReOBINruUW
+RNL1uKUuzwqlm+syw60694wCKecGOdLxQtqo5ckeZuz4P1Zpa1TadqW/Cupq/9wC
+j6iboVh363CIST3kR7azg47Y+qStkJBg6E4vMzwMO5t+WR6ZIGNb5jokMJIO3i1Y
+dPyCWYIJYfJepywnBFfqqLzzRqrG7Ku4WzCeU+gEu17pav5reAd/hL0SVYJ6I7kX
+ox28lTV3fIjLV2JONgkh+MUG9KGd8PVefal9i9/WWTdx908QjTzYUqiTpvc1QU7N
+aXf9pgu/Jch82eGW6w9VKxhVdKYz+EyR2I9fp9sbuNg5oJKACaJkX06AgwvJaqZf
+rGT3a2INBMYK14Xj0njCZ0om2pTfGsP0CRKka/2F1aHjKWEaaQlftkIhWyVPEdOJ
+X9IwNg8D9w0UslfeeOUdvdGUVtjX/ZAh3gTSuPXACWSsFF9HiWlFNWUKI/0rB3Si
+BcsQP6DbjR8gfGK+YM6q1QDFMEDKaO6328VY5Y2UAf3FZUi+z9usV0Kh5Xu5RH56
+FgoIMfnrUW+xC/ZUE3SzhF+de3SZbmHRQfbVMl09l8SZfA4v36oFppIYg2fOGMCK
+hwQEBZ/NGLKyds7xsCyfaT880cZLO8Faz1U06YtF7xKQ0ugLll31W4o3weIjkX8M
+Yxy0lArdwtNPbYLZp1Vw21eMhllVcq1RZwf+LUcjubsVqa9VMxKE6Q7UjcaEp1sQ
+ts+3Ycb1T8HD4XVgCHsSCxZLhNjnrZ5us4TAV+E8nqV+wct6v8hNFlerkC+TFeLx
+OXSBApbaoSTM+U39fjhcotndHrLMlQAQRVrISibo4HtjmlwAbH0W0W3DpC3Ghnac
+wGyHiZSUskttnFEZ39+AaZwpEihEj4sN
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked.pem
index 054b105367a..21cfae1167c 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked.pem
@@ -1,60 +1,60 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+KwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAGHehmcYOWcSp5lsG76z+nC2+6DJ
+XErXXv193AXyefuj9m4WRK9/apa0ZtC8GjgbxRmqzsQRjvfIipYzOhj9viPc05FL
+EOzrSZysVmF88awuDiwlMUa5nQCikOe8qURjtPSWIrWjFWGK7YdkywNcpZ1NPbS4
+JxFLYSJYs+5eBsToC/yNI5rvka6CIBdxdAWW1GaPhnc/U3IG9LPthYJvny+qaOLs
+46/wgbLL8uOsSP3gF4C53wzUe/Yoo73YGxfVvHVNQlGi/CgSBcbdeyPt3QXy4ncs
+aOQ+ltFn38dYoI68EGK23KoKv0JdRToNP5g9JhLFHm7IB2vm2SVODGqbJgU=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked_key.pem
index 35542b877fe..1d64e1818e4 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/c_rsa_cai4_revoked_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIgEE1B28QDmQCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNcOIFgOcG1YBIIEyLWSxqJ59zle
-qp2TAbXTWPcjKKCv/XuDySLR8OIGJD/4VFrv+6xSt6MF2ObvYwld2OSp3evfYyJs
-1bKuT+RRfXqdtlB5ULBntIRKqhhL7Q5sYjQuQc4ZtULB1+7L2ZnOnk2jWMy04w9Q
-ac6O46xPy4pZFrKWlXEEaCSuFybK1yKxSCcUmIziLl4uBYiq3GQbRrxkLWQu3pHy
-TMXXpiTv4Xe8Z1N4KvCN0mjijYkfXgldJr+9eHP+1aoEd7bh0zV5lqtAwzgKS18y
-A/0qh0L7950lrW5cfcanvanUSitrQnzvcXVSNbDRcg+Rir38U/X+WcGcLekpVzZl
-x5xobC+oAMBQuS0bdHHVz3tU681otYhseBqe4u2A+fZTwZeU7yC9YifuVRdgQQ1K
-qh0SFmaw/SLXmt20M+FvgCAWlSjOPK/VHdxAszY6nKRvDDdh+TEiJlVeHfZF06FD
-Nu8YG8DQottLT9Z4sdIrZMH8mNT6RvcH7MDocPKomrV2/C93vxfZB5c2tcPe4MQA
-Jb8TPkKriw6NttvbFN7kI6bDzAHQBo+8Z6UvtsJwh6v5v8RvxYDQI7QJZdWruOhs
-UsBIJ1plmC5700SIED6p23HtbLRDein4Tfpfu3ID7S9UI1mxghmzRtPcrGel8wfs
-Y5Jpy83We52ZURnCATvorEIa4bNNQE+NoltXcF7x7U/O4X8Vye4YjOhBwOxsa03T
-JktvEZCQVlA9ckTrxQudpD0voVS+t38X/OvAz5B04tAcgmT6YpltKCnEm38T0978
-YvFkNpLd/95kGSsEjVKAWbe7GZ414Oz0uisDCMMFFVSgWbBZcDDz3JBjJgfr7QHY
-v4LdT2SmYE1GbSFD0YfLwxLg4y6X3iDbrZR9TjkkWQfgs72zsH/oq5189KtzxXXD
-CqJmwZWauheLSXUyZSTXhJ1N24gsJ/NAf4Imbk1wG56VKvkE8fG2nS+ofZWB71mQ
-Hhv5SHFtMuF6T5bYkFoP4at1faI22MsFz2uOqx7aVQpf9reXYHGifI47/QG0tk2H
-DXsAKGbY04iJcLS5IwL9gNn2oNH5hhNP1SYD7N6O9ocuqxcaToZmapRJ7nLk+MDj
-mI6mMBqMQmrLgBVNZO4YhCsprbf0yHFiYPj7XCuOrR0xYQvlfzVIrRQDRzp8PJAq
-Bs3CtxwSWIhTTX1hEwZ6WMszCqb0rIm5FMdLoTU4Oa693RmqHXsHE5FzCGddT7oE
-GYvVHM0kk4aZm3V3M5gxjrst4j9TEl9zgPiOS26qsMUCSs9YDvJzA8OGcY98iymS
-cWPaiTVgF1ZTfquKaaTXu8n//axapRlzMwQ0d2f8Cj8hlBi1Gk211ej4RwMgbBjX
-e5slL/41y0OmjBRnMpLakQ781oGTQXCdLFxJCG7qbOp3OCQeVTNH4b4z0MAoGUVx
-IcW+ATf7M8HJ1DNIayeghZsH6YLOaOU49qjkMSOSTuhlR6/sNGb9zXJZJtHdaY3W
-tz0XP5UP18rfx7z8FMQDNx7mlTwDMdeIrs25PdK60/jCwVyUS5g6HZpvaWNarjLG
-tKMViEZzjCCgYQ4y6mAtcjrGHIwkWgAHgAYCk2J2XB5zy+1t077GobdRvGWMe4rp
-JnQ7dXOlMfvLi/+lvsO27g==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQs7EOTV37g/CBQs27
+CdoxCgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIBqeTH8ae6SIEggTI
+e2Q6pYjRar+ShziBC/RB32zcE0ykatoLZhs9yef7PQwhipAH/nEke1lBh1yTCGrd
+BZgse6Vwg3wik2IWCyJDJS7RxD7nLniKTltftEbVv09wWBpE2aT71+2gcAnkRYfP
+68H85TW9wgZBqAmXkjbfFSfkZ1/lwaKiuW2qmYFbnBl4Ur0nC1o3eBobqCVXvAF4
+k/HBwiMcSXr5mpJoJHVSfOejTqiIw8y8bM1qNJJM3j8KYxWA+Gp21imgt6UM5+1p
+An/n/vzQ/sOKd0MeuR+WWuu4XeWp+ET6cUjL/l+Pz3ejYF7ZrdFmFP4846EIAsvn
+qT/HnI8giOOoqyiLzDl9uEoOYfsLKlp5EUTQxxX36uELnJ7rji9Kcn1pHvW688an
+Lslo26zwRrKShp9FJIOL+F85uG9j0k02ImG5EQ7QwCjOqMZWYgRvfcIL4RwPiz8n
+vewqzcDoljQLqKmlTiIqO+WrrU0pC8llD3OQfTV0ypQmQy+dfyJ0Ld2FypxSqmBy
+faUqp43+LtosI6sjW+pbDZusoTx0y99Bzzd5/BF7oiLRDbiIAxLNf2xNUu7ajX/L
+VaJhF+/P29kLasM7bwS4PR7pY/xCBk+nOAK3KcrrbYZ/sOGS2LXrt7CTLIO+XDRd
+oZo9tIzBz9WYFbL/BPIcfZnfmCC/RKfdQ4EYK4B10l3hm5gh+rigWPhfll8aoiiZ
+0sahdkiSKaberv1nxWNe0BfFkDtKWTWD83HRN0qdD+ScoET+WgEK0Vvl5zRm92px
+KvdOqPhgp80GTXQl57/9k4abdUybnVtzMA/q7SPbVR04fzGXh7D6v/G4s1hym8ny
+DuJPzIs4XVyQgI7r7YpjZO6nHT0BI0/gorh8dhKFAP5j3xKtrgJ27Lb01Zg23aOj
+jfoqz6RBJ4Qvhi5QZ0utsm6l94gGWzM/9Cu2pQODUafUqRq+dw57INClOt4NKw0A
+ct6T3DtZPo5dmIYwDah9wJog3RG5NysfAWNi8Uo9cDnidtfM4p+KNni2pZZF06x1
+IzF05Qd3rkCRtPDzZIGXjAo+g75WnQg/YV4wphA6cB58d4EnqTBpfVL2k1yvpJO7
+CikzaQQE4+H2IROizB6ru2hFVu5APU8bJe8RL9fZiwbxcGqWOiHCo8nL9qN9MUyU
+LCiT8DA5Sf/uVE1PAS7DBJkLKkApxmT3iD/+VgiJ78eBToFi3vAe3qMpDqFI7zb0
+sNMttX1qL3JDJwJpik98eXiBK6MeclKJO+TytxUkAVbBi1leqocuJJ+LaNQU3uWj
+/u5PXO/ckDQGInFu0WWodIzuvoEHqE/+KngazwETRHEFDitHpRNmij4rASWjHpTh
+4WgmohkVkDp5Lh99d5lFLxc2Epvyu8LMabnzP93yYGnjjTOPUMwiVhSqKMtWGZlh
+dYiSF3LX3TH6q9VkdyxwpYxqbDbxidnA6cseC+oIpQ6arixbtB3dPV8IZXFRD0gn
+TFfvJWKvcsqbHWnfxGGRDeD8WpxiISfxdED+tFXtP5PMdsHbJ9SLb1Wl8M34+pYG
+6/xduUNHWkmoKOYksyxaozkaQnJqFjh+q0o+VJaH5pil1/pejaGaVq0qgbyrBv3i
+8vGS9KRC9LEznC+p7Y1ITueufwnvlltJ
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.pem
index 42082a50202..0460ad36570 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca.pem
@@ -1,60 +1,60 @@
 -----BEGIN CERTIFICATE-----
-MIIFOTCCBCGgAwIBAgIIAo+VBXGcQdUwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU0OFoXDTI0MTAyMTIwMjU0OFowgZsxJTAjBgNVBAMMHFplcm9DIFRlc3Qg
-SW50ZXJtZWRpYXRlIENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK/uECE9z6rQ2kiYPNS4IIoWJy3r6fX8fw7X
-OFUA4/KCaSCxiNHgt7/0dw9U0wzFLDZ7mNEQSd0njE3YlrHSJ2en2x917A1m/t8V
-492D+d5x0bad6YzBXsC/DgPrqCcafSpplGM6MIQ/tCPoiHAIUkcYl9+yQAD8fWQk
-reKwysH6eDdFeFekRc620hcdI5E/Y7Y8T8YnXrItZFTDcdXy0I527sqxSh0uTp+/
-WGlOLoHJI3ZlfMBGYeFLtjFJbhimlvTXq1iOi3Ak+vdYPpY6cmuQJ2CVJJPwyc3u
-tl7+9NuWwX4eakFm0wEovwbmUfrEGbOKWyAFuW4yQBLlMJIa/RMCAwEAAaOCAYow
-ggGGMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFGQgzES/L7O8JMGNWJh+nUcYcEsx
-MAsGA1UdDwQEAwIBhjBiBggrBgEFBQcBAQRWMFQwIgYIKwYBBQUHMAGGFmh0dHA6
-Ly8xMjcuMC4wLjE6MjAwMDIwLgYIKwYBBQUHMAKGImh0dHA6Ly8xMjcuMC4wLjE6
-MjAwMDEvY2FjZXJ0NC5kZXIwgcIGA1UdIwSBujCBt4AUFIs5xO9xBoQgNVg46yWT
-r2bpkeqhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0EgNDEMMAoGA1UE
-CwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQ
-MA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmlu
-Zm9AemVyb2MuY29tgghHBPovLA7xMzAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJA
-emVyb2MuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAkxN1/oviEuF6WSoZl5FCjE43F
-GgGllTl1O2TT/xIW75TSbSu9vZGHy5PHMTPuk62WZC+XVVgG222Hz6qJH98UAWms
-b8MaR5ZU4S+5ngYU0x7Vc8EraohmE3EcpFpby7W7rk2FGxpoy12CWDP0GQaIqI6j
-1y0kZToA6pY62G1zP5D+6MkHBOC5lChdVd8Lkfcc6iCyh7IUbu0iKGNt0RcqPWPT
-BPnYbuKC5h30BywrQ00Jxb+1YhTxVM1nvmDpv7Of606h1YGohFgfcwTOgBW6H5Xo
-He1DQUx0cwGE/KTuropJlkGaUT2cojZgq06MuzplERTfBiwO7BI4jB6O22On
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+MIIFOzCCBCOgAwIBAgIJAJxc/Xw9GS1vMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTBaFw0yNzAxMjUxNTI2MTBaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+IEludGVybWVkaWF0ZSBDQSA0MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
+LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
+VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDP5m4jnDebcImy+SbMPrmta11iC9WZPRyP
+QLDo9DXOqqoO3mS1gKR4YMWSLnIH0jfTfFTHbckYY0WRFAMvo34QuxaZYvu6msbg
+q0y9o8++/mLow8n4v9YSpXH5dydGn4VhsYtic7TN0RhxHR+DAZHopAGBsuOMZu4E
+7E30Ukq+d9tlinPn9VKqDsSHSyRDYBfJTm9XUq+SsHgT/Y5G7kLUfW/PbR7RFO4l
+CZ3tEEWIXN9xIbLr28o75eIy8halSBcyma7YGb5P1BaxcDMtQSu6peXzgutlEUti
+rztGcwS3md/hRxzY5uY6YShltVeJvIaliU4USlZ/5toj/Q3/BBSjAgMBAAGjggGL
+MIIBhzAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBTIWM4vb2VaA1y4r2wyaDTj66gS
+/zALBgNVHQ8EBAMCAYYwYgYIKwYBBQUHAQEEVjBUMCIGCCsGAQUFBzABhhZodHRw
+Oi8vMTI3LjAuMC4xOjIwMDAyMC4GCCsGAQUFBzAChiJodHRwOi8vMTI3LjAuMC4x
+OjIwMDAxL2NhY2VydDQuZGVyMIHDBgNVHSMEgbswgbiAFEPaOFOZpNkAWJpo7SKE
+4mYyPMHSoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNV
+BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
+EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
+bmZvQHplcm9jLmNvbYIJANHr9QHB66X0MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
+ckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBACkIREC8RHHmF4Qn7xztCvMx
+9hnJOQbCX94p58nbRIQFYMJZqJf4alUK78XY/u816kBZsPhi+lJLypwbIycFgO2S
+YnYQFspOWCeFoohufsFOVDGJvaKJ1cmANqJlPMZe2oEl8FNIePvX6B251eyHgdil
+gvvRRNKGGJcKN4V3//dviMZz9DhSmcDmACUQuBrSfSRef07h4hUo3ay6GxUv4hMQ
+HPMkbFRa5w/FIQqp1TSbrsdGV0nyIUNkyJ+ihQvRqQHQxI6l26mItS9MQ21eGfAx
++1+mF6zNmx1dRH6ttVfnh+w5HJ8k2fFdcQ9RgC8LhVEktgJ0xtcvim2yNDJ34pw=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca_key.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca_key.pem
index f23134ed2a8..940b0542d36 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/ca_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIkVR4iGTIPvgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBf+/FcZdaX/BIIEyHidnlBhFzPW
-22MaeWqOm7hombxQviVa7wq1RFvOL2o53rR6wzgj3QMR8RBM74qA6H5o2sUuk6fU
-WkEuk9ihmNT2tvgsADkV53eCmh21OTWnmM9AX8S4e8xf4WNmX1MsJjDdkI0aR2dO
-wBSpVnr6otwWYVm/asUHWvR4l3eW8MnoJtNv6czelKhcB4kiEQgwzN13Vz6O9+D2
-4wMsBwOYA7iUD2u00kAQpTv0aBuX+goLoF4Q0cT/2CSFR7Pck1mo+hIlTnZRaVXr
-+uPSt/wMfDXJcQKzHL1j3B4TLzJJ29SmX385GvwnIO2JtwPTMh26h0MqFn20NJfa
-EJ9qL1MHnWpLkpu4fYXqxNWuIra3BAJqMuFepXwgWf/xNJK+lDKCrpCIQrX782EN
-wkoJs8qas3Hagu0Wvo1P1hF7LoytBz/XZzWZ2BYYA16Cy+4H7o8iWtlmOEDTkBIH
-G3Rk82hR+2bB8aEfIUc+TeaMsVsNSKjmY98OZXMvnv9mOdmJGI5xvNlSYyJ9Txui
-itCSjqlY+22qa1e3biCvLT5q0sVXVFFHGekBZ1Y6recG1QtLmaYHJ7a5R+Ytf8w7
-rqWg8MPUV1nTuCqBM/3fH9TKouk89nOKqmjG4bQjTSCrJochsW0/M0hUt5DKjE0n
-VfvT0wtvNQLfZS+lIdfw3OrE2yQNonL2Fef6kZ2gwoZSEKTk+MLwQoVnEdWmL6xb
-wBsWW3T7WFHZL2VdohqJnD5/Mmy4S4ByaLHELzHN8y6xO1vpGchtkLOtp4VGSEn2
-nePbCsFxImYuYAtYQXCtExxfDnZioy35ULcTBd3wLqFjGu80T6E8nP3ER1tDFI3C
-PJx20ta7xCbRJ8iMgt/cqgVEg/7wxFHHiGi+uOTKt5xZuWMRGYwUjilydo4mRIQL
-FHbbPfYRr8eDXEsJ1wstKX06MRMIiC2vCRiepsOetum7aIgEjErPHE5sgLabSdL0
-fQuB0wNNitSf9N5th3sSNSPBm8csI1DVCOPm43ZNuacriB6sYfEaD3+c1bA9DvFA
-7qNrrdZ5OKUfz9iQm90Ng/wpTg5sy9FLZizMhr9+fvHx+LE1LQ4XBpn0H+CDy89R
-3Ik5idRdn89yIo9ilkw3ZjOyI4qELnRj+GJL/5atjhSJdqz5hMPMq3q2C7aBVcbK
-ozlMrp5QC7lEzgPxk742ey6HkHsIRbPq0EEwWPTgBjk8B5V3vq8wz2qrBsA3fUu2
-3d5UJbMD79xyQpW08fYxmlc3/BRPSOywc2dd7UquaEmOz8Ib3JvrdG1eCVzi/0Ji
-Cj5uCGBv7cKuuNDuFV9pahy+O91ZkpIVHUi51xhNne+UHQHSGZm2Ao0mkcbepIOS
-G/oOTBZcqaNQLiBY3k2Q5xNfSUO2nWx1sdm7n4acsoN49TWvfmgR/jGbUsVQyase
-gznEGfNG0VFdspcPd6ZJrYK4KFUcMnCgUjYjSMByII1wD+bQfOwceM467FEvp09P
-qrKddnK1lBJIvVfWoahTgb+upDd8/zG/4ycF2muJAMiYm2oUkERNelvYu3DzFnG+
-hXAyMa9h7qU9+0l3xsuC379wT6zSrG5x8qZnhMQ+m87FbTKjM7Lwt7RVe6sWbH5q
-zbKDi+R5jNoBUhazap8oCA==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQpLThPbCkInHjA3xT
+drR7+AICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIbcbnDnzesdEEggTI
+LrJACDiLd8ZW1xpE2RMOBvcb9lzJRjUwKEAliqmiSEXs+Kje70UTxHur84r2p5Jm
+7ArXXbZ2d2zh/FWV2e3EehjKYq7ey1t6nREg72t6r+fRFGyiEckKiqwf/dQSoUoa
+XlYnH9CiXK/gDqzS2tNYp3CtUBEFzV2Lh+wNYzBYb1HQ3VvOHlDOyY6tj8HneI3H
+Dh/AffQIRyPEO/Oy3ktfpsdlVVMLAGPNE+xN2tqSVIMprmkV50HC7XUvcUrx2Pep
+tVCOWKy+q1pnPkHPeS7WzyYlJDleehgAqd7b33J7oshAKdqQ+cSTS2xysqjfUf4k
+hIVCrG1fylQ92F7/EenqNbw1zNVP7/v0rfCEmdZxWSjITzSKCSbkC9XGsdCTNMir
+lhHcXVWwmsNvSFAmQnx3/uP/dhx6tXzaRxuhBp50QL8CPu8QnZIWhe/VRDp8enEH
+v62l72YcJ/g4l+StGpc4SnhlszL9ePndNWJwgCK/p4hJvbRY/Rh6GTQoEnkcik4x
+8biXy3Eb/oWuYRvu/cQk0tbn+od0VibiqclXCEM0iMQbTKqIkBMVw8WqZqBx7xfc
+yxmygWjzpJVxlU2emXw7mHnkDw5hNMj83Twp9dchFP07DuyJSDvfBJtYEL5zuPCB
+ayGre1hQfzOLsyFgVyUGwGpbGR0qkf79v6N/QlPe+6tH4nJoOMdNbj8xv0c8Wns5
+Yn9KqMlmMSkwSMVRMTfACrwZXTY1gp6+sAviwsztiWH1xOy4bM9JjLlfCGum8SfI
+yhHeeaeZdySIL+s2BOAKrCTUj5coD3R1INrTZLshSBNJo9lqj6HmLhieL15kSXrx
+io37gW0H3Fzmp/3gRsRUJzsvsRBwaTaorKpC6hsG7tgNS0ZXzI8aPSdovd5saeco
+EdErbu5j9tTr3RjK4Uw7hVapIZCcVOMa8ji//fWyIgheFkL4kHTvG/iVAVjt+U6D
+uuwXY766ryDbK+zs4ANwDkzwARhvUdnxe+xe2H8c+Ef/xxLx1OupWA/cb/d+RmPY
+qn4RYJn6MRZGdQ8jGOpzjn4QZSS+vzkv2zaDyAkZYavcPxXof6qzKa/1EL/wdGr6
+OMfOwp20mkuaiBe8/93lVz4cfdmpI6wdP9oYKM4DLpwdC3djK8fgillAs846aTUO
+Jk8WpfhgSJ4XTZVDtnFdAiS4CI4QAlrT4FEXBaQrBM/8hdzdoat2ezscRLZYC3pz
+wrHS50TYgfmEt1B+wn3MmU8cuszedvNCSBRPrzWRq/1yERl3OGaVFDfxGA9r/sBQ
+mr3/aLAy90H6SrtE5hE9jQ1D1EfqstasteaAfQIPS3/Y1IIa9JQSVO5G4Nr8heBh
+EZPWocC/H6OkM9zG1LPVV9uxU3Tq/phY0o/3aM6w0HPymtMsfN43tdQ1maUIq8RQ
+p9W5Jwgo9OMjQt6OsUTxEyg/pC35bAmMwPuB7Fjvwqt3gqMKCCQjFtn9M+BTmqWU
+MXCslFD1Z99dLOq0gtscvXWna2DJNEQkRfguxz8s+er85W7TsD+3AA+fRkOwrS6m
+UvBQx2SryTlhpu/0Ic0aHTOFnfTPtwFLI2Lxqd4mZsAI7QaSAYK0DaBw6A7whhvG
+zGf/COztfiUcgBLar/w/XLS77PagWZmv
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt b/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt
index 9a2861ec241..7a28b1bfe54 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt
@@ -1,2 +1,2 @@
-R	241021202556Z	220719202558Z	5076FA069983F0E6	unknown	/CN=Server cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
-R	241021202556Z	220719202558Z	D68878031FFE9374	unknown	/CN=Client cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152613Z	241022152621Z	5537C55F64DFC98B	unknown	/CN=Server cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152614Z	241022152621Z	569CFFCD916D494E	unknown	/CN=Client cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt.old b/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt.old
index 7bd9b8f2dba..ccf3ece2596 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt.old
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/index.txt.old
@@ -1 +1 @@
-R	241021202556Z	220719202558Z	5076FA069983F0E6	unknown	/CN=Server cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
+R	270125152613Z	241022152621Z	5537C55F64DFC98B	unknown	/CN=Server cai4 revoked/OU=Ice/O=ZeroC, Inc./L=Jupiter/ST=Florida/C=US/emailAddress=info@zeroc.com
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4.pem
index 4860ce7eeb0..f8a77aee570 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4.pem
@@ -1,60 +1,60 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_key.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_key.pem
index f157036f5f6..2e19afcf540 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIiStAlR0JHZACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDE448TeSTDSBIIEyOPfT2YIh2DE
-pZeL2FzF29PfaQAhilvCCql1VCHjVp5e5dKgv704TUVWddKzbJZwe972wOcHFLZz
-YtedyEAj32frpph9FhQ4Xwu8yVGadQEimywCY88RZh35dNkxkqIckPRx5nhJNkN0
-aPDoXiTqJjFHk9JTQVerhLMJhGvhM7fDiKgczyb/ekGoEo7kRlmbycHLU8xhxCUr
-rAnYz1Mb30/kvedjfrfaMGHAziVIxE2M2bPemqxNzqm1nfzpKixC7/mefw9D60YQ
-0AIEHUO5qhePU5doieId6p1RHnij+f2zk0rcPjghFSUStQfT0r7t2nwxJ2U7yeFH
-u4UQNjlWZ0BEbaI6VyeRaLQs3rWveP1nGsgSZdFVRsmzy5HLCTYQuZiEDQRlvtly
-BkYMoDkwqQTxwUwRj4w7wRDkLDKeDqPmoIS4wF+8FLtnudycxwFPjdHwUPyG5gES
-hnq2yOOgfYUPogVVHhYRDQYv3Pw+bqwEhWZfs7SbZrwA9Bon8q2Wj6NTctx8JhDA
-SHVoCWDyDvzvRYq3m6DRR7TYhWYil39OnSql98+qV2ItNVxsBEgJmP9xLmHPS5vX
-owHZw1BUfXbvmXxpLNpQJhA7DNEre+sSoqsdSPl4+LEQ1EPB36cw2Eb6OSjINqUS
-+XBud4faaw2dv84DD7+iCDMSyjBimYYn0pl6BxwrIdUtZoNh8jGwSCSsfUynJg7y
-nPEpXU7oj4i8dHi5fxLQNiUSRIFxmpiqtZ5HYo/+O5A/3tFRTDP8VPH+DTdu8zXp
-5lpswJq0AUgA3scjsQQdb7ccDKXXVAXIFlk3c46/JerEpyWin35Xf9jRGz9e5qJ2
-UGw7d7T/TECkSURDHKChDp/3qJUnJKDJOY2gdDp2rSiwnewpBVVMN+JdXrO38Lgl
-0BeqkYoB6TmVtUtkQk275WZtm5H1G9ELg6fp8MKicdhlz/DY84ihx4dz+UaYewxu
-HraCjlHEFZ+D7dbaPw2666R3OMAKaOybagIYGK4dbAaVd/0ufmBrnKmGv5VGi8Ft
-L6QYxYycvu7d4hp+MrAMk53dNg2qsclEKVVjTGbBIUai087G4+S16iqDvAmi3Xaw
-6/+tXQ30K1uspG1prufsnm7+eYI/EVyXCLpUWPiKk/CpiEevsTPYJGGgU/dODk7b
-fN9itKqlKHpNpvIsXI2G+uxKtmJtOBLg4qA1MuR3Bqzdof44AFnQT83VTSKuT8E9
-F1jg2nv+KOD+mcWvSRx2npwvM5b2p//NfdVVY7lbSNylPQlwwepWfZ/XlxhkSnXZ
-H5HmvDh/nmMBc/WHa9yPy48IojRQ3Cv+Bj26fGCi/aqtuX/ZGWm1F5/I0pgOQqrR
-R9GE0yKHhcwXIF8CJ6NA3hFhhOdpjeQTDahxMUAL4IYEHK2/uZYB7eHpXqEFyby/
-WJ3NGobxsnPmdKdPmqgKsjXjgPTm7n/VgB+dqczn7Dc7j7t9UEp4AJahRCuF992B
-JETQ6UlJyt0MxW6qg66AgHRfRXp//GOQ1EiVtxnVjaWfbUXV9qVetQPynE2KrGf/
-GDl2UIZHyRYVZbR6Fh/0gSub1EsP16wkPdqImxMDDROljcuBACvj+dL6H2r+2xsF
-gSkdAxUL+yeqqG9G2RW3/g==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQYGJlsB5XpL1FjK9b
+G1CmnwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIvvetgdqgM+MEggTI
+MBJafsartcuCss/ajxzBOUo6E5Orv6K44S2QHyYzt/Z88Fx+rdR9CFtZfPLzcbtB
+OkuudKjQbtotgEYykjyv7MEM1v6fTTpS7MU1kldPwNw09mVPCMYdREnjgiE0r8as
+yNl4wbafgTc29MvyworMcvNrYWhmZH38AXoaNGn7g/bCzFT9guW43mx8/VYy7s4J
+lRWMLtjzNo8ZEQGH+Pl9Oj/DSXOpH7aR6fUPZDOJJtH+914z7pu0iqCu8v3AFG3d
+7lU9vcsJGNljKC+JNBRn3DkxxvV0aEKI/zOPs6tMilPfKjLrfC98ARHod1RiUybZ
+iIRbPS/wiim3ZJvEAYGLGF19aceYvG4brbiRm1XpUgiBe55Z2J4ULHIkXIp+OG05
+QH7joomIH3IehhmnfroyJ0yXi1z3aH8WUUslaQeGJNRvTIxo5npaUYbPdB8mcHBl
+vu3Xz0e+K/zFrg0NyoN9w4Wh6BpZTEnDbh2eSEgC3q7Ib2MI6oK3FCDBThg7di9j
+okslK8lT2GxNOWFA7x3XmclI5rIZy/zVUhEJLWgrd5IzEVTMeVI+nh46REpZpYDK
+D/k1dJGPVXOz7SeFRk7p5hvsSitwVnyY0HMGTY2tRRVDz/75mVrqd8zPEmj/n8Tr
+Se0BelszZXiTAQvtZIa1TTLYHNORMKvzR1mUihQ55QKvLyUcXlTWhYjomE9P67uQ
+RGScyO7Tl4nbgmD1TWRKrPR9JuTqA5brrwWhDu5IMikzPQxgr5X1qXdVv/5p3KsE
+5Oo3Tya8X3nA6P6S+MBTa4jNCY0W9wWYgMPfQJ9J4AYYGFRr2z1I8qM5gKirhnRf
+6VC+DynREaQnux96DBc9vNgIMla9A5qY53po2WrM4pPSU/xGj0Ut9Gjez9/qwYy2
+CevEN6mWTIwslBjbP/dq+DBLa8tU+IqXO0JNCbSWL3uuy8+oEejASO5HViB0g8/6
+QdoiqhiC05jj9paxH4Rv/QkjnLscacfsFMO4uwn3fYh5Kw4+hPm6WFQ1QCTYCfjt
+aWp3sASXfyVN9sLtT+LwgNSYCTOloDdn4XsP9eH7PoLDjK9/6F+TLqh0sZnR7Tsc
+i3ETF30yHyiJEbPWLDX4OIILtO1lTsUs5Tt67zv8e3tpD4JC6NRPO7IR1xoePIx/
+bXBAdKp3g70zAysHPAhS8ekjvyXnBUakXR102C+VzIbeEiYSKUaOXEdZwJVe0qxI
+WEGfOawkWLV19zhzyjU8uARsaU0g68nJj42+m3TssZ2tbP+XL74QTSI8UE+gjH01
+JjDCwO3mKvt87FNcKx6sDcWDUy365pOmAVL+vSbNtojbKRocpMqtr40g5PPxAfTr
+9ca0lkB5R48z8CXXE37BwlzAwVYHTSjwyTBVcze4TZqj/fg5khw1YYi0/EgsF8Zy
+IHxNN35Fcs4QkVz1YDhANuxibj+Ha1tY/7kAYPYal4ULwdOFCB3RXRj1XZW5kqSJ
+Gf5//wuVdb3l9UIrew1SmxZuLbenjWx6ElDatTpTvK0RDwwpa/K4utPNeXmdrTYV
+HlmYuCmtDkkEAvkN5DkGDH9HxnpLn75goQCbjJ+zgwZQS380id2kclYceKeCtBsx
+DtJQNi33/ttaddHfoHh+ALxZ0/FgTk+k
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked.pem
index 0489a94ccac..f8b5aed3717 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked.pem
@@ -1,60 +1,60 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-LmNvbTAeFw0yMjA3MTkyMDI1NTZaFw0yNDEwMjEyMDI1NTZaMIGSMRwwGgYDVQQD
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked_key.pem
index 3afd79176c5..6f515cec6e4 100644
--- a/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/intermediate1/s_rsa_cai4_revoked_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIcAigxw66l0oCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAu1m0/Rh0CABIIEyFb4NsNoltl5
-IN5TyDE2PUrd6xho7tsiaT6uCbvwfggQkDIHJpYryvBbeiOkg092k4nuKVnqC3OQ
-CP+8pS8hcG4WnWG0bbUtEgHFvyY4Kjc2Mck3Eyqc5uTZGIq0X+KTwY+TU7bKzbfb
-3H2Oq4tILVGZmUQXd1Iqof9d9SOUjcEeWwI3n3muSbvocPaqv8nYWQlF9MrV1cM8
-d2KZ6KHXkXFd3Jt/SlaqaPZvk6JlNQ6MZbok2BRRjt13Np2a68Tg1iNGGHoOF6pt
-SONX55JwbilRPTe8H716YWvnZT7MkuTgZq4s4112xV5naQzDNoekyBtJhp5evxr0
-/W9DlOs9pQZeQY7ZoxR1REnnpg199PvbbIt/Iobl/bai8hK2whTLQngqusYlT4rZ
-6Mo/w9x2B4jbs+BHUhVYsa6mfq5KjYbbXamLUqsJdxcPX+Wg5tQ/E6RHpDJyYzlt
-qeDfVjsF1qkNPQC1xHGtW9mikJrUfODdO6YsKklCC6e+1wpzs73HimWuRTplrfrc
-Q+3YLL8sxI5gGizGyq1GmLlWTjrb27rVF64v4T6tUqq1zfY/swhqz3pTdUZfAEl7
-ff65wpAxC79lbKTBLyr4BCct+5kYzqvxqZ27Fqit45cnAzUHOLMQs80pjxCf0WyO
-SwR/ymHeznJAUUPifET7iwktKscdIB6I/OE5dLebZvf4ejsGNPJ/f4W9npvJ0rYs
-2GP/p5PsLZDvmifCU+zS2okngb14AB+hFm4Z3YI6Ew4nJ/GSprshpjwH7n3lEpTF
-mHngcWTcixjU8bSQIpE+J0BskYV9vNr75KnDE2DcOYAhNx+V/wBeQ4mq/VkIibCw
-OpjvKJX5ltWmG0QvEvhu+4Jtmu4eJH7E45LsUZtR1CyuGeL+qFbi7BUQkG6cR+yc
-+RMqeg5XXCgvmzWXFShGcwQ/TLUSZXZXmcuOZQq4JGI93U4ainWy25HFVhmiqoeu
-EexOLSZ6N7odIEGYXP85/Ftn4OdAj0RfVanjCLcqP0kSXdSxp7xr/mgflzhrP359
-NE7COPXgSiDkjWY1CozZee6t4VE+7Z0kzosfGN+kNqhSFInOPUFsZ59iufL+BcAv
-u7Rq723tEnBeaZn7m5RCTRxOJYbamb7V1MDr40QsRKi++uskhBTPGgAJUx2Jf4Q/
-njnlH+nr8vGi19+d7GF7ywPu4jQQdTzi6t3/7TrnbBb77WDRRXWQra4Whb81btvm
-bEh+T8GSrB/YCMXY+5BOIWZwPb1UmRANQI9491M24sRWqcAhMYuwRD1n/uYoNDpD
-sUrlOQDG1Fs8PULYS/8mGtG5AkUR3m/mMBCMUk8l3Q1cGwSmAFhZzR5whx8wfvl8
-pUfagnNsgxI9GlMetd5E1MdzUYTbEfA2uve68iWTK2rTE4OiCFwd16SDEYoqdvb8
-vVKJKQwQnF7/iZDcK/1kJjSK7XqjRRmqlGq0nMRoTL4BXQEPGvixKOatHMBMNKG0
-rfSz+P93K5EMcnK9ZMKZV4/3C9+Dha6CM0ymLTXfaKFhs8z+sBdvB9/cI9Kirq6o
-LXrQqZpCV+gtojcE6h0XTzze9A71IsltAv/Z7joKqmUCsR4c2cTuAT3CQm8x/dHD
-C4wi43okqYyFLT0tHJrCkQ==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQgJTiQ4g4mVicR+bv
+OEMhwwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI7NzHE6gbGogEggTI
+QdFt2T1/7vxScbXymz/GcobeoC8BeDb+2vdeQTgizq8uHBoBsefdWeUVpd5FCVcY
+l6a0b9a23RN2YK3fa4F8upYhi7qikt+m7Pdt0I5N0GViLs862NzQUUgTEfeNcTH3
+2nFAtFgdLyeiBp0plFLRSd0mmIphed28WxO+m8A2yDNEDpOaSomU5dcNtQIKYxrb
+Ta0Y2uVaYPrTNzj0kxnriU/vkXgUXEg+6KiJvW5mFCGjy0iD3mRpwDwKg3sHle2E
+9OR8Tme6n+5xsFdFzJ4ey9NkqqdXiq+YJPwTlEVf9E1UBiRXGXIqAKpLtEgWg2Cc
+l7jBPPeNTxAaCNd0p/jdxaNyCHgKYjgipsXuPIeNTkjYSBwpLrlxfDbstuG9Wf61
+pk3yRzs8mSfkCdA8O3NhcuQf8ofuauDvzW4Hn6e+xMyl749IaC0rxAmfykVxZSy8
+fxx6IUksT/Mb3xiDbo/JOhkewswgAuHAGg/5/tlUhgzEG8azXakHVTBis/uNnLSs
+Qj8gchp0E0p7RE6SlSjxee1mLPVNdumSsXC25Tb3Yf+Eq2/NFgR02bfSXaC/3k0i
+Kt6hcdKg8E23lzCEDRicLuOuE7uP315Ke3B7OZl7m71uiEYGgnsWcVXJ1aAciivw
+UBcyHUg+Bml9A5ZBuKG8COtdXrSAtzJJdmsEfQGPAhLX1cmsaOkuNVQx4K9BCnMg
+D6mYlYGCuFq/u79ywW9EDyYPudh0Ebgm3XuCgE+qTacgaYkYoB6U0Lk4RdJNH//j
+WrJbLuWnNfE3S4b+s66vmpMryGwcffbF0YoPVO+pS8FVtzOxqIUC8fRFJOh151fe
+a1p7cZlLnfrTXhitEuxaZEOnEc5JMZctKOiYz/kOwlwIa9UlQR52sxFfUX6W4cA2
+h3ufrQ1agp8xhHTqLJndkHTEn0R3CG5SBtydxN/ImgzxufHh3GXy3U3APHQvlSDl
+5Z0JoX2BfVWhdYNX59xpQGyLRuiWbTBBD559Z5vzr2MYYhV6w/C6XctIJG8n3J60
+OZle60mvdeGxRTalBMy/KCF3Et/OvbcbZ6ruiH0O4vRThX0VcDdAlDoHnmxZtZBN
+IhgLzCQg0G9F6fNOGCvQLYN9V0fM6OFiwtZ+0iIiMKkO1am0ZtrBnRsuIJ+wbRmc
+7E/8cvlXnt7PFE/aLetAHFJMt++Rp6eRin9c+PLyzNVLTqPsfreU7NjNhSFvbMDG
+xxSd0vnJH1sPVPTtnmlWqxqx3zHKWD3iaTuKuM1bW/sYR6/clPaeK0S2nyx2DnvQ
+vk6zRNMt7ePjn3ILWjE6rFqw9GvI5AZrJjhuobma6nf0iaJNexrTwpMtVqAa+mRB
+zZf4SZLyGvzXbeOvJKr14AXqaQsLPbLT3fc8/Ad3FPsUlDttn/F40KNeQPl3T8+q
+6eUGrFfaMvoVAZqWcdseOauMAoKjUC/XLhXvzBr7SexoaLxbpjik5QBsF4SN/BAV
+BGj5TFm8mHFC/Fe5lks1QAe1Br8G2y7nhxeatA1fH94OSZuyz11sJQZBDq4mKWPv
+RYK67d1yCKw3FqDdURe5y1udLJsqX95PPg68dRr6psNQCxyhrY/WP0blTvoyngGd
+emSJSyxT4csnOY8b5pGEJomAmsuc6sCY
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4.pem
index 0b88a87e69b..76ee7d0ec79 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIFSDCCBDCgAwIBAgIIHHg+BhpHuEswDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgNDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxM1oXDTI3MDEyNTE1MjYxM1owgYkxEzARBgNVBAMMClNlcnZlciBjYTQx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAK3M+c/CF4BLKuFafl+Hkss/XpzZX32/oPyhXVPDCPwF/a2J9T4f63nSoxQs
+sknylTAFlnHqg0cSrYv2DkVmaez3c2gmS6ikZlBsrXUd/ApANgQavVcT+9B46Y0y
+zXF8+LZfdj3GAWw9Rit46XtYkGz6Ddg3/l0qOBp5JhwcfQ0OPcJ60aEo2iLQxGNa
+ZrIYLvs5UZu67u9kvoMlH6S4SBItBbyN0cPAf9OMWhu1n14uLrxjTToM4/0IR8rR
+8DvMSrKWW9c03oMSDC0iO7LgMMqOCQHQqEctmY89sSyRVa4T5La3EJkHqlktQOET
+W4QCYxFXUtQeHKf9GLNPA+cB3xUCAwEAAaOCAaswggGnMB0GA1UdDgQWBBQnJtUi
+rDWcehNqgB4J4DC84Buz3TCBwwYDVR0jBIG7MIG4gBRD2jhTmaTZAFiaaO0ihOJm
+MjzB0qGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSA0MQwwCgYDVQQL
+DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
+DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
+b0B6ZXJvYy5jb22CCQDR6/UBweul9DALBgNVHQ8EBAMCBeAwYgYIKwYBBQUHAQEE
 VjBUMCIGCCsGAQUFBzABhhZodHRwOi8vMTI3LjAuMC4xOjIwMDAyMC4GCCsGAQUF
 BzAChiJodHRwOi8vMTI3LjAuMC4xOjIwMDAxL2NhY2VydDQuZGVyMBcGA1UdEQQQ
 MA6HBH8AAAGCBnNlcnZlcjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2Mu
-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
-wFQxwJeNg+39qUab
+Y29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQB+EsyP
+fKXXhc1bZYJ3xkJG6DJVEAppjs1s8ZiK5h165aj8NTRJc/7sfwyBwP+sG24WB+vl
+SW/raaXfmgBEI2Wu05pUs5831SZB9iKv5DPw+CE9cC5guRb4rElT/jq4IQ4ge4e5
+2B/UbxfVh30L1AIIlKTtTG0Xl5NK0p4tcniix5dtf0gis37PipKVrOsii9SuPUy5
+WdHdDh1OycOxq27gK7gOtXKkdcJunXeC0MYr0JUDBAHhQ6gh2YghS7XL7qPsFQb9
+H4S3vCpHDol38R2HYhZ3STmyJvXuVtkWrVDH53kmh8PeBQ/ubUK1lVBfqXTouf7Y
+ATyTXacB/PY9SM1C
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_key.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_key.pem
index 7903e21b7f4..9f2ecd008b0 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIPh+poEapAMMCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECImt2sb9/U5CBIIEyC2Pr2U3gji8
-THbXSQ8jeFQwLNnC92RFS4bwfv+BoGSOpAdj/IOYKybN+yajvvJnZiNVwNL5KMrL
-5pMg/2ynJ9GqLYepLFjqbwB754Q7jutrVY0MJAei3Y5QWTzoSXeW9iM+bPqIvxEh
-4luA1q4PFxY+bOSdWPmHTOxh1Q5ggAgECJRuh8A8LnztsfVggMFp7GrOGrl72qvi
-0+ffsM5gQPSuMbHFoq95u1mjMIyA75/ivV9t9AIJmM7iM5jepBzNgrL7VQjB0wyE
-USlidvrq0Ixvgegk8+gOiTRUyz9KV6S9ZpDzHdSJutQFjYVgFCugtx1dQKglkKRd
-//Zyx5qlcv4v07zuLczisBIqXuq61Eiy9pFyPbpRKZCdo/x4S/gQsEneNGLP+krE
-Wc1uLCXMAmTXH8JsMDLp8Zwd6lD5iiGqcWV4HJn5HLl0duOjZL7tVN9t4OsTWKBu
-0w/YnLWU5cD6oMhbRj7IXG9MQo8YeTtGH622K8iDbr7q8ubsKmBuNOOvfpCR2KGw
-qL9TOcAUJJW7CAwo1ewBpRRRd2mWQmpgddicS4a5FnARaAE4TaxjNtvK5y5jfzjE
-C4dssld7k83Z1dRmknpFv9p0VmF+WZVeTA57C1n9/ZmgiviB2Zv6QBZpb0Odmhrx
-S8WW0I3GZEqWuO9HdEr+jZXtg4m30vfMRFe6lFdFr16z7egJwArYH4gN0HejQQyh
-++nSack0r30Z8pyaNmJs/e4pyvfQjSfllICTKpSnE2FyWo+jxaAEuLSAmttP9F83
-pGlrOOr0VQp2PqmsxUiGk2gnjjrcKHogopz14HDuB7K+wzvkMS8IpnhubgmjDitC
-4ajpm8idj9rY4U7o3vsxBAGVlY+TBFik+7r7t1S4VSM+Fy8kA5MwcaRv3gb8kG7p
-CUhrW7JNSJH10LxBFtm936tT/lYiuRuU/u8G4GL38Y+slAXTAqoiS0pj/UM2jsDD
-kqkG2EQBJ9PU3PMeGUCnwYTOKukNxX2ht8AoRuwg4SU7jhekc+VQzc6ibG6zeS/i
-m1UsH3PWPUzI2ZaPSpbv+GQ98NhyodGldZckQg9C7GWvBlYDnredTiBXYS2DavUR
-0aj1fYqeCiX2n2riUYRFn/KiyBx2YBmCZbx2KAp59/Q4ntyATuEMR9vs3q1ghIp7
-VqAxpdp5MDpgoOw1gQn2PTfsoVT/WIpVueswrh1QL3LKFkMJPJMmZK9D0z1iR3+2
-vf2D98E7wR/3DDtZizko3SdaORAMOD1Op4tUm4p72RR+pEvbHeLmlO+ScfVQx31J
-P13tECtNPdNi9MbnV40H40E0FvsOnsebjmzOfW4ahaWN3MwgTwvftOEDPslbidQ1
-81Mq0AJdqF1qFuS0h2wpEShFQewx6r85C9aclPx53gaq1sKsUR2hF/E+4+92gyW+
-/GAvaxydC3jr+zPmY4L20f7lAeun2i2XL74DXRBwzzwriZBAZRIEShN2WPwFwbhk
-4M11df/4rvLe9D/LOlAHSJ3oLn6MZrTE3/db8pg+sxPoJw3mZ24x+tt4uOx9G1dI
-Hej09jzHVlgPyj/wDyZR0JM4cFGZBWisix6M64DXnvV4AqhM78lTKc75L7oMSCTH
-SWCVFNKjYvWQXwS8Mpgv6Q==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQnnbPj7MUyyIoVc9U
+G20fZQICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIQmRN2SEo1y8EggTI
+RYM1pjxutqiumh58+mq3yOaOmHDaRGDEt0A1caYKAhdNGLf1Sf+ZIyt5ZaPAozif
+wFJSGPZRCc+Spfac95bj24W1DP3yIzQKRNt6bxBZMwFwmCVbqifCbkWScrfvvV0F
+rfRAyD3XrzTqq3sCLPqr/nlz/B26TIPMnaSTjkTTquW35jJT/RASYy4mHZ9qkJWJ
+FSOewxFz2AgfN6lBgAr77RPj7i9PX628/AO80jPTBpFX7oRc1cuLBZxqlFizB6i6
+VWZHk9aIOI7+OzvIMJxtUeGHoPhBRjRoKRnUzrcNdgD0S7diT2bmvijindY1Jj3E
+81JTzeniZBSr1o+E2/OhPOOvVhbIRf5JlP2GC3FyT3jHFk/Fa9Gz5d5vAOiciBCo
+oPp2erh3B+fivpmkYs7n1pIYMwsEcP67S+WrhLl3ojvPsdBcll1dgCNRsHixi4fA
+3kWFlikeB6BImwMYnoGuX+CGKtIPYyO9HCgtT1t9XxfzWj/Fz4387UGkcbshNXGJ
+35spvrNTU+iCFtjnvILzsnLhC/sVJoNMNJQuqB+gu4Xbz1EeCfkDHhuXkYspznr8
+/5x1LOAF4OFS9yk0VR03oVALUMh1VtrsK9z6d+Wk13QoMqRMSlNTmkh1NmOwVNcu
+67GzJbWVBkWsU0AUCDyOT2TMa6kf2bw4b1LQKmQtluz11ucOkeerBXn73bw6Fc2n
+GcmYSUPNgjGRN5FZeIfHfSj9dBBWAAQIh4DhzAi1Drm7Zjcgw4sSr55UFqa1s5+z
+7G27auvfHuFSTUvytA2AajVmSB1WMzYnNEW9PAYPV23cYbs5/wsFYHB3yxNJCZFS
+I/oy9DOlFAV1TaODlLN0mj/lGN0fLQmrmSybF6qUo2lc4uD65xlI6aZZ+CyZayLR
+jrEkZhYI64Iv9EgA91vusMGsAFOcaykD1Qg6AuPejrdkuJ8ksc53eIP8IWbeiVsq
+e0q7RrSnVKwzEMoWoy4Qk70PhS8dmpG2Vg3WAMYdhHPwBUnDlCPcUEZpYXXrixg6
+/NxICXSpTV2rOJ0ZWLS2fy6T2X8XB8Zp+mgVfLSK1hm/WpnA1DvtiDCDWzIo6GqM
+fZYgf552vszLpjkIg7E78Eqm1KezQ4py5bKDI+KrmTHIl6IrOVVflESDEU4iSife
+ulE0/KziEvMNbxpi4ronuH3rqg0wVTVT59ZWIbGc13zqJxBupfVqSKLwSoLFyirs
++4xEfeHxsujx4+hfGf1dNdmSfgDzbcocRZ4TNbIzAB7dmZkHr7VDnSpR90yX01tn
+k6R3NtKel0JL76cJWW78Ecj+vLSVk8B2o9g/DX34YBng4Iv+NwqRaCAqX2+Nmz3i
+/8M8HFQ34odai4A3gJpz9szoUAYCJfWQCi6HT3KhZQPJqJClxtIbOkoNlXEXKVmT
+0ckqegetwueLEihAmCQeGWng/Jvn5tGzB5pCVxnKIrs+qWMYHRPatjZ0VBfKHvdX
+EEyA5VODmBk2F5qbrXWMxhgx4QexVuSzAhgpLdWMRUN5R9EPnratp+lHd80WvQcM
+flQP9kUmw2HhcqRFYlRUFzGtoWCVFjq/Cfl20bfT2AnnTN8eiNwxO6gJXTW5oQit
+kJzieLeL5Esb/8kqf9prt6ELdyK8Ax7F
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked.pem
index 9efce48f11d..aae9b8b6a46 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
-tLXlY0l6wUbC3VvH5oh/Q4OIiNw=
+ggEBAFma/d1fJRDz6LWRn4CrcnxDK7Rg32v3jzsnsksLDJhuVKxjRwjcXbZ9jlTw
+0f8xyE3xh+5mDxRy6T9K/SRkRwD6aCzubjeDnN6fqjP6jVzsACO8tdI07PzLb/85
+tT6QS3ozfFfz1vXyn48G8ajfRVIWsJ7JVPYdMIMrIm59mtzcGZ6kJ67mwBmwZesv
+Vzu2h9EL6RQdBY828JysBLJwZv9iSCobGjyKTBHe6UCtHkaQVwqeQwn7Cjur51ze
+oxA1l0jgHppHbfCCSV0JlNqPVNrkS1z3J8FT493+s9ZuTxS8OW15tu4hziL53n6d
+bxjnozTrJqzLyM0+udEEI7EG9GM=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked_key.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked_key.pem
index c8834bbfde8..94e372037cf 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_revoked_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI4UXSVR/CKS0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECEhlb5+wgiUUBIIEyPd6Nv1A3V1X
-uyudNVcTkU+SLUh8e08X/kFT2O4c1Z4nUBvra78QF8EwEuxmWXoujlI7VGmKrohd
-KEQWaT9wvkEiRYJpCuoSeP+rZ/Gs2ya1/lELptY+4XJIoa9OaHVmbU1AUDpw0yZ1
-ct3hWYbzrLRYYLpLN89NcG3sBOT7aNPDqDsdSQ1sQkSvkaMx3K/VaALqwH+fwEbe
-2g9wyucGjmpdxeAsbeh0hNWqectIrgGV9PYVxz33dBfbNgj8wkl4lvSRO6+/0snI
-0u1dZeo2PswfwaXWxSPNK0/zFNXsG8kRf3hiWQudeVYoEmL7/P9Cfr0GwToBafUu
-2ZX+GWdMMiJP8zVo8i4hZBp5jNw/Qwj5QbxYN5jpSvmlww9303yktFWGoSW2nkcx
-7EA+1eki6ikrH6XChN0Gs/+SqduIr9VP5s+AfANguGhH9vSB/+0xQyTiev4Hm+B7
-1pTiJaPc1f/3nWNi2gVT63OGmGv2Zsh4X2vJFCsGhBdy/GwTUyUvUalqPfaOjari
-2wC5M7igiqllu/fJtQoJd56Z2DJtEf3jbd6weWjFE1VChMKLDPVQIVP6K/gK1DJO
-LRPuyaNdquJBcUHMSH0DbU2n0KGsRkEkJQ78roVAHgQLwNpt9LqYm95/AHwlZhcD
-mTHNK3P1kLY0LuAUQQSZxs4wTBEghZUCZAuQXFjkellMR5DYWBBT1r2IpMr8V20I
-+W2LLEnfJckjcLcJvUXXgzxi1p8GbUW14TSioJSCf4l4zHJA6riZprt0qbR5WnBC
-X8NlF/xUlmYuMit42qHRzltSnG2+3rY51fQCNBCZDvl0uneva0My+WBb/LW3n5OC
-aL/If8j5AuogjE/rgtLmyp9P+LswT0SHyFGSf/7a+YNnIhTzx475m6buA6q2FPyG
-BNM6uhW2blEDgMOWlIBzWLPZwMTLCSdAbP5FZ4w9v3ZIdKpNSYxXcZo/4hA11tLf
-/SNLSUOS/J9uiovvLNrWSQXHDvYWpkr4e31pqQxGMx9FExwanDplh+fviwfgSp6y
-k62P0p3h8bejrcGOhQ70mTmtxclRHtwlPTK0QkS78WAPVaWCE3rpYgm1KfTbECa8
-jqcI53gKxNtD3h/VGY4rHmhlNhQxqiWa/gxSzxMCi5HEeoo8ZvSROKDzcVkqscYy
-rZxqqoQpaX/ydty4bT/z0V1PRnT6Okqd0ympXZ7yAp4C/S9iFjKIVQKgTs59hES6
-UfDR5/rdWAec7+KR+qMHpKiF5aCuYZ9nEI1r0N5qMB+NiggGx/2Rnfdbvu0SDskj
-WOXeNYPH8XGcBIT7ScUvJQejUAQC0GJY3s969Ppr78H+8kxBx8ZEoRDEqkY+n6Vn
-7eNwLo+oEDpnpVSfGxjj6nnVipyFYyO3VlQq7jj1F4qSy0NDTTRY92lyFy1gg+x3
-UZ8B8jK7gGH47Uu5kKxoNTCy7IxheQz6OHR+hdAwe9uiNqku4+XzhLmIEMwDCOtv
-3ggBZdMquzsh+MOR2tfdD3g+/MiV0+rB2T8ZK9ZvlQZnBkUw/xsb0Gh6NGEITZ98
-6Z/h1Bf5ltogqPfe3HV5DtfQx6X9EoRpHUwYdfw9bxHhnC0UXOHqd99V9UDWPicB
-yTMkgdb3jbUEwRk1MixLow==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQwAOeXKd6M3yxpgZx
+AYUZRgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIecxIqYwAyVUEggTI
+qq9NDiB9eNMuBByto7NiD50IFMAQ37VFyMqCSDIg4D3qB87tts8aCifBmgPU87cP
+7L50/oe67R7yx1iBbDopTzRKfasmKiP5u6Ozou7NAd6Fi+v7K/nfAEAynvUDXzoC
+7vMvE+UZg/IXO9oEN6m6JnB6wvR6II3jOD0zSRdYAhIHAhhbq5fG1H/teoDSYkQM
+Pd40NIZVTznotngMeinT1evvve71oAM4ts5UEJv7qlobWY5LRWi9QHgK8hg/eDIq
+8x+i/brFBkdYAwOu9HX/gzyY+Q23kUQU4Tcl5jiYFGtTAiVTxBCuPuKaiT57D6lw
+C04KyoVBgAstVqjWJ7xZ01C3Hl187imdzWAdj/B5Ck2fcbp5khxyyxlnhDuaswWQ
+Sr6yp4Axkvc4LNX+Am/c9CbAFkvzmmOy+XJeBtphy9J4cbznlpzCd9EYeB3oRzHc
+MDEpb/mtn6WwUsQCAm36DzO2sjOCDoEG7by0t46l4txeCgHIh8gfTeftxFcBl3FR
+5ltlqCmWQK18W1g6BAq4T0ZiTn+gzo8tGDe5J8HXFB5PjQppGcqTQu3kHqOQVObH
+/IGGHp9/XkpQ07QkAJRUpOQL0RvQSkGA2go97gYTtSDUjTgTUrbGn3fLo77lawgd
+9Ce7q9TCxtvaqVChUa6Opvwz/3YTbdPImXvdGWS32XrNUS14YGPqi2Md3997Lrm5
+dufWOFD9JRdP2xNEZcUqLJ/sdJbLyI+pWJgTiPCyw82+hw2Ilcg1F0wFkyvr3nBm
+kjdqsj3Z/C0361TSoVYqbSZ4ucxCiuhwAVoIXKuGgC5z5CoM3gCk5ksAP/uh4Pn3
++7Hu2eQ5XBCYpp9KqBmCorUUS2+F7twSgSmibtOSGBVQdhOWSsPAcOadkkXB4A0b
+qYHdObxKWkU2IgXUMvO9BAaEXANtIgTqEsfRRCfxbaLwYixLvyxPpnnxkJOaLp9f
+wdkl5UT5NCZQQRntcGNUP7AnQThWzFWEMeHLLTcFp/SJSTlP6AguKdTvTPy+htRi
+6mpMf6SpbheTT6PtRi59cJKY20Ce/B52LNZHPsDAH2UFgpVzAm4VjR3THD0Ekf9g
+CcL2zAN0IQoLU1Mh39X9NMdFI8Emnk10yg8/l5iQZwrYCt5JVm9uBdVO3/IeM8gB
+MTolo2aRPPsEF5C+72CH9f7PLu2ptXAIrWbFFXBonsunxEm5nkcammVvlZUD6FnR
+Ff02SvvKqiTlWIrwSwz9G9s0BOHeAjc3m31G+GDpBV3RvrdxJuSisNmQj2iZrx8E
+l3+kK384hOA59B/fGxP41NvrZ3PF3FGnWIMz8L9NxseZjlEAa4sNp7kv9kqH0XQz
+ABniXbWw6q1THKBxhpkOUtXZVcVzq+vf+khLir/pGh192Oa52rV6HSVQufzX3hXR
+hwUThZwYHnnirasA7zrpnXEEcMjX/Wua0b4ZnAoi0d7y5TrIaF2DXk2bGyFM+JuY
+7l4G0CPBYr+xf01vEh7oNy6zFakoKzHzKHCMyfBLFcbL9TH0LyIoK40F3y+6WJry
+ofhRUN2IgMPqYL/adkxXltMqS7R9qCo4EIX56L3gt7N/FYHxDcyOCC0EeaAKaRqN
+M9LebyL+kYrLiWUIUZX9tdHMjDWFzeFh
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown.pem
index 1db47c03c9e..e3a1873e3c8 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-AQ8AMIIBCgKCAQEAxtlsYe3pKcYdtfUvmiu7AlK6qMbOIi+LA0EOkUiqOLs6Obvp
-tif/DRSmPt0940ds1RP038vXWzT3yqRDsm/QQYnSFmLRFm49L/b6wsF7TtuhJFbs
-9gl2d92r8Ir4/9laEtGfSoJeXh3f0cnvBzSoQE+9/4npgBSdLSqJM3H6gJxzL3Z2
-fTdRzaRG3AqV/qRbNAg1OKqDNIpOsbUGLZ7ByE0mnk3n/Jjainm6xNSh1CGTXptK
-d5UT6gOSag0wbnnCR5H++Vzb8PPZSYw21jHEjF2aXT85y4IoyVVOFjg6jq0IteBc
-VwL1sTrIA3gQjFbheTIv+CjIMZ7j5gsmvFA5hQIDAQABo4IBqjCCAaYwHQYDVR0O
-BBYEFG3V8BdPP9fiNl72wxWyg6SgOgAYMIHCBgNVHSMEgbowgbeAFBSLOcTvcQaE
-IDVYOOslk69m6ZHqoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDQx
+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
-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
-5bUwgqGi5zHa90YQGyXX8w2Q+A==
+AQkBFg5pbmZvQHplcm9jLmNvbYIJANHr9QHB66X0MAsGA1UdDwQEAwIF4DBiBggr
+BgEFBQcBAQRWMFQwIgYIKwYBBQUHMAGGFmh0dHA6Ly8xMjcuMC4wLjE6MjAwMDIw
+LgYIKwYBBQUHMAKGImh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2FjZXJ0NC5kZXIw
+FwYDVR0RBBAwDocEfwAAAYIGc2VydmVyMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
+ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQAD
+ggEBABOK1GoFDxBOG25Nd5M+V3n5WawgJNzhQdTZA8VR+VNtb/KCN3yTdIPeLRmG
+rGJKyhQe/jGcogo+OGJ5gQIPLaV38BCoBbelrAO2q5Zo/UsA1RJ21ohHBwmG0HeV
+YMy/Tlk3EB1uxreUV6d9gLFl6sOOalYQNDNi40hAVUcYSfd13YBb6gfWxUtH+sz+
+OC8ma71HIM+ZfjtwSFyw1YnW4R7b4cmttMQE2B9j3E8eFdEk/BoWdl77uD1m+mRF
+HETRU/kWI6o+5OuVNK9D77+XeSOSXQwB9Ah8kYpb3lGuaE4JEB9o9eJP4kGu/XX6
+gKoH6TgJ8167pwHCuP4diZZx814=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown_key.pem b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown_key.pem
index 34af1c26caf..c243ae42e2d 100644
--- a/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown_key.pem
+++ b/cpp/test/IceSSL/certs/db/ca4/s_rsa_ca4_unknown_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIuG4wixr+woICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBfBae1Wa6gaBIIEyHrji0sbrlbs
-pEPacf4tL4565Wgt2KpCMTjdV+uccGV9tAgXCtOJ7YD1qaKV7om94ZUSX8Hw+Fjf
-lY/sr0MwIRWDwSj6rq3uujNJxQSXao7t0oBsTr9FU/UyoQrxh62T447K6rHQH0c1
-q5EOQmfktQuD0Kc2X1KtbMp0E4s2U+6Y03rtWuevEPmkyX3kqfvysio3qxsgBp/X
-iloM2FlSKkgIeXYHpF8Tp9tVW7M9gWe60S1Q2ws1aM2UAP7kAxAf8McG8ddJC7MO
-SzM/t9I0MQSce9mSEXEkCByXP7tibsMvbMyCpQSYKVxGw8Z5QbYFzwMKuKcyGacC
-Ir9xiOBvEh+TFObWcv2WflHq0fXCjvQ4MQhSqw6tcBZM3sJtRro+fnBRxYxGMyJI
-/XYL2TXFbQkMfeGQdK03rxJ2kaCazxcBpM3gbo+xRULCUKbHV36wE0ygPoXCPUxY
-LhkaSPn3AuDvAEVTY7gNfcnPUWC6js7SEkj5dJ8kw+43fsXR8V+OVIe5zfgBJp9m
-CGTHC23VOY6FA+qhYLlbvDT18XmcyG6NaCUfAsJ3jiHR74nF3jr76qVku7aOku4S
-bntVH4H1T7f8cN1RBFFiFEuo/oqgBhJEcpmDvp31XpJIRQxbjUg50TYjKg21/Jab
-Kc7/3zbq62EbsxCXJM8t+KgLCcqlv+kmke8IQH/N00Wft+zWmZ9HBJXIryTOrvWP
-q1o8uCqfURE4mmkMzH7sV5oYtNC4Ixm6V5q9poI/TCLWZ0aigo5HzBywHjcQpR3O
-TvScy5+BxIzcvxzLRnqXEHof8hqSciHRyQc7Ed1sqa6dF03KlgB6cxWDfDQ2g7K+
-oE9COQ9BdaUTb/D/8PcwPIaKwVXrpk2yvrEHayggDIttUitXsiuKHCbG08pNTnMG
-z7WcsHwp0NJfq2UMDYnULFdw6hOZ2gslq/Y4qjSolhvej9Qv2rKDwbwCuFWwyS0F
-Voq+1T231T0kHT0DHiXgbys2T08V52/otVr99ncQXVcBny+Cz+yORivfQXGFnQh+
-SPsSrrzsjbnlIKGU9o1sCaXtdEwGH8AfzovUWdQApY4q6LCmdyy7yAiXVGe+6sRF
-iYxOPhZipCYSYf4OzUPEDvRRpObfOry5THt+9nzR6j2N2+FsmEy3MHS1Vh/w2z8s
-DrJTJqW8WFFwtsemM978NPkNOxDdLDaU0vb7oZJna1hdTJzAAzjEAQ7NMrFiGhud
-JLA+1sgaQTKR93R7FR2js578WA9xESvxMjYTfB6jspEnz/tKhrhXJp9ZqOKse/fR
-jfeON23hKVCxVj57jgOLq76R/CC4sip4SPa+I3lQq5uQIiGRNfsN550zbHu7+VOu
-yo89AYBawSlaRclHc5PcDTJzi0J26PcjcpPSFatodPLTcAfzoxIfksNNRRWwhN2k
-UDBVjJcOjm16H2RVCZeOKN9NuuAZ9EqRZZP9jbwGf0Qe0/4KHm2xlPhYH9voRVia
-thdy+Xua9ryYwyCE8Fkd/bVPiqmCQimwUR1kzchxC/6zXNhMgaR5TV1ZW0Xq4QJO
-jaRJEKOWLHRi7b57HdqeSzBxojhMM/m5IVF9l9A344/iGrH3ULqxfyjhDXzcdA4C
-kEHTkIiPXHAKLZ0MmsQ2dw==
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQ/9krQDvdyuKUbEPx
++PbqRwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI77MjbYUDOGIEggTI
+m0n0zXdaUBbfdVcbAbRG4tK1fsEUjUX0R1jCns9OR9JaNEhfBG/U1i5IJW8Dy3jM
+BODXxbe56rfae20ys3aRV45nYvbrTL1o/onCzkoQJ/C2X7yeXe7hx75MKTjbDRpP
+9D81AbehCq1rG3TAXN9FQEvMmINd2cHVIxfRdDd80x4cY+p+qZSKS9wY5KCpnI09
+zr8tGnykXliZQ9Dx/cZHIcBsndpKDWqckRWjEMj1F2WLJ4D4UVlRr7MPuY9pL1sU
+rT9+rWMZRD4N2FdCLcx11I/k3L1Eftcyy+nayLJtjHYiffGUFYJTVNvMnuBgcTPS
+57APRxygj3w50TTQA/2uBosxhXRUCEBUz746EnKNAx7hsE4DTobPityCYHwQU99a
+2KwjkX1iXz+qgM/6ZImJd2nwiW1oFRATxnRftO2/KT5cebOr2nyMV5inXQ2vrBPW
+UqJj/qXrP3SRcFoS3ibgPEucItwQM9b2JUWQ7PauVnkTj3pHQtSLPkfJaY62fDzE
+G7rHbJZOfdMLJF04okVoxj3532BCzzp6BRUekZd3BDNk+DRoZPZ4G1ezGUXSLFDz
+1/TtpEp7CBEJ/O5x1tHvztq1J6ksknP/eLArVdNApA3UM8hn3YqrYH7Bvz7ZM5Qs
+jxm6JvfbbL2W/t/gADf2S/DPSmY918hYgA1wmIBzG9V8W5Uyfyppb+kivNTAmgVg
+oadz87ymsj1sSPoOKAYmo/DVhYMzMF1j5K0F54XuYGxOwiBwOVVhbMVK2tGEhuRk
+/eGi+QFGSLtZNHyeslL/zi37G9pcupdfFzKA5sEY3bZC/gJHi1/MsUzZetVUYlRn
+KFrVZ8TNFx21R1uL/RbxaFx9I1saPEhM4HTiGqMALH3cLhyGikp5YI0Iy/QwMXR5
+xaPjJ5KIKoXEZXuLr3BTGejyLnNDeRfK391g1VZSneAeIRNn5EN1a5DUvPZCqbym
+3RUbtpgfM/SIFkAyd+DylIM8xl2BrNV0TQn3UgIZxdAvLOovb3/Q2R7u4hMYtakr
+9CYcojAxJlwVOmimJi4YA9dVwwvC40Sy6G6wmTGNbKKIzemevw+qksiyN67OwWgM
+tbwipQVZSDK1jwI78Ji8w/0iRwOSiRlXsh56JlVJbjBQpdotP7dhu+oyR0AENyeT
+cfvZ7gdeuafFIghmEcp7nK3e1QDZNdUQ30RnQNx1H/rgFwfym6+CNxXcdQMYChH6
+r3nv100d5NijESQdWjm+S7f1Nt7k5u5yfaE1XVosoVUrJa9Piv8b/4Q9IF+5LdF+
+e2c/XQXWM1k1ymAXXzf1yQCPpJ1kAfeXYTW4556MPGgdjo2c4qMtoE8bGI7Ncq1R
+LDaEjHLPmKkbGLak+Nv6vMDGaDPCz8a/XrUFAQaAwYrlZKp0ygPwTrepx/EVIX29
+O9Ls0AvdHFQQm+YQ/SdBTFUSceGZFqewiyK9wXLFj5pgs5Mo37UY2GLnH6e9lkbv
+7Sx9yjKMCMPRyFnNhSXL0OdXBEs6IRE3bkaqw5e2ceZMEBSBHC4QSl7Zx9gs1iqk
+O6D3iO4HGHWxtgFULqG38pxsX1uf8YTQxF3xI9lSffJdUT2KyxIuSA/O3PoH5pi3
+1hDtDubzPUkU6MRgM9SXpbZW7xqU+sbk
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/dh_params1024.der b/cpp/test/IceSSL/certs/dh_params1024.der
index 335dbd9bd47..32d85a11109 100644
Binary files a/cpp/test/IceSSL/certs/dh_params1024.der and b/cpp/test/IceSSL/certs/dh_params1024.der differ
diff --git a/cpp/test/IceSSL/certs/dh_params512.der b/cpp/test/IceSSL/certs/dh_params512.der
index c988b870722..ca790dd0674 100644
Binary files a/cpp/test/IceSSL/certs/dh_params512.der and b/cpp/test/IceSSL/certs/dh_params512.der differ
diff --git a/cpp/test/IceSSL/certs/makecerts.py b/cpp/test/IceSSL/certs/makecerts.py
index 4f5d1e76a73..3fe67f48727 100755
--- a/cpp/test/IceSSL/certs/makecerts.py
+++ b/cpp/test/IceSSL/certs/makecerts.py
@@ -80,8 +80,7 @@ def runCommands(commands):
         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)
+# Create 2 CAs. The ca2 is also used as a server. The serverAuth extension is required on macOS.
 #
 ca1 = IceCertUtils.CertificateFactory(
     home=homeca1, cn="ZeroC Test CA 1", ip="127.0.0.1", email="issuer@zeroc.com"
@@ -112,10 +111,6 @@ def runCommands(commands):
     caIssuers="http://127.0.0.1:20001/cacert4.der",
 )
 
-dsaca = IceCertUtils.OpenSSLCertificateFactory(
-    home=ca1.home, keyalg="dsa", keysize=2048
-)
-
 #
 # Export CA certificates
 #
@@ -250,8 +245,6 @@ def runCommands(commands):
     ),
     (ca2, "s_rsa_ca2", {"cn": "Server", "ip": "127.0.0.1", "dns": "server"}),
     (ca2, "c_rsa_ca2", {"cn": "Client", "ip": "127.0.0.1", "dns": "client"}),
-    (dsaca, "s_dsa_ca1", {"cn": "Server", "ip": "127.0.0.1", "dns": "server"}),  # DSA
-    (dsaca, "c_dsa_ca1", {"cn": "Client", "ip": "127.0.0.1", "dns": "client"}),  # DSA
     (cai1, "s_rsa_cai1", {"cn": "Server", "ip": "127.0.0.1", "dns": "server"}),
     (cai2, "s_rsa_cai2", {"cn": "Server", "ip": "127.0.0.1", "dns": "server"}),
     (cai2, "c_rsa_cai2", {"cn": "Client", "ip": "127.0.0.1", "dns": "client"}),
@@ -376,8 +369,6 @@ def runCommands(commands):
     (ca1, "rsa_ca1_anyExtendedKeyUsage", None, {}),
     (ca2, "s_rsa_ca2", None, {}),
     (ca2, "c_rsa_ca2", None, {}),
-    (dsaca, "s_dsa_ca1", None, {}),
-    (dsaca, "c_dsa_ca1", None, {}),
     (cai1, "s_rsa_cai1", None, {}),
     (cai2, "s_rsa_cai2", None, {}),
     (cai2, "c_rsa_cai2", None, {}),
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage.p12 b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage.p12
index eb82c25de4e..658c6fbfa7a 100644
Binary files a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage.p12 and b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage.p12 differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_priv.pem
index d25f601a9a1..3583947bd57 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDepZdFssvlixoW
-j+VYtdcE7wnx8vlECsULEdxLfbAybGi5V3HQxsDubzwEkbdQ7tX3FxEdW5Bp+dq5
-SVJruiBVE2MnZ091HWOl0EUft86tokjM7Th7tfDUOJv2zL//pNyrULbyQ4ZleXnv
-iWn1XQUuFAo5+zEq45qQzdwK73vYTOfeohcxBd5RBBNBa9TeO0YiKzh0+d5UDDRx
-wZqfczEGDe+FDFaxh6YxlOxQzMEpdF0zG+81O/22OiCY1oIvjVfg4YMr+frZgGBa
-DdbS996keqkVys+WL7X/NGiQT1HlD+MoCgzOtEsePJGObv8pGbDnFEEdnJZZfTjm
-kzuVhLVFAgMBAAECggEAMkJbFYa49EYkS3eMJCxYL2ruacmZbzynIkqT2g6zWY6T
-TVNqA+D56Fj/yWBDa2eesTppyKDExsd6El1015Caf9nyhhCSJTPPLL0I/ZH2e8eo
-e2oJWBPIG3/z5RBvPvwuPBXqVmHb0shLOEFiw9qNsssfS9tiS/Y5C/sMcwOAh2DZ
-I85Y1G3HNwXLJFGYQ0XdgJ+sTRaJ/A02KcPRoDRPd3Ei0Wv+EeazflK55ykiPwy4
-zmmzPH6M4paTi0nuMLMCK8w8shpiA6qUj6IA3KavOIeHgzPh83hiyQFZZtnxtobT
-9QAqvuM3QuQ92KU7hIuhcrAf7oi2JALFm6NROW94+QKBgQDsN2hlRU5e/izgs+yV
-r31xGRD9kUvTcZk4feKSwkb4wgI9GzRY8RjlOoBnBs2oZTzM6FqJxnRjsXDgZ3n7
-h/ieiep5JHl/IEPR8blzCv2ZzwBoxzM246ZVM5v3yzOTdRli7hAjOWxVcyyKGr/5
-wTBIvbKC1muIZmMGJA0AoITszwKBgQDxSz6ZMmCINEOFBewdkAYvdZ1hdv6GC+O8
-QX+o7p3YeTGxVLfq9gcuPdD+zUidoDUTBhVLKVLpfri9enbEsm1kvgW9QvDbABHy
-+fzSRnIEVkciL1ECcB3p9bY7QvTnO5c3CD3Rpnt0ZzQl0qpqVBiCY7RpnS7T7t1C
-U59Of3TJqwKBgQC0yC8ImoNBZkwYaPtfD+D0Zte/CK08lQtL1eRKp49DoM+vzptA
-mryP6zcMIoPRJjHjLMzl9tFq3wlhZTBRVh3rz+d4cXbe2WWuTs68giPWzDsm9ZV3
-o8DQImByw7ykVRFpyoLlQnRr7WqgA5r7XWRDt5LgWZQQ3zNYJs0gtrkktwKBgGGO
-e4uy64aGIvpob5NwRJ/xnKToWHXX3sahcLzbZOQ989Jvn0CXIkYW5iXu17orKOo9
-HmTaG1SeUJEDL3vNbB88GNPxebIBsEAdxJM7uiN4wp/Wo5kpvV53YqtJIf1PgY7V
-fTEDb4yboWDdcNs2jwZAy5Ob4m/7dme3qYQyUgSrAoGAGxmqkhAQhBjOtXhh3Dq+
-SjRJq0unaFonPcbVr98F7eD8OUwmiP03xI4zvm4FP1BvnI3BeW1HIr7vop9+yYiA
-hpH6Vr+34Kx7/apPNM6punJv89qS4diYFR1fYtyeSl5d/SO2TeR5hchvkvhkbaVy
-Vn6U22uCeZbjLfLEYweGhgY=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCeZ2Z7PMHEp7mX
+zkmalZX3y2Sr8v7UGg5eFgPv0rV2IiBJh1Fvmm/KQRJfzRWSsfzXvYg1gBhekwQ+
+RUuVi7PcViey0T38TDaJ+6GlTRMGl18EeJuCRP4n1wsW9h1y/t7IBOYpULHu5QYk
+whjjggpOvfkljFbkIEyWLzMkLZfdPVBJ8ALRZstMZ4UjSJk/uR6vnhb9+tUjdMdN
+0wOib7025LnoKWlxdQGG5C9OFrpUQCH/McTjqycp7ZI8hmz2R9P79Qn1TRLrmIme
+nSBSdLBXRqVrNzUN5HIC0sm2ATgQAhoQ2RWz+twSghRXStHRCnL3+n7yKJG9c8CK
+7A/8yeAXAgMBAAECggEANuk0QutUZnYYJbI6nK5XLu+gheT2BpPDwETUd4ntIrcA
+x0xz5AK+1veIxZID9PbjZexLb/RoPjyrn2SJJ52mq25oU5oqaTAIRfvnVLSrsEDA
+DP48NkPxcOEgdIS7v7Xvh5n/KXpSPDTDVPG+C/vz08kSObx1EJ7LvdI94cA2YVhI
+Qi9IZnjtDP8fM5svTeEpqIsDgQkqm2gq5/XHmnnnd6RsQIbetDS36y0FKhAMYo2d
+G7bWmBIsF89KjOCRUJrJc6hgEkVETu87rz62tKMdB35gHX3K37qUSeZWxu49G7cg
+gJzmByEV9+A9G8X0MkJRriBhQysO9Lk2WpPVpFhfhQKBgQDbRrGEH8NuHwCkSzdX
+2XsX+ZLIwvRF9PvJa8MJfPDPqHzMY8FnvVePIIK9S5UqWqFmHSQDFa4E/umiclr3
+GJY5DuhHLUQ6G+2v1qiJCmYxPXyTrwBePBfkzTQRc1BqyRgSmLoOafuaMo+Net5K
+sVDACXcuer1v1O5FmS007ySYBQKBgQC47tqD+GH++v8g3NF7tl3DWive3twgcOV9
+u3jLa1wHz539KILyWX7vADpljTvm7RhlfwROGLwBlfbvQKkoHMi7mtUQgNCVSfqu
+E7gl6BpgiL0TXW/qM2rSLXi3G6x9xJ8JLedBEqVLnG+1AqsC2/lpL8RskbcXS8P3
+z69QbCLeawKBgQC/cFPRN24G+Xg0+BokT5KBVvpI3rQnU4Bz1OpdoUAY/E+gnkMf
+kBYetlKOc6uSY7ffj/d93fKlF+zgT5iNfGDDBfnTEnkrhnCYgP95TaP0v2rBARuA
+KlTuBB2+Un/WCyVCLybZKLxqXlQoQCpM6cvHLTxpTu2O8kboapgmS9cWBQKBgFEg
+hz/JoMPIvE9gT42j7PIcBo7Y2Vxp6mMD8PPb/x12GOrL8NX8KNEUGooeMR8W99Le
+q7bO5vsTHKbMiOiN6AlU3Q9GUzqKn6vp/qiyb4/VrIxoOwZU1BGr3P8G5t6teM8A
+Eijb0yOeVurjZr30Xi+kwtiV++n+VNPLii8PoSRNAoGAF7nwXOgTzrD3b9FCoYGV
+zyuPsKwg9TuIOFyMd5+yYB155jgdSy61/2jOApgI07lLifBI1CglLA0RE3kXM3uq
++nRAJatWKwrvZnUGWMX8HtwBkDpjad84Wop0m6c6EFRdIwCn6uOxSaQgG2XT7ctv
+gAiDqqT5dKgxUAYqCcMifX4=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_pub.pem
index bd9fc76d4fd..697c18bf81a 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_anyExtendedKeyUsage_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth.p12 b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth.p12
index 8d6d382534a..cea711a97ed 100644
Binary files a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth.p12 and b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth.p12 differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_priv.pem
index 05ea15e65c1..5d1ba5655bb 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCWvs47jwMGVzJq
-ZOtx/3hnGtdYJX5aa27RbNoV5FEBSwFH8XvhMteW+H5/F4+tVguGNvJOL5HSx4zI
-1vtMDudk/SOG7g46x04QcCts2z9TaqL1KB4Sv669yvhpz6abfu5xbrNxkdEF8iEm
-ZXOF5AYspYZuesGZyVgnnF/b50SnhXPDFNUctR+QJSggYSjdfvKBzRIHG9EfBjJb
-xLpDv6qrx6Pi633tJqh0+LEBk2VQAxhlfS/Z7JZB6WLL3BXKvWHLPdC8gwcZrjKJ
-jrIT97GOmhQMv9H/QuvoK5Y8Yor74kTy7JqffruntNHtFH/2ji0uF2+Tv/XhIg3S
-euOcj/QDAgMBAAECggEANB8dJ7K3FQYpRGhIkE4Iz32UX8H3AkSLOJYugctDxvKs
-KrfwYVk2+dhJxJ/c6c4KhgmRlj8UaJDeuMK8ePvePijYk9rTyLcI4t4l5amZJ7qD
-RcjtPQZR4QXBBrTponIs98OS//2vDCNAGwqQ+wZwrBc/eAuxzP61IF0NN/eq4VDX
-cJqUHMSqFnbjOsKPM7xKnzhXDhydB1fzMYR/Gk4NOkvK8EgFI67sGmW07nIg+KWm
-ctgssLJfQqfpmnqQE2vmfyD20dNsjYK3vpXw1ohDKujrSexD4umPgVPukhpNqMQ2
-MRtySTR3hiNaF1JPufTTEbg2+j8ZPqh4QEXZsVoCAQKBgQDDmVbu3NzzHn6acU74
-tgenNAGwXr11ONjUuoJvYskeI/2K/toe3H+G4TZRJ1jvnmUq6+bQebJ0mbWFo+6b
-yqJFVpDLHu6z1hsLD4EeD7mxFzJYxjFMLLBPpznZmi36iQqffKZtGznf20lh/TK5
-CS2G3JexvxmAIB5X6gQdG4/TQwKBgQDFS6gQjexued02w+2youKMStLbdiqgXLLr
-AxkprYYq04QVl1jvldOOG6ts9KzL4m/62HTNRH28YAs8QN7Z9gdjAgkYvpZ3rSV2
-59hZ5a51vkMDOxVkzFH2MaGd1h5VZWZeDBrZASRzBOtpfWlm/IKHyVmvEizcLecH
-A+pk0ApwQQKBgQDCweDcj8/0x61ZzG7MmDtAkjkISx0sJgFIt7j+fYcx2rYu+xlm
-VzknrQFvhtU4Kigjt6YoeLRnA1HKEnOYbghrMAmWJmOZbxuYRMTUkOXdXfKEkDsv
-1ONtPF4OvEUBzAhmyy/PPae/rNIBnqItueS5/tWQZ25VtCVidiHIddQcjwKBgC0E
-qGKun6ZNtEZMyq4aMKtmX1qoSe2xeTnaySETcSvQe7EZibeRbmZcte70nYEgOAD6
-5xv3ZuFW4Plsq+z8EI9s5Xp58od4QLYzDNDmcbp4IX5ZOvZ3ELSmeoQzWVSPAJ6x
-EGc3tYNxOe4mKajQMVCehxJFiWrsJm0ZXaCHP/qBAoGAE7Wr/gshPyZvruiBzHBF
-MDrHb5ZqIiEMeRMxU/W9tVvFPExx9HViYOhXGh/rIV4PvCE7+tOJ/FPwsp/7cW2F
-oVB7I5iRpd7/c/0+lih2GijDXRCBnkgBlt0NDn99l+HmxWqdeLiZk4t30Va8tYBM
-2bIKTXRGhKt86uExm8iQcUo=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCxoyJHKkcWBjYv
+flSAiOZe5ZBzEqjn1w3QQJrhl5g0lB9dWlXN7RRX5F0UouCqzhYo4h5P0fnGZkek
+IX0Sh4ywldGKzdVCW8HS0zNZ1q1fzLE3kuqrlUe8HFR73gcAuN1VO00rrjg7//LG
+rrFlrxDgmVoVEz+K6KE3MkRH/pTIG0PamoVswI6Usw0R0k/qvFZj2K2/oeKqNPmU
+sSWTU6yDBSBFL2oUb1fLD1DTOE+fCAMXOUubL5Y/+RA2D6YhyXXA2ppCD7UyJCcM
+WQ/v+xcOfGV1nb23IhUEIZD2mvfid7qm1QSaIXwL/iykg0m8C8EwP6XjTnX5nbk3
+xs7Rfn/jAgMBAAECggEAEPjgOTfIi58o+t1cH4fKUv4mELM+C3YDA4cYr+iMX1cD
+rtIHFAzMfnVQO2eF2xajtrZGunj6dMKoTP3yIEdujB9UYlRg8DJ/e1rjM3iNH3PE
+PuYSS+CQdmBSkMnZlhpo81AeLcfl5uhWfuCJYd4Z2QvDN/ObL594aniqs3eXKY3g
+Xe7FJMURThyRLz6Yz1K+MzAoEScfsLw1Qzkih3GDYuturOYWJljsTt2oPI4s+NuQ
+YWy+JoNb421sYGeF4WvQ+P41isnzVQtxdhGrIiGwsBvLcfiDsm8NTTT6wIkdyc12
+Ic1ZLImAKetie9wQt6cA91ZK4/2yY/Wgib5hsW/QAQKBgQDstm0zZI3F9IzjQ7Je
+uCuRzdgtwBEMR/Jn2ERNKb+elCwmCJ2G8tSB7aMY8Jlpm9a2Un17PKoSuG+VKaqv
+dGpqjRd6e3+e45AA2jNNGtTUf1QJjiCgKI3OAXIUzv2nc6DsKp8VoVsTxrkonPPs
+x6s301UYrsdd7zwXbcNN4s5X4wKBgQDAHHVCTAeGk9WtsKSYCJGo2yKkHPsIS4Fv
+UlRTRYDqCHY4FH/95+24gWUdLfPVTaWoonRW4TSylOgpYiwmn1jQNv+KvbY6Bp51
+XdxI6XnR61SkAWIlU7QOCQnI+zvci28PYlNGey4WQR4v38V4MdYwKwcNRL+Gac2c
+2rKQN3e4AQKBgD1yDV6t129vT7Meu4qC3Cx49ojJtqMteesi5HfzQl5zsBIfYmTJ
+XAhuG0w6CFi1r0Kcnx4CXVOGtNBPhJMO8SC/hzywGiywfYz7Fx4IvP58HuBsGGP6
+ovS6w1ZLdOSmyzsCxVDkFbRIfX/hXiA0pGlVXl2N4QqtMzgRsgThvxZpAoGAMGz8
+AeI4Y2wQiN/mHYzLas0SRlwny0d9MRqHtxXmERhg9HH2cYJtIf08B8b1l+ciwwdw
+XBYYuotemk/s4S95q8KxV7/Kl4Xjm6I1TQvNcWToyQ6wNsiKsp8EoGz0AfwD2tTm
+OPYEAAgaG+dEV6/4VdwCww15WeCBu/BE4qWYwAECgYB7qxlZLO3tOVUFD2Xkzr6Y
+cw9+O/+38oGgkWjzXQnkDl39I1kATV0zqgfNfoYTQE2xSG+y5TFWZttyZUsgmqfw
+c+zDf3hDeb9LEt2z/0CXIEWjR13FFplQT8DI4znCH4F9J399lMk+P8uRRjfSBCu9
+fiJtUGskf8rc7/M0+dul3g==
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_pub.pem
index 45e70486abd..d7a9e2b062f 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_clientAuth_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning.p12 b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning.p12
index 58afec2e843..1f02a642fca 100644
Binary files a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning.p12 and b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning.p12 differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_priv.pem
index 1fdf463ec7c..77261d1689b 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDe+n7kAutLsOVd
-5bMdg7U8wEDr+MudHzgYlsHZraigArfU55kxk0Vq7Mc8gDp9Ub4Tdi+LLIjFO95g
-M2NdZBhgy76A0DAmf1uS/rDklsduCoE2TFsBOjg9NRNqta0CnC/ohrIWzk5tM015
-eS4+skjYhs9k2Ey0Ih0fQogvSgNBYOm1ECJginwfL1oVSkpv4sytITioaANYhVZ3
-HboIUJ0ZUNtLQJnTyfa4VFOpySzjEJEOk8g9WRyEA/XANruqpFU8zLGzpkz0Bjxn
-Ztv7+oEopAqbZ+5+PopbG96NtI9kxDWv76iN3f++4EMNYYYq9fiuSeGhK3cLC5/w
-XqNmsClnAgMBAAECggEAA/sis2Tk0/6RK7PWpgfFZbd5AJ7RAouyELLNKAQCg1od
-jSZvo6y17TYlpzUdHeZkCMaEhvJOCvtHdKMfMuCd0gG3oaQqY26HePttCOzhMGY/
-SzZ7sxDKZQ6kF7TB3a/73YwLYFWANwmefM7NOTTbvs//HTQM3HQPd8QMpZmS7KpD
-WDKxT5skF9W/hD+yriUpD7facQiNLoBesKm0MXVbxNwnQi0CY2qy+i/Sh+sq6Myf
-vFRDZ7d1PJOWsgaB1keoCX1G3q7SM86O2aur/3vOzZtvyjY+vdJJDb2rA8B/+fKg
-jxOohNA9kQRmVDGduVvTQnl5E1tD8UxjOrZ3E3hn4QKBgQD7vdZKR9DxmTv5GYXB
-/Uk1gGLk3w4w5CZsToflAcwh58+/k72YRjVSfAf0KaUAJTsl+FckUXNV3K438n+y
-RJTtclcpwaZX4hQPu6An1ED+/k2nKu+0FqSt9rKBnLcrnMeSFPMfiOHctCbooE4d
-LXdmexIY/azewMLVDibHO1nEvQKBgQDiwBnDbhxk8M6E6v8fYEGwSsDvcJ7cFBRV
-/x8vGsL6jOwhlA/aN8mkZEr9pR8KTX754ONB+oipPa5Kj2vEwSJuk4/h0J57RNGQ
-AOJp4cE8DbPUSd4h67wQICYyKxDymItEDQYlN/9ujheOzjHmpD1k9YRM9JljTrpX
-j2hxONuy8wKBgFePeRiPECrofIaxDOgjfDJCvKMUvm/c+0xSqEvMKz9jzMu6zIhJ
-a0SMZYvUbFK3oHIdhdnZBr/HqUVGcIoF9rL8QTsB4yTQOuAaB6Oy3QSUWVgaxBMk
-iRUFKKOSadeeiX/TD5lZWA4XDy18jI7zgINBrVLJ8TXtYBcQ/AXyK9AVAoGAAd5L
-WAzkNwC08utsxrloUSeMh2yKIo4XzM2ZWC4ERUQ7/drWdpnXE3+wDn75zn/s9+oe
-dUC3N43Gjd64qJpeykJ1AQtTAvkCMQmQ1AaELRZ/0NP6/JSQrCFXrzojnZwcKadh
-0ZSwihypnQed6aSYzOgo+ulZCjRv3KDV33j0dnkCgYBm698USnDPS6R7v0jDh8pE
-tpSBkc0j0eHgBGK1nclotzrOtV8KZfgnNqjzrJvh8N+JcxC3rqzCfNicWeyb7VQh
-aZ0Q8kQNt5UgE6bS5mBiW35MvmUHzXunwUbV6g2PvCE8WYT86kQRd9QRRlXm7i/Y
-TbHmEpnbZnRzqSfCoCdt6g==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDm3y/8YpU3A1Np
+LgSTLQ8Re7gWwhnFXlC5kz2L6SAFr7DUOsfc0yvpQENOFeKUO6EWk/21ODSi2sv+
+4d6PMZ2g4YHynYHGiuYM+Qgg7/re/mk2bcY7y3LomlMAUHAEdcmyXZD0zs+uXMM2
+HjC4MjreOymscLXyNa2zo2YvXzLbcoMco6ZzDsCT9rmheV4diwVJP/7KY4xq9g9z
+RFZrxPKSVLSK9xj64+fY63QRtrpmf8MVFNjEJuefhILCe/tU+CSfF0Cf0zD+1ETA
+3z1jQRLkrcaxAaqacOjJN8HpXFjgaNCgvg3dZw8nopOTPRI67JwCKnC0SEwdnZYP
+Iy9X8b89AgMBAAECggEAAjVybRS4Xr1eZ+wzyQCuWzl2ymjy/Ctp1EyvUw5Y6xUC
+ORWS4e73RZUCz9VvxIFJikDCNaCjCEfVmcupaG9OFcLyjlKpci/UAZ3EUSRanxWK
+BiZItju9DrKjRqZ+W9yQoG86uszbucxTZcomJyz72TJxtJ+jbfzLe6N9j8h2YRkT
+ttYH+HCqj4DQUqoyzg8ljcW5jqNZnUo/aithOGCQs2KTOPeRord6lNzjBgyfJ3EA
+bGzBK34i3dsE1WAU6tf8wJ7zgRPNzE+s9wrNLsTwumukA7WgUh2USJuiC/LnEk9L
+16cQ8FfT0hClYEQo2c++Ai1E6i1/gVWm8DHmNs7CNQKBgQD5Ap5EhlGkgEazWSAs
+05P7SlDqM4o0CdjjwbLWOUorOj084F+cyqIGKC/vUN/MM7HcvdD7SQNVxIw1l7ra
+yHddRwfPBoQm6ydyp221Frhoacx0sJzNgsqZYk2McIFw3cD602XAQ8xEyfFE0ZNT
+r8h3pW+sMMDNqrI2QbpuPLnFowKBgQDtWjohoVpNaUbBfnBGAbeA15+8qHGJHPw4
+Li6I3t32UXJE0Q518o7tZDC+wc0MYutaH0GUtCzQU98dPFh8CXrRtha98CZCyFsM
+mb4zJBAEKEEXePy8iMmrMQ3fFakWD5IiLIO/wU326fR++JBh32pxJ4m8KlpNhaL+
+sOUd6Jn1nwKBgQDsXYjgIOPkk4MJAUPiaR/h+6Qc+7lnNiWz5Aye/pihudGhNJZt
+nYb48zK1Jv6YtkVR9LgnnyHUSxKQWKucu4daem82G8hbrQGv+q/PonZ/XlYeOftN
+tKYdvMtB0RV9jnF9ZicCvxhp/4rOuWTwnj5bHCWJvGl3kF1D1VZjB6+LowKBgQCJ
+3Kh7NC8xW36/kONBpmmhqpybhfM8Qtu0/g4Fbf3avn/yvML7e0HNXS56/jJNiX9O
+P21mJCkLcEvdvVlf4lm2SV94P27Zx2orLXmuVrn+0CrOqXWTRJhumPWHqBsoNy8Y
+LmbwECVqz4U14sZqMsyuoNp9stP0xzRfXvwVnS8f3QKBgFNMX7wDHto8oAM6xHPY
+xrxRxIzi5Iex/oQJy+Ux9oGWPLLWqFBKPCbyHR+gjYqwYVhpoj0INc/k68lhf0md
+0BkOt3qodEvv+cRJo8QO1A8hRYQlvbtXCIwOtj8T8Ov0NBAGrnSdEnVsV7fZJw+e
+G7j9d86pkPMdPFRpt1+AIVka
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_pub.pem
index d4d3eb9f5b8..856af6b7ffb 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_codeSigning_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection.p12 b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection.p12
index 8efbae4b222..5108d49cdc5 100644
Binary files a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection.p12 and b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection.p12 differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_priv.pem
index 7e2a2cb8ecc..07457a2687a 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCxTi8s3gOZuCXa
-3yUpDc9al0/WKJ3WzatTBAMTlQheDGmAvDET3jY9srWpQp50BTDYQ7Y0IL5/jCYs
-Qv8Ee17NOEso4iBK+smS0cuupGwsccNCEdB4IgE+P4vCrn7WvHfciyCTJWEfzmkk
-8p5OieMa5LPMIt57lGJRBbs8nYZ+HehVwSxSQ4/d8v3ntBs0ZjJiYzN+kNcrcuy3
-/yc/VoLWnm2eOkvBWIVpHL1XcLEODboiE4zWFdKNfJvvJkaP1+Rj+gVnqPb+voKa
-ZhmpScI4Vv/T1s2l7Tm6htgUJjivMiLhy/NtSH4JzLgmPLAvYEIwiIpuZOPfJWjC
-ow+BzAq9AgMBAAECggEAFSxuC8tI3h7p6QpZiLPifZdblwqWAXnhf3IXiqDIirAB
-cA3emoMgh8ZYqqmO/JybaagkZnM77Jq9pZmBP3VwK80Q2gVZr+U6ad3DQiGBMt7f
-CiZ7IRgxJ9A0438tHH24nqNqtMfI98sRhAez31MuG3RmWEwYX4+nx1802JdDNrou
-mkyolSEXOgJHHot2AqkOcSnXY/+PZKb/eQU/UUtwItvRNCRaJhjJ60n9bGMxUdqx
-BYI9K1M6UjwJ1B2gTA1mZd/pZFjoSN9c0d1nxWzfEJboq6c77Uu2ydUdG92eGeHR
-RPosqt8VSlL3yN24y31jBXGd26m9grY8PE6ZJTrh7QKBgQDjWS36/8sIshxE6j2m
-BMh2Q9FRiLbz16AmDqZuLyTd3MeHGvyJV3Xx5G3b8lVvfTFCspMHBQvltMzvzsFu
-a7bFKx6KPa3OyHc2ZUEHvSAKl31AHZOiSejKolxT2WEw49Hx4TdzdgwNWedAfRC5
-zCqDqIwIyvxUDaBAfI49lYhxlwKBgQDHpn7L3Meb/k/HR3/WmoKw76/hqQnfLV2E
-ZrQXyOpucEMrNIXJ1cPUB+tAOFP5XL4l+xxt89RNmT/mY5kn8UOjX2xd/TDxyiaI
-QYB5UE+lHDkUUIa38OG5zuNGoFJUA67xAZnzx55Nr1TzYv32G6f5E65fuwnLhXd0
-GYvp3ITIywKBgGmRn6hN3xnKmxXlL3tH/U3tb+VMdqgEGHmTk/TWL2hWfNBf16Ru
-2HXafKkFfmam25j9EwjPbxbbPc6dU3TSz6v+uc+3lF3Q+Ippuii9yYMhlSeQlF1n
-tJFjkzvcVSU+pN6MlhMnXbFVbeykJoAgLh20xlHO8ByXtzI6pFI0fYdBAoGBAIty
-qFeeArHbRD/NmeX8D9Kj53Y3ilSerBYBYkLGq6+tq8yup8/dBiW/zjoR3d1rQMjo
-hufpid0VcENsR5pVcsfWq6tOYHRRnO5IygJx7N9HQjsFL8OkdRVCAw7ehgJ2fCeL
-1csnH1PlZfGFsBrJIF7ht0bYLjRAKbom6cnTo89XAoGARIb3ttORMN+0snls3S9K
-g21iCFnUkYPzpFDgEOld3xVb1xHLs1sjUiXiOC/0sYIoxaRlmqmQzF3Pa9/WxdTL
-UdzC3Veq4aGh4KxWYSXp7vEvhQJMfH3hBeinGIQgwU6nNKKNm8yFBt2SbQXJecaf
-5eotG1P/MCs9cpF7j+439XA=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDR/drbF4ebYpJm
+Es7O8QXR0BURYzjPOa8po2BUENstJO8AqhsxuGlTF3yOSFkMwRcTuIDwrsMe6XzL
+oAxXHwcAIWJI7N5XydWz44KQSVMimw+XXIyQrEwbQTj46VTcgkyFi2cdcEZZsBye
+xj0Z3j73+eBfw3J6bd2qcU/oNrRmRyTMinvsqcte2WL9wLfWoVNfCFqk8pr7lM+U
+kglhxPHIIB11VnnlVflJeKT28OD+++ldL2mR5VDcHM6J/IZZWk/ByeU8hRIuyksZ
+JZ+I1jI7VU2o6S6aNn9rtFpgrwSI0EKJku72Hzki+1Bq2k3E5ztJQhFusHN5H8ug
+Oka2BDUtAgMBAAECggEAPMMjVl0nIJezu/R6Qhgs8mqvBfJ7iD7tR/Od1oVwHk5/
+F+ag6tCtLV1w7azSk6W1uz+ak8pF7IZsVXFw0K7KNEf0rBxaM/XTr/NHnt+QvkU3
+DDm79MreVM6ZITFHHG1ZnhTZ2ANaX+5dQbYkDP2po9B6k8s2r2VmDEEweYWGyscK
+GSCwJ+P7NlRoFjzgwuJgo44PE/E6xzNVEZtklavqvLQnMVu88QgBl6nXcsk9O2Pt
+QmAiG2PE80WXSc5GLm3AY9W8daVJVrM0g7n/ycPbdwM4Y9xzjJJJjy+Z/sMY7J9A
+tPcodd1tQAmC9jWIxw7Ss4xapCKywfiJt+9tv+tjEwKBgQDoOgdzlOzlIIx3xu+X
+ePWF4bTOqMNKftEuisonz59D/5QaF51wAGen3QHEGoWDMcBEeJV5ud6i4mAoCHgV
+6UTWuBLP9zf1f6apVmkPx68IbJwKnVolH0YISB+XMkdRUFEBl1vkzlDodBZEyAb4
+0JssSGWNaYMjTPniLrBxguXiOwKBgQDnfRxwPBa86rWP7YH4r95PqtL7Pf+Ape+/
+uUGOrq9zTuPNdInAj4owkfCwzrHLLjt657NwGnkOqMQBw8XKgSlrwolnNU6+5wik
+q7gzcoJNiTfo7WcZgQQvwpdHFMSfR18LwTTajjctu7BWEeg8dvjX7Tm26fbE+Adh
+RDfcUqGntwKBgQDeS14Cp9Y0ZnnP1iBW8LSl2a6H/EgksUxvru9gOICOSMJuT5in
+M9wFdatRGsofEaqoYH1FLkUNyoCdEa5R2x/IIh/v7wgj+nOAuXSMZGsKN10PVByM
+WGljWBbVVo2qKqXATjDqzwvn1+fRI2B5IMbJFuwO96dOTUsN1f+USObhLQKBgBit
+A30LSrk0o8oF3VbvGFmRsg/KGhRSm+3qB4z4HgfCnxHlnFGEe4yV4fxW7Cjmcry1
+OjF3APSJFOvDPLBLeGjeQdtYmV5MLmWvUGFbkXxGZklUFStoz1NwAMQ4+ISqDP2p
+yMKLamJboX5rRkA7xmbuCLrw0bdJYTADH5lCzaydAoGBAM5Sm1v0qMwtbUDT3ab8
+lM3m6ng8MjMbSur7WRsAwB5M1vBUOfvkXAjhFXFrN/6BT5ujYm+PRcF8mRA49OPO
+OlWgHi6FFFNTZUXVJpANabMTVUmeLq2S/Q0akvYFvinnKjfzfBxWi7LZO7BPIG2o
+i4F3WvduY0Em3jDETb9UWL1g
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_pub.pem
index fdfccc387d2..35a17196086 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_emailProtection_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_none.p12 b/cpp/test/IceSSL/certs/rsa_ca1_none.p12
index ea57f034209..ae5ad9ec143 100644
Binary files a/cpp/test/IceSSL/certs/rsa_ca1_none.p12 and b/cpp/test/IceSSL/certs/rsa_ca1_none.p12 differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_none_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_none_priv.pem
index 50618719f7d..2c73852390b 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_none_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_none_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDV6Fi2WJsyfAxX
-7azfll5SsBYQuK1fL4QjfcqX3WpMAY9qI7QKHDK6UEetbCUgYJf543yD9lJSEWTn
-wk4KyQIaSKAmziAqUGUBs5UmwCsGg+4HlcpYHl6bAvaMyTEpfPKSSvcOw/T1UIuH
-wXnYbPhzIXRdXPeRbBGfweqTaMpa3YmRbuPwvoopP1ZLjzIxNk9jn1B26ln6sOfJ
-MfDfVgYRNoIo7H3pQ5MHY5Eo91cUikMDmvbjiSoYkXTnL/h0Cr0WTMEIKm6n3ioP
-dNB79e5UvgbcRU+w5HuvlP+ETw+b3V7vp2W45a/jnfvAcBv/nbu/9nN3XnUFmzgh
-jjlj2MpxAgMBAAECggEAGYIJJyh6jFsC0U7yRyDcK13cab7ODNxilGVlHfY9PWZP
-uvNaPjzl1zYoz/9GD535LYdBQ07Buw/gMatn6U0WSzpXH72DlCwtWVY4DmyKzO55
-WW31OMwZUcCZFEmPK2B/IC8glkILoV/LHcOWgzaea4NFKDeEfbLOiLekAJNV0x8h
-X4LokKXlGRHyVZjiG/Dx1r11nwkuMcdXgmJsJpm1kDTEjlrLBszqNzIYgota/Q5x
-/7AdwlDsq0PB/UU+tzRjgN4Rz3X3PkjCeMaeciQPWYS+PnIcWoY+xHJUkIuttexT
-1G++GG6SFNH1q1oCQepSskcXg77wf/PArGDBnyf2CQKBgQDpaYBWXuuOgIK8L8qM
-/kNS07nFt5D7RGVdW4WzQTIsJJphz3rldu5RO4HJ5Zrtyiz6vecCF4BAPemKc64C
-M5HAjwmNJo6FqDRt+8KUyveVayS/s0ZCuN5YbsgLNoNSbCe31/N3n1sdQZER061F
-4MOH3k1/P9sgYF69pNgYBQ5Q2QKBgQDqm6UXy0oXeZ1E2lVAov8t67u/pFfmkJti
-eU3Es+Y8+dpzQvLe6odPJkK1MF/g3EljicGE9WrSDuOsMhN6JTtTrZs06YG22QSS
-3x9TwVKdcAOXI2p98oekIAlL4j8mXq2CJoK/nbCabLAeHfTMrkjOnTFIeSB0LGuR
-DnlkBXbHWQKBgQCn5dIBTwoWWW6xO5dx0DxRSieph5/sfoiDnSARj2Ytxq6eiQaY
-JPLM0AdOWbEWN4YfX5baNFl23JIvm4Kh5sKDRuDR/dgrYJFGRAD10wJBIu8uTiDO
-Qfj+l8Gh/zZ7hX0Ui2yAscpywwU9U4yiZUmBZHFOhXp0UZ4UwI0IyipAEQKBgQC6
-23jkuK+sftp6CoO4VZp1ErqY6uZv52E7T25XawnIKyCIiRwz3AwlSE39TigvSoTR
-WNjfczC/WciQT9ofgSP9g9qIjCsaXUM9T6T96o5Igvz5FeYtpkvOtw1weSTfBK2h
-adbdk1UjycmEU0u08mNe3Ohx1re4j+Ckyih5N7jhEQKBgQDjmvyTP4NjCD+/JgeV
-bRAusYs7IO8mBzQKwY4thQ9GW3nEy5+oKjbnD0exSKExestLjxeCDAozbkPMOBNH
-5DM+oqwvWAg9XtH87lstSJTyECfdTvsudBrLOp0tz52MGyZ8UDTDTURS09uUN9Bc
-aWpq7CjHK9OS3C4s7x+qsRYpGA==
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDue3BJ5zgmvv8W
+JssRbiD4VPokz5w045sHc8IysN6dppmHfrygD8QfKbcblhKdSmJWSIOKiSXe/KL4
+S9gsk1O8VZrM9c7tO2kMZirfZ3NXuXZKB8G5ojYcK4yNCaj5/gMff5A9/ulhh5Y+
+fE6zlVNQEFmjYzgPwsoBkIHAqWjYX4JZr7AtQk18tXIKYMu/rvYo336MVmsBLT7H
+gVirWzAxkbbEPUL7989vuz+BQFmMAWoRKQMNzQimZLi3snVVoh7SRa4EYRyi3yws
+HI6fJhCDyRxxlfEAleFKjMbujzlO95lW4uoUyc5gw5Ub95QT0JmBJvRYfueAUKFi
+BHAFFAmHAgMBAAECggEAF17scamhpJZqHCsgEmy2+W8mdm4MEljNzAypltsjbdKy
+UAd5B7yTzTQC2Ea8O0LbYTZJAc4P8orSk7+nBzNG7Pl8qqJaLYB5engWsn8KXCn2
+MCoTb5Q4dklERFwSfbFJcBBJu/GbwG2PqT74XXwARqPbjPn/t/ewYTfep1lSx4Vg
+JpfRvOZueRT0LXyRWxQdQc3UJ7bVf0KSg5ENy9uUWqCio5fCUEAYbawoEEMOZkMk
+zUP7Bxef/opE59AU0zBI7SJ05xcGsoT6f6UpfQX4HDS0PvuKwUdO1UoT5CMYJ3Iw
+jnFh9/2U3utXUpQOPKB70xNgGIaNYQuFXDfXQaJlZQKBgQD+5+jc0BvlBMuJuE53
+wxe+xWTTg43O2KO0UhVJ6NfMz5O/HRVCddp1GnFPELqoRhfgRZQ99DCGerq5LQhY
+ReKnBvqxTpjEGX/by1NFMjo4PlHHkz4KeorCLwCcvjzyftupxPB3ZdMo3MYVyKUh
+ikinwIQ/XoXcWbI6cy0k0U0gxQKBgQDvgXuOmMsnaqSuNRBSSWv5ltC1Dq7ui4Gt
+czojfY+EYOV2f3W7hq0j5NIhh7xfr+r4fV1kk5OTkBSbCB+8CCZ2FVZYgWjZnvgn
+6lYWI2vej+6IzGo05S+6dSLZC6GGvx14Z1v16D12j4VuB42ljPM/wYEodFYzKpGh
+ekNGcKMN2wKBgQD0hltnl2tq4pKt5lO/pzLcGleCX6xlRISlsigh4m9BVc8RgkCm
+pI+PznHrusyUJ8k3pwdx9xGlr433nS9oHoIyYAuUkyUQ2LVCj2Wt92TKF14z6ReW
+zb7WUGhx9DxbEz59OSLEJrXNeRu8QeHGrvTLl25Fq9MVciX61An2S6GFUQKBgQCJ
+FK0pUp6EMu+Kneh3kHpyYjWWS48oDUTth5PxGD56YBM1nYI/ELgsYR07/7p7ce6k
+xuwbUrQWs1J34VB4iJmq4E+JXJgsZmZWQjN/fEqTGgJG3eiz2bFVoRGO9K9AtkYh
+0da6inATWdXewgf6hw/6n8BS7TMhGe48ZAP5XyKUHQKBgQCzxshw96jcpR4ANkK5
+QW3znvc+fjKXmXLWp0fdGjM/uZoCy13katXaE2WL+Lwj1PB1RcDpQpTLqWTw+I6Y
+EwcakKlaVVheOpg1D0YadHAxEBnaHE4y1bbnpek032+gHwVA2vQfnckb99NLjUS6
+M2Dd2ciKyzu48TGEUkwlubxPxg==
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_none_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_none_pub.pem
index 36010f5ed77..df7717e7776 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_none_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_none_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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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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
-/HM8tJ0=
+b2MuY29tggkA9/5C8jwaSRUwCwYDVR0PBAQDAgXgMCEGA1UdEgQaMBiHBH8AAAGB
+EGlzc3VlckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBAA/sjKrv/7Hw190C
+iAvo7r8DuNh638EwoFR6LIOPbNhoAWmFl5anihwFa9tBgokjcX7MtQ9aU3GztHAM
+IEyEaE6qm51GGZPmHT20fpIU86GbcGqmb5s/VqUtwH23Ei+DISDetbQ/Kn/A7CNB
+rSCGUF5Jjigcfm+lOgeg8zBtlxwfFRltiU5adP+3K5tJ22X28bhGZ91vKhmfodVP
+SoLUa6BvijAS8t0xpqXI6xzVJ1h8VFKTBVTu0oqk4iV/nUclBxZErh1qIP6FrgR3
+I7twUrtnpFiSyQDJaxhpli9kqdhygVb1isWs3bZnkvXHWwxAXSP0zYmKahW3dXI0
+ncUA8FI=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning.p12 b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning.p12
index c3026708c44..6cc9c233033 100644
Binary files a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning.p12 and b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning.p12 differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_priv.pem
index b06873ef300..a5ecd79ab7b 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC9hS+jOrVjQ6ha
-q6tsMPn2Jk+19DcsV6sH5mpayOf6glU7fx0JvmaI4DX1UOytvB9KzOYc8b2EtwEs
-AxtHjZoaphWFKu1loNgVXPfVk7YCVV3X0uDrpN7lKOXYqv9niAPChSjgstfCyYqz
-0RcbjWcWNYkYwrsNpKJyIpLwr87BdYFjPwvqaiidTulMbyrxA1AdPb75w8f/M70l
-1rTkz51fuNy1/dSgPiFz+iPvdLqlYiYyT1QOSLX9oV9sHqebvf3Jor2plt+uAYew
-uxvlhLiUQ6vNmzrfdWw+EFfTiOJlwi8KItoGFT/YiWoRiRI3Fi4rRRuzxBWzZQSj
-vQHEECWZAgMBAAECggEAAXQv2x30bcRDWpy2BjCy/jEpi+EJelDa2kbpenRPmUOe
-MURmneBEy5iCuXTLOAL5L3r2afLtzAKWYvbMIwaiT8GF6T1c0FqFRdaufQgyzX5H
-p8Pxn0Umw5XGe5zGNE5eDwQz/dNJZfBjXMFGHts9FvXGrTazNiXU7DC5NVj36lJ/
-0DPNWLoI1VyL3CIBDNi3vJaSEMbEwMe5UY148HutEEsKZlVPd0QzAoyMAt57cFPx
-0HsErnL4ZRmFIGaP18Bi/2NLqLf4pUudrG+wWEkvMKQ1sfi51mcN6f7iunPMzbM8
-RFeKfeZpkIE5LdfxwUvRnYaVF74mU72ftG26LLhufQKBgQDcsDtXEHsdoHHvur7i
-RpJCmhtUHARa+ilClBiz2ed9wKXQcGgkfyy+HWEUowwJBcddbm1P3n+/5AhOf7Jo
-QjbZoMtt8PcpRG2223xFP1wwcd4BGmSK1VJY6BYQzl8Ve+K/fpemSR1BJGLFjX2Q
-tg5yCQ7CV0956sZM3EbPd6S5DQKBgQDb2EEq1/UfaJ69ZHBp1vzJH68iAFSbNGiA
-yyIxcG7pBoQeijg5kurNgdnTIOAy7fQThz79dNThL+svxT7um/0mDnfQCD9J0TGO
-WxuPgFXc4KJYPqWpvIoG9lmjZSIIPDdKFFyRVWU8fIBsNxfNwu8VczOdjjvMFgsT
-6uK7C5HjvQKBgHsIwTxr0seUoJCvQyYxg+8frWa56++wkfotSIxUSovAMHFBib33
-LMGc7Xes4tPQ5fH/0294sy4O+laROKyJZbz0uRVFBvZ50NTmDqUoisPzZ3qj9TO1
-dCBe25ZpB3eZxrNN50vsbSPZHjvXAw7/gJQw2oqcVJG6wu0szUlzAWGtAoGBAKov
-PTtaVDINPh0k3HTCbYuQUHXExbokFuXk2kJlZCZV2f7+Rsoi9ktCQwpSf9xNIk3f
-u55fS9BK1Qh06+Ows4Y7Wvqa98s/+tnVo38x/MXwyxv+2yWLg1oiaH+5cV/opXBe
-VM5YyfbJ9mxPNckeJxB2zrUf/yBczBSOFxhuu3ANAoGAOxPaxKAQgFiOHm0rI1dq
-G9oLkAfp1NzOZ1Y6zcXSpmSJEGJJV+nTU3cLrCBgOIK+ECKfvWHsFuCzJ/AXYvFq
-qMWTrh9Uy23lxQNdmqc2EDlo68fW1OMB5O6C9UhjNaUjj2SY2qqBGlllzJ9YaXbd
-0qdvfypSnilBY5MshqkHs70=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDi3JXMzvtw06OQ
+gLNe9Wl6egYqUyEQm6rXQ8Vs/6aZUMA5oOk2pWSEEkar/+QOW3Yjia9TQS16RMLI
+edKNtDJgKWsGv1ZNeZyoGB7Kws1WeC8UOoBwq+CgDaMwq6l2jICPVYJVfqHmWRV0
+lWeHRyj+klsCAbnd7SathdxI/26c1H8HG2FGVtqwPED8RbGnoXT7AZmxvclHmBxj
+/tm1bAjIaBbiBokt4wqzT0iyGQCVKa4cvpovbuiPHAQZ0f+iSr7MPTAStOMJQMfL
+9KdaZ+3A9bq0sHk5xXIGcfvW85Q4zzgD53/HWbY7Sx+CpTfYf29y7xtB6ArFQhcs
+6n3sMhLjAgMBAAECggEABRUpo5C/mMs4xRGTQf1ig0l/+dygeGdm5lCw2m3a89bc
+i1pL31E/JqeV3Icd7E0KISuL6qj7K9v0rYug3nqnXG7zlaz2NvTrLF3d+iCqjzfa
+uKHqmda2IaTKHQvPOgFVs7kEQoYZ8KQpYflyBeNppAWNQfgZKVcZUdFRpEwemWJo
+cwGHwjJyjdwHY3cyOffZpFlqWmvJjroRa9JzvT7nzgqxJ0MHM+Q0hTEsNob3UGQ4
+/lGDMODAfVndINLo/Rh8Tr2G+TFIMguLhqOybG5zixHIiMG/x2HRnbBfJ1X4ZY5b
+7oNcYrgzMYIiqr7iUNTF9fuEoevw3ygCN/Lt6WjigQKBgQD164OZcD4BAbszIO6/
+5zLbGRhb+XhTjnIjc8/L3dDbviymxyVl/FxzMWsxhV1+0ZTPWTw8Gpi+dkuEso4P
+4cEkS4kWjjRrDTesE+edq5/BZ0arEcNUoqK60/u0i5Vk/nL9KuEuP4IaRI4IJk1l
+rfWRzL+TmEJk5S1bGrE1V5mnfwKBgQDsKRanpHcVSGTjByWrmAzDvtRwH0ZErm5D
+BBvRYcRaopTYe1uBDFhG5tOJfl1AUfxhbqIT2Ox1GnFTezcROfNBsTOj04gqlT2t
+CpZLUsl3FSks6eC1/TbR5DiZbJf0WnFt0hEULA8DoegjffohZdDIPyQ8yin9NTme
+QFIDDKamnQKBgEJSyUQ5lE9bMyyf5iQVa47RntM3Xe9TDI9pLZKy+SA6kvpL3Vc7
+D4f1vQ43BLcuOO8PBwLCvY0ohEd+jHfWD+wE/yz5H0P75ZbgK2hHoCdd/h4nBUIv
+Nqoif9D6kEkTotmKlf6OHD2PXarvAZK5rvAqg0SAHO/vKyNV+JMFVChrAoGBAKpN
+sy2v18R8UWy68bp9yu66Rf6ZPxY2aANiCiGDjJMD3a0DwGgem+Z9fR0RCHRi60rj
++nOvok2MhR77oymEDd1YyXGiEPcMas7H7Lxi9jAvDWN7QXZcJVVVbE+P1UD8nAHj
+VDek0ir/biVyKpg9EUPm7N39uCwGXwe1QK88R02tAoGAJX+y3WOZl2KH3lh+mVyp
+zgX+9X98T3JefNifyd6XjOE3t60/FnjIH040OSioh+cSrqz8sfKshoy/TOANhQgi
+lUFjM9oLeJokKKEWm92UCsc3fh0FhtNlAiTXpjX0KQ2GlsIA4OenANwko4rU2mYu
+bd8YgGs1QC83KCtZiPsBKu8=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_pub.pem
index c7385ed836b..80911687af2 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_ocspSigning_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-bmZvQHplcm9jLmNvbYIJAL/ehwUYP0SNMAsGA1UdDwQEAwIF4DAhBgNVHRIEGjAY
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth.p12 b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth.p12
index ac33d3eca42..79e198e988e 100644
Binary files a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth.p12 and b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth.p12 differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_priv.pem
index cc7b70324d6..2a68f731eb6 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDKT4DV0LsIqrQh
-GRBOHOATnnR4LFaAbNK3YMtLaNXIdQzPUOcITqFbV5erBuimJgir3b1Fx95mrnoI
-65yYlh4QBX7ZX4I9K+IqqYHiGcbkiow0Fm1sf0dBJfvSjLnMDPi6/XrmWyouz3X2
-UtIGV/hQ+0dthO0Kq/SRDDYvWDv+/mg8O/1Vm53bsKRK9AOpw+pAmn1H96YrMLGi
-luvh/IKDxZT2grNCW48/cw3OoaQQDOCxXgcrpISN3BLjUZ0/9ysT5HlRqf1s1MvB
-P6BJcXXvwdBAwJuQrq/ZRPzW6mCmOC7eA2DZFtAJtBxqsHrNN5wE471ZrQNmscyg
-/KX8FXMLAgMBAAECggEAX/HJZ12Ivej66TFyPqFKEXPVx4I7ecdiPU5dy0MKE/mS
-3CUBlDp6IpANYTIzFky2Uw+jahsKGcdIH7/hcanL0wxQJrW5VdpgdZwS+VABN7SP
-Hkq+lTRdbgOeBDHyEVfbhA6fgOyeOjnwNyP678A7huhMbR+brTJ0l29jqRtexKQ5
-gno/o4ifqlGn+MCF58sab1dNgIYwUHrdcVeC+XPXDc0cyBsI9w06SBiDEkV/SyY+
-DeON9fqoo4PLGW3Lt55VDg1o/GOo+dBCttC1aTY9JNeZ2Ha8I6Ya1lhv14JCvoII
-3FILfIOwkLAKV8vR0JfrMVdFi9I7A3kNR1BJOE25KQKBgQDq6IE39ppLl5REc/Zv
-h6m/zVAAJ2KumjacUVh3qaCrQvXn1zrC7PutJ7udNBMWDaMggvXVDfMZ6Bjz2NEh
-hL9O1VeN+NkBSPD5LAkIbcLUItK43LXxgfncMf6/SPFraTmiLlEx6CetcEDUwu4c
-dKjrKVOryGEO0Hwk2DHkj9RsaQKBgQDcebklu9jIbP67eC6tGZ9a6DzJ0gTX0RCi
-zApy+gmX7KB95TnvlU9mGnHRZya0yElcx62lADiiDNHuCxd398YaKAC7FOhqTlLG
-RcRcaim+IUFBOW21n2kOxcbSV6NvOa9c/SmpfGVkf3mfNEvTTJiG9rtTD4vS7yPz
-5X3/aU5FUwKBgQDBpSMIiDBPikf+Wf3XmOUVKOH/Dnip6JSGLgSYuGurYoqmMOXO
-1F7wMeXWRJxLPLixz2Np25MAUzVmpuBXGkA+c142ueHhzkhfj65ulVTbXU2KeN8/
-lF7t5wTSmQXy/o41JKtoUbGLpxK6kWqKaJzrJmlEHe3ssW71TIdsnCiHqQKBgFw8
-DAnOKSXH+1VANP6znmfwiiXAV8hVrQj+JUzub38APjAM6ozhQOMtIvqAlb/BnndT
-DcDec9LPXC+iskG9BUJCA/RADe8TLyvFWh1zSF1DGkKIHO6DbvcAJGowwa2xSzyy
-qHBAG0bM0XuZ7DLMc27a34kjEtK+uqK5Gln0mwsDAoGAX/2xGAtTr+1hN1kq89FZ
-hedf4pR+abXfQ0n7mSLGVeBwTXFVHzInpzlYfZrRuXTsxQA1mcaJ6G3fueZnAqz5
-Uu6XHbzLX3ztb1omZihXjp1iKHGN15qfzzLm5DMC3/CMlhwmMWfBOt2RpG6dB5GT
-IdRGuviQa3C2wC9WA5Nfj1g=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHADVDVT5qnazm
+B74ebcfl61uQFQErbBjgFxLzYflwgzIIhtlJl/zvpgRiMhheWSucoTPmPSoGDzUL
+ev0pin8n8duk0H4as1BR4Aq9uS9nkFNuGWs85CARSJ83K2a0SUJlduoh3iA/V6/h
+3JMhUlxkADVurRVf4crB3aX6pSdrZSEhqIJPddMXd92sj8zDbonAx7QYjZ0o2EL6
+RmG/GsyiApN90aP/9dgHkvvqUqalPJEEobBtD3helaIeYmTtRsj3MSDfRoLEqOJ1
+NL3G2wp7ToxWaSdH5wi+1fPuesaTKjnA6a5AO5sB6wAcDRelNj7yqLbYzZQEDYqV
+m7BEvQZHAgMBAAECggEADrraNnCx3Qxsxt4d2XzAxikErwaO/prSwIuUsIU5BHYB
+lxX8MXFZnJeKTYZtvVYWX1KjV9CBMs+fWokxAgkpXliNrIZuPyW0tUrDIMX7V0wc
+kNK62Ff+c6kPd/LzeDbP/lit/fHGK0ofT7WXAmlpQ1GsotOW+HDrJCx247Wj1FQX
+epNj7t66923VY03uiuDEDVRZLJ7waniN064//SAABh2JNqlva9/kE5WQjZvvWEqg
+JvBe858iL709ZREM/2ANLB5P4E979a0C4v0cVQ5/hu0gZmsFnwGtKQbbjDrhkEqa
+EDcpdSJIgCpw/Ckso//xtNxs4hUPD7kYJSAApcJ12QKBgQD0EEnW72MDafCWiaal
+NlEnygIICoTqkS6BtsjS90ZkjU+FMIbTrhpzDSXKE+ovmxzcdBAHfRA5QByMk/T5
+oisO5JOrZuEhm4r6OWVtKMw55tlDnJdeJosku73Q3F6VVs0pWxylO1EGDlsgbK5o
+NOocIjNVdKWkQhoFh/ptQnzyqwKBgQDQu7oLdeLm/rQJ6bA4jdZauqScHn44ZvSf
+opUqH5dXPYQSJNWMcBRJMdtS6rMkBCl/ZJTwBcmjw11smXGwuD1QabeU49JyQCCR
+oj3bS4fKpaClXaf82JHeRolo1N8KLMlwt6Otwn1BmYjz3XwXEyz2ft12KCgWWI5c
+kKgU2GVa1QKBgQDLBkW2Yzq1W0pEn8sdgfquo69e6wk4a38JbnjObd6DxL1SqVRv
+AFSGQnieCkT0Rw8SIAY5hIKbbUaSdn4BrzIsWF6y5Yj/wPkyP86sqJSC0hMH2Fpe
+eqei7f3voXGYvzU5Ys6IcLhs1kJdzaqjiuj4cEbNnpQv+MDWuw/KFdYEswKBgQCt
+cnEEOO9VN2zvl8ohFGt8dP934zbLM3IufHEq0Zl2mt12Hjl9O1z//XfcjL5TPUom
+W7QPRx/o/txQ86ivSklY2p/8Dtu+qF7n5UM1SKwLzlmRUCPZTTTY2RAxlkHIOLMj
+ANX3+1cN/cD5s5/7pKmGIqFwH6o/91JExMeGmtKOCQKBgE2hHgLkTzmfTRwQabqH
+sgAY18mGwxgLW8RWBNPGZ9YjmJDG5melgnWr4RIIX8G/uPwNDCKlBQdJGof+co26
+wP0IOA9khWzLepyCnupeF5c/OuyJX+UhQmidEzrDzhyNKaehbr8oQ9KP3tah3BgS
+hQBpxuIi0N40NtUHuQWQjVlC
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_pub.pem
index fe4e4457618..4b2111c9d81 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_serverAuth_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIEzDCCA7SgAwIBAgIIbF3Bwf1zl7UwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
 BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
 QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping.p12 b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping.p12
index 7f3d5f8b902..81d417fd615 100644
Binary files a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping.p12 and b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping.p12 differ
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_priv.pem b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_priv.pem
index 7d1ddc51d13..0f71f7fcc0d 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_priv.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDDA4M7w0nJhQva
-jaAsvKvHSL4WzRr601KiGcyVvSAvGBPrtl20QvgTRQKH5YXqr1rjx5zJqfX+86r+
-F2P2nv13INGCohJZz7faXQUKkQxupC+tEoXqgepLnZCjvZEstj7ADmQSlUvRJMLI
-UlHH0Q+R7dSunnd+DSrr+ylOSv2TPR5NsUc/dKknhWJmP6Wuibl6jFjLfqDiX+hw
-5WS3ef5uqxA3ZsahfNL6ha7/pGzjOM8+19VkyKCrypX5saMBvlilIJqJRLKekuou
-shch7J4Ucuk1SAzz6k0JE/VlRt1rRnXLnvvDQDnrm0Jmw7b2XeZbDirp6HV0SpFl
-tQDmKKMRAgMBAAECggEABvN5Ggg7+RLk+UVTEEUpWlEddXKaI5aku2JwCGZVX1hc
-XWqCrIo2jXlIPc/Qlizp8HSNAiMswYmt7qCmz4ObRUPGNAHS5aChzQbDxzykVM1F
-ZcXjQBihYVCcdzmqkw1r7yyUJJVtvmaxCrLkd1rcUzdG/XJoj/WoMgEh18iUgUr8
-cTswJkzhqtUHeU9dZQZhoxxVkkQPCa7nbap7S+bC3pD2/1z3y374StYfD536aM4n
-/17OfWmGZhIVoPJ5p7NVcoKRZb4nuqDgyzs4C5csr/acIrhZK91JlFHP55fksbnQ
-emd86v0nVMfYPxM/sNcA0Wddx/UWTebE5gVNQuvIgQKBgQDP5STnYEZrdA7idcsW
-ORHqbK7kE1y5KJraC4IPfjRSyfstKsF94vPmXY/j18VKm7q8TgFy5mUc7yaZkDaS
-ZiYqJxz1uAC5DAAS/NeR0wsXRXizp3Xy3ubHaMj5rFfvkZVvWFKLiqP6iTchYnfd
-jQ7TJpGGzwnxGm6FGMlvVWL5zwKBgQDwI1QdFBvVZ1Tulkf9cYweq+VFh7wQTUhw
-9raD3d5aZuWiIwFuZF5tSrkXrXTUYpvLUkiXgsVJ6w2pqzkGubuQCynKe2WRKGzE
-VVvqQrFG5yn6qyM1rNqYvNpNGkVA9ejkrEnh7Bv+S6/aHxdhuvx7fTvaiQVIaDUq
-deJxGk0tHwKBgEiQR7hG/21kHgnnaZKBKwKzGrxbEcNDLAGtgKEdwO+gtn5GbTEe
-dVlUEPRLDP8EqkItzA2p42MdClERaCrjYrDV5CLULdRpHuGBxVCN5FIkGoRCkEXM
-jarOpU+YWz0wiINLxcwVATVijY6miwYWxTToQmVWgLbaLfdg9nZYzGo7AoGADa2l
-e+aKU1SIdPKgdSJDnfeinpxFrRQJ3U1gRhCcOsADsoGV8kjLTCRmeJ/LuNFJGIK+
-Wcr8G+LEq3ZyUBzCP0kzfzIaLfOEhoZqLuTPnj9Kl9mprsQCy5JuSNgHO9UGCAh8
-SN8fFRQQlzcQKOPyv8H5Z9BIOcCdzqZaWKDr5ncCgYAuFh7rUzA4tkMPtxbQH82W
-rmQNQ/bee1lSYfU9BHExjjy3hGlcpzlqAucj7IXRyyA+pK802bOATUzhg6aDcGnd
-a8QFurkhpxO6OO0KXpg2ktEtUEuBiaO6/LYczmVEUA7xFVfUFwwPviIERUN16rmQ
-AaijmlfnJKqW31oQu49C2w==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCsEFFnYzCmVR+Q
+Nr5F0LUKNpq3TvQd7kHNFh00HDloRYaUoTd7SvEWKxjfdF1+ArMNrDvisR625BlN
+X8cBYaw7t3KGW0hjXn5AgkOyjSMc/iLpy6D7rivkCtxIFWSiywbhCubsNUwY95hT
+TMxj2ZRrDx+Aow25Dc5RQQMucyFw2jE7JCxrfOrkvhWsHCBeM7i/bS3Vx6WaV+pS
+L7J0ygOQU+lM3ysx078pgGoPHouExXOFtF7VmYkct909t9YV1aUs33Hf8fmXajZ0
+H1SpC4mKPVy0WCgy7tiXCrHpAL2H2TDIhWXUhxcqRFROsEtOxcR9iLpdfz0JLdxz
+pVyRpg2/AgMBAAECggEAAv1LC1H78qw6qm5QVCmmZcLBp2OqPB4p38d9lGamlt4C
+AWXMBoT9/PLijpANGN/TrXnFxJYOqY3kEwMR/IUoi4ltCVIw3jtJmbXeCw41PVUT
+7JKtlONL4evEkOjGPjKOGQqqFbS0E6wQIESOrfudUD86MvrztCzsmBj9J8xDAdb/
+397zRUAtJjwoJLT3F1B20J1+FFiL0NPXzqvFc6Yt/diXjRoLoiwrvn5Z997cxGuh
+58aeKQa/wx0mLYOWGIwxjPzjPqT6B9CUuQut2nxakRcQpl6fWat3GqIx67ELFrq9
+Zgz4Yomup+XDH47WLw6jj6lbtbVmZkGTgN3eGHGNeQKBgQDfF+6gADzNpstNhkJl
+IWfXupno8u2L3ABK76GH8uYhdz/VZKMNx2rCHfTrwhSeBs9yUoOT9ul1DDhL8tz3
+2wFIoF0UNQz4VDuzrxRb7O/NxM+wsC4nCC80uGsUFwQo1ggutsb2Wue55Oteu6m2
+XUDHwXpO68jKNYa4is/CuTgN8wKBgQDFcX1RwR3ujF2iXbojFk6uRWe0j5sXXs4G
+2tpA9QuYbflV+VSzjaZ3tuKP+MP22dOidGA++5azHJPMS0vci0tq8CdRkhKTU48b
+nZtwBXVolhzkx7nGZm5yCYosgsXP/6qtJqbk0xHHphgUsUOhVT2t381RwfPSyLP4
+AkeJgYUYBQKBgDm1niPDi/cC04ptVZWFi7AxdAjfdnV8ZpL75AQf4En96ARScR9q
+W4J1b1rhLKYoStde4uyOrZt6msGCxIhVHcLkwM8uXfmLCJqViqWw5+OJqtQg7v9n
+zZZMsl5TCd9qZll3LIajw1fCEOTDlMY43z4NHY92zM0KBZyNQ+syMH7jAoGBAK0t
+D6gHZEN5Jh9laf+gbz53bbB3TKbA5qAokMnspFD8FHeOCva5xUq3RBzXKrp28CNL
+Q6e6b8GFzTSgzlcQbgPLxBDNuDE0Vw73vAATKZmkII+hhpY3/aNULrc/tFTtgDwC
+7NtDLhMY4YI0wIbfBwxcge+12DAHDaL4DNrUmXIpAoGAHoscNpt68rEUvuy5cO+4
+EXXytC0J7EJeVoFSN/LlWffj+VF2gpvvOpqdHmYAnGeD77fRCmq9LQ6l9XV915KT
+sdPwokhUt17NanTfSdCW+poQGO4hA85eu6Q7eF7Vc/4Rd7a8WYH3zCLWk3rPknqJ
+/R0smclWUysZeKDyvZi/iWY=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_pub.pem b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_pub.pem
index 74ba332d449..23536cb28bc 100644
--- a/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_pub.pem
+++ b/cpp/test/IceSSL/certs/rsa_ca1_timeStamping_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_dsa_ca1.p12 b/cpp/test/IceSSL/certs/s_dsa_ca1.p12
deleted file mode 100644
index cd6f842512d..00000000000
Binary files a/cpp/test/IceSSL/certs/s_dsa_ca1.p12 and /dev/null differ
diff --git a/cpp/test/IceSSL/certs/s_dsa_ca1_priv.pem b/cpp/test/IceSSL/certs/s_dsa_ca1_priv.pem
deleted file mode 100644
index 3618c0b3f95..00000000000
--- a/cpp/test/IceSSL/certs/s_dsa_ca1_priv.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCp3Jykbo9ufffO
-FHpAVmYmWENM3W02zD/WDUbvBwYpVJC9ibN5G5F8RrYyQffzNyriXo4PmstUlTZG
-9SWVv/dVd+Odeq4cWyQ9b2jm3qp77AUUK4r3z+fcKIHueL+F/t098lmBPLqBbzai
-fPc9LwnTk088QSxlI26ubVLOUU+U+hC8AXWXeOdxpbogwa6/sp3kuAmd6YwIYDDy
-0QOrdMwaRegtB+OyXT928RT2PgbjD+hUnPKWtGC1+jjJfQyiHh15mRLoHv9jbIsS
-hZ4xRLMXI64sBBmRIeISzvtPMR6u6UqTnd4O4Jk8RYmUpE1Iio6sYYrdhKnx+Z5Q
-tx07Anv7AgMBAAECggEALnJ5UMs8pEGEv9DApxQZBZYv/PY1VX0fXYgu49B/YlDR
-7UoYjd64dwuc6Xw5cUOeEd06KlExFVVhzKBfISYnWzMXxemUb4OKktQCktLDOnSM
-5PmNG/s5Uu2urcdN07WfyL8as2ioNRl0jpTuREg2/ygyS+8kVRmNu9t//5OjV8Bh
-Df2jRZ852utfhC4r/j7qaAKpb+ihp7Y2YjgrG37L6uztguwJCMORMUMIUlvhnm/p
-rdN3YcWH+BPTgnsEomwXfSTCA6bVFbz0z/Oawh7Pjahv1GvfkB/LnzyrixfYs1X2
-FEa8F3ASxLkZz3RzJzyaxVOljM8RmdDxdZYBlPbfDQKBgQDdvduQOfZowqeUC8vx
-+ygianPnhQPViIaIHSc9JFsxLw2xJupMfHUyjF47QF3mj96Ck9czblnovclPjTTE
-CNeAL1drJfQNacxlLMbEVyVc2jFXtAEU9VEBkCm6UJP/gQoC8Us8dviKTum8ZBp+
-aZSUfBSLUzAb1O9i0SWcM/L0zwKBgQDEGtgv7lAYuikeshMDPQZMUqUUy+8nkebQ
-nsVn4McHtm4vjghVsZ97TvteJN6XRjUIC4oqtVfzc0E86hsN/KfR8xOpVpn9HdwU
-0+srDb+hQgLLbLk2kH8wpoasEtQ8zBRqTuutyI9WHvdalbmBVbCHdQdSxj2/+lya
-0REMTXzpFQKBgGodiKyNwIlD1jR4LMKBwiQuM4dxVXNj4ZXT9cpB0s5HyVKk3+14
-hhGJsTLDy+whn4d3vr3jKm3CHUvPtJe374FtpnUldZTRs7obYofleIDl/kUNZJMm
-Dv0jg4ShOSJGG4dq9+lYufpeZ2b7tN4YIr2oX6CJT/WRwnnUwx3sknFrAoGAeTeW
-tln6zK4VyNGOCwxnnjnfrPE6DR2UrRPXNhStMklD5sVGxaGb0R7LJjBoHt3Y3fY0
-G54olWWCx+J1grnQCmjUmHHdkaYpaf5seRpwf39MNu4ntmCvHiVxTV/+LO6BGA1c
-hPlaEIPnpeiy2A1dpv1h33qGpOpe35unjBFBytkCgYAZSRe4VABB+cizWWx7v1JK
-a5Su6hCnlNVwkwI/3kDMph4cqJteAaf4NjwP4eZ2o5DaLk1df7OJdKHnPO2xZrrD
-EXifBEDE5Z8eUEZNht36IG2HGLgqm8eM4+awsUDrUhFIJCMc6qMyIPX9PGuphcCK
-hV/0OXRqfZx/Ts3CO+U4dw==
------END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_dsa_ca1_pub.pem b/cpp/test/IceSSL/certs/s_dsa_ca1_pub.pem
deleted file mode 100644
index 225476631e6..00000000000
--- a/cpp/test/IceSSL/certs/s_dsa_ca1_pub.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIIZgilCUNqEA8wDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
-BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
-QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU1MloXDTI0MTAyMTIwMjU1MlowgYUxCzAJBgNVBAYTAlVTMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQ8wDQYDVQQDDAZTZXJ2ZXIxHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-qdycpG6Pbn33zhR6QFZmJlhDTN1tNsw/1g1G7wcGKVSQvYmzeRuRfEa2MkH38zcq
-4l6OD5rLVJU2RvUllb/3VXfjnXquHFskPW9o5t6qe+wFFCuK98/n3CiB7ni/hf7d
-PfJZgTy6gW82onz3PS8J05NPPEEsZSNurm1SzlFPlPoQvAF1l3jncaW6IMGuv7Kd
-5LgJnemMCGAw8tEDq3TMGkXoLQfjsl0/dvEU9j4G4w/oVJzylrRgtfo4yX0Moh4d
-eZkS6B7/Y2yLEoWeMUSzFyOuLAQZkSHiEs77TzEerulKk53eDuCZPEWJlKRNSIqO
-rGGK3YSp8fmeULcdOwJ7+wIDAQABo4IBJDCCASAwHQYDVR0OBBYEFOXiBxEvQJkn
-NK7Q92HfsDKP3FAcMIHDBgNVHSMEgbswgbiAFAL9G+lvTpaPDA6ZYY9FSGsrFDwx
-oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
-ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
-BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-cm9jLmNvbYIJAL/ehwUYP0SNMAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEF
-BQcDATAXBgNVHREEEDAOhwR/AAABggZzZXJ2ZXIwDQYJKoZIhvcNAQELBQADggEB
-ADgNjPL2pPYvXdb4TaDiyf8AZxCnIRclZxYrGaY0H9ZILnONHzO0WjIJt5nw5vUi
-cPSUVNVojMgWcFm38K73treYq30gfikjChd8QX4MQQ/f3dUp+DJI0ffz9znGklMl
-atS+j+HrZozpW3bFN6f5mWQJo269B0sBQOva2kphU2cPTM94B6EY4udEl/lSD9Ta
-VrsIZu+I4AF3mZtN6z2elhi1FHrh1+0aCPVlrHWX5jJCg5KUdITNKV1blWXK5xLV
-kLzQJmJyuQo1ba6lUVeGaXTEf9CteyYJCQhYmuroOF1xtcT6YeXsE/yE5nQQ66fq
-2c2DEk+QRiSNYapb5OVU0UA=
------END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1.p12
index 2fb53f7cdf5..95d7307e399 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.p12
index a3803fbe389..04f10679702 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10.p12
index 62b995a717d..77c8788e66b 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_priv.pem
index 960e13d5cb8..b0c8d4bbed0 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCQ5LurIMiunzch
-3dXyDNKTSsnJizKxGfDuS0RVwORoqAR5cgZshBIEGGXwr3inh8u9dy5StaMm2I52
-I2dm6ie7h/P1aRP6Um0uaq46lltwaUDp7Ua25MAUigcxmFwt53dmshE6ku8MI+Ix
-8wwmAZDllCqrGIireI/R/7fmfIOEZqUkuhXkfwx3jdadWlXIZLxiurJa5jgkqe6a
-vhcVDCp8n2eMHQzG95r5+5BZn0xC3cOq+4448r1km9RzSt96hmpI6n+HnUSWIewc
-+9F4ymzZavzIfNpQo6QH/s2Ayre0IsX+Nia3312Ss2crNYvvBEtHRICIhvCVKds/
-T45AlxdJAgMBAAECggEAH/WL3X2wNjAhMYOkVqz0X4+9/YoKBt1RcsZATufqmZkB
-z6XSe+oPrT6ScanKo61Ex8g7e/vbfkyC89TwUFdypx8gNO/V+79lnLjkMEEM7zkQ
-G+j90YaYRY+CcbKJFoj5IbpCKZjSSGu7z0esVM/AnZr2ZGHXd3byxh+w+RJa0f+b
-D167vBhjbQ+Sy695oT4Py4qCarvrz2jSWqnjxKzE+6i+upQcNEjbplCCzevy7qdR
-81/iHVDCtTkpWyj6+eAjxGvpcdHLTb1OhuF3tOs2ou1gWwuWLcOvJpY4hWk7TCgj
-az7Bc0I5uNXZXD9RchM0VeZqr7egbqFhbMiO4M5ofwKBgQDEp11767qfG5eKTZ7X
-c0cMELiw4tf7DUMfxlqE9EaUyXkqHut8rZ3Fyc/ovxdN+4ElDvy4XZfQKTqQ/lRy
-F+RPJqMZfjJHtGLgrhS67+gpgwd2Y0wIpJTVjIQY9w9KTd//xccwGv8pHmC6onAA
-6536nJMXVTB1WY/GfIdGAWiz2wKBgQC8npakfoZvQ47ypwSQ9YQ+ckBhIamfBy+q
-J0qwrQEGI4nwDENtQeVQarTdsJD09jQUo87sJk3ZCNbac5EC5EGK06eAbcF/JMQY
-lEda/izoXriLG35Y7B/cwqEtYGlN+dOZ92anc3M6zVs3IJVX1/AWgcDDePLKtWcG
-CFGwAmEcqwKBgH5mRQQ9xDo4dfMDaTF6exQaO1wWslQ/dgGacNw8VpGT3jlgnmQJ
-A/v5d5VWHhiVq7CyLWYjYkz98xL3JjgfezQU1YixQIguPc/ElLaDNWpZOhayRFDZ
-2IBaTR3uzvknjO7NpPYapB8901aiyfMNfwFyWmkI7JjA9FTT/e7VQQM5AoGAB/L/
-EkuqysGkIqHbVWijfCZAhFdw2Jzq61bglPWVl3aj95Psu4wNaAg3OyiX01sU8tG8
-hMNQgJcYxvgb4m1QPdORuZ3mi7827HpDT5hquBhV2rb76i95YEprlIf9qCWhP1nn
-36LD9nR1Jauf36XgHnK1dwd/4/8lKmHrX2maQiUCgYB4ICX4rt37Lt3aNbVDn1iH
-YdIDUtQogEqFAbLEo2hcq8yndpoHpkuRQHG5FHOq0JrcWqA8SDDhiOmXtsLmgMLm
-fDy7SeypzkURUyXj9AR6PvE0pB0LZby85NqF5ghmoLpBVOlx8TxKDomuKl99XBKO
-OfFkSFSpdeYcnlBMfP0hww==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCwRZz14X4Yd4m/
++cq9NsiOESNwCOnBxOrPFEVJ0bYS+KLkl3nm9YTYiPm7H51o+pMR4cODXPCc2RXk
+k9rXFPPA7lN4XWEWjVR4CIyX/8s2XE//JqhdUvRSJW+uVlbGZ9gY98MjTpyH60d3
+psJ5OKhR6EA5iYJ2mh5LqD6YmJ+w3OLrx2UKguaT4yM9Jp4xu1VOS/znb3GbACxg
+wXxcUCMJvvHgIe19ui6vC+pWaz3Bug2MWLGjPiZqd/1vroOa4Aj30s2XCVzdWDbr
+g+ogDt/8ruxCkmz6Z6giTzNF6d7/zAUPsymZA6vhnQb6aiE+mb0rmWCBWo96w0aL
+OYDAKFvfAgMBAAECggEAUsn3POKSAzLNnz1WU8URr+vrvXhqNahjciv+mPumbMWb
+WAqu5eNFaB/5TsI7/6zEe18SITX7CmfJKQiqfV8pVuF4ka0l5t4tII0/Xzpz+o2j
+wt4osGBAQP61M+f4LIpkS+G+JGyNBydhcxh++Uk7gPC4jW2AuWyMMxOLhscUJY/p
+du73kgDo2KHlLyXAi4Urjdmg5IShjwIFX+Rsbud1HCQ3WV7hRBWKjLUYEk3nv3y5
+Wu4kVciFgAC9b+HwqLfaEpU8d8VxZHc1dKN+DKIdlZOXRkWugV264uGUc2IfIqtq
+QGcB2EOyHWN9i6bgAhdvBQqi+6uqjX4jKpGgjhqBsQKBgQDVBrxi0AZoPP/dLNIO
+ktpyLAFjHdrQqvhlhaC+++jEBQPT/zYybtHZ5Fwg4QssWRK8hqZ9GWwNSfEJcgX1
+C0e0Xcv6+LM4qpQ4Ij6R1b2SGlDNeUbn1uiilGUosqgyoXuuP4JYPItZ7n7D4L5T
+XSiWuDSR+xGF4FUFitlWpVjJLwKBgQDT1Mee3KVyi616HGYUPqIEzhKJzQ+fkG0k
+AJ5E3HbsexDkyUDGSmNJtzUI4mo1yK1dPiOfDvFr7jHzPcZcPwZC9THM16H6aijr
+AW+KFTZkloLsjIPbV+6/4u8/xmFYGC5Bw7nAEFg2qTrBrMDA2BX9xdJh5O5VyhTC
+DL2SNuWMUQKBgGNTIbE850/g6TfZ9xMee8XyKK9rMyRKI0lKtfl2gUAsSm2lOELp
+kuTyadZWt5v06ByI98WqfcvwZveNd6Oan9NETKB3JzFLr5JAvUXID/y4UmaLnnjo
+pk1vvX7tVilNS9qh+AdmK19CKU7xUiySaiNkPfa2xqPSRjIwXEffDne3AoGAFLwc
+Ohmg/EBd37kN6OdklpHRULnI0LajaEXDODxYS7eUJMDqXT6Ez39mapM3EEKvbZQa
+ioQ873KmYwfl9buZkk5L7KAi0882aCKA14RSCbCN6jeq5HqL/S5qetShTK05Qei1
+su4mpFsWTETrrTS5mliVyk1NYwpf08rJd5l2CLECgYEAvJPElxUKxG/AZycfSr1t
+PtOJ8VuTkVSjofJQR5AHJlThiMd9cNxhKfkowTomkk2GAU117EwG/aZqGEQaUwbY
+xL1w6Q/PxoPvO6kpIxgv8q6uw8UqQjlmlSh4PQ8pCTC8N5OpILXAQkoEydVEXZYf
+rJLUMwC6dafEPykNDB5OxBk=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_pub.pem
index d1f5c52184c..43d7ce47a4a 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn10_pub.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBACawYllsXX6S
-o1pCGbAFPukkVFySAZl3V87i9ZxYyd94VIhrQRWaXFV07Nig2nC1KrVFOdBIUmXq
-ID+t/z+//+fwaBHBFt3/0Eyffxs0jleZ7mx+e0f7O6NqlcTCfcEFnwSSCqG1eCcT
-hgFW4EPKITpa7vpA8r/UUpiucadDG9YnRUwlFsgYLjzC1p6VC+SzR3Ep6Rp62KN2
-LJEcM+B+xJFjea2fTTOy+e8/4iz6iPeILCAe+xIbILiRD1vYrdMXLrECeJ/2pBEF
-toixEHgnujWB2ksbMTaLMpdLofY+nGqpCUhoAD0nLm9vuavHSEgRQIrhO1l/kcej
-BNVR0NxbzV0=
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAG3NO8RVjHi5
+mbmtQ7FSLpm11mmeCYePgJUT7M/7o4zsuKzn07RUZa2vgu2ddQB7qu+Ep2nq0BQd
+Q4bTmDCmna3ihj57OorUGe3lbel7CxsCLIkHgmZhyLj6uI8bgOWGxq4WN2qQmizh
+/M3sPh5/+wToul+Ke0YGq+wI7M/uCAtKWCO+CHZ8d2GXywHySf2fELoBp8cEtd7U
+UMGbHPsxBX86AZJa03soHvVGbpf9OKT4dHzFANCyTZn41dNbiKgmiYCePxPjFegs
+eMJGXMGuDZvty3ta7faj7dS9EVzLl9Bwpm1+mnrIGny2Vn3Qy5E4eOmZWkb6blsX
+cgPlyqG5YqI=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11.p12
index 4b6a0f0fafe..c8f77e37d93 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_priv.pem
index 8155e57064c..c0a80cc3144 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD027mrQKXG9Pla
-lHQ8qY06heBKMaLfzipgguXsD9B4Pk52xLkH9+m7RD9gxHQbnDIDng/rt/Z+nH22
-Mfwm89hUxuEs/Q7qFRrZ/aOBaWQxBFqtWCMJfEoq1rpysNZ56Stpgeh3YyOzE46Q
-f7ISe6nwo24ZIDBjo80nk+t1a40ggxJoMMpjejkBdplIxKAyZphLcj6UFXex7bzw
-63dl8hWF3FxzXzt9YotX10SUf2KN7lsVrZIpU6wY+/kePSD0+YO7xdUvgbZzWAf3
-IlptYUbzG4QQcIyMLTdVUoi8rkT+o4PNz3edvY/F2ONTd5+S/l7RmEfXTwzBcSwd
-hNpTpmRdAgMBAAECggEAUO9iB0O2qDVoSLMCWtzWdE41LYELq7uLUVxjIGy3xU8f
-A24SFRqylPZBlrxI/qlZ9M0lyQ4FOaODgBo0lTGLw7X7TzIUYHZ6aizHA2sxNWyR
-hnO4HRYKs+9HMMrYEfLrKRRKIVBRSAuCV6wF0csziHmU1lRH+l913AuuTCExRFm5
-TRFHwGx/NVZPhxl+YwlrEhzDfagqrogDV0928FjCYcaog4ifudiF8mb3Lfd2uG75
-pGhnjU6rMyWsyO/mOXhR7dfT2FPofn+H1t+TINQjsspdTw4LO25PwAkXi5V93zwa
-BYSHp4bHmXscuAyUr2Xh72jXv8uPKlNG5j8WItqblwKBgQD+0ar0afqfNLLyxEUm
-cscYk8PrGTgmORte0rd72nB1Zb0lmwFmr7L8/BEZJ1sLb90Wxx7Ej6APt2c1PpH8
-71N3KUoM91VvN2PzBK1Z5apn8ws7odrdmNuXovx5Ojsiqy4/3vkyZPC2i7V7CFaA
-MDgbnxOU4uS9n0gMBReyAcESlwKBgQD1/j1QIZ3PoZmcWXs+uZGcpA9IaGE9nCwG
-GKOlCruftJ3BGQHqlvSLSu3XLdbHX+U4tY9aZj0voB2gUCQRoqVLQc0k+vRaceUU
-y2sd2FBCEAXJpa4sDvKwwFYHs7GIJnHmdDFXVO7SpD8eEJrUc0huF4wTyXjf9c9F
-594oyZODKwKBgQDPp8939HF/kjOOMLHlfj2PYsOS7+9Y/sq2QGO0M7PXh7xXS/Ud
-WGs1TLkmVXMVY+i46jXBmwWmKSCbPE094U6UWfp1jI1735i87v/RtZ5jraVmyCSS
-10GEVhcHN5P/UZ6UAEH1dlrPeBTBmW7cce8XW1Ba0Xf0qzvMR84iitlrKwKBgAUG
-o8QOW8YRPC04ms8GRZZYt8M39rymgzPArx9BH+I8c3ithR+A5BAwgLmDwz6hk/Jb
-q0kii598ev56hLIji5MFDibyRanPZ+nL2i1q7QDciPG8w9k8mPLJizhvEHKCrpMR
-zqxFHPgKyQtZNYCftlwheQgydpjE0e5QtXZJ4AyvAoGBAOHs8Zz78Tl6LXAyOXQ2
-VH/DsIPRbZ2VPiUOG2fsMaRLfedMrERbOglHWpE99EH3Z9ENLBCZBhoXwCN8on3q
-bCx+McIZaFYywCbRQ2e+n4MHliEpjTG03IkvcJfNnuCKgnsQ9OIE/BvMlVjaWzdX
-AKXdxushz6C4q7EA49lvKJN3
+MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQCqZpsFocboPUqb
+44SwkBLRet0EO37JkgpXimOybLcZDoxfDpQ4v4tAmwCPTMCw1RULC3XH30sA5JHh
+4ttOSJxgPjNpQl+WX578u8Ff7SfGk2n+keGJy2udR0wAQrAV4vA6DsoqJcuKjZQO
+tDBTXm9V6TN6f0PuFchzQzjVGIT8spviJ/1iSk9HpoLgbdvfBUDxm5TcNRHW4Xtj
+UNuRx44HJ9ElQWuWutCity0sevTHmRhMRl/DyOWShrq7pO8sTxw7MlzZa0REWw/u
+LEPph0ql91wiDAn8dIMovlQ24GQ7LpMp5Rg3Okf3rOl8T0MpmzqE82VQE9pg1Hda
+kZ6ShxlRAgMBAAECgf8zAMMlzGZc3PuX7WGp93WqfbvpqGUqsCuoSCPPI/sp5NDf
+It36nlpv2/Uu7yo9w4mo5KU8TfmFKuT/V4eMxu8HX5bDyroRqE1OGGSo8bMWHMl9
+CO0Y8WokiVKWQV+zLVn6BrM8KlPiBL5sKELOsVVhwYtG/xC2Eo8M8PHx1oT3nYAi
+bMiElMAs8RqgoUA/aZHCX7QlLjeg8esJUxn/9P4wYdYeWLJVWs3VYu1LNoOdQBZC
+W9UZBuUcYv9lVrXdorkiCY3CMab9hHSKO9ClPLm0cTjB+/4f1+axRxWBaeVOLT+E
+18zgUcsUM4b/B+MCmUh5jpBx+VsBU92PugeM5IECgYEA7t2Lw+JrZXp050Rtsa9x
+yi4WOf/T55R1Dk/v72iX1KDue5riOWHxV68pbgghRGnsFlFDjvjsVnV0URdcqcug
+a/zoGDCg0boAfmewav9GZZApga+aG1PQIwe5p2mOnc7yi5j6ML7xkJMDm3nfWGBx
+2u70vML/9Eobn8Dj/TdHZUECgYEAtp/LsLYyX/cl0NVEpIoSMh5Vc9qtoYAbQHPf
+at48sc/hjKnq4WwopdfFrColtfRjQJdhufgEQc+069RwAeAnFT6sM80hnBqzSRXu
+V3CNVTNP+lpeuGw3tZ71jV6ojVADDgMKaXO1Jfvbe0mn2fG4DeeMGbf26eqtlLwI
+XgeRYBECgYEAkZXmgdWWr5sbdXl3gjz0lc3RLjiG5zbMwZRnIPwWzjnoIN4d0+um
+NVNFZRL/c7s7cb7F9nYxVeDwrBwZFkRN2oOi0luRKUK82k5IcG52caCUK77jppRG
+35LtzOPBUN25ZuwuUVeP1BZGtJRrVGoz+sR51jLj3fjtLUlbrBHtKgECgYB3qVDQ
+IzHyy4BNy9BEd+vgRxv646itj8FLhCE6ZxAh+nJxtsyelD42HKH7Y0p+ZPm70vVH
+44j2jmCfvfz+XZ9+PiibcKe7H4umMeaQCMGyuAKJqjkyYkZGjTecQA/1OB4oSjnC
+SvzBPLvdlq+TEN1mzvdvyqjRMOI3+NUKt6674QKBgCfpF3FOK12jK8TpUXmSllF+
+0X0p82uknh7U0sNk3fnP++ZePEPS5krxN7U3LtnuapLPXEPMsd6212XGmAM066rK
+GpK/xeY0VcXjPvFxnFZekbDT+e6qzfTv9BgwM4qYXAhEHZDxxMpMurc0Me8WG5dn
+rmilDMu5VQU+fNmUv01+
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_pub.pem
index 9f8c84357e2..87ec1ba8fb4 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn11_pub.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE8DCCA9igAwIBAgIJAN9yWOwaa559MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTJaFw0yNDEwMjEyMDI1NTJaMIGIMRIwEAYDVQQDDAkxMjcuMC4wLjEx
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPTbuatApcb0+VqUdDypjTqF4Eoxot/OKmCC5ewP0Hg+TnbEuQf36btEP2DE
-dBucMgOeD+u39n6cfbYx/Cbz2FTG4Sz9DuoVGtn9o4FpZDEEWq1YIwl8SirWunKw
-1nnpK2mB6HdjI7MTjpB/shJ7qfCjbhkgMGOjzSeT63VrjSCDEmgwymN6OQF2mUjE
-oDJmmEtyPpQVd7HtvPDrd2XyFYXcXHNfO31ii1fXRJR/Yo3uWxWtkilTrBj7+R49
-IPT5g7vF1S+BtnNYB/ciWm1hRvMbhBBwjIwtN1VSiLyuRP6jg83Pd529j8XY41N3
-n5L+XtGYR9dPDMFxLB2E2lOmZF0CAwEAAaOCAVMwggFPMB0GA1UdDgQWBBTXXnkH
-ZZ9Y8golGVkPgCpJ+eHYwzCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhr
-KxQ8MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
-b0B6ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwIwYDVR0RBBwwGocE
-fwAAAYcEfwAAAoIFaG9zdDGCBWhvc3QyMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
-ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQAD
-ggEBAKXO5CCXKlb9/nLaL/q42P27EdMqq0m9pnMDYPeFeUWs24/LRyMTCjwib7VI
-IFI1fYmzpu6YUNf3hcrAyqLd/9UTPOh7v246T3dyyG7grLLvpceMOlnntmUOvKRf
-q3f6/uLUZoFV7E2lKBDfTmSlx4YAOw/qFzVbEcJtXXGOOMWM7Z4nQfY6Utn973hU
-wOh7k38qt5El4E7mGztJDZweOtPAF3/lCMsYwgDVetsR3l3MCBwU3Kj4q9gBwyoU
-KsYRJkt2i8CbjSF5UDiFezXvIrgC715kzAqvsvLePkhbAV/fhRnSWNUe/SwM8S80
-UkWErlegn01vn6z8oORY3JcWnwY=
+MIIE7zCCA9egAwIBAgIIFjtws1dbUwcwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMloXDTI3MDEyNTE1MjYxMlowgYgxEjAQBgNVBAMMCTEyNy4wLjAuMTEM
+MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
+aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
+CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAqmabBaHG6D1Km+OEsJAS0XrdBDt+yZIKV4pjsmy3GQ6MXw6UOL+LQJsAj0zA
+sNUVCwt1x99LAOSR4eLbTkicYD4zaUJfll+e/LvBX+0nxpNp/pHhictrnUdMAEKw
+FeLwOg7KKiXLio2UDrQwU15vVekzen9D7hXIc0M41RiE/LKb4if9YkpPR6aC4G3b
+3wVA8ZuU3DUR1uF7Y1DbkceOByfRJUFrlrrQorctLHr0x5kYTEZfw8jlkoa6u6Tv
+LE8cOzJc2WtERFsP7ixD6YdKpfdcIgwJ/HSDKL5UNuBkOy6TKeUYNzpH96zpfE9D
+KZs6hPNlUBPaYNR3WpGekocZUQIDAQABo4IBUzCCAU8wHQYDVR0OBBYEFG/4ewSM
+fffooj8mQCPkmnRj85XgMIHDBgNVHSMEgbswgbiAFIxegempX8ORk3njKGdAR7yt
+uN2hoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
+A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
+BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
+QHplcm9jLmNvbYIJAPf+QvI8GkkVMAsGA1UdDwQEAwIF4DAjBgNVHREEHDAahwR/
+AAABhwR/AAACggVob3N0MYIFaG9zdDIwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVy
+QHplcm9jLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOC
+AQEAQO+DvsjvPvASXvKU60dGysj02EOO1hwOadh3E4y5r9NfeomQdaa6j8vFlS/D
+zmOYDeJvxT/Ra9QxZMVSaJ5rOF6yYxgiShHQbN2VjY+3ZDVLIZiXn5s70HCVw4hZ
+4m9y7UViv738tiUPJkjT/wS5GyTrhkVipJ4rZ/bYWmLld1nHuCQSPXS1L9Oh63KP
+bZ9LvYH5D4Km8Mtvm6q1fvcD2gc1J/fmCbBDMxcH0V3A2lIh+BwYOgnP96G/eesC
+6LZkSh2vPhxC/5lq5yQ1tOd/O3LnOIkyXwLmgSXgwe4sYuQxd4rSDY3hRLbkyW4h
+cX9fph5+YaokAgZsCItEuL+xCg==
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_priv.pem
index 9385ca4b7ee..8b8443c7c81 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDT6eq9sHZufyJC
-3gmnraSDi2vfZEtMIpgoAAF9FHK36xCGlp84XLpdxGDZxdhriVQSOoKNtFygh5i/
-09MmDelgqyX0p0UkiGWhZL86qYGvPNXI7Nq5w3oSyMkhnD9vwrJvt6rSJsshbxKV
-p4Sfb+5M38xc3YyYK71rdkcvamP1BcL9uGcDicGPlDtSId0Xe2OlYVwQlXv6/zuv
-xdSXLXqcKrAyCaR0oSxrYCsc9pKtFuvDJ6Q+DjtdjYjfCPzsF4LUBiSH3fAlXltB
-uPEDJ18WBhvolgAz4jlijOTiRiOLgRjn3TJCXBKXyHTZ11nOlTKZRzxM2BhU2+k1
-RLmQ/XkVAgMBAAECggEALjDFjvVAy1MA18xoFFmAC4A/UiEdXIoJ2mYt7OKhIr+l
-CYEZUYK8yKV+atl6E+6KGbMRM+wFaKRFwkJcuuW7YevMSSiQpKbqaCR6nkHGV7kN
-7E7cWjNmj2Oem6ngFe89T6acIFR+YFpClcY+3TXbnnwFopRUCfM2xY6xc39gLE7g
-pn+0oa/BOe1DCPSrghOnHq/a7dvSxvpQHrc4dofLgnkeQQNyhIKFC4xIF+jU7y2I
-tyUshOzCY25nu3e4mxYyIyx9WL9J52077Vr47AeWjKvc9J8E1uopbTHfislZejOm
-mvzhKpioGBeJvWJlu39FV4US4y//BCLvhhgxkzFZoQKBgQDsJ1EwmjzfzMh4G3gZ
-LLbLNjQi+j2Qg6gJI0s5Yeg3QxbwMoou+z5F5FBu/DfV+XEpqKz5j6zlt/qTIM6H
-8NUbhG6q5pXdil1vP+t8tt71jsMIpxAFw4vTWjJJxr6OpZtuXNwFPx+jR/8Vg0n1
-zPmab4wFDdUQdYcckfB3soHp+QKBgQDluRib8bB4SMOJnKNpucmJwEBQzT+gJfE5
-zmLJRO3FxXzA37GS+QSuLt3r1HUIAVOA0seW10njbvkI0C1NPINPHG8pZNdEUrnl
-If2DXpIqDEN1T3ddT0FoNmxVmTX3E6WaOTkM6GTMV/J8aDzetmliBxnG7mNHvXYs
-lgBEmqKu/QKBgFTc4ClGFAAcuCGpRWROlDW8ecnkAUGwfi8idsLdMzTAsDqK/utZ
-MAyvulPX4TzMkeT1j4tzHR/EGJDMpktluT9VPOu/RzXApkj3QGml0cOOlPnEB1b6
-6YF/FTk76XibfJqRViOwhm8HzVvuvSJOkZf04+1hBiMPCQm0TCTHijYJAoGAMgmO
-PbF4UcrvpJLU2VuZdYLFv5Plbvm0wHWe+N4luHVaxhwzbqMFDPeyaQLe9v5q9N10
-kfuU4ZAzeGL36yHqLBoycF7BsOUgDrPHp4y646PGMdA8XLu9sHhiQobbxVSnNp+O
-OKyKACSL8eM2lwA+lhab28PjJiYzjmSh7E+ObfUCgYEAmZDePBLt2b9RHK0rlDq7
-97p3tysBxACq02o08KWqEsMXdwfNHnTuk7Ks3TXz0nGNsmG4RL9t8dbuQrdRDVSv
-w2QMmFELDSiLGI7sn3Dp/jGjNV8AGDZtsioKExupy1Vqhrh8IoTpXM8M3S1rf7ww
-5ROsHFAXT2m7hsK2xqC+0MA=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCiGGB6xS1uev/N
+nvJHC6Oy+G+S37Xk8qyT6klWDZy6uLTWY91FoqoYMucGC/6BnmCWzlQ1Fua5B0AO
+Imu8Fg2Z/izfZm6TquWpqwWzuG2XjF7O2BbE+2s5Fwc6bQVDw4eWL2Lc2b5DlNSd
+zw/KLu8asSY2bZjuu8Wh7tThWnCqLG6roihrLyF8JENHFQPoO6zpRyk53mkNnrmH
+B3ZMlbjbOFklKlYtxoJ8DDf3cxpX/AWYOyImDhP7iD7K19wmSZTBLzV83HT1pJOD
+wgnazPjcXeaGndR99Du3MHxFSVzjFKuPlNgr3plRzingS2sU4/2hG4zLCntD5yv7
+G8soQ2WZAgMBAAECggEAESrdxQLvHd1fDEsCQ+4Cp2jSgE67OAVPq9bLb5a/e7Mm
+S/KFs+NXenqhpy1MBjRc7HvrxTeotf4Dlbulh2Uaia222O5DVdZqvn6DexZUXRGb
+1PJj7vbl00USGekD/rpNuOVJ5jQVh5jSr+gHNxWjc0NB1c/ju50dgFoIJ9npRsyE
+fBZIVEzhcJ4k3/OpncdZApCttrQaMgSD9RViNW2kWNXwONelInOKM4xzqUjrpi+O
+BYXc6oKHZ+UrnLwjX3oN4MdMbihg0EQMBeXvGh8BWqxPatG6zlHgahSkJ0ljaUvs
+oacrkr7yXH0BCGG0YYBQkNF0U9Ak2+dWKhkikvYRVQKBgQDj6qKxgGtdeYYdL2nJ
+kFKC5g8RJtXOCo+wT579PSadhJLUslQidA07hk6jkkSp5mnVE07Kb5B7i+3ZF3OE
+HZRLkOqwvD+feGH47+ottGD0pYVa6JnhNliBPbvJImFYCLjNywziEHfukhQx8zOz
+O4YrgjDKctrIHtYr28tPzS+sQwKBgQC2EXvQ9k0WiM+W/FG7AmtBeRHMyJM2gNaI
+gxP2+76PPezFlz6UbWOvql2tjwV3JvzO/+SeN9IFqmi8KAXiZMmYTqbzH9AZ9Log
+8RVOTHsCkP+jJLRC8ZLZfnhEyYVCYl5NnENQp/onw4x5LzIGJIHHTzH5NyjHK4zs
+JyjFjzR28wKBgQDef5IibLbjwx49YasJfl4+sa8l1F7HTaImwiP5HviSr/jTsd/W
+3qqIYL5miwWDQ5Av1jCGCdHn+pvQ4kcARAwglTG4JZ6K5O/oIPbhdYVtcCU2sXp/
+1Rkj2ot3eJvFYIZhSQejreYXPf5/IOho4gRCd0+AZA3XbdsxZ9ocZrhSlwKBgQCo
+pEkrpPiChvbBw7Vwoyz12E7EgITbVztf9wnnHAfGZnWKEC3HDgvoCsX6nR9S3qoM
+kroQU2QWG2In5mqM6Q5SJYg+apk3cZd2K9iwTeci2WvwkW7nExwSmTKNhJwKgVMY
+UEWJ0A3GBzt2hGCxj98l3hVL4evDkHNXym3ZkGvoQQKBgCWv/wEUXZBNBmKNbYAL
+iU5w7tm6Bg3Nd2m+5heJEWpcaKk7ZXzxQ/VM2ev6r2Z5W96/6UiaQUs1JkKsPfUG
+SYdfHYJRgYjuPDGxMu9zWiQMolE++lEJrpZEUFq39tyLcU9QQnV31QU03QDmuIX8
+tce6GpBvs6RCihssW9CrUdci
 -----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 c02a05b0ac5..ec9e45f3e94 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1_pub.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-+Q==
+DDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEApDzODP+JEwWXFF/0MY5r
+2FiDsl0gZSh8r7UYQkYl08+o/yoNqB2RJHjEiiTOqrF959kkgT/wa5O2rQEcVtPJ
+QU5XCBjmb2UIirNLm/TbexuZXRnTjFVGS+9WfJX4qxC6qJ8T8QVzbmXJmefB6iYi
+8UjMEhMIxO6s4UXgpz5FIAnaxNWsgHKoGCCCdtqlBqQxH8f4A24ee4x9BcPQtG4f
+00QaM44feIVSBtVAHKq0dgDCTPKG8ibc6knMjXum3xjUL9jTzOrqrNMa9wu/4dmy
+UDbIVEz/xv3HIBwx/HjrmfkPsX10nBbhOZYoxS2mvwAxcN6tHxH5mXsc03As7mrC
+2g==
 -----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 a2708c31e54..61e999813ae 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_cn2.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_cn2.p12 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 de55ba7ad8c..8dce498ff47 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDB5okkB2TxF/ky
-LMgN18oW5RcoXXGNJBU82jbFYh5XsFBh/MSGtVsMzlSOAnfpONZ8pv/zTPboNWI0
-NMBd+W8mN87zIBPhsJ2XzqYvzIBJvxBvLO+16bMyhLeySgXffp32amb2ydinTRG0
-kbdHmuEMGp5SpX7v2irtIDMnfDK8/e/n9r0TJ7PsU5Ju23ynaO/yPQ/O/M165K6W
-Ru+0qDHR4z5xZDjbNPR67yngTnO/bsDFZO9tp6PO2X4HD2mCeKaOM45Q/3mZGsww
-JHfDD9TT5di6waj/vtnaDNP0VyB70ci+2SbnqRwpYifIohZ8Y2POST3lIJdmqBiJ
-ZFDufLxHAgMBAAECggEAIxXGWeUWoENgvXH57vtNX3ArjQu/eLT/PMgVYgjbia1n
-FhvpKaDWLU6GYT3UGbjFor+LD6itAp5qOx0Sc86nDIjLoxV6U3ukQGxNiNednPp8
-DEnaxBVZ7fmyzYl0X5jnF0fwgpZKZBdfbUdynPvK3ehRHo5AlkDpRIfviaUA/045
-AY/loo2TNiqG0mckkZ4Ut9ks57iQip/7LYm6MgP1ChuqMRQV3qOh/tCN85HbEhum
-r0fzSep5FedTwbsMXkAa9dfhex7fACQ9/Ekcl6AtTaAE1kQBdbmQdh3JY6McRxUs
-WSPdUd/BVI6Y6iC09lMnvk1Dj0KVYJ7lEJBALmvZ6QKBgQDc3pET8IZfKXxlfwcy
-Ev7Xb6peoGKkLv4C5rMU4d/mNFPcvl2MYxNjuw+IqBs0iIAxncPJFKDhTy8MuwGb
-TaGjMMqkQVOtyqgEcneEHvu2OQGDgOTNjl5TPvbZ+2bMSEjlrUN2St29u8bC+Jo4
-24brw7or/53dFan+EAjx0AioOQKBgQDgvddyOkDstoqEZtVRPqoCnxfJaqvQheK5
-bRbCOsHW42oBq89KhSjLYiNKkCSCmhoS9gzL2q144vuWhi775Aa1AH+8iwnMR/Yb
-gFeg0xzf/l9tieR2Sa/sCxxgjIY/c4Atgfz/5k9zMF/gaMMukkwyEKWAsiOhUvC/
-Ty2cWWuIfwKBgBbVL1xHVizKRiDb8+t6STwOQCeOHwRoEzxLiyHSg+nxaOX+C/+y
-UlPSB7YR4tYYcmAutgm4hzUjkXKYdn8OlHIhXiGC21qxA5OKHc7bwRvCYuSsU3ro
-h9nFPZGlSqg9pMORmNLGxIuTuOV4+8B6+USwNDPONgyf67XnBHWzEuIJAoGBAJlE
-HmfCHoDQRErjLlsH1z2ObdRosN+2TtaR9NFk7Mi1speNKgLyKM37EYJKJvwCSAHi
-Vvu3GFK2yUjwHZ6e9Yv+2R4l2/q6oLZEon4FO03u1fmH7oxU2GqrcSDO9MbU5/ch
-DP8fe9NcjCYoi+N41gnWnGfWFMJyI8j0IHDd8p3VAoGBAIcaFPw/g1vchYf3mWcb
-0pjG8sPY8aEY49qUcrrGrazAB3MhGui2lfgYLj+gbZaz9BYCpTToUQXTMHW93GYk
-hE/gCXbGvFefBKCS1f2NbGC0yF/GJrOo44ZYxFpVElumhkzJ4t2SuCbF93hO7+5Y
-aZ9A/uqqvhHSVvXk4TTwirwH
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDiRYe/3Fd3QA56
+/UVia/dSPuL17qJ2L4fARKVoP6/ZhLIjpZaQQ8ZJI+ACwZD8JpoImJM7lSjFf505
+XZDQZCVuAU18gydPDLB8JG1LMsqPpmea+LnMS2vb+4Pr27pIHXUizln032n7320b
+ZWW5lRST19sWOB0gMLbFHUg3KHaMr/Ev4zNC7qgpWXTN8UDFS3GG3tCqOw1JsyHB
+VAbauOupNqwnDZ5sWuyBc/APvbTr2kLEbrSkvD/SsEUQ45bsfeRU7FpgLFcgZF3I
+jHgHPM60nzNz+oZdWVEdw0R6vwVuZlDlPr7beaw8RQE0axoGPCBSJ3oXcW7vgWZH
+XB1sSJmdAgMBAAECggEACMayyB+wenUEVW5fONJLC92vDrlkWT+o3QL8mbwbTWKZ
+czWquZU7YAkGw6yaJkGMCL3RkMZ4B/MAwuHCFRHGpuCLjsMFLQp8X5BHzJp0zgNh
+si/SqwhuL6CELSDUYJQt6n1E8sZl6rRE29gVYjrp9ahcvHJNj5BRd83rMrfRzffj
+/U+bN/nkPyh+XMnZQwH2PJPNdtYsEe5Lgq1TGMdjK4G8siTlMsPx+ySrwiFuXgIv
+lm19LK6PC+ay4lnMGltyWAe/21Li+oHztHrJ8zOjcgKancU1stOMheLsXMM7Lrwm
+40yfWk5bLFh/VzDoqLY0Ktx79Ru0uO96Coe0+3CtWQKBgQD/K2Qv2Epdc/jFxTrH
+s/HTihQwqhNxHEVfAD4l8+n9+1lG9uNgxf4SsdJBviF1IZn/kIrOwFJgvAtqbg16
+eeE12xFJpJYvegPb9sqYlnwEfnobW3GvW67hQfWgnLMwsVIzisIzGoJ8IAILBYcc
+NL9bfRKMTHd5HFwYgjUeKZw4uQKBgQDjAg+foOFrAbWhuFlX5/5wuN248BX+tpPk
+8tYziqrYZ/jaL07j9WPRKoiSXb5oSDgHLx2R9zTQxCuRm1+0UDbO+XszEWbXJnJp
+jgeOLx9PPH4+mv13gNbfzkvsh1l1uIVx0DNHo1on36qd7JjtHP4nOq8tonUJyxox
+vxn4dLxuBQKBgALnkYph4ebSbSCDMDoZuET6K2SqavI8qiV8sThpYF59v/Ro1wnA
+9zVrRMNu0J6utTwNfyb/VXC4c0DQ4+JjBMdCKR43e2Yq82RLmN7Hx72dWvJ4xgCD
+AKibwZoEbp29RvxDNhay1I1pJ9zMQU924j6+W7mxHSMJyZqV0Nj5DEgxAoGAdGiP
+KHVwgtYKlRaawihWYul50adUMBziNEqOqzmVqImQpBoUY3Nnr1AXXq8xv/oguRZh
+HIPfEps2GGHLrwRfRr3KfoKS8QtnKlfJ6hCiBpjnyCTki46HIZeBeZZiuqpXy+hP
+E5Jh3galUHyOYzE151oBkO45BD+hfBcaMz1xjx0CgYEA0ZHNykjDmuIt5WheUB2J
+YzI4Fvix1dcJF8CNDMM0J0Vbbgu9pZVs2TGKf1JUh5WYFKgYy6RfAO1mY0S+1Drk
+9WaQTxdqMn3Kt9/nWZ2qporL5p4p1YCIvAdNUY539s/m9XS800XPOA9jglRtZbvS
+p35JFod4GLNSmcIdj6e5B9w=
 -----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 25dc126d0a4..b21b1bdb6c4 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn2_pub.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-weaJJAdk8Rf5MizIDdfKFuUXKF1xjSQVPNo2xWIeV7BQYfzEhrVbDM5UjgJ36TjW
-fKb/80z26DViNDTAXflvJjfO8yAT4bCdl86mL8yASb8QbyzvtemzMoS3skoF336d
-9mpm9snYp00RtJG3R5rhDBqeUqV+79oq7SAzJ3wyvP3v5/a9Eyez7FOSbtt8p2jv
-8j0PzvzNeuSulkbvtKgx0eM+cWQ42zT0eu8p4E5zv27AxWTvbaejztl+Bw9pgnim
-jjOOUP95mRrMMCR3ww/U0+XYusGo/77Z2gzT9Fcge9HIvtkm56kcKWInyKIWfGNj
-zkk95SCXZqgYiWRQ7ny8RwIDAQABo4IBRjCCAUIwHQYDVR0OBBYEFD6EXTq7uRFm
-jMHfDqJzZl4I8DU0MIHDBgNVHSMEgbswgbiAFAL9G+lvTpaPDA6ZYY9FSGsrFDwx
+4kWHv9xXd0AOev1FYmv3Uj7i9e6idi+HwESlaD+v2YSyI6WWkEPGSSPgAsGQ/Caa
+CJiTO5UoxX+dOV2Q0GQlbgFNfIMnTwywfCRtSzLKj6Znmvi5zEtr2/uD69u6SB11
+Is5Z9N9p+99tG2VluZUUk9fbFjgdIDC2xR1INyh2jK/xL+MzQu6oKVl0zfFAxUtx
+ht7QqjsNSbMhwVQG2rjrqTasJw2ebFrsgXPwD72069pCxG60pLw/0rBFEOOW7H3k
+VOxaYCxXIGRdyIx4BzzOtJ8zc/qGXVlRHcNEer8FbmZQ5T6+23msPEUBNGsaBjwg
+Uid6F3Fu74FmR1wdbEiZnQIDAQABo4IBRjCCAUIwHQYDVR0OBBYEFIxJIwL8zZOr
+eh663+9UykmMBWAjMIHDBgNVHSMEgbswgbiAFIxegempX8ORk3njKGdAR7ytuN2h
 oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0lj
 ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
 BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
-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
+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
-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
-9juO
+JQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAXekWkYt02spjoFGLl
+aNaEEpy0av9B3Gri8e1McwRoPbti94JTOAWwNS6GPbPTRMHQAIObItH3p/vOEsf/
+Ra2+fNK4f3HYCakAbqzfW2nX35TsjzoNU4m9n8UrQA3kUO2pllORZAxCtg0N4B0I
+3e6wf+dcDgA+ttcrmuPGVf1squUmrvcbicxHMzGT118GUQZcboAQZrPa+jGjWgoq
+ZCghTFvbsLp6s8HZXAVFuUP1oim2rEJdT/vBrCd1XTuua03PRap3HXRpvw0w7HaR
+QoATFpVy3jius5UVWuAG+0kK7bglVz7UtpYyUbyHN70TrQtry6wgLLtOJGDumViK
++afT
 -----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 b06d3e9dad5..b71930fff16 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_cn3.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_cn3.p12 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 837bd36036d..bca3f184d71 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGuYNCCxqcZImG
-WRMiwPXCQ3pBIQQ1nOMV+yC0WaXnzGSr+NSAhuGrsEYkzoowZJmB756bXJWm9Bz/
-8u0H5E5bt2TxLWGd9mGf2sPBW5grhGCChx1gBhVdKUV5CuiQnbfvS7TS7r18FkKj
-retEw0CtdiHYpdWkM2RfNnM/7UyIa6JJLw7vA+G61pIzTwq4wodrhzxxz/V/Evo1
-pqWpyMlyJmSV5ux2mAza5mOh5jORHkBD4bkL3n/aUaL2dH3WMdKp8fKAORUTWLDQ
-51TZol+iaXi8hZb/0Wtw8LI00YHaOBP+RoW43ekQltYzCNwXgqB5mwAZkqMEDwHG
-PkK3/vCzAgMBAAECggEAFMHc5YGeanaP7OIR/x/Tq9J7iyEFPQphp/KexGfWzgMK
-AvKPU8uC9/mGIiMWyR5A8JMUaJr/oLw/6TY5LwlYa/kYiJ6aYzMQmG9z4hcMqoL9
-x7SQS27nPV9pu855Y12uEEdCoIPCdBspI8qvV/PjJhtARs5vpeKeWdmoqSVCyL7y
-JZ7ukCnwB36AUGOgcEVruM/aM81agEBvuUz9eNyPzkvecRciVZGFL914PVlJmLLS
-MGfI13VmclxQl1JpU1KVhu1KOc6uFmb0USwwI3UWNHrrBrACpOL9diHPRn+CqR7s
-lR9fV1IcAVFf7WYiKL5hIvVutrxWjQAOtpnM89m8gQKBgQDQlnFffC1FJM3/xwaF
-x9fwo2LB86FC8UOuBnywKK34NSueUlzDjwT+7C3562H+tUgigf9H1MyQi0TWfYbj
-AwGGdnSwxBZc7OK7dG8YDNylTZuDA13EcDbKPEq0fIIauPvia0YVryCYVuMiGZaK
-ZKfCXDB5chXv0Ib9MkDhWCtpgQKBgQDz5SYguFJU9HpgsHW9DxA/c5XiQ2lErZly
-c3YR7nOqe1BF/oVgNPj9FuqFUZALbG8vh/U0ypw2jwa0cJarm31NqMD+1A3uPd6f
-vIXzVBDQiuAwyaCjpoX0dxLgG95YpwAbqG6JB9WJSnNtikB3jIDIfKUCGEruzJet
-3hwZkRbsMwKBgQCY0C7dAm90AYO9yISZzBACpuB6MU/KaFDqFKySrirN9b4v7i0x
-w/yn+kWwm+aeIRdo2I46hMcdejqDXVFNzOz4Ip5Yxj+P8qglJycgmoOnwxSURgoT
-GRa60LL2SWVTyIQYm/ireDLMCJO8brygRR+2P63vu0og+Ed9Ba0MqnibgQKBgEFz
-Jecz74wyy0B1OjNQ/og4iWlds7slZv9Kss2fEtUWIHWYFsy5inPImYjLWX9nSvMT
-Zh8TnBYcDa2QZS6KHHchqSD5YP+lBMATBFNHJPgBvKX7BavE/T+cUKlpcSKTNjk1
-2uvU+V3NZ+pmZmRuhQTIRjOotzscFjwnVZ0azW73AoGAEn4eaVf2T6s9w6RzqkH8
-GvKnNyBUN92O/PsQSGo98xKYqMXTHu04lkicRRPP7Hp1IbpM533dlG5W4939DR+G
-ShJytJACVnFvOu3OqgVps1ltzvwZZQls/XV5VkHbDWPavE74nX5G8LPDIi5CGqKe
-JUarKP3rvp7akx41mnVBIns=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDEfrYIr8f5OSHO
+hnXPYKiMDWfKAzJQO/W/kQ+6ccL/OdhNyj29qW9FXI6Fh+oDfDr0l/sHPqgYkMId
+i0iS65h1wplLYE4RIAPCQDe0aPPAIPtaEz4WezYC1NeDVUQVXOXQXhK29R8OGZKQ
+49/D4nJEeVIVz1bfuBXwcTALGnhhLocZ01cbNT1JIf9tBsEm0o5OSelS3KT6GOkA
+xX8UAohGKv6FQgRo8R7kR5vwnyS6v4GDX1XN1hBXZWuiB7rTKIVPNsoR2Bg2kEb3
+vVvW7BUO66RkG9ynbhlf4D2vg6Lcbf0v3GUQl+UlBkCIMcBZPKvh7nZSlXF4aI9a
+zHMe9F6/AgMBAAECggEAEXwTp1A6Tiim+SFT3baEfk85u2saELOqhCJcsO2Ajtok
+hOozIOuxIA3tYgpxvgpRlgQ+wn/xJfEeT3yzt4ceqOk+X3ZcBqq/oDW7VI1mQI7E
+Ga7OqTd2MJL587t5nyEGE3WGMCDoY4Z5A/WTAB49UW8uPmHrIWXYZe3ceuXJwnPh
+Cg9n77KmlUgGHzfftwlbG/Qqvu1gFl3Yh3PERKEoC5eoBBe5QWXxedHAKbZycaiI
+xUf7OurZbLkAX8QXmtWdNE4YRcG205fJxPwLbjrdzRpJwrSu3AjOA5V60n74Gl1T
+IMR9/oxWI3NvfopK2dIZINVqVGVhu8PG14f49yCt2QKBgQD1NhaPmrN3WGA8f9ha
+qR7RMGsXPf0UpeBH+mRBUScoN3ZgmwlUIO3l2hjYMPfLKDWUlZrfDXBEgDsLHjBd
+cC0FTkjTtTyMBmayrA0iU1aTTvhD/CPnDQ+T0D5QdVC6TDXQIgqKQuEPe2OmIBz/
+KXXSib7qsFeKj5Bex2JIP5lp+wKBgQDNI+loy1PjHwN9Gl4MKr70piXROowc0JLB
+t05c1p8s/EvGlyIrC3Qa+tosaTh0vaXXMU74PcDAyEPr6rQkYXN1JlFWWDBpBts/
+trSy3bGwKo+d0e8j6db9tUpJtRgH81opL9fKmnSt13RSeRf8ZoFnebM7qM9YioOV
+96DBTrJnDQKBgQC39UHrrfVhXW2lNYwMR8AU06wjnZ+Vs/OUTCaWUdl8dE9cnjLb
+aHDQ9VOaLPJY+Otpcuri12QYH9MrvhQupQ9BYb+FA/xOWCcHd8fKrpbOoHnkFu6g
+Uc4T6DA3kCtl9/KPGFqr6wyI3tqdMI5QZrw7nJcb3ftuudFnKVF0PjJLrQKBgE1S
+7wUoNyuSIh+C09ZkOmw/QFv4ZJ3r5JWOQcRuxbsQMoPdrexpuc79pUU+OCCQ57UQ
+igK6TDCejDOd2V8pOHr9AYW5Yi4EfpoqhTwyomqT8GR9oFV6LCafsivMTg2ZJfAG
+b6GXzMlGQDtiF6909+wIDI49WEK4m1bo6zhSMJ71AoGBAJIB7G0MQduaUJr82BLE
+6L2d+Sg9sBCXYoIyIuaItBQzEDK6Rv+qUeIPQVhSfeQ0tj1zy4eqnFhxrk1nt3L7
+nHXPRQO1MV7qjcZpy59koQi+mMY+VzqGwGoV5VDJdnTm+4pvUul+DDYpv+oZO+Oq
+lNn0Wq6UVdKd7V/iJgwI4isx
 -----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 8acdb5b42e4..e3a61035d49 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn3_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn3_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn4.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn4.p12
index 854c429c23c..7b04dde58c9 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_cn4.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_cn4.p12 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 895899b049a..880ddf99cc9 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCv9sZTQby6cDbi
-pquIaSdpxTYEQwidEVRWgp+SlJb6XNsITGrDh7Mqd3KPH2ijO62SwhSX+VDkAXhK
-QJMePNNYN8dX4LHPB0ebIRbYGiALN7yGyXYRiHRXE6JPnQ/gNq0Yf0tXwVYRHEJc
-COxfw1ZZ1z+5i9qN/qDmCQawtpCGZBDEdFFKgybc0Tdv9Id2f16VoogbV7wUWMKC
-H4zi+99wMI7mJUUP2fPwJxmyCsQjg6Xz1R19cftN/Ojze6D0qa7vlVJmWjxGkSh8
-lUsS4BBY8TxzDGhDMoRTkE3u83j9pBrP2oEJVr5kkb/dsYdtxE+uvB4f7jyHJnt7
-TV0kpQ0zAgMBAAECggEAISuBozwnGXYBwqPsfeBkn5mfXxpLy1/y6APjlLwR4cwT
-NfNBxO4VphGyNKyVCwA67glL3IIQ74ofZM/ba73HkT+igjxHCGG069dG+SGjnLm6
-/iWH7jIszCVVWXCgB4IHCzEjwL0fPkZ3c+XyuPKXmoPq7U0hu9ad+f8FldY0VEDD
-vsMkQZeJZhjt/IQC8O9AsfdKZIobC3OyRjWAkpnogE2fNwEWtxjItWhdnrTm75cI
-plCChGJb6awDvt9qSQioqyNt4M5apCfnd0Qnl6lciYaa3Lh/yQszO3DJGU5MazTc
-4M16vo+g7dxpDtyWNM7hl5Z/+OpmShhFx28lwkf4UQKBgQD3Ek6VffoThlvV0Q70
-ifkh0mSaIH1spjO6Jw97eErgHazWUpWE2B1FKL+1c+12SZympt5esWXCWOxBYAoo
-zPIpln2qAXjTDxZXQXNlsOtMreNjuIR+nqFjyNtwBTHQEJJoUM+ZXORoMDssqU1S
-IE5JwpDMgE5yd9ctVFwRoZoHXwKBgQC2UqRS+MK0JfZP5OVWJbaRnWddwhBnRQ7o
-PQ/YOMhj8bLaVyE5r7pdqz24D8+FYEO+fuFCkhc9jpNMYXAJSHApDmh+fT6r7lxy
-V10aD9XtAs8XnP6ZFcWMUxaUrfcWRAiehvN0/z6AMqcU8I4LakiXlrWrEmqiDlhN
-H0GWvqUurQKBgBsnrPFrRigNNVy7vHwOCg64lAwIlCBz5+2Gy4HTh884E73+l6Zh
-Jl5qix+DXU8J6ii64Gfh8YA5y8Wnq5YuaFM/0hH0VXZFCzyN2gQMPOBRoFNefVl5
-T92qvsuCFqZ6m8zRTO/bMNNusaJH/VKQcGpU8xs24uhb2Y+G3ROnAknbAoGAJOZ0
-+5X9Uhic0W6yO81GNhJ1aTRtvXjsm3RAULKtXAz+9dHMl7BJN8wAodARYB0rmNJ1
-JNQMgBjrFvphgn92s9iGrZMLrCCB9WJZJX0u/tkisNTFcpZFdTEb0Nuktozucac+
-ft9p9uhJiKNnHEhWiNenzQfdLQ9aL8GztJ7BL8ECgYEAsmbwkg1TrHf2m8o+qjg9
-oHz3pdxMbRAzUAmgH0lo4bKKsHIecnyV1ruE+bEa1yE6k2tmEq+nn6ut/KiNUOCb
-9CTKHiQXNuD4Zxrtl8hGGYj9mwNTk9nuz4g7TwTtwSV0Wz98TMre5eQ2HdlXbBfH
-BYR8vixQU8DzOnCzzqsHEyQ=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDyw1I5OXzcUSfD
+7LZHZt47FZ5LSaC0tWgvxA6HGUsCpP18XRD1KhREd6lRlDXdXi1xf5FLbPgaCoOE
+ThbH6osODocRMmDVVQa9u08cz4Ij+TbhQ7dDhtBn48IZA8sZfpXtPmhVyEeQJQTz
+X/jwUREp/0ADpOF3E+Jb+N9s7cJSM0LSOg987K+Gm1Y8W8l9NIvMVDJSRafjk9UL
+yhFpww0Qv3Nn+W0Y0lzgqThenMmoz8HA2waqGTdDb6OgqIs5VOuH1T4IAYYMeTC0
+VrSvA2VBaRgctHNmVUwwi/3Oixl4bBiQyzdMJT/QsMg/6GWQ/g3iUb1BQGv68YfG
+t+mkSAFRAgMBAAECggEAK6jiIEWNBaiY0L1BOQ0wmYq1SdAHlYhsoO6POE/dtC+N
+ITExrA3x0DB/JJtVpqbZ4Ggzbs+9vR038vMCWNj/QjttojOfw65DhJrrywAs5SBc
+dN3zVzMnRw/oqAwNGlwwRZcsN4VKDYwC3Gxdvoat4hI0ZpNgM0TBuI3FTPdjs9mH
+lHuyahEzTSBUsODT6UTYUuHKDZrXlHgdBVdgLUPLRamgnfVgv/wfe24KRzaNk9U7
+mlmFeQw5t24vvFIzkFeJMLG5hV9ucKnjVkRNjVG1lPM7gciU+EE8BHJe+faKfN5C
+EIs6RkIH2rfQ519h69YzZsN4GMvFOT92UWlc/d/yIwKBgQD9Bzzo9MmSqIHf27FS
+GFZMwg3UroHEXiohnkcSpZLMVIdUiJd6a301DkWcxpafdQZGFUeO1AWh2HBb0iD9
+sCfJyozLshDffybou3dGRziPmPDjlj2RBdaxSEP9PqVhF97qGzH9GfJMn0ALEptF
+8m7Cu+RMI91lfm8I5WPCjYfRQwKBgQD1nTgkxEmdKLyPYiR1w0+cTMR43iOrPQye
+/Y82T8VsZJUIG8C3tf2gKLa8VLUUIzJ/4c6+xYAAw7azRqbrMMZSElx06xGoaDH5
+FSYcf1/SzzBmi6dKyZIBfGFAyoH78D5+AyaYJ/ZfAS+sveqFL+UXobCijdgB74iY
+8lebtT2/2wKBgQC2G7966rMpGp5ev3+f1mRGWmQZ7n73Fc68423DvecpqKy96pEb
+SsGSrfLsIwHFQjSBvE8EPRTQpzY238Ve0KnSUjWDZWU/dgRK/KGbsybCMxEsu7UT
+61/ZuGk2mx/sAYIue+Q+ha4d93/geEPI0/NjtFdbdXSi15ySioaCP9rAgQKBgGII
+ZJZYOkGeNtTMCV1vnWD3SxwrHfWFInp7HiRBZr1C0DEyUpOA8kBwv68f6D6nZcqh
+KFIApnynoU6hDpKlHyM27OxFvwCGxhtzE4kgVfDgfaMQbq9tEPfC21Zu/b6/P1Iw
+k8D7glydLpg2HVsXqMrr4IKhNuxe3Rie8dTWXFUtAoGAVgtjNktxrViesvG21keP
+so12S5CnnelaP8tCzvC8uScY22gEZpUbTZs47+mCVrXHR7xN2wGfWtdu2mGzSgnq
+04cCoJahsdzgJ+Qdp9B1rfojji7oY/euicyCAKUc8jHIY3hJt9LXlgq/Gct4kBFf
+wb8tWZKP4nMjpb5PsrstCj4=
 -----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 b7004a8c6fd..3141b28bc11 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn4_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn4_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn5.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn5.p12
index b299beaeca5..212c20fdc91 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_cn5.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_cn5.p12 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 0a594ea1944..ef298cfc108 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDB81jJ9jv1LsmV
-T11N9MIxcrBCUWsYf9cHuP8HND1ifo+eVKM87cg1j+JXQP0CtbiU4ZHziIzh38jg
-tHxoVGnerLiwsn06iqPEIa+2X1F3aVb3xTlKHxTriIQEnOo69qkqgak7zRGlHSZg
-zaAyySSyr+BP98k8xX1ALPnbGWMjmB7vnvD/yc0ghOPf6REroew8+1eZBySqQMCx
-aOfsiGI1zuKVKapC4S7QtcJ8KRWOKnXOK+fe5C8qJ22weB9r2n8I1efn70MZd7r2
-o0SzGuZecC7LBkqdHGdecKre7Smbd+iO19Z0u8MUZJt0ATot/HQyq9us5NMKIGho
-fKZ7KdqXAgMBAAECggEAFQqXiWGjY5gt2nr/vmNdZgvxP2Ch48iKxZW2ZUuvlS3x
-2tWH2CZb4CO6BIlSaabZXZ2TPf6EekTTAD3UeWUfDz9h0hmrKFy+I5sb+wcgSXou
-KzdEXdw9Ysguumljp/32oFvsxkYbMfSVo07roFbeGlymU0aomGU8j2fRu4lnjgbU
-PPAQGCxf4DDsDl1pSZOLyN7krLpQ928yq91Y8r4lXbv4iXX/TTddsqAHpUG2tEv4
-71qOpgt7lb/JLIQmFLSszC/MyE7NUPQ+vsM6tpQUXxRFu1e7a/iuFaoqCBzePvRP
-vXCJpy2XLxN8KZX/zu1RxJPB4xpTJEtSHet+KncOUQKBgQD5UB7uVQHfqmSmACMY
-+l9klLaOMntX1QHWShAPtCuRj0hUSicrnDrGbVQ05Gw39BcBSmtiMh9JRUIvOtAI
-rUdWktCI/w5YVuhpAL4Zq+So9MgtEdw2GeWM+S+O8vL2R3ep61HSeRg8owMEe7nY
-yxxjR3BooBU0p/cQh7EGum6ugwKBgQDHJxYd4P0R82WUYqMOevgqUNKX3tdZ1wpF
-iByKu5mEQDizr/NF3MdItB2QkiTZ7cz72RqJQParzwbXCmJcRsr8EjEeYjuFTg+6
-H+DwM6+wTQts0WEkJlDrTkYWuhz4EbsEUZCP1svWo7Fn1f7jC46Yqe9jiWICPaKY
-bXKLA9+nXQKBgBhtLiqhr4ZPdn8BIm8vEKuVGnHCJm2LlBt/tCUlvOMNC8QeY8oV
-C3knewmXm7a7tolM1kqPqJsQKxTfiURgXc3wonfZrXkgQrMO/JEdU1DucrJfvpia
-XvA59dvml8FjbSj7wk+Bx8shGYmV6baA5+4eMLg/fvRixIUdFk4XdAKrAoGBALQb
-CChrYdNLINGKRtaApVB3mYzZbj6EeHibeNyKfnKZNe5jMIo8+UkqAxbM5GDma5xU
-ImiAhNSqPRBbBstXBpnixeMpiZSsHRMBY4c35yp08uEtlkGAGWxEdKR3Gl3KgyyL
-q0Y6RkxN69HxOTsSJ5qvDJ0jEKzgGtzpFk7caPbNAoGAKSdHuPlwpT2z/RbPtT9c
-WgBzY55tGyHZ35G119BQ9DxMXdFLGIlS+ssc5tYt5eUXBeZdYTBISMXAexgWfR+V
-vbScVabqSbqkWRrfdqGPQZz6TzPia1qhNAs5+KtSbDCeNB+QoXaHrul98laBO3tY
-YIktHpTYDEc+ZtI0A5BoV34=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDBmUM0eaIOwIbH
+/xAerKl8CtZN2J8grI6GJ3mueIfzLCI2BGXm3yn4QDPXYWlzU296glcAeM+ACkz4
+vdVifM4DG6+YwRhnwu+UdrnccKJuoJTZdz5/nR1mVM407yD25DHf8z2FZIxPjxjh
+qMNpVud2sSnCw5bmGjyF1t6Uqytab7opJiDR3YrMRFWE/fL7EpwWcEH3tCWgJDrc
+i3X2QjrvDllPErMVVoU0r5Nb5Nip0/dDJERxaplCihEwZ9ImItDuNgny6WUE7XV8
+pEFmhbuNG+cd3AngCPPurONyG164wbnTnHkVNzM3GSySBRuO1p6qtef0CkRRzcr9
+5Q0NpblxAgMBAAECggEAB9fgBD2HRlmGosFsU3adGTFOASWTcNBWdKXsK2VAfYze
+R/NbdrdRoBHNzkSCid5DLm+FLp42Xd9M9gJ1PvVQ2iLItVB6+In9Vc9awU0I4tPi
+Ck6aVOY2UJtP88INj+/eLpudDia5yBr2hmUYoZxlNtN/nlKsbhJGPTysYNG8dgBU
+IN3nUG1fUkLQIWcsXziYpvC7TU4bZ+ixgUXcp2ZJD9E1wUCfOXuKvWjYfMyoklJ9
+6E/fsj00klWrNQ4I1fNcFT+Q1qsVFc1Hi3J0K6QMxP88cC7nY85Bj3JVMXYb8UII
+sYBQCJC/Sx6ErUDcjPXnP6LYHaCKineaubpbRcfPfwKBgQDll4+YEf4c5jUcg0cL
+BDK/LCbSQnScc9eO/fA2I0B7gCdbMk/+v08WRjNhNfTya/sO9+mvvzVk117aCcR7
+ZfB/KhhWXWnm0s5Xtve65ge3Cawecm58zuNK0GvqUmOGUE4M/i7GEHjTiC0VF2Sa
+BgEHLOpCLIQP8bH+UmXS6rpQawKBgQDX3dyEL5p+xz2rDHIJeGB32Jh+xk2/L1sk
+dBPADfZ4eBp0JrGhiLglfpfbyqw+2g7XRBr26oaKyUTjN3MIxOb3H18ENxpCIPZn
+buDegNtPlvrm/cZQ9X1sewI/zwQQRqFwnfzKS8bczvX8D3bOAuUEjk2Q7Ukn2ZJn
+fErX0K+kkwKBgD+j0UO/yQZNsW8j3G9rTH29SU2C6jvryFZ0gT8gamFRVpdqzM26
+TbvI3bkWcb04vTCa+4WhpLU9FaeuiW4DBbTaAEEAR7iZumSJ7QU7eev8nF8cLRAf
+cNVuDFu5VqkGXXwwgNqZ+kP4PTbZcyNWgrZwdsa8/CZHQqVSRbM/KUHdAoGAOWXi
+xrspp2AvA5ZRlDcP344WLk9oSNe8slqzDbQovyugTRYk0UDbRgz9MBIZ7rRokdCo
+ItOFZs3RpWEPE1vX1gnfZ+2G6+J74lDXNhKpPeZ1XIpJ+yjrarbiiDjxaap+LsWz
+e87eV8QoIBe0jV6zqpxz/384noH5rc6cz/nLWkUCgYEA3KnKEzb0QPyiWzZ0OaVn
+WDWHbkb6otU9xr++TWOPQkksRpXK85+y8IA2/4WIlhq4GJpLbQXbxF28ZNQMC176
+W9OQu1MOtqy/9kml7AiD10q9nmuI+wCKhfih13sTG1s+Obyh55duOPqWwm5o3dUz
+L7o7aLJfDXo0tSqn8UChpOk=
 -----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 2ec6f75ca6e..5b320de28c4 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn5_pub.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE4zCCA8ugAwIBAgIJAI5ESrgpzLqUMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTFaFw0yNDEwMjEyMDI1NTFaMIGIMRIwEAYDVQQDDAlsb2NhbGhvc3Qx
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMHzWMn2O/UuyZVPXU30wjFysEJRaxh/1we4/wc0PWJ+j55UozztyDWP4ldA
-/QK1uJThkfOIjOHfyOC0fGhUad6suLCyfTqKo8Qhr7ZfUXdpVvfFOUofFOuIhASc
-6jr2qSqBqTvNEaUdJmDNoDLJJLKv4E/3yTzFfUAs+dsZYyOYHu+e8P/JzSCE49/p
-ESuh7Dz7V5kHJKpAwLFo5+yIYjXO4pUpqkLhLtC1wnwpFY4qdc4r597kLyonbbB4
-H2vafwjV5+fvQxl3uvajRLMa5l5wLssGSp0cZ15wqt7tKZt36I7X1nS7wxRkm3QB
-Oi38dDKr26zk0wogaGh8pnsp2pcCAwEAAaOCAUYwggFCMB0GA1UdDgQWBBSOVYMH
-MJ98UjtqBEEtuCShGV05HzCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhr
-KxQ8MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
-b0B6ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwFgYDVR0RBA8wDYIL
-bG9jYWxob3N0WFgwIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVyQHplcm9jLmNvbTAT
-BgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAegVzsrawU1JJ
-0qBh1A4DliBR7zliSG/gL5+5R3kztVWMm31LJETni3g88yZytuDUZsPdsoKavt/2
-JDg4svSTLYN+nmK7g9JzjlP0ReYqWz9Ibxrq8tiDy92Z9ikvLi6xO0lN6MXcZmyX
-kpkPayGo3Rllx3BUM9G9wXX8tLTWg3LRl/EEZ+LJTFRpkN3teR4jy0mKFBA5NdDd
-jSa+CSwGPQO8Jyyo1T+Fj0baLtATL+92Ja6RZwzJnEMTwaVcL85oqQLM67jZiEb7
-xYRUd98+qY+qn+6S7Yn0jcVl5sF4n4m9+4UMHMlgECmsSvDTdH1xJwSZT5LNYjct
-1pETtVHB7Q==
+MIIE4jCCA8qgAwIBAgIIKNbSf7cRU1kwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMVoXDTI3MDEyNTE1MjYxMVowgYgxEjAQBgNVBAMMCWxvY2FsaG9zdDEM
+MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
+aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
+CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwZlDNHmiDsCGx/8QHqypfArWTdifIKyOhid5rniH8ywiNgRl5t8p+EAz12Fp
+c1NveoJXAHjPgApM+L3VYnzOAxuvmMEYZ8LvlHa53HCibqCU2Xc+f50dZlTONO8g
+9uQx3/M9hWSMT48Y4ajDaVbndrEpwsOW5ho8hdbelKsrWm+6KSYg0d2KzERVhP3y
++xKcFnBB97QloCQ63It19kI67w5ZTxKzFVaFNK+TW+TYqdP3QyREcWqZQooRMGfS
+JiLQ7jYJ8ullBO11fKRBZoW7jRvnHdwJ4Ajz7qzjchteuMG505x5FTczNxkskgUb
+jtaeqrXn9ApEUc3K/eUNDaW5cQIDAQABo4IBRjCCAUIwHQYDVR0OBBYEFAt7X2tH
+8lTiV3UL2otsGzMMikfDMIHDBgNVHSMEgbswgbiAFIxegempX8ORk3njKGdAR7yt
+uN2hoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
+A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
+BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
+QHplcm9jLmNvbYIJAPf+QvI8GkkVMAsGA1UdDwQEAwIF4DAWBgNVHREEDzANggts
+b2NhbGhvc3RYWDAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMG
+A1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQARZGJwe+2Vmh86
+xq0ebv5lkDLiVGSIvqIo5KdBjQwxQSsyzNAPSkzCmJFL9rdCuN7iQUysGFt4YEmg
+7V/oJarC8CptxhZdXIc0AF+MwUI4zQ1SJe0CHaDPnsjfzAHgv01+0MfAYaGBzpV4
+hoNN68aR6sxYVAxMYMIZ5b7T33F0dY5hpfhjuDRoRdR3YkAJyzJeslwL5o5g1gtn
+hgtuiHGycmcLfMTNLnBinbTWL6qmJcY2YhgBP8XCU4xMOwhKp1lYe6nTvtJWyMsl
+mmXIRx9Kc8mLGi6Ior/AJMqTsNwH322fmuKyAnJ1LH6YlGitY7/3+DQ6Sz2sLp8M
+7D/E6s8o
 -----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 4fa878a276c..0019dec3bb5 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_cn6.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_cn6.p12 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 d79a4b56f66..da7e9f5d083 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-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCs0J//x+vhHFxK
-VoVjFrWKHtkqNGG9CHK7Okv2g2AMZHclBcS3PGbVPDrnoVROv/BW66dyC9SZAenR
-0cqHnIVUu2/XTfjG55Mvk2juzXnxf2TEeC1m0HrzK5ALBc7VoJzcQ0Co+HO/76kX
-YjHqUoku2kvfgH5+5Fek3/Et1a3ozHD6rn42STUQoWJOzFR9vJ43LDM+hcO1DxxR
-LXSIkf2U1oAcwY9dvV4cKQt2GxXSuf6pgEb3Um8jEhX/vtyTKxAvW/I68a50p0h/
-7KMYNGQ/za2PiQ6j9ChSCmLjR/pMwJtaSCxVFzG6Y2RK6ERaNy2EViT4P6SdOSdJ
-mAUDFNvXAgMBAAECggEAGw1uO9j8z1ikXTdjGmpdJnnYGVe+2cZ0ng4tAwd40H0k
-+4+GG6sMa/f0PqX4xSUdx0riLk5fdvOfjyrDWhbsoPbV4K3s3PI2Y720hkwgeTyt
-4RBGXIW+oXS3JUqWS3HLlwgTcKqyr/VL59mwIlQjnnPUvxrlx7u7Y+zHMUYgZcSN
-R2K9IZwr860lkWMMYValDUOxwEosRqYR/QoGd2YPIuehGcmTDiQBasiBsIH+GXl3
-Tn8NM0SYWn2yU63pjifdUT6gvfl9QYvUpO3VvHG42Ly1CRSAEPBT+WyUV8/ShtLi
-J6YYButF77IjQR3SRzVxZ+EkmbOZyqKpZiNdWxW89QKBgQDJhpczuibvUrh7HLzS
-Khk6K9RoWCPubGa7nosP9Ym5SDprHYlBECd6UoqOn2+k2wDnppx3Q5t6B1eYeXMu
-8Rx/jeTmkoUf+f65xyesoZG/cStSrae4DcOsCWRjVw/8pEmzEWz2lDgpu+vCHRef
-Icet+wtCn90jP2ZDhd/reviYpQKBgQDbh0V0QZ6BSMBpCPa5SxdTmBLIqsEGLyro
-vYwCdswIZ2g1SNC4aV2F5MMJXehoZrSO2bVAfLGQg+lQyVOg2vGvtRNVHzu/DuMc
-HPUW4Qy4pnQydHrdJyqgtqU2v0POXR/ZmloI7KtSw181qtmU0Bq90Npqf5s5bsfd
-GDIzVJq9ywKBgQDCGkt6PBsSOdeMZMKNnpTLzbl5gyOgmnJc1bjVd0be2e3CjCFO
-NJQBoozoEDLFU1dMx9I+oTSYVYgOSTQjC4LKbM4DMy7b/LtXDrZs9PXfsc3rhW1c
-vo0wH5+8evff/BEsU2VjHqH1uJW8Uq8Uy8F7Fqji0/133LHP6ZsiQUA+LQKBgAxl
-rjlrfz0D08HavLwoDnAtFVp5sh7cSQsNsTtuZAVReaQQsaDIanymN5Fu2TIUIrwy
-dTboE8r6eBGU3QEnfCCVFDtpYSFgANlUlU6udN50n/k9dLbKgHDE/72AvZ6IycSr
-H8yDOQWafOT1+gWaXvg7NCpxfF2Y8PZ+aE9XxslTAoGBAKzMuP8+2bzhce144Fio
-WVzjRzLom80veGS1zMbVlsGqMI/pZ3UjxXx3oCFCIMb/IZQBI6EChOZuMkRbzQAo
-tanrHm8lqk1zHA2tiZxsAlAt2zuMaE/QeZIrK3IPCgLD/id3STaVtANbo6JLditG
-F7eZiLT1khnecXIDcxmSVvOF
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC7Ny4S1RLYp5cS
+2t6TR9HgoVXkXeP7Rmkhgl2J+UihM4gWcvzZUhIKMCPjuS8f1sPfzkQSJV7m6qH3
+wDvd1mYXnUPjcxZkGlNMEO/R0HNOSRS3w/4FOP5VJZISS9HPzqJsZYPlFAVMnf9h
+vpM2KT3GLz5qXgXJDTZtBPjZ3APIhROpYaNg3jaI6z9pSC6ZCncLDH5Im0EjqMYi
+hQ+gShsNZm7bCoadMMtFQgXo1R8CGbBb2DU52e/KIoCP02VrOTAP0FJ1bD4Uk8up
+7HQZD3HQGP9D8dFT2BHNjXQNbtgfCQXvRyBiB2C05ks3BZGv3Tv9jlBbUL/YF3tE
+vslOg++TAgMBAAECggEANLyFeP6WcXs7/i6zNe+sOkeYJ10fZF/gK3VKnhwfjnEy
+q4g2m40X0dDfuz0l/iUERh4XZLksM4XynBSFiKblWU+OmRqJOyeDQVEgDQ1X/bxu
+XpmSC6yTUC7mJ8s9zfjaHgi2j6gFGiEDmGgTldUmNpaGUXYs0Qasxyb4Zn4ofqoq
+b979S+Hr8AApsScVaG6yz/u0MqdIpQCCVgKzcmLx1U5RLvfls3jv0465S8zDoDA7
+k6pqXCwaQkajXAjCRbHmOmGaRxExlqCWsDej8vnKkJSeGeL2R71DHY3m3kSb0TEZ
+IsG12aphfzzg32BxnZ2DihAv6QvD0DiDwp0UDLpcqQKBgQDmjxhu1acNBKImiSh9
+EB8OhhiD39WmcsDm3e8W9PHF2AnO+OPdbEK5gC6exF3aQ2AZZtXC0HtWtvm3bDu1
+OrSTvS/AZ3VWXqJdWvtGEmrdtwZJGQj1Jwhb7we1S2vwRwDCl4uJ7jv/RoH1q7OE
+wLZxxG/DGMMAKc8ulw3Y5MHY/QKBgQDP37SeBL5Ttx7ugdg+GSK4ezYQ7KepP1wr
+qxOrhozfQ/nCaJA8SbOaCODN0iLhqlsvl+Rson7VOZYeZfj5sUyTKqabgKqV5cEZ
+iqm7/QzrtHcHyD6ZDHdBH/mLDx6Y1QKrirlf2jowqoAfSu5qbNdCmFy33sjdtATS
+l0xPeX3XzwKBgHrsHe2xsV/KcZ00EUckWjqHGfjtVN5qXhh4iOlnbKO7u/cCUZKT
+DrwR8EkrjpI4y7qfTiaQusGPynGVnfvQscf23MerIS8MQ2qcgE1qsllFJG/CjjkO
+N3G0bhqlfIXdhTU6UOYYAxrl/5H4mjyT9nGPdrrAr+6dW92OIY7a39MNAoGABgBL
+UpSIeho7Rl9xQrmvCuxjrzFl1bkCjDAwLS+BOaDYwQgLwfHOwY+oDckXQLSOVV1p
+NsmqJ7W148LF4U+BCm6cyLh6NEGhxX7/T3IKwXNATHU3eWumtbaama0iEP91SEaE
++4NtUqJZeI3NPD1QKZgEdTp1ShE8YmgDx/eV7nkCgYBC9rtDDfWJIXKkVrhha6tw
+OwoWoARnJhuxebLh5OQDjWWp3Cnco09S5TFkG7IvTK/BRqTvY6NBti+NUHQSO4s5
+pBwqNbvxZfcAXLneTFDsebelhMTmZf21PrCR87b2YKbAzGGifG/9A8spOpFZRR49
+srzN0Hq1DkTr1D/HKvtZ9Q==
 -----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 9a747bc617b..c1130b6f38c 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn6_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn6_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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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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
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCnjEcst7jYi2Vuq8jcwmoCojoB
+XoVV72bxPc03Aa1Kv5RV8fadTJvuW2qdMPFqyqpWDyGb78er0AkaLXy8GZbWuS2X
+Mu17Y0VklKc9mWyhe37ceXCkiZGe/ttnvQ+Ruzj/QbKcX3LEBZMzAXYyeflnsozy
+z0bFyhSgqPU5hFUIz2pGt2f0y2H6D6Lih6V63xsmmQhgMG2+JFplFI186npwyt2G
+Wyufp1xYkutdReiHt3pLRTtKHx6L6px7OTC5pTmIJRWXznRXDIL1hbi+UQz69DbV
+uJL6goOopz4fp+lAiEUmdVutHz2mV5Wvugjx4eXFsfw0PCqGzIvwPHGIBak/
 -----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 426afd3c10e..50f1475b0e4 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_cn7.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_cn7.p12 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 83032a09635..72ce0609486 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-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDN5LwvTQs8yqCu
-BsnZH+US6j6ojfR31KWGarqEJ4lfSI5kPP631xeif+uKst2RYmkfoNKmD53gn7JF
-Jii3b+7Ewooq94iLlERjvDGLi08jF9gBBp4h4RVEB+EYbhP7RMx3SJA3eoQDd+v4
-WCI1oD3NDlPr5TcgFIuLJtI9H+wuEnU3l9M1y/iDsYdkIaJb5em5RJP84HAl9iVU
-lybAzyYp2bcUFxcFASQVelpfPzjwMS9NwnhxA6QLXAyXeSsCNKqzB7e////LblGX
-ozGgz48zHrB52SPamXxBKAhm/zWZwc0zXxFWmd7nGQ73rBC3oIittoHe+vO8PqLg
-pLGmnijPAgMBAAECggEABiXvbKYrULxoQeoX+vDV4VO3XUcn5rAl5TaorSuVEZBU
-GDAuFwVIQmT5fqHKtf2vT+94etb6iuuZ4jC6hIfGJH/+qjvMCwb5Z9UF0bnuOgkL
-PTSaYj6baPWnRhh7ZkRuqp0zGUUCTiw1kqvnEZzgW5Ay91dX5xBV/mjBXGvonJOI
-z06j/gEW0q1Aw22du0at774f3whdRm807uX1q4Xoi36YgirQTyOH0bJZGWeXW+NS
-M7zdFzZVMOAEVYa7c+q7dHs3gZtLTI1jG8cceDYa7lZX8gyZAkuIA9n5r0a9PaaQ
-EvNsjNCB8i3M2fiMLUNJeAEfsrWDVMl7LV0KwPes0QKBgQDf47qekpeB3/1+TV4m
-wvwDcGYh09t9LhjsVcy/zrriGX+L9oScrZuVTQ2N9NeTMT0wws0zkQCaRbc9jO9G
-opDnjeQs311sWFPlvSY93n/RxiO5QpEyi/lfIljyvr6Cxe5iSJqSZck+g8I/eD4v
-Svym80uhQKV+jsDXsB3cr3uKpwKBgQDrbERgoxBAQImYPU27DjLddwmqIJ3UH2/y
-NkTmKbrIAD5vj7q0sKG8qxnj3Ql+TwT89yGjDNM9J3bdwH13tt4OVZUW3rLwm7I1
-SHj+1f0tvFj7nLhvCC17QVg8mz8xJCufC0ZTvcpg/ClIqPmzJD19nliaQ2Q7+TDh
-crBqOJ29mQKBgDKtJyaRY72/527ZMEBxzf0xSczKWVoCPx3vZcLclixrPRV/HREh
-sp+eqzzAeLMWaBVLYosTfSFuOkWySs6gKVBgK4+El27Yp1TO9YL3g9MFmDxsttTM
-HgvMiHmZdyG+j3CromEUrPJ7fFJFcz3dKUbYtvuu2EbHJRss//VduwbtAoGAOP2P
-m/k9gOBerr0AaSzpwVUEwOt+aZBmsDLVAQbPEYWFl8oqf31W2e5tqQykNLB6W6aT
-vP3o0SARlWL4vJdHMB8lpVCp7rcyL9XofIBe9shmnhp1R2OqZvENpDZM2N+Rs8Gt
-9621JT9F2zIUqHo4bIV9m3J+/Em5vIngDQbBoNkCgYACqCVQSFDeaos3begcB13K
-P+1U+YLJPBX3HEfReGR7gLxKCJSod43+djiaWEqWk1zDaEiN+zoJUq1606m6crYp
-+cNmPHvXuzriYTPBNCWPdMWVtGEE2jnlBIrAWmtcswPbsFhSGNJNpu+11iCmjoLy
-DANDIpV+ogI0RsflwI3LXw==
+MIIEugIBADANBgkqhkiG9w0BAQEFAASCBKQwggSgAgEAAoIBAQCcNQ58+DydiN5F
+J/tTGV5RGoN4o5tCBdlgnR/HpCIObecl29CJ7yj+UaVhxWlf8LRMBDQh32+Mvs/j
+BR8zZRDZ4OFlQKQ2xolHYsxDpJqA2WVhBmfHJC9ttjJOhNkKs7q0DwBbRuEWP8ow
+DcJFDNYlacc55eVxY4sejHqFiY/cgRXXIpjM3/sfSuIz8kQvcy6gUyUWXbbAoSXA
+PT6S+mI1mOgUu5oq1r/BUeDyvGfT1S0xdEcxk+WQqpUvMi1sJ4UAYi8CjNjeET/0
+CP4igyL2vfGm2MqH3/fqk8bIA18Wd5gjemn7jBbAQ9vtVsScHnjUOq9nbJFDdkH3
+izMtewx5AgMBAAECgf8Zx6fceBuI5E3KnA6eaFFokTehcV7uRojZqRTVngEA4KKF
+XQHNwerCDjd9K1d4vgEDiq4P6RA/6j3k+bNsiAF/890/GKwBXkLJxURw5XmaSkaw
+/J2kABTTxn4G92Xank7x6IfmiIwdX+m+hIbLXpL5GbwHkimLzSHoqMaPw2Q6v9ES
+JWZdiwv+kkyDcwsTJ0yaC2EkP2wmgQyUCa6UYPTHs0faf4MIunM3IOP6ArMyeleI
+3oaZlEIuWNhZMpbhkUIWALFAxsJPVpfHNsBN3k4Mzhyh+jtkht3UJZ/cAVBKuyQZ
+EoBpF9gWWKDUxiNY5IHMsGUUMZ8E9MnFGCp7NsUCgYEAzds1/f7Pyd7smR7lJzlm
+1UAL5B5jHiKpW1ke2/iEFl41WJNNKYljfqb4r1AS7b4JChyJhKGJPtb0l1lxR4za
+sMILH+8ZXCRKxPvKNiZF99IwxxpbMQJq8cjWm8HY2ppvIFFCrJ20P6UdUpPXi24p
+tzEncVMqjxvbiCrduk29SZUCgYEAwkHUi5ZcdrRKVK+SEjX99uH7oMnDrO0uoQEZ
+x2IMC0H9s4jUvzRx1eTa0xTe8H7BS+e1YEm5tc/LCkiebz3IMr8IHjBr1xcaYgcM
+nXY2ctUdmwUiBFf1ucC14MK646Gh3llBvXiJCwfR6ryNCwBTjnwEbnGjQf/APz7/
+qON/plUCgYB6/eIAY2Hahuptgdv/13ftKVrxbIZj1unAvjqFyrGAe8D7ruaHTqK3
+ZSNn+zuT99qGxA4VxD2v4dY5JyNbUHjI6uaiqcRJHRXfI2DpgWyEaHzkOIcLfRpQ
+Y2J1pRffZC3I7UQcxgyPiiM+1z4M/EDIRwH932aqIkbD0HixewkBEQKBgDakk+gs
+BJhzgJEvzfQHcgf3a3PALaXAFiS+DYVTZDXqezX8YHPkibz0IkXMEiYuUatLY27R
+bkbhS6j54m9CPsVfjSYI0tzvJ8G5X+gPL6O/pRNNL1NvdrSoq8CspiuP9Nt52g81
+D7+llHvmS/pzPg3PfuOeXaEcEvT3gKz+SZL9AoGANjvHktj1c+P7oCM6MrQOqtx5
+hTujhujsSVRjY48SblOi/eo+2vkWyMnKXHOaQPIvXcMtZJzNPs3l1IJJM8VdXbuK
+OtYZK5HwG4cPoIqfcnnOY7NCDFb4aSo0RgKsUu6JByIotNn8KCQWzBlqZP1tMn3j
+1jjgrbaP9B4So+5U4X4=
 -----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 9f7c9741f93..b57045668e3 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-----
-MIIE2TCCA8GgAwIBAgIJAIxy88trofTnMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+MIIE2TCCA8GgAwIBAgIJAN+2LTd4vljEMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
 VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
 b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTFaFw0yNDEwMjEyMDI1NTFaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTFaFw0yNzAxMjUxNTI2MTFaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
 BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
 ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
 Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AM3kvC9NCzzKoK4Gydkf5RLqPqiN9HfUpYZquoQniV9IjmQ8/rfXF6J/64qy3ZFi
-aR+g0qYPneCfskUmKLdv7sTCiir3iIuURGO8MYuLTyMX2AEGniHhFUQH4RhuE/tE
-zHdIkDd6hAN36/hYIjWgPc0OU+vlNyAUi4sm0j0f7C4SdTeX0zXL+IOxh2Qholvl
-6blEk/zgcCX2JVSXJsDPJinZtxQXFwUBJBV6Wl8/OPAxL03CeHEDpAtcDJd5KwI0
-qrMHt7///8tuUZejMaDPjzMesHnZI9qZfEEoCGb/NZnBzTNfEVaZ3ucZDvesELeg
-iK22gd7687w+ouCksaaeKM8CAwEAAaOCAT8wggE7MB0GA1UdDgQWBBRSjZebN11j
-bdgfZMZId0wEKCtBpDCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhrKxQ8
-MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
+AJw1Dnz4PJ2I3kUn+1MZXlEag3ijm0IF2WCdH8ekIg5t5yXb0InvKP5RpWHFaV/w
+tEwENCHfb4y+z+MFHzNlENng4WVApDbGiUdizEOkmoDZZWEGZ8ckL222Mk6E2Qqz
+urQPAFtG4RY/yjANwkUM1iVpxznl5XFjix6MeoWJj9yBFdcimMzf+x9K4jPyRC9z
+LqBTJRZdtsChJcA9PpL6YjWY6BS7mirWv8FR4PK8Z9PVLTF0RzGT5ZCqlS8yLWwn
+hQBiLwKM2N4RP/QI/iKDIva98abYyoff9+qTxsgDXxZ3mCN6afuMFsBD2+1WxJwe
+eNQ6r2dskUN2QfeLMy17DHkCAwEAAaOCAT8wggE7MB0GA1UdDgQWBBQhJcGr/IFP
+7GrmsICIrEUft9d4pTCBwwYDVR0jBIG7MIG4gBSMXoHpqV/DkZN54yhnQEe8rbjd
+oaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQLDANJ
 Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
 VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwDwYDVR0RBAgwBocEfwAA
+ZXJvYy5jb22CCQD3/kLyPBpJFTALBgNVHQ8EBAMCBeAwDwYDVR0RBAgwBocEfwAA
 AjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQA9p4yiNT2xVwsI2IN3KOp/43/g
-tmKf4K0WFr8Lbl8ebT/fMMoAUh2oNUMIO61Am6bdGtt+2Exg82deTqzJ7C6xGdHR
-u0kB3B4Mmub06qYsxxsIEce6gf02XxvVhpsSA7goxZbLgWNX+3NgUchHXO+ouGhB
-4TVa8qfelv0/i5K46IVGQqTvi9uGFCFs4OSsL+bjWEDMwQ2ViNm8nwVzLsF2vpG3
-9vFUZmDrTHjWgcSlUkfzpVpN5GpsU86wFZuKjdOprg7ih/dxunXRIWP06i/sD1+8
-ZwkbTXWq2uVyaz2cykHmTNBm/3uhkvqZUb0ndte/EPsH2UUwa0+qaF9hZb+z
+CCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBnGI7/d4AOsV5F6RIYhxxd41b8
+PmJAlbelrR35ZLYC4Wj8h5GeE0WMgnV7NQIEDQcQShCVWZ6nwTbKrAacJeZElrC4
+pUJskrGajsNZFYEeK/3vWYeOfv5i8mOwoJtv3yAXFJEgIF8zc907gCp5dj5TPgbi
+W46PczP6WckyVXLhvnuLj5phf/zDHmL2dt/ATxFC4gAH+KkX57jP60Q0lLShhYEa
+w0bMOU6qoSMxlq/xcADiK8eUih69Wsb7KziSyGuQ5WCFXxfpWn4KgwrFQu+WMk2z
+Lpu3jrDIGVgEqzBWLGRgnScRdsndSATD1L2PUykG3qBfvwmQAAbYN0coQIdx
 -----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 9d87abf7a3d..713633cd3f1 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_cn8.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_cn8.p12 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 1a0f559f4c2..60283ec1c40 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCMds4PPrRv3uzW
-vCO+aHD8lRW5jwjCQx6Utev7FnBl+xQsmy/SIv96p7nE91SdDA1Mx5/tQeL6duq/
-NSdvfQZ3eYhib+yaO6RtlWGcA2wd3c4SXf0TI7PUG8vb0hGFNocRzlixmgxLtjMN
-jVS7d8UcglXJfFv6MnCax60gsf4fxHAkQNXo1PsTIIaVG25qwqk7YdARZTRcoAn8
-fPvDt4mopgnFVKbo66MVvKmQP9X2v5HXtQz/IJKGG5qQd+RJu80ESsX3ACvW1fVE
-/gsE7C5hfCh5Hcs5hSA0RrcLbfVWEYfJQhtUREmoUnNgHWXPbQUx3RBMhAJZkD8n
-s2zkxcDxAgMBAAECggEAMHpOWseW6adEEUaEhZIxMJNZmJ2rdbRJiSSSSamwaBn0
-GAMFSZ6HkvLxM+/ylXMT4gRhhzZ+mlfRY+V580nwoephbivXulFMSf/M3NX3igVD
-umYS0ni3d0SSoo7JOjMcAcK4LK+Qf87lps84x6yp7FF1PyE680pWP60bbNXRcW/N
-JnpVnlNBKfuztLwbuw2PdhsOc4053DLEnCo7wvyBr3zpVjnbVF+R/VrXH1tvuvVy
-jFnqYPnndYD5ffSuJ/Nb4+lSXfUZwbMHCmxjOuhW+w0FP6K57E7kvYfDAJ0gQBo0
-bDCwEJGkePu7L4yaTm88Pmh44OkxyiySe5r6XPl7GwKBgQC7BSHpj0sCPXEcYdee
-GWmw5fYKhBnGkQ+nqRy3R5TqFnUxPEi2f/nUsxNlmKRxkHm0+FHat7EqCzl9GoP+
-Ly/VgcwSzfD7AjnqNbpnHniEHE7skVa/JXACUE0gtb0MORXc7qL+6Afqq7ZK7KBp
-AQt3F9o/thkZsHOS26HpaIFh/wKBgQDARb/351+/7JyXMNENthqvnkO3Ton/KTKg
-ZTFPLCQcFoQdl3Jih0dD/NhJfnCOvfEBNjzkozvQovHWCFcIjgJFlFR39pSm9HBN
-KfhiTWsGY9lSyIXO/+MlgLtHxWTu6rbEjCPdVoxBE7sPc6edBpegKHqUles1lgUS
-qBpAaKj9DwKBgDorPoEGsK3hrmzFgesKvHTpEb3zmJDKTbQ4RVY8TXUBxzGpLnSV
-GX+usznGYF9yMGi5U7xTpicNlrPyq1tEEfy2gmLW6z0nVBwk2fV45MMyitnJ2tFZ
-M52EnHiwDjzfBI3TK59dTBkRj4F+V+ZRDN/d62Qln2j+GPR0m8edWaDBAoGABa4J
-zbj4CyNiPNUkV9NZVnbGaVPYn8EHzdUvb7dOGcZQgM9IgcCdSlTdzs39ZToXNIH1
-qotn6PHnUvtMFuSbDJMlK6YNHiF6b80dmUnQL5Aji16BFWxZuXHkFmquYKBuZb/+
-DzvPSNzcWciA2xKmyARqGpmTKTIVVEfC/sQYueECgYEAllpHqZd0x7gWMzZVlvHX
-bwsuzd2sR1zQzWl8yeROInmLGfzx2gcGn16hzM3uFByzLvH8vyExVDR6Gw3/LuQL
-ls/5Z4BPHrkrLjU4+Y11lJE8ppC5BBOLCmloTcKI13LazGYUCPvy7u9E67Dgo0F0
-OykPbuYH7aZrFnuB+bmuwv0=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDhLIKsKKcd/sMH
+eIKMVj050uZFGevXJAj+t6QcOWEOiN9sFqlVzH5EZKeltYqoa9aetvlHfXSgddsh
+DsvVVXHKsc+E+XQgbephbkFPSINETiW/cQ3379HaHQhFvnJ1MYFwh/E9X9EQ92zf
+tVM+EQxf1BK+l9i3QWXg31Y3Ix1z0ityY+/UUsusgp/sHW/L9JFYbO35uIfy2J0m
+z5qP/KlB2PZ64krlygC1lHf21XV+KL7qvZ8YUo86EtqxzRc2Ae3ePexxrx3T2XA8
+1j5+Uem4q8oV9RliDNwoN+qppnb81VLsab39VusVFJAIptTh41Wjif5KQ721IPrZ
+6dV0mQvNAgMBAAECggEABN2e3JSA+U4fgxemDofwiRbXFf2CPKMRNLEy289GRcz3
+CFFnCwJruhOeEcpzUBdgdbaI0B7UYyvuIRqTlK0PfpdKtNoPxIGg3nEbpS3GdGE8
+lz9HU35m/6UVStiGME/Htxmg62LDfu/cdkBnUkCGZBhjkqMaXOoOBwbHHf2QGIgS
+4tL+we0fK1+FRymE4c3t6WpQU42d6vXh4XjsT7gplGrkwvY+RTdmqZ0dF0sc/xsu
+SOQRy87BH3wAp2rDAeVKA5b//OtdERCf2aPWTjqLbgCIvMmql/BgqiOkkNZ9zaR8
+x9XJY/LcsDe8nBSINyTsYnaoo9jViNrjkKqvcckOuwKBgQD7UaO0ZenE+G5xeKrm
+WF0bKzMJbXvPumHndpPTJI0+/SMKCJOvVFeZrpwBtJuJmiEV+dUh6o/SuT2h7i3f
+A6VgwYrD6VpeLA+ZgZu0qiN/DQbFQDGmDA+TXo7IoZv0yN1pg1ARLHzpGJ1rEQj9
+oBHba1buMG0NK7f2QDGE85udnwKBgQDlXjQ2FSl35XRxscJebhy9fP7EfDgdf3Oy
+Cf2xjQhxXT1ogsGYcS27WobPqoYIiH+PYRoi/zQPtFwUvslaPkyKD5dtHnyzhtLc
+zLMH/oIsv5iXxdAYgp1WT/J1TzlNbJZPXdmsBSOGr9UlTTcrpQkmNlLcEX9t60fc
+daQrLiMHEwKBgH4eIgDNg9qMsR/QZjLh9RdFPn9kqdU8uxTktJoopZkOfx7x3usF
+cFB3B2Lzt3n+Fsxoa0Rx6Wrd+sfgNrTLp5o+hdx6phbMFaf7GqA3IUkIyHUEGeYx
+9z8FHLIiJ5lXk4T3mJ6FrMlsyNKJ4fEk+tEZtK4jLxaE8fRpknAdr+IRAoGAIES0
+i7dGcjuxuh0L/0T2fiILpZDkRCIeILoPGt+AhJJdhUp/+fZSPL1roeOXn7O0XnOG
+vc2xgVQacEC3Cx8gnXu8DfnwCUG6gJ27wjAoGCuMSC3oLMqTYAU3UxGmOiJAs0G8
+0dqXOOeb0Pef/1/kfZ++4H8Fsm0bWwSh6AFBpEkCgYBW0iJMTpM1mq/Ilv2E1fxQ
+XcgPA/21pa+TBxvOWzbt+dn4M/v5rnhOXse0BhqgQSOvT8gddBgrHx52kiaOmYaZ
+xstvEW8ar5Ui9ymYEkArY/vdsgN0tu6Bcr1WTq/5a+OQ7kQAQgdgJCiH+yualCvT
+VDYm3RPG3oNJFc1ZKRkGwA==
 -----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 24dbd726fc7..aa0de5a7f97 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn8_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn8_pub.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9.p12 b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9.p12
index 001627807ae..417da21534c 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_priv.pem
index 81707296339..f1c47762d13 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDDyn6ihRLcKtUR
-HwilUzSIrpkP+HDGmUd4hvM0yS7kMNzJZZfX/T2IZ1Cd84sOje67B3D6IfFvqByz
-ypzBP9DthwYl9Xo81Yl4ayW1ORNvwbYNO6aiI+R1j7NUi2xFcuPgQO/snGvGtwfl
-OGi9KFXhtaf+ykPQhAaSTKair2iOj1QMdJeGe3P24ereQlCxHGXZQ6I6EfnvyBLX
-jdzFM/Zvb/DTvumhPBvibFzMpQqJq6ztPtw43IKydTT84exddaLoWtqSuc9ULBzz
-3B7vi7woihGC3lmvphkKYdgHOtTzkU5LuQcvkCicoCZmYEGd+9/UsG+wJvQlGpZ7
-03YWYPUvAgMBAAECggEAEHopLO1wFRe4G+go5rW/tRHXwp1Q65XL8WiO05sFMQhG
-FhKDtEl7dTaxdSmHqWKBr26RfN6znlPFxQFaYdt7oZHJQnm/OM44jIOcuWMKFk/b
-tCj+ynE+cWcpKDm3k4l3HgQfbO7ZFYpWLF2r8UdeVIMTyU1YzOKSvwGbM61f0Kds
-LeEr3J0w5ACxzm8J4R4Ny0ueUBz/5KS0oVF3cEVH3xoN3TNPNaNymsJuyDzDzivx
-82PqrymDcj46QNsl39pFxFnOP+onfDZLGHbVJIVU1kLxXIdkDvknV0cOriU3Lg3u
-dPUp4bmOX0C69JWc2yH31Ib1iTzq/pPtmqDESENm4QKBgQDIsxDk0Cestdrn5ZcU
-IiA7o34KAA2s6EcfNOGPiTS10VGuI1oLb4q+WYHjwGJ5rasZKZjbiNET/4HN+D/b
-8HhfJTjY1HG7gqfwCQczywcqDGLXgYDSH56Av943lL/8td3FmOmQ7JZzOB4pNwBD
-xCnR2OoAf2V0L9KYzd7I547ufwKBgQD5vTG/m2wh4DuzuZHQbllHSX0THpR8VYAY
-IE5XFi51q96zYiEjU+hdoJhpt96tgC0X4AFTi4GpXGaqihr60I2Rzd2I3yvgGDVF
-/jC4ARSxW3JCw+d3ujFkMWAoccd4ic7p+NAz6UVmAM1zb+c8NT1GsIR+WZI10aDg
-oB2z4kcBUQKBgQCt5cHgkJ+f3V6UifFSx5LoOewOnCc9R3HAj2BVr0vVsk20tfri
-Z75u2j1aaqqoxZq3zbwdlDmcu0nsfopOdtjFkAnmjoURNM9wg1ITRXqqq1rFYfeN
-mUoMQrM3s5J6U9aZzLmsEeL2aIxxp696CDE4G1v+HGR6vKkcL1029LR63wKBgBYj
-0a885h8ys9hBEU47GisZtr7lLSDAq7R32Lobu06vR/T7NBjfrW/vdtOYe2NCQ70k
-HLn9Widbi7Z+u9mUd5h/ea5Sqp8ZRk/IMyV84wq+IqkMmQ6iMRLC1dWAEMD85p0T
-c9HGUmKym4QqXYOW7LHBoF1bL30Z8ns3dqql2smhAoGBAILSH8GgsMiZ6OBuG6pc
-crUjEgG+/V+BIJ06K/1b4Csax/jd5RcNtzy/MDZKVMoLPr7ZR5lTP5nNKuI0+cGH
-DaDXb5RQwG2i2CWol9svJttx7jdHNdRnZfdzf0bWG97YeJZGUwLiZwx3n45+xMii
-qUBizmjMk+yqoXww5GdUCqNf
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCOaqyHr4X2Przy
+SjnGi0hFwK1+oSTL8b5nnOVTSlMPgkuRFDoTY0VcK4JaFV2Q2i00o2X4HdhB+MNs
+DJjHN1k+9m/tnlb7QH5z7DJ9ut5X96lxfl6q9Ovjy/TuhqKIt9I2NBdX5PV8YRrQ
+ComBpSQ/BRAM1V0Ct92BhZ6fsjnsEx8mcbgJALa6SmghxCEFlq+WZeBo2u9gCB2W
+JX1JZUxRm7vHrK3nj913SC7Kg+7kSKQi9qPvLUKedwQVfmtYXC+GRXS8Y2AoYwsY
+Ff1Kvfp0i2rVio4tBl7pdJXRCDDxbEsy7t4m4WbwOMKKge8PL2qdYVULnTecHvbE
+ykai77MvAgMBAAECggEALFZTfi6L4xynEDtBf2lPR7/zg2/Bl+ib4X/7+REziKmE
+wxbr+as3Jbm57DeomHcECdYw4azQ7cD3fgTx71tw4mQwdmaMJ85tT8Oh+HibzgEh
+dF7mNAzp/1I436V0pmGsBQn0ln2GW4GTql8NbhoujZwS4hvux/Db+f3SY19GHxNi
+Av/8cQVdiWcUyDF+XBXWLGQNmt45FKVaCMQfzaOcpMlTPykO6fno74+dLD3t7vi9
+RyaC7rkITROqqGdZR1PhPj5Tvgq+XgB21wur27p//K3VeinD2jEg4EsnfDXFhiu8
+n9AH42l4VAsAciuoANWQfKUcBtKm03oRe8NdRBnKyQKBgQDA1RGYAECr/f+gwhN3
+YYUij1Fe7lFk4/9xVTskx4ayJGdV7BpWnxDaeYIEvlpQl2mGdykuZNoe7fs4uQm4
+VMlq5juG4SRJn8AXQ4lVpQO7MY4JFBZPcFqKuHcJDd9d6X9uYw5Le8pZZ0N07+E6
+vlCM/DHx63mSdb2fqIhMxkaWWwKBgQC9Eb+xAQ+oyFrP0Ikx4iZGjB1tR1jSJ9Y/
+8eQtjHqvgHSgXyMyeCcLZ5Cg+LAln2+hkYGfe4ts/RWgRfVsuo8vWZETLf0sLklU
+eYnSBtaR1RdgrTmZcOlfNXG9TYORn434iM1EPjBJ2vmWkEzWPMAVX8Tqf3Oc15Kg
+RmsK5Sq2vQKBgQCfG29/5r117IdO4rPjLgEHKg/u718TixiLL9M0HrniJS1qdPyq
+emcSjW2dcl7c3oIApDPDhw1+tcgy3mLJyJPE86EsQnqJkRmTWHNpylVQ0Kusi/l4
+pHDgwyHcw6iJOY+eynbSC5tDt3OueftyV/Po0HJ5dV0DXskOgqWsC3HUvwKBgEC/
+z1Ii9uXql48L77AxrsICQiGmiXiPRARqJqaisXFhII+7hSZHl7eEJDe8czavP1+p
+oSao/Lq6gal9y+sMiPTCS7ixyz5SK7LOXLCcvub6fyMQr+UokgOVHfqijShV6Bzx
+XLq+QXNJlqhFisrjyzSGs71LIKDaAtD4zLfSe6pRAoGBAKu7FCi+o0X9YiikHQuN
+OBNY1xuv26q38KbdF2d0nH8t1FCWauOblm/fUco65Y6Mg8lJAs0kSocEH8jN+FCB
+R5jdUQafZfiawfokaO1eEnxjiDZlobyWteicfz0lTiddtkzLT7lA2i5uLSZJpLfZ
+ygRVHngH8ggKE3h/5l1ep7ar
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_pub.pem
index ce1908c69af..ab09ce01e54 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn9_pub.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE7jCCA9agAwIBAgIJAL/GYaiOoAT5MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTJaFw0yNDEwMjEyMDI1NTJaMIGIMRIwEAYDVQQDDAkxMjcuMC4wLjEx
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMPKfqKFEtwq1REfCKVTNIiumQ/4cMaZR3iG8zTJLuQw3Mlll9f9PYhnUJ3z
-iw6N7rsHcPoh8W+oHLPKnME/0O2HBiX1ejzViXhrJbU5E2/Btg07pqIj5HWPs1SL
-bEVy4+BA7+yca8a3B+U4aL0oVeG1p/7KQ9CEBpJMpqKvaI6PVAx0l4Z7c/bh6t5C
-ULEcZdlDojoR+e/IEteN3MUz9m9v8NO+6aE8G+JsXMylComrrO0+3DjcgrJ1NPzh
-7F11ouha2pK5z1QsHPPcHu+LvCiKEYLeWa+mGQph2Ac61PORTku5By+QKJygJmZg
-QZ3739Swb7Am9CUalnvTdhZg9S8CAwEAAaOCAVEwggFNMB0GA1UdDgQWBBRJu1mB
-7RWxVL7yZgzu0e0vmJQoHzCBwwYDVR0jBIG7MIG4gBQC/Rvpb06WjwwOmWGPRUhr
-KxQ8MaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAxMQwwCgYDVQQL
-DANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAw
-DgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5m
-b0B6ZXJvYy5jb22CCQC/3ocFGD9EjTALBgNVHQ8EBAMCBeAwIQYDVR0RBBowGIcE
-fwAAAYcQAAAAAAAAAAAAAAAAAAAAATAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJA
-emVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IB
-AQB5c7rBRsJjaRUJwb86V+JPTdlwmjQyjO6WbTq76wtsmv02UaMShu03f15sYQSa
-72OMOXOpeYr0SvMQXjlcn2nI5HbK1tRNNXFaCQ3qLIehrdV5Vv6Ow7t9DO/DSC/j
-LxLSkObaB+XiCPJB4JUU0kzvDBkRHWG4im8jUXrg3rbCQpZGBdc3wdlC6+vs01CY
-Lhalstt2wQEm6qfhY8xQyWvzrw1NdVdB2KXSJD0sc5m3g7ii4sOY1EK6aEmIFtC6
-ccnbNGwA+cOTdmvmowZS67vb19jc8E8lXAwH7ZBmAMxDybFM21ZlalXMfAXr1Ft3
-UdgNaqo6TH6ZBo/5huB2Yqso
+MIIE7TCCA9WgAwIBAgIIc3n72ZhEwyAwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMVoXDTI3MDEyNTE1MjYxMVowgYgxEjAQBgNVBAMMCTEyNy4wLjAuMTEM
+MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
+aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
+CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAjmqsh6+F9j688ko5xotIRcCtfqEky/G+Z5zlU0pTD4JLkRQ6E2NFXCuCWhVd
+kNotNKNl+B3YQfjDbAyYxzdZPvZv7Z5W+0B+c+wyfbreV/epcX5eqvTr48v07oai
+iLfSNjQXV+T1fGEa0AqJgaUkPwUQDNVdArfdgYWen7I57BMfJnG4CQC2ukpoIcQh
+BZavlmXgaNrvYAgdliV9SWVMUZu7x6yt54/dd0guyoPu5EikIvaj7y1CnncEFX5r
+WFwvhkV0vGNgKGMLGBX9Sr36dItq1YqOLQZe6XSV0Qgw8WxLMu7eJuFm8DjCioHv
+Dy9qnWFVC503nB72xMpGou+zLwIDAQABo4IBUTCCAU0wHQYDVR0OBBYEFGtGPltv
+QG8BhaECaJEOV8RQi9ZjMIHDBgNVHSMEgbswgbiAFIxegempX8ORk3njKGdAR7yt
+uN2hoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsM
+A0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAO
+BgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZv
+QHplcm9jLmNvbYIJAPf+QvI8GkkVMAsGA1UdDwQEAwIF4DAhBgNVHREEGjAYhwR/
+AAABhxAAAAAAAAAAAAAAAAAAAAABMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6
+ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEB
+AJ0JpRKkhC4wpwROg9PYZ3iYoPdu/7EBvudQvPVmIQI3xcvsrgozyHufUZE6x21I
+9FCRwMCg8+HpF5sZ+QrP5PthBaZ8hvUo1JknFogJcS7X792Z9BX9mph2os0ZdO7N
+dPckFehj7JB/ZbI8UbPbQq4KdIunV2YmCI9eRJj9rW5Ay5RooSVwnkua9YTNG7eu
+p78V2itWalBEm6y5X8xoeLy8tyfYDnDv67b7iwmwTUg+Gh0jnLNDLpknMwA/0uI6
+sacKA7qzQ/+DJvmVpSF82nvnKNIWYdMO0uXh6RIATyTfdB0WJblum4Zn6NICngsM
+/vXi4BbR/rrzL9iQ6lfh6JM=
 -----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 a2bc505ca2d..516873c1411 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca1_exp.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca1_exp.p12 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 c1a2941cd4a..6ba5fca1655 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-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC14H0eLBO0VlVa
-wo3rsAf6lH3qIPSYmtRCDCPdLaSpfkNRCOWwl3LQixqujYjJq8RiffKSsbwCgvpN
-jbsKVBDQS6dm/QwMGY53dfqS+Z87T39rE7c1QkOj+7Nhz62SA43orfpUo2w/C88V
-jeCqKMPvcXTtmT9D8DHS6HjWMfJUq02WyI8j7WvLYhOsiOyZH9SCE8eNlfULqy+y
-nxwQCr9LtQAiBUb66JQMLu4AkRNDR6Edw8kmBJpV+6EWGHBtbu4LtnZTcyu7jHfQ
-ehSCcgmVEl0ssxTpO7x/S+i30+JvJdu4O4hx1MC3swAsEUGtPHTRqdmF3RmJXTpV
-sNACM4mrAgMBAAECggEAANSYREcSJBmNyCYrrnsOzSpPuAtEaLaGMxqXFjpqpFWw
-A57G/Js58NgI7dfvda57lO+L8OV2chjnav0HTYlAuq07jJV0uRvnPz+QhUP4UEu0
-bFbg2CwZoSwwss1KF9/2n+pkRtfmQKGDCOVmzu+Kgi4ABwX678O395/gQK6JSZ+b
-Qr84Rlp6uPSOvdNBeYzboL9McPjlSBHuCmpdxjCDquoYWi37g609tEZRr8eR/xll
-uINU0G7l4fClUj04JjW4N+zH+xWEgYW/SeSMRfwRVPG1KhI1jdTGQq48qkE8yRlR
-S/mJ8PrJVp5vuhDZimmrKHNvw5bfuwTx92EzHWi+gQKBgQDmPBT+Nvw27U1xqOXV
-Mm8th20PMIlk6gBxWMdgPdeDnoX3NNrUKCJTppAEQFoj0NShfcWXOaLkrYKk66NR
-wInEPRckULEeDjvfTZnKJ/Dl/V/12lhrROq7K8L2t/4m9uqiXNkjRRQ0fjZDGieA
-g0RW9IM0ZF2kdXwKvzkiIvYi4QKBgQDKOwU7kGAXM8Yvwhc2N612HG63MBGJs03X
-mjeff2milrsUIyjDaeAmrKL1ShVwJI6d8GUEZmdHyqdIZ0u5RWddByyHSOzEGXsW
-9fKOZYplktrI3Ezw/z/CA4TI/J1DtRcDgW6uEWcRbHqOB82JCXzhHCBEJH35Yy/u
-8OttN+tKCwKBgGHOiliIgVLQMsMjLigI2eQskO8P/n4pTnDYdzJycxiOAnlHMeNI
-/XQt4SZ9NA3dDEdih8s7h/C/qS1okSQMuDnufeNGiEetYk/1xmxz1UnO/rIRxNgl
-GdbTu2pWNZjV8k1xRilOkkvOhjyxYrCcky6hhw99x64y3rQuEhZnZcrhAoGAZt3O
-s5WkyyiSzwgzNmjr2wBrcNMKmLiUB+9yC7eLzCBP2NZpjbz1P7bgzVR5wylVQhFd
-0Pcl4ea7YKDqa7tZ8IANrmLxzG4JpoxEbRpJY5FnqHQmzw+HJvETQgj9FcuvgSD9
-Y52Gh95eGJDvg51H4FmmMAM/8PL7FteFaXDgRjECgYArqo0DHtxgCtzIA8z6DlpS
-4SfSsKJx3UYwXW6H4/Wtm2XhToVe5kt81lGtblpq4xI7HkaHBMJXOEpqpH2bnd+s
-5ZGmn8bkxg5BkpldbMe/aEG4KI56GPeC3le/dZOg/yi1/o8fonT2qKdbhtdXrqqt
-BGLlqGWAtFks7jjEJcxlLw==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCyERX9cP+wKIri
+gpztPp1sr26oserR1ch7JrqItBz+Jo8yWbOA3syrpmRApUlmDosl7lrkpab/nul1
+x4H6JssvMJZaInui4k1rbnv0uaSneuci6ftXftxbJbX+YguYMmWhR5SjuJXQ1awj
+evY2pDlzPTw8kPvO5q2uB/bTp0Mi8+cOvor+gJ2yiymI2KibeHDlS8eOH4tXUlRx
+ZbEFKDrdfyuxC1Czoo7eRTgzXzWRA+23vKZ/oUg5OUKTppj9F12re1BPRp36cZDm
+6znffVniTuo/kQDv8wE+SwqZdyTBnc471MoWsuG4A5JgGCzSiAPpiLU0EHXDade5
+K9ka9IVVAgMBAAECggEAFUrzPvbt8EXs06isNLdl0jsJJ718t6JRgp5vNE0bYW3B
+dlMhIqIhxc3UE6HgLMbE72B4+HnxhgQd5SJaAcx1Q/uSow0YDTJz8QqJYop3bLqG
+3JcvobcPCQwxns1hFw5Btl8toEVAjvQaDTUVL5QENapHI3Pv1H4jmxmjM4x++/UM
+h0V9S1G6+UtVxgu2VDHcBuPWxh3k1yWeLMLSOl6kaTkZ1etOmwWmNUfqT7yjBolG
+JVH6ZkUeK3kkKLFx18ctc0V06q30JznloIn+94vbIMnR8JzLUoR4OcmWxS/DcvAl
+fntXBVT7/1BmX9MvV2RwJG71xgJz5FzBH7g6s7iIyQKBgQDw4zPs6ek3tOKLahUn
+oEH3ZHMgMToP+2fJXyjm/Fs+SiyLq45oaSzhF9N3ESUONKBdYHSQGMxMbJGMGqEx
+PGGyR2JWEW260S79qcx+iKRuBjTIQhLUDKHlaNmMkv51sWiSUQ3dzC1Eo9xIPU/4
+vAtnHa3z8ivvL6p3deAUNkz2rQKBgQC9PPGrmjzi0TrrxcfDQ87jxqST7X1Zra6b
+GSFXaMFEN73Vv8n/8FtbvDtk6TFmESPI1bKCFDvgj4iu8Ll4eIYh01Bl/wA7SBh/
+SBNfLV3WBo3UlsHF2OlA70OgYazr5fVwOn0tlgW+6V0TwUUyYORkpYiCjgoQFcfF
+lEXqiwamSQKBgQDwJSFkA4GMFplu8S/r1DlPX+Xh5xGCU1kRiPum41g3Tg0ApOQQ
+tSGXuYAIiKAPfGmPDZTG/uHVIrsrGHUwN4kSCVZAhZmGD/qvyfJjBugeA7PlHPHW
+Uk2n/hI7sWNag6XDkGipgF50uoLlxbIPP7CCeTUtKHWiOzvPYkUlAUlS9QKBgFWY
+14fTgG7oTUqQb8d3SIHnPFJdPjHuSeiF+XrcO29r90ZUNj66rdhU0FjY0itk3Vbe
+spv8Iwl0Y1MeOAayHZn3R4qbSbOG7O3F4F1Q2/0PgeADQSsI7pkcoO5OwDUEE3zs
+N+sCzR6J2DwzU+Vxxl1wMss7DHoyH+bTJrzsndlhAoGBAO/ETZyFXE4W7zBdedPd
+QMSRSXFv33AjzVXSfw9oqi67dGmddvUcwuOE2oDfeICZjdkrxfPpmoDplqhXjUT8
+yLqIRIahdbJRBoQe8Ag27lgTQyJ43A+1a45Oc0XwEWNMTUUP1MhIzL1GbuRvfSgu
+SukHqiGuwFslAIXROgs8fhU9
 -----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 38e425462c8..f2c12f46d89 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-----
-MIIEyDCCA7CgAwIBAgIJANO2zsJr8rrsMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+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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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
-XDhHjM/CWJCaxceZgxp+TuvawcMSxUpaTSz3uw==
+9w0BAQsFAAOCAQEAf0akT9bHrH7HBr2roajPzZ6jDcGPihIE26rUidI5GgxlODnD
+cpCIujLs+a0hc3Nbx0yOGNPbTBJ19Ho6NKQvHesVB41E6JQg0M6l9eY7myCXFAMj
+jx17brJQnSjVoUnF4uN1lrV0geLA3teOhI69CDL5/UFtVxly37/WflzSRabtaY+c
+3O93lO9GtxWsSq6LP5j6MIMGQRbvf83xKAEiF6Yau9C1L/MY+k91roOHvgtFHnfF
+e/0SDtY38jpahRL1cZTOLUfd/tjAwA9a8NutV79+wl9CjDiEI5rzb2yFHu6sZYsK
+xJ4hG3mhVXdR9EPm9f1PagQPYGnPGGN/W+dRYw==
 -----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 d78c442a8db..4142804b652 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-----
-MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDXsmYx4MCVXnAB
-TTshaBjgDfJO+4UDm5opSDQFVolup7sDNHlaaL+pmZ61M8CCqPaPc+r2KBcHAcvx
-+7yyyczCRlKnWH/awY50Zh4YSipJ7tb34DwIG6e0HqxvKOiS+MLS/ksRHwBSrUg7
-DKcbnkAWOwC+Fbe3maOEYMxZzIkVcmA8i9en2Fh7CDVmNDVFejkP8DsQlGTq6yjz
-VPZZaBog9Z5d9T5oi/ocbNCd9NqJ1CY1oXXlw8vv5ryUyfkWGU1upxyZ9o9dliR4
-yN8V5gVwKSmGWtvib/a6zdHhy37g6k+c27tfD37WiNtgLsblPQPH7/HxrSs1zGzQ
-W8y1wy95AgMBAAECgf97VCXanwd+YGDqXZ5Rm5OdiFvjjSygw3eB4ybbZn9uJblo
-O7inWP09m/iC4vRPwQw5Oa4+0O1ZtE1ILwfVskzBSDQ6Ov/ftIwfQcQzXzSO0WFY
-mX25pRZehqtRY7KXVmUO/xcs0uz8WNfT64gg4nsCOvpRtVk2QUKdjjtJnQlEmPRY
-CBY5Knox/1aDVhSITiD/IA6I6WgdFc+j+120+oi86zOzSuhD5ufneVRd01veCv9g
-7kTPvYRxOWUO0E2RmiRv3tRtHfQWFv4gSeklM8I4w5E6+fu2mtam1+y8b7j7ZX7T
-zU9GmvUhUgMNQ+Fe4tLsO92ZKal9IqNrGFpDqvECgYEA5DRyCUOr1ZMnopscoHgT
-oEDSt/qxOEuAjNDOZoHhXqchB2P/duyLxE5Ub+7BrqxvAjsl5xU0Cs2h5jkktkEZ
-kXAJw8pp6DiM6rTN5FgWvTH4i0wyFAdCmbVNnhK/tUzI+y6PgjpzLVyv1QmVr/Cs
-QmwEl/+R/AKSD/Nb+kKm9GkCgYEA8ffyk5Mr8RzTneysS8uiNzcraQJEV6VVUTEZ
-BgB16hmAvv5Xh/wBqOrxtgFY0QUi6taJSp6zeDvcn6XUSdCS7m02WWKNhOdPe2j7
-IjUyC9G3b6v7Xz5+YSnpAStTkOGH5oMzt5YAsUFlWML8BeJkQSWZ9XUCBn2xgUdG
-ngJEwJECgYAemNWNXnBko2VWDPwKm+7ttqNKHaezR5RFzR1Payyfd0MbbZHsDQ00
-VdhGZbm8RMxhfTK4yAQBSs7hQlokwZe/A0mb4cDPbP2f3nwYmKL73P5ZFu9D9jE8
-0K1Ge3cOxOvRmc2OBW4578p3guB6BYfjI/59rruREXsp/lQfut4NuQKBgDTTkR4u
-71UAmiLMXQFfP9cWMGAIoqsP6YSEV5Y724J0dus71BhYKHScdpDp0l4v5OOoWujz
-pPMG/q/MIIDNDIcJSOhS39q4NV4YGVvqiTaTXpz+yy6MEkNcRwZ+Uww6cNUep9fY
-4+XPBTVPvH38Yy7l6qrwFLUeE/bJfN1aWXBBAoGBAKEfZxH6K43DQDqnMrTYuwMu
-1Jx5rtXsJmT0PWJ2j4aXKS86CjXngUxK3kjss5og8iRpq09XqSo2NNtTsdl3Sd66
-Zm4N+hB+0qNW9Hda+wR+9md2j4MfTCb5Z85ErxWtg0kw2hQ0Oh11tWptsKKO+xhq
-JdgCZKetX/SCxJYYvBDs
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDS/kJ+rFuZ9F8I
+dI7GCYGX3LihV6g/D0yBpBgFvPUyi1CuUj+eroRvxkQjVNF4jylJIoRK1c/vK1qS
+nbnb1cev/BjVZjMyVqxNK6ximB16exszkFqpDlJt9Vd6BNDdtq84LM0+YdEfsin3
+4mNHi5Ho9VgwsWP50kWDRZYsZxmG4B17gnzOjAb/F7KcVupHrclm/Xd9gAzVz4JZ
+oMKfOAtcDOroDsaiWzvhTkQLhaQKFFDQq4ST7MKJN+Y+GtCW0ZSYbYb3qr0VVbSU
+En63mPiL+w+obPuLD/2jquIrhGTIJk6Muc803uV2TK+CMQaRAcztUQ/3Yfa+Mskk
+fVGoIhsfAgMBAAECggEAYHttS8CkOJ/jDxpBqXRyYs/HS9wqLv/fc87mP0V7eGv1
+bmlk9zqFjBlFUkS4buFEN1HF3fSs24jfJ3lhopG8+RAWCQttcODqdHV6pDE8FaSS
+uT8S/ghzEB4nLMBkBGbD9DOkfRi8yLovb8+Bp5c+lyEN/WI4veX17IPXGqHgregc
+cIryB8sKz99NqvYbhOJndVx7A1TR5FYshOxsSQUJxu+6aKB3TKYJHBI3UGPZlxj1
+9f+j1K/bT3gM7cZQh1RxAipwUItS4xFsmOMXT2UR0OjQFeTsNZ7Y6apbMkT93DMv
+6mY5dRXDYFLMwsg6ktKSS3KxKMlZUFFBwBJG2fItGQKBgQDrijdt/3MNLGwiox5C
+4iFyfOoFPWl9l/k3yIN1ePdOI1LWEZpClaJE362pir08RjFx59fYR3fXshCdCPVv
+Vw3CHQ8lVCs3CQI6LR9hAappANock8diR41jKO1JnvfbG6GBrHCKpfVIMO+Oa6aC
+cBiQjDIsqlNslXdFN0qnIhApiQKBgQDlUjCEK20p5CWQL1AmUGKjKArXS2mRRN3o
+cMp3AdfDt92/MIa4WD398AGOLPSwVR4kGSQo+rSMigfMxxOMrDJob9UvA0pTt8Nf
+UgT42LM4RW5TZLJcKQY244+Xrk+R/Ppxo6ogPO4hGFPHazZkjBcRjoBy2JYx4sQi
+ShzAYa39ZwKBgBLqS59Cx2uEaL6zWMfIPyVhkK2RC/qxDKuFJ8F0UG/u+EUGrtuw
+BpL/X4PhB2div6/FDZlpy97/hsQFpygk1o8DJGc8BihqScqAOyfgKV47Wki3OWjU
+FC+lZsDlykPHSUYPog4QW81LWMGYNYv+EorxJ0pc90weCLD/Srh3TNL5AoGAeclV
+dMvvVKEShelqon5sdAPPBhnJvdmaFFjaXat/4DRksqXd1kce3R66ZLxhUshRkpA7
+kPvcKQshK1LKghntR2OlDyurLJzaSGQxucq0G31cIzPGOYWcBEiEOOTc40Y752Ao
++KgDO1ZFIBJDN9Dia3OHqfZ2hZXN3fwIGu+FTJ8CgYEAuJWPIK68QYxxFHTPePh6
+XjLeVkdU6UmtSC8cOZJsLe10qdZVSw0SW3MQpDcPmCFWVQxdHZIYTbWpoeQcnYfB
+LextmJ1Ngl+IW1XATOs41EqHe9BuYQdVt+/yMeYBpvfpxejTUCsnd26f1aesrs7V
+lrC7veQvsnU6OtFJvVMx/Gs=
 -----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 2d0f4276151..cbe5364d663 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca1_pub.pem
@@ -2,27 +2,27 @@
 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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca2.p12 b/cpp/test/IceSSL/certs/s_rsa_ca2.p12
index 63c24d98a20..bb43097a61a 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca2.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca2.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca2_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca2_priv.pem
index 97a0b6944ed..350d5fbd12e 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-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDPfbloOIJ2BOR2
-XKlqhgo8DG7MJt0GopSROwF16CGg5T+jDeqn9nAFs+ADLy1fdN0V9x9pV9q4jnyV
-XFPX2545Lmms+X4VYI5G4YTkGUUYkur+AE/fwbBATqclBWix8QmLpGlIfQAGGKOm
-JPnCOyBiLHg+jiNNs/moJ/UYsu9HF17wUh61xojC0orl4zDOAXy8MDjnsUTygkPx
-dnUvBfxcX/NFe45YlHM0KQlRF5Xn3nJ4/5sfFADYYvU6gp7YnJLyRX/LT+vJilB+
-M6HdIarr+xZcdDwarH0QwN6aLpDEe/MzMOo0cJswI7/mM0DNIPD0ec4lTe2JdSYc
-TMuf1Qd3AgMBAAECggEABjmT4T68xJSoqVe7VMZOXUx+2yIZWcnGjPAzvtlRf6Bm
-adpmMqwlN+PpxxQDF6I2ayJzBKKNncwsjFXs8ATB455IWQJSguABig/ZqvbfyKPJ
-ErNosgz/YCvb6N5CLKskvwCWO1tWBQN35BP86D5aM4fOWGDESgr/D56Z7v1DSiMp
-WJAEIIjQD+eM9CcCFcvQyr1cgDZzYfEbf4gCFvJYCCoGBw/9OJMP2qQwXEyJQrzK
-5R5wzB+XfHw7rN/gXQQsm8EdoXGiE0GX3cuMcomzHAJMtnhKSduQIEtbK2rjO1yV
-zQKK+lpZxRQwvf9USNmZAmRXki14CCDbrWy6ZO13RQKBgQDbSGaVJ9Eug8hSYIMY
-/ru8eagrQ4hovzuhNZ9/GPDNZy250MrjwJNrPAGY6MDMiFtf+froIHLsBYEh/uRL
-ssf76fj28HzvMX6X/by7gCCHS00rrDluvgvYbQKwJ3Q9Xv3GFmAjX1/SSpZ9rP4j
-aanLZ1AE4SzCrbOzk7UINuQ5XQKBgQDyO96wC2UNxHCDbRj4sey5cFI0dCSSoMyf
-OM/IzafFy+Se1DwkPPSgtsPbBfwBhRcYaQOJzIQCm2ixsRN/c8uRa9piMtQXRzYh
-DB4oK2DMFShMzepeUrrQ4jiC74qQu5oxKH0wLgQpK0I97I1gjLu3d2rDGcPfJ5df
-tEQyYyoy4wKBgBQHXudMxbx76PYtPowv6DHk4slg17rJjMbCwRi4zHXWcMTCH2YC
-FvT6fCLdT47e/YmcqaA+JoEMV6klQPDxGXcW/diASskGOkvjrzNpFo+E/z138577
-2NUhz9cLI4DfhkprjMhuU7A/g9Ni06ukYQ/lFdf8QTxe5UUHvsdLTDk5AoGBAJNA
-H8PGeXygAIF0LWzow+2KQP6P57eWtizIHU+E7MsJggWnIJQq1c5oq7CV97Z40CxP
-kg4PW+Q10rPJ3/9nRcU12gA9w74O1PHL6v0iOWp2JhRiTGlgQx49lnrJ4OLQmA/v
-/AHwxyi7mj4IcXzSsD38AtNs8yvRZmyQKbCzpXBfAoGAQyulNcCcYuwT7YraYhgi
-XNxgz544nAjvjoeqBRspkVszSnsRh0PMh5jqdLLg3nKhD44aMtvpHlo9736/IGjt
-33xiG6Y2aUZRFXUEE/7BvMJgZUDlNbSX1jKDuPyBHaqnPjaKe2CdHyTrdPOzisN0
-VjPo21PSJEorFSgKnIplseE=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC/KoPGWOfgupD0
+WXh8UddM5pX8hqYedEcpSZ9TQj+CZQFvlbDhsfQxl2ZxlJKuEEiKH64312jgzaDj
+8hEgomF7KUqE4XDnJZsdA1Xah19t+q54FiRDtJYvjrrEgddjz7DhNuaKqYqPk3kO
+cgiVWTHfPfMRqxaseIGXxPVoklDFyR9s5uhmJnl0lAeaEacvpyAp5zhKIgLn/tjp
+NXzSABVZLIphAyKf69SWjg8ZTEaBqneNtYLu1jOnvXRkd+TGZuZUpIvuWszrKE2O
+DnmvmV9s5bI7wY5MKdcB/F2FzO8nKwUsgOyhNxftMxfF4kKQcpouldaNMZSViaPc
+5nTGZ9bTAgMBAAECggEAXotrzcK1t6b9vuOrG60sUsut/U0oxmISucBALKDUoSxM
+SAAcEZt93rL2xxDIdI74GVvuwY5nP9tjCal0QBQfKxbyVILc4GzwaKp4IRKXp2B2
+Pk0RFW0wZAfupfZjbOlQnSoWXhjYvwacNgE+7oJFEJhmaWQY3CbjTQjrqJLIoPBp
+NpGiDGjc08S976ecfEQ/MrVJyZK2tfRVcpYBcDduX6avjWfFORj9rK+O7itIV2Yo
+bFBx3W2//CYdYDVRRzWiIjUOIrAvG1YoH9wsn05XNZur6oviXax1+oHQuMovPrGY
+spQRMBUgYLNXwjeLdGvBl7hafa5hgjdwIX1sJ6tHNQKBgQD8wpx+9HsW4UH8eeey
+/XOQ16BkPZ/mtVbEO8ne3vjnAlfDNk0zQqWUPuvZxzZu4D82QAhiwyT2GrJQo9ip
+GvPc8t3JOKZ09vWpzlDilqdjzWyrjHtQYB24Qh6GWzF2MdIyHpHslJZeLjWIQv3x
+4fkepKtPXPEUzjBpSGtNHlC/LQKBgQDBncsCXk7J7hwOx4So1iVtI22+Iu1fiVe/
+w7+5fxdyVYL+non8Cr+e4dmd+kyas9ZpRLqKEQ4Hbe6IQBfgxO799mEasJFwbB0p
+LEVrYI7zjCWW52J6hTvrMsFWjC2l3lIw2RSuKuo27gO4tC2X2zhVkoSGeC+KTF7I
+T0HKCuit/wKBgQC4w/4oI8kywXk9+VLxGar371e0zwNrX5XMnrQDslSacbD7517p
+oMdvJcu8h4534H70xjwbDfGf4YYFwq/ndedb1UFhDYNIrxqHhWTFLkGwiALvKCMg
+bxJqlhLAPjta3jJ8JrKfEUMWF4tUTzxZK8myp8b+nb8xaUQkQicF2apHBQKBgQCD
+39QMUuvbQiE+N8s1rFZllcIDxYpkjgmEhfGqiNQRfgjxIE7fqvqFX1N39KoEnQUn
+QjbEH4WsrcXQa8dXwwr9U7kkEqudJSZfitXloyj63bQkqok65lC/jBx/tI7K8TiO
+KO2bC4Pn0goa3i5HxnsCXf+CD45h5k6QpNssoG2HRQKBgEJG03j1FgpVyHVH/BgB
+bVgLTPCk6Jfjp8/p5JC+qfemWeOip2CJAdVdpfr1u6Sovi/kMPy5aSJlR9Wf2pL4
+JFUCNoxPPQokOMCAALtpUzftJ4Qaqrh5gAMKye0stoVnGiwmLs7hifWaNbDYCadI
+KSGh70eflLCmn224YsR4gw66
 -----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 5d5f629d669..f1408620309 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca2_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca2_pub.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE4DCCA8igAwIBAgIJAPkreGJfmL2gMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+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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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
-HSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAQRSpgDQ5877+uxhW
-q79KlolBJj9TTFr0ZRfAnIF+tebmHYH4bEk5jG6t6kB/MCYctpJSwid0pYOjNHx+
-oVV+YgxAB8xzuuxJ/vgkXjbVBIH2iYf7yHB+H0G8WkSUC9I7twPfyaZJZPwzf4nk
-S7j8EepJWSmZTa4jxrr42nywwROgn75J0QldHqBGZ3MhK2ee+s7uHDt9kfSSdDuu
-IqMv6yULobSyEqRJNNUJ7gnFyAvN+ZrvcX3AFhVMMZbs+dq9CLplxzOjCj3R5a8A
-56c7ZHjqnhgiccSSdiEIPmpngBwTrRg/zGMFp/4MCqM6eskXAhKEhNuUYancgShQ
-wAy7uQ==
+HSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAOIPsXi0j2Q230KLA
+36wFSRylHb2qY9vXTRpHBGSzxYFc1NLd6y6Vix59TBe2eVobRar0b3kNbKJyYJJa
+vjZHyegelpOkGkDpbTxdc/u7bjYbq39rINBdWUrokT3fg885SNkUPBd6ubg0YWB8
+UcObkHBbfpGNqOcdOmijEq7/duL6b9eR6q27jg2wdsLTdxlLXPSBG2Sx7YIvvVyx
+ZbK+Gl20HPSWECK9nQbtF8hBuYrWuyLTtAMsxPcT/OMCxVz28/xXmEsmBs/p0Ya0
+X1+AptfZT0BTburiXSrKsDyQMTx3SKMUMfkA2P43NyrqOXuokyB8AAf3zQoLozKK
+YPW/uw==
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3.p12 b/cpp/test/IceSSL/certs/s_rsa_ca3.p12
index 50ddf5f1ff5..4d27dee243f 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca3.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca3.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca3_priv.pem
index 2ec28f42a6f..57bfd873d8e 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca3_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca3_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCcfpLjp53yrvfQ
-2NYxJ266QUV7MB4Fx4rmrfw6bvJT+7p0MsUCwLNqOwWVIIpFRpiPXuIoHUH7HXwQ
-rDRmkH+LsM28jM5ap7RwnydJNe3ZIU0LhkDZXxBt+oTjLLFKmxeIN63Rw4PVhWF5
-JNXhdyY6Cgon1mqdxQDt1YXP+nKH6RYCwE/4l7fOmb3a7UVh/nacVlGUSvgpPYko
-r9vCRKwE/vTW6pLFDA07B/kXeIEO74JIeapYdgeO4spW6digSp9YkYOkovCwZ3yo
-YKB0x55y72k33B18UzY6hTX4u3xCGJ2lJPPboSKBhCGiYUby7Mvy4bFgVdDaHR4K
-vi3wRwGRAgMBAAECggEAAKD2T3942CzVam+VmDnWpT1OBXk/dKHdLDE4o0Y292kK
-ci0ySxEZw3BwZL2OSqoWgrR0k4lPDp6LJSDA/uS/m3DC2doludnkxONRz8atgYbj
-iatg2zK5ZNy54BUJ0xE5lGq3WkF3KBJmrms8SAEv3FG2Idv33pGIH/yAsrHImCTR
-LVRDsrOfRkKFnS520UEvC9jH39cnTT4Rp9XRmQYf7l1549pddmm+ezFBH1ACBzpT
-GFrbi0uE90Gfrn7LYZdmPhCrdQs1j8jEC2mr/pon51xAWzHy+ZIEUh9wuf3q3Njv
-FEu1hJXdz/4oXtkwfx4ZByDbwNB+voXfYHu9UCWvwQKBgQDS2qYz/vwVZMOUIn/f
-xtFJoAPd4ouBAdevcKddPuwUOrD+86+U2eBnQNK+LlncfF35X0lc6kD+v9leWtFO
-Qdek0eUF4tbkaDQcNmQmfSVA+c1wNJEhw7a2JSMOcOEmm5YWrKnxchJtVGYalIjM
-0PHEI0oYw/C15DXlUm7ExnGl0QKBgQC+AFu1UPrA+JZsHszMRHb0cfKYCPpzbUfu
-l+nvJAicLNU3fzUYQ1Ind5QkTVCf2MXXut8ZFepnwiDgWqsaP40WJceCeKhG3Xvp
-145XELSHJEbEgPXemJi3m5nW5s8c8WMP1OVoFqp0arNWOVr3ncmMa/0Q8EBYvYWc
-Jh6h93XPwQKBgBmGuuRElEQKxNqkKpLuwNuG8bDlAjqF/JSSsNBLE82HJXJYEgOV
-NOOLJ3g6qEpXDBFqhbkn6uJsW2Ze3EP7GJ4tguppgdZ4/wYDV7CJKf9pvoM8+ez6
-gp4edNYEuF0yLMNl99TxGGX/97R0EvOov/wcwZWp8vQyQowWpK5Rz+RhAoGAAs8s
-i/TDkGDckIKwEoEcpSaeKKNRWK2P97YlTlThD7YV/PkThuVP7Kd2+EZwX7yryDHK
-JKvPSHN1WvvcNcokwuQSHBq+mjWiJGX8g8sKcEkYBsXFXOIyt9xEHQpSm6HyDgTe
-03gqUwhU2HyGnMyncz0Rg9OZj/ZVaGaj408uXcECgYBGLseJRh8zxfIAF496bDcy
-298jPNr+i+1sNUuoQ5LkWVc3UxIDKf4zruhHAw9QkiYdW6UFCdpD+FrESzX6Dz9o
-sRNgBdME5Gg00vNsnDqSaUBiZUmaDbtIz4TyO9nL9OoRWHUDIW5PcKjruQnqAiFg
-xtweJQ+w68whax4tSI+8ng==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC0Df2GCeV8eUvP
+DTsKjVPqXc0a4CRLeXHWKXnfVEW9o2FpP9fXVz/qYmbxZhAv/gpAFXO3Gr4ZtTyr
+t3GAy2d6VWKGe3pjZ7kJZEFY4iKbFSmLSZO1VHgF1dwDiREyGo8hvxU3XxZXJjTC
+JPS4aGU2D+agunfm7Dy07vW2tRZZogsizLz35icjyShZ2Qk443GziYfhY5IVZGdp
+0lr8YDDlOWxpRD7pCHeci0l+ofWe0xNM7uccUvDKQcCOUCF72i4az/UWM7eD0u0C
+iJApcWPF2TUEgm21oLFeHTDjYovjLnPJDdVDiIl4l6Blh1QqDBOFSn/1P2DMy2rq
+9jKwOuS7AgMBAAECggEAGjwTnY0hl+JgjlmiKaZv/K0QLoNMJocadBb0//pacwg0
+ME6yF1lKIc+WqkOxxhxgx/eYNay62CoVHfwLmLWKbUO1qFyjd4psZpbqApZobmpF
+9FqTIA+fsVH4zbcR/1fpVQRvhfLf4XDarRMPaTMk1By7AN5KjCYNrltHCAkYqZR4
+fSOxtkNGAHYeiBnCfuBXO44ajCalKoMRWc0PsqiV5pvvpUyHpzC7oIA0RiyqxLU8
+KwZHcMilBVhOWDSg195597JSE3g0VmAku6CbZ9II2b1Yo2fQ5iL2ZjfBBsseGCcV
+IEKrHz3mcUruyvUXkaSOPwrFoQC4AF+7+viKQayDgQKBgQD5trjFSP1wTfExVN7L
+PVC7jHD23ZHArgv/Z61uX7cdwRuyUIOwqoIpYM9Gdwo8wThxBAvu89XWcIqT6bkQ
+VVhPEmZSTODyHANg1EogR/YyYtlo4Q9K1U91fboMrRDFACCJEWZY/rBr8zl5uPma
+ublkcSfGbh3CxBML+TdqjYrbewKBgQC4llnc4BPKEIaE4yL52AB3DAJ/9R+AkfBP
+bY6lXGQ2yr0uOjSIdgJUUA9rwzsm4U240v67KnGG0f/IHzcyRetDG0dMrmZEOUi4
+xTJfP2iRxX2TVi/q7UvwKa3g7voBx31ojNGees9wCL/Cu5HdnIBDJ/JzS0i7Tp5b
+R4U3cOw3wQKBgQDrq0noT0F46uZVk26MyzpVNm8qXOQAv4HtMlDYmRa9yxEzkY8n
+fVRIbuhP7WrI+eYlqxcEFjXbIu12OR+CTbmBLrFIvOuTM2Lw0ImAu8mbtfTPaZBA
+JN7P2K9s5Sytb7hFBBnepcekqbC1syBGqT9RjwVl3WjS9q+vHi3xrtG83wKBgBh+
+01QNZHLnOILABa80K/OgY2CJrfGI7GQN/OUS2rWut+Y/kSMezfZUXYeGc/4X3hGN
+5oH+AuzKR3BOPCvuvWa9YvvZFPcuxujGOoYLSxw1IhIAWQGLFg276jg0XncH+yt5
+rIOkdoy+jHwSGixXjWncDj+gmPlKWJdyaUpPMPnBAoGBAIAgqtrm4bIE8fxKD8YI
+2XrEHOEnXIyuj4CqI/vEE40mg6VWj7GWoYJShGyAeUOynWoa12InMj8yhvA76bj0
+VcOzjNnrJ+fIQuQKSiT4z8Yc+R/W4FpQsz7eVI9mLyQtltmFFdxEiHh8/7bn9wP/
+Us2H+f0x/fKpUdMOBPpaNrlH
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca3_pub.pem
index ca7dc31ac64..74bf91d6955 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca3_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca3_pub.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFFTCCA/2gAwIBAgIJAPvDfYCNVvS0MA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTNaFw0yNDEwMjEyMDI1NTNaMIGFMQ8wDQYDVQQDDAZTZXJ2ZXIxDDAK
-BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
-ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
-Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJx+kuOnnfKu99DY1jEnbrpBRXswHgXHiuat/Dpu8lP7unQyxQLAs2o7BZUgikVG
-mI9e4igdQfsdfBCsNGaQf4uwzbyMzlqntHCfJ0k17dkhTQuGQNlfEG36hOMssUqb
-F4g3rdHDg9WFYXkk1eF3JjoKCifWap3FAO3Vhc/6cofpFgLAT/iXt86ZvdrtRWH+
-dpxWUZRK+Ck9iSiv28JErAT+9NbqksUMDTsH+Rd4gQ7vgkh5qlh2B47iylbp2KBK
-n1iRg6Si8LBnfKhgoHTHnnLvaTfcHXxTNjqFNfi7fEIYnaUk89uhIoGEIaJhRvLs
-y/LhsWBV0NodHgq+LfBHAZECAwEAAaOCAXswggF3MB0GA1UdDgQWBBTjSbb4T3fg
-RCSArYQ8R6ldvhaRDTCBwgYDVR0jBIG6MIG3gBR3tHoC3VL4bhkfq+NsrUhRB+Ru
-uKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAzMQwwCgYDVQQLDANJ
-Y2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYD
-VQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6
-ZXJvYy5jb22CCDM7O3QitefbMAsGA1UdDwQEAwIF4DAzBgNVHR8ELDAqMCigJqAk
-hiJodHRwOi8vMTI3LjAuMC4xOjIwMDAxL2NhMy5jcmwucGVtMBcGA1UdEQQQMA6H
-BH8AAAGCBnNlcnZlcjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1ZXJAemVyb2MuY29t
-MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAt3nCUPeg2
-4NCplwbYeSRe4+C8KohLFWAA+1dWW9rbckOwpmEQ+mjd4xj9OaX/qy48Ygxu18ue
-W7lQsJf6z9rOxBr+kkDftvGNLHe0Y8GIC7wCtazNeKPUEq6S1NRMarxutj+xCiOb
-7MUEO6k/R+tBs+TdzFqdjPlApzrKRwhHdcFJP5kP/Txo9vtPeBv8x+XqhpC1K2c/
-dICnov3Nw+fikjhlDxjUqKbHoOk8sb21ng4gVodPKcQdOFlVidQu11nD6mNlYKr7
-kaDQCANOESFTYP8nKLVxn3MwWYVx0S92osMz0OqnzoABdW6CnSznshYknoU5AHWa
-ZuQ2CKaVV5cd
+MIIFFDCCA/ygAwIBAgIIHl0SuFnEOXUwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMloXDTI3MDEyNTE1MjYxMlowgYUxDzANBgNVBAMMBlNlcnZlcjEMMAoG
+A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
+cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+tA39hgnlfHlLzw07Co1T6l3NGuAkS3lx1il531RFvaNhaT/X11c/6mJm8WYQL/4K
+QBVztxq+GbU8q7dxgMtnelVihnt6Y2e5CWRBWOIimxUpi0mTtVR4BdXcA4kRMhqP
+Ib8VN18WVyY0wiT0uGhlNg/moLp35uw8tO71trUWWaILIsy89+YnI8koWdkJOONx
+s4mH4WOSFWRnadJa/GAw5TlsaUQ+6Qh3nItJfqH1ntMTTO7nHFLwykHAjlAhe9ou
+Gs/1FjO3g9LtAoiQKXFjxdk1BIJttaCxXh0w42KL4y5zyQ3VQ4iJeJegZYdUKgwT
+hUp/9T9gzMtq6vYysDrkuwIDAQABo4IBezCCAXcwHQYDVR0OBBYEFOz7RR1TpiZr
+3RSDLJM5JFp3HnReMIHCBgNVHSMEgbowgbeAFMuqnyxYLlHYqQh976VAMV5wuGrk
+oYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0lj
+ZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNV
+BAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHpl
+cm9jLmNvbYIIHmQFmbBLbwowCwYDVR0PBAQDAgXgMDMGA1UdHwQsMCowKKAmoCSG
+Imh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2EzLmNybC5wZW0wFwYDVR0RBBAwDocE
+fwAAAYIGc2VydmVyMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3VlckB6ZXJvYy5jb20w
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBADJX00wqv+Kc
+8pK6d+AlxfqvpBUeJUaBzLMzE6203214cOt9R/ycHxAi4G9EZO2V8W3+j2OFyGHq
+YrTfBgzUM8/v527pmBpqQBViSBE7kwRoqF962XQ7LrOMCg+CnJ8yZXj5N7RYEOma
+fRGMe3A4YlEHhtqM41k6K8Emc8WzMCLw5g3OTysQOQwnYZ9jST4z8AzRawzdPBpk
+n4mLmOvwdPMkq1weGd4/wEt8u6dMuqgWiHdwhf/V48jJ21GFpzcCB0sYUt/d48JB
+kKMTUKJ8biNu6UxgIws6d1V+dsFYzHtcc/BW4RZjDH4o7+xDpo00dQOa6pX4+o5n
+tKhBeIOiNzo=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked.p12 b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked.p12
index 424619a5c6a..ebc4da0db5d 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_priv.pem
index 0533dc3b11d..aee29343350 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXGHqwkqDEECo9
-QwYcMhbVanB+3j68TI1dTOdo9ZuAx4IEZM9g09lfOq+fo3n7pYbs+Pc2mEH9M0Ns
-CtCE2V1VC3+j11SQKPuddtakfjz23QJHENFM5xnL5w68bKvVEAoMyyDzOBzNo7su
-o1T9YmBxfgo0CQDl5X8qx7HvienVVMEgV6pZQzhyndrFbLSAKFPdhlq6A7OVya1z
-IueziUBWDBJMgVsOg2PWzN617/QwoBMPfslQCB3Hr0+9EE5gvDII8FEwFnoAfbJH
-w4W4A4tn/tCw623FlN4dazldnzh1ylWIcPyphD3+IWmfxGHlAwzCE6BhFhjLbulK
-RNsSTB0zAgMBAAECggEABrsc8BPAHKvZrdv4ADaNBNnWhBhTdCD25TKhVnAmisCY
-fqidAmO9mbvsCfEG5Jp1ncXjgWeb/PMVLFF5A4oJWdoGyB42Eqv4tYWPP0muXpLu
-4IqTwFjFMeuroOI4b2flArfj0mHsCo8iLgwxo44H3NZwDuxdwWANX7MArrqWk52+
-5wgzG1nWKQnlDhuZ9Bqk7hF+Q5c140mUtsu2wdi96MWw03t8fMPOboYYocXpOXNU
-yEgdUAqfa+Eeyn6XHjqQn+npa6WR4ALhkitlDtY5sjD+ft0gJwiucVxq0K3eeHS4
-JNdedayVX5z5NkXbEB2X9frBlRYOaxY5ZMtZ6lBnwQKBgQC64tgCWRwOjFn/iVKP
-ik5ZPLFg2n4pLwXKRtOUCLGErNCvgEnPuO7RwC4hv09jMW/0l76uROCo3zfCDbxv
-APJ4zB6E2lMUuUYliIPrUf57HbPhctQzZoiZCeFEkGAX/ciT0zVtF2cCoBNJQFF/
-JsWKoV5S3TIhq0MBmAS+q78uQQKBgQDO+TnYh87+gXcDWdueY0Z83hZnmujNqC6O
-vfaKM/CzgUg5LOhSiRH9FJnQZbjP1g7oyzycoVKOxnwkXRadJKCnyjXc29YdXkzD
-PVgipIPmHtPXGPHqhNryx3CDBTfV82iamDUW6SOVwTKpwW6lt0ygotwCxshudEAH
-4CH46sDWcwKBgCKKpOQiNjZWKJg7eGABbyO9PQequqDACTDu0FJPHQhprJSTgJD9
-HF72R1CDfJfX3lp15Y9uOZvczgB263oU0bwT9hwWAj8VU2rChadr2z5EKigkQiZR
-8DNhCRrUGH62sGjqI7jLF4X7sjTax3VZ5C8QTk/AhHCGp/bWcyIOumJBAoGAaVk1
-9l76H1UqjMwaGz6QzFIGuWmCAdwPBpzudl4FsHinmGKhRhF61IS93fNI5JEiOZ/p
-FBiQ+xdQbPns3sOb+ovUaryC+aPcEqyQxeFTObiLPzr1N9ez0kttm2L2jrI8liPP
-MgAtGrah4QISHct093at4cPolUAar2eIIzjqOr0CgYEAjUpip4riSjuuaT7663hm
-v5b1tl4tgR4iQ8px/vNE1Il8hCbVjgDVpQdnGsmHgX/sh+jWbau6/RcXoTD2dc40
-e+cMdHitnquPVXXqhtiB39qs/zYxCfoO4m28OI/U1cvZcdOLptoVh50atZOGgJuT
-+TMUdS6FMvaW24aEDB4bLHM=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqxtJ1sUGp+LVV
+mIWvMkk8SC+3VilZQcY3kpdNVg2jgVriiKjI6lnVmCpqJARFtEkhaFBxGkN0n+wh
+0IwexEKcQLVjO0v5UU2YixZ9tX5Ww737KRrv4HXVMyZFy/go6h/Q4SWqFgcYuym4
+8Ihq3iwsH9+BHegOIjHUw/E90T/KsY8I7QOgrNhjjTx6kuBJZnwoOZxFnhIyvlj+
+d+b0M820JGXu+sN3Ra4VQbx7p41OntnEgrvQaqdSJEb0poQbXO9P7uX0Hxp/RHfE
+rq/mwhvaL48nVsbHxKGtMYArVwMFjsiomMJQSFckk30WU9tILu0nWcVqFJg/+rxz
+z4IMpuazAgMBAAECggEANSI4H/sfEYm6rZ+PVHOiWpmhEvtBUS6IRAkdfyfbhXg9
+NUdMsHpNqgm2hKChHajaqgTBJneD7ljFiL3Qos/wY5o0dWPhHvifWmtH+6PI46jy
+Rp9C7MhbERLhgQzVsLErZftvEwzYd2bgM9TOtOVcO/xMt2j9JsyX0XmHaPLeVKtH
+p5U5By5AIMEHEGhbF7ZA8yEhfqCgLV+UHWxDInkP18G7Z823VwsfeKIT83KC+b3o
+LROIe8M7Jh/i5HsmpkjUm53Hn3hm+utb3ubGVeghkyaXUHSLPRBRrMds6gnZ9AOz
+Rg0mx2KByVk8vKcQmwvJIYTd8oKo7ORVhcSRmxFGuQKBgQDvUgQychy3WzjqBEGL
+rpYQslL3olkf2AWmGWwIJcNofbFREIrPeqr8Zha2nUQm+9Imhz8Tnwz/XO+wpFFJ
+JI1Cqrs58/6wYkfBV9K6soAavaVtq3NYtYiYDBK5tQ4uPQkc+8gPxeQhVIzDr1Y7
+HZrotVqcp5MjlTWKXFlBNUENywKBgQC2rdcQKiJIWrTIj3KAHN82saRrwTRzudvq
+VKkhwjB2RuurQcUXk5btbGG/n7icTMZV+2Li8IrZMyguyCGD482sWde5KttWl7gi
+X/6zUFzAsfjG+0pqRAhddP0U8wHqRcrtCFQeHDgKP8Bw5jsCabyftR8PwiCwnawc
+tAHleL3tuQKBgFCy1E16YyqE7S0kIEIMrfeVWhq8uNbfDhCTU/VvXnQWpjsSm+wY
+jh2sAw6y+y82DQgG5QMlx8k4Om7TCcHjPGr1jUqedwxdJ5sPlTR1SnM57dWMUcng
+9N1ofMv4PH7k//SxBiYjcai3jPvTXP10Hy9HL/XRH/GIt9QfDc3KOlR/AoGAIU6O
+0K6t830+SvcEjGE3PXSkItVmJ9dyRkZLVBFg3p/NpjrmoYbSVNWW+OY5NZ4150Vf
+YTs0RaezItxwZ+in/k2fLG6o8R/WfcX83VrAno2Ua0sz5S4kTE3hOumXpsw01ITZ
+OWgxu4SmJK+FgMogjwnp8OiXJzyIPe+ADQO3tVkCgYEAkKclq6wvAH/BAs7ggEPI
+snfTT2lIL5jO93BMJktPXpz8cnM/23uAffEL+pwbrOohLQJxRfPFl7kBJk+JmZQy
+eNv/3507DmKP4wm8VhEUZfulwh4q9I39Y0GqfvHo/T7Xj/7PXA/thXYFzWaAc1/t
+BQCCoAkesbUAVVJNcIYzb58=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_pub.pem
index 3515c7509d4..a806655bd07 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca3_revoked_pub.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFITCCBAmgAwIBAgIJAMhPhesMBkMaMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
-VQQDDA9aZXJvQyBUZXN0IENBIDMxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
-b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMjA3
-MTkyMDI1NTRaFw0yNDEwMjEyMDI1NTRaMIGRMRswGQYDVQQDDBJTZXJ2ZXIgY2Ez
-IHJldm9rZWQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAO
-BgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0w
-GwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJcYerCSoMQQKj1DBhwyFtVqcH7ePrxMjV1M52j1m4DHggRk
-z2DT2V86r5+jefulhuz49zaYQf0zQ2wK0ITZXVULf6PXVJAo+5121qR+PPbdAkcQ
-0UznGcvnDrxsq9UQCgzLIPM4HM2juy6jVP1iYHF+CjQJAOXlfyrHse+J6dVUwSBX
-qllDOHKd2sVstIAoU92GWroDs5XJrXMi57OJQFYMEkyBWw6DY9bM3rXv9DCgEw9+
-yVAIHcevT70QTmC8MgjwUTAWegB9skfDhbgDi2f+0LDrbcWU3h1rOV2fOHXKVYhw
-/KmEPf4haZ/EYeUDDMIToGEWGMtu6UpE2xJMHTMCAwEAAaOCAXswggF3MB0GA1Ud
-DgQWBBRr3LSZOWWxsK6PWfZppV2BMGu8HDCBwgYDVR0jBIG6MIG3gBR3tHoC3VL4
-bhkfq+NsrUhRB+RuuKGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVzdCBDQSAz
-MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdK
-dXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3
-DQEJARYOaW5mb0B6ZXJvYy5jb22CCDM7O3QitefbMAsGA1UdDwQEAwIF4DAzBgNV
-HR8ELDAqMCigJqAkhiJodHRwOi8vMTI3LjAuMC4xOjIwMDAxL2NhMy5jcmwucGVt
-MBcGA1UdEQQQMA6HBH8AAAGCBnNlcnZlcjAhBgNVHRIEGjAYhwR/AAABgRBpc3N1
-ZXJAemVyb2MuY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUA
-A4IBAQAAFIJLy49mWCeK6hqVf4EreoLNqst33Tjnho8z17ajnhuSHeuzA8nh6E4O
-IGRYCaRpb4KY99oZ2mX017hgj3FjgsOyyFaQxpuYQ6+vSEGEUSEVj872n3jw58qC
-7tLfzBtzLsCnmmibeLaE1QL6J7xvq9KMXgPMe9BfleiFuK4tOVe3fXd1w6oIIv5d
-hefMLpMu4xh7ZZeJz+P3Aji667Z4M/fxFENIPsAg+dbJ95s0hPfTojQIoPElc6E+
-gPyYlQfAZLi+oyK/wLqNvaQvvkZFhyxTXAtWDl8AV2x9I8Yfk8a5Eoj7WxksYnNd
-zmMjrT1Z3K2BUvW7h0DuBUTF73aX
+MIIFIDCCBAigAwIBAgIID5x5xqvy6WgwDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMzEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTI0MTAy
+MjE1MjYxMloXDTI3MDEyNTE1MjYxMlowgZExGzAZBgNVBAMMElNlcnZlciBjYTMg
+cmV2b2tlZDEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4G
+A1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAb
+BgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAqsbSdbFBqfi1VZiFrzJJPEgvt1YpWUHGN5KXTVYNo4Fa4oio
+yOpZ1ZgqaiQERbRJIWhQcRpDdJ/sIdCMHsRCnEC1YztL+VFNmIsWfbV+VsO9+yka
+7+B11TMmRcv4KOof0OElqhYHGLspuPCIat4sLB/fgR3oDiIx1MPxPdE/yrGPCO0D
+oKzYY408epLgSWZ8KDmcRZ4SMr5Y/nfm9DPNtCRl7vrDd0WuFUG8e6eNTp7ZxIK7
+0GqnUiRG9KaEG1zvT+7l9B8af0R3xK6v5sIb2i+PJ1bGx8ShrTGAK1cDBY7IqJjC
+UEhXJJN9FlPbSC7tJ1nFahSYP/q8c8+CDKbmswIDAQABo4IBezCCAXcwHQYDVR0O
+BBYEFCzcIl+SehGKzrzHrEYN7gYaWJ3NMIHCBgNVHSMEgbowgbeAFMuqnyxYLlHY
+qQh976VAMV5wuGrkoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDMx
+DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
+cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
+AQkBFg5pbmZvQHplcm9jLmNvbYIIHmQFmbBLbwowCwYDVR0PBAQDAgXgMDMGA1Ud
+HwQsMCowKKAmoCSGImh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2EzLmNybC5wZW0w
+FwYDVR0RBBAwDocEfwAAAYIGc2VydmVyMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
+ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQAD
+ggEBAASqrxgrLwH3WUoE8AFvlPC+2LOwxLGGl6tc5UojGs4LCy0OOE/0l5xUwfK8
+tidlyG/h9ta+0ekZBHMv7x8DnjD9tDTWE3NSJ65Rb8IUiX4jhRcDQfyy/54AWMeH
+B0Yq2IodGxepAf70rH6P9ztltGEVH8t6Ywt79z1ZLbqyW7vmEM3PdIvC2eUt9nCw
+5hp6GRd2qpPhbMUlXSWls2wYPbp9wZUm24cAjFMe/RJY9ZTtCFmxg+QGNTO+ZHHc
+8KLLzncMfSoB8uCbbDhZ0ky0QQoj+d9B254H77Ci+G0aEPQAJO3JMSMLqM0L+9Mv
+IG28uqiccDM8QVfMooxC57ZUIqc=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4.p12 b/cpp/test/IceSSL/certs/s_rsa_ca4.p12
index ec8fe150b9a..a850a9e350a 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca4.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca4.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_priv.pem
index 08d96ec535c..07945e6771b 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC5OBwn/SCe7DmK
-6GvUoE28RJ20PrUG0GcfgueihucFt8mxupgjYakMIFhypdog5OjW4cTgI6Pfcly7
-DP15OTSz+HmXuaYTvZOVNIvNF2jJ4lxr6ZARNgFdMdAbWHbhtGqE//VsrL7sluia
-FKb8n9sDYZ8e1nMmsL7QAiPR8Vnfqsmf4wE6jU2f78193+nETafdElQnCoJ6eoZN
-/AHb2KHy2JCQr+kiCgqf1jIdLquP+aU670uKymgoD5l8p38H8d07c/gLORt3rif0
-A+Xe7pSq/LAqikWVDj3lA+JJLr1+9ZJ0giF20l3D1S2Pr+bWdVeyf6E2PEr10TXp
-z/svs/lJAgMBAAECggEABNURGFKofbegXrPmpaL9tDTpamZHwc2WddeBT0JhbPWZ
-EQZ9vqU8dwEHCGK0WK8Fi3RTdxzm7cb64rRu49vuuJKkgCVgpFuJ/1a3c6/cf4aP
-g7nnFNPfCufoS+EDJQCt1hokHzmN4k1OSerSWn1EhlzkfQuk8HRPCM1C0vuO1+DT
-mQoTiL59IAkTgqbTo5qTvy5R5LQMYt2bYBTF4HxyYM+35NRyRrwZpo0tHHogLFyw
-hq2B4ygPciGdOREEcNywr27b3vi7U8aTEJpX8VK0JkhvHCg0hdfPdj5hqtTsS/1a
-MiqRdwU6mLmfXU8Maggf3KVtWV1BMUVaBpRbGMT/aQKBgQDopsJpNSMeI/e0jsn5
-J3u8leu3KNRCTIgmLQ8KbG4vqi0tHwR4/zrx6Mb/F56pH1sWqW0x4SrT2v6iH82x
-5pD72FN0c5T1X7fdrohz/cEsQoWa8vCJDbfW0LKb/1GKXDLISD/cjMbOJ4Z0vLu9
-tL0v/+5AhaBYeJQtbkxKw1MdJQKBgQDLzrrYumAmErWQYMyVF8Jrk3/JYdX3RxOA
-vWm9x0EX8BHEiBod4uvJFw6molxuxAkATWEtM6ZtHrfg4JhlhAaXQZuKR8YkEjzI
-grUUwJ2nV+ImeLUb0dMGk0fH0PMqKl/YcZDNxaI2weFC+l5hUMBUssyRjjUawrpU
-xre3V3pcVQKBgB/3kez81Sd2D7oqiIwIpdLi0rGnFYtKksaUGGX5QiagfnadtXKe
-t024C2fPqghY+54gh5V79/OGOsiyEARqxu8j6Uut+gDBNzVpnuw5KMrZFRyWVwCt
-9t24bWJL8btOMdgdPVEjsslu2uW9bRqC9B/dTbJl6gNeBhY7+pWnQwtVAoGBALGU
-VEtowUQLQzYkkb1KsXVoVIyUeYl23bBr2cmo5rfDzsduS0tFIGrbc0GP8Hf2yV0B
-Dy4Cdf1YKaGAMGkri06ZtLvc4/EkDuAquzr0xak8sukQfcVaosN06rNZBbb0qwR9
-l00j6b5KWkswubGTWbGzBPnCbdT+XLpnV0Yhq5TtAoGAQc4YeuDE9bZZZBcyFfnI
-9KMbMVzwPAc5Fa/I4CJAHnlk3imqGeMcLy+0KyJ2hxDdnthW1AlVowNQPoD7diE8
-8u7OYoX0Occ44kzp7gYJ5ejisxysDn2CtI7Vg+lASF8yMOieugf1MqlhIiKs8v4t
-SdnhPb3MVGBXO7MFT8N/iC8=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCtzPnPwheASyrh
+Wn5fh5LLP16c2V99v6D8oV1Twwj8Bf2tifU+H+t50qMULLJJ8pUwBZZx6oNHEq2L
+9g5FZmns93NoJkuopGZQbK11HfwKQDYEGr1XE/vQeOmNMs1xfPi2X3Y9xgFsPUYr
+eOl7WJBs+g3YN/5dKjgaeSYcHH0NDj3CetGhKNoi0MRjWmayGC77OVGbuu7vZL6D
+JR+kuEgSLQW8jdHDwH/TjFobtZ9eLi68Y006DOP9CEfK0fA7zEqyllvXNN6DEgwt
+Ijuy4DDKjgkB0KhHLZmPPbEskVWuE+S2txCZB6pZLUDhE1uEAmMRV1LUHhyn/Riz
+TwPnAd8VAgMBAAECggEAF9uKkjyiNbv7xaYCsXHeknRfNDg5nb0jp/Itqb0c212m
+Kj+FEPNYQ2eI99C/45s/Y/FsarRGs4eql4sd/+RUV5FLQAl7uslgextD/07vpWeV
+kqAqDA1D9KTYaIfIAFNnn79Ab6/hy54opviI0mQApVj49AyRp+/O9kFZnCPD/bnT
+28RzajcTUvyY2mJWbaYItCqWVeVPW4YEqo5ggfdLAgqpCc1hcBLDN8jw7qBQkUDI
+8dRCediWhWUsgUKlcs9YvL7DqNg2E68LoXW2tvynNef20Xf9fiQl+kq3UdhiNrbN
+OPemAOamInHC+eKZzkawOaups7PmcFgGObkVPCuqGQKBgQDl7gNx06cu6m38weco
+Wi5QrY5IyjY2EuFLnHdFhae6REqU4R3Nj+18N+BsX58s+tEvLArKiYqH3YIrQX/Z
+7PYUzDV7AhW+fDWUP5uDbV8rDU4hrM9IdUuRHp+sHtHBor218Syciin1Tld8x/Tq
+B/lUKO060zCsuyOBos+xwiMfbQKBgQDBgb/Pya3udfI5uDlY76wNH15YO7wMVeeL
+q5EovlN2aSbMN5pLr5xQE3CMZBKK9U488q2D2Jhf5OJVhaNsbNJA94CAxnEaUwVh
+Mr5W/Oia12rWexBi1u/hdNvdyEJniv+QQywFniVznl6izqO0sdbcfMDRZna6S8C1
+z8HyBL7tSQKBgA070b7va6ProkD1+BP+fMPv+Ux/NveNxqHPc53wv2KdI53GBy0Z
+p5WKscQLDOJN3VRVuJlHqU2AlklfD7i/RrqTtlBKIm5AP+U0dALwfJXBwkl15MhK
+1/qWRKJnc7MtZrXeF6861Idl5usrpxEBPHx3jo/gL+EBNF31vPaCMftRAoGBALwt
+ZU64HgCrimc/E+W9DV+lhaXgUTrdv1JAAeXRUHDySNyHpfC8UhI9FVIxbyba7r6u
+cLaqx2NZvhDU6Nvj54NuLPUOBadH3Q9svVTylXEe07LH8mNsCdMCRV4kBQ+USHsO
+F51O8bTB6d4BfYmW+A9q8kewkP0R9dHYvA6TNuihAoGAFCHtOXwUcNggu73AytAW
+nX5y18An5UJ81+cV8WxxCuI7w+VCTn9Yr1FZUsaa08qBWdcL1JwcvWHTGExMI7Dk
+YCHx8eDr3LFCPU8QMvj+f4dyvnLhEDAB7pjxg7al7n1GSji0HgERtCsrmQX1LZKx
+Z5jr20ZuaCkZ4aYSWMPGGWQ=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_pub.pem
index 0b88a87e69b..76ee7d0ec79 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_pub.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
-wFQxwJeNg+39qUab
+Y29tMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQB+EsyP
+fKXXhc1bZYJ3xkJG6DJVEAppjs1s8ZiK5h165aj8NTRJc/7sfwyBwP+sG24WB+vl
+SW/raaXfmgBEI2Wu05pUs5831SZB9iKv5DPw+CE9cC5guRb4rElT/jq4IQ4ge4e5
+2B/UbxfVh30L1AIIlKTtTG0Xl5NK0p4tcniix5dtf0gis37PipKVrOsii9SuPUy5
+WdHdDh1OycOxq27gK7gOtXKkdcJunXeC0MYr0JUDBAHhQ6gh2YghS7XL7qPsFQb9
+H4S3vCpHDol38R2HYhZ3STmyJvXuVtkWrVDH53kmh8PeBQ/ubUK1lVBfqXTouf7Y
+ATyTXacB/PY9SM1C
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked.p12 b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked.p12
index 91434cb7a79..6d5881f08d7 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_priv.pem
index af82d6cced2..b5867badc3a 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCnFsewN3pMlKiB
-bBZkfTcbm7KXb4wAk6Ry7tJlek+2WdESjo3MkVzq28IbfzFlnH548P9I+/V27xSH
-M1IGWz4QvVfM+c4n6eIRKXu+ivNX6tlg1bxev+yA1KUv8jxS2Rhdl8ev2MiSkgQH
-IDRNgD6Eyp2SAOjXRw18lo0wkl1OZz/lnSWsjfylT1fr6j785Hdi359XZwvdifqF
-oTj06dCOBDuPIf0H0UBBW274GIACbxy81UXjEH41Pdzdopdlmx+rdvoh1KPikW8j
-I3aM1X+dUj/PcSP2MWibVC3AdY8uGoAQWqelDbIPSdEqIFn6vPh2ngrsShlr3Hkz
-xpyn43gPAgMBAAECggEAKkv79MG2ddhT559C8+E2qAh75xXXrPWy9V07aXDS6OhH
-opjvkE9j5BgJRQinqn85DMiE9ybA9oCDA86b/vvt9DLaHQtHgpcUISANMSjffOv4
-Zyjz7FBNQDeUMVTyrE5EerzHUd5gt6m610rxsoS6TsczqBgO2SAla9p4l0kV0Zis
-sRAPb7xmuz15bW6CPmEFxpRbsVNn+rvCRKVeNp8yX6+o2T4OeDpCXlDHzeLFqSXN
-q3GSQoSErj9VwNkTqjkDENnr5kXcxWR1kSElz8s6134mnxbMfQKW6PXj2vLnXrer
-W+jhuN521wo7GrEUzwhTo9Z+XRDdifAjTW6tGJn5oQKBgQDH+X7SBNd90dncqJYS
-cqFe7VYuxNO4sSeyZ2IS8L7o5ekO24BlLJKmmwfTyIsbvTgw85APl8wXMbd+8Gg6
-kv1kJTtPhwtrvmMkSMqdE3c48DqEkK0YiknZNQmdoE2RFaEpcj1XncBTu3Q0fJhZ
-Lvx2q9FaPc+ZBXOKZeWvhWsVVwKBgQDV5qzW8fA7HtIWg/xQoofqU54VCnUPXhNi
-ERrnPkJIbRj5pF8XEKfEwUg/RL7e0xB8O1kPl3v3X81JpcUMYFrNy/dDxQJEV+Lx
-i3Puic03DICpDGCNWnNthSQQxrTfXOjnNmI7qdlsr5n0IF2jKLDRmUOZJANFv/nv
-HpU+nxMICQKBgHmgMZYjA72uyMcAcmY9+g/2YhiH9g27Ed3cKzZB3ptgWmOC9ZCT
-j45tdFFHA/SXHXoIaXJSbPsebfBy37HgfOVQD8bK6BNb9Ii5DSKEGFs1ISJHrD/k
-vA2zyGlqekLn2OGQbebAN521wXO65B46CatTzT0Jox36xs9CMnSSvRJ5AoGBAMR1
-jvAI3K1gPHODnB3vecgmLr6CkUuhC0p6DWywiS5+TX8UkmXb3UtgftvlZy2/S5fe
-5ojkiG6HZkSrZZVddmkoWh27d76Pvhg+DifcF0jlSdJ6VL/fgL7pl1t1NjEk46Fh
-GM5VzSX/DvbjNz2hJO4Nx8GDCyJoFcWjIE6YymEJAoGAXbWeeaRhhaPk17JR2u+a
-jJddiQKc1jLx+Bi/IjVv28d10lJIkr033h9pxy8WZ5cE3IQx92rWLoXf/5Do3Ghl
-SeLGvb3K+LuaUr1EM/gGlVAGyXdJHYfs2Gd878o6kjGhNUxy/thqsUUzwKuXNddA
-J7iCLNbSVQOz8XKatfmGLEU=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCwYJfc4AufN+dj
+jr5Fbg7yuODgqHBbdGwVlu0YOdAojjGROvV9hUuVXd3UZdvLaTYbaFN/jUi97F7N
+K1Q5RHHfZcaIWL6afgdpqZAKolXzXvT/4irjDyaTAYOC7m11UVFN/k7DWWT7f46+
+1K2oZxCXMuetltQgjMJ9QqNsatVPvu/gGSpLLx10WYdp9S+ZnSDBL//tQyNtMxmc
+0IigaZTTCBPURNVj/5fAq6D14uCK+M39/qA3Z9AFK9WrRPScN89V/zNasBuERWOB
+E5qVFX3U2bbsNlCWothGohy5T+uum3brDOh3LXQOnHraRXtNj5D7kGgYCNU40iSI
+zhD5FJcxAgMBAAECggEADBIsSopN2VF85VAnXv6TiNKU12NHv0aWQBsCcoJAaAol
+Q8x+cR7+h4QzUp4+/uqeMJ2A+22KsS7cZRvGSZ4Q0gp33ix+rPmbncRkTooCKmQR
+DfMnXr9Sc0SrALq7JIiScS1KrC1xzxGRjidllC0rkkGCYBu+vFSN2f9Fyn18SFcK
+gGRhb01PqQdbe2NtPvKXG8VqhWpudBGR5hs+84dxn3aJrUD0zGLoILSlZ1ZtnDqy
+/wXaJjKBrBddwBbouVZU1a/lf3RO+XegBVaS9XV11wkCbgpybxvX/4IlGbjm3XYR
+PuQu7iWjGahIkc3hMh8EfhnYyuX+ag+J5Vlf70n2LQKBgQDqFQixExjD2eiKL1+z
+u5ji63QWspA01x4qjlewXYAQjXwB5X6xuFVY6iR46Xfdy324lXkngPPbo7joAzUD
++uD4ovqsL03mEyPfaKYDc5WxosJX1e6ZtT+x4rwaDJBhjixCiwrE6PH68Uda83VG
+RRR9zxkkTcbJghkwoDcgcW1C5QKBgQDA5F64ZEr56QiyTXeN2nVrhJISa1Ds/PW6
+uNmOhI43CfcFvp9wWMsT3h4hYsTv2MpkX95mfQaPyv6WiFVMRBLsN0OHgZRTVYAe
+vq9afFrApv3RUlwQOsuUIJG3oKI53xYVOmnieFqmqJ5pVtBDpP/bDAcAoE4Zd0kD
+1tLTGQ+CXQKBgQCXXvq752mAXQ2vLmtowstfEnuDofz27pUnV90Ew7HpAlVKtKl1
+K4qlcOQc/HzzBIBMOPybuxv20Kzl/Azwge+xWVNYvU5WldIAyp9wY/JNaL7cJg+h
+fj+uPLz+61kCfPnKHjfclfbFG/nUqtMPmeRiZuYPP+xoqqS3eSOs6yyIsQKBgAgp
+YYyhyb5bSt/ogTeCV9eNy3R2D/2HEoqtCZ+LIk1X4ZjfoPVq/GTB0DqPaE/Rt3aZ
+y9pATgfFihIqgJlyg+50xCm2pOUFyB8E6HyGqHxgVHsH5hdVtYl1+1Ruuo6CTvfk
++df4SbWlitZgMv25vI2zK5SuM7/GGVPNQixmcg6NAoGBAJw5d9P/MODFTpYnOKvf
+o3hh0VoZGaJjc8e2AMsSsjoynAhaap6LyMQRuwBRPOqwtwkb/nnPSOkMbmIXdvop
+1/UN6r4ure7CtmjAsFmDWHzhAH05o3omC2Y1ckmkUWn3nsblR8uzZ4iGDufaFPmx
+IVHntkhfnmrfA2sghzqzHvyd
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_pub.pem
index 9efce48f11d..aae9b8b6a46 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_revoked_pub.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
-tLXlY0l6wUbC3VvH5oh/Q4OIiNw=
+ggEBAFma/d1fJRDz6LWRn4CrcnxDK7Rg32v3jzsnsksLDJhuVKxjRwjcXbZ9jlTw
+0f8xyE3xh+5mDxRy6T9K/SRkRwD6aCzubjeDnN6fqjP6jVzsACO8tdI07PzLb/85
+tT6QS3ozfFfz1vXyn48G8ajfRVIWsJ7JVPYdMIMrIm59mtzcGZ6kJ67mwBmwZesv
+Vzu2h9EL6RQdBY828JysBLJwZv9iSCobGjyKTBHe6UCtHkaQVwqeQwn7Cjur51ze
+oxA1l0jgHppHbfCCSV0JlNqPVNrkS1z3J8FT493+s9ZuTxS8OW15tu4hziL53n6d
+bxjnozTrJqzLyM0+udEEI7EG9GM=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown.p12 b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown.p12
index 38023024b04..12c9d3cfb65 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown.p12 and b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_priv.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_priv.pem
index cce5c0437a9..7026aa8591c 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDG2Wxh7ekpxh21
-9S+aK7sCUrqoxs4iL4sDQQ6RSKo4uzo5u+m2J/8NFKY+3T3jR2zVE/Tfy9dbNPfK
-pEOyb9BBidIWYtEWbj0v9vrCwXtO26EkVuz2CXZ33avwivj/2VoS0Z9Kgl5eHd/R
-ye8HNKhAT73/iemAFJ0tKokzcfqAnHMvdnZ9N1HNpEbcCpX+pFs0CDU4qoM0ik6x
-tQYtnsHITSaeTef8mNqKebrE1KHUIZNem0p3lRPqA5JqDTBuecJHkf75XNvw89lJ
-jDbWMcSMXZpdPznLgijJVU4WODqOrQi14FxXAvWxOsgDeBCMVuF5Mi/4KMgxnuPm
-Cya8UDmFAgMBAAECggEADdw6W9du35CgYgjm1O7JkHd5Qh88tNvOVf9Qd2EoAkp5
-8WvEdi6yrl6l2YRngQJ/FsQXFwwDj7yGWBYxOiG6k6g6YAE/yeSMYx3qloLQ0us9
-VRsyVaeiXb0HtCglA9pf1vzMXFpwHvcjR8wfmzI5Abs9Ma+9z5sVkJV3g5c6gCvS
-vxsal9jsZk91gY8jx7iNhASRN/pYdQ6zqcVUK1xhrRuMuVb247dlaDxdt4ozgCzD
-6gA+rZKr7ruCiUxKmXCpULZVtE1d88kggPSEkx2uJEtGMVzb/CNrH0WcnDBR6y+i
-BzWbPzZ2KqK2Bexm8gwfw7EqibrZwz/lLFknXeouAQKBgQDgq/rfXc9BjfiFINg7
-0DZy8mJvLHaBqXCN8xNH1jPwYjI3UjBS/Im0oaA5nBQ7GsTdTBzqK/lnm+csZXoP
-vqsPY55xNMOdlWICdIR3Pmy9+YP8Ni4BryoR+Fl8aS1mlIr9de1zF24/MXuYpfIA
-1k9+MwhxTaucNPu2XlWFiiWHhQKBgQDik6sXtPN00LG9djYcgbczRwJCvuetWOEC
-JDFM81bT8wa+/wVFTyK90x5Q8iKFqmhbrCnIFFnKuNqFcIruybY2ltcCnqs6UtKl
-/hMNkjKslSI/ZybjN9LYq5KRDs4aATD2UpkrJ0QfkzuLjfmuatdd1GiLZiE8qayC
-IjvMaLmKAQKBgQCq8vDeSHjMvoOceFNPn6vuZnNzd/drzUsxFwVSoa+/dlgTM9xF
-KJZ29Iv/ibzzA/lLEQDnRTJuHXgWldf8Zu2ttfT22lkFbIa4q4OnX75KBrLgkzEK
-Ywe1yKv+N+EtrlTbaoGUEv3142bRzWKINIkj0xzXaWvsXXwxVTHpfCX2KQKBgQCr
-GFmdqE4jyyg86tRHyIhgF2IUpvZqB3C6XjxAYI0TtjRE7Gy9ftm8QH1nIMGC8ECn
-4SUX6o43sEmLdIXldbq8FEG+v7SLcVmScX9PwzOy8VcQS8Oo11HHviAKnAR0zKt9
-hrgVRyyBL3xKkOaXmCSTvT9I7NFybqpPBqzjWb2qAQKBgEjFl89amFPE6pQQ8SI6
-OIV+0IHfJ60ubOUiMziqJqfAcgTj3ddXKBKt6yOLrq1bjBW+CNZV5tc1OyAUjlpN
-VvAZlisitURGA3OsvY8SIBmxJwMC5Qe72KIobW4BZQNsh3NUxbx0qkq7CHNequQM
-9YYadK1sPV8V1xsKC1YPhs9H
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCHscc2wRMGk83v
+2mvUu3pSkb0vCHxbUndt7yQaLNgL+8Q+LOlrlLJxNl+8YNTophVGaXEJS1roZRJ2
+Sdko/j3ltMahrGNDEes3nX07/fs+ChJpq9cq5wyU/dNbVyFi83/bb5hIN6Nds+8Q
+90dl7MGn43ScfdBbwzZvDgC08gG2CP4BG5e6MgXtpc2X68eAlec90A1byyGwVE63
+qnYBdMCIwNxCcwt9i2Ggmbfvc9v9XA/qpIRPCOat0LYNUJ5qTKd8xWUGzZpjuo6G
+VubJHbqaPQcauq7+jCKqjWc44LNXCg6GSU3MfFZ32isp1vKzKXBYhsFo68FmHVdq
+rYN1NpTPAgMBAAECggEAFa9I3TdXRtlO8zzODPsq41AWp2dX7DDOaiXpzeRgYEXg
+iL5yTPbAhMwXhN9aluqXrXQYlCTT3HND0zMeU5Pm/ghOJ98Ie9rnYoYLUeTW24Vj
+h487vZzvy02Rkwq7s02jdJoDACN4ECI68FSmtyNHQquxjSKkA04RKwfWABSem7bc
+6mXcQj4EQNfy/UIUOkuVcVOs6UDSh2MJUww6LImSvXX9aiI6yWdnnzJQP306RcaP
+963ew9MxUfUNG6UQ5UuHb2Xzw3k55Zesxph1nrmutI/WR5xESeTSbL/ReKeapoqe
+T/dvo6qBj5eH6ti8QoGmgYeN5Ba1dVRr5bpXxpcYIQKBgQC+Fhi0oUXwR+GK1dDT
+vYgDlLF1OYxee7OZBRCvKEURmB5sKytL2Mr4Y4J6rvLZxKjU7FmNMYaCfJGYTocl
+bbI9Ou4W9QAuOgaotEBaZa1D7s89vFQUX9XkMTbgjx/bqknsIpCC1t+w+U+yk77a
+im1fM5f6sGm39aFUxPpUvmM2YQKBgQC2v1UQ7R763XKoC/OFb4DLyzcWwrTYiiEW
+7ngxuIQCrJUehjiqNikrvqJjjCL0yzfPRwpYrjQEpcR0FTCzQ2Obd7eSzVtmtVNr
+MIcSjcjCSqb50R/1/VeFpsbE1emdYsthwtdmyrfiEy3Yt5T6Lnb5KCQ4O4ObtkHL
+/wwGrGQ5LwKBgBke6HLuoUSI61iiuy9Qa+o1O2KHkXJnHKwLTFIpmz8hAFxBND6Y
+zvIWjIbUGgoHgFxrQ8ZyFhmmhsM/FYMvxQ9se0yTYku5pWmkMKEBsO06YS8CdYYf
+yC+ZBWyV3Zr1HUHUq45vAS7tM8gg2GcfRib/tYUOzVnfX0vJoF+UrZ3hAoGAZdfN
+JWiwKig9XI+EgCl6wpgWtFWACWk5NZliXHsy/naFiARPEfSrDxjnUMjpNjkGejph
+9rfmf2yORg8FG/IDUcHvCR3uwRduTL83l0xyxGxsD67Ou/0ayH4AKfP4hGBpbary
+9fMldRUxKKRuntpELWiEft4T4zQ4COKzJgjutbsCgYEAmeJQkZNt7KezJx14MlUQ
+a29BnltZg3gPH7rUZO3Vss68EFxNeQiejMu50ur2IRMSMsipNifUJ3UUgA3+9O+n
+qgUaqwv8JnIk4ecug8DLRfzGE8L+VPzf2uXf7GUgL7Oiy9wH9GT9pb/u4dVUy8yk
+ASBMsjcJE+jxPByD3Q/WPIw=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_pub.pem b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_pub.pem
index 1db47c03c9e..e3a1873e3c8 100644
--- a/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_ca4_unknown_pub.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
-5bUwgqGi5zHa90YQGyXX8w2Q+A==
+AQkBFg5pbmZvQHplcm9jLmNvbYIJANHr9QHB66X0MAsGA1UdDwQEAwIF4DBiBggr
+BgEFBQcBAQRWMFQwIgYIKwYBBQUHMAGGFmh0dHA6Ly8xMjcuMC4wLjE6MjAwMDIw
+LgYIKwYBBQUHMAKGImh0dHA6Ly8xMjcuMC4wLjE6MjAwMDEvY2FjZXJ0NC5kZXIw
+FwYDVR0RBBAwDocEfwAAAYIGc2VydmVyMCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
+ckB6ZXJvYy5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQAD
+ggEBABOK1GoFDxBOG25Nd5M+V3n5WawgJNzhQdTZA8VR+VNtb/KCN3yTdIPeLRmG
+rGJKyhQe/jGcogo+OGJ5gQIPLaV38BCoBbelrAO2q5Zo/UsA1RJ21ohHBwmG0HeV
+YMy/Tlk3EB1uxreUV6d9gLFl6sOOalYQNDNi40hAVUcYSfd13YBb6gfWxUtH+sz+
+OC8ma71HIM+ZfjtwSFyw1YnW4R7b4cmttMQE2B9j3E8eFdEk/BoWdl77uD1m+mRF
+HETRU/kWI6o+5OuVNK9D77+XeSOSXQwB9Ah8kYpb3lGuaE4JEB9o9eJP4kGu/XX6
+gKoH6TgJ8167pwHCuP4diZZx814=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai1.p12 b/cpp/test/IceSSL/certs/s_rsa_cai1.p12
index 3c022ccd05b..652acaa7372 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_cai1.p12 and b/cpp/test/IceSSL/certs/s_rsa_cai1.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai1_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai1_priv.pem
index a257843fbf4..ae141d93201 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-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCjlVzHkccof9FX
-j96xpWZoU3uFepmq76oiU5d5X2MBQe0azciFuHt6kDNvRIe2+UstMdlBvGnJAVV8
-nuQn2jrbM/XPs+VqKZJzbIffit1EMu3kGLMlhM+9pUnUs+D+hzvcgqnu0ecZhET2
-rt8C42Q5WvojS+G1YPBkLMCyCElJAfkFZcvwxbwzMNkLkUVKxYHsBI3FNuod8y8o
-hJASBi3WXRoIxJ9TaSo8DwPNGJzDed5sRuVSObNlT9dcU0u8x0iWIZ8Fg+uzbfYS
-Ht/7Yzb3g+O8Wws9wYg+JjMiCCvkAexZgscBy+daH7Kx7Gt8/9pRLcTy1AI1D74N
-/kcqnentAgMBAAECggEAA31OK1uquexwFMQW5gc3NgaB3gkNeh3+rRjHZGlqfT5g
-xm+ZVXDoAWdOEZOOqZKLzf0AO2y/fPAwWKYzC76V/tMO7U1TGX6lhxzLkTMvISNM
-+86jE6vPmqYJ+yWTKRrNZhjLczK7EUpHBlQYocEkBC0ypMobmHjm59wkiCexGIOP
-hdPUQaRTZmZIcgiy3n9tLAPUhQ5Sp6HcHFFAHA67KLvE5JkIs8N2LGXpFvoIxXYI
-TMo7lksEe+OEfm11QBVXT//gJvlgLTlc3QOqClqO/z2L2EH1+MUwS/c+6PjktBIS
-JvGNErXShJteJPCEM0PieSmTndIYVFXjek2FLUlTKQKBgQDFZNLTKdRUac3V5YkL
-rd2C4y4iI+PcoLdxFxHpm4pOQRwdcZQahfsK+NGq72QT9hFe2zhtrlMgMBb+evH3
-lOIMrD3CMRaxrEEkj7VQtROwHsyB0Z8MexAHfcwpNV/0sC1BCmMq527gNJCeTs1m
-GYBvYZb1UoCrUoCImaJnvULbqwKBgQDUJrxXXP5mMFuIZqWKstOMI2Owr9HS5j/R
-ckBlw/jnXz85UZ4m5k3nnsicdR8n14QCh2/RRaq8bUGRG57qZa5otyG6nTYUj92x
-8abk+I8BNOigNpTEB1VhxqlaFy04H+mBAYkVR5zlAg4Gx7cqyO4Rv5pUrkue9HcS
-QrvsGQd4xwKBgQC0I27ChknfPy85JGAM6H5eFDTlsxsfHQxLiGIwbmGpSIH/3Mbr
-7ZlMSgYNmKocDVOM3UKB1bTGixxw4IIxDw27wvQZY/Lx8eEBHKS7IoT1FSZM0p/z
-I9tc+tB2St9mzeB+mpwla08kDNRtpDyOEHfFLao19zS1JHVoM8yiH3YEQQKBgQCv
-kLrOZZPWR3CIScH3LRQqZeMLBgVTTd5EWxN15B7ogocUzTlfIboY0utbpwU4eH6z
-hReBDPFFa/kVt9DkU29pExxjjdSCYahqqPufgx79NabJZ0Hnk9YRy1C80G9IgghA
-DWA/bvsk/XVUIRSw4IU7xN9X8sF78v1S7E0ODoyDYwKBgQC9Nf0g+0itDz/gbZ7F
-e0mWVEWr7YdG8MrRKIUiwIjDfJahKk7AERwATwnjO2Ort+zsOBuQ9dKH5JIXAhdO
-/RXJCY+pcbmnJtXGbl9RCsE5vJ0+uq+y7pyj9UadkFZ+Vt+BfbwbeQEOoHKdq12p
-4k4Wtw6d2zEL3iUqyXAIXtpVwQ==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQD1DTgHdY5knT1J
+Xeh8xj/yO+hYEzLCStH7r61moFjWhP7rJcKeLBBJQZc7tYB1ukGyfXxIYu3attWr
+v3wlCm3QCc27SUbmlzt8+6xHEr/rXyrIcrL7+340j+quV2b5UzUmh8jVQs9bZZWc
+2WexoGj6B3RhhvK/04dZtkZCQ28n/MSTDjjt1iPVA7v3/lrVzQFmgKFG1ugk//eN
+Nnd2+Wtd+rKHsWl4ap7iIQyWGnx7rZUm08048ZHICxjDqfYO/+6dzaK2dkMDVn1S
+9SXzPmrgeh7/xAhKwQswGbIQWeyapZkNnx4TvivWSQoA/wXBPa/XJ+52ddrPUx2L
+xzkjuDOXAgMBAAECggEAWdQ2rcVSJV/ej351MwgZeNqtGVwwRzjWMMT9c5lj939Z
+UynMZd8ROUlp/uFR7dYRLzUA0igxuPM88HCJOarRBmoRmI4MB4t4qyA2zvb4k3eX
+X1NseSJ/6RS4mqA/hzYRTcaIwGR1TrO2XID1mg+La9w/tWCaq+cGvsQqjS/bF3TB
+k/XIVJCETBoCCuZ3j3omUXteSKPzn0w6qz5sW2inhfsAzDB3bAHVKQWrxgTWylCc
+xi91XSgAR5uVFtGmv4auoj+Aamo/s3bqG1mdddBizUWk5rb7iIo+gQITYFL0AwaP
+3AYNfhqyoI2VbY5gYx+qnlq8q4s0+Tw8l0aIz9H8AQKBgQD+OrdigDizCNjsR7et
+aweU51NTnfbW88CA4QQ2/0YoaynbRYTgO5gjIw20j2OZbh/J274PyUxou3K68HXl
+du892NSiG0DMwWTE7/eCx//zdMfAUsthhS+DEegDrQAcsihT2zyGuAwUbJFlq86c
+4Q+TUopAlOBSDC25pO4NfTHzVwKBgQD2wiOOy3bQZYvtupXukYp0pFPAs62OC9NZ
+GOA/Vv8vsm0y6KZnAWQTHdddBDxVjNXsd7W2e1orWuWi74Tn6wn5u1wIQhigI4aB
+CVr5s6n1L8M5zVL9jzQx+5PBSZ+rW7eibkBj/ppMqIr+UkAIMDo9nYlbopZLwzfp
+iIfXyK3ZwQKBgCEEARLSsgpWKM2ulqT31Fk7HXArgIXzy9kw37pAtpzDJgFq6tGw
+C5bsk3gScw3W5lvxpKIqMzkattCeL8FoC7PNd/fBcE3nA64rt8oNLSkxzksktXLp
+t/zek3H+wpf3bxNM0nRwbGkunEdG46Mt+zbXrkqqyuL83+dPCvdHffgrAoGAAmy9
+9LVDIaEd0uQ2fPWpKqRCvm4FkpPDK+j2qyirsUhLkmh+2hxFY3qzlxJnlV+g6oXy
+nyxvImXuQ7+eyrigjHeu29XqcAhpVfNFlZaSYPprLLI70ooJtUQHm6qhiwmHsGzs
+7Q6fbYlqdD1Sq8HtkJVvuBrM50mvzvesfg5WxwECgYBe32KD8PZ9KO3sLOkbnbs9
+DCOA8d9OexpaxCUVm72RHnygr3P7937zeSBfckpwyQktFdvAwJfbnsFaEOQIjexJ
+2kSL5sjP2XZuLdLLRTFJuJJaAK/s8TqrWj4cIiFnk6cOl7UwiKLFgStr4wm8Fi4Z
+x+tX9yUPivqg3Q1/zssnXA==
 -----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 9720c8635db..4a34700e022 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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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai2.p12 b/cpp/test/IceSSL/certs/s_rsa_cai2.p12
index 484b3fa34d8..9a8065659dd 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_cai2.p12 and b/cpp/test/IceSSL/certs/s_rsa_cai2.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai2_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai2_priv.pem
index cde2bc4be60..004b039f672 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-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCVWs4fd6lg6y5t
-3DeBdGomLdE9Q5MTraN+bAC/LpuEeGOTe1/EatBTq3YbCairiban7byvdAPeDYFd
-wB+ozmLUdgEDciBK5GT/YTkmLSMF28lXN1Ia058FUs1IpyiWBWpDCvZXxmDKNI6N
-VUxHw5wzn1uCcxzcStn04Sd2hKqLWu1mKMzEP8qhRFCFoWORJgA1Zeki3GKyFY1g
-H0at6BgAn7UwQVMi68SNO3HigM9nv4UkoVZVGWfFvzPYl4j8HI+S8rkvoIxtwBtq
-p9Dp6xw8RUlgmDwTzU+bQmupqv2k4rHLZJ1gRpbXGmf0ubDIDI/F2u2g3ZoSZsf6
-UIqQ/NqPAgMBAAECggEADHJhLoLUwndMYEAeVBM1QXHyDRlTlCvqrdTRtHJtktBM
-TsnVBP54gXCO9YPhjaIlbxXt8pqdiTo2PMTlHov3SojRtCLPtCNtPfyGkbrolKAT
-cHRIyw7geBtwG4zqt03uOXYcFNvlzGmC3nPBrqgLnXW7X5djoVbk68vTyRnB82kD
-emNjNV7XfY2VPFAMTLhGMJ4LzapUEQz3dxsN2h7ti4FUvTk9jv4+4WEyMy/Om8SI
-VOvS63wE1rUS1IAmPQF+rMbN0vorxw6H5cennekIbuEMsXnjbS9YejZsCi1o8TjJ
-cahPO+9OnbnRehcsBz6nyzx3Aq/9O753IX6oqI7aeQKBgQDSfPeICGd8mukoV59Z
-r9jrIlE+MnH41tU9+5qptm9p56lmHUfh2JK9QWSKpfLOMHn5Bb/h5rZ7rtQHujQ/
-0c75ET8ieb/cAgrcDQKeKJ0eV2C1oDvc2Umi2OoYyl1MaDRUi0V6MDpnbpUn+3wi
-6I7I5eGQ15N+y8U9EkCo3ackEwKBgQC1pfPuiBiCsMuc9W+E0ipusvtWSTNx7pOb
-5nRZumxGTWL6caQ1PHuYRhITW0VwzqF9faobNBSRb57W3NSOh1tWH3NggVmReXVU
-6ZRiQcgv3SrnyL1C4hPKjy5UgBXIrLvdDMrlzhM4r/rrs6bazUnbOPTd5XGrm5PU
-n2OKjhgnFQKBgGHQTts5RJYECuuDZHqyG/SQuv5TROFlPC0UmffZ3oZxcCgS3U+X
-bAFkvQstONsWbegKAvRAWXa6dK+umQ87OZpGqHcl6sGbdV5y8U98Ah+SbU+ZyZfE
-pdJ2SLsCdz7FgePz4HJ6rPlZyxiMZlB2j7vOD/dWJqWanerWa5PNhRlfAoGABjjy
-Gzi0Rj3SK8VIla8xXutoqrMFPSDkE5IYaD53mQzrmBKuglhZD4VO9zTIMy4Q4CCe
-5CGrlrPRKCEWcu92FIQtSqADtnUHrOn3eEoyllkoMBpzSUg/T1AKUUC1/lLUeKUI
-iki95dI5cTuNOq+PmR/hW3yRoURKEx2GpmdpsmUCgYAJevE1s7igBMTJfRDgSStT
-d78qhmf6FPSRX0m08qMGqRkDS29MTyumY4WEwGW9WiIIkLtazirgln0bVM7rV9dY
-LS/obAbFzOi2jj6qFFG0FlCQvGcpN/mRbguJ2hl/SSgibxzWUkFRguuh6ix1Zhq4
-vx2sPeoTYMlmWsGYSvtKew==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDzkTrks2w5FQkg
+Zzk8TDLoaqhq3kb0a+FAVUT7yTX1FTsPplmcQsSVfMSZhS+Qa2WmlrDAsGSxpEAb
+rF4PphXs9dfyWs3XnFnSY02iDQo4GN/zcPz2L3DW5tcWU+TJEjhPLCyvN/anxJww
+4AerkmmzaUHt4wGbqkM1zPKPf4xAqn7I48gWfOvRIsfFYcy0RdRM5ejCXikeoVcn
+wEsinl7tOMqhZzScCMiAFZJYOKH3z1VGmI4sLcgYOJBsFPfGE7+3NbbrPqvMKPvn
+kqUVyZPvS8cHMYWa9rPqx5y+JSm8In9bVl+Y0WMD79GwMI4P5tVboef6xfgHydOe
+icsdf6GdAgMBAAECggEAF8UL0g9nh5+Tqy+fsJCAJFnqUzmbg5V2n1Ri/c56X09h
+2uphUuRaMnuBZTkP9gBhJHOOztM4FHUC06CL8muDNsOcPjjZ30mRI3zQ8fhjT6uv
+yV50tWLWWIahJXrs+Cl4yNM3DieAQQmpM4TdgsMwYROr3Tca7FHeqsS0REhOi+3W
+34mIJKfhV5PxoCXXLh1EitTswpQ9a1q/LTbB7UwOZu5B/x33fJU9X/itnEPSD7p7
+E/wD0pFlI+TkFRDqs9w2u4+oO/Q/uFzYk7tM0dEhKapsFWa6FWqZ7Nn3KDsS3N3Y
+8k8d+ETE+B3uMWlmIkZ+WvcGhKtbdMPQy3RE6q57MQKBgQD+3qNQU1M5ZspZUY9t
+fzirlJ5fIL7r3H9m5uujYYzlcGsac2TivxB5UlBfRjj/Mcy/p4z4DMPCgCFaNvO5
+9Rru07O+t2NC/MiENsitpdEbQ/B/cebHwR0UaQolrGw4ZoGocZ1oWuv5seTpCSda
+FgU+FpKySKThtsXuoLmveC1T7QKBgQD0pcKY1jl/XPmhX2Ep4jVel3V+lXbFwVSU
+tDreFouyoEAoOXVIL0uqlL8fR4lxvSwreOBOLn7WXHW3J6ajqbBvJx3ziPbZxUcI
+dq9tR+0QidS11Vyxsnn+87rsTyn76fVX1ROGV2S8h8CWSLrKBM2plWXElTmbwpwa
+aohV4u0ucQKBgBSvbyPKz3teK1gadYCWjbvnQP9JghVUfQaWAVPuS+gnOpoX+X0p
+sqWWF63T3jZgDVUUvS04o/66NXrD8P4LtZbimbkF20mJiKCqbZkiVxlWZ0OAtBFM
+TBbm+4rZNqNRNn68UeExV+uZE5ISSx5VoTFL1bYgjTlAg0n9w3RJVax1AoGAJ61+
+mxUbbCmjHuX+NzHF4BqGZspM4hPR6PA2H/DeJVFSNnPjLprlFbxcJvGOPBEnScGn
+92YZEiEawmK+5wpNYCmi9O2Aw574P0ood3vT2fvQsNDy4KsGmC/lYBASyhWOwfj/
+2qjv4JfPx0/yY3NV+6wMPk7JchalBK/EftF4EDECgYEAmDiBKDIFeD4kgeBOO4aC
+Sy0N64hyowcgxd0lPCCJ5OX4CKIVhtoT50MDPwx/1XcxpXEvXeqVDSLGXUw84oEr
+uiWuA0a3Ov01ee9wqVAziT7LO5sW/rpHfynxvl4CTN152Z1oFewDfJfc4UdDFHxy
+rXvJDBw2FWnfUduVrnkUNyw=
 -----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 7479ecd8126..050fbf020f5 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai2_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai2_pub.pem
@@ -1,84 +1,84 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEwDCCA6igAwIBAgIIFbuD57VpAFgwDQYJKoZIhvcNAQELBQAwgZsxJTAjBgNV
-BAMMHFplcm9DIFRlc3QgSW50ZXJtZWRpYXRlIENBIDExDDAKBgNVBAsMA0ljZTEU
-MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
-B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
-LmNvbTAeFw0yMjA3MTkyMDI1NDhaFw0yNDEwMjEyMDI1NDhaMIGbMSUwIwYDVQQD
-DBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAyMQwwCgYDVQQLDANJY2UxFDAS
-BgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdG
-bG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWHsLE92wzrcRfxhw
-CybhBUGfR33LfAEgvpizd+Csb0H8qjKOH6jLiM2wGTIER+jKYX3YfNnT21+M42z5
-OSDOJVVNxNXDqzcRj4S5Py29uouIA1kQXqOT/8KcdNcq9iJbx55tE8Rb64D02p9b
-dY2It4t2/+qY9m7cMHkwgK4ZzrH+jD/WOtDzK4oTXSIO9fjMp/o/+0Nv+imJUvWs
-Q4JPwjgSarZDoRpwMXPFWYI4XUkVeT8F9F7oeSlkSCdb8UX6OhHU29shMKJOrhSK
-6nywl3r2vKUMXcGcvPgac0PmXiitujPxHU7m4jODFG+mhIxbwFCJra5FUtxQ1Uo8
-e0CPAgMBAAGjggEEMIIBADAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRiSlFrj5GZ
-WgU4QSKHM9VBhm08HzALBgNVHQ8EBAMCAYYwgcMGA1UdIwSBuzCBuIAU8jtG6ro0
-Hqe93iNe2pSmeDZ0MkuhgZSkgZEwgY4xGDAWBgNVBAMMD1plcm9DIFRlc3QgQ0Eg
-MTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwH
-SnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG
-9w0BCQEWDmluZm9AemVyb2MuY29tggkAyUsn7ylOxxYwDQYJKoZIhvcNAQELBQAD
-ggEBAIJBRdBWMbJSoVJkkdtyZ9UtHtAd1rSGyKA5y1NcyNAyus2MkYv+1Y6vkHfn
-1lxGO5mRTolDCKwewNQRLAKqcVKd33MzTIfssHDrlqh+oyxWVoKg9S/1WPu8YhS0
-1QwNF+etfroHjYQGwM5RZoZDUbZVS1ubSjothpzpNjZ8GYIUdbV6wjA8YmmyGR+V
-g6Q24YDdXwagwElUndYMuKRnOVfR3YvBhN7NSwEoPuNf71dAHncMHg8fhP4fhdOq
-92HJOnRnxu8SlItF7Rq7KGBh2+4gh69RvddSlhEUMam3FCuZ9Yy4uvnWKwmDHczP
-JZSn6IpfkLAH4tM8WHSDALCJZAQ=
+MIIEwTCCA6mgAwIBAgIJAPsFplxafcOCMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
+VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSAxMQwwCgYDVQQLDANJY2Ux
+FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
+DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
+Yy5jb20wHhcNMjQxMDIyMTUyNjEwWhcNMjcwMTI1MTUyNjEwWjCBmzElMCMGA1UE
+AwwcWmVyb0MgVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMjEMMAoGA1UECwwDSWNlMRQw
+EgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwH
+RmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2Mu
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w6jJO5vS39W0lsd
+qwEigtwWvaUmPMxeWJKJlV/4ig51RbtaZDUa9eIpsIENtF33JHhtNat6gl4wKrwZ
+Jgk+fEEWF/9ZqZXbcht4T/HYsmD7egWkqbA5VVqrg62lXMOqV4mSwIl5sxIMO4k1
+iouT7hR53s6F300nJv5o6vMKapMNXhxBxDkSOMJN2C88TVebzSI/hMb4iNs+CMTE
+doKiKsN0lQEpPDwoydJRB3RwCYIvdGH2JOtAXbVcKZqDyoIi9dolMejadC94V9m5
+GXs2y7i0qO7QPEWjPeXvxnUZvrEHLS/6HxKhlQLYsP/rTs08X4TQfj9DIvfOEIL+
+McRJuQIDAQABo4IBBDCCAQAwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQU4DL6E7Fj
+d6n/7WfFD0zD9m1XsLAwCwYDVR0PBAQDAgGGMIHDBgNVHSMEgbswgbiAFCgrCn9R
+XBPBR6yEX3923g8KoS2eoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENB
+IDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcM
+B0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZI
+hvcNAQkBFg5pbmZvQHplcm9jLmNvbYIJAKF/0S3jU4zlMA0GCSqGSIb3DQEBCwUA
+A4IBAQBAc5mLwMOWv0vgHNEMZbmjj72BzcsmB+7VGGDBgoZ8vfz5ZbwBWMUKIG+i
+rG1MmH94WAI/OWYR7uIZfPxjnE1Jzvu2QefwwimvXThhj1z7cwjzwVdyIRmABQLU
+KFpr+YNLMjmqDK5k4HcFg+jWGj2+1BLUYB8ZE9AyHR1Fge5VO8PJlPNWedL5m33M
+kodPdXF8Eotn3gygY9QOS5fKDeG4Ds/ADqkAa+e/zt2LLX/V7XtCdgKk25tKgNNo
+7noLaSfnp66CofTGlRa2xAOFH0jCcdGQ7H+/CZWR6se5I2TNyFblr3NAEge29mGR
+uHRrX5GqieKNkGyxU9KPeiPexsY8
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+MIIE1zCCA7+gAwIBAgIJAKF/0S3jU4zlMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
 VQQDDA9aZXJvQyBUZXN0IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
 b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3.p12 b/cpp/test/IceSSL/certs/s_rsa_cai3.p12
index b5cb8e32cb9..52b5962b144 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_cai3.p12 and b/cpp/test/IceSSL/certs/s_rsa_cai3.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai3_priv.pem
index 1b90526e924..ce5e5ca47bb 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai3_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai3_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCngOlwbPwWpr/y
-+evMFJMrGVOYv1vuwts3eUPHW7Qd14fztxQaooHVvzxeJsRZcm82HwMmUezrrVVA
-OAIaqQqBjZCFmaAeGGgXN/F2FFlCtWRvUJy01+2Lf+juMD5fVK0RLcviaYGCVu3P
-IxlRPabXp9PFP3WGQcOul8cTfBpWWyZ/wMJlMwuuLmOXA3WNaJKYMF3u8vs4mm2w
-sEeHxJJYrBFlUOx6jDZlP3ZvjcqYCJRYx68GbgB8XOOyj/vqIU4p4ASan46qzypd
-6KqEdwDVRXz5FwvK8lyAibUHKgaanBAA6T2CokPMio1w4TPHKtQwRx+kRCrL4uer
-QS2HYyvtAgMBAAECggEABab8eZ473XnQBV94nQDevHgU0ZU3gXWS1yrg5iPKjq08
-ubUmWQW90twqqdSuEISjixR90ze1gnhtZYbeT07/+0IvK8r0078oGAx7uevS3UTo
-uDbkqteUfP4aepsnJ6lgU7GTbTb5N1A+oxxAmPS3IhTYORI8oYSrmUMm5Rnte5d2
-vw3JOhn4CKqsTXApSICJT13YqlB/yn58lexR5j4M4BscpmagSMCjnpEkr/FebNeD
-kAjy2Fm95Ad96NptpwgZPA//f3US3U8zIwNxv4hLiKEUeqKiN9bXvkMFsBsYYVr1
-I0PMEj2n1M+zV/NLOJRBiYqBeHK/W2oiXGo/28iEYQKBgQDqCHAPHVl6dBh90mRm
-8EYfnHNFQnGUZb5ZzxQYXcSYKJVHZK/Co8y2A+8NzfDC6vu9PqPckdCotXfsx9xE
-JIgHWJZ2afXOHXVOqHxxaEvVnQgKheTq3Ekh7uyyX/IM2P5S+oo0mZydhxjic5xS
-V+FxiTXVKBl984RFf6vRpC16/QKBgQC3Odf9Uj7XIR2ZWsOrRim0sAO0lPzJvXhX
-qxlIKSM2TmtSMN5vp8JLZZEWmz18kVVCHX7hS73mpkOarNkMoKSIQqVYT0Xfh/X3
-AMWslPUo6czq0F5Ot8jSQh1G0fVqgscuRNSbSFKtrwMZwLYhZ/BLsrJAeixvIIvO
-Jx0rfyafsQKBgQCeJ/+ap0nt0AExHnqNejjZagAYQRPCppNh2+iHou6VqW9gZPHG
-Rq20H6pwmMjo4KYpOOjByaTKLoCR+mqnfkyTMlHUSj08AnphIsmeVk5RWKKzgdK2
-yRF/Jhi9XsuT1Rzh9MBrVZgaeM7fUiPFHfCTqpc/qq63iFbOJL53mUzG/QKBgQCv
-MZfcmG+NtBRhNfAyLHxkUIi6elrba1dOPEOIRA1vN7xWcnO9v2KARTVdsEIygaRL
-+3f+ZDXH/OJXWz6OXGv1/gOrVOEywwXkj9BzHFruK9/MBkCmdASJRr5HoSpQFYvu
-KdJAR/8GI3mLfkCn4IJbXxohnLAv8aa8D5pMpN+BgQKBgQC3QV7Qg4Z9df7qaRuV
-UABi+0xBMFJFvK/kGRFn26lg+0nqieFuFWDjswakBb39F864ksD4Zo+fETN65m+u
-770fEaXxI1BP8Tnz1lOJXTUbK43muVx0gBPLlJE9bUekG5r50X9EFJGH8PlSqTc8
-g+IViDFDJ/9ufkvB7HvdElO8dw==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDAgyx30ctGrgiD
+rhul1pQp09FZkrHL2SPIQGI/sryylIBFHed5sK3/r9FvpyPr6PmAlE3eEXZ/HH8X
+//8KewoHfTIi0Jo+e1eRxc0d1tzj7XNPLdZBqEMwlpkcy0/CzG3qvRlchjBnsDUA
+TQdtzRlpwz61Gip0Q5oXBGA35AeTcTMoZuSmk2+af3JlD6cWgcBKAm8BbWplb2Z4
+r53VABC+9VdkD562DIPcCRBlHJo2mPPtHi8HiVvKKNJyo/iDC3+DA+B6vOd/igb3
+paMB9zliVNMlbljICugeq2EwWzyCH7ZCy2mjTyrdHFn7qcFz6M7TR6/PErP3u/i6
+g5fBYVmhAgMBAAECggEAF5r+BOMwrcYBPURIF5msKUTT0svuCTTi8lcStQTRpoQX
+BmKYU4+ahlOktrAj83Vpwp5sveIeSY/Q9bxqJXrYy/pJ/4LcpvSw1CsQ76u9AiXH
+kdno/7wGIRsWQzWa3iP7BmGRjorVvKEanqLTWl9f0lwigEppEkCH0HK06aWIWEe+
+aibEstZrfQi/r0mq28fytjpsM0nQz+amTYAMbplwUfuX/8LY900nxMcGzY12qCnN
+T3r4jlUAEPD6FkEooXcv3Zc11ZQnRnRNdahVIwLYfu3z8JYvCUwk7/o2SXWtCBtR
+dlIH0msZc1Fh0FFBi1L8XifFRfShkcd7534YuzuT0QKBgQD1gZtsqwujGbZxdr/Q
+Gahk0CAL3mSEyhxuAhSDEliZFI8WZKXaytgXXG06dxn/FK6uudTwyMPdJp6MP/Dt
+9p2UOGvFJLwFQtEYMtisPfkaFx9yg9NafnhspQMDTRXA1nP84jTwTMeYM1uQqosT
+WICEqZvK6jS038Yj6/Ao7wX6awKBgQDIvbGjQaSmjB5bRnKvsbSUPTFxGWndhjA9
+hhO3SIUYwFHNcT3oS1giBRAP4+9bn0nLFbbUL02jJf3hjjc31C0k3QloRsbAAPkH
+79BQv+pjBzZOM3D0XVlzkiaTCP2pnWNLvPz775pvq9Q/Id/Mq8PKsykLk6LCG14D
+OQpxM1GXIwKBgQCgW6rgnQy52RaxICaDz+6NAuCbwASaM8XEGTm6r2YNfz9DGjS3
+J51kDOwPrzHcym6bFCjBqfE9Z3dSFoXReS9OXFgQakEhkpYvHy8lukkWQJo6215X
+EpqoJFRGeLhHwAv81uhLOWt5v7oEUVEMLterT3nCXZ5VsoCif/7bTdzyxwKBgBSv
+PzukSvQCYipjkvO5qvLPb2XJCZiS+CuOwj9TkKthPcyei5OBF/7BaMtKYGKfgjoT
+7bfle+mAw61XOydcjJ5MzGhbSqWENCT2OA/qBpvXpWffcxcq+0mmWKUz+vdcSVwH
+iEXphY9WNFOhCO+ND2q2lVclClNYAJLycLoDYLfjAoGAc1bWyUKCooMjSnzWNZOs
+qsSRufsb4xZ3Z0oNeSD27LGWFws/nBRQCYDRsvkHqKQ+7FAvih2eZ/cIXioK8xoe
+jdn9/55jSVZfsQTG/XeauvX4/Sy3abZhzZpOpVBy4qjRyo2ZOhqnzO+7KXxReq1Q
+3kyoOC67yr12wQw76EsPr2U=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3_pub.pem b/cpp/test/IceSSL/certs/s_rsa_cai3_pub.pem
index 03d1869c77e..ca76481f3ab 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai3_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai3_pub.pem
@@ -1,58 +1,58 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-bmZvQHplcm9jLmNvbYIIMzs7dCK159swIQYDVR0SBBowGIcEfwAAAYEQaXNzdWVy
-QHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAMQRv+Z+CLcfQEs/LVpbieqB8
-kLp1US1z1jAE2j3f7zd9qZDhaB76dVh4ei66HNAVB0Uyd0zMJUNFv34qZawIkeNa
-7DrbJ9hTETH14kLt247MtDwzqB42avPUasmyzGDub2Ij6yLipaswtkmX1jOFjjXq
-p6E/8+/iAu4FcvjKnBOsytA58ZqUAou164cdvFYzcl7pz1MeQ3vOFHxzGU7VbOjp
-DI3LWznKgzvvOTOvLbRQ4O+5gxaskxKjE+A14cDM69XTejlMcNQim6eEjI6dufHl
-5ANdUXRpfVU5EMlhgLA/RZ5PAP/R44ocCAd6jP5AjPr52cbtQJ4UVtAVSCkvZw==
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked.p12 b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked.p12
index c1b18aedac4..a49aa62d5bd 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked.p12 and b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_priv.pem
index 7a84369549e..169579d6abd 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCM0DAxl9PZ8iv0
-0bZ7pGas9+28BHrRqHw5R3n+92ESnTePvQ5HoHVxhfomLz5JlEqyPRskL797SF9H
-M0UTUB6BOa9BgPJOSOlYUDMlKKTAyprdXgAQ4/T3yls8Wi6SjCoHlE6jm66dRXy3
-xd8ZYmtuN2KibZECI9dpLGVdERhRtV8zl6dMRL+v4UEZCcnsa6qp5ke9NTKjECyk
-CDdhvwlBpX9OYfHCcuPZSnotf7l+1td7Jxc9fB6/g63v55jyMa/nM8+PZVvLfcGE
-AYX4MlZ3Kg3AhjmIaYb7Sd/qUW7LSoXkiojAE2dCQF0F8YUmzUz1T1g5RYtHwZHm
-ug00YtUtAgMBAAECggEALEjxTzeDrgCGqHkn3dzHWdCjWMVD5xoI7262RGSCh/sf
-1TnM+uPQ68IJ+OZUvYlAsKudFJVbsCcDp/3M1JUW8uc0YfJuwgYWNOsMGryci/Fs
-IQCGHsnCagefB+0IxpgEQ9v1m2jD0rxey+EUGASm6sPKZnD08Opavb3zpwBQWKmt
-YmPDZ6shihscYgptOvAr29SQApMvAQMdsSO7yYfxc+D+oQGAkjwRwWy+cL8K1szd
-2WA5m1IF8IsrwGmdLRhdZybEAYJhAVQ+wk79vcM66xl0uryZdgf23WN+G2kU5LSa
-q2f3oW3pnxNNyQO543aEph0SfLSCVW1+QVJVOo4+tQKBgQC2mNswiuR/RaPYsLsx
-U0mJuG8PrDiBFqrl3QHZsV41NXsOQLQP6FjfCNU2hpWVBW3XsQUtrkpofOZiWjvF
-voST8DNg7yJ/gHuua/7WamfPoZZkd9fVtmQCLP3jqTvH171FR65H8O2XozN+wAE0
-5vtEz6A4qWjfyNEdbsogG8J4ewKBgQDFa1ZoIYqqTBl7RbsGLiARw+oPuQKJVAeX
-iF7NHEdnVSfjm7G2iEeNe+FcrF+okZvqVhYZwbnAQ55/ErEiOZtEYyhjGKlGJQKx
-y/Zp49p9tqhLPto7ZWYHGwBv+kwphNQrSVlda9ODBh3vkjHO6WfVr+QaFlbgD3eL
-eUJHrkA8dwKBgAE1je4KXW0CVw1uTi8LcCc7U3D1IQKp1cPj7Mk2RXtwuTnk78xT
-K5N+iXrs9TyhZpLRF0mwJ8n9WcE4+8BZfKNGKfDwZHgXr7n9+RgOaFWVqltL99/w
-b0UcayoAyuaN5TD6Qoszaz9f0015lAh3px5TiaoWZR1mRQw+2ZPQ2z7VAoGAICdV
-UWx1Gzt9wvged+k3S+1ux9TINvm6qtGJLzr13jyeXJHVJfeYP9D3aZKhmeDtVgNj
-YhqNWGUrAWNX+k0Lnt3PjCROHaCVicPAhIqZ4XPIgUjhXl8reOjK73ICyZhavhoa
-Nf8D2gk7AvP6rMqTINie/Ci7SY77V3oOc4JL8A0CgYEAn94Ny+nXnpTQI0/99a7Z
-QYfaZEwHmu41p6ueuYLgIyXlVZLlCJPgd3hLYLgNkILqD5jq/fM2EE2LdEpuDZtm
-IlfO7oHnfQeCnY9Ca0cgnMxDah76cA6OpehyI+uGMHrMvyXDNri69E3D8XCbXfLs
-VR++twAOk97SnulFzzJWcx8=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCpjcV59Iw7dOeL
+aPVt4x3HMGnvgAJoLGZRwuZhoG8oa+jYemqEssvbITx3aFDc+yaAeO27iZGRjw7s
+2chH1m+TihPxH4L2UXqIZf2Od4b+sRk0Ex8m3M9Gu72GcSeeYrPLzgtvYkjUlUGi
+yVAVXrb7cuaX6jqDh47OLLICy20Wnd2mfNm4CNfplRezGLPeVh6iFmXIkAwJv/rk
+jX+uXF2C6g1ltXJreX+9Aft799OgEtZUbg1Neb2b24yXFganPORprpPOElKcCsWu
+goTKl/6AvdkyNqdzktmWwhopnV0nmg9cQipmfvKLrao87s5yVRlzAoKg+appYdis
+a1l3/WVJAgMBAAECggEADkrRYvFWl3XIRXvIdxsrmcHJUZNJy1GKzR46YJpZzwoh
+ljXjdWIY8FTB4xLbq3T5jt94B/9AUl5rv1KwS5Xre9VUzwDSqkQTVHIRyIjndoqj
+zubvEPiQpFa+UsSGYWx9Lr3PQElZovRzPu9B8pCJqMfLtkcxPYBswju0RFYKJltv
+G7TNjxfHyfAz/3g47jwCmTm+zcW47cUNFtbTscwobsybYmVY2zWjtk60Gou2pyHs
+6/P8NrwphkRVXXLTTahRFppmw4NKZP0Dv4P8SOrnUfAk58I/eS0khJwy71IT/zsc
+9hAG77nnZ6/ZbkjZjq9NtnUC8EQ0hllSwfRYIOBMPQKBgQDdXgX6/fpsI8RUdQ7t
+jlFaPu5pvgqIPEOCfRJnWiyjwZoutlhZ+8RNQaOLXy2SXC/1AdHGJ3wipfGXc93c
+duz42tSG2sb7dV9w8mdoE9czbBUaRL/JPyX3XgHZ9EP/q6IkLfjCs5eoPMEdY2AN
+xPTCIQGSdetrCCrqWx8D2hXyCwKBgQDEFJExzfeMu9pH5jZ9da5B3cXBxGZHoUdD
+Odbi2pyFs4wKyRhUe7PTeJWsEMABJxEMVQ4syy1HEIUXbJU6VtLAP7XjVzOmOc3p
+xZ4374bfRurB3fLZSdo3BUuaJYP33F3rpsmw3cqNmR5kP9lOaGmrAb1HOp6PtVhO
+ef7tN5COewKBgDiKQlbINgUW4Zd8ypJMbmTxe+2QN5pyYf/bOC8jrhEpatsRgeGB
+17Kv2DjJ15bxauJWU6EcBq3G2r0HQByGV6J8KhpDmN0zLmxnzZecsbOVoJI0CxQ4
+x9a1sR1dMV0FFoXNJCN+wXacBeserbL2ollPGtqwua99x5BSM8rFEiPfAoGAZgYd
+lkCJMdz8srSCXb1Bslvmbe/3GAY+wifyO49sKdVGZMZFto+2/a2cky8T+IWPRU9s
+VLpTEMrztUB2VSif+BAuX+Abq74f+ictMAWds8d+lukZVx4qQL6sm8QxamJrLBZY
+k4KTxiGJwrfGJhoGAUiiZ9GEd1nwXMT1dBCZUskCgYB/gRHEYSFy7IcZm5vgLpmS
+nEOvYp9vzJcez2pJ97M8oY01Ip1rBr9cBONUPfA5/sD+5xdHnaxsAQ2ByEAZtugG
+/ADpp4QVOxXK5dNte6fCmrG+P6OEF5aBqTC8bdnyCfZjfudcpWhZcvi1IJimp9bS
+hZ4hdPR9J9Noo780udtxRA==
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_pub.pem b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_pub.pem
index f2a7d40d7f0..0f57ef4e327 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai3_revoked_pub.pem
@@ -1,58 +1,59 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+gQ==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4.p12 b/cpp/test/IceSSL/certs/s_rsa_cai4.p12
index 7e5eb262be1..996ff5e8022 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_cai4.p12 and b/cpp/test/IceSSL/certs/s_rsa_cai4.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai4_priv.pem
index ee21a4f2c92..fc4332f6aab 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai4_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai4_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDo07ESMI0oDzwd
-aPIj/LxuDtS6WYkUs6RlU+qjq9dtyDD2Kv5cn+D9BxFCMmucMXE8DsaeMOkD1dbX
-tlTRsOEERSo1NNEOhZZsG74NH1yc9QkQqL9W9+Ox8QrbBqhpxbWY7NMgiwN+8UH1
-RzkqeM83NvpGodz/KEmXAd3MbIECnNcE3tZypwen2bddZdV6m0aZ5FqvedvH+UG2
-VHvxFFMJ8WiyeRR18GMA/Pr/mrpokToJf78lzYuzSqrHSOWcrcU0HYRrEGeRyYL7
-wzkeR11+rD0pycrZ+Pty0dH+kb9VnzGJcDgES5V6PI9QdvtOphmc2sr6t72awF8R
-jCg8IxJDAgMBAAECggEAJZIPh1dlV9sJgNdwB4WfpITpJ/8Nw1TvyNgfS3UN6O2+
-lOLANBMqm7oZu1xmiAhkdOQPgfRzjYZiymFmU4Ye8XD1zCsvNxAwg1aAtx5h9AQI
-h/MrGS4cRJkYftqWr6bTVI+WzDASitgEpD9vhp6DFa5d+arh/hyyr1cCQxwZP2Hf
-90b2sAlDM2FV1KRUzAgW3ZChSEeTb9XzmK9F0hE1Ncp08KnRMR+OOIEGgKrrX2YX
-5vNg8qCVY07vzzT2yX5uajSG52T8wcEKuKhINVXWrhcKH1Gh/ZkVwiZmrIZlSXcn
-DdhArThc6cGnLJyzHC4MoOb/w59VkK2Gire8NBjJVQKBgQD1rPvgBxrI851Egsm7
-VB16MrwlCN81lU3VExpTTUVHnOHJbrscSvL0nxp7iyz13IT6iLYyyob+F+4wZXWg
-c0RwL5Bn22celLD6PaJRsyYP49JB1J8UNAFKRoAjcVCm/wrM0wQKzyOXUv3iT8RI
-1oCQ+8i43VApHonjybGti293hwKBgQDynHp/owsYbfNWtseXYD1cuIEjJZW0rQB6
-F+U9p8QSe3v6i8BYXhjJ61ZvxrKiqWx5q9IC0y8GECCfqEK+OLFcptkFkQgWdoja
-z7PhHzEiUx8DwpaC6Z+9ZFR4SzdYIHFBsoepuoLTb/XyptImDE0RdbaEKaaian29
-yIGhODZGZQKBgQCQeDAJ1sO2hiPmZO7SXS2UbX9cW/I+pVUGxtwFPnxOF4BjHt2j
-TqO+nE1Ld1VyI0KDvZ8/EP//Lf1gsllQiFgnjKDjog7q2c+U6Geqman5UCSVl74Q
-eGCF2B2EOh+OhI5KUpCe9p5cX25zBitMFe+20ol/xI1eENpPfI0im8tpwwKBgHap
-HikLX8PlEx2YbGqXgau1+kNsgJpL+227/j13rqiziOH0NHGEJG+uESq+bmSspQel
-iCQlklxOywYL0AklxWnhmUfltaT2+Ny8tegnz2pQaVz3cZI6Hg0N41qqvzj1NS/C
-2COlu5MasZqrCSHe5lrhzhE6JexOVY3bYbuuuK0ZAoGBAJeop2Q6SpvdY+XmXHCY
-buxB24PtHDWYVS0BXz0cTuOI8ISNE5JoSB/iU87O++rfPja++3MEmXe0qQEPSGQI
-NXuEO98DHcqIdgD2tw8imSFgAJ+oO0cPyVjsqx18uFQlzvsCm1DrY8YrTLFc161y
-wB42B9T9tEB/l/w72RoYzvLG
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDIEmoWjpAJfxKP
+EE1a0ZplFRH5yE067G6YJcmjDAvd9ZUR71omrvZ0hcNeGfzI8HuIwUDwuSQG8zW/
+98SA0e6ZaP05UfFzAIm0ZSqs4LA721IkNkiiKSgUWIJ0NtaidoGnjz/AEyHgne/2
+qK0xtC7KXuaxGWV+ZbV3OsY/gy5W/vcQ+7pVvvtpaIdMPvBslmnqzmxiswg1E8BK
+WZeb1utl0ycs+ykmAhttM0t+f654gPN8QvWjDArwfflZbydmWhfI02APpjAkDBeG
+E1gyDREi1FKhNocxTJVB4u4JcUpkr3rwCUHeVIIuvYptv5byF4i1+MZZv9yG3t/Y
+3c7ZmiD/AgMBAAECggEAVZ+n3mp5006aUzbPXDhLAsqfLE6gWsDX3e6CGnDr3Tye
+ZRQR+W80k46xm2K00Aw3WkIWuE8Lz5ujm7n+U4FEw0vu32ql0ilfRaBsQJtSYPOO
+dmfy8s95UyfEANd9SP89osfIKTwm6fm9ukrbAGQUCFDQGuf7CzqdDF9Pe9v454qo
+sEStN32SEapHlJCgSBDnJ8IyaMgUtvyAIKZOri8qTM2VroD9Ao/ToEs5czGERaOF
+3VNlYbOYuxQumS4cRIaaroW3kULAxgwuT554XausP1h+3uDrKCCgiPurqsDfv3DD
+ksBUrw0NYgy84w0G17uy/vv5038eh+U4sBJUKN1ObQKBgQD8orI/VfgfZnYov19h
++Mk8deZTrmC/27RqswprtKHxYU3sqFCGSf7vkup7crggrXMsCJXgDOVQI5p5flyO
+BChOM+9Ar84awXvrqRdD3nGORmmk086101BUJGExoa42XTHGeZ1FLc2rriW5Kl9e
+frhCl9gX1MJs7NG/DqLlKhYLlQKBgQDKvIOwv6sGY0PGLekCXkSweofKxBR1WLDB
+CFWI6mz90J+MKWoBTxwsjMDZXtDrO7XWOv9PmWac3+kxfB02+ukJKpJi2BlOs8GR
+6eSNwYFX/6oW4Lm9gWt4TGDnRvw5hrVQNkHcOqiBO8RYjREF9KbimtXQ8GbC0glK
+DVkeJeJ1QwKBgQDosMXytjE6YrpUX6fv6iEX8hP6YXO1Yxxy5oOjnpVGaXRHlOPO
+PJt2eGBG4ewcFQYuuZ2p5tbTkGd4nd2L5OJm3Ujx0LvKQwnrjivilCENhWdKrNgI
++yBSz8tB1oRKiF4PS/aCQGTeSyFtwkxjEd6PX6JmmM2XXCz4h/ebkb8KXQKBgDU/
+cCMzJDtIRRu/IS0DD21+sT27ZFgx1DLO+pA8aiX77nvEwNfZLGAzE8/DzIGMLEU5
+N6dzdfUMBlZ977pqClzi9pHJilQWeGfXk7T7tvoi50yc94vjexOck/MKvOJrFCIe
+Lgwmx+0xgm9zlZ4H1PE9k50OFx9iRRhTCy4U6za7AoGAAYMrz3E37ecoGwegOUNE
+1MJsZXWO/85KirJ5NqEh884TowXBIHQS4M+ls38iMMtF6lfUKy24Nndt/15kRqV6
+KfQAv8iesoXu+dRZ/QmJAAw1nztp+CSfOpAjKGNhS+j5U5/ilJJaOvWgJmC8tQ0O
+95vaGqf5KJlaW40yo2OOGPs=
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4_pub.pem b/cpp/test/IceSSL/certs/s_rsa_cai4_pub.pem
index 4860ce7eeb0..f8a77aee570 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai4_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai4_pub.pem
@@ -1,60 +1,60 @@
 -----BEGIN CERTIFICATE-----
-MIIFMDCCBBigAwIBAgIJAJXMvdhqwg4gMA0GCSqGSIb3DQEBCwUAMIGbMSUwIwYD
-VQQDDBxaZXJvQyBUZXN0IEludGVybWVkaWF0ZSBDQSA0MQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb20wHhcNMjIwNzE5MjAyNTU2WhcNMjQxMDIxMjAyNTU2WjCBijEUMBIGA1UE
-AwwLU2VydmVyIGNhaTQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIElu
-Yy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYT
-AlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAOjTsRIwjSgPPB1o8iP8vG4O1LpZiRSzpGVT6qOr
-123IMPYq/lyf4P0HEUIya5wxcTwOxp4w6QPV1te2VNGw4QRFKjU00Q6Flmwbvg0f
-XJz1CRCov1b347HxCtsGqGnFtZjs0yCLA37xQfVHOSp4zzc2+kah3P8oSZcB3cxs
-gQKc1wTe1nKnB6fZt11l1XqbRpnkWq9528f5QbZUe/EUUwnxaLJ5FHXwYwD8+v+a
-umiROgl/vyXNi7NKqsdI5ZytxTQdhGsQZ5HJgvvDOR5HXX6sPSnJytn4+3LR0f6R
-v1WfMYlwOARLlXo8j1B2+06mGZzayvq3vZrAXxGMKDwjEkMCAwEAAaOCAYQwggGA
-MB0GA1UdDgQWBBTtAzCNQR290EH1zNxsSKf4GJIa0DCBwgYDVR0jBIG6MIG3gBRk
-IMxEvy+zvCTBjViYfp1HGHBLMaGBlKSBkTCBjjEYMBYGA1UEAwwPWmVyb0MgVGVz
-dCBDQSA0MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYD
-VQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsG
-CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCAKPlQVxnEHVMAsGA1UdDwQEAwIF
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked.p12 b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked.p12
index 1ac63fe2055..56921ea6245 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked.p12 and b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked.p12 differ
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_priv.pem b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_priv.pem
index e73f031a5f6..cfef88e4d05 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_priv.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_priv.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCiY81cRolOEtM+
-bWv5mgwhL1UBsOxFgSdzTtbjUtglOSd1yLjPeOQkusUN1HWYd9RTvrvy+u1X8QFB
-dV+FQLrwpqJlV9OKbnpqTIxXkOMJ3dSdpSWPDdQOwGUfqG/LVuOvS+RlTEj5TYaR
-g8Fs2ZnXMA9TfAAWODwFUU/2L7iqJhsoO17AG44EhUkMmlrunRDxDA8ns2YaDFlW
-tY9GStEHAt+U+D5TmICp4h0+4I3ltpLZinC6GTu/qvmI916W1aoAT+uFQPGEfgfS
-TFJzo5b7xqXdh+EKYhIXnEnA1//o6Hpk4zHAzdYMpe34R3ypjDInSsVI/9D/tdOl
-IJFYM7gRAgMBAAECggEAB0r2IQ9Qj39hmfKuEe1CJmruUA2vd5ufmu/AswdGptm/
-P5c+b0rdlsIF3CqWIy7kto6Lh2kBRGQgGYiVyiqL7HlGbR4LZXnQBV5RJdtfWKik
-8MqcOjOucuR7gpOutg6Ey9SxCCpA/g6Q61byOhP+yF7jncJPwcwlZQWFC692E4J9
-1OkQOj8KfvuOLFwebhdLqu9rzayfTcTxDnFJDXU0dHY09WoemIces+xQ7yKiQoBP
-4PuhNuGfrsGjzwX3dOOi2zgdiGf4OyB1NU+blvgSCSl77Wo5ynmxir8gkw8vPUi2
-XizOCMuwsLs/SbhxORZMMIgVLuIT7AtjG2v9fFBIpQKBgQDQmQOtOtl7LSBeAAIL
-SBRjQtC7FeP9e0ufMpwCak27Q6DvAA+Yxdm9OXxZptGvsOljz+owislHKVjgAmJ3
-EjmB7t7e17d3NepCHSxBXNPO6wGDAiAtl9dKnCFeRSG2yIOEYVeRyoXwBprF20lG
-YUp3xJ2iap5f2otRBPUNAcbYhwKBgQDHSq/UQaRalnbhX3OL95COe7LXdVN2/GsH
-X9glm6ZTYiPRtTg94DUGnMtIEqPeQKOTET7f35XlV6XokPOmpNKvkNcMuqp3Az3M
-ONty1ThSHtM/gFzlyUbJ6wuvDg/AfUOBELF7O8NFP7J0isPpZQfaXEYtYvGVffH6
-zy3EYtXIpwKBgQCE68wk+agVzoaef4DN8YtUSQI7BNL39jYU5qn0/Ao2Nvz47uAB
-aKm740Ky2hMp0iCWgqlnbzidCOLiM4LM/yb3/d+0vl7hLtDseix2JhGt+6BF+/fH
-NcdxepXkvUajc5gipeioNRYuAfdj9rz1hQ9vzDDqiugKindWFEOWmzg7RwKBgBge
-Drc2FmisCsjtXzNSC1li2NrAJRCiLWWgEK1Eb9VpbAJF1v+N8XzSXrtjHheYZPM4
-RA6dpSsy9y301LeW/LQoaA3vTQ/IAaOEQfJcoUs21cO6igN43ysyWaCeqANYZWHq
-HkBWlCP+OF9oJ5tIEbI4NnnpnmjD7BO5HMXGXC7DAoGAFPq36KhfYOIzO0prmyPO
-dMenRlPa0PhODZIz6ZUCUroERcXYuG7amLUDGl3Va7jGbCK3Mt81lvWUBSdIeaPC
-EtOPr42VXrbViA5svisgNNLQgQfShIo8oy4ciiqi0Xce3u3wbLJuqXyUWqASMqbE
-jpiOHwmr9Oz08XVuTkXd3Mk=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC66yaD4Imd3fxU
+1XmoT79bMx6jfNIaAAitLzCcXc8Li3a0xKn/WO4ffkWaSVitCX1yD9JNxqIV06Lm
+zV/rYNgd0LjsR499jDpNWgIV3Xoe3jmIB/XzqMamUk1BWJVobvyuZE3MQI75ad8y
+nVxRK9blyTDy8bdlJreWL9nUoo/ZSajendm8vST4AgKiOjrohpF0xU2/MTW59Mdk
+sOYmFTH1nDgbfTnKKcuTRgyoyOqh7EtjYLSN+3H/BkQ5kXCgL2CshyR3QgOPLiF9
+p9CfqW5XIVgyYX5sA+ZBVzRMLUI98zUD5ZP/HDb3JUe8WP3dcA038el/lqKML4GX
+vZkKKeCvAgMBAAECggEAG1N3XP49gCvM0OYok/ecpQuTJhmAabapjhABDksUkr5/
+yyuZIrBwl4ARUt34LcveYAd6Gk64sXIwNYe+xx1wWuOBtWE81ADlIRvQhDvNt6eL
+R5zKUyXQbM5JZw05Qnw/Sot1aC/j9wiITdD9hwxerVc9Zbb6tbn0SuuR7+kYGI7R
+MioZq0I+qOtocqjcO2ff4P3F7eCe97/YQlA+UVqUyLyuTjE8Lc62tPNDKrCr8Rp1
+iYaC+3BWYWHvKwTQlczLyMVdGwr6yUtIKSsdyKSQaVfvReBfHggjN8gREbPcuV+x
+V+BENmpV3N4bsNGSr2/TkaWgJEwx7QpuzHgTpNtdAQKBgQDkHPHiXSZ0aHum5Hpe
+kHPy2MBgO6SC3r9r2+n0qZgxuRBjoLNL5m/sG1EJ8QuCLzMvIp16vSrVxIDKYGnx
+89Yq/P+H5DfBCtYoolCQXht1xpgW8cN6HfCqXW4hH6Ua2I98pFVRyOraeAJZPj3E
+kIKeiKvkc0xqXqXz95dAsxo7gQKBgQDRxPogHHHYeaqbYqd+0Yl15HcaQHEugSRP
+bRUN7TiD2Teb3UM54PoQ9lCMdVHDyBTSSy6SSRIvU8NRJ9gDxgrhDLk7ra1cS0TU
+KKjoP5FqlFIyNt/GF1HpTWRBid11QCGfpHvQ2WGVKdJbdPYR+BRITYBhf+xSK3GQ
+OFIpgKL0LwKBgQDLn37Xxrjd7qp6Nrd5FE88Nvm6rWLTo4yR9lOoH3+I2x7jH/8M
+wJ2l0FiNnEreoc15xNd4ScYj3e3tORU5cqT56K8dGb4fJtI2oXVy+V5fyq/Ww2bv
+6iv7l70H+lyCU0/6PiMfB0+FRt0p1qKChVDjvTJbkgRjayuOVLQCgB3pgQKBgQCh
+NQy4MsP3BgFr6tQn7OYD2PEDFrUkdRCvjXgZvM2q3fsTaGZqi5ACCxl56AtPN2tw
+9WA0Ab3c6zV2H/WtaLwhmcKcr2tEO4AIv7qWyYt6acQFXRB5zqAfeF9s0oODwSZV
+5nVU2kpY9Mv5hxg4VPtZWV4pD8NQnpxmpjHWPUp99wKBgFzH8hvpxs91j1RzD9r5
+Pg2vxkSjbAAqRHnU8Hb7G83i9Zh2S0RUHO5g+qQbtDjj9+5OcSL+cl2o3vVcpn49
+bkw7YNR/Hu9c1BcdA8IiYo/r/gCFBJcpsEnGS+OpXHOY6yj29bKccOGEsnudxW+U
+yc3RghX8FXK0NTRiBHExSAob
 -----END PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_pub.pem b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_pub.pem
index 0489a94ccac..f8b5aed3717 100644
--- a/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_cai4_revoked_pub.pem
@@ -1,60 +1,60 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+MIIFOzCCBCOgAwIBAgIJAJxc/Xw9GS1vMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTBaFw0yNzAxMjUxNTI2MTBaMIGbMSUwIwYDVQQDDBxaZXJvQyBUZXN0
+IEludGVybWVkaWF0ZSBDQSA0MQwwCgYDVQQLDANJY2UxFDASBgNVBAoMC1plcm9D
+LCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQIDAdGbG9yaWRhMQswCQYD
+VQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDP5m4jnDebcImy+SbMPrmta11iC9WZPRyP
+QLDo9DXOqqoO3mS1gKR4YMWSLnIH0jfTfFTHbckYY0WRFAMvo34QuxaZYvu6msbg
+q0y9o8++/mLow8n4v9YSpXH5dydGn4VhsYtic7TN0RhxHR+DAZHopAGBsuOMZu4E
+7E30Ukq+d9tlinPn9VKqDsSHSyRDYBfJTm9XUq+SsHgT/Y5G7kLUfW/PbR7RFO4l
+CZ3tEEWIXN9xIbLr28o75eIy8halSBcyma7YGb5P1BaxcDMtQSu6peXzgutlEUti
+rztGcwS3md/hRxzY5uY6YShltVeJvIaliU4USlZ/5toj/Q3/BBSjAgMBAAGjggGL
+MIIBhzAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBTIWM4vb2VaA1y4r2wyaDTj66gS
+/zALBgNVHQ8EBAMCAYYwYgYIKwYBBQUHAQEEVjBUMCIGCCsGAQUFBzABhhZodHRw
+Oi8vMTI3LjAuMC4xOjIwMDAyMC4GCCsGAQUFBzAChiJodHRwOi8vMTI3LjAuMC4x
+OjIwMDAxL2NhY2VydDQuZGVyMIHDBgNVHSMEgbswgbiAFEPaOFOZpNkAWJpo7SKE
+4mYyPMHSoYGUpIGRMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0IENBIDQxDDAKBgNV
+BAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIx
+EDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5p
+bmZvQHplcm9jLmNvbYIJANHr9QHB66X0MCEGA1UdEgQaMBiHBH8AAAGBEGlzc3Vl
+ckB6ZXJvYy5jb20wDQYJKoZIhvcNAQELBQADggEBACkIREC8RHHmF4Qn7xztCvMx
+9hnJOQbCX94p58nbRIQFYMJZqJf4alUK78XY/u816kBZsPhi+lJLypwbIycFgO2S
+YnYQFspOWCeFoohufsFOVDGJvaKJ1cmANqJlPMZe2oEl8FNIePvX6B251eyHgdil
+gvvRRNKGGJcKN4V3//dviMZz9DhSmcDmACUQuBrSfSRef07h4hUo3ay6GxUv4hMQ
+HPMkbFRa5w/FIQqp1TSbrsdGV0nyIUNkyJ+ihQvRqQHQxI6l26mItS9MQ21eGfAx
++1+mF6zNmx1dRH6ttVfnh+w5HJ8k2fFdcQ9RgC8LhVEktgJ0xtcvim2yNDJ34pw=
 -----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 d702b45f4aa..7c3ad565442 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_pass_ca1.p12 and b/cpp/test/IceSSL/certs/s_rsa_pass_ca1.p12 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 b5d50b7cbe7..e1328d4ebbc 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-----
-MIIFFDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIa11ufb3QJDUCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECG5z7FnKihuZBIIEwFfd/9I77beT
-tyV8JEzZx6HFCHJtVyfZnjOqxtZJEslf0O6AhTgh9fW6Q407foCrdeAs5FsatGsP
-xqpUqs9t0SCQ9amoMzyBH+oghvQhwWOt8lX1ulHcncPEUhouWR0r7eiKIGWbJLdm
-oAvWny6UdQ120CI7WwRq1koXEQD7MAZ6EF/9aHTdmCRWa0tEqzyFcpjO2OrWw8UX
-lxNl39s/grXNevs5iNh1/i9fT/DSa38dbuezGe8dtOqkzyDCTYOuaX21CANDFXak
-RR8GNUyYLihx9mriUEYmzgSoXicrfAh8wAiflRcuNS3paF2AdB2IQZBZyBP6i1sU
-y0CX2e+iLId4IseHcRDCTzapoPtc2jYQvss9NGqfT7gdsiQZqcWAeqMueY24RAqS
-gwLWsBFlhBWx+ymHSOw7V68OVBoiVI5f+vCb12K4np2TQ0ZPr/aW3h61rKZ1G6Q3
-PeNeTV7qI7nKKRU3q5Z7OkEvAYnXaLGY3WL9iNrEJW6zgZzXIWc4j219JwuStuyF
-5JREeyv3tEfIJqoRZEvy56Mdvb3IqSR0wc/9myKkFfw1eGZ7ib1Isl043O1l1h4u
-XQMeaI83GKHUmd6EFeOGGqpia5afxtUhJ0iDUBh92d9T/ZXw1Byo/GDiH8CoRh83
-wDb6KdklHVklc6cfcYOasIzTw41cHWmAL1G0AwoxAmQm3vznziw9d3I0+V+RFJCg
-AeoNKCic+sq5t+YmyyjCWjOF84d7KO2njZlJM1lg/E2uRMc//tc3jyZfWwZLzWJN
-61w3ztxXICbgV0zHynnP+ps1FZFAyHajcb0n8GS4RG5oXEs7/58KeULR5z48t9kL
-CvjL1I5JHkzV2SDJB4p7sZL5K4RBIw3i2vkBRhiGQZqpA8OB+s/iTQvxxQhak72d
-qxgvXvJ8QeNIhcrCXmHXvbxb9XEBRn/dIEaowucw6BYb0Nc/1QDXirUfQDGp100X
-2bBBmPfRv4liHd4DITNpnpbX5N7Mt71D7CBJTW6No1of9ceAYGRATKLodXCA/4yJ
-vrrDH1du7JwWDO8IWMFuU0EwSPyvp8/LxnLeKHr133tTX7OMb+PIfcPIziQaLd3/
-/96RYPpb+hYkwP0XsZrfmyPMx2UH6xiHbsyA7hFbHZzdRIx1LJQDMkzF2fYWEfoT
-nFD8RkHdeJYr5eRGAAVKMb3JUPcSs6si37hL7Op63qS4lECeyAtY3KDBkvqJaKaZ
-BgfY1DHPdHttwYCXgvQ0m6+YlnXBwVStYac9AHc69dBLlTbEQ9nITw6GztYJfww+
-3u6d3LD4mGvCObKF3QPoFOCwEyfreVOq7VLPiZiLT4g9c3p9FJrkDjD8thlvr0CJ
-mYWSnTyXOt1RJVlVSHdLMQJhNPOQGOvvkPPdVMkqCXkHLABNK2rjKrkQubYUbmE8
-VMxWiijf13bqScyMIo02xkUL2heWE+19ypMRwJN8DVXt7kXfem2NKUuo7keDUMEq
-+liUrSoqxD0LLaY0r7RbGMSsGPJqwqbBiqLAaG7DXVuJKYc6G8sLAmiq2S1POxOX
-gaGYqSFsNoZ7D8OQPRc5Akgga7DGFp9hwbdasl7D5HiIP8E+Xw8si6vKa0UIOwmb
-XMccJyYAZC8=
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQpQ3RazTwkzN4DLeS
+C1pKAgICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI4BHcrlMyj0YEggTI
+IBpTLO69P0bNI1sMrrHHBnr+QE/jD4YFgU6kjg6o9awPngZQS+w2PqeqcobgHHga
+aOe/sSbDqZmjvGNAlrQJljoW3kANifwzOM3XkAEHAGchlVGjDrglsp8uzpDOZgwO
+GYUMBJaK+/ZD/CNoNjzIxkK3QgjVjzmKJeJE0utPuEp8/XQC9K7mI9+4irvrUKYx
+xthHe7T6mnn6bjWbur5otYefAhlC6SDYm0aK+TNEHw+NHploKoie5l+y3Ir71YiN
+34Wq8C4s4fT/0q2Tk6pyELjAj5mgniPAqeDIixe5G5T7E7TG3g/PoKBIf+4tUxoj
+qftbbFqWNt4LufJ8cwAnpRNAoU/BeXV07BZLon9H+b1+eJzBw3LXnIXkMfPAnGpU
+sT2XGzHxWUzOIRDuyxNtIS9lQDti/KZlv6EN65jIiKJGVgDYbsMO3ILrRCa6cggy
+Tin3ARGfkmCIE7XEBQ+pKaTjYncTJwmBhldldnK9F3+jfJvnRT+akdLwkCSQa3Mf
+1BrVEpSwAcNMgLe3HLcP7qeIbrBVvE56Nxu20rt+ZkuTDD5JhLwD9MaikHke5JK4
+P4DIjtNRNM54ZW/uJ3/g6R7JeGWlPLztSpBVEupstslSwQefl0qhWYuciRxvi3s0
+fLM3MDd/HEkOHhhppRBnboD/OnG5ccf2k4ZYtEMmZGWFzhVhHamg1tO5Wq9yECpx
+qLua7RU1XOzQ9w6FdR7soIRrJ3fQXlAg7kIlTktfNYzGC9jZCkQOabBB+wG9pn0S
+uWDB0wE75BztMmyD+YqbfvOTwfu9Wy82YUL5EaORCMMpvERajgXuXzqPEuvN1hZ3
+dt51fqePZfxeqNCYkVxgK7cbijeDgNUb0VMCfSoBWdVDCAiPi+2a7C1DIf3JcF5y
+u0DZDPj2i2CQ9T3Rn7yNrY52NrJQsdmGeSP2AprbUblBSudySfmlXzvwCByJePoS
+BjrYEr0x0l1pBbZcB0M7jylyWfOi++MRiAYPL0G37FwcwoC3ZrCww1tNIYp5cyM/
+Spy5CeZGLJZ1ICl8ZUsEivkNaNvpaFMfiJhntdQ/4LQiiz1l+LKhrbzBxoh/PdMF
+Y6qFcrYrRLWE60MxLN71ysA9iywJrZvsCJcRFXyg3wSH9vpM6/Yw12Eeh07jmdtb
+Y53ndwvJf16OQQ9fZDWmtXKXAqB4PrZwchlbDGo3G6T+8ojZN07BTrnBbPJ4XMtO
+yRNRkVCpJVso0J3S8wqLzPJs0C/qVxdDaiowDzBRVDdZbHwOX21q9GcU5HQ+fwt9
+BayDsb83sn70ddg4/ShMIrHypbNqahHIYLEpsj5TPkwhF2FQ6/6KjegIszPkuIxD
+TQ8ATMGsx+6PZ5vp18i4xoUr3oer8r4hLD8t2L6/fhs1rZhQN7HMSu3b7Fdj7ai5
+ft79yWl7odSs/uMgG8huGjrVqJsTggtCV86TSahn9IJjDskgQNVNDkoM2Qrojekq
+gkK33BORbo2yWfGpsUhVZAHYY32p37+LkxYPo4IDOKH7qVb/u6wLnSz/ncOZ1PXR
+Ap0d5rUn8DkKrib5vV63lu7ePGx8vCWr6Qn6MgWbkkkpfwqrXyLbmLQ9JXRX+/u3
+LWq7SXYVtT/b2MaURAyOyYzr4b8t0Dji
 -----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 2d0f4276151..cbe5364d663 100644
--- a/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem
@@ -2,27 +2,27 @@
 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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/s_rsa_wroot_ca1.p12 b/cpp/test/IceSSL/certs/s_rsa_wroot_ca1.p12
index 6785cc58941..c25a8b019f8 100644
Binary files a/cpp/test/IceSSL/certs/s_rsa_wroot_ca1.p12 and b/cpp/test/IceSSL/certs/s_rsa_wroot_ca1.p12 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 d78c442a8db..4142804b652 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-----
-MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDXsmYx4MCVXnAB
-TTshaBjgDfJO+4UDm5opSDQFVolup7sDNHlaaL+pmZ61M8CCqPaPc+r2KBcHAcvx
-+7yyyczCRlKnWH/awY50Zh4YSipJ7tb34DwIG6e0HqxvKOiS+MLS/ksRHwBSrUg7
-DKcbnkAWOwC+Fbe3maOEYMxZzIkVcmA8i9en2Fh7CDVmNDVFejkP8DsQlGTq6yjz
-VPZZaBog9Z5d9T5oi/ocbNCd9NqJ1CY1oXXlw8vv5ryUyfkWGU1upxyZ9o9dliR4
-yN8V5gVwKSmGWtvib/a6zdHhy37g6k+c27tfD37WiNtgLsblPQPH7/HxrSs1zGzQ
-W8y1wy95AgMBAAECgf97VCXanwd+YGDqXZ5Rm5OdiFvjjSygw3eB4ybbZn9uJblo
-O7inWP09m/iC4vRPwQw5Oa4+0O1ZtE1ILwfVskzBSDQ6Ov/ftIwfQcQzXzSO0WFY
-mX25pRZehqtRY7KXVmUO/xcs0uz8WNfT64gg4nsCOvpRtVk2QUKdjjtJnQlEmPRY
-CBY5Knox/1aDVhSITiD/IA6I6WgdFc+j+120+oi86zOzSuhD5ufneVRd01veCv9g
-7kTPvYRxOWUO0E2RmiRv3tRtHfQWFv4gSeklM8I4w5E6+fu2mtam1+y8b7j7ZX7T
-zU9GmvUhUgMNQ+Fe4tLsO92ZKal9IqNrGFpDqvECgYEA5DRyCUOr1ZMnopscoHgT
-oEDSt/qxOEuAjNDOZoHhXqchB2P/duyLxE5Ub+7BrqxvAjsl5xU0Cs2h5jkktkEZ
-kXAJw8pp6DiM6rTN5FgWvTH4i0wyFAdCmbVNnhK/tUzI+y6PgjpzLVyv1QmVr/Cs
-QmwEl/+R/AKSD/Nb+kKm9GkCgYEA8ffyk5Mr8RzTneysS8uiNzcraQJEV6VVUTEZ
-BgB16hmAvv5Xh/wBqOrxtgFY0QUi6taJSp6zeDvcn6XUSdCS7m02WWKNhOdPe2j7
-IjUyC9G3b6v7Xz5+YSnpAStTkOGH5oMzt5YAsUFlWML8BeJkQSWZ9XUCBn2xgUdG
-ngJEwJECgYAemNWNXnBko2VWDPwKm+7ttqNKHaezR5RFzR1Payyfd0MbbZHsDQ00
-VdhGZbm8RMxhfTK4yAQBSs7hQlokwZe/A0mb4cDPbP2f3nwYmKL73P5ZFu9D9jE8
-0K1Ge3cOxOvRmc2OBW4578p3guB6BYfjI/59rruREXsp/lQfut4NuQKBgDTTkR4u
-71UAmiLMXQFfP9cWMGAIoqsP6YSEV5Y724J0dus71BhYKHScdpDp0l4v5OOoWujz
-pPMG/q/MIIDNDIcJSOhS39q4NV4YGVvqiTaTXpz+yy6MEkNcRwZ+Uww6cNUep9fY
-4+XPBTVPvH38Yy7l6qrwFLUeE/bJfN1aWXBBAoGBAKEfZxH6K43DQDqnMrTYuwMu
-1Jx5rtXsJmT0PWJ2j4aXKS86CjXngUxK3kjss5og8iRpq09XqSo2NNtTsdl3Sd66
-Zm4N+hB+0qNW9Hda+wR+9md2j4MfTCb5Z85ErxWtg0kw2hQ0Oh11tWptsKKO+xhq
-JdgCZKetX/SCxJYYvBDs
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDS/kJ+rFuZ9F8I
+dI7GCYGX3LihV6g/D0yBpBgFvPUyi1CuUj+eroRvxkQjVNF4jylJIoRK1c/vK1qS
+nbnb1cev/BjVZjMyVqxNK6ximB16exszkFqpDlJt9Vd6BNDdtq84LM0+YdEfsin3
+4mNHi5Ho9VgwsWP50kWDRZYsZxmG4B17gnzOjAb/F7KcVupHrclm/Xd9gAzVz4JZ
+oMKfOAtcDOroDsaiWzvhTkQLhaQKFFDQq4ST7MKJN+Y+GtCW0ZSYbYb3qr0VVbSU
+En63mPiL+w+obPuLD/2jquIrhGTIJk6Muc803uV2TK+CMQaRAcztUQ/3Yfa+Mskk
+fVGoIhsfAgMBAAECggEAYHttS8CkOJ/jDxpBqXRyYs/HS9wqLv/fc87mP0V7eGv1
+bmlk9zqFjBlFUkS4buFEN1HF3fSs24jfJ3lhopG8+RAWCQttcODqdHV6pDE8FaSS
+uT8S/ghzEB4nLMBkBGbD9DOkfRi8yLovb8+Bp5c+lyEN/WI4veX17IPXGqHgregc
+cIryB8sKz99NqvYbhOJndVx7A1TR5FYshOxsSQUJxu+6aKB3TKYJHBI3UGPZlxj1
+9f+j1K/bT3gM7cZQh1RxAipwUItS4xFsmOMXT2UR0OjQFeTsNZ7Y6apbMkT93DMv
+6mY5dRXDYFLMwsg6ktKSS3KxKMlZUFFBwBJG2fItGQKBgQDrijdt/3MNLGwiox5C
+4iFyfOoFPWl9l/k3yIN1ePdOI1LWEZpClaJE362pir08RjFx59fYR3fXshCdCPVv
+Vw3CHQ8lVCs3CQI6LR9hAappANock8diR41jKO1JnvfbG6GBrHCKpfVIMO+Oa6aC
+cBiQjDIsqlNslXdFN0qnIhApiQKBgQDlUjCEK20p5CWQL1AmUGKjKArXS2mRRN3o
+cMp3AdfDt92/MIa4WD398AGOLPSwVR4kGSQo+rSMigfMxxOMrDJob9UvA0pTt8Nf
+UgT42LM4RW5TZLJcKQY244+Xrk+R/Ppxo6ogPO4hGFPHazZkjBcRjoBy2JYx4sQi
+ShzAYa39ZwKBgBLqS59Cx2uEaL6zWMfIPyVhkK2RC/qxDKuFJ8F0UG/u+EUGrtuw
+BpL/X4PhB2div6/FDZlpy97/hsQFpygk1o8DJGc8BihqScqAOyfgKV47Wki3OWjU
+FC+lZsDlykPHSUYPog4QW81LWMGYNYv+EorxJ0pc90weCLD/Srh3TNL5AoGAeclV
+dMvvVKEShelqon5sdAPPBhnJvdmaFFjaXat/4DRksqXd1kce3R66ZLxhUshRkpA7
+kPvcKQshK1LKghntR2OlDyurLJzaSGQxucq0G31cIzPGOYWcBEiEOOTc40Y752Ao
++KgDO1ZFIBJDN9Dia3OHqfZ2hZXN3fwIGu+FTJ8CgYEAuJWPIK68QYxxFHTPePh6
+XjLeVkdU6UmtSC8cOZJsLe10qdZVSw0SW3MQpDcPmCFWVQxdHZIYTbWpoeQcnYfB
+LextmJ1Ngl+IW1XATOs41EqHe9BuYQdVt+/yMeYBpvfpxejTUCsnd26f1aesrs7V
+lrC7veQvsnU6OtFJvVMx/Gs=
 -----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 2d0f4276151..cbe5364d663 100644
--- a/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_pub.pem
+++ b/cpp/test/IceSSL/certs/s_rsa_wroot_ca1_pub.pem
@@ -2,27 +2,27 @@
 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
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 7c118332856..d3e43f56302 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -1881,8 +1881,8 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
             "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:'8B D3 64 6B 9E 80 AE 56 08 05 0F C8 DE 9B B0 4B CC FD 4D 9C'",
-            "SUBJECTKEYID:'7F 4D BF 80 65 E0 EE A4 18 D5 6A 87 33 63 B3 76 7D 42 82 06'",
+            "THUMBPRINT:'49 D0 0C 39 C7 A6 44 51 2F 2C 6E 58 5F 33 76 39 74 47 84 14'",
+            "SUBJECTKEYID:'0C 8A 4F 53 BE DF C8 1B 70 05 AD 39 AA EE 30 C6 F3 BE FD 79'",
             0};
 
         const char* serverFindCertProperties[] = {
@@ -1890,8 +1890,8 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
             "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:'F2 EB 9D E7 A5 DB 32 2B AC 5B 4F 88 8F 5E 62 57 2E 2F 7B 8C'",
-            "SUBJECTKEYID:'EB 4A 7A 79 09 65 0F 45 40 E8 8C E6 A8 27 74 34 AB EA AF 48'",
+            "THUMBPRINT:'72 E7 51 C7 DF 19 E3 0C 98 58 47 DB B8 39 0B 04 2C E4 D0 92'",
+            "SUBJECTKEYID:'A2 DD 5E A5 52 06 0B 9D 64 89 DC E1 01 B0 7E 46 F5 60 A5 D7'",
             0};
 
         const char* failFindCertProperties[] = {
@@ -2009,7 +2009,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
         const char* clientFindCertProperties[] = {
             //            "SUBJECT:Client",
             "LABEL:'Client'",
-            "SUBJECTKEYID:'7F 4D BF 80 65 E0 EE A4 18 D5 6A 87 33 63 B3 76 7D 42 82 06'",
+            "SUBJECTKEYID:'0C 8A 4F 53 BE DF C8 1B 70 05 AD 39 AA EE 30 C6 F3 BE FD 79'",
             "SERIAL:02",
             "SERIAL:02 LABEL:Client",
             0};
@@ -2020,7 +2020,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12)
             "SUBJECT:Server",
 #    endif
             "LABEL:'Server'",
-            "SUBJECTKEYID:'EB 4A 7A 79 09 65 0F 45 40 E8 8C E6 A8 27 74 34 AB EA AF 48'",
+            "SUBJECTKEYID:'A2 DD 5E A5 52 06 0B 9D 64 89 DC E1 01 B0 7E 46 F5 60 A5 D7'",
             "SERIAL:01",
             "SERIAL:01 LABEL:Server",
             0};
diff --git a/csharp/test/IceSSL/certs/c_rsa_ca1.p12 b/csharp/test/IceSSL/certs/c_rsa_ca1.p12
index 532009e9a3b..0643de7645a 100644
Binary files a/csharp/test/IceSSL/certs/c_rsa_ca1.p12 and b/csharp/test/IceSSL/certs/c_rsa_ca1.p12 differ
diff --git a/csharp/test/IceSSL/certs/c_rsa_ca1_exp.p12 b/csharp/test/IceSSL/certs/c_rsa_ca1_exp.p12
index b34fa7dcb1e..6931da48dd2 100644
Binary files a/csharp/test/IceSSL/certs/c_rsa_ca1_exp.p12 and b/csharp/test/IceSSL/certs/c_rsa_ca1_exp.p12 differ
diff --git a/csharp/test/IceSSL/certs/c_rsa_ca2.p12 b/csharp/test/IceSSL/certs/c_rsa_ca2.p12
index ce37aefbe41..7061a4a038d 100644
Binary files a/csharp/test/IceSSL/certs/c_rsa_ca2.p12 and b/csharp/test/IceSSL/certs/c_rsa_ca2.p12 differ
diff --git a/csharp/test/IceSSL/certs/c_rsa_cai2.p12 b/csharp/test/IceSSL/certs/c_rsa_cai2.p12
index 589cc2ad4a0..e0e4cc24d93 100644
Binary files a/csharp/test/IceSSL/certs/c_rsa_cai2.p12 and b/csharp/test/IceSSL/certs/c_rsa_cai2.p12 differ
diff --git a/csharp/test/IceSSL/certs/cacert1.der b/csharp/test/IceSSL/certs/cacert1.der
index ab5fda48f8f..9c70958b4a9 100644
Binary files a/csharp/test/IceSSL/certs/cacert1.der and b/csharp/test/IceSSL/certs/cacert1.der differ
diff --git a/csharp/test/IceSSL/certs/cacert1.pem b/csharp/test/IceSSL/certs/cacert1.pem
index d60022cbf81..e82d05efdf1 100644
--- a/csharp/test/IceSSL/certs/cacert1.pem
+++ b/csharp/test/IceSSL/certs/cacert1.pem
@@ -1,24 +1,24 @@
 -----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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
-CqVhexCqbwVNhXvKB8r/cOOC0Hk=
+ggEBADlWzFkaRjhKsbDs01fLUWtYj4ETEtEltdosWq3RQ1F7sPx9MCG7K4AicV3d
+dk8VSvSgkSgem+LzTOPuhrNnC30Tu/5wUFdiTttm9HmqySArD9XMGmGCLJRhKiJ4
+TFMyXt/aCWcryvvs847MX6onm8QpgYbtHucEsjk2AaC9Fw2nt00fkTztx5uhzlBB
+2l4/Km8Rbc4mCeyXUlnXLmlzoT0bAzxON4sAlxb4r1EiFM0y75P030RNljmw8g2T
+HirfFNv3/KS50/TLt4rYRiyzKlmd2zXKbx4rFCDrvvSCEhYUsMjEeORvqJnfrCAG
+IDIRYd2chTD4y0y09MX7GvlLkIU=
 -----END CERTIFICATE-----
diff --git a/csharp/test/IceSSL/certs/cacert2.p12 b/csharp/test/IceSSL/certs/cacert2.p12
index 12f17219d6d..22d548c17a7 100644
Binary files a/csharp/test/IceSSL/certs/cacert2.p12 and b/csharp/test/IceSSL/certs/cacert2.p12 differ
diff --git a/csharp/test/IceSSL/certs/cacert2.pem b/csharp/test/IceSSL/certs/cacert2.pem
index 10397ca11dc..9e9bb9e7f11 100644
--- a/csharp/test/IceSSL/certs/cacert2.pem
+++ b/csharp/test/IceSSL/certs/cacert2.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcx
-OTIwMjU0N1oXDTI0MTAyMTIwMjU0N1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/csharp/test/IceSSL/certs/cacerts.pem b/csharp/test/IceSSL/certs/cacerts.pem
index 8d85a62ffa4..4e2df2c7c02 100644
--- a/csharp/test/IceSSL/certs/cacerts.pem
+++ b/csharp/test/IceSSL/certs/cacerts.pem
@@ -1,48 +1,48 @@
 -----BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIJAL/ehwUYP0SNMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+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
-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
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yNDEw
+MjIxNTI2MTBaFw0yNzAxMjUxNTI2MTBaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
 IENBIDExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
 BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
 KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-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
+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
-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
-CqVhexCqbwVNhXvKB8r/cOOC0Hk=
+ggEBADlWzFkaRjhKsbDs01fLUWtYj4ETEtEltdosWq3RQ1F7sPx9MCG7K4AicV3d
+dk8VSvSgkSgem+LzTOPuhrNnC30Tu/5wUFdiTttm9HmqySArD9XMGmGCLJRhKiJ4
+TFMyXt/aCWcryvvs847MX6onm8QpgYbtHucEsjk2AaC9Fw2nt00fkTztx5uhzlBB
+2l4/Km8Rbc4mCeyXUlnXLmlzoT0bAzxON4sAlxb4r1EiFM0y75P030RNljmw8g2T
+HirfFNv3/KS50/TLt4rYRiyzKlmd2zXKbx4rFCDrvvSCEhYUsMjEeORvqJnfrCAG
+IDIRYd2chTD4y0y09MX7GvlLkIU=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1.p12
index 2fb53f7cdf5..1ee3c69fc2c 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_ca1.p12 and b/csharp/test/IceSSL/certs/s_rsa_ca1.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_cn1.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_cn1.p12
index a3803fbe389..a764777d999 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_ca1_cn1.p12 and b/csharp/test/IceSSL/certs/s_rsa_ca1_cn1.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_cn2.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_cn2.p12
index a2708c31e54..410632b3fe8 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_ca1_cn2.p12 and b/csharp/test/IceSSL/certs/s_rsa_ca1_cn2.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_cn3.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_cn3.p12
index b06d3e9dad5..5a99b108c2b 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_ca1_cn3.p12 and b/csharp/test/IceSSL/certs/s_rsa_ca1_cn3.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_cn4.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_cn4.p12
index 854c429c23c..6a811e4eb48 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_ca1_cn4.p12 and b/csharp/test/IceSSL/certs/s_rsa_ca1_cn4.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_cn5.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_cn5.p12
index b299beaeca5..d142bdce41d 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_ca1_cn5.p12 and b/csharp/test/IceSSL/certs/s_rsa_ca1_cn5.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_cn6.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_cn6.p12
index 4fa878a276c..06d7fea47b7 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_ca1_cn6.p12 and b/csharp/test/IceSSL/certs/s_rsa_ca1_cn6.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_cn7.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_cn7.p12
index 426afd3c10e..215cc8e7dd6 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_ca1_cn7.p12 and b/csharp/test/IceSSL/certs/s_rsa_ca1_cn7.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_cn8.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_cn8.p12
index 9d87abf7a3d..f4b9fd07a6e 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_ca1_cn8.p12 and b/csharp/test/IceSSL/certs/s_rsa_ca1_cn8.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_exp.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_exp.p12
index a2bc505ca2d..726bac97704 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_ca1_exp.p12 and b/csharp/test/IceSSL/certs/s_rsa_ca1_exp.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca2.p12 b/csharp/test/IceSSL/certs/s_rsa_ca2.p12
index 63c24d98a20..7a127f05a9f 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_ca2.p12 and b/csharp/test/IceSSL/certs/s_rsa_ca2.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_cai1.p12 b/csharp/test/IceSSL/certs/s_rsa_cai1.p12
index 3c022ccd05b..6b4b752426a 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_cai1.p12 and b/csharp/test/IceSSL/certs/s_rsa_cai1.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_cai2.p12 b/csharp/test/IceSSL/certs/s_rsa_cai2.p12
index 484b3fa34d8..16f048a429a 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_cai2.p12 and b/csharp/test/IceSSL/certs/s_rsa_cai2.p12 differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_wroot_ca1.p12 b/csharp/test/IceSSL/certs/s_rsa_wroot_ca1.p12
index 6785cc58941..fe8c9483093 100644
Binary files a/csharp/test/IceSSL/certs/s_rsa_wroot_ca1.p12 and b/csharp/test/IceSSL/certs/s_rsa_wroot_ca1.p12 differ
diff --git a/csharp/test/IceSSL/configuration/AllTests.cs b/csharp/test/IceSSL/configuration/AllTests.cs
index 9ea862a3cd5..862de4860b6 100644
--- a/csharp/test/IceSSL/configuration/AllTests.cs
+++ b/csharp/test/IceSSL/configuration/AllTests.cs
@@ -1525,8 +1525,8 @@ public static Test.ServerFactoryPrx allTests(Test.TestHelper helper, string test
                     "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:'8B D3 64 6B 9E 80 AE 56 08 05 0F C8 DE 9B B0 4B CC FD 4D 9C'",
-                    "SUBJECTKEYID:'7F 4D BF 80 65 E0 EE A4 18 D5 6A 87 33 63 B3 76 7D 42 82 06'"
+                    "THUMBPRINT:'49 D0 0C 39 C7 A6 44 51 2F 2C 6E 58 5F 33 76 39 74 47 84 14'",
+                    "SUBJECTKEYID:'0C 8A 4F 53 BE DF C8 1B 70 05 AD 39 AA EE 30 C6 F3 BE FD 79'"
                 ];
 
                 string[] serverFindCertProperties =
@@ -1534,8 +1534,8 @@ public static Test.ServerFactoryPrx allTests(Test.TestHelper helper, string test
                     "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:'F2 EB 9D E7 A5 DB 32 2B AC 5B 4F 88 8F 5E 62 57 2E 2F 7B 8C'",
-                    "SUBJECTKEYID:'EB 4A 7A 79 09 65 0F 45 40 E8 8C E6 A8 27 74 34 AB EA AF 48'"
+                    "THUMBPRINT:'72 E7 51 C7 DF 19 E3 0C 98 58 47 DB B8 39 0B 04 2C E4 D0 92'",
+                    "SUBJECTKEYID:'A2 DD 5E A5 52 06 0B 9D 64 89 DC E1 01 B0 7E 46 F5 60 A5 D7'"
                 ];
 
                 string[] failFindCertProperties =
diff --git a/java/test/src/main/java/test/IceSSL/certs/c_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/c_dsa_ca1.jks
deleted file mode 100644
index 706f7985dbd..00000000000
Binary files a/java/test/src/main/java/test/IceSSL/certs/c_dsa_ca1.jks and /dev/null differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1.jks
index 8c4cacd9a19..057941801d9 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1.jks and b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1_exp.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1_exp.jks
index 2f80e31005d..5f203eb3076 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1_exp.jks and b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca1_exp.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca2.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca2.jks
index f921e1ba083..29ab7668ac1 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca2.jks and b/java/test/src/main/java/test/IceSSL/certs/c_rsa_ca2.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/c_rsa_cai2.jks b/java/test/src/main/java/test/IceSSL/certs/c_rsa_cai2.jks
index a5da467f32b..788d9190a35 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/c_rsa_cai2.jks and b/java/test/src/main/java/test/IceSSL/certs/c_rsa_cai2.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/cacert1.jks b/java/test/src/main/java/test/IceSSL/certs/cacert1.jks
index 55105dfddd7..2391665a763 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/cacert1.jks and b/java/test/src/main/java/test/IceSSL/certs/cacert1.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/cacert2.jks b/java/test/src/main/java/test/IceSSL/certs/cacert2.jks
index 7d029ead2bb..b65f58a31d7 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/cacert2.jks and b/java/test/src/main/java/test/IceSSL/certs/cacert2.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/cacerts.jks b/java/test/src/main/java/test/IceSSL/certs/cacerts.jks
index 8f6c144f2ab..a25b50f153e 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/cacerts.jks and b/java/test/src/main/java/test/IceSSL/certs/cacerts.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/makecerts.py b/java/test/src/main/java/test/IceSSL/certs/makecerts.py
index 3d325cb73a0..d5939b09a37 100755
--- a/java/test/src/main/java/test/IceSSL/certs/makecerts.py
+++ b/java/test/src/main/java/test/IceSSL/certs/makecerts.py
@@ -95,8 +95,6 @@ def usage():
     (ca1, "s_rsa_ca1_cn8", None, {}),
     (ca2, "s_rsa_ca2", None, {}),
     (ca2, "c_rsa_ca2", None, {}),
-    (ca1, "s_dsa_ca1", None, {}),
-    (ca1, "c_dsa_ca1", None, {}),
     (cai1, "s_rsa_cai1", None, {}),
     (cai2, "s_rsa_cai2", None, {}),
     (cai2, "c_rsa_cai2", None, {}),
@@ -124,13 +122,3 @@ def usage():
 
 if force or not os.path.exists("s_cacert2.jks"):
     ca2.getCA().saveJKS("s_cacert2.jks", addkey=True)
-
-#
-# Create a client/server certificate that contains both the DSA and
-# RSA certs.
-#
-if force or not os.path.exists("s_rsa_dsa_ca1.jks"):
-    if os.path.exists("s_rsa_dsa_ca1.jks"):
-        os.remove("s_rsa_dsa_ca1.jks")
-    ca1.get("s_rsa_ca1").exportToKeyStore("s_rsa_dsa_ca1.jks", alias="rsacert")
-    ca1.get("s_dsa_ca1").exportToKeyStore("s_rsa_dsa_ca1.jks", alias="dsacert")
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_cacert2.jks b/java/test/src/main/java/test/IceSSL/certs/s_cacert2.jks
index b93d5d34dcb..ab8aa18d11a 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_cacert2.jks and b/java/test/src/main/java/test/IceSSL/certs/s_cacert2.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_dsa_ca1.jks
deleted file mode 100644
index 6d909beafae..00000000000
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_dsa_ca1.jks and /dev/null differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1.jks
index 2bced895029..aeb37f4ba7d 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks
index 3a8b4de0cad..bb9a546accf 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn1.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks
index 0f15fb4d6d7..844459fd754 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn2.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn3.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn3.jks
index f46b9f3542d..9a3f60c8406 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn3.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn3.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn4.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn4.jks
index 5d9b906866f..9a57d66ea7c 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn4.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn4.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn5.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn5.jks
index adb4ac0af0f..7408e21e5df 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn5.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn5.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn6.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn6.jks
index 679c604c4d5..9f103eea56a 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn6.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn6.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn7.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn7.jks
index c7c93e6726b..4c9993d0632 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn7.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn7.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn8.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn8.jks
index ff066285547..ff3d5142ecd 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn8.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_cn8.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_exp.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_exp.jks
index 4a1acff853c..31787130c5d 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_exp.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca1_exp.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca2.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca2.jks
index 5ee0ee141c0..d1e28a278a3 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca2.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_ca2.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_cai1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_cai1.jks
index a867d2e4133..970c91a68e3 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_cai1.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_cai1.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_cai2.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_cai2.jks
index 67279e10aef..ca03d103a9e 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_cai2.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_cai2.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks
deleted file mode 100644
index 239f2113023..00000000000
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_dsa_ca1.jks and /dev/null differ
diff --git a/java/test/src/main/java/test/IceSSL/certs/s_rsa_wroot_ca1.jks b/java/test/src/main/java/test/IceSSL/certs/s_rsa_wroot_ca1.jks
index c01a7ce019f..108c0494d25 100644
Binary files a/java/test/src/main/java/test/IceSSL/certs/s_rsa_wroot_ca1.jks and b/java/test/src/main/java/test/IceSSL/certs/s_rsa_wroot_ca1.jks differ
diff --git a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
index 2679dd29e45..bd8b992693d 100644
--- a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
@@ -617,12 +617,12 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
             initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1");
             initData.properties.setProperty(
                     "IceSSL.TrustOnly",
-                    "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server");
+                    "C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server");
             Communicator comm = Util.initialize(args, initData);
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -637,12 +637,12 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
             initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1");
             initData.properties.setProperty(
                     "IceSSL.TrustOnly",
-                    "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server");
+                    "!C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server");
             Communicator comm = Util.initialize(args, initData);
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -656,12 +656,12 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
             initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1");
             initData.properties.setProperty(
                     "IceSSL.TrustOnly",
-                    "C=US, ST=Florida, O=\"ZeroC, Inc.\", OU=Ice, emailAddress=info@zeroc.com, CN=Server");
+                    "C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server");
             Communicator comm = Util.initialize(args, initData);
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -678,10 +678,10 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put(
                     "IceSSL.TrustOnly",
-                    "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
+                    "C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -698,10 +698,10 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put(
                     "IceSSL.TrustOnly",
-                    "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
+                    "!C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -718,7 +718,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -736,7 +736,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -752,7 +752,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put("IceSSL.TrustOnly", "CN=Client");
             ServerPrx server = fact.createServer(d);
             try {
@@ -770,7 +770,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put("IceSSL.TrustOnly", "!CN=Client");
             ServerPrx server = fact.createServer(d);
             try {
@@ -788,7 +788,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -804,7 +804,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put("IceSSL.TrustOnly", "CN=Server");
             ServerPrx server = fact.createServer(d);
             try {
@@ -822,7 +822,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -839,7 +839,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -857,7 +857,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -875,7 +875,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -893,7 +893,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -910,7 +910,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put("IceSSL.TrustOnly", "!CN=Client1"); // Should not match "Client"
             ServerPrx server = fact.createServer(d);
             try {
@@ -930,7 +930,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -947,7 +947,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put("IceSSL.TrustOnly", "ST=Florida;!CN=Client;C=US");
             ServerPrx server = fact.createServer(d);
             try {
@@ -966,16 +966,16 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
             initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1");
             initData.properties.setProperty(
                     "IceSSL.TrustOnly.Client",
-                    "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server");
+                    "C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server");
             Communicator comm = Util.initialize(args, initData);
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             // Should have no effect.
             d.put(
                     "IceSSL.TrustOnly.Client",
-                    "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server");
+                    "C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -990,12 +990,12 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
             initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1");
             initData.properties.setProperty(
                     "IceSSL.TrustOnly.Client",
-                    "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server");
+                    "!C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server");
             Communicator comm = Util.initialize(args, initData);
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -1011,7 +1011,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             // Should have no effect.
             d.put("IceSSL.TrustOnly.Client", "CN=Client");
             ServerPrx server = fact.createServer(d);
@@ -1031,7 +1031,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -1048,7 +1048,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -1068,15 +1068,15 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
             // Should have no effect.
             initData.properties.setProperty(
                     "IceSSL.TrustOnly.Server",
-                    "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
+                    "C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
             Communicator comm = Util.initialize(args, initData);
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put(
                     "IceSSL.TrustOnly.Server",
-                    "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
+                    "C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -1093,10 +1093,10 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put(
                     "IceSSL.TrustOnly.Server",
-                    "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
+                    "!C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -1114,7 +1114,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -1131,7 +1131,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put("IceSSL.TrustOnly.Server", "CN=Server");
             ServerPrx server = fact.createServer(d);
             try {
@@ -1148,7 +1148,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put("IceSSL.TrustOnly.Server", "!CN=Client");
             ServerPrx server = fact.createServer(d);
             try {
@@ -1169,11 +1169,11 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put("IceSSL.TrustOnly.Server", "CN=bogus");
             d.put(
                     "IceSSL.TrustOnly.Server.ServerAdapter",
-                    "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
+                    "C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -1190,10 +1190,10 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put(
                     "IceSSL.TrustOnly.Server.ServerAdapter",
-                    "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
+                    "!C=US, ST=Florida, L=Jupiter, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
             ServerPrx server = fact.createServer(d);
             try {
                 server.ice_ping();
@@ -1209,7 +1209,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
 
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put("IceSSL.TrustOnly.Server.ServerAdapter", "CN=bogus");
             ServerPrx server = fact.createServer(d);
             try {
@@ -1225,7 +1225,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir)
             Communicator comm = Util.initialize(args, initData);
             ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
-            d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1");
+            d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1");
             d.put("IceSSL.TrustOnly.Server.ServerAdapter", "!CN=bogus");
             ServerPrx server = fact.createServer(d);
             try {
diff --git a/swift/src/Ice/CommunicatorI.swift b/swift/src/Ice/CommunicatorI.swift
index d140f0e2950..cb0f88590c9 100644
--- a/swift/src/Ice/CommunicatorI.swift
+++ b/swift/src/Ice/CommunicatorI.swift
@@ -13,14 +13,14 @@ class CommunicatorI: LocalObject<ICECommunicator>, Communicator {
     init(handle: ICECommunicator, initData: InitializationData) {
         defaultsAndOverrides = DefaultsAndOverrides(handle: handle)
         self.initData = initData
-        let num = try! initData.properties!.getIcePropertyAsInt("Ice.ClassGraphDepthMax")
+        let num = initData.properties!.getIcePropertyAsInt("Ice.ClassGraphDepthMax")
         if num < 1 || num > 0x7FFF_FFFF {
             classGraphDepthMax = 0x7FFF_FFFF
         } else {
             classGraphDepthMax = num
         }
-        traceSlicing = try! initData.properties!.getIcePropertyAsInt("Ice.Trace.Slicing") > 0
-        acceptClassCycles = try! initData.properties!.getIcePropertyAsInt("Ice.AcceptClassCycles") > 0
+        traceSlicing = initData.properties!.getIcePropertyAsInt("Ice.Trace.Slicing") > 0
+        acceptClassCycles = initData.properties!.getIcePropertyAsInt("Ice.AcceptClassCycles") > 0
 
         super.init(handle: handle)
     }
diff --git a/swift/src/Ice/Properties.swift b/swift/src/Ice/Properties.swift
index b240291bd7f..1a8581dfa36 100644
--- a/swift/src/Ice/Properties.swift
+++ b/swift/src/Ice/Properties.swift
@@ -18,9 +18,7 @@ public protocol Properties: AnyObject {
     /// - parameter key: `String` The property key.
     ///
     /// - returns: `String` - The property value or the default value.
-    ///
-    /// - throws: `NSException` if the key is not a valid Ice property
-    func getIceProperty(_ key: String) throws -> String
+    func getIceProperty(_ key: String) -> String
 
     /// Get a property by key. If the property is not set, the given default value is returned.
     ///
@@ -43,9 +41,7 @@ public protocol Properties: AnyObject {
     /// - parameter key: `String` The property key.
     ///
     /// - returns: `Int32` - The property value interpreted as an integer, or the default value.
-    ///
-    /// - throws: `NSException` if the key is not a valid Ice property
-    func getIcePropertyAsInt(_ key: String) throws -> Int32
+    func getIcePropertyAsInt(_ key: String) -> Int32
 
     /// Get a property as an integer. If the property is not set, the given default value is returned.
     ///
@@ -76,9 +72,7 @@ public protocol Properties: AnyObject {
     /// - parameter key: `String` The property key.
     ///
     /// - returns: `StringSeq` - The property value interpreted as list of strings, or the default value.
-    ///
-    /// - throws: `NSException` if the key is not a valid Ice property
-    func getIcePropertyAsList(_ key: String) throws -> StringSeq
+    func getIcePropertyAsList(_ key: String) -> StringSeq
 
     /// Get a property as a list of strings.  The strings must be separated by whitespace or comma. If the property is
     /// not set, the default list is returned. The strings in the list can contain whitespace and commas if they are
diff --git a/swift/src/Ice/PropertiesI.swift b/swift/src/Ice/PropertiesI.swift
index 7861783b7c0..c32a1c432a4 100644
--- a/swift/src/Ice/PropertiesI.swift
+++ b/swift/src/Ice/PropertiesI.swift
@@ -4,43 +4,43 @@ import IceImpl
 
 class PropertiesI: LocalObject<ICEProperties>, Properties {
     public func getProperty(_ key: String) -> String {
-        return handle.getProperty(key)
+        handle.getProperty(key)
     }
 
-    public func getIceProperty(_ key: String) throws -> String {
-        try handle.getIceProperty(key)
+    public func getIceProperty(_ key: String) -> String {
+        handle.getIceProperty(key)
     }
 
     public func getPropertyWithDefault(key: String, value: String) -> String {
-        return handle.getPropertyWithDefault(key, value: value)
+        handle.getPropertyWithDefault(key, value: value)
     }
 
     public func getPropertyAsInt(_ key: String) -> Int32 {
-        return handle.getPropertyAsInt(key)
+        handle.getPropertyAsInt(key)
     }
 
-    public func getIcePropertyAsInt(_ key: String) throws -> Int32 {
-        try handle.getIcePropertyAsInt(key) as! Int32
+    public func getIcePropertyAsInt(_ key: String) -> Int32 {
+        handle.getIcePropertyAsInt(key)
     }
 
     public func getPropertyAsIntWithDefault(key: String, value: Int32) -> Int32 {
-        return handle.getPropertyAsIntWithDefault(key: key, value: value)
+        handle.getPropertyAsIntWithDefault(key: key, value: value)
     }
 
     public func getPropertyAsList(_ key: String) -> StringSeq {
-        return handle.getPropertyAsList(key)
+        handle.getPropertyAsList(key)
     }
 
-    public func getIcePropertyAsList(_ key: String) throws -> StringSeq {
-        try handle.getIcePropertyAsList(key)
+    public func getIcePropertyAsList(_ key: String) -> StringSeq {
+        handle.getIcePropertyAsList(key)
     }
 
     public func getPropertyAsListWithDefault(key: String, value: StringSeq) -> StringSeq {
-        return handle.getPropertyAsListWithDefault(key: key, value: value)
+        handle.getPropertyAsListWithDefault(key: key, value: value)
     }
 
     public func getPropertiesForPrefix(_ prefix: String) -> PropertyDict {
-        return handle.getPropertiesForPrefix(prefix)
+        handle.getPropertiesForPrefix(prefix)
     }
 
     public func setProperty(key: String, value: String) {
@@ -55,28 +55,28 @@ class PropertiesI: LocalObject<ICEProperties>, Properties {
     }
 
     public func getCommandLineOptions() -> StringSeq {
-        return handle.getCommandLineOptions()
+        handle.getCommandLineOptions()
     }
 
     public func parseCommandLineOptions(prefix: String, options: StringSeq) throws -> StringSeq {
-        return try autoreleasepool {
+        try autoreleasepool {
             try handle.parseCommandLineOptions(prefix, options: options)
         }
     }
 
     public func parseIceCommandLineOptions(_ options: StringSeq) throws -> StringSeq {
-        return try autoreleasepool {
+        try autoreleasepool {
             try handle.parseIceCommandLineOptions(options)
         }
     }
 
     public func load(_ file: String) throws {
-        return try autoreleasepool {
+        try autoreleasepool {
             try handle.load(file)
         }
     }
 
     public func clone() -> Properties {
-        return PropertiesI(handle: handle.clone())
+        PropertiesI(handle: handle.clone())
     }
 }
diff --git a/swift/src/IceImpl/Properties.mm b/swift/src/IceImpl/Properties.mm
index 126dc4e0fc9..167274cd205 100644
--- a/swift/src/IceImpl/Properties.mm
+++ b/swift/src/IceImpl/Properties.mm
@@ -15,17 +15,11 @@ - (NSString*)getProperty:(NSString*)key
     return toNSString(self.properties->getProperty(fromNSString(key)));
 }
 
-- (NSString*)getIceProperty:(NSString*)key error:(NSError**)error;
+- (NSString*)getIceProperty:(NSString*)key;
 {
-    try
-    {
-        return toNSString(self.properties->getIceProperty(fromNSString(key)));
-    }
-    catch (...)
-    {
-        *error = convertException(std::current_exception());
-        return nil;
-    }
+    // We don't catch exceptions on purpose; in particular, we want Ice::UnknownPropertyException to terminate
+    // the application.
+    return toNSString(self.properties->getIceProperty(fromNSString(key)));
 }
 
 - (NSString*)getPropertyWithDefault:(NSString*)key value:(NSString*)value
@@ -38,18 +32,9 @@ - (int32_t)getPropertyAsInt:(NSString*)key
     return self.properties->getPropertyAsInt(fromNSString(key));
 }
 
-- (NSNumber*)getIcePropertyAsInt:(NSString*)key error:(NSError**)error
+- (int32_t)getIcePropertyAsInt:(NSString*)key
 {
-    try
-    {
-        int32_t value = self.properties->getIcePropertyAsInt(fromNSString(key));
-        return [NSNumber numberWithInt:value];
-    }
-    catch (...)
-    {
-        *error = convertException(std::current_exception());
-        return nil;
-    }
+    return self.properties->getIcePropertyAsInt(fromNSString(key));
 }
 
 - (int32_t)getPropertyAsIntWithDefault:(NSString*)key value:(int32_t)value
@@ -62,17 +47,9 @@ - (int32_t)getPropertyAsIntWithDefault:(NSString*)key value:(int32_t)value
     return toNSArray(self.properties->getPropertyAsList(fromNSString(key)));
 }
 
-- (NSArray<NSString*>*)getIcePropertyAsList:(NSString*)key error:(NSError**)error
+- (NSArray<NSString*>*)getIcePropertyAsList:(NSString*)key
 {
-    try
-    {
-        return toNSArray(self.properties->getIcePropertyAsList(fromNSString(key)));
-    }
-    catch (...)
-    {
-        *error = convertException(std::current_exception());
-        return nil;
-    }
+    return toNSArray(self.properties->getIcePropertyAsList(fromNSString(key)));
 }
 
 - (NSArray<NSString*>*)getPropertyAsListWithDefault:(NSString*)key value:(NSArray<NSString*>*)value
diff --git a/swift/src/IceImpl/include/Properties.h b/swift/src/IceImpl/include/Properties.h
index 47ddd12cf12..d0c2225a948 100644
--- a/swift/src/IceImpl/include/Properties.h
+++ b/swift/src/IceImpl/include/Properties.h
@@ -4,29 +4,28 @@
 NS_ASSUME_NONNULL_BEGIN
 
 ICEIMPL_API @interface ICEProperties : ICELocalObject
-- (nonnull NSString*)getProperty:(NSString*)key;
-- (nullable NSString*)getIceProperty:(NSString*)key error:(NSError**)error NS_SWIFT_NAME(getIceProperty(_:));
-- (nonnull NSString*)getPropertyWithDefault:(NSString*)key value:(NSString*)value;
+- (NSString*)getProperty:(NSString*)key;
+- (NSString*)getIceProperty:(NSString*)key;
+- (NSString*)getPropertyWithDefault:(NSString*)key value:(NSString*)value;
 - (int32_t)getPropertyAsInt:(NSString*)key;
-- (nullable NSNumber*)getIcePropertyAsInt:(NSString*)key error:(NSError**)error NS_SWIFT_NAME(getIcePropertyAsInt(_:));
+- (int32_t)getIcePropertyAsInt:(NSString*)key NS_SWIFT_NAME(getIcePropertyAsInt(_:));
 - (int32_t)getPropertyAsIntWithDefault:(NSString*)key
                                  value:(int32_t)value NS_SWIFT_NAME(getPropertyAsIntWithDefault(key:value:));
-- (nonnull NSArray<NSString*>*)getPropertyAsList:(NSString* _Nonnull)key;
-- (nullable NSArray<NSString*>*)getIcePropertyAsList:(NSString* _Nonnull)key
-                                               error:(NSError**)error NS_SWIFT_NAME(getIcePropertyAsList(_:));
-- (nonnull NSArray<NSString*>*)getPropertyAsListWithDefault:(NSString* _Nonnull)key
-                                                      value:(NSArray<NSString*>* _Nonnull)value
+- (NSArray<NSString*>*)getPropertyAsList:(NSString* _Nonnull)key;
+- (NSArray<NSString*>*)getIcePropertyAsList:(NSString* _Nonnull)key NS_SWIFT_NAME(getIcePropertyAsList(_:));
+- (NSArray<NSString*>*)getPropertyAsListWithDefault:(NSString* _Nonnull)key
+                                              value:(NSArray<NSString*>* _Nonnull)value
     NS_SWIFT_NAME(getPropertyAsListWithDefault(key:value:));
-- (nonnull NSDictionary<NSString*, NSString*>*)getPropertiesForPrefix:(NSString* _Nonnull)prefix
+- (NSDictionary<NSString*, NSString*>*)getPropertiesForPrefix:(NSString* _Nonnull)prefix
     NS_SWIFT_NAME(getPropertiesForPrefix(_:));
 - (BOOL)setProperty:(NSString*)key value:(NSString*)value error:(NSError**)error;
-- (nonnull NSArray<NSString*>*)getCommandLineOptions;
+- (NSArray<NSString*>*)getCommandLineOptions;
 - (nullable NSArray<NSString*>*)parseCommandLineOptions:(NSString*)prefix
                                                 options:(NSArray<NSString*>*)options
                                                   error:(NSError* _Nullable* _Nullable)error;
 - (nullable NSArray<NSString*>*)parseIceCommandLineOptions:(NSArray<NSString*>*)options error:(NSError**)error;
 - (BOOL)load:(NSString*)file error:(NSError* _Nullable* _Nullable)error;
-- (nonnull ICEProperties*)clone;
+- (ICEProperties*)clone;
 @end
 
 #ifdef __cplusplus
diff --git a/swift/test/Ice/binding/AllTests.swift b/swift/test/Ice/binding/AllTests.swift
index 5ef7e4fcb71..010f743a116 100644
--- a/swift/test/Ice/binding/AllTests.swift
+++ b/swift/test/Ice/binding/AllTests.swift
@@ -536,7 +536,7 @@ func testSecureEndpoints(helper: TestHelper, com: RemoteCommunicatorPrx) async t
 
     let output = helper.getWriter()
 
-    if try helper.communicator().getProperties().getIceProperty("Ice.Default.Protocol") == "ssl" {
+    if helper.communicator().getProperties().getIceProperty("Ice.Default.Protocol") == "ssl" {
         output.write("testing unsecure vs. secure endpoints... ")
         do {
             let adapters = try await [
diff --git a/swift/test/Ice/enums/AllTests.swift b/swift/test/Ice/enums/AllTests.swift
index 0bcb7708f79..1474e5be761 100644
--- a/swift/test/Ice/enums/AllTests.swift
+++ b/swift/test/Ice/enums/AllTests.swift
@@ -61,7 +61,7 @@ func allTests(_ helper: TestHelper) async throws -> TestIntfPrx {
     output.write("testing enum streaming... ")
 
     let encoding_1_0 =
-        try communicator.getProperties().getIceProperty("Ice.Default.EncodingVersion") == "1.0"
+        communicator.getProperties().getIceProperty("Ice.Default.EncodingVersion") == "1.0"
 
     var ostr = Ice.OutputStream(communicator: communicator)
     ostr.write(ByteEnum.benum11)
diff --git a/swift/test/Ice/facets/AllTests.swift b/swift/test/Ice/facets/AllTests.swift
index 29eb1e6f025..83b48296454 100644
--- a/swift/test/Ice/facets/AllTests.swift
+++ b/swift/test/Ice/facets/AllTests.swift
@@ -16,17 +16,17 @@ func allTests(_ helper: TestHelper) async throws -> GPrx {
     output.write("testing Ice.Admin.Facets property... ")
     try test(communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets").count == 0)
     communicator.getProperties().setProperty(key: "Ice.Admin.Facets", value: "foobar")
-    var facetFilter = try communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
+    var facetFilter = communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
     try test(facetFilter == ["foobar"])
     communicator.getProperties().setProperty(key: "Ice.Admin.Facets", value: "foo\\'bar")
-    facetFilter = try communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
+    facetFilter = communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
     try test(facetFilter == ["foo'bar"])
     communicator.getProperties().setProperty(key: "Ice.Admin.Facets", value: "'foo bar' toto 'titi'")
-    facetFilter = try communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
+    facetFilter = communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
     try test(facetFilter == ["foo bar", "toto", "titi"])
     communicator.getProperties().setProperty(
         key: "Ice.Admin.Facets", value: "'foo bar\\' toto' 'titi'")
-    facetFilter = try communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
+    facetFilter = communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
     try test(facetFilter == ["foo bar' toto", "titi"])
     // communicator.getProperties().setProperty("Ice.Admin.Facets", "'foo bar' 'toto titi");
     // facetFilter = try communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets");
diff --git a/swift/test/Ice/info/AllTests.swift b/swift/test/Ice/info/AllTests.swift
index 960238e4829..621a771fca7 100644
--- a/swift/test/Ice/info/AllTests.swift
+++ b/swift/test/Ice/info/AllTests.swift
@@ -83,7 +83,7 @@ func allTests(_ helper: TestHelper) async throws {
 
     output.write("test object adapter endpoint information... ")
     do {
-        let host = try communicator.getProperties().getIcePropertyAsInt("Ice.IPv6") != 0 ? "::1" : "127.0.0.1"
+        let host = communicator.getProperties().getIcePropertyAsInt("Ice.IPv6") != 0 ? "::1" : "127.0.0.1"
         communicator.getProperties().setProperty(
             key: "TestAdapter.Endpoints",
             value: "tcp -h \"\(host)\" -t 15000:udp -h \"\(host)\"")
@@ -149,7 +149,7 @@ func allTests(_ helper: TestHelper) async throws {
 
     let testIntf = try await checkedCast(prx: base, type: TestIntfPrx.self)!
 
-    let defaultHost = try communicator.getProperties().getIceProperty("Ice.Default.Host")
+    let defaultHost = communicator.getProperties().getIceProperty("Ice.Default.Host")
 
     output.write("test connection endpoint information... ")
     do {
diff --git a/swift/test/Ice/objects/TestI.swift b/swift/test/Ice/objects/TestI.swift
index 032a00d97bf..0ecf961c7c5 100644
--- a/swift/test/Ice/objects/TestI.swift
+++ b/swift/test/Ice/objects/TestI.swift
@@ -159,7 +159,7 @@ class InitialI: Initial {
 
     func acceptsClassCycles(current: Ice.Current) async throws -> Bool {
         let properties = current.adapter.getCommunicator().getProperties()
-        return try properties.getIcePropertyAsInt("Ice.AcceptClassCycles") > 0
+        return properties.getIcePropertyAsInt("Ice.AcceptClassCycles") > 0
     }
 
     func getD1(d1: D1?, current _: Ice.Current) async throws -> D1? {
diff --git a/swift/test/Ice/operations/BatchOneways.swift b/swift/test/Ice/operations/BatchOneways.swift
index d93057d1172..ee96eb1f92a 100644
--- a/swift/test/Ice/operations/BatchOneways.swift
+++ b/swift/test/Ice/operations/BatchOneways.swift
@@ -72,7 +72,7 @@ func batchOneways(_ helper: TestHelper, _ p: MyClassPrx) async throws {
     conn = try await p.ice_getConnection()
     if supportsCompress,
         conn != nil,
-        try! p.ice_getCommunicator().getProperties().getIceProperty("Ice.Override.Compress") == ""
+        p.ice_getCommunicator().getProperties().getIceProperty("Ice.Override.Compress") == ""
     {
         let prx = try await p.ice_getConnection()!.createProxy(p.ice_getIdentity()).ice_batchOneway()
 
diff --git a/swift/test/Ice/optional/AllTests.swift b/swift/test/Ice/optional/AllTests.swift
index da7fac61a67..c2896092521 100644
--- a/swift/test/Ice/optional/AllTests.swift
+++ b/swift/test/Ice/optional/AllTests.swift
@@ -669,7 +669,7 @@ func allTests(_ helper: TestHelper) async throws -> InitialPrx {
     }
     output.writeLine("ok")
 
-    if communicator.getProperties().getPropertyAsInt("Ice.Default.SlicedFormat") > 0 {
+    if communicator.getProperties().getIcePropertyAsInt("Ice.Default.SlicedFormat") > 0 {
         output.write("testing marshaling with unknown class slices... ")
         do {
             let c = C()
diff --git a/swift/test/Ice/properties/Client.swift b/swift/test/Ice/properties/Client.swift
index 904f0057528..1e39d92b96b 100644
--- a/swift/test/Ice/properties/Client.swift
+++ b/swift/test/Ice/properties/Client.swift
@@ -101,13 +101,13 @@ public class Client: TestHelperI {
             output.write("testing ice properties with set default values...")
             let properties = Ice.createProperties()
 
-            let toStringMode = try properties.getIceProperty("Ice.ToStringMode")
+            let toStringMode = properties.getIceProperty("Ice.ToStringMode")
             try test(toStringMode == "Unicode")
 
-            let closeTimeout = try properties.getIcePropertyAsInt("Ice.Connection.Client.CloseTimeout")
+            let closeTimeout = properties.getIcePropertyAsInt("Ice.Connection.Client.CloseTimeout")
             try test(closeTimeout == 10)
 
-            let retryIntervals = try properties.getIcePropertyAsList("Ice.RetryIntervals")
+            let retryIntervals = properties.getIcePropertyAsList("Ice.RetryIntervals")
             try test(retryIntervals == ["0"])
 
             output.writeLine("ok")
@@ -117,24 +117,26 @@ public class Client: TestHelperI {
             output.write("testing ice properties with unset default values...")
             let properties = Ice.createProperties()
 
-            let stringValue = try properties.getIceProperty("Ice.Admin.Router")
+            let stringValue = properties.getIceProperty("Ice.Admin.Router")
             try test(stringValue == "")
 
-            let intValue = try properties.getIcePropertyAsInt("Ice.Admin.Router")
+            let intValue = properties.getIcePropertyAsInt("Ice.Admin.Router")
             try test(intValue == 0)
 
-            let listValue = try properties.getIcePropertyAsList("Ice.Admin.Router")
+            let listValue = properties.getIcePropertyAsList("Ice.Admin.Router")
             try test(listValue == [])
 
             output.writeLine("ok")
         }
 
+        /*
         do {
             output.write("testing that getting an unknown ice property throws an exception...")
             let properties = Ice.createProperties()
 
             do {
-                _ = try properties.getIceProperty("Ice.UnknownProperty")
+                // Cannot test in Swift since this generates a fatal error.
+                _ = properties.getIceProperty("Ice.UnknownProperty")
                 try test(false)
             } catch let error as UnknownPropertyException {
                 try test(error.ice_id() == "::Ice::UnknownPropertyException")
@@ -143,5 +145,6 @@ public class Client: TestHelperI {
 
             output.writeLine("ok")
         }
+        */
     }
 }
diff --git a/swift/test/Ice/proxy/AllTests.swift b/swift/test/Ice/proxy/AllTests.swift
index d440741cdfc..36d8089c230 100644
--- a/swift/test/Ice/proxy/AllTests.swift
+++ b/swift/test/Ice/proxy/AllTests.swift
@@ -856,7 +856,7 @@ public func allTests(_ helper: TestHelper) async throws -> MyClassPrx {
         "test -e 1.1:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==")!
     try test(communicator.proxyToString(p2) == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000")
 
-    if try communicator.getProperties().getIcePropertyAsInt("Ice.IPv6") == 0 {
+    if communicator.getProperties().getIcePropertyAsInt("Ice.IPv6") == 0 {
         // Two legal TCP endpoints expressed as opaque endpoints
         p1 = try communicator.stringToProxy(
             "test -e 1.0:" + "opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:"
diff --git a/swift/test/Ice/stream/Client.swift b/swift/test/Ice/stream/Client.swift
index 0068c41e0a0..71fc7157df4 100644
--- a/swift/test/Ice/stream/Client.swift
+++ b/swift/test/Ice/stream/Client.swift
@@ -186,7 +186,7 @@ public class Client: TestHelperI {
             try inS.readPendingValues()
             try test(o2!.bo == o.bo)
             try test(o2!.by == o.by)
-            if try communicator.getProperties().getIceProperty("Ice.Default.EncodingVersion") == "1.0" {
+            if communicator.getProperties().getIceProperty("Ice.Default.EncodingVersion") == "1.0" {
                 try test(o2!.sh == nil)
                 try test(o2!.i == nil)
             } else {
diff --git a/swift/test/Ice/udp/AllTests.swift b/swift/test/Ice/udp/AllTests.swift
index 2b9f9e3c3cf..fd43b265120 100644
--- a/swift/test/Ice/udp/AllTests.swift
+++ b/swift/test/Ice/udp/AllTests.swift
@@ -83,7 +83,7 @@ public func allTests(_ helper: TestHelper) async throws {
     }
     try test(ret)
 
-    if try communicator.getProperties().getIcePropertyAsInt("Ice.Override.Compress") == 0 {
+    if communicator.getProperties().getIcePropertyAsInt("Ice.Override.Compress") == 0 {
         //
         // Only run this test if compression is disabled, the test expect fixed message size
         // to be sent over the wire.
@@ -125,7 +125,7 @@ public func allTests(_ helper: TestHelper) async throws {
     //
     // Use loopback to prevent other machines to answer.
     //
-    if try communicator.getProperties().getIceProperty("Ice.IPv6") == "1" {
+    if communicator.getProperties().getIceProperty("Ice.IPv6") == "1" {
         endpoint += "udp -h \"ff15::1:1\" --interface \"::1\""
     } else {
         endpoint += "udp -h 239.255.1.1 --interface 127.0.0.1"
@@ -140,7 +140,7 @@ public func allTests(_ helper: TestHelper) async throws {
         do {
             try await objMcast.ping(reply)
             ret = replyI.waitReply(expectedReplies: 5, timeout: 5000)
-        } catch is Ice.SocketException where try! communicator.getProperties().getIceProperty("Ice.IPv6") == "1" {
+        } catch is Ice.SocketException where communicator.getProperties().getIceProperty("Ice.IPv6") == "1" {
             output.write("(not supported) ")
             ret = true
         }
diff --git a/swift/test/Ice/udp/Server.swift b/swift/test/Ice/udp/Server.swift
index 406aa247d47..0ec93eae55c 100644
--- a/swift/test/Ice/udp/Server.swift
+++ b/swift/test/Ice/udp/Server.swift
@@ -35,7 +35,7 @@ class Server: TestHelperI {
         //
         // Use loopback to prevent other machines to answer.
         //
-        if try properties.getIceProperty("Ice.IPv6") == "1" {
+        if properties.getIceProperty("Ice.IPv6") == "1" {
             endpoint += "udp -h \"ff15::1:1\" --interface \"::1\""
         } else {
             endpoint += "udp -h 239.255.1.1 --interface 127.0.0.1"
diff --git a/swift/test/TestCommon/TestCommon.swift b/swift/test/TestCommon/TestCommon.swift
index b5b4e35ac01..6a1d96158b8 100644
--- a/swift/test/TestCommon/TestCommon.swift
+++ b/swift/test/TestCommon/TestCommon.swift
@@ -99,7 +99,7 @@ open class TestHelperI: TestHelper {
         var s = ""
         s +=
             (prot == "")
-            ? try! properties.getIceProperty("Ice.Default.Protocol") : prot
+            ? properties.getIceProperty("Ice.Default.Protocol") : prot
         s += " -p "
         let port = properties.getPropertyAsIntWithDefault(key: "Test.BasePort", value: 12010) + num
         s += String(port)