Updated makecerts to copy pertinent certificates to the test directory on

    setup of a CA.

11 files changed, 302 insertions, 258 deletions

diff --git a/cpp/certs/c_rsa1024_priv.pem b/cpp/certs/c_rsa1024_priv.pem
index bed6c34a529..4cd966b1953 100644
--- a/cpp/certs/c_rsa1024_priv.pem
+++ b/cpp/certs/c_rsa1024_priv.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDBVfi8jJNVPFz3ZGEzEhleOg0vzae/2XKEGInspnRDRGNeWB3j
-Sk87yyTQYOkb6NfuYEzjTrhwz7KR+d3217z6xaygcV6/xHg8sl+8kR6cRQR9SOZC
-BKDSUS9/EQyXXPtkt/kXA0FuGDdEclyp+5+pVX1Mdvc/auVYKwej7kwUPQIDAQAB
-AoGAPstTnLnz6I1QjLG3uES6pJYqTkp3n6JaxXjK42g0/twpgi0QmBA8p+kVLfEs
-BXqdF7mDf5jD4zAyiaMkatYrdJ6PFGVyhXh1PQ7dqNIsf96U5dMWmBLfVVYGk0vr
-eiYJkxSACh/5OJIRDzGkxJ1+X8cWVBaI45iKFrirgYyttAECQQD22S44DrMFmand
-PpzvsMsOjZNLjoHvxWkbvg9UoyJA2DuwZtUUdxiDG6RfdcXEBid8u5MkxT1mmOdU
-IL9s2T29AkEAyIDoV/g+c74C2QqdBdX96jrrh3nqisYY4NMNnchfCOXiBewW4Ija
-wB6qN0Vk4CEzdpf6KJhmyIF2mmer9DdYgQJAcBTKnJ9n/8n2y8NLRLX0bQYxdCQf
-sXvkLrmMgnST7/d+mqkGZQVyds1NRB7YjhnxQfx1YkPAjl4s4xD/ee/lzQJBAJXb
-u0zczxjFAO3lv9z3xzNFXHrCham5TCjltfyjIVzOLPQOND8YKp+Di+eJp07ZodRW
-3PNwjQn5sYLQT7ZVk4ECQQCFOBugjETxnaJ/Yii9fuNWEC0DmOIk+Vje1Nkxmw5+
-x9AJo4XZjSVdSjvpYP+aAFGW+1pQf+jDsxj+o9ebT6dh
+MIICXwIBAAKBgQDW9QJ8Go6rLOA2myM24pOJGWofAeXfc5ZfelIXzGDUooTBy+iN
+P8lhoIHKcCiw/LAkCZOSJD2jghZXEAfjZXC1B9ZJarm2pwQwDi3OOLdqzoS2CwjP
+a3epg8zAstXhFvV47Z9pqdblprMriI8zm3SeM50fW8toMeGPa3jgeysvOQIDAQAB
+AoGBAINhjPs9YCXPb9rwRz2sjnAlUG9TQaSpiSciJDrXd/d+vZWVg7WRXwyEhc+t
+bbF/QElGcSPJcsMVJ4JfEfMydQeR0Il6qOlqsciLXX9vvcq7xeA4fjqBvoXoHAzM
+aXz3PkcNsj9/WK38StWwtqxJVUJHM25y9/XiiCvaXT6rATgBAkEA7isVcdAd7l9G
+nTubnEgjizRLRhACAOSxNMgzETCquc22cgb0tAnBP4o1BeiPAAX8Cpc0mJHaUxKh
+Kj8BBcVI2QJBAOcNCrD1owayY5rvXiOVtgxY4P0e7M8wMSwVpl/nuLyXYkjrQHDq
+3Weqgnov1vf2+Eh7UqpwDTcemV2LUFk6HWECQQDVcvlqIhnhG7RekCB7JM/uHzTj
+Gs+g21TRuCbEXjh0AyBi+0bt39w4xPWWUQFwBO0I1NDHd9gSIZ0dDpAtCs2pAkEA
+h/YHtYxGS7mLnW+AAQanIurmMm0RQvaD6QIwbj0oW2nlvy0YNZovgUI4F3ixUic1
+gUl4oqzfSfEqpH5HYMou4QJBAMsb6bYoWjyK8nfuGqIGcg7VoR2szSodw+f1Gv7u
+X0xs3XOkRUqGE3RIOJ9YFKQ4IIxOYa5/iD8AMiE2RUGQyvw=
 -----END RSA PRIVATE KEY-----
diff --git a/cpp/certs/c_rsa1024_pub.pem b/cpp/certs/c_rsa1024_pub.pem
index d61200c2b73..91ab752914f 100644
--- a/cpp/certs/c_rsa1024_pub.pem
+++ b/cpp/certs/c_rsa1024_pub.pem
@@ -5,71 +5,71 @@ Certificate:
         Signature Algorithm: md5WithRSAEncryption
         Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/Email=you@some.net
         Validity
-            Not Before: Feb 23 19:57:38 2003 GMT
-            Not After : Feb 23 19:57:38 2004 GMT
+            Not Before: Feb 23 20:45:01 2003 GMT
+            Not After : Feb 23 20:45:01 2004 GMT
         Subject: C=US, ST=Some State, O=Your Company, OU=Development/Email=iceclient@@some.net, CN=Ice Client
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:c1:55:f8:bc:8c:93:55:3c:5c:f7:64:61:33:12:
-                    19:5e:3a:0d:2f:cd:a7:bf:d9:72:84:18:89:ec:a6:
-                    74:43:44:63:5e:58:1d:e3:4a:4f:3b:cb:24:d0:60:
-                    e9:1b:e8:d7:ee:60:4c:e3:4e:b8:70:cf:b2:91:f9:
-                    dd:f6:d7:bc:fa:c5:ac:a0:71:5e:bf:c4:78:3c:b2:
-                    5f:bc:91:1e:9c:45:04:7d:48:e6:42:04:a0:d2:51:
-                    2f:7f:11:0c:97:5c:fb:64:b7:f9:17:03:41:6e:18:
-                    37:44:72:5c:a9:fb:9f:a9:55:7d:4c:76:f7:3f:6a:
-                    e5:58:2b:07:a3:ee:4c:14:3d
+                    00:d6:f5:02:7c:1a:8e:ab:2c:e0:36:9b:23:36:e2:
+                    93:89:19:6a:1f:01:e5:df:73:96:5f:7a:52:17:cc:
+                    60:d4:a2:84:c1:cb:e8:8d:3f:c9:61:a0:81:ca:70:
+                    28:b0:fc:b0:24:09:93:92:24:3d:a3:82:16:57:10:
+                    07:e3:65:70:b5:07:d6:49:6a:b9:b6:a7:04:30:0e:
+                    2d:ce:38:b7:6a:ce:84:b6:0b:08:cf:6b:77:a9:83:
+                    cc:c0:b2:d5:e1:16:f5:78:ed:9f:69:a9:d6:e5:a6:
+                    b3:2b:88:8f:33:9b:74:9e:33:9d:1f:5b:cb:68:31:
+                    e1:8f:6b:78:e0:7b:2b:2f:39
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                A1:15:B5:A5:0A:17:FB:81:16:E6:EF:10:05:C2:99:6D:AE:3C:CA:C4
+                2D:C3:08:2C:45:F7:34:20:A1:3E:30:ED:FE:CF:21:1E:46:92:F0:D5
             X509v3 Authority Key Identifier: 
-                keyid:A3:62:E2:93:71:FF:B6:5E:05:97:1A:1B:72:88:6D:2B:69:09:71:64
+                keyid:29:E9:30:30:E9:07:C9:6D:A8:51:6C:7D:30:51:40:D3:0A:C4:24:80
                 DirName:/C=US/ST=Some State/L=Somewhere/O=Your Company/OU=Development/CN=Your Certificate Authority/Email=you@some.net
                 serial:00
 
     Signature Algorithm: md5WithRSAEncryption
-        aa:01:ca:82:ae:63:16:ef:7c:99:6f:52:86:89:93:35:a0:50:
-        c9:fc:96:7b:ec:41:81:7a:73:3c:88:e6:14:b0:e4:f1:0c:36:
-        f1:ea:2f:3e:29:5d:8f:d6:7a:43:e0:3d:10:ec:97:ff:f9:ed:
-        0a:5c:a5:d9:71:32:97:7b:03:81:8b:1e:a4:ea:c3:ee:ac:ad:
-        ff:b2:61:ef:60:e5:83:b6:c9:62:83:5e:14:18:e9:81:74:f5:
-        ec:e4:ba:4f:94:48:b1:77:2e:66:48:b8:92:22:ce:a3:14:40:
-        c3:83:78:a4:af:24:04:55:19:95:70:80:38:ae:ca:1c:ef:31:
-        ad:a4:e8:16:86:fa:76:aa:33:85:0a:41:55:16:d4:33:6c:8c:
-        bd:d7:64:cd:cd:7d:e5:23:fa:fe:f6:73:fb:e6:1d:79:16:4a:
-        c3:ab:40:00:0e:56:cf:1e:ac:9b:34:71:ec:b5:4e:2f:70:4f:
-        b6:fb:d0:09:a7:d7:14:f0:7e:5f:9e:7f:0c:e4:69:98:4d:03:
-        ed:6b:eb:de:87:82:a8:7d:17:28:30:f2:45:ee:86:ac:fc:aa:
-        7e:1b:5b:0c:e8:67:3f:e6:90:d6:c1:a8:d1:b4:68:13:82:52:
-        e6:b2:cd:57:cb:63:a8:3b:d6:6e:b0:7d:02:12:2d:90:52:88:
-        88:4d:8e:dc
+        76:9f:25:31:69:d9:c9:ee:42:10:4b:d2:0a:4b:f7:d7:5a:a3:
+        3d:96:eb:aa:f6:29:1f:da:23:d6:e5:5b:6c:da:64:79:60:4b:
+        34:34:be:f9:d2:03:1b:84:a4:78:59:86:c5:c1:c0:69:05:d7:
+        9f:5f:ea:80:cf:5f:a2:2d:29:88:fb:19:b6:00:9e:ab:d2:7b:
+        c7:8a:61:86:70:07:b8:ab:e8:ce:a6:f4:95:71:94:4c:d4:b4:
+        11:e1:7c:f9:f2:54:da:ee:f3:27:bd:91:5b:31:ff:c9:d2:48:
+        59:32:6e:ec:a0:e8:8f:52:b2:15:6d:b8:36:57:08:67:9b:53:
+        26:f2:fb:0c:77:dd:83:5f:87:3b:41:6b:be:6b:05:e4:d8:58:
+        4a:bd:82:c9:57:f6:24:bc:f7:79:b8:77:31:e1:e1:5c:b2:6a:
+        02:0e:0f:57:fd:7f:40:19:87:55:09:a4:af:0e:d9:84:6d:6d:
+        4d:e2:7d:6e:7f:ac:e1:15:7f:b6:20:28:33:49:6c:de:4e:e7:
+        05:dc:08:46:a0:46:98:b5:30:88:23:5a:10:1d:cd:b5:1d:c1:
+        14:06:5d:98:ee:80:0d:ab:a1:c3:03:54:1a:42:0a:35:f2:95:
+        36:03:c9:a8:c5:c5:e4:fc:f9:c1:9a:cb:e1:b5:7a:93:dc:af:
+        47:47:d5:66
 -----BEGIN CERTIFICATE-----
 MIIEKjCCAxKgAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
 EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
 ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
 WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wMzAyMjMxOTU3MzhaFw0wNDAyMjMxOTU3MzhaMIGIMQswCQYD
+b21lLm5ldDAeFw0wMzAyMjMyMDQ1MDFaFw0wNDAyMjMyMDQ1MDFaMIGIMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTEVMBMGA1UEChMMWW91ciBDb21w
 YW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEiMCAGCSqGSIb3DQEJARYTaWNlY2xp
 ZW50QEBzb21lLm5ldDETMBEGA1UEAxMKSWNlIENsaWVudDCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAwVX4vIyTVTxc92RhMxIZXjoNL82nv9lyhBiJ7KZ0Q0Rj
-Xlgd40pPO8sk0GDpG+jX7mBM4064cM+ykfnd9te8+sWsoHFev8R4PLJfvJEenEUE
-fUjmQgSg0lEvfxEMl1z7ZLf5FwNBbhg3RHJcqfufqVV9THb3P2rlWCsHo+5MFD0C
-AwEAAaOCAQIwgf8wCQYDVR0TBAIwADAdBgNVHQ4EFgQUoRW1pQoX+4EW5u8QBcKZ
-ba48ysQwgdIGA1UdIwSByjCBx4AUo2Lik3H/tl4FlxobcohtK2kJcWShgaukgagw
+AQEFAAOBjQAwgYkCgYEA1vUCfBqOqyzgNpsjNuKTiRlqHwHl33OWX3pSF8xg1KKE
+wcvojT/JYaCBynAosPywJAmTkiQ9o4IWVxAH42VwtQfWSWq5tqcEMA4tzji3as6E
+tgsIz2t3qYPMwLLV4Rb1eO2faanW5aazK4iPM5t0njOdH1vLaDHhj2t44HsrLzkC
+AwEAAaOCAQIwgf8wCQYDVR0TBAIwADAdBgNVHQ4EFgQULcMILEX3NCChPjDt/s8h
+HkaS8NUwgdIGA1UdIwSByjCBx4AUKekwMOkHyW2oUWx9MFFA0wrEJIChgaukgagw
 gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lIFN0YXRlMRIwEAYDVQQHEwlT
 b21ld2hlcmUxFTATBgNVBAoTDFlvdXIgQ29tcGFueTEUMBIGA1UECxMLRGV2ZWxv
 cG1lbnQxIzAhBgNVBAMTGllvdXIgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRswGQYJ
-KoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAwDQYJKoZIhvcNAQEEBQADggEBAKoB
-yoKuYxbvfJlvUoaJkzWgUMn8lnvsQYF6czyI5hSw5PEMNvHqLz4pXY/WekPgPRDs
-l//57QpcpdlxMpd7A4GLHqTqw+6srf+yYe9g5YO2yWKDXhQY6YF09ezkuk+USLF3
-LmZIuJIizqMUQMODeKSvJARVGZVwgDiuyhzvMa2k6BaG+naqM4UKQVUW1DNsjL3X
-ZM3NfeUj+v72c/vmHXkWSsOrQAAOVs8erJs0cey1Ti9wT7b70Amn1xTwfl+efwzk
-aZhNA+1r696Hgqh9Fygw8kXuhqz8qn4bWwzoZz/mkNbBqNG0aBOCUuayzVfLY6g7
-1m6wfQISLZBSiIhNjtw=
+KoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAwDQYJKoZIhvcNAQEEBQADggEBAHaf
+JTFp2cnuQhBL0gpL99daoz2W66r2KR/aI9blW2zaZHlgSzQ0vvnSAxuEpHhZhsXB
+wGkF159f6oDPX6ItKYj7GbYAnqvSe8eKYYZwB7ir6M6m9JVxlEzUtBHhfPnyVNru
+8ye9kVsx/8nSSFkybuyg6I9SshVtuDZXCGebUyby+wx33YNfhztBa75rBeTYWEq9
+gslX9iS893m4dzHh4VyyagIOD1f9f0AZh1UJpK8O2YRtbU3ifW5/rOEVf7YgKDNJ
+bN5O5wXcCEagRpi1MIgjWhAdzbUdwRQGXZjugA2rocMDVBpCCjXylTYDyajFxeT8
++cGay+G1epPcr0dH1WY=
 -----END CERTIFICATE-----
diff --git a/cpp/certs/cacert.pem b/cpp/certs/cacert.pem
index 3503ac5504b..6f9e0253c83 100644
--- a/cpp/certs/cacert.pem
+++ b/cpp/certs/cacert.pem
@@ -3,26 +3,26 @@ MIIEzzCCA7egAwIBAgIBADANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
 EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
 ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
 WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wMzAyMjMxOTU3MzJaFw0wODAyMjIxOTU3MzJaMIGlMQswCQYD
+b21lLm5ldDAeFw0wMzAyMjMyMDQ0NTdaFw0wODAyMjIyMDQ0NTdaMIGlMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTESMBAGA1UEBxMJU29tZXdoZXJl
 MRUwEwYDVQQKEwxZb3VyIENvbXBhbnkxFDASBgNVBAsTC0RldmVsb3BtZW50MSMw
 IQYDVQQDExpZb3VyIENlcnRpZmljYXRlIEF1dGhvcml0eTEbMBkGCSqGSIb3DQEJ
 ARYMeW91QHNvbWUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-r/tUH3x/WqpppiJ+v8mTleo2+7DE3+bNSxQeYoRX7v7pwYEPS0qDPmQ5K7nJLjCR
-RTGRV9EG6iSfS6vozpKNn/eWn3ycWI7EBdaZDtZqXoBd3xbRFG04CqiNCPszDZsF
-JBFOWriW9ayu/8ovPu7QLb2OR4/umDfH9Wmsr9ngjEIsKy4/qp9yKedpF1atwCpy
-i8zziCo+92EMaPNf3K+k5Ktez3UQa89TpsFQl6tzDlfDq/w6m7Y/01vsoZfxw+5C
-SHmGdJ5x7nOxHfzo3ikxcLke6n9SNzntbzi587+5QUjDrdpeP5XUVEsp4vLM/4ue
-us9c7wRCL/j0eRal/IkrVwIDAQABo4IBBjCCAQIwDAYDVR0TBAUwAwEB/zAdBgNV
-HQ4EFgQUo2Lik3H/tl4FlxobcohtK2kJcWQwgdIGA1UdIwSByjCBx4AUo2Lik3H/
-tl4FlxobcohtK2kJcWShgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpT
+u17O25ToqVFfcNUlGGvpgDu1mQ+HlJ3JZ7smF1MlsvKyQDEvgwu0THTzoIockNOv
+VDOfwQMAskBHDZZIzy8rATRP5WUCnpmYZKtdr7FMB9BLt/a0B0EL4bdKqAyxne8R
+9br4/MERGa79NGL2FGwFV7PoLQ/rmqmea6tgBqjqg8fX6UHOXHEgnZ2we5zgtXuV
+7GEe/2ys+k2wDXM740st7qSrDUAZ+lXN4VJUfe4ravWmOfiBG3X8xw1s+pNDwA6M
+VpTPI+fV+Gdnk6jOi/quatiERyNkxfbAYsgKk4Y7hUySgQcgpMZOOhvJWJOyU0OT
+32xZUXfVA5d+0DBQ6mGMbQIDAQABo4IBBjCCAQIwDAYDVR0TBAUwAwEB/zAdBgNV
+HQ4EFgQUKekwMOkHyW2oUWx9MFFA0wrEJIAwgdIGA1UdIwSByjCBx4AUKekwMOkH
+yW2oUWx9MFFA0wrEJIChgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpT
 b21lIFN0YXRlMRIwEAYDVQQHEwlTb21ld2hlcmUxFTATBgNVBAoTDFlvdXIgQ29t
 cGFueTEUMBIGA1UECxMLRGV2ZWxvcG1lbnQxIzAhBgNVBAMTGllvdXIgQ2VydGlm
 aWNhdGUgQXV0aG9yaXR5MRswGQYJKoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAw
-DQYJKoZIhvcNAQEEBQADggEBAC7emGx1m/bENZ/WPGV4/PEfxoXm8XdMsc8YP6QV
-JqX7SJ+PyrsDunhb7RrMPcuy22TMYFVe+Wq2Ap1wkGy843vDSv3C6JlI2spX9PiL
-zU1iObtCeHZLyfbX2vWzlEQrpQNWrs2HopF680Mz9csD5CRyRlBWV6Vjce/Y+TxI
-03NZoQ9xQq/5qUo+4zdQgT5s6z7shucdQceOnCFdoQp5tcnSS/h5lLbpoupKS2A1
-3f/aKcBjG36s5Mok5fCKKBPWiSqiamZanYdHbncDa3bQRejjueVZ2953ENAuPfkB
-eePsb3zUADHbeI6SnEaDR7dyMDji+A5Dz3xX7WZVeErDFDI=
+DQYJKoZIhvcNAQEEBQADggEBAGsmp3B4hDosIkYMm11mvfKkBoNPsblVS2Q4D3ts
+fF2iX7ihHafB2zmw4vT5pSSEcWIDFxlQeC+Q2uuhwLukWvyFexCuzzDhzVywJShu
+/hEurcTZlUGEwZAXjn1aexIEnYH8rkDrNryLEhHzuXABrgSB9kUsGMKeRStP50Pg
+Z23aSLFdMDN/ePqtZgKF6L0Qj6YsHsjIaz6ZMGnVe3claEWSdlstilFpErK56iEt
+VZsw/jwNGLXkaHzHcV3IUAjLwi9DcmdzLOpPRnZz83JDspjA8Rb3yq3FG50cyli9
+o327C73TtcvnT8gomNxAsuLN/MCmQHpIU+giS3XKDlxUkME=
 -----END CERTIFICATE-----
diff --git a/cpp/certs/s_rsa1024_priv.pem b/cpp/certs/s_rsa1024_priv.pem
index a9766fb6f64..7e4804b3a92 100644
--- a/cpp/certs/s_rsa1024_priv.pem
+++ b/cpp/certs/s_rsa1024_priv.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDtq8Ua0s0zzssLPSkSACDx9Ne9EoHD+hPOgSgs6PYGiXlFkvKi
-4U5IbrUKbPG0LChDzGw6JOMpnYutu46QQUkK0ITjexk7FXnNoDbMxWMQYBnex8QC
-4WN9EztoCt5+KjexqpAEkKlZzOvyn7IY+rCnf3RJqWoHyzWgkq01l33iuQIDAQAB
-AoGBAKOg3tLYzu4cMS5LrTr3W7c5Gk7RrwV95qUFxuMkgD1/6D4+LU52T68OiRXk
-a4Pf4tjKpLhjLQI5tTCnMD+gsuerY7FOxMsid6ujTLqzkJ5EXrUk368wjpPY7QWZ
-96I13RtvKWNmgigJQ7KmpZ8k20beszvN0W9MqVhjLxk3REABAkEA/UxGF1os45oN
-aF5GezG/GdT5oiwZZ4jMkQ4BdF2Td3Zg3QKap/lsaoD7Mcp1s6HKHWvDqzNGoaRU
-FWkPuJcv2QJBAPA00h5ySkAFEn5VoYWuITk2xSwC6zMO9DAbb0NdWkgAZoVDmExV
-EIrW1iUkm/SpTlj9HcV98Ulh4gYexFYzXeECQFx+DJ4cXIXjy/+PZVc47BpHrbwt
-ND2dM23IWnmebenSfT5W5BhwOMmPPaqJzn8Alig2IKYUPDdsJRQIYCg8dMkCQFGg
-sZLVJfRRhPJXqTcjcHjf6utE5qaIO2UpvYq365kyQaShztyJv8Bet5ERusnOyygk
-g/x8CwXz9Ho99FySwiECQQCkcDNjhXUQNmO7RtG5ZgyxHb+AlIaZ1TMXD0MC2yN1
-KZJZNwyFYcVjZBAtXVj7UfQ6mFswpmNcm60zfX/MHiK7
+MIICXAIBAAKBgQDhzWf5Y2AOdfBV+6x/W1U6DvyTmjoiOZ5eI4DoqKE5uhIB7eT/
+lUGdOhNxt6Kc3KEtbS+VHgA8cnepPt5rUmPWjiTr/zAhIaJPJZUE6ym3FSMne6d9
+itiZL5z3juwQNxyDbVZnRx/8LfISXIfAzmRmy6IUd8L2p5ftNHRhBmt3qQIDAQAB
+AoGAY2LzttNEvliu9kmWPWBH/QwHpDgoClRuHmVmIgHHJQ9/SZYaS1y4yql7UXxQ
+eNarosECRpIz7Gc9wCLJ51cWVc+thzfXXxXHiPT1Lg/ySEgdqP5O5Vv38ygVsvEq
+FEzLXF01gJHxmHd60t3lIC/cMcOoU20qsQJaNloV2VUwDhkCQQD+werZ2khv7w2H
+NvFeNXSJHaIRbt08gFrscoDUkrkOBWWmPL29k0CAIet703OkSvvYzyKEjMh+7Prr
+oFHAzbVvAkEA4udWFRtsxHSzZ+St0ZIDzJgxTPibYbuzdicC4zL4kOji83mZkVcb
+w8sOASHwXJfQlUQWjcpVTgmG4UtOM8QIZwJAb7UWRtqJQtO+ydiUs+uaovkkdKJ5
+Tis2M1HuHcgMbxJ8xQ0DYhosgULeYBiTL6pVjncdOqQE0msVh7Zvwqww7wJBAJpo
+fuYCMbRHDkdnEPoKeVdjQjl0/Jg3mVqQFaDy8L/8G2VAnMaRFq3YooEWzXDVRvYs
+zYRT6lUempD6JA+KGYUCQElvBXjq+KRfCujpnFqAp51/wXb/V5KgWL4+0vWonWUj
+yQHHUHv7D0Bzjh59IkETNuf8CDHbaQvnpivWtlGeq6w=
 -----END RSA PRIVATE KEY-----
diff --git a/cpp/certs/s_rsa1024_pub.pem b/cpp/certs/s_rsa1024_pub.pem
index 155e75ea518..45318e1b449 100644
--- a/cpp/certs/s_rsa1024_pub.pem
+++ b/cpp/certs/s_rsa1024_pub.pem
@@ -5,71 +5,71 @@ Certificate:
         Signature Algorithm: md5WithRSAEncryption
         Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/Email=you@some.net
         Validity
-            Not Before: Feb 23 19:57:36 2003 GMT
-            Not After : Feb 23 19:57:36 2004 GMT
+            Not Before: Feb 23 20:44:59 2003 GMT
+            Not After : Feb 23 20:44:59 2004 GMT
         Subject: C=US, ST=Some State, O=Your Company, OU=Development/Email=iceserver@some.net, CN=Ice Server
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:ed:ab:c5:1a:d2:cd:33:ce:cb:0b:3d:29:12:00:
-                    20:f1:f4:d7:bd:12:81:c3:fa:13:ce:81:28:2c:e8:
-                    f6:06:89:79:45:92:f2:a2:e1:4e:48:6e:b5:0a:6c:
-                    f1:b4:2c:28:43:cc:6c:3a:24:e3:29:9d:8b:ad:bb:
-                    8e:90:41:49:0a:d0:84:e3:7b:19:3b:15:79:cd:a0:
-                    36:cc:c5:63:10:60:19:de:c7:c4:02:e1:63:7d:13:
-                    3b:68:0a:de:7e:2a:37:b1:aa:90:04:90:a9:59:cc:
-                    eb:f2:9f:b2:18:fa:b0:a7:7f:74:49:a9:6a:07:cb:
-                    35:a0:92:ad:35:97:7d:e2:b9
+                    00:e1:cd:67:f9:63:60:0e:75:f0:55:fb:ac:7f:5b:
+                    55:3a:0e:fc:93:9a:3a:22:39:9e:5e:23:80:e8:a8:
+                    a1:39:ba:12:01:ed:e4:ff:95:41:9d:3a:13:71:b7:
+                    a2:9c:dc:a1:2d:6d:2f:95:1e:00:3c:72:77:a9:3e:
+                    de:6b:52:63:d6:8e:24:eb:ff:30:21:21:a2:4f:25:
+                    95:04:eb:29:b7:15:23:27:7b:a7:7d:8a:d8:99:2f:
+                    9c:f7:8e:ec:10:37:1c:83:6d:56:67:47:1f:fc:2d:
+                    f2:12:5c:87:c0:ce:64:66:cb:a2:14:77:c2:f6:a7:
+                    97:ed:34:74:61:06:6b:77:a9
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                83:2C:38:C9:55:7D:FD:08:6C:08:24:A9:03:38:F1:00:95:B0:34:F4
+                31:DA:B5:13:E7:28:CF:42:58:20:CF:FD:D9:C9:95:F7:33:E7:FD:7B
             X509v3 Authority Key Identifier: 
-                keyid:A3:62:E2:93:71:FF:B6:5E:05:97:1A:1B:72:88:6D:2B:69:09:71:64
+                keyid:29:E9:30:30:E9:07:C9:6D:A8:51:6C:7D:30:51:40:D3:0A:C4:24:80
                 DirName:/C=US/ST=Some State/L=Somewhere/O=Your Company/OU=Development/CN=Your Certificate Authority/Email=you@some.net
                 serial:00
 
     Signature Algorithm: md5WithRSAEncryption
-        77:f1:c5:39:81:aa:e0:89:1b:15:1f:c7:98:34:56:25:a4:d1:
-        57:8e:fd:dc:be:12:67:53:9c:e9:2e:e7:da:57:4c:d9:7c:5c:
-        d6:4c:01:b6:1e:53:3d:4a:a1:ff:91:fb:cd:e9:43:5a:4b:b6:
-        1a:0f:ce:c1:8e:25:b7:1e:62:24:b7:54:0e:e6:1e:9f:3f:b4:
-        59:38:74:36:1d:71:1d:91:b7:38:1b:f6:ef:54:7e:53:63:bb:
-        a2:68:19:f0:28:87:99:8c:97:98:94:d1:d7:31:d6:3f:3d:f2:
-        b3:d2:70:d3:8c:76:7c:f5:23:64:31:bc:ea:1a:b1:35:d8:f5:
-        d1:49:f8:d9:cf:41:b9:98:a9:c3:79:18:da:8d:f1:cc:36:8e:
-        08:d3:b8:6f:d1:e3:80:80:91:3f:9b:a5:97:6e:f0:10:d9:cc:
-        58:86:fb:c2:5f:c1:05:a3:17:1b:83:e5:14:70:e6:62:cc:37:
-        59:7d:f0:fe:1e:06:22:f9:72:a5:cc:8a:93:48:c3:79:07:d6:
-        a9:e8:e0:4a:f1:2a:9b:77:b5:91:8e:ef:c1:32:74:64:bb:0f:
-        1e:9c:51:50:1d:c2:52:02:1e:af:8b:6a:4d:bf:f1:5d:58:32:
-        61:a3:29:02:28:78:a4:fe:8a:28:31:c4:85:2e:f1:fd:54:48:
-        8c:9e:d9:83
+        47:24:0d:fa:8c:e5:ec:b5:f9:10:1b:99:48:e0:b8:5f:fd:53:
+        0e:5c:6f:62:5f:17:39:8c:f2:b8:08:e5:b6:eb:75:2d:dc:50:
+        62:42:f7:98:33:25:ee:4d:b8:b3:7b:2e:b9:af:e0:f3:97:b6:
+        69:3b:57:da:54:9a:65:0e:2f:35:c4:c2:39:6b:3d:67:38:8d:
+        65:ba:29:6d:b0:d2:fd:7e:d0:e5:c5:0a:95:28:cd:5c:f9:c3:
+        29:43:9e:53:14:88:f1:3f:2b:31:1f:29:eb:2b:65:ed:65:66:
+        d7:c7:1b:3b:ed:50:14:c3:ca:68:b5:6c:8b:39:f4:c0:86:93:
+        49:bb:cf:de:f9:70:4a:e5:1c:29:a2:85:b3:30:54:af:22:c1:
+        ab:99:4e:c3:5a:d3:97:39:eb:53:5b:10:ea:ea:dc:f8:94:ae:
+        64:04:44:a1:c4:f5:ad:75:61:0d:29:b3:ab:07:43:a3:11:9c:
+        86:49:6f:c4:e1:84:b1:43:2d:cc:67:c8:1e:81:43:31:df:ef:
+        74:9e:d0:e4:d1:2d:e4:77:ef:13:45:01:71:7f:24:ba:76:53:
+        65:6e:4b:dd:aa:c6:74:b2:c0:1d:d9:c3:9e:28:9a:c8:1e:d7:
+        58:b3:e5:3b:61:7c:40:28:9d:df:9c:8a:5f:f2:c8:2e:f9:53:
+        1b:fc:2e:98
 -----BEGIN CERTIFICATE-----
 MIIEKTCCAxGgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
 EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
 ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
 WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wMzAyMjMxOTU3MzZaFw0wNDAyMjMxOTU3MzZaMIGHMQswCQYD
+b21lLm5ldDAeFw0wMzAyMjMyMDQ0NTlaFw0wNDAyMjMyMDQ0NTlaMIGHMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTEVMBMGA1UEChMMWW91ciBDb21w
 YW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEhMB8GCSqGSIb3DQEJARYSaWNlc2Vy
 dmVyQHNvbWUubmV0MRMwEQYDVQQDEwpJY2UgU2VydmVyMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDtq8Ua0s0zzssLPSkSACDx9Ne9EoHD+hPOgSgs6PYGiXlF
-kvKi4U5IbrUKbPG0LChDzGw6JOMpnYutu46QQUkK0ITjexk7FXnNoDbMxWMQYBne
-x8QC4WN9EztoCt5+KjexqpAEkKlZzOvyn7IY+rCnf3RJqWoHyzWgkq01l33iuQID
-AQABo4IBAjCB/zAJBgNVHRMEAjAAMB0GA1UdDgQWBBSDLDjJVX39CGwIJKkDOPEA
-lbA09DCB0gYDVR0jBIHKMIHHgBSjYuKTcf+2XgWXGhtyiG0raQlxZKGBq6SBqDCB
+AQUAA4GNADCBiQKBgQDhzWf5Y2AOdfBV+6x/W1U6DvyTmjoiOZ5eI4DoqKE5uhIB
+7eT/lUGdOhNxt6Kc3KEtbS+VHgA8cnepPt5rUmPWjiTr/zAhIaJPJZUE6ym3FSMn
+e6d9itiZL5z3juwQNxyDbVZnRx/8LfISXIfAzmRmy6IUd8L2p5ftNHRhBmt3qQID
+AQABo4IBAjCB/zAJBgNVHRMEAjAAMB0GA1UdDgQWBBQx2rUT5yjPQlggz/3ZyZX3
+M+f9ezCB0gYDVR0jBIHKMIHHgBQp6TAw6QfJbahRbH0wUUDTCsQkgKGBq6SBqDCB
 pTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNv
 bWV3aGVyZTEVMBMGA1UEChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9w
 bWVudDEjMCEGA1UEAxMaWW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkq
-hkiG9w0BCQEWDHlvdUBzb21lLm5ldIIBADANBgkqhkiG9w0BAQQFAAOCAQEAd/HF
-OYGq4IkbFR/HmDRWJaTRV4793L4SZ1Oc6S7n2ldM2Xxc1kwBth5TPUqh/5H7zelD
-Wku2Gg/OwY4ltx5iJLdUDuYenz+0WTh0Nh1xHZG3OBv271R+U2O7omgZ8CiHmYyX
-mJTR1zHWPz3ys9Jw04x2fPUjZDG86hqxNdj10Un42c9BuZipw3kY2o3xzDaOCNO4
-b9HjgICRP5ull27wENnMWIb7wl/BBaMXG4PlFHDmYsw3WX3w/h4GIvlypcyKk0jD
-eQfWqejgSvEqm3e1kY7vwTJ0ZLsPHpxRUB3CUgIer4tqTb/xXVgyYaMpAih4pP6K
-KDHEhS7x/VRIjJ7Zgw==
+hkiG9w0BCQEWDHlvdUBzb21lLm5ldIIBADANBgkqhkiG9w0BAQQFAAOCAQEARyQN
++ozl7LX5EBuZSOC4X/1TDlxvYl8XOYzyuAjltut1LdxQYkL3mDMl7k24s3suua/g
+85e2aTtX2lSaZQ4vNcTCOWs9ZziNZbopbbDS/X7Q5cUKlSjNXPnDKUOeUxSI8T8r
+MR8p6ytl7WVm18cbO+1QFMPKaLVsizn0wIaTSbvP3vlwSuUcKaKFszBUryLBq5lO
+w1rTlznrU1sQ6urc+JSuZAREocT1rXVhDSmzqwdDoxGchklvxOGEsUMtzGfIHoFD
+Md/vdJ7Q5NEt5HfvE0UBcX8kunZTZW5L3arGdLLAHdnDniiayB7XWLPlO2F8QCid
+35yKX/LILvlTG/wumA==
 -----END CERTIFICATE-----
diff --git a/cpp/config/makecerts b/cpp/config/makecerts
index 82be2be5298..5adaed09126 100755
--- a/cpp/config/makecerts
+++ b/cpp/config/makecerts
@@ -34,7 +34,8 @@ if ! [ -f $CA_HOME/cakey.pem ]; then
     SERIAL=`cat $CA_HOME/serial`
     KEY_NAME=`echo $SERIAL`_key.pem
     CERT_NAME=`echo $SERIAL`_cert.pem
-    openssl req -config $ICE_HOME/config/server.cnf -newkey rsa $PASSPHRASE -keyout $CA_HOME/$KEY_NAME -keyform PEM -out $CA_HOME/req.pem
+    openssl req -config $ICE_HOME/config/server.cnf -newkey rsa $PASSPHRASE -keyout $CA_HOME/$KEY_NAME \
+        -keyform PEM -out $CA_HOME/req.pem
     echo "You will be prompted for a passphrase - this is so we can sign the new Server Certificate."
     echo "Enter the passphrase for the CA signing authority."
     openssl ca -config $ICE_HOME/config/server.cnf -batch -in $CA_HOME/req.pem
@@ -49,7 +50,8 @@ if ! [ -f $CA_HOME/cakey.pem ]; then
     SERIAL=`cat $CA_HOME/serial`
     KEY_NAME=`echo $SERIAL`_key.pem
     CERT_NAME=`echo $SERIAL`_cert.pem
-    openssl req -config $ICE_HOME/config/client.cnf -newkey rsa $PASSPHRASE -keyout $CA_HOME/$KEY_NAME -keyform PEM -out $CA_HOME/req.pem
+    openssl req -config $ICE_HOME/config/client.cnf -newkey rsa $PASSPHRASE -keyout $CA_HOME/$KEY_NAME \
+        -keyform PEM -out $CA_HOME/req.pem
     echo "You will be prompted for a passphrase - this is so we can sign the new Client Certificate."
     echo "Enter the passphrase for the CA signing authority."
     openssl ca -config $ICE_HOME/config/client.cnf -batch -in $CA_HOME/req.pem
@@ -57,6 +59,15 @@ if ! [ -f $CA_HOME/cakey.pem ]; then
     cp $CA_HOME/$KEY_NAME  $ICE_HOME/certs/c_rsa1024_priv.pem
     cp $CA_HOME/$CERT_NAME $ICE_HOME/certs/c_rsa1024_pub.pem
     rm $CA_HOME/req.pem
+
+    #
+    # Copy pertinent certificates to test directory.
+    #
+    cp $ICE_HOME/certs/cacert.pem         $ICE_HOME/test/IceSSL/certs
+    cp $ICE_HOME/certs/c_rsa1024_priv.pem $ICE_HOME/test/IceSSL/certs/goodKey_1.pem
+    cp $ICE_HOME/certs/c_rsa1024_pub.pem  $ICE_HOME/test/IceSSL/certs/goodCert_1.pem
+    cp $ICE_HOME/certs/s_rsa1024_priv.pem $ICE_HOME/test/IceSSL/certs/goodKey_2.pem
+    cp $ICE_HOME/certs/s_rsa1024_pub.pem  $ICE_HOME/test/IceSSL/certs/goodCert_2.pem
 else
     #
     # Create a new certificate and key.
@@ -65,7 +76,8 @@ else
     SERIAL=`cat $CA_HOME/serial`
     KEY_NAME=`echo $SERIAL`_key.pem
     CERT_NAME=`echo $SERIAL`_cert.pem
-    openssl req -config $ICE_HOME/config/generic.cnf -newkey rsa $PASSPHRASE -keyout $CA_HOME/$KEY_NAME -keyform PEM -out $CA_HOME/req.pem
+    openssl req -config $ICE_HOME/config/generic.cnf -newkey rsa $PASSPHRASE -keyout $CA_HOME/$KEY_NAME \
+        -keyform PEM -out $CA_HOME/req.pem
     echo "You will be prompted for a passphrase - this is so we can sign the new certificate."
     echo "Enter the passphrase for the CA signing authority."
     openssl ca -config $ICE_HOME/config/generic.cnf -in $CA_HOME/req.pem
diff --git a/cpp/test/IceSSL/certs/cacert.pem b/cpp/test/IceSSL/certs/cacert.pem
index 70809d7208f..6f9e0253c83 100644
--- a/cpp/test/IceSSL/certs/cacert.pem
+++ b/cpp/test/IceSSL/certs/cacert.pem
@@ -1,20 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIDMDCCApmgAwIBAgIBADANBgkqhkiG9w0BAQQFADB0MQswCQYDVQQGEwJVUzEQ
-MA4GA1UECBMHQWxhYmFtYTETMBEGA1UEBxMKSHVudHN2aWxsZTEXMBUGA1UEChMO
-TXV0YWJsZSBSZWFsbXMxEDAOBgNVBAsTB0ljZSBBZ2UxEzARBgNVBAMTCk11dGFi
-bGUgQ0EwHhcNMDIwMjIyMTYwOTQ1WhcNMDMwMjIyMTYwOTQ1WjB0MQswCQYDVQQG
-EwJVUzEQMA4GA1UECBMHQWxhYmFtYTETMBEGA1UEBxMKSHVudHN2aWxsZTEXMBUG
-A1UEChMOTXV0YWJsZSBSZWFsbXMxEDAOBgNVBAsTB0ljZSBBZ2UxEzARBgNVBAMT
-Ck11dGFibGUgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKqnEzfn10va
-xe1N0Ixo7Lal0T8c3N+qXHzmRQuuyQDlfVZr5MnvTQVhaUKPkR2Un8/HuOIGsJBZ
-lgbCjUfVGoyz4PDDTK3LVyEZ7kCDa9uQVblmVTfKNq0w2Asg0lHoGu+rlfWCKgcN
-5+hy/MF0QyRzcUM9iKV/MhEufb7vIZbRAgMBAAGjgdEwgc4wHQYDVR0OBBYEFBSV
-OXsF8JuI7LcNZkyP8Alwz2PZMIGeBgNVHSMEgZYwgZOAFBSVOXsF8JuI7LcNZkyP
-8Alwz2PZoXikdjB0MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQWxhYmFtYTETMBEG
-A1UEBxMKSHVudHN2aWxsZTEXMBUGA1UEChMOTXV0YWJsZSBSZWFsbXMxEDAOBgNV
-BAsTB0ljZSBBZ2UxEzARBgNVBAMTCk11dGFibGUgQ0GCAQAwDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQQFAAOBgQB5uQBgd/TClj6fnCbLNN0QwEB6hRZYc7aC+uDY
-p47prG3Us6Vey/p/6X2HXp96VMbnez5wSDwkzYiu/b5d/YKG3ZtgK/mUjjA5jzuU
-IrwMPOGHJQACzDtXfdenKRs+VP4FrCLsgVQvf+32L3JqIqSpzM/bDIDgydYkRxY4
-Rcgjzw==
+MIIEzzCCA7egAwIBAgIBADANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
+ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
+WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
+b21lLm5ldDAeFw0wMzAyMjMyMDQ0NTdaFw0wODAyMjIyMDQ0NTdaMIGlMQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTESMBAGA1UEBxMJU29tZXdoZXJl
+MRUwEwYDVQQKEwxZb3VyIENvbXBhbnkxFDASBgNVBAsTC0RldmVsb3BtZW50MSMw
+IQYDVQQDExpZb3VyIENlcnRpZmljYXRlIEF1dGhvcml0eTEbMBkGCSqGSIb3DQEJ
+ARYMeW91QHNvbWUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+u17O25ToqVFfcNUlGGvpgDu1mQ+HlJ3JZ7smF1MlsvKyQDEvgwu0THTzoIockNOv
+VDOfwQMAskBHDZZIzy8rATRP5WUCnpmYZKtdr7FMB9BLt/a0B0EL4bdKqAyxne8R
+9br4/MERGa79NGL2FGwFV7PoLQ/rmqmea6tgBqjqg8fX6UHOXHEgnZ2we5zgtXuV
+7GEe/2ys+k2wDXM740st7qSrDUAZ+lXN4VJUfe4ravWmOfiBG3X8xw1s+pNDwA6M
+VpTPI+fV+Gdnk6jOi/quatiERyNkxfbAYsgKk4Y7hUySgQcgpMZOOhvJWJOyU0OT
+32xZUXfVA5d+0DBQ6mGMbQIDAQABo4IBBjCCAQIwDAYDVR0TBAUwAwEB/zAdBgNV
+HQ4EFgQUKekwMOkHyW2oUWx9MFFA0wrEJIAwgdIGA1UdIwSByjCBx4AUKekwMOkH
+yW2oUWx9MFFA0wrEJIChgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpT
+b21lIFN0YXRlMRIwEAYDVQQHEwlTb21ld2hlcmUxFTATBgNVBAoTDFlvdXIgQ29t
+cGFueTEUMBIGA1UECxMLRGV2ZWxvcG1lbnQxIzAhBgNVBAMTGllvdXIgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MRswGQYJKoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAw
+DQYJKoZIhvcNAQEEBQADggEBAGsmp3B4hDosIkYMm11mvfKkBoNPsblVS2Q4D3ts
+fF2iX7ihHafB2zmw4vT5pSSEcWIDFxlQeC+Q2uuhwLukWvyFexCuzzDhzVywJShu
+/hEurcTZlUGEwZAXjn1aexIEnYH8rkDrNryLEhHzuXABrgSB9kUsGMKeRStP50Pg
+Z23aSLFdMDN/ePqtZgKF6L0Qj6YsHsjIaz6ZMGnVe3claEWSdlstilFpErK56iEt
+VZsw/jwNGLXkaHzHcV3IUAjLwi9DcmdzLOpPRnZz83JDspjA8Rb3yq3FG50cyli9
+o327C73TtcvnT8gomNxAsuLN/MCmQHpIU+giS3XKDlxUkME=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/goodCert_1.pem b/cpp/test/IceSSL/certs/goodCert_1.pem
index 02125263ba7..91ab752914f 100644
--- a/cpp/test/IceSSL/certs/goodCert_1.pem
+++ b/cpp/test/IceSSL/certs/goodCert_1.pem
@@ -3,61 +3,73 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 2 (0x2)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Massachusetts, L=Billerica, O=ZeroC, OU=Ice, CN=ZeroC US
+        Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/Email=you@some.net
         Validity
-            Not Before: Feb 22 16:13:18 2002 GMT
-            Not After : Feb 22 16:13:18 2003 GMT
-        Subject: C=US, ST=Massachusetts, O=ZeroC, OU=Ice, CN=MR RSA 1024 Client Test Cert/Email=mrclirsa1024@some.net
+            Not Before: Feb 23 20:45:01 2003 GMT
+            Not After : Feb 23 20:45:01 2004 GMT
+        Subject: C=US, ST=Some State, O=Your Company, OU=Development/Email=iceclient@@some.net, CN=Ice Client
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:b0:98:c9:20:6e:11:0f:39:47:86:33:2c:67:a9:
-                    4c:3d:eb:9d:19:a7:12:66:c5:e3:18:55:9c:53:97:
-                    67:ba:db:bd:86:e3:b8:20:0c:3d:58:aa:ed:da:91:
-                    7a:29:10:3a:61:9c:5e:22:38:62:ea:af:ab:39:ec:
-                    f4:94:51:4e:e3:05:d2:d4:91:6b:70:97:28:c9:75:
-                    78:18:e3:da:85:d9:08:01:d0:95:29:bc:da:79:90:
-                    37:b9:76:ba:e1:e1:f5:d2:0c:b1:e7:d9:b8:55:72:
-                    f3:28:f8:ba:29:8b:58:8b:b2:f3:0e:a7:ac:b3:99:
-                    0e:88:9a:59:83:fc:d2:09:51
+                    00:d6:f5:02:7c:1a:8e:ab:2c:e0:36:9b:23:36:e2:
+                    93:89:19:6a:1f:01:e5:df:73:96:5f:7a:52:17:cc:
+                    60:d4:a2:84:c1:cb:e8:8d:3f:c9:61:a0:81:ca:70:
+                    28:b0:fc:b0:24:09:93:92:24:3d:a3:82:16:57:10:
+                    07:e3:65:70:b5:07:d6:49:6a:b9:b6:a7:04:30:0e:
+                    2d:ce:38:b7:6a:ce:84:b6:0b:08:cf:6b:77:a9:83:
+                    cc:c0:b2:d5:e1:16:f5:78:ed:9f:69:a9:d6:e5:a6:
+                    b3:2b:88:8f:33:9b:74:9e:33:9d:1f:5b:cb:68:31:
+                    e1:8f:6b:78:e0:7b:2b:2f:39
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
             X509v3 Subject Key Identifier: 
-                0A:73:7A:10:E0:C1:CC:25:64:21:49:53:FC:3E:8D:23:72:B0:38:51
+                2D:C3:08:2C:45:F7:34:20:A1:3E:30:ED:FE:CF:21:1E:46:92:F0:D5
             X509v3 Authority Key Identifier: 
-                keyid:14:95:39:7B:05:F0:9B:88:EC:B7:0D:66:4C:8F:F0:09:70:CF:63:D9
-                DirName:/C=US/ST=Massachusetts/L=Billerica/O=ZeroC/OU=Ice/CN=ZeroC US
+                keyid:29:E9:30:30:E9:07:C9:6D:A8:51:6C:7D:30:51:40:D3:0A:C4:24:80
+                DirName:/C=US/ST=Some State/L=Somewhere/O=Your Company/OU=Development/CN=Your Certificate Authority/Email=you@some.net
                 serial:00
 
-            X509v3 Basic Constraints: 
-                CA:TRUE
     Signature Algorithm: md5WithRSAEncryption
-        59:a7:7a:e0:2a:bc:8b:6c:61:b2:e0:93:d2:5e:7e:82:76:1f:
-        2a:71:c7:b7:0f:ff:53:63:1f:0e:b4:d0:91:33:88:8e:05:00:
-        ee:1a:db:48:2d:6e:15:b5:f0:73:a9:b6:c5:ea:26:76:8d:7b:
-        19:f5:bf:9e:26:d8:64:96:a0:c8:f4:eb:a8:75:b7:5d:42:77:
-        99:43:21:39:6d:cf:22:02:6b:64:f6:46:47:4d:f7:42:dc:83:
-        a8:8c:a4:e6:bf:58:ed:f2:bd:9a:f9:67:8c:6c:28:3d:2a:21:
-        0d:64:5e:59:23:b5:3f:b8:a0:03:62:d5:b4:01:8e:95:ff:2e:
-        5d:56
+        76:9f:25:31:69:d9:c9:ee:42:10:4b:d2:0a:4b:f7:d7:5a:a3:
+        3d:96:eb:aa:f6:29:1f:da:23:d6:e5:5b:6c:da:64:79:60:4b:
+        34:34:be:f9:d2:03:1b:84:a4:78:59:86:c5:c1:c0:69:05:d7:
+        9f:5f:ea:80:cf:5f:a2:2d:29:88:fb:19:b6:00:9e:ab:d2:7b:
+        c7:8a:61:86:70:07:b8:ab:e8:ce:a6:f4:95:71:94:4c:d4:b4:
+        11:e1:7c:f9:f2:54:da:ee:f3:27:bd:91:5b:31:ff:c9:d2:48:
+        59:32:6e:ec:a0:e8:8f:52:b2:15:6d:b8:36:57:08:67:9b:53:
+        26:f2:fb:0c:77:dd:83:5f:87:3b:41:6b:be:6b:05:e4:d8:58:
+        4a:bd:82:c9:57:f6:24:bc:f7:79:b8:77:31:e1:e1:5c:b2:6a:
+        02:0e:0f:57:fd:7f:40:19:87:55:09:a4:af:0e:d9:84:6d:6d:
+        4d:e2:7d:6e:7f:ac:e1:15:7f:b6:20:28:33:49:6c:de:4e:e7:
+        05:dc:08:46:a0:46:98:b5:30:88:23:5a:10:1d:cd:b5:1d:c1:
+        14:06:5d:98:ee:80:0d:ab:a1:c3:03:54:1a:42:0a:35:f2:95:
+        36:03:c9:a8:c5:c5:e4:fc:f9:c1:9a:cb:e1:b5:7a:93:dc:af:
+        47:47:d5:66
 -----BEGIN CERTIFICATE-----
-MIIDVDCCAr2gAwIBAgIBAjANBgkqhkiG9w0BAQQFADB0MQswCQYDVQQGEwJVUzEQ
-MA4GA1UECBMHQWxhYmFtYTETMBEGA1UEBxMKSHVudHN2aWxsZTEXMBUGA1UEChMO
-TXV0YWJsZSBSZWFsbXMxEDAOBgNVBAsTB0ljZSBBZ2UxEzARBgNVBAMTCk11dGFi
-bGUgQ0EwHhcNMDIwMjIyMTYxMzE4WhcNMDMwMjIyMTYxMzE4WjCBlzELMAkGA1UE
-BhMCVVMxEDAOBgNVBAgTB0FsYWJhbWExFzAVBgNVBAoTDk11dGFibGUgUmVhbG1z
-MRAwDgYDVQQLEwdJY2UgQWdlMSUwIwYDVQQDExxNUiBSU0EgMTAyNCBDbGllbnQg
-VGVzdCBDZXJ0MSQwIgYJKoZIhvcNAQkBFhVtcmNsaXJzYTEwMjRAc29tZS5uZXQw
-gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALCYySBuEQ85R4YzLGepTD3rnRmn
-EmbF4xhVnFOXZ7rbvYbjuCAMPViq7dqReikQOmGcXiI4Yuqvqzns9JRRTuMF0tSR
-a3CXKMl1eBjj2oXZCAHQlSm82nmQN7l2uuHh9dIMsefZuFVy8yj4uimLWIuy8w6n
-rLOZDoiaWYP80glRAgMBAAGjgdEwgc4wHQYDVR0OBBYEFApzehDgwcwlZCFJU/w+
-jSNysDhRMIGeBgNVHSMEgZYwgZOAFBSVOXsF8JuI7LcNZkyP8Alwz2PZoXikdjB0
-MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQWxhYmFtYTETMBEGA1UEBxMKSHVudHN2
-aWxsZTEXMBUGA1UEChMOTXV0YWJsZSBSZWFsbXMxEDAOBgNVBAsTB0ljZSBBZ2Ux
-EzARBgNVBAMTCk11dGFibGUgQ0GCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQQFAAOBgQBZp3rgKryLbGGy4JPSXn6Cdh8qcce3D/9TYx8OtNCRM4iOBQDuGttI
-LW4VtfBzqbbF6iZ2jXsZ9b+eJthklqDI9OuodbddQneZQyE5bc8iAmtk9kZHTfdC
-3IOojKTmv1jt8r2a+WeMbCg9KiENZF5ZI7U/uKADYtW0AY6V/y5dVg==
+MIIEKjCCAxKgAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
+ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
+WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
+b21lLm5ldDAeFw0wMzAyMjMyMDQ1MDFaFw0wNDAyMjMyMDQ1MDFaMIGIMQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTEVMBMGA1UEChMMWW91ciBDb21w
+YW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEiMCAGCSqGSIb3DQEJARYTaWNlY2xp
+ZW50QEBzb21lLm5ldDETMBEGA1UEAxMKSWNlIENsaWVudDCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEA1vUCfBqOqyzgNpsjNuKTiRlqHwHl33OWX3pSF8xg1KKE
+wcvojT/JYaCBynAosPywJAmTkiQ9o4IWVxAH42VwtQfWSWq5tqcEMA4tzji3as6E
+tgsIz2t3qYPMwLLV4Rb1eO2faanW5aazK4iPM5t0njOdH1vLaDHhj2t44HsrLzkC
+AwEAAaOCAQIwgf8wCQYDVR0TBAIwADAdBgNVHQ4EFgQULcMILEX3NCChPjDt/s8h
+HkaS8NUwgdIGA1UdIwSByjCBx4AUKekwMOkHyW2oUWx9MFFA0wrEJIChgaukgagw
+gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lIFN0YXRlMRIwEAYDVQQHEwlT
+b21ld2hlcmUxFTATBgNVBAoTDFlvdXIgQ29tcGFueTEUMBIGA1UECxMLRGV2ZWxv
+cG1lbnQxIzAhBgNVBAMTGllvdXIgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRswGQYJ
+KoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAwDQYJKoZIhvcNAQEEBQADggEBAHaf
+JTFp2cnuQhBL0gpL99daoz2W66r2KR/aI9blW2zaZHlgSzQ0vvnSAxuEpHhZhsXB
+wGkF159f6oDPX6ItKYj7GbYAnqvSe8eKYYZwB7ir6M6m9JVxlEzUtBHhfPnyVNru
+8ye9kVsx/8nSSFkybuyg6I9SshVtuDZXCGebUyby+wx33YNfhztBa75rBeTYWEq9
+gslX9iS893m4dzHh4VyyagIOD1f9f0AZh1UJpK8O2YRtbU3ifW5/rOEVf7YgKDNJ
+bN5O5wXcCEagRpi1MIgjWhAdzbUdwRQGXZjugA2rocMDVBpCCjXylTYDyajFxeT8
++cGay+G1epPcr0dH1WY=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/goodCert_2.pem b/cpp/test/IceSSL/certs/goodCert_2.pem
index 1c0ecee724a..45318e1b449 100644
--- a/cpp/test/IceSSL/certs/goodCert_2.pem
+++ b/cpp/test/IceSSL/certs/goodCert_2.pem
@@ -3,61 +3,73 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Massachusetts, L=Billerica, O=ZeroC, OU=Ice, CN=ZeroC US
+        Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/Email=you@some.net
         Validity
-            Not Before: Feb 22 16:12:18 2002 GMT
-            Not After : Feb 22 16:12:18 2003 GMT
-        Subject: C=US, ST=Massachusetts, O=ZeroC, OU=Ice, CN=MR RSA 1024 Server Test Cert/Email=mrsrvrsa1024@some.net
+            Not Before: Feb 23 20:44:59 2003 GMT
+            Not After : Feb 23 20:44:59 2004 GMT
+        Subject: C=US, ST=Some State, O=Your Company, OU=Development/Email=iceserver@some.net, CN=Ice Server
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:bb:12:55:41:d5:09:97:ee:8f:65:9f:17:ed:14:
-                    4e:fe:2b:14:75:5a:96:47:47:fb:4b:9b:a7:0a:7c:
-                    89:d2:a3:b0:2a:ab:ef:ab:a7:82:24:d1:29:c1:29:
-                    6b:c0:14:85:5d:05:dd:04:c1:b4:4a:ac:a9:bf:ce:
-                    e6:72:36:8d:6c:8c:f2:c0:e9:ce:2b:c0:68:8c:9e:
-                    48:6f:61:6a:f5:a4:36:e1:6b:a2:f8:2b:bd:6f:cb:
-                    0f:54:d6:43:a5:7b:7a:fd:d2:43:02:c2:38:a4:76:
-                    d9:94:1d:7d:7c:d7:fe:9e:93:3e:60:d3:2d:5d:41:
-                    b7:9a:ed:18:08:a6:bd:6f:65
+                    00:e1:cd:67:f9:63:60:0e:75:f0:55:fb:ac:7f:5b:
+                    55:3a:0e:fc:93:9a:3a:22:39:9e:5e:23:80:e8:a8:
+                    a1:39:ba:12:01:ed:e4:ff:95:41:9d:3a:13:71:b7:
+                    a2:9c:dc:a1:2d:6d:2f:95:1e:00:3c:72:77:a9:3e:
+                    de:6b:52:63:d6:8e:24:eb:ff:30:21:21:a2:4f:25:
+                    95:04:eb:29:b7:15:23:27:7b:a7:7d:8a:d8:99:2f:
+                    9c:f7:8e:ec:10:37:1c:83:6d:56:67:47:1f:fc:2d:
+                    f2:12:5c:87:c0:ce:64:66:cb:a2:14:77:c2:f6:a7:
+                    97:ed:34:74:61:06:6b:77:a9
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
             X509v3 Subject Key Identifier: 
-                11:09:FF:EC:47:C0:B9:4F:3D:D1:39:A7:0A:45:BE:1A:F0:25:13:9D
+                31:DA:B5:13:E7:28:CF:42:58:20:CF:FD:D9:C9:95:F7:33:E7:FD:7B
             X509v3 Authority Key Identifier: 
-                keyid:14:95:39:7B:05:F0:9B:88:EC:B7:0D:66:4C:8F:F0:09:70:CF:63:D9
-                DirName:/C=US/ST=Massachusetts/L=Billerica/O=ZeroC/OU=Ice/CN=ZeroC US
+                keyid:29:E9:30:30:E9:07:C9:6D:A8:51:6C:7D:30:51:40:D3:0A:C4:24:80
+                DirName:/C=US/ST=Some State/L=Somewhere/O=Your Company/OU=Development/CN=Your Certificate Authority/Email=you@some.net
                 serial:00
 
-            X509v3 Basic Constraints: 
-                CA:TRUE
     Signature Algorithm: md5WithRSAEncryption
-        6a:d4:8c:b0:3d:4f:4c:e2:b7:42:4c:bd:64:fc:e2:bb:68:06:
-        06:d8:ca:d0:cd:c5:83:d0:b3:69:d9:fd:db:8f:5c:ec:ad:19:
-        8e:ab:c3:02:7c:92:d3:3f:61:13:76:c5:78:b5:05:1e:c4:a8:
-        39:ff:c0:02:ee:d4:75:f8:ba:e1:f6:bc:a6:ae:07:75:68:34:
-        08:99:c5:53:bf:30:8e:da:8a:2b:71:08:40:81:f8:dc:82:3b:
-        d6:30:c8:15:cb:70:78:1e:bb:03:1d:d3:21:3c:be:d3:c6:0b:
-        8d:9f:43:b1:37:1b:f0:fb:a5:67:df:76:13:62:36:fa:0f:47:
-        6c:04
+        47:24:0d:fa:8c:e5:ec:b5:f9:10:1b:99:48:e0:b8:5f:fd:53:
+        0e:5c:6f:62:5f:17:39:8c:f2:b8:08:e5:b6:eb:75:2d:dc:50:
+        62:42:f7:98:33:25:ee:4d:b8:b3:7b:2e:b9:af:e0:f3:97:b6:
+        69:3b:57:da:54:9a:65:0e:2f:35:c4:c2:39:6b:3d:67:38:8d:
+        65:ba:29:6d:b0:d2:fd:7e:d0:e5:c5:0a:95:28:cd:5c:f9:c3:
+        29:43:9e:53:14:88:f1:3f:2b:31:1f:29:eb:2b:65:ed:65:66:
+        d7:c7:1b:3b:ed:50:14:c3:ca:68:b5:6c:8b:39:f4:c0:86:93:
+        49:bb:cf:de:f9:70:4a:e5:1c:29:a2:85:b3:30:54:af:22:c1:
+        ab:99:4e:c3:5a:d3:97:39:eb:53:5b:10:ea:ea:dc:f8:94:ae:
+        64:04:44:a1:c4:f5:ad:75:61:0d:29:b3:ab:07:43:a3:11:9c:
+        86:49:6f:c4:e1:84:b1:43:2d:cc:67:c8:1e:81:43:31:df:ef:
+        74:9e:d0:e4:d1:2d:e4:77:ef:13:45:01:71:7f:24:ba:76:53:
+        65:6e:4b:dd:aa:c6:74:b2:c0:1d:d9:c3:9e:28:9a:c8:1e:d7:
+        58:b3:e5:3b:61:7c:40:28:9d:df:9c:8a:5f:f2:c8:2e:f9:53:
+        1b:fc:2e:98
 -----BEGIN CERTIFICATE-----
-MIIDVDCCAr2gAwIBAgIBATANBgkqhkiG9w0BAQQFADB0MQswCQYDVQQGEwJVUzEQ
-MA4GA1UECBMHQWxhYmFtYTETMBEGA1UEBxMKSHVudHN2aWxsZTEXMBUGA1UEChMO
-TXV0YWJsZSBSZWFsbXMxEDAOBgNVBAsTB0ljZSBBZ2UxEzARBgNVBAMTCk11dGFi
-bGUgQ0EwHhcNMDIwMjIyMTYxMjE4WhcNMDMwMjIyMTYxMjE4WjCBlzELMAkGA1UE
-BhMCVVMxEDAOBgNVBAgTB0FsYWJhbWExFzAVBgNVBAoTDk11dGFibGUgUmVhbG1z
-MRAwDgYDVQQLEwdJY2UgQWdlMSUwIwYDVQQDExxNUiBSU0EgMTAyNCBTZXJ2ZXIg
-VGVzdCBDZXJ0MSQwIgYJKoZIhvcNAQkBFhVtcnNydnJzYTEwMjRAc29tZS5uZXQw
-gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALsSVUHVCZfuj2WfF+0UTv4rFHVa
-lkdH+0ubpwp8idKjsCqr76ungiTRKcEpa8AUhV0F3QTBtEqsqb/O5nI2jWyM8sDp
-zivAaIyeSG9havWkNuFrovgrvW/LD1TWQ6V7ev3SQwLCOKR22ZQdfXzX/p6TPmDT
-LV1Bt5rtGAimvW9lAgMBAAGjgdEwgc4wHQYDVR0OBBYEFBEJ/+xHwLlPPdE5pwpF
-vhrwJROdMIGeBgNVHSMEgZYwgZOAFBSVOXsF8JuI7LcNZkyP8Alwz2PZoXikdjB0
-MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQWxhYmFtYTETMBEGA1UEBxMKSHVudHN2
-aWxsZTEXMBUGA1UEChMOTXV0YWJsZSBSZWFsbXMxEDAOBgNVBAsTB0ljZSBBZ2Ux
-EzARBgNVBAMTCk11dGFibGUgQ0GCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQQFAAOBgQBq1IywPU9M4rdCTL1k/OK7aAYG2MrQzcWD0LNp2f3bj1zsrRmOq8MC
-fJLTP2ETdsV4tQUexKg5/8AC7tR1+Lrh9rymrgd1aDQImcVTvzCO2oorcQhAgfjc
-gjvWMMgVy3B4HrsDHdMhPL7TxguNn0OxNxvw+6Vn33YTYjb6D0dsBA==
+MIIEKTCCAxGgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
+ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
+WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
+b21lLm5ldDAeFw0wMzAyMjMyMDQ0NTlaFw0wNDAyMjMyMDQ0NTlaMIGHMQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTEVMBMGA1UEChMMWW91ciBDb21w
+YW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEhMB8GCSqGSIb3DQEJARYSaWNlc2Vy
+dmVyQHNvbWUubmV0MRMwEQYDVQQDEwpJY2UgU2VydmVyMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDhzWf5Y2AOdfBV+6x/W1U6DvyTmjoiOZ5eI4DoqKE5uhIB
+7eT/lUGdOhNxt6Kc3KEtbS+VHgA8cnepPt5rUmPWjiTr/zAhIaJPJZUE6ym3FSMn
+e6d9itiZL5z3juwQNxyDbVZnRx/8LfISXIfAzmRmy6IUd8L2p5ftNHRhBmt3qQID
+AQABo4IBAjCB/zAJBgNVHRMEAjAAMB0GA1UdDgQWBBQx2rUT5yjPQlggz/3ZyZX3
+M+f9ezCB0gYDVR0jBIHKMIHHgBQp6TAw6QfJbahRbH0wUUDTCsQkgKGBq6SBqDCB
+pTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNv
+bWV3aGVyZTEVMBMGA1UEChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9w
+bWVudDEjMCEGA1UEAxMaWW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkq
+hkiG9w0BCQEWDHlvdUBzb21lLm5ldIIBADANBgkqhkiG9w0BAQQFAAOCAQEARyQN
++ozl7LX5EBuZSOC4X/1TDlxvYl8XOYzyuAjltut1LdxQYkL3mDMl7k24s3suua/g
+85e2aTtX2lSaZQ4vNcTCOWs9ZziNZbopbbDS/X7Q5cUKlSjNXPnDKUOeUxSI8T8r
+MR8p6ytl7WVm18cbO+1QFMPKaLVsizn0wIaTSbvP3vlwSuUcKaKFszBUryLBq5lO
+w1rTlznrU1sQ6urc+JSuZAREocT1rXVhDSmzqwdDoxGchklvxOGEsUMtzGfIHoFD
+Md/vdJ7Q5NEt5HfvE0UBcX8kunZTZW5L3arGdLLAHdnDniiayB7XWLPlO2F8QCid
+35yKX/LILvlTG/wumA==
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/goodKey_1.pem b/cpp/test/IceSSL/certs/goodKey_1.pem
index 19daec1302f..4cd966b1953 100644
--- a/cpp/test/IceSSL/certs/goodKey_1.pem
+++ b/cpp/test/IceSSL/certs/goodKey_1.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCwmMkgbhEPOUeGMyxnqUw9650ZpxJmxeMYVZxTl2e6272G47gg
-DD1Yqu3akXopEDphnF4iOGLqr6s57PSUUU7jBdLUkWtwlyjJdXgY49qF2QgB0JUp
-vNp5kDe5drrh4fXSDLHn2bhVcvMo+Lopi1iLsvMOp6yzmQ6ImlmD/NIJUQIDAQAB
-AoGAVxslqc9grsesFe/L6V3Cc5ByLyMPmo3lVC12LG00ByE4PP655WTkJYY6SGMV
-hIeypE8Cx5JUiDoaFTph8X6hj9t4sTAmfJW5IxjL8M5MW/nGW4s2mxv0b1qWQkmk
-Vu3rkemvi/ZfA4ic1RpzAHJAZNltqI36TZlaKfWk+boMZNkCQQDc7Nxy39+Y34hm
-9ImsfG+DxoHYAxz7v70fPdRseYnoNDSDW3/4xCBcOiYhWEY0U9dzRuweQFRkeSpU
-J743VQyPAkEAzKJFBmztuhZPgIcwi/vy5qLZfpByk5Z5Gme6j8Uh6pAnEb6EFodB
-DMXr/eq+IAENcAIHK6bZ/ULOjkzkriw8HwJBAMSCU1xC0iqyuiuJ3GP2k2KNUbWI
-n2E2ncyKPMb4HLjUptkorF3kZjxi5MPINzoYUY4SSbhm1CpCtGoCp+mj1vUCQGfQ
-avQ3juM5LlwmOZrK1w/qzixHW9lEHWwn8528hNhbCXcXECvdskKopnDLBml2HzsT
-zE949l5l5iSLHfi+uEECQQDLH8uGp1h1N795gwO9S+Wu71Yuun1oBY9CajV4agcZ
-z7wiNmRS5xto7VdHaJNETiZCYkjWPup34SqFxv/NjqIe
+MIICXwIBAAKBgQDW9QJ8Go6rLOA2myM24pOJGWofAeXfc5ZfelIXzGDUooTBy+iN
+P8lhoIHKcCiw/LAkCZOSJD2jghZXEAfjZXC1B9ZJarm2pwQwDi3OOLdqzoS2CwjP
+a3epg8zAstXhFvV47Z9pqdblprMriI8zm3SeM50fW8toMeGPa3jgeysvOQIDAQAB
+AoGBAINhjPs9YCXPb9rwRz2sjnAlUG9TQaSpiSciJDrXd/d+vZWVg7WRXwyEhc+t
+bbF/QElGcSPJcsMVJ4JfEfMydQeR0Il6qOlqsciLXX9vvcq7xeA4fjqBvoXoHAzM
+aXz3PkcNsj9/WK38StWwtqxJVUJHM25y9/XiiCvaXT6rATgBAkEA7isVcdAd7l9G
+nTubnEgjizRLRhACAOSxNMgzETCquc22cgb0tAnBP4o1BeiPAAX8Cpc0mJHaUxKh
+Kj8BBcVI2QJBAOcNCrD1owayY5rvXiOVtgxY4P0e7M8wMSwVpl/nuLyXYkjrQHDq
+3Weqgnov1vf2+Eh7UqpwDTcemV2LUFk6HWECQQDVcvlqIhnhG7RekCB7JM/uHzTj
+Gs+g21TRuCbEXjh0AyBi+0bt39w4xPWWUQFwBO0I1NDHd9gSIZ0dDpAtCs2pAkEA
+h/YHtYxGS7mLnW+AAQanIurmMm0RQvaD6QIwbj0oW2nlvy0YNZovgUI4F3ixUic1
+gUl4oqzfSfEqpH5HYMou4QJBAMsb6bYoWjyK8nfuGqIGcg7VoR2szSodw+f1Gv7u
+X0xs3XOkRUqGE3RIOJ9YFKQ4IIxOYa5/iD8AMiE2RUGQyvw=
 -----END RSA PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/goodKey_2.pem b/cpp/test/IceSSL/certs/goodKey_2.pem
index e77a73fdf56..7e4804b3a92 100644
--- a/cpp/test/IceSSL/certs/goodKey_2.pem
+++ b/cpp/test/IceSSL/certs/goodKey_2.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQC7ElVB1QmX7o9lnxftFE7+KxR1WpZHR/tLm6cKfInSo7Aqq++r
-p4Ik0SnBKWvAFIVdBd0EwbRKrKm/zuZyNo1sjPLA6c4rwGiMnkhvYWr1pDbha6L4
-K71vyw9U1kOle3r90kMCwjikdtmUHX181/6ekz5g0y1dQbea7RgIpr1vZQIDAQAB
-AoGAJI6NmKLQEB+vaBVx8IOCeErk4ZYFPgLECd9uAi+aI06Xk48r8+h1F0rElRnK
-E6wu76HAsjhESj95oKEHCZS9h/5m/Ci65JrIRhYwNaGuzFijsilo4MPIToZegsyl
-yKoM0MhOUcjpvIUm8Brhr7H6eXhDXY1PFGevhniNOdkWDNUCQQDhAdk8zubiLAgJ
-ojvR85ro4boazJ7n4VNzDjMviD+xl0cEoDCX0lxGZ8yBl7aVDWW+NwsHct5aZBv1
-5t1fZ7pvAkEA1NbO2uQY4O/2XoNN2SMo7iTdLJiosD02ItpPLufoM1y7Msx01P7u
-Cm+iwLOcQEziBl1uh1+NGb1vVSWRQbMtawJAXlffFV8Pce/SYu+yM2L4JgNXfBsl
-2cYhrlFa5ugzBKyQa4EbPt1GMYMePYw2UyLt8Sa1Kidg0fe9vYpScclVYwJANU2a
-vo0Tgfn2zJK7w16f2IxY69tLm9+omC/uVsPzjjFyHHXB6LnzqZ9tti8FOcFHdeqe
-TL7sWn7ry/o9l6OlAwJATdH7Sd2hc3LyjrITgU93XOHFywpmgaP38Q5Yjmk0c2tE
-4+8l7DMRlT2GqE+10zrU7NDYkPGUd1EYQMkTF6sEuw==
+MIICXAIBAAKBgQDhzWf5Y2AOdfBV+6x/W1U6DvyTmjoiOZ5eI4DoqKE5uhIB7eT/
+lUGdOhNxt6Kc3KEtbS+VHgA8cnepPt5rUmPWjiTr/zAhIaJPJZUE6ym3FSMne6d9
+itiZL5z3juwQNxyDbVZnRx/8LfISXIfAzmRmy6IUd8L2p5ftNHRhBmt3qQIDAQAB
+AoGAY2LzttNEvliu9kmWPWBH/QwHpDgoClRuHmVmIgHHJQ9/SZYaS1y4yql7UXxQ
+eNarosECRpIz7Gc9wCLJ51cWVc+thzfXXxXHiPT1Lg/ySEgdqP5O5Vv38ygVsvEq
+FEzLXF01gJHxmHd60t3lIC/cMcOoU20qsQJaNloV2VUwDhkCQQD+werZ2khv7w2H
+NvFeNXSJHaIRbt08gFrscoDUkrkOBWWmPL29k0CAIet703OkSvvYzyKEjMh+7Prr
+oFHAzbVvAkEA4udWFRtsxHSzZ+St0ZIDzJgxTPibYbuzdicC4zL4kOji83mZkVcb
+w8sOASHwXJfQlUQWjcpVTgmG4UtOM8QIZwJAb7UWRtqJQtO+ydiUs+uaovkkdKJ5
+Tis2M1HuHcgMbxJ8xQ0DYhosgULeYBiTL6pVjncdOqQE0msVh7Zvwqww7wJBAJpo
+fuYCMbRHDkdnEPoKeVdjQjl0/Jg3mVqQFaDy8L/8G2VAnMaRFq3YooEWzXDVRvYs
+zYRT6lUempD6JA+KGYUCQElvBXjq+KRfCujpnFqAp51/wXb/V5KgWL4+0vWonWUj
+yQHHUHv7D0Bzjh59IkETNuf8CDHbaQvnpivWtlGeq6w=
 -----END RSA PRIVATE KEY-----