certs

10 files changed, 266 insertions, 266 deletions

diff --git a/cpp/certs/c_rsa1024_priv.pem b/cpp/certs/c_rsa1024_priv.pem
index 4cd966b1953..3edff333b55 100644
--- a/cpp/certs/c_rsa1024_priv.pem
+++ b/cpp/certs/c_rsa1024_priv.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-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=
+MIICXAIBAAKBgQDRbiJhIr+krxP/60B1gOE/hc1AaTRyJ0bGnwAg2dJcHvnp+Tvl
+DNiMtVwXj3A142ZzAYDyDlRrVPNA7ickn32b8eAOEv5WBtII7mfGPreXeS6EM6vB
+/nqrYegMId603QdK/+bjukTD0IRwn7Lx74QS0b+6YvhYG9oKHDzLjPRVTwIDAQAB
+AoGBAMiRnUNBsB/bvF+fwX/HCfF4BvXky2F31ARsSgcsFJY85EL7ei0GfG1lUukN
+af1x5q/FhORMbPTNypkoezxLslJmwyVjb1fl1sfZlYnZcDb9s+XoH/frehxoXHEV
+8IxkUJ81RJyqc2wYSBsVeok6kCJejkM12q45K3zSWCQzG/aBAkEA9N6Ua+upITiF
+/7osaoXwNGyUCCNTXuE7t0p1VVT2tufEZ8CLpYzlQwLxOL5qqHfodsA+D92Dvi7V
+A7KRs+vT3wJBANrzKpAZK+etU9AZFkSpZ4SJq0V3XcndC9+SJXLIOFQ949wm27cB
+CDkCW1bg0zhCr8kbHb7f4gGDopyOxHrpLJECQAVRG+nn+QkmoAo4caRyeg+5V9GB
+atsBivlk3X1X1e+Mwr/5905F6+hzlOdFgy1bRSnm7LINfkHP5IIrC2zbrwMCQBDH
+HXXZV/Hy6D9EDN7KFHKlkghKs1cqpyREsLXw/dAGxhUyrReC7rxfn9wycj0Xbxz8
+BPWBdnIjQiy5C/lXMOECQHB+6ZrJdAQJj/yjIG7x1mrR9HR7TkEoPAcL3y9+TsYX
+nQqtMwM8erF+8Ep8SSgRPlfmwhizaZ449NHyDe3PkYo=
 -----END RSA PRIVATE KEY-----
diff --git a/cpp/certs/c_rsa1024_pub.pem b/cpp/certs/c_rsa1024_pub.pem
index 91ab752914f..c3466adb607 100644
--- a/cpp/certs/c_rsa1024_pub.pem
+++ b/cpp/certs/c_rsa1024_pub.pem
@@ -3,73 +3,73 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 2 (0x2)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/Email=you@some.net
+        Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/emailAddress=you@some.net
         Validity
-            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
+            Not Before: Feb 23 23:28:18 2004 GMT
+            Not After : Feb 22 23:28:18 2005 GMT
+        Subject: C=US, ST=Some State, O=Your Company, OU=Development/emailAddress=iceclient@@some.net, CN=Ice Client
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    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
+                    00:d1:6e:22:61:22:bf:a4:af:13:ff:eb:40:75:80:
+                    e1:3f:85:cd:40:69:34:72:27:46:c6:9f:00:20:d9:
+                    d2:5c:1e:f9:e9:f9:3b:e5:0c:d8:8c:b5:5c:17:8f:
+                    70:35:e3:66:73:01:80:f2:0e:54:6b:54:f3:40:ee:
+                    27:24:9f:7d:9b:f1:e0:0e:12:fe:56:06:d2:08:ee:
+                    67:c6:3e:b7:97:79:2e:84:33:ab:c1:fe:7a:ab:61:
+                    e8:0c:21:de:b4:dd:07:4a:ff:e6:e3:ba:44:c3:d0:
+                    84:70:9f:b2:f1:ef:84:12:d1:bf:ba:62:f8:58:1b:
+                    da:0a:1c:3c:cb:8c:f4:55:4f
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
-                CA:FALSE
+            CA:FALSE
             X509v3 Subject Key Identifier: 
-                2D:C3:08:2C:45:F7:34:20:A1:3E:30:ED:FE:CF:21:1E:46:92:F0:D5
+            0F:CC:C5:BD:B6:B2:CC:6C:06:60:0F:59:2A:9E:EF:55:6B:A1:89:C7
             X509v3 Authority Key Identifier: 
-                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
+            keyid:D2:56:3D:94:01:2F:92:7F:07:BC:C7:18:EB:41:4E:75:3F:56:00:F1
+            DirName:/C=US/ST=Some State/L=Somewhere/O=Your Company/OU=Development/CN=Your Certificate Authority/emailAddress=you@some.net
+            serial:00
 
     Signature Algorithm: md5WithRSAEncryption
-        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
+        2a:3a:62:b5:aa:34:8e:b6:f9:0b:de:9b:db:31:b2:14:37:bc:
+        39:44:74:c4:fd:96:0c:73:32:ba:4c:56:7f:dc:16:91:19:90:
+        37:1b:20:2e:79:4e:40:1c:79:e1:2c:33:e4:80:a9:ee:ba:45:
+        85:1e:e4:6c:1a:95:24:e0:62:cd:a6:63:c8:41:5d:77:90:59:
+        c9:c3:e7:53:7d:e2:25:ac:9e:1d:13:0f:05:d7:7e:c9:bb:5a:
+        28:7d:e9:90:6d:a7:ab:9a:39:3a:68:ba:ac:b6:d4:f8:a5:ab:
+        4c:05:b4:eb:ff:a4:80:1c:96:e3:e6:6c:6a:d4:fb:98:c1:2b:
+        42:ef:a7:33:33:48:14:25:d5:73:28:41:e6:31:5f:94:53:cd:
+        a1:9b:ea:61:4b:93:81:4a:f5:cf:bc:0d:42:25:e8:2d:a4:df:
+        81:5c:d6:26:d3:65:df:e3:5e:b9:a0:d9:39:c5:e3:ba:01:f0:
+        d8:d7:64:d7:ff:84:d6:dc:79:4d:4a:8c:a3:c2:7d:4c:40:41:
+        6d:fd:a1:6c:49:df:d9:19:23:90:26:e3:74:54:8c:29:7a:26:
+        03:c1:01:07:4c:2a:bc:fe:a1:5d:a0:67:5d:58:32:9a:50:fa:
+        0a:ac:25:a4:00:3b:f6:74:44:f7:c3:1d:ad:33:07:2b:c3:1d:
+        59:f5:ef:ce
 -----BEGIN CERTIFICATE-----
 MIIEKjCCAxKgAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
 EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
 ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
 WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wMzAyMjMyMDQ1MDFaFw0wNDAyMjMyMDQ1MDFaMIGIMQswCQYD
+b21lLm5ldDAeFw0wNDAyMjMyMzI4MThaFw0wNTAyMjIyMzI4MThaMIGIMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTEVMBMGA1UEChMMWW91ciBDb21w
 YW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEiMCAGCSqGSIb3DQEJARYTaWNlY2xp
 ZW50QEBzb21lLm5ldDETMBEGA1UEAxMKSWNlIENsaWVudDCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEA1vUCfBqOqyzgNpsjNuKTiRlqHwHl33OWX3pSF8xg1KKE
-wcvojT/JYaCBynAosPywJAmTkiQ9o4IWVxAH42VwtQfWSWq5tqcEMA4tzji3as6E
-tgsIz2t3qYPMwLLV4Rb1eO2faanW5aazK4iPM5t0njOdH1vLaDHhj2t44HsrLzkC
-AwEAAaOCAQIwgf8wCQYDVR0TBAIwADAdBgNVHQ4EFgQULcMILEX3NCChPjDt/s8h
-HkaS8NUwgdIGA1UdIwSByjCBx4AUKekwMOkHyW2oUWx9MFFA0wrEJIChgaukgagw
+AQEFAAOBjQAwgYkCgYEA0W4iYSK/pK8T/+tAdYDhP4XNQGk0cidGxp8AINnSXB75
+6fk75QzYjLVcF49wNeNmcwGA8g5Ua1TzQO4nJJ99m/HgDhL+VgbSCO5nxj63l3ku
+hDOrwf56q2HoDCHetN0HSv/m47pEw9CEcJ+y8e+EEtG/umL4WBvaChw8y4z0VU8C
+AwEAAaOCAQIwgf8wCQYDVR0TBAIwADAdBgNVHQ4EFgQUD8zFvbayzGwGYA9ZKp7v
+VWuhiccwgdIGA1UdIwSByjCBx4AU0lY9lAEvkn8HvMcY60FOdT9WAPGhgaukgagw
 gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lIFN0YXRlMRIwEAYDVQQHEwlT
 b21ld2hlcmUxFTATBgNVBAoTDFlvdXIgQ29tcGFueTEUMBIGA1UECxMLRGV2ZWxv
 cG1lbnQxIzAhBgNVBAMTGllvdXIgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRswGQYJ
-KoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAwDQYJKoZIhvcNAQEEBQADggEBAHaf
-JTFp2cnuQhBL0gpL99daoz2W66r2KR/aI9blW2zaZHlgSzQ0vvnSAxuEpHhZhsXB
-wGkF159f6oDPX6ItKYj7GbYAnqvSe8eKYYZwB7ir6M6m9JVxlEzUtBHhfPnyVNru
-8ye9kVsx/8nSSFkybuyg6I9SshVtuDZXCGebUyby+wx33YNfhztBa75rBeTYWEq9
-gslX9iS893m4dzHh4VyyagIOD1f9f0AZh1UJpK8O2YRtbU3ifW5/rOEVf7YgKDNJ
-bN5O5wXcCEagRpi1MIgjWhAdzbUdwRQGXZjugA2rocMDVBpCCjXylTYDyajFxeT8
-+cGay+G1epPcr0dH1WY=
+KoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAwDQYJKoZIhvcNAQEEBQADggEBACo6
+YrWqNI62+Qvem9sxshQ3vDlEdMT9lgxzMrpMVn/cFpEZkDcbIC55TkAceeEsM+SA
+qe66RYUe5GwalSTgYs2mY8hBXXeQWcnD51N94iWsnh0TDwXXfsm7Wih96ZBtp6ua
+OTpouqy21Pilq0wFtOv/pIAcluPmbGrU+5jBK0LvpzMzSBQl1XMoQeYxX5RTzaGb
+6mFLk4FK9c+8DUIl6C2k34Fc1ibTZd/jXrmg2TnF47oB8NjXZNf/hNbceU1KjKPC
+fUxAQW39oWxJ39kZI5Am43RUjCl6JgPBAQdMKrz+oV2gZ11YMppQ+gqsJaQAO/Z0
+RPfDHa0zByvDHVn1784=
 -----END CERTIFICATE-----
diff --git a/cpp/certs/cacert.pem b/cpp/certs/cacert.pem
index 6f9e0253c83..78eac5d2da9 100644
--- a/cpp/certs/cacert.pem
+++ b/cpp/certs/cacert.pem
@@ -3,26 +3,26 @@ MIIEzzCCA7egAwIBAgIBADANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
 EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
 ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
 WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wMzAyMjMyMDQ0NTdaFw0wODAyMjIyMDQ0NTdaMIGlMQswCQYD
+b21lLm5ldDAeFw0wNDAyMjMyMzI4MTBaFw0wOTAyMjEyMzI4MTBaMIGlMQswCQYD
 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
+sPpmQJPSKmK/cDgJkMTULxdEJNQW2ZOygCYQm/Bhc1qPaY0bDA0Iw4HmQqOGWdjS
+RFyS67o/gY3RNB1aD5AgyJmhBoolRExwuuDWhqR3u0np0Py4rBTg/54EGwTJZDcm
+PfloyF4TujtY14ec5+HZqg041ZjEfwaqJbEZ8sEdE/8aX5QdoDZWjiQGwv2/KVe+
+3IXph9kfLuhs3MYv/CZhInYTIdC69YNKDDHDeyRM3K+OFJS4Q2K/WgOud8ijDQ+8
+uydx/bOmKWNLycR0jNLW2AOjjdX4cWC42R0eWm4pbsBe/5M5W+UUgYxvu4gO2nXc
+uHBpy2iHI3aTOFlCaRVqPQIDAQABo4IBBjCCAQIwDAYDVR0TBAUwAwEB/zAdBgNV
+HQ4EFgQU0lY9lAEvkn8HvMcY60FOdT9WAPEwgdIGA1UdIwSByjCBx4AU0lY9lAEv
+kn8HvMcY60FOdT9WAPGhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpT
 b21lIFN0YXRlMRIwEAYDVQQHEwlTb21ld2hlcmUxFTATBgNVBAoTDFlvdXIgQ29t
 cGFueTEUMBIGA1UECxMLRGV2ZWxvcG1lbnQxIzAhBgNVBAMTGllvdXIgQ2VydGlm
 aWNhdGUgQXV0aG9yaXR5MRswGQYJKoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAw
-DQYJKoZIhvcNAQEEBQADggEBAGsmp3B4hDosIkYMm11mvfKkBoNPsblVS2Q4D3ts
-fF2iX7ihHafB2zmw4vT5pSSEcWIDFxlQeC+Q2uuhwLukWvyFexCuzzDhzVywJShu
-/hEurcTZlUGEwZAXjn1aexIEnYH8rkDrNryLEhHzuXABrgSB9kUsGMKeRStP50Pg
-Z23aSLFdMDN/ePqtZgKF6L0Qj6YsHsjIaz6ZMGnVe3claEWSdlstilFpErK56iEt
-VZsw/jwNGLXkaHzHcV3IUAjLwi9DcmdzLOpPRnZz83JDspjA8Rb3yq3FG50cyli9
-o327C73TtcvnT8gomNxAsuLN/MCmQHpIU+giS3XKDlxUkME=
+DQYJKoZIhvcNAQEEBQADggEBABO1wfZRqupBp934k55HSjmm8zPNFIe0papzTp9V
++min/lW0tJT0AgfpcEdnnTHOvA+W5zMNN8Y6tPh3WcZfYJln7z91d2oxhRsL+J8k
+Uo/Tbzdin2hCMA40PoYOgoaHcywcfhTEMk7Ziqx89eaDj0KxpSKP5JP85H2dnTLw
+kRRtmnSCd2ZD0pfW5EE2Bgxex0dukzds2fVlfqaJIFKqUoVIBWa2MXJCMZVtfQDi
+pE36/e3tOSwn2eC5KbVRv40Q95YxDwZuHLAl5Z7BFCJWkepeanj4QfJhSbyqB+wy
+uTGVHcSckMNXAHc0Fs1VuWX679am9RMW+gRnpD9Ic81Hg4I=
 -----END CERTIFICATE-----
diff --git a/cpp/certs/s_rsa1024_priv.pem b/cpp/certs/s_rsa1024_priv.pem
index 7e4804b3a92..8978428f645 100644
--- a/cpp/certs/s_rsa1024_priv.pem
+++ b/cpp/certs/s_rsa1024_priv.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-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=
+MIICXgIBAAKBgQDX8PGzOwC+KjmJFt0yQktWhoLJOGGm63B4Jk4xjzvmdyDH5j/J
+vmWcE0ISPphG9NzyyPwl4aj/HnbyW9I+cDDwCWL2tjvEHdMGqYVsliBoPDytphuK
++KRJ5TDm9SGfnGaADgBbRLTgMj452p2z9QaEjURVkYnIKtEa9QrJWXTQCwIDAQAB
+AoGBAMz+0ATs42Sj4yDQUsZuhuSqJyhs3M9APPHis2J67kt4FeePHkkf9Yf4BEYb
+pCXgOIxG3o/7rJocSqEDKBDcIqdN4dODsSC5xjeIkBHEI3vDBBxXv929a1mjq/QN
+G/9/TGuYpuAK39PuP2i82o/rC0JBVtNdOYZzJCPjv99buzzBAkEA9thRbwe2mXcA
+0VBbz6Q3j6AIvj4EER+oEl1DaA6MXzhf5VZ6+WkP/jQVoWRclidMKytu5TLFB8DP
+ONKC9mMGqwJBAN/zNVaGKUNmYe4EZQ6i72ZUATiUZbrfXuJtbeX+jWWYgUmbydhS
+bCLTf1w/ZBQfV+7H25/2kEQ42+rAI87i3CECQQCdshx0Hi1dZVU0Y24D/RkxvD9Z
+qizW865f7Qz/ESxEOLOqw9DUPXZmI8gdzwwHMRvMCHdUHVcaWOcJmhLobOL5AkEA
+rlKcpDtOh158wE+/ckM2YsrlIGuzPGF/dHWF5E/fNMQfb3LLDY4rCnjjXKUje95i
+DkaYGM5OwiwYU4U42mQQwQJAcs6RrEgpxaMIiKYU/gvSGPmGlf84EbpmUtU+t53G
+F7rhRbkVpbZjT1tzNPwXpnc5F62giedgFJW4EaI5G+9A6w==
 -----END RSA PRIVATE KEY-----
diff --git a/cpp/certs/s_rsa1024_pub.pem b/cpp/certs/s_rsa1024_pub.pem
index 45318e1b449..58ba45435a3 100644
--- a/cpp/certs/s_rsa1024_pub.pem
+++ b/cpp/certs/s_rsa1024_pub.pem
@@ -3,73 +3,73 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/Email=you@some.net
+        Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/emailAddress=you@some.net
         Validity
-            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
+            Not Before: Feb 23 23:28:15 2004 GMT
+            Not After : Feb 22 23:28:15 2005 GMT
+        Subject: C=US, ST=Some State, O=Your Company, OU=Development/emailAddress=iceserver@some.net, CN=Ice Server
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    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
+                    00:d7:f0:f1:b3:3b:00:be:2a:39:89:16:dd:32:42:
+                    4b:56:86:82:c9:38:61:a6:eb:70:78:26:4e:31:8f:
+                    3b:e6:77:20:c7:e6:3f:c9:be:65:9c:13:42:12:3e:
+                    98:46:f4:dc:f2:c8:fc:25:e1:a8:ff:1e:76:f2:5b:
+                    d2:3e:70:30:f0:09:62:f6:b6:3b:c4:1d:d3:06:a9:
+                    85:6c:96:20:68:3c:3c:ad:a6:1b:8a:f8:a4:49:e5:
+                    30:e6:f5:21:9f:9c:66:80:0e:00:5b:44:b4:e0:32:
+                    3e:39:da:9d:b3:f5:06:84:8d:44:55:91:89:c8:2a:
+                    d1:1a:f5:0a:c9:59:74:d0:0b
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
-                CA:FALSE
+            CA:FALSE
             X509v3 Subject Key Identifier: 
-                31:DA:B5:13:E7:28:CF:42:58:20:CF:FD:D9:C9:95:F7:33:E7:FD:7B
+            B0:5E:F0:82:88:56:64:03:74:7F:A5:94:99:69:01:E6:0B:9A:71:D2
             X509v3 Authority Key Identifier: 
-                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
+            keyid:D2:56:3D:94:01:2F:92:7F:07:BC:C7:18:EB:41:4E:75:3F:56:00:F1
+            DirName:/C=US/ST=Some State/L=Somewhere/O=Your Company/OU=Development/CN=Your Certificate Authority/emailAddress=you@some.net
+            serial:00
 
     Signature Algorithm: md5WithRSAEncryption
-        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
+        2c:15:86:b0:e7:e5:db:bc:17:76:53:1e:53:f2:95:68:4f:56:
+        bd:19:38:10:1c:59:b7:e5:11:3d:d2:61:59:b7:8f:15:a2:2c:
+        86:64:bb:02:10:7b:a1:62:f6:28:8f:78:f0:0c:0c:52:75:65:
+        3d:00:0f:29:42:75:62:06:9d:6e:b1:93:66:36:c0:09:99:f1:
+        94:e1:0e:3e:99:20:ab:c7:23:0a:cf:6a:d2:87:db:66:c5:cc:
+        23:b6:da:26:72:91:39:9e:98:33:01:4e:e2:0b:f8:60:03:16:
+        d2:04:3a:eb:99:eb:de:b9:d2:5e:f7:ad:b1:71:36:85:c5:18:
+        c5:cd:f2:67:74:ee:b0:21:ed:06:e8:7a:39:65:25:ad:df:bf:
+        c3:8f:d9:fc:c2:ab:dd:c9:4e:5c:fa:cf:d9:ce:6f:b4:ae:33:
+        0f:02:aa:61:44:ed:de:2c:0d:f1:97:05:be:90:64:8c:8f:a8:
+        be:6f:f5:75:0c:0b:a7:f5:27:e1:89:37:b7:97:ae:f1:87:cc:
+        1b:f9:76:f3:b9:68:27:e9:5a:37:50:73:08:61:21:cd:34:a2:
+        75:eb:bd:34:1f:c5:45:04:9b:e1:d7:04:f1:67:0c:d1:da:a8:
+        09:1c:4a:7d:c6:2e:00:8e:70:70:89:b8:ab:56:3d:4b:18:07:
+        d1:cd:f1:15
 -----BEGIN CERTIFICATE-----
 MIIEKTCCAxGgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
 EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
 ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
 WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wMzAyMjMyMDQ0NTlaFw0wNDAyMjMyMDQ0NTlaMIGHMQswCQYD
+b21lLm5ldDAeFw0wNDAyMjMyMzI4MTVaFw0wNTAyMjIyMzI4MTVaMIGHMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTEVMBMGA1UEChMMWW91ciBDb21w
 YW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEhMB8GCSqGSIb3DQEJARYSaWNlc2Vy
 dmVyQHNvbWUubmV0MRMwEQYDVQQDEwpJY2UgU2VydmVyMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDhzWf5Y2AOdfBV+6x/W1U6DvyTmjoiOZ5eI4DoqKE5uhIB
-7eT/lUGdOhNxt6Kc3KEtbS+VHgA8cnepPt5rUmPWjiTr/zAhIaJPJZUE6ym3FSMn
-e6d9itiZL5z3juwQNxyDbVZnRx/8LfISXIfAzmRmy6IUd8L2p5ftNHRhBmt3qQID
-AQABo4IBAjCB/zAJBgNVHRMEAjAAMB0GA1UdDgQWBBQx2rUT5yjPQlggz/3ZyZX3
-M+f9ezCB0gYDVR0jBIHKMIHHgBQp6TAw6QfJbahRbH0wUUDTCsQkgKGBq6SBqDCB
+AQUAA4GNADCBiQKBgQDX8PGzOwC+KjmJFt0yQktWhoLJOGGm63B4Jk4xjzvmdyDH
+5j/JvmWcE0ISPphG9NzyyPwl4aj/HnbyW9I+cDDwCWL2tjvEHdMGqYVsliBoPDyt
+phuK+KRJ5TDm9SGfnGaADgBbRLTgMj452p2z9QaEjURVkYnIKtEa9QrJWXTQCwID
+AQABo4IBAjCB/zAJBgNVHRMEAjAAMB0GA1UdDgQWBBSwXvCCiFZkA3R/pZSZaQHm
+C5px0jCB0gYDVR0jBIHKMIHHgBTSVj2UAS+Sfwe8xxjrQU51P1YA8aGBq6SBqDCB
 pTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNv
 bWV3aGVyZTEVMBMGA1UEChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9w
 bWVudDEjMCEGA1UEAxMaWW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkq
-hkiG9w0BCQEWDHlvdUBzb21lLm5ldIIBADANBgkqhkiG9w0BAQQFAAOCAQEARyQN
-+ozl7LX5EBuZSOC4X/1TDlxvYl8XOYzyuAjltut1LdxQYkL3mDMl7k24s3suua/g
-85e2aTtX2lSaZQ4vNcTCOWs9ZziNZbopbbDS/X7Q5cUKlSjNXPnDKUOeUxSI8T8r
-MR8p6ytl7WVm18cbO+1QFMPKaLVsizn0wIaTSbvP3vlwSuUcKaKFszBUryLBq5lO
-w1rTlznrU1sQ6urc+JSuZAREocT1rXVhDSmzqwdDoxGchklvxOGEsUMtzGfIHoFD
-Md/vdJ7Q5NEt5HfvE0UBcX8kunZTZW5L3arGdLLAHdnDniiayB7XWLPlO2F8QCid
-35yKX/LILvlTG/wumA==
+hkiG9w0BCQEWDHlvdUBzb21lLm5ldIIBADANBgkqhkiG9w0BAQQFAAOCAQEALBWG
+sOfl27wXdlMeU/KVaE9WvRk4EBxZt+URPdJhWbePFaIshmS7AhB7oWL2KI948AwM
+UnVlPQAPKUJ1YgadbrGTZjbACZnxlOEOPpkgq8cjCs9q0ofbZsXMI7baJnKROZ6Y
+MwFO4gv4YAMW0gQ665nr3rnSXvetsXE2hcUYxc3yZ3TusCHtBuh6OWUlrd+/w4/Z
+/MKr3clOXPrP2c5vtK4zDwKqYUTt3iwN8ZcFvpBkjI+ovm/1dQwLp/Un4Yk3t5eu
+8YfMG/l287loJ+laN1BzCGEhzTSideu9NB/FRQSb4dcE8WcM0dqoCRxKfcYuAI5w
+cIm4q1Y9SxgH0c3xFQ==
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/cacert.pem b/cpp/test/IceSSL/certs/cacert.pem
index 6f9e0253c83..78eac5d2da9 100644
--- a/cpp/test/IceSSL/certs/cacert.pem
+++ b/cpp/test/IceSSL/certs/cacert.pem
@@ -3,26 +3,26 @@ MIIEzzCCA7egAwIBAgIBADANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
 EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
 ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
 WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wMzAyMjMyMDQ0NTdaFw0wODAyMjIyMDQ0NTdaMIGlMQswCQYD
+b21lLm5ldDAeFw0wNDAyMjMyMzI4MTBaFw0wOTAyMjEyMzI4MTBaMIGlMQswCQYD
 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
+sPpmQJPSKmK/cDgJkMTULxdEJNQW2ZOygCYQm/Bhc1qPaY0bDA0Iw4HmQqOGWdjS
+RFyS67o/gY3RNB1aD5AgyJmhBoolRExwuuDWhqR3u0np0Py4rBTg/54EGwTJZDcm
+PfloyF4TujtY14ec5+HZqg041ZjEfwaqJbEZ8sEdE/8aX5QdoDZWjiQGwv2/KVe+
+3IXph9kfLuhs3MYv/CZhInYTIdC69YNKDDHDeyRM3K+OFJS4Q2K/WgOud8ijDQ+8
+uydx/bOmKWNLycR0jNLW2AOjjdX4cWC42R0eWm4pbsBe/5M5W+UUgYxvu4gO2nXc
+uHBpy2iHI3aTOFlCaRVqPQIDAQABo4IBBjCCAQIwDAYDVR0TBAUwAwEB/zAdBgNV
+HQ4EFgQU0lY9lAEvkn8HvMcY60FOdT9WAPEwgdIGA1UdIwSByjCBx4AU0lY9lAEv
+kn8HvMcY60FOdT9WAPGhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpT
 b21lIFN0YXRlMRIwEAYDVQQHEwlTb21ld2hlcmUxFTATBgNVBAoTDFlvdXIgQ29t
 cGFueTEUMBIGA1UECxMLRGV2ZWxvcG1lbnQxIzAhBgNVBAMTGllvdXIgQ2VydGlm
 aWNhdGUgQXV0aG9yaXR5MRswGQYJKoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAw
-DQYJKoZIhvcNAQEEBQADggEBAGsmp3B4hDosIkYMm11mvfKkBoNPsblVS2Q4D3ts
-fF2iX7ihHafB2zmw4vT5pSSEcWIDFxlQeC+Q2uuhwLukWvyFexCuzzDhzVywJShu
-/hEurcTZlUGEwZAXjn1aexIEnYH8rkDrNryLEhHzuXABrgSB9kUsGMKeRStP50Pg
-Z23aSLFdMDN/ePqtZgKF6L0Qj6YsHsjIaz6ZMGnVe3claEWSdlstilFpErK56iEt
-VZsw/jwNGLXkaHzHcV3IUAjLwi9DcmdzLOpPRnZz83JDspjA8Rb3yq3FG50cyli9
-o327C73TtcvnT8gomNxAsuLN/MCmQHpIU+giS3XKDlxUkME=
+DQYJKoZIhvcNAQEEBQADggEBABO1wfZRqupBp934k55HSjmm8zPNFIe0papzTp9V
++min/lW0tJT0AgfpcEdnnTHOvA+W5zMNN8Y6tPh3WcZfYJln7z91d2oxhRsL+J8k
+Uo/Tbzdin2hCMA40PoYOgoaHcywcfhTEMk7Ziqx89eaDj0KxpSKP5JP85H2dnTLw
+kRRtmnSCd2ZD0pfW5EE2Bgxex0dukzds2fVlfqaJIFKqUoVIBWa2MXJCMZVtfQDi
+pE36/e3tOSwn2eC5KbVRv40Q95YxDwZuHLAl5Z7BFCJWkepeanj4QfJhSbyqB+wy
+uTGVHcSckMNXAHc0Fs1VuWX679am9RMW+gRnpD9Ic81Hg4I=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/goodCert_1.pem b/cpp/test/IceSSL/certs/goodCert_1.pem
index 91ab752914f..c3466adb607 100644
--- a/cpp/test/IceSSL/certs/goodCert_1.pem
+++ b/cpp/test/IceSSL/certs/goodCert_1.pem
@@ -3,73 +3,73 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 2 (0x2)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/Email=you@some.net
+        Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/emailAddress=you@some.net
         Validity
-            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
+            Not Before: Feb 23 23:28:18 2004 GMT
+            Not After : Feb 22 23:28:18 2005 GMT
+        Subject: C=US, ST=Some State, O=Your Company, OU=Development/emailAddress=iceclient@@some.net, CN=Ice Client
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    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
+                    00:d1:6e:22:61:22:bf:a4:af:13:ff:eb:40:75:80:
+                    e1:3f:85:cd:40:69:34:72:27:46:c6:9f:00:20:d9:
+                    d2:5c:1e:f9:e9:f9:3b:e5:0c:d8:8c:b5:5c:17:8f:
+                    70:35:e3:66:73:01:80:f2:0e:54:6b:54:f3:40:ee:
+                    27:24:9f:7d:9b:f1:e0:0e:12:fe:56:06:d2:08:ee:
+                    67:c6:3e:b7:97:79:2e:84:33:ab:c1:fe:7a:ab:61:
+                    e8:0c:21:de:b4:dd:07:4a:ff:e6:e3:ba:44:c3:d0:
+                    84:70:9f:b2:f1:ef:84:12:d1:bf:ba:62:f8:58:1b:
+                    da:0a:1c:3c:cb:8c:f4:55:4f
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
-                CA:FALSE
+            CA:FALSE
             X509v3 Subject Key Identifier: 
-                2D:C3:08:2C:45:F7:34:20:A1:3E:30:ED:FE:CF:21:1E:46:92:F0:D5
+            0F:CC:C5:BD:B6:B2:CC:6C:06:60:0F:59:2A:9E:EF:55:6B:A1:89:C7
             X509v3 Authority Key Identifier: 
-                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
+            keyid:D2:56:3D:94:01:2F:92:7F:07:BC:C7:18:EB:41:4E:75:3F:56:00:F1
+            DirName:/C=US/ST=Some State/L=Somewhere/O=Your Company/OU=Development/CN=Your Certificate Authority/emailAddress=you@some.net
+            serial:00
 
     Signature Algorithm: md5WithRSAEncryption
-        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
+        2a:3a:62:b5:aa:34:8e:b6:f9:0b:de:9b:db:31:b2:14:37:bc:
+        39:44:74:c4:fd:96:0c:73:32:ba:4c:56:7f:dc:16:91:19:90:
+        37:1b:20:2e:79:4e:40:1c:79:e1:2c:33:e4:80:a9:ee:ba:45:
+        85:1e:e4:6c:1a:95:24:e0:62:cd:a6:63:c8:41:5d:77:90:59:
+        c9:c3:e7:53:7d:e2:25:ac:9e:1d:13:0f:05:d7:7e:c9:bb:5a:
+        28:7d:e9:90:6d:a7:ab:9a:39:3a:68:ba:ac:b6:d4:f8:a5:ab:
+        4c:05:b4:eb:ff:a4:80:1c:96:e3:e6:6c:6a:d4:fb:98:c1:2b:
+        42:ef:a7:33:33:48:14:25:d5:73:28:41:e6:31:5f:94:53:cd:
+        a1:9b:ea:61:4b:93:81:4a:f5:cf:bc:0d:42:25:e8:2d:a4:df:
+        81:5c:d6:26:d3:65:df:e3:5e:b9:a0:d9:39:c5:e3:ba:01:f0:
+        d8:d7:64:d7:ff:84:d6:dc:79:4d:4a:8c:a3:c2:7d:4c:40:41:
+        6d:fd:a1:6c:49:df:d9:19:23:90:26:e3:74:54:8c:29:7a:26:
+        03:c1:01:07:4c:2a:bc:fe:a1:5d:a0:67:5d:58:32:9a:50:fa:
+        0a:ac:25:a4:00:3b:f6:74:44:f7:c3:1d:ad:33:07:2b:c3:1d:
+        59:f5:ef:ce
 -----BEGIN CERTIFICATE-----
 MIIEKjCCAxKgAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
 EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
 ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
 WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wMzAyMjMyMDQ1MDFaFw0wNDAyMjMyMDQ1MDFaMIGIMQswCQYD
+b21lLm5ldDAeFw0wNDAyMjMyMzI4MThaFw0wNTAyMjIyMzI4MThaMIGIMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTEVMBMGA1UEChMMWW91ciBDb21w
 YW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEiMCAGCSqGSIb3DQEJARYTaWNlY2xp
 ZW50QEBzb21lLm5ldDETMBEGA1UEAxMKSWNlIENsaWVudDCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEA1vUCfBqOqyzgNpsjNuKTiRlqHwHl33OWX3pSF8xg1KKE
-wcvojT/JYaCBynAosPywJAmTkiQ9o4IWVxAH42VwtQfWSWq5tqcEMA4tzji3as6E
-tgsIz2t3qYPMwLLV4Rb1eO2faanW5aazK4iPM5t0njOdH1vLaDHhj2t44HsrLzkC
-AwEAAaOCAQIwgf8wCQYDVR0TBAIwADAdBgNVHQ4EFgQULcMILEX3NCChPjDt/s8h
-HkaS8NUwgdIGA1UdIwSByjCBx4AUKekwMOkHyW2oUWx9MFFA0wrEJIChgaukgagw
+AQEFAAOBjQAwgYkCgYEA0W4iYSK/pK8T/+tAdYDhP4XNQGk0cidGxp8AINnSXB75
+6fk75QzYjLVcF49wNeNmcwGA8g5Ua1TzQO4nJJ99m/HgDhL+VgbSCO5nxj63l3ku
+hDOrwf56q2HoDCHetN0HSv/m47pEw9CEcJ+y8e+EEtG/umL4WBvaChw8y4z0VU8C
+AwEAAaOCAQIwgf8wCQYDVR0TBAIwADAdBgNVHQ4EFgQUD8zFvbayzGwGYA9ZKp7v
+VWuhiccwgdIGA1UdIwSByjCBx4AU0lY9lAEvkn8HvMcY60FOdT9WAPGhgaukgagw
 gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpTb21lIFN0YXRlMRIwEAYDVQQHEwlT
 b21ld2hlcmUxFTATBgNVBAoTDFlvdXIgQ29tcGFueTEUMBIGA1UECxMLRGV2ZWxv
 cG1lbnQxIzAhBgNVBAMTGllvdXIgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRswGQYJ
-KoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAwDQYJKoZIhvcNAQEEBQADggEBAHaf
-JTFp2cnuQhBL0gpL99daoz2W66r2KR/aI9blW2zaZHlgSzQ0vvnSAxuEpHhZhsXB
-wGkF159f6oDPX6ItKYj7GbYAnqvSe8eKYYZwB7ir6M6m9JVxlEzUtBHhfPnyVNru
-8ye9kVsx/8nSSFkybuyg6I9SshVtuDZXCGebUyby+wx33YNfhztBa75rBeTYWEq9
-gslX9iS893m4dzHh4VyyagIOD1f9f0AZh1UJpK8O2YRtbU3ifW5/rOEVf7YgKDNJ
-bN5O5wXcCEagRpi1MIgjWhAdzbUdwRQGXZjugA2rocMDVBpCCjXylTYDyajFxeT8
-+cGay+G1epPcr0dH1WY=
+KoZIhvcNAQkBFgx5b3VAc29tZS5uZXSCAQAwDQYJKoZIhvcNAQEEBQADggEBACo6
+YrWqNI62+Qvem9sxshQ3vDlEdMT9lgxzMrpMVn/cFpEZkDcbIC55TkAceeEsM+SA
+qe66RYUe5GwalSTgYs2mY8hBXXeQWcnD51N94iWsnh0TDwXXfsm7Wih96ZBtp6ua
+OTpouqy21Pilq0wFtOv/pIAcluPmbGrU+5jBK0LvpzMzSBQl1XMoQeYxX5RTzaGb
+6mFLk4FK9c+8DUIl6C2k34Fc1ibTZd/jXrmg2TnF47oB8NjXZNf/hNbceU1KjKPC
+fUxAQW39oWxJ39kZI5Am43RUjCl6JgPBAQdMKrz+oV2gZ11YMppQ+gqsJaQAO/Z0
+RPfDHa0zByvDHVn1784=
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/goodCert_2.pem b/cpp/test/IceSSL/certs/goodCert_2.pem
index 45318e1b449..58ba45435a3 100644
--- a/cpp/test/IceSSL/certs/goodCert_2.pem
+++ b/cpp/test/IceSSL/certs/goodCert_2.pem
@@ -3,73 +3,73 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/Email=you@some.net
+        Issuer: C=US, ST=Some State, L=Somewhere, O=Your Company, OU=Development, CN=Your Certificate Authority/emailAddress=you@some.net
         Validity
-            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
+            Not Before: Feb 23 23:28:15 2004 GMT
+            Not After : Feb 22 23:28:15 2005 GMT
+        Subject: C=US, ST=Some State, O=Your Company, OU=Development/emailAddress=iceserver@some.net, CN=Ice Server
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    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
+                    00:d7:f0:f1:b3:3b:00:be:2a:39:89:16:dd:32:42:
+                    4b:56:86:82:c9:38:61:a6:eb:70:78:26:4e:31:8f:
+                    3b:e6:77:20:c7:e6:3f:c9:be:65:9c:13:42:12:3e:
+                    98:46:f4:dc:f2:c8:fc:25:e1:a8:ff:1e:76:f2:5b:
+                    d2:3e:70:30:f0:09:62:f6:b6:3b:c4:1d:d3:06:a9:
+                    85:6c:96:20:68:3c:3c:ad:a6:1b:8a:f8:a4:49:e5:
+                    30:e6:f5:21:9f:9c:66:80:0e:00:5b:44:b4:e0:32:
+                    3e:39:da:9d:b3:f5:06:84:8d:44:55:91:89:c8:2a:
+                    d1:1a:f5:0a:c9:59:74:d0:0b
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
-                CA:FALSE
+            CA:FALSE
             X509v3 Subject Key Identifier: 
-                31:DA:B5:13:E7:28:CF:42:58:20:CF:FD:D9:C9:95:F7:33:E7:FD:7B
+            B0:5E:F0:82:88:56:64:03:74:7F:A5:94:99:69:01:E6:0B:9A:71:D2
             X509v3 Authority Key Identifier: 
-                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
+            keyid:D2:56:3D:94:01:2F:92:7F:07:BC:C7:18:EB:41:4E:75:3F:56:00:F1
+            DirName:/C=US/ST=Some State/L=Somewhere/O=Your Company/OU=Development/CN=Your Certificate Authority/emailAddress=you@some.net
+            serial:00
 
     Signature Algorithm: md5WithRSAEncryption
-        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
+        2c:15:86:b0:e7:e5:db:bc:17:76:53:1e:53:f2:95:68:4f:56:
+        bd:19:38:10:1c:59:b7:e5:11:3d:d2:61:59:b7:8f:15:a2:2c:
+        86:64:bb:02:10:7b:a1:62:f6:28:8f:78:f0:0c:0c:52:75:65:
+        3d:00:0f:29:42:75:62:06:9d:6e:b1:93:66:36:c0:09:99:f1:
+        94:e1:0e:3e:99:20:ab:c7:23:0a:cf:6a:d2:87:db:66:c5:cc:
+        23:b6:da:26:72:91:39:9e:98:33:01:4e:e2:0b:f8:60:03:16:
+        d2:04:3a:eb:99:eb:de:b9:d2:5e:f7:ad:b1:71:36:85:c5:18:
+        c5:cd:f2:67:74:ee:b0:21:ed:06:e8:7a:39:65:25:ad:df:bf:
+        c3:8f:d9:fc:c2:ab:dd:c9:4e:5c:fa:cf:d9:ce:6f:b4:ae:33:
+        0f:02:aa:61:44:ed:de:2c:0d:f1:97:05:be:90:64:8c:8f:a8:
+        be:6f:f5:75:0c:0b:a7:f5:27:e1:89:37:b7:97:ae:f1:87:cc:
+        1b:f9:76:f3:b9:68:27:e9:5a:37:50:73:08:61:21:cd:34:a2:
+        75:eb:bd:34:1f:c5:45:04:9b:e1:d7:04:f1:67:0c:d1:da:a8:
+        09:1c:4a:7d:c6:2e:00:8e:70:70:89:b8:ab:56:3d:4b:18:07:
+        d1:cd:f1:15
 -----BEGIN CERTIFICATE-----
 MIIEKTCCAxGgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
 EzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEVMBMGA1UE
 ChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEjMCEGA1UEAxMa
 WW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkqhkiG9w0BCQEWDHlvdUBz
-b21lLm5ldDAeFw0wMzAyMjMyMDQ0NTlaFw0wNDAyMjMyMDQ0NTlaMIGHMQswCQYD
+b21lLm5ldDAeFw0wNDAyMjMyMzI4MTVaFw0wNTAyMjIyMzI4MTVaMIGHMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKU29tZSBTdGF0ZTEVMBMGA1UEChMMWW91ciBDb21w
 YW55MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEhMB8GCSqGSIb3DQEJARYSaWNlc2Vy
 dmVyQHNvbWUubmV0MRMwEQYDVQQDEwpJY2UgU2VydmVyMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDhzWf5Y2AOdfBV+6x/W1U6DvyTmjoiOZ5eI4DoqKE5uhIB
-7eT/lUGdOhNxt6Kc3KEtbS+VHgA8cnepPt5rUmPWjiTr/zAhIaJPJZUE6ym3FSMn
-e6d9itiZL5z3juwQNxyDbVZnRx/8LfISXIfAzmRmy6IUd8L2p5ftNHRhBmt3qQID
-AQABo4IBAjCB/zAJBgNVHRMEAjAAMB0GA1UdDgQWBBQx2rUT5yjPQlggz/3ZyZX3
-M+f9ezCB0gYDVR0jBIHKMIHHgBQp6TAw6QfJbahRbH0wUUDTCsQkgKGBq6SBqDCB
+AQUAA4GNADCBiQKBgQDX8PGzOwC+KjmJFt0yQktWhoLJOGGm63B4Jk4xjzvmdyDH
+5j/JvmWcE0ISPphG9NzyyPwl4aj/HnbyW9I+cDDwCWL2tjvEHdMGqYVsliBoPDyt
+phuK+KRJ5TDm9SGfnGaADgBbRLTgMj452p2z9QaEjURVkYnIKtEa9QrJWXTQCwID
+AQABo4IBAjCB/zAJBgNVHRMEAjAAMB0GA1UdDgQWBBSwXvCCiFZkA3R/pZSZaQHm
+C5px0jCB0gYDVR0jBIHKMIHHgBTSVj2UAS+Sfwe8xxjrQU51P1YA8aGBq6SBqDCB
 pTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUgU3RhdGUxEjAQBgNVBAcTCVNv
 bWV3aGVyZTEVMBMGA1UEChMMWW91ciBDb21wYW55MRQwEgYDVQQLEwtEZXZlbG9w
 bWVudDEjMCEGA1UEAxMaWW91ciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxGzAZBgkq
-hkiG9w0BCQEWDHlvdUBzb21lLm5ldIIBADANBgkqhkiG9w0BAQQFAAOCAQEARyQN
-+ozl7LX5EBuZSOC4X/1TDlxvYl8XOYzyuAjltut1LdxQYkL3mDMl7k24s3suua/g
-85e2aTtX2lSaZQ4vNcTCOWs9ZziNZbopbbDS/X7Q5cUKlSjNXPnDKUOeUxSI8T8r
-MR8p6ytl7WVm18cbO+1QFMPKaLVsizn0wIaTSbvP3vlwSuUcKaKFszBUryLBq5lO
-w1rTlznrU1sQ6urc+JSuZAREocT1rXVhDSmzqwdDoxGchklvxOGEsUMtzGfIHoFD
-Md/vdJ7Q5NEt5HfvE0UBcX8kunZTZW5L3arGdLLAHdnDniiayB7XWLPlO2F8QCid
-35yKX/LILvlTG/wumA==
+hkiG9w0BCQEWDHlvdUBzb21lLm5ldIIBADANBgkqhkiG9w0BAQQFAAOCAQEALBWG
+sOfl27wXdlMeU/KVaE9WvRk4EBxZt+URPdJhWbePFaIshmS7AhB7oWL2KI948AwM
+UnVlPQAPKUJ1YgadbrGTZjbACZnxlOEOPpkgq8cjCs9q0ofbZsXMI7baJnKROZ6Y
+MwFO4gv4YAMW0gQ665nr3rnSXvetsXE2hcUYxc3yZ3TusCHtBuh6OWUlrd+/w4/Z
+/MKr3clOXPrP2c5vtK4zDwKqYUTt3iwN8ZcFvpBkjI+ovm/1dQwLp/Un4Yk3t5eu
+8YfMG/l287loJ+laN1BzCGEhzTSideu9NB/FRQSb4dcE8WcM0dqoCRxKfcYuAI5w
+cIm4q1Y9SxgH0c3xFQ==
 -----END CERTIFICATE-----
diff --git a/cpp/test/IceSSL/certs/goodKey_1.pem b/cpp/test/IceSSL/certs/goodKey_1.pem
index 4cd966b1953..3edff333b55 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-----
-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=
+MIICXAIBAAKBgQDRbiJhIr+krxP/60B1gOE/hc1AaTRyJ0bGnwAg2dJcHvnp+Tvl
+DNiMtVwXj3A142ZzAYDyDlRrVPNA7ickn32b8eAOEv5WBtII7mfGPreXeS6EM6vB
+/nqrYegMId603QdK/+bjukTD0IRwn7Lx74QS0b+6YvhYG9oKHDzLjPRVTwIDAQAB
+AoGBAMiRnUNBsB/bvF+fwX/HCfF4BvXky2F31ARsSgcsFJY85EL7ei0GfG1lUukN
+af1x5q/FhORMbPTNypkoezxLslJmwyVjb1fl1sfZlYnZcDb9s+XoH/frehxoXHEV
+8IxkUJ81RJyqc2wYSBsVeok6kCJejkM12q45K3zSWCQzG/aBAkEA9N6Ua+upITiF
+/7osaoXwNGyUCCNTXuE7t0p1VVT2tufEZ8CLpYzlQwLxOL5qqHfodsA+D92Dvi7V
+A7KRs+vT3wJBANrzKpAZK+etU9AZFkSpZ4SJq0V3XcndC9+SJXLIOFQ949wm27cB
+CDkCW1bg0zhCr8kbHb7f4gGDopyOxHrpLJECQAVRG+nn+QkmoAo4caRyeg+5V9GB
+atsBivlk3X1X1e+Mwr/5905F6+hzlOdFgy1bRSnm7LINfkHP5IIrC2zbrwMCQBDH
+HXXZV/Hy6D9EDN7KFHKlkghKs1cqpyREsLXw/dAGxhUyrReC7rxfn9wycj0Xbxz8
+BPWBdnIjQiy5C/lXMOECQHB+6ZrJdAQJj/yjIG7x1mrR9HR7TkEoPAcL3y9+TsYX
+nQqtMwM8erF+8Ep8SSgRPlfmwhizaZ449NHyDe3PkYo=
 -----END RSA PRIVATE KEY-----
diff --git a/cpp/test/IceSSL/certs/goodKey_2.pem b/cpp/test/IceSSL/certs/goodKey_2.pem
index 7e4804b3a92..8978428f645 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-----
-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=
+MIICXgIBAAKBgQDX8PGzOwC+KjmJFt0yQktWhoLJOGGm63B4Jk4xjzvmdyDH5j/J
+vmWcE0ISPphG9NzyyPwl4aj/HnbyW9I+cDDwCWL2tjvEHdMGqYVsliBoPDytphuK
++KRJ5TDm9SGfnGaADgBbRLTgMj452p2z9QaEjURVkYnIKtEa9QrJWXTQCwIDAQAB
+AoGBAMz+0ATs42Sj4yDQUsZuhuSqJyhs3M9APPHis2J67kt4FeePHkkf9Yf4BEYb
+pCXgOIxG3o/7rJocSqEDKBDcIqdN4dODsSC5xjeIkBHEI3vDBBxXv929a1mjq/QN
+G/9/TGuYpuAK39PuP2i82o/rC0JBVtNdOYZzJCPjv99buzzBAkEA9thRbwe2mXcA
+0VBbz6Q3j6AIvj4EER+oEl1DaA6MXzhf5VZ6+WkP/jQVoWRclidMKytu5TLFB8DP
+ONKC9mMGqwJBAN/zNVaGKUNmYe4EZQ6i72ZUATiUZbrfXuJtbeX+jWWYgUmbydhS
+bCLTf1w/ZBQfV+7H25/2kEQ42+rAI87i3CECQQCdshx0Hi1dZVU0Y24D/RkxvD9Z
+qizW865f7Qz/ESxEOLOqw9DUPXZmI8gdzwwHMRvMCHdUHVcaWOcJmhLobOL5AkEA
+rlKcpDtOh158wE+/ckM2YsrlIGuzPGF/dHWF5E/fNMQfb3LLDY4rCnjjXKUje95i
+DkaYGM5OwiwYU4U42mQQwQJAcs6RrEgpxaMIiKYU/gvSGPmGlf84EbpmUtU+t53G
+F7rhRbkVpbZjT1tzNPwXpnc5F62giedgFJW4EaI5G+9A6w==
 -----END RSA PRIVATE KEY-----