diff --git a/programs/ssl/test-ca/client1.crt b/programs/ssl/test-ca/client1.crt
index 679bbea..4e0dd27 100644
--- a/programs/ssl/test-ca/client1.crt
+++ b/programs/ssl/test-ca/client1.crt
@@ -3,74 +3,75 @@
         Version: 3 (0x2)
         Serial Number: 3 (0x3)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: O=XySSL, CN=XySSL Test CA
+        Issuer: C=NL, O=PolarSSL, CN=PolarSSL Test CA
         Validity
-            Not Before: Nov 29 19:50:42 2007 GMT
-            Not After : Nov 28 19:50:42 2009 GMT
-        Subject: O=XySSL, CN=Test User 1
+            Not Before: Jan 14 22:43:40 2009 GMT
+            Not After : Jan 14 22:43:40 2011 GMT
+        Subject: C=NL, O=PolarSSL, CN=PolarSSL Client 1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:a7:2b:e9:c3:d5:68:7c:e7:4b:23:20:31:c8:0e:
-                    be:9f:c8:e6:b6:a7:09:c5:59:67:ab:6d:e9:f3:7e:
-                    b2:e7:3b:1c:99:28:33:e0:b8:e9:8b:ee:45:a3:de:
-                    91:f8:03:59:34:f1:b6:e0:b3:62:33:45:87:64:8e:
-                    59:d3:34:4f:f9:fb:3c:64:53:a2:f2:53:20:97:a3:
-                    2b:fe:6d:c4:f3:38:83:02:92:c8:cb:8f:9e:d9:d3:
-                    5e:87:36:ec:17:b3:50:5b:68:b7:03:04:e2:90:2f:
-                    d4:0e:48:40:b1:ad:11:28:de:8a:a9:4c:df:20:05:
-                    47:8a:ef:ba:24:09:fa:ec:f6:d4:f1:0f:a1:31:b7:
-                    f0:54:d5:d5:23:19:1e:41:6d:b7:96:17:81:ff:b3:
-                    1e:83:92:76:4b:7c:ce:b1:8f:18:b0:69:20:60:f9:
-                    41:8b:04:ae:89:84:a8:20:48:ae:f3:1f:50:ec:1c:
-                    61:97:bd:81:50:54:61:5d:23:c3:c2:84:ed:19:1b:
-                    ee:0f:22:38:28:de:51:04:41:6d:e1:82:43:76:e7:
-                    7b:40:fd:84:ea:9e:e8:d8:da:c2:72:c4:31:c6:b0:
-                    ca:ce:ac:7b:5c:fa:43:15:5f:41:1c:21:be:dc:96:
-                    95:d6:77:16:ef:1d:51:8d:10:65:aa:f5:9e:f8:47:
-                    6a:41
+                    00:de:b1:57:8f:86:00:c3:84:99:f9:36:ba:c1:3b:
+                    7e:f8:0e:ff:0b:ee:73:e1:4a:69:2b:8f:2e:e6:cf:
+                    6e:ca:9c:4a:e6:c3:16:5c:e2:20:0f:ea:23:f2:ef:
+                    8f:21:94:42:f7:ec:d4:12:11:3f:1f:e1:9b:96:35:
+                    ff:1c:4a:b1:ec:cc:31:09:ba:5a:17:bd:7c:4d:6e:
+                    de:64:f9:ee:25:2a:a4:da:66:41:e0:f7:a7:05:1b:
+                    aa:0f:16:ff:00:40:bf:0a:10:90:56:d3:60:0e:ec:
+                    1b:c4:fc:99:73:e7:59:87:8f:f9:bb:27:d8:67:e7:
+                    67:0e:21:04:53:e9:ff:5e:8d:d8:34:7c:e7:b4:5c:
+                    18:85:3c:d3:80:d5:76:b6:0c:7d:87:15:fa:97:1e:
+                    87:bc:fe:ee:22:0c:44:6c:4a:25:f9:08:16:ab:92:
+                    a4:f0:4a:d8:82:d6:2a:0c:21:63:81:4d:a8:32:c0:
+                    7f:98:b0:04:3f:64:4c:15:5c:60:fc:b0:c0:e9:69:
+                    e5:06:61:f3:56:85:9a:ad:e5:8c:8c:72:5d:d0:81:
+                    25:46:ae:6c:0a:d6:64:74:2f:86:b3:08:3b:fe:eb:
+                    1b:9c:e0:41:fa:e7:24:aa:aa:e1:d2:3c:bf:54:34:
+                    28:2c:bf:92:5a:cd:81:65:c7:da:73:61:be:7a:f6:
+                    e8:b1
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                F2:C4:96:02:CF:BF:C1:AA:B0:D2:1A:DA:E7:F3:4B:2C:5D:D1:DF:14
+                AA:27:5F:B4:17:D6:BA:24:04:E5:D3:8D:83:AC:65:5D:EB:9D:7E:74
             X509v3 Authority Key Identifier: 
-                keyid:F2:67:B1:5D:5F:51:5E:DA:51:89:E9:D9:E9:6B:CA:8B:AF:A5:2E:69
+                keyid:80:EE:21:48:46:6B:56:EA:9D:71:32:06:64:2F:4C:C1:B4:2D:A9:2E
 
     Signature Algorithm: sha1WithRSAEncryption
-        ca:29:3f:44:90:8d:9c:c6:0d:f9:e2:a9:50:d8:e5:d6:0a:e0:
-        be:6e:48:fb:e8:7a:f4:5f:50:dc:6b:d1:76:a5:f9:88:91:96:
-        62:e5:66:89:da:eb:17:01:f7:d0:d2:f7:3b:35:78:dd:80:45:
-        d0:64:32:13:67:20:a8:fc:d8:62:e1:44:d4:ae:41:37:2e:e7:
-        63:94:37:66:61:3b:38:e9:7d:8a:b6:18:d4:b7:2c:59:ea:46:
-        a0:ed:ab:84:79:04:be:da:0f:9e:2d:68:34:a0:06:63:fa:33:
-        61:bc:8a:00:07:62:c3:81:11:0d:28:d9:80:8f:51:a2:db:be:
-        23:16:a4:37:65:18:72:34:17:c2:a9:63:e3:5f:f4:0e:7c:58:
-        5e:e4:a5:44:8f:6b:23:ba:18:4e:e3:0c:25:2a:86:ee:5d:c2:
-        a2:e7:92:8d:a8:84:77:ef:b5:9c:af:2c:53:5d:4c:1b:eb:96:
-        a4:56:27:f5:bf:cb:82:91:51:6e:8a:f4:49:6a:84:39:44:a3:
-        23:7e:d0:83:ce:2b:4a:5f:18:1b:d1:1f:74:14:6f:91:da:1a:
-        ee:95:1d:ee:c7:9e:77:a2:df:1c:22:72:c2:08:bc:98:60:a0:
-        d6:5f:eb:d8:e8:ad:b3:f5:05:c4:1a:9b:a9:8d:29:83:7e:26:
-        62:fa:e3:79
+        93:30:e0:12:65:5a:d8:5b:b8:2d:04:f9:74:b6:4a:40:c5:eb:
+        3e:c3:2d:6a:67:bf:08:cc:c1:89:21:fd:7f:8f:55:37:b5:bc:
+        27:9d:9b:99:cd:6f:43:f4:90:30:d9:49:68:91:58:ec:8f:5d:
+        55:ce:35:63:16:08:dc:ca:8a:f7:e2:9d:84:f9:6d:ae:e1:94:
+        6b:11:0d:26:da:3d:60:0b:8b:9b:5d:c8:76:6a:a2:f9:e3:61:
+        28:48:d6:0f:8e:aa:bf:65:76:82:c6:6a:e9:23:25:e3:f0:60:
+        43:98:62:64:81:cd:02:a9:a1:16:2c:33:18:e1:15:bd:cf:bf:
+        e2:0d:3e:fe:a3:5f:33:35:64:18:13:fd:76:71:a7:71:9d:8b:
+        e3:35:39:19:f3:4a:5a:0f:5a:c5:ed:63:82:f7:fd:73:94:ba:
+        20:ba:29:8f:2d:18:10:fd:2d:b6:cb:9d:49:8e:07:b8:75:34:
+        f4:63:a6:03:5b:73:76:82:a3:1c:16:c5:2a:6e:d1:92:d6:c0:
+        13:b1:92:f9:2a:74:a1:ae:5f:08:6f:16:d7:43:60:51:37:76:
+        aa:51:9f:44:fb:b5:35:0e:c2:3f:62:31:7a:b4:04:2b:29:96:
+        cc:98:32:2d:13:42:69:b4:79:72:6e:a9:ad:ed:6a:83:ce:6c:
+        9a:13:b0:87
 -----BEGIN CERTIFICATE-----
-MIIDFjCCAf6gAwIBAgIBAzANBgkqhkiG9w0BAQUFADAoMQ4wDAYDVQQKEwVYeVNT
-TDEWMBQGA1UEAxMNWHlTU0wgVGVzdCBDQTAeFw0wNzExMjkxOTUwNDJaFw0wOTEx
-MjgxOTUwNDJaMCYxDjAMBgNVBAoTBVh5U1NMMRQwEgYDVQQDEwtUZXN0IFVzZXIg
-MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcr6cPVaHznSyMgMcgO
-vp/I5ranCcVZZ6tt6fN+suc7HJkoM+C46YvuRaPekfgDWTTxtuCzYjNFh2SOWdM0
-T/n7PGRTovJTIJejK/5txPM4gwKSyMuPntnTXoc27BezUFtotwME4pAv1A5IQLGt
-ESjeiqlM3yAFR4rvuiQJ+uz21PEPoTG38FTV1SMZHkFtt5YXgf+zHoOSdkt8zrGP
-GLBpIGD5QYsEromEqCBIrvMfUOwcYZe9gVBUYV0jw8KE7Rkb7g8iOCjeUQRBbeGC
-Q3bne0D9hOqe6NjawnLEMcawys6se1z6QxVfQRwhvtyWldZ3Fu8dUY0QZar1nvhH
-akECAwEAAaNNMEswCQYDVR0TBAIwADAdBgNVHQ4EFgQU8sSWAs+/waqw0hra5/NL
-LF3R3xQwHwYDVR0jBBgwFoAU8mexXV9RXtpRienZ6WvKi6+lLmkwDQYJKoZIhvcN
-AQEFBQADggEBAMopP0SQjZzGDfniqVDY5dYK4L5uSPvoevRfUNxr0Xal+YiRlmLl
-Zona6xcB99DS9zs1eN2ARdBkMhNnIKj82GLhRNSuQTcu52OUN2ZhOzjpfYq2GNS3
-LFnqRqDtq4R5BL7aD54taDSgBmP6M2G8igAHYsOBEQ0o2YCPUaLbviMWpDdlGHI0
-F8KpY+Nf9A58WF7kpUSPayO6GE7jDCUqhu5dwqLnko2ohHfvtZyvLFNdTBvrlqRW
-J/W/y4KRUW6K9ElqhDlEoyN+0IPOK0pfGBvRH3QUb5HaGu6VHe7Hnnei3xwicsII
-vJhgoNZf69jorbP1BcQam6mNKYN+JmL643k=
+MIIDPzCCAiegAwIBAgIBAzANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER
+MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN
+MDkwMTE0MjI0MzQwWhcNMTEwMTE0MjI0MzQwWjA8MQswCQYDVQQGEwJOTDERMA8G
+A1UEChMIUG9sYXJTU0wxGjAYBgNVBAMTEVBvbGFyU1NMIENsaWVudCAxMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3rFXj4YAw4SZ+Ta6wTt++A7/C+5z
+4UppK48u5s9uypxK5sMWXOIgD+oj8u+PIZRC9+zUEhE/H+GbljX/HEqx7MwxCbpa
+F718TW7eZPnuJSqk2mZB4PenBRuqDxb/AEC/ChCQVtNgDuwbxPyZc+dZh4/5uyfY
+Z+dnDiEEU+n/Xo3YNHzntFwYhTzTgNV2tgx9hxX6lx6HvP7uIgxEbEol+QgWq5Kk
+8ErYgtYqDCFjgU2oMsB/mLAEP2RMFVxg/LDA6WnlBmHzVoWareWMjHJd0IElRq5s
+CtZkdC+Gswg7/usbnOBB+uckqqrh0jy/VDQoLL+SWs2BZcfac2G+evbosQIDAQAB
+o00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBSqJ1+0F9a6JATl042DrGVd651+dDAf
+BgNVHSMEGDAWgBSA7iFIRmtW6p1xMgZkL0zBtC2pLjANBgkqhkiG9w0BAQUFAAOC
+AQEAkzDgEmVa2Fu4LQT5dLZKQMXrPsMtame/CMzBiSH9f49VN7W8J52bmc1vQ/SQ
+MNlJaJFY7I9dVc41YxYI3MqK9+KdhPltruGUaxENJto9YAuLm13Idmqi+eNhKEjW
+D46qv2V2gsZq6SMl4/BgQ5hiZIHNAqmhFiwzGOEVvc+/4g0+/qNfMzVkGBP9dnGn
+cZ2L4zU5GfNKWg9axe1jgvf9c5S6ILopjy0YEP0ttsudSY4HuHU09GOmA1tzdoKj
+HBbFKm7RktbAE7GS+Sp0oa5fCG8W10NgUTd2qlGfRPu1NQ7CP2IxerQEKymWzJgy
+LRNCabR5cm6pre1qg85smhOwhw==
 -----END CERTIFICATE-----
diff --git a/programs/ssl/test-ca/client1.key b/programs/ssl/test-ca/client1.key
index 1b78404..257be4e 100644
--- a/programs/ssl/test-ca/client1.key
+++ b/programs/ssl/test-ca/client1.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/programs/ssl/test-ca/client2.crt b/programs/ssl/test-ca/client2.crt
index 14a90ca..f9d8eb6 100644
--- a/programs/ssl/test-ca/client2.crt
+++ b/programs/ssl/test-ca/client2.crt
@@ -3,74 +3,75 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: O=XySSL, CN=XySSL Test CA
+        Issuer: C=NL, O=PolarSSL, CN=PolarSSL Test CA
         Validity
-            Not Before: Nov 29 19:50:48 2007 GMT
-            Not After : Nov 28 19:50:48 2009 GMT
-        Subject: O=XySSL, CN=Test User 2
+            Not Before: Jan 14 22:43:42 2009 GMT
+            Not After : Jan 14 22:43:42 2011 GMT
+        Subject: C=NL, O=PolarSSL, CN=PolarSSL Client 2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:e5:7b:e1:94:06:e5:dd:20:0a:0d:6a:4f:9e:2c:
-                    43:ea:74:f8:af:90:ab:60:7e:45:17:27:d9:1b:1d:
-                    90:44:97:42:45:67:22:32:d5:eb:97:4e:76:ef:45:
-                    99:3f:80:29:c5:45:94:7d:43:c0:0b:01:bd:ac:9c:
-                    9d:cf:ff:3f:ea:1e:04:1c:2a:70:94:ff:6b:d1:63:
-                    6f:cd:b0:5f:1d:bf:d6:45:f2:e1:32:17:18:87:b4:
-                    79:39:52:01:23:50:5d:8d:10:89:02:c7:e8:a8:67:
-                    a5:14:41:0f:1a:d7:25:2b:91:f8:6a:c6:5d:e3:b0:
-                    fe:30:7c:47:56:95:93:e1:e8:e4:74:e5:1f:bf:00:
-                    32:49:8e:f7:1d:29:07:68:4c:8e:ca:6f:84:96:37:
-                    37:3d:ee:92:1d:15:b3:18:30:ef:a0:46:b1:6e:7b:
-                    ec:d4:a6:27:8d:11:f9:35:31:9c:91:04:c8:e2:8a:
-                    ac:4f:cb:b4:49:b0:92:2b:82:59:4e:69:00:62:51:
-                    4f:5d:10:72:54:03:5c:24:39:8a:fb:39:6b:c1:da:
-                    84:10:15:c3:04:cb:31:26:91:b8:0a:b1:b5:32:69:
-                    ec:0f:64:a7:51:53:dc:64:13:b1:c2:ec:fc:55:0a:
-                    d8:f5:22:e7:c4:d9:4f:73:8d:85:b6:cc:8b:2a:51:
-                    76:e3
+                    00:ba:70:94:3f:4d:d7:04:0b:5b:61:ea:21:8d:1d:
+                    c2:8c:b5:df:6e:85:b0:14:41:b6:79:4e:90:87:78:
+                    99:9f:65:8e:78:80:63:51:fd:a2:de:31:4b:c3:be:
+                    dc:d5:fd:b2:ba:44:32:d5:a9:62:41:cc:7a:87:ef:
+                    57:21:2c:93:15:2d:68:95:7e:c1:ce:ab:e7:ed:45:
+                    6a:cf:9c:b6:ef:46:a0:10:25:a7:e1:21:d6:bd:bf:
+                    6f:9a:51:4f:21:2f:6a:b1:bd:89:a3:df:fb:36:ee:
+                    d6:0f:c1:c8:af:f9:47:dc:0f:76:a5:ad:b3:36:db:
+                    a2:4f:bf:fa:41:6a:d4:b4:97:81:49:42:d6:fd:8d:
+                    a1:e7:92:ba:fd:99:f6:42:9e:e8:5e:db:e0:bf:90:
+                    4c:ea:e3:81:df:22:24:a4:3c:74:05:24:c3:67:78:
+                    ee:00:03:75:99:4a:ae:e5:4c:8b:a9:49:5b:15:ce:
+                    4a:0a:ee:b9:df:e1:8a:61:e0:ae:1e:96:5a:15:07:
+                    e9:99:e0:11:08:f8:b2:3e:8f:fa:53:3b:e0:7f:56:
+                    34:bf:e2:3f:1a:d8:d4:69:4f:f4:e5:09:b2:3e:96:
+                    a9:9b:0c:6f:f4:46:d1:37:12:1d:b2:a7:16:05:0c:
+                    15:ec:88:64:a1:6e:0e:b2:77:2f:a9:f3:df:b1:03:
+                    2d:03
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                72:A9:55:09:13:A6:61:1E:1D:9F:00:BA:AF:93:D9:8D:69:86:1D:20
+                0A:D7:6D:86:0B:FA:78:67:00:E5:D0:79:80:58:06:4F:A7:D3:DD:B2
             X509v3 Authority Key Identifier: 
-                keyid:F2:67:B1:5D:5F:51:5E:DA:51:89:E9:D9:E9:6B:CA:8B:AF:A5:2E:69
+                keyid:80:EE:21:48:46:6B:56:EA:9D:71:32:06:64:2F:4C:C1:B4:2D:A9:2E
 
     Signature Algorithm: sha1WithRSAEncryption
-        68:32:9c:c5:ea:15:03:a3:2a:5b:e0:3b:ef:02:72:72:5e:5f:
-        57:b3:32:1f:a8:46:93:33:38:75:92:5f:41:e3:99:97:3a:f2:
-        0d:7d:2b:71:81:31:a7:ff:15:28:e8:f1:fe:d4:c1:83:2b:0b:
-        1a:1b:6c:b3:81:01:e1:4c:77:51:8b:09:2d:7f:da:52:2c:f5:
-        9e:38:a7:59:b8:cc:dc:f5:42:d4:3f:7f:22:96:7e:4a:89:f0:
-        cc:6e:77:f0:ee:79:d3:82:20:7a:0c:17:e2:c8:14:77:81:cd:
-        bf:34:27:76:7c:c2:eb:4f:93:dd:0a:a3:ee:2e:b9:f6:8a:d2:
-        7f:0b:f0:69:0f:90:05:6e:d6:ca:23:91:6d:38:68:28:2b:c7:
-        2d:99:17:c7:2a:1b:a6:1b:78:ea:68:56:cb:2e:83:d4:98:54:
-        1f:a5:77:cd:88:59:9c:bd:a2:88:70:4e:f4:68:f0:0e:70:45:
-        9c:c0:ef:d4:48:f0:14:cc:24:b5:47:40:08:07:2f:df:78:0b:
-        0b:50:f6:49:85:41:8c:48:12:78:3a:67:67:d9:82:09:0f:54:
-        a5:fe:14:7c:d4:21:60:a2:45:2b:ea:97:df:38:cc:f5:5a:cd:
-        4d:62:5a:a1:cf:51:cb:93:36:2e:c7:17:ec:77:89:06:f2:c9:
-        55:70:96:f3
+        58:fc:d6:71:a8:c2:4e:d8:38:17:38:f1:33:9b:96:62:4a:15:
+        6b:f9:63:03:a7:21:b0:2a:75:18:16:fc:86:6d:84:86:a7:81:
+        8c:a7:86:fa:34:74:ed:ef:e4:bd:09:29:00:ea:ae:fd:52:2e:
+        20:b4:fd:93:af:de:fd:b8:b1:a0:4a:d7:01:9b:a1:3f:6d:be:
+        06:cf:c1:52:32:52:cd:23:6c:0b:d1:0c:04:cb:01:b0:e8:d8:
+        f9:8d:fd:35:18:16:f0:3b:cb:40:ee:ae:57:af:e8:ce:5c:2c:
+        57:18:c1:bd:29:bf:92:03:14:dd:4f:bd:fd:04:7f:d6:ea:52:
+        5b:6b:4f:1e:a8:a4:b2:ed:42:e6:08:42:c9:b1:c7:fc:d2:34:
+        35:5d:72:32:89:32:cf:84:a5:a1:ac:c0:6f:f9:c3:4e:40:96:
+        a8:15:14:0a:a3:42:d6:b1:d8:bb:99:20:f5:7c:c2:cc:09:92:
+        a7:33:2c:ed:80:d6:23:32:99:7b:13:d1:a0:67:05:78:35:0d:
+        b3:7a:93:80:ea:d7:d2:7c:e4:74:00:03:04:7d:d6:c0:c1:78:
+        d1:84:7f:19:b9:ec:9c:d5:81:fc:25:13:16:36:bd:bc:1c:56:
+        c9:f8:82:90:ef:21:ea:58:f9:ab:61:a4:cd:fb:f3:a5:07:70:
+        1b:03:71:52
 -----BEGIN CERTIFICATE-----
-MIIDFjCCAf6gAwIBAgIBBDANBgkqhkiG9w0BAQUFADAoMQ4wDAYDVQQKEwVYeVNT
-TDEWMBQGA1UEAxMNWHlTU0wgVGVzdCBDQTAeFw0wNzExMjkxOTUwNDhaFw0wOTEx
-MjgxOTUwNDhaMCYxDjAMBgNVBAoTBVh5U1NMMRQwEgYDVQQDEwtUZXN0IFVzZXIg
-MjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOV74ZQG5d0gCg1qT54s
-Q+p0+K+Qq2B+RRcn2RsdkESXQkVnIjLV65dOdu9FmT+AKcVFlH1DwAsBvaycnc//
-P+oeBBwqcJT/a9Fjb82wXx2/1kXy4TIXGIe0eTlSASNQXY0QiQLH6KhnpRRBDxrX
-JSuR+GrGXeOw/jB8R1aVk+Ho5HTlH78AMkmO9x0pB2hMjspvhJY3Nz3ukh0Vsxgw
-76BGsW577NSmJ40R+TUxnJEEyOKKrE/LtEmwkiuCWU5pAGJRT10QclQDXCQ5ivs5
-a8HahBAVwwTLMSaRuAqxtTJp7A9kp1FT3GQTscLs/FUK2PUi58TZT3ONhbbMiypR
-duMCAwEAAaNNMEswCQYDVR0TBAIwADAdBgNVHQ4EFgQUcqlVCROmYR4dnwC6r5PZ
-jWmGHSAwHwYDVR0jBBgwFoAU8mexXV9RXtpRienZ6WvKi6+lLmkwDQYJKoZIhvcN
-AQEFBQADggEBAGgynMXqFQOjKlvgO+8CcnJeX1ezMh+oRpMzOHWSX0HjmZc68g19
-K3GBMaf/FSjo8f7UwYMrCxobbLOBAeFMd1GLCS1/2lIs9Z44p1m4zNz1QtQ/fyKW
-fkqJ8Mxud/DuedOCIHoMF+LIFHeBzb80J3Z8wutPk90Ko+4uufaK0n8L8GkPkAVu
-1sojkW04aCgrxy2ZF8cqG6YbeOpoVssug9SYVB+ld82IWZy9oohwTvRo8A5wRZzA
-79RI8BTMJLVHQAgHL994CwtQ9kmFQYxIEng6Z2fZggkPVKX+FHzUIWCiRSvql984
-zPVazU1iWqHPUcuTNi7HF+x3iQbyyVVwlvM=
+MIIDPzCCAiegAwIBAgIBBDANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER
+MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN
+MDkwMTE0MjI0MzQyWhcNMTEwMTE0MjI0MzQyWjA8MQswCQYDVQQGEwJOTDERMA8G
+A1UEChMIUG9sYXJTU0wxGjAYBgNVBAMTEVBvbGFyU1NMIENsaWVudCAyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAunCUP03XBAtbYeohjR3CjLXfboWw
+FEG2eU6Qh3iZn2WOeIBjUf2i3jFLw77c1f2yukQy1aliQcx6h+9XISyTFS1olX7B
+zqvn7UVqz5y270agECWn4SHWvb9vmlFPIS9qsb2Jo9/7Nu7WD8HIr/lH3A92pa2z
+NtuiT7/6QWrUtJeBSULW/Y2h55K6/Zn2Qp7oXtvgv5BM6uOB3yIkpDx0BSTDZ3ju
+AAN1mUqu5UyLqUlbFc5KCu653+GKYeCuHpZaFQfpmeARCPiyPo/6Uzvgf1Y0v+I/
+GtjUaU/05QmyPpapmwxv9EbRNxIdsqcWBQwV7IhkoW4OsncvqfPfsQMtAwIDAQAB
+o00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQK122GC/p4ZwDl0HmAWAZPp9PdsjAf
+BgNVHSMEGDAWgBSA7iFIRmtW6p1xMgZkL0zBtC2pLjANBgkqhkiG9w0BAQUFAAOC
+AQEAWPzWcajCTtg4FzjxM5uWYkoVa/ljA6chsCp1GBb8hm2EhqeBjKeG+jR07e/k
+vQkpAOqu/VIuILT9k6/e/bixoErXAZuhP22+Bs/BUjJSzSNsC9EMBMsBsOjY+Y39
+NRgW8DvLQO6uV6/ozlwsVxjBvSm/kgMU3U+9/QR/1upSW2tPHqiksu1C5ghCybHH
+/NI0NV1yMokyz4SloazAb/nDTkCWqBUUCqNC1rHYu5kg9XzCzAmSpzMs7YDWIzKZ
+exPRoGcFeDUNs3qTgOrX0nzkdAADBH3WwMF40YR/GbnsnNWB/CUTFja9vBxWyfiC
+kO8h6lj5q2GkzfvzpQdwGwNxUg==
 -----END CERTIFICATE-----
diff --git a/programs/ssl/test-ca/client2.key b/programs/ssl/test-ca/client2.key
index 8696e10..c773382 100644
--- a/programs/ssl/test-ca/client2.key
+++ b/programs/ssl/test-ca/client2.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/programs/ssl/test-ca/client2.pfx b/programs/ssl/test-ca/client2.pfx
index 9d7c25c..30c7ebe 100644
--- a/programs/ssl/test-ca/client2.pfx
+++ b/programs/ssl/test-ca/client2.pfx
Binary files differ
diff --git a/programs/ssl/test-ca/crl.pem b/programs/ssl/test-ca/crl.pem
index 87b42ba..a351fa4 100644
--- a/programs/ssl/test-ca/crl.pem
+++ b/programs/ssl/test-ca/crl.pem
@@ -1,11 +1,11 @@
 -----BEGIN X509 CRL-----
-MIIBmDCBgTANBgkqhkiG9w0BAQUFADAoMQ4wDAYDVQQKEwVYeVNTTDEWMBQGA1UE
-AxMNWHlTU0wgVGVzdCBDQRcNMDcxMTI5MTk1MTA4WhcNMDgwMTI4MTk1MTA4WjAo
-MBICAQEXDTA3MTEyOTE5NTA1N1owEgIBAxcNMDcxMTI5MTk1MTAxWjANBgkqhkiG
-9w0BAQUFAAOCAQEATos7dzWxTxm51ZbI48LRseHgz/976mt/E1UZ5WoeoFMmW9qG
-oGmRexrfgzABz1s0S+fjunSibH5lPN4WLTTQ5vY/wzbLFE/ysXMB82b7EVf0fdVC
-9V1805XVOfSr5CBYTdTk1XQ8/ihKHi+TEJMGgXjC4V09qVrKVXO3dmD71MAr4Bcv
-n9ZSWnXuAIELyGfZaHrPjQf9cGc1awsFfdBbkmFrEOuL3Q7oKLae2oENknSWcMhy
-cJTkQuzNI2HwCzR2U1TA4YUrPuNTLaQ58FiI0hEFjTjtgreMirqn9LROJjKzb/xs
-Afi6pbrGefpkTZEZsnbvXxCKcej1tRYjCfgoIQ==
+MIIBqzCBlDANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDERMA8GA1UEChMI
+UG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EXDTA5MDExNDIyNDM0
+N1oXDTA5MDMxNTIyNDM0N1owKDASAgEBFw0wOTAxMTQyMjQzNDVaMBICAQMXDTA5
+MDExNDIyNDM0NlowDQYJKoZIhvcNAQEFBQADggEBALhEPg5YVSK4l1BMRa0HNkrn
+FuBGc4tFUhM4kiw397tcOKF5DMEslmV3BwsmeX71BoQoD6V1HNoqb4vEBVmGgKq6
++WH2GVBusiBNj8V/SjWS6lpMGPJ+XuNPky4R6CB7bulh7je41g42cXuHF1L623Nn
+nDTdpD9+L5p5NkM2mxMcwF2afTssZZTpWi/b4CG17UTbrUQOlw215vIyc7/6Iaeq
+cYfDGk3970SwpWJvR/0lOzFtm30wwld6GYMlg0P6rC3KYJdyJE3LeblBAP8W9tdb
+Gvn5Rnf6VU58npBfQ+BeMUN/5h6yvA9pGak9HRjaZ1RxuGNreQ1Mb7i0vgO0/SM=
 -----END X509 CRL-----
diff --git a/programs/ssl/test-ca/index b/programs/ssl/test-ca/index
index f14f2ef..0745702 100644
--- a/programs/ssl/test-ca/index
+++ b/programs/ssl/test-ca/index
@@ -1,4 +1,4 @@
-R	091128195030Z	071129195057Z	01	unknown	/O=XySSL/CN=server1.test
-V	091128195038Z		02	unknown	/O=XySSL/CN=localhost
-R	091128195042Z	071129195101Z	03	unknown	/O=XySSL/CN=Test User 1
-V	091128195048Z		04	unknown	/O=XySSL/CN=Test User 2
+R	110114224335Z	090114224345Z	01	unknown	/C=NL/O=PolarSSL/CN=PolarSSL Server 1
+V	110114224338Z		02	unknown	/C=NL/O=PolarSSL/CN=PolarSSL Server 2
+R	110114224340Z	090114224346Z	03	unknown	/C=NL/O=PolarSSL/CN=PolarSSL Client 1
+V	110114224342Z		04	unknown	/C=NL/O=PolarSSL/CN=PolarSSL Client 2
diff --git a/programs/ssl/test-ca/newcerts/01.pem b/programs/ssl/test-ca/newcerts/01.pem
index fb7dcd4..730b82f 100644
--- a/programs/ssl/test-ca/newcerts/01.pem
+++ b/programs/ssl/test-ca/newcerts/01.pem
@@ -3,74 +3,75 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: O=XySSL, CN=XySSL Test CA
+        Issuer: C=NL, O=PolarSSL, CN=PolarSSL Test CA
         Validity
-            Not Before: Nov 29 19:50:30 2007 GMT
-            Not After : Nov 28 19:50:30 2009 GMT
-        Subject: O=XySSL, CN=server1.test
+            Not Before: Jan 14 22:43:35 2009 GMT
+            Not After : Jan 14 22:43:35 2011 GMT
+        Subject: C=NL, O=PolarSSL, CN=PolarSSL Server 1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:c6:ca:48:5e:2b:f2:79:4b:32:0c:38:01:e1:4c:
-                    1c:d1:24:bb:ea:de:b8:2f:fb:7a:01:da:4b:3c:13:
-                    0b:d1:12:c0:69:dc:f3:37:2b:fd:b7:a3:b7:49:f2:
-                    57:c2:6d:f8:be:90:f6:7e:fa:80:37:89:17:b8:4c:
-                    85:22:36:f4:36:51:9f:91:6b:48:01:9e:bb:e6:8e:
-                    99:be:ab:45:01:c2:6f:f0:0f:ad:22:ba:83:06:38:
-                    aa:b2:3c:e7:f4:aa:c9:32:30:32:db:1c:1a:96:87:
-                    eb:2f:53:0d:97:2d:75:3c:bc:75:74:e5:04:51:67:
-                    4e:4e:81:d0:00:4c:ff:47:e7:c3:ca:1f:5d:1c:65:
-                    00:89:0b:d2:78:a5:d3:d2:8f:5c:f8:fe:e5:54:9d:
-                    64:83:bc:12:dc:38:cc:b4:68:3e:2b:c6:b9:d0:ef:
-                    b1:e8:bc:cf:5a:b5:b3:1f:47:0a:b1:0f:79:06:97:
-                    73:3b:75:f0:6e:26:1d:36:88:4a:e9:64:b6:e6:58:
-                    f8:92:12:a6:7c:08:cc:7b:69:47:6e:c6:65:ae:d8:
-                    31:39:30:3d:ca:0a:4b:2c:c2:01:3e:e9:05:c6:6e:
-                    1f:ce:38:21:22:f4:f5:00:1e:18:0e:d5:48:1a:6e:
-                    d5:22:82:af:be:09:a7:47:03:0b:d3:4d:52:5e:34:
-                    d1:15
+                    00:ad:68:ba:12:67:43:a7:11:2c:e0:d8:d7:a1:9b:
+                    89:af:a7:a3:92:2f:20:57:e9:bc:ae:89:f8:7c:86:
+                    00:48:08:cb:0b:b6:fc:d0:08:e7:fb:14:67:e4:2b:
+                    68:b2:0e:7e:01:d0:01:f7:22:2a:43:67:48:2b:88:
+                    5c:af:8c:1a:d2:4d:cf:18:c2:3e:e1:15:22:bc:d4:
+                    b1:7c:7c:b8:73:f3:ca:11:d2:3d:df:7d:c4:bd:fb:
+                    f2:fd:bb:e6:4e:ce:8d:c4:1b:c2:2a:e0:44:17:be:
+                    35:3e:25:db:d8:b0:98:9e:1d:68:38:fe:99:2a:5f:
+                    2b:e7:d0:52:4a:bf:f7:ed:6d:b3:14:b5:4f:c5:05:
+                    f3:06:2e:2f:b1:2b:9b:c7:fa:c7:4d:a6:16:60:f7:
+                    b2:e7:be:9a:b0:db:8d:eb:38:7a:2e:e1:26:25:36:
+                    08:9a:d9:7b:60:76:c4:7d:34:b3:b4:7e:ea:0b:a3:
+                    5d:5d:e1:12:88:d8:82:a1:25:25:44:de:11:48:46:
+                    a4:ab:13:df:e3:88:b0:b1:84:77:ce:0d:00:48:bb:
+                    aa:46:0b:13:08:9e:51:69:dc:ad:e6:c5:9b:97:d1:
+                    2c:5a:c4:06:fe:c0:4f:e2:7a:82:ac:3e:a7:0d:6a:
+                    54:0c:46:80:a4:c7:e9:29:a4:f3:cd:93:d3:e0:b4:
+                    38:15
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                F7:AB:E7:C0:58:5F:E0:01:C5:A4:26:83:44:CC:1E:7A:91:C9:44:65
+                D4:F8:74:59:8B:5F:AE:67:1C:33:7B:4B:F2:D4:EF:82:6A:E6:21:08
             X509v3 Authority Key Identifier: 
-                keyid:F2:67:B1:5D:5F:51:5E:DA:51:89:E9:D9:E9:6B:CA:8B:AF:A5:2E:69
+                keyid:80:EE:21:48:46:6B:56:EA:9D:71:32:06:64:2F:4C:C1:B4:2D:A9:2E
 
     Signature Algorithm: sha1WithRSAEncryption
-        06:9b:8d:63:8c:bb:8a:2b:1a:87:ae:3a:27:34:bc:24:60:f0:
-        95:12:0e:f5:4c:e6:e4:1f:bd:e2:83:a3:d4:1e:dd:ed:8e:c1:
-        93:bc:e6:20:96:34:65:73:ac:bb:85:64:54:49:53:82:da:27:
-        8d:86:e5:a3:12:a5:b6:8e:c6:40:87:0b:1a:a4:02:fe:47:a9:
-        bf:36:39:b1:54:a7:63:1f:92:b2:1a:4f:9e:05:98:e6:f5:b1:
-        16:fb:47:bb:57:1f:31:35:8e:f8:36:d1:36:48:6a:25:c8:0e:
-        1c:3d:02:90:cd:cd:1e:68:d2:af:09:e2:69:51:ce:3a:11:67:
-        20:40:44:c9:9a:4d:9c:3c:af:07:22:dc:99:77:71:40:46:d7:
-        fe:3c:00:30:fc:67:50:89:73:aa:04:4c:ef:e2:44:c1:2e:88:
-        83:89:83:80:47:88:47:ca:1b:db:67:7e:e7:a8:0a:54:b8:72:
-        f4:96:3f:eb:c1:ba:21:c1:fe:07:eb:ce:4d:b0:80:d6:d9:cf:
-        2d:e9:8e:c2:2f:6f:cc:8b:a9:13:fd:48:50:5e:2f:86:cd:9e:
-        8b:ad:16:7f:69:ab:b7:7b:7f:c6:d8:49:f8:06:d0:8a:37:71:
-        75:d8:4f:3f:02:29:3e:9e:29:cc:f6:e7:c3:10:42:77:6c:34:
-        63:f3:be:57
+        82:5b:53:0c:3c:00:13:cd:05:af:be:47:aa:b1:4a:f4:00:da:
+        d3:95:91:ef:97:6a:a8:c4:01:b9:33:6f:9f:d7:7f:6e:32:d6:
+        64:2d:49:d7:fd:d9:98:c2:7b:81:2d:2e:0a:a4:49:69:97:ea:
+        6e:3b:65:f4:5a:9e:a8:e0:b6:51:53:37:b9:d2:e3:07:8b:5d:
+        03:7c:4a:a8:75:c9:2f:c3:e7:78:bf:00:78:a2:64:b9:59:ee:
+        9c:0d:36:c7:f8:1a:66:91:c7:c9:50:c1:9a:8d:f3:59:9e:38:
+        35:6b:81:9f:74:28:37:47:29:c4:24:dc:64:3e:0a:51:17:26:
+        e9:3e:01:0a:8e:9c:15:a0:8d:5c:82:3d:11:f6:3a:20:d7:30:
+        f8:ed:7b:24:54:4a:8a:93:57:9d:6f:bc:d0:28:f3:86:7c:9e:
+        28:b5:95:2d:96:59:35:b2:9b:ae:5b:a6:4b:ad:52:e0:8a:04:
+        f4:5f:11:ed:14:1e:66:83:77:80:c3:d7:9d:fe:93:35:16:0a:
+        d1:9e:12:28:10:35:f4:b9:6b:7c:00:fe:7f:4c:80:c8:f6:e0:
+        95:92:8c:7d:5f:5c:a2:33:76:c9:32:3a:3d:87:68:30:e9:ff:
+        ca:42:ff:a5:c0:df:24:c1:40:78:65:8c:fa:70:4b:f7:79:aa:
+        9b:61:70:f5
 -----BEGIN CERTIFICATE-----
-MIIDFzCCAf+gAwIBAgIBATANBgkqhkiG9w0BAQUFADAoMQ4wDAYDVQQKEwVYeVNT
-TDEWMBQGA1UEAxMNWHlTU0wgVGVzdCBDQTAeFw0wNzExMjkxOTUwMzBaFw0wOTEx
-MjgxOTUwMzBaMCcxDjAMBgNVBAoTBVh5U1NMMRUwEwYDVQQDEwxzZXJ2ZXIxLnRl
-c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGykheK/J5SzIMOAHh
-TBzRJLvq3rgv+3oB2ks8EwvREsBp3PM3K/23o7dJ8lfCbfi+kPZ++oA3iRe4TIUi
-NvQ2UZ+Ra0gBnrvmjpm+q0UBwm/wD60iuoMGOKqyPOf0qskyMDLbHBqWh+svUw2X
-LXU8vHV05QRRZ05OgdAATP9H58PKH10cZQCJC9J4pdPSj1z4/uVUnWSDvBLcOMy0
-aD4rxrnQ77HovM9atbMfRwqxD3kGl3M7dfBuJh02iErpZLbmWPiSEqZ8CMx7aUdu
-xmWu2DE5MD3KCksswgE+6QXGbh/OOCEi9PUAHhgO1UgabtUigq++CadHAwvTTVJe
-NNEVAgMBAAGjTTBLMAkGA1UdEwQCMAAwHQYDVR0OBBYEFPer58BYX+ABxaQmg0TM
-HnqRyURlMB8GA1UdIwQYMBaAFPJnsV1fUV7aUYnp2elryouvpS5pMA0GCSqGSIb3
-DQEBBQUAA4IBAQAGm41jjLuKKxqHrjonNLwkYPCVEg71TObkH73ig6PUHt3tjsGT
-vOYgljRlc6y7hWRUSVOC2ieNhuWjEqW2jsZAhwsapAL+R6m/NjmxVKdjH5KyGk+e
-BZjm9bEW+0e7Vx8xNY74NtE2SGolyA4cPQKQzc0eaNKvCeJpUc46EWcgQETJmk2c
-PK8HItyZd3FARtf+PAAw/GdQiXOqBEzv4kTBLoiDiYOAR4hHyhvbZ37nqApUuHL0
-lj/rwbohwf4H685NsIDW2c8t6Y7CL2/Mi6kT/UhQXi+GzZ6LrRZ/aau3e3/G2En4
-BtCKN3F12E8/Aik+ninM9ufDEEJ3bDRj875X
+MIIDPzCCAiegAwIBAgIBATANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER
+MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN
+MDkwMTE0MjI0MzM1WhcNMTEwMTE0MjI0MzM1WjA8MQswCQYDVQQGEwJOTDERMA8G
+A1UEChMIUG9sYXJTU0wxGjAYBgNVBAMTEVBvbGFyU1NMIFNlcnZlciAxMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArWi6EmdDpxEs4NjXoZuJr6ejki8g
+V+m8ron4fIYASAjLC7b80Ajn+xRn5Ctosg5+AdAB9yIqQ2dIK4hcr4wa0k3PGMI+
+4RUivNSxfHy4c/PKEdI9333Evfvy/bvmTs6NxBvCKuBEF741PiXb2LCYnh1oOP6Z
+Kl8r59BSSr/37W2zFLVPxQXzBi4vsSubx/rHTaYWYPey576asNuN6zh6LuEmJTYI
+mtl7YHbEfTSztH7qC6NdXeESiNiCoSUlRN4RSEakqxPf44iwsYR3zg0ASLuqRgsT
+CJ5Radyt5sWbl9EsWsQG/sBP4nqCrD6nDWpUDEaApMfpKaTzzZPT4LQ4FQIDAQAB
+o00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBTU+HRZi1+uZxwze0vy1O+CauYhCDAf
+BgNVHSMEGDAWgBSA7iFIRmtW6p1xMgZkL0zBtC2pLjANBgkqhkiG9w0BAQUFAAOC
+AQEAgltTDDwAE80Fr75HqrFK9ADa05WR75dqqMQBuTNvn9d/bjLWZC1J1/3ZmMJ7
+gS0uCqRJaZfqbjtl9FqeqOC2UVM3udLjB4tdA3xKqHXJL8PneL8AeKJkuVnunA02
+x/gaZpHHyVDBmo3zWZ44NWuBn3QoN0cpxCTcZD4KURcm6T4BCo6cFaCNXII9EfY6
+INcw+O17JFRKipNXnW+80CjzhnyeKLWVLZZZNbKbrlumS61S4IoE9F8R7RQeZoN3
+gMPXnf6TNRYK0Z4SKBA19LlrfAD+f0yAyPbglZKMfV9cojN2yTI6PYdoMOn/ykL/
+pcDfJMFAeGWM+nBL93mqm2Fw9Q==
 -----END CERTIFICATE-----
diff --git a/programs/ssl/test-ca/newcerts/02.pem b/programs/ssl/test-ca/newcerts/02.pem
index 72b06f7..e805480 100644
--- a/programs/ssl/test-ca/newcerts/02.pem
+++ b/programs/ssl/test-ca/newcerts/02.pem
@@ -3,74 +3,75 @@
         Version: 3 (0x2)
         Serial Number: 2 (0x2)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: O=XySSL, CN=XySSL Test CA
+        Issuer: C=NL, O=PolarSSL, CN=PolarSSL Test CA
         Validity
-            Not Before: Nov 29 19:50:38 2007 GMT
-            Not After : Nov 28 19:50:38 2009 GMT
-        Subject: O=XySSL, CN=localhost
+            Not Before: Jan 14 22:43:38 2009 GMT
+            Not After : Jan 14 22:43:38 2011 GMT
+        Subject: C=NL, O=PolarSSL, CN=PolarSSL Server 2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:cc:d4:56:38:49:e6:d6:7f:50:e7:d2:05:c8:99:
-                    25:32:45:71:dd:1c:e1:72:3d:68:94:c0:68:e2:2e:
-                    95:94:87:03:5b:fc:70:69:c4:b3:a0:94:e6:71:02:
-                    18:b1:00:5b:bd:90:ee:08:d0:cd:33:d2:fb:5e:ca:
-                    d6:c2:58:ed:f0:51:b7:54:ac:a4:99:22:8b:a3:07:
-                    bb:d7:41:14:de:0a:5a:92:9d:2d:08:1c:5f:bf:9b:
-                    dc:02:bb:c2:ca:06:b8:f2:8d:04:67:52:ca:9c:3a:
-                    15:a3:ba:30:2f:51:07:4d:8c:69:5c:8c:9f:41:56:
-                    03:ca:b4:88:b8:ce:0f:f0:28:67:19:dd:4c:96:64:
-                    8d:1c:07:b2:c6:cb:58:bf:d9:2b:42:39:ed:28:80:
-                    30:61:23:0e:95:d7:27:11:6f:7e:bc:bc:7b:73:01:
-                    c3:9a:56:fb:e6:ae:88:a8:96:5a:0f:bb:a5:b1:9d:
-                    d5:4a:74:00:26:68:08:3d:67:92:49:58:ab:e2:6a:
-                    00:45:83:3b:e1:e3:e6:c7:2c:c0:40:b9:ca:68:0b:
-                    a4:8f:ba:6d:53:af:6f:7a:57:84:4f:d8:b0:ae:0c:
-                    ce:23:1b:25:32:13:b6:3a:97:74:ca:af:2c:96:76:
-                    34:b2:24:6e:39:45:13:ec:be:16:db:b8:41:71:06:
-                    00:ed
+                    00:a7:d3:64:9c:a0:6f:f1:55:e4:b7:a1:b9:4f:5a:
+                    4a:00:dd:8e:6c:fd:c5:e9:48:df:13:6a:e0:1d:39:
+                    c4:77:36:dd:2e:91:fc:d2:64:3a:c8:ff:81:f8:3c:
+                    77:29:3a:0b:be:6e:ba:22:50:b1:d7:56:34:67:4e:
+                    b0:67:17:22:e3:3a:9a:87:23:51:9a:dd:0e:a8:7d:
+                    4a:d0:16:a7:3e:c0:1e:50:13:99:c4:e7:73:6d:52:
+                    92:90:0e:a1:a9:9f:0b:58:87:8c:fe:56:ae:b8:5c:
+                    24:8c:df:f6:1f:92:dd:c0:ac:22:7e:77:47:e3:a7:
+                    73:f5:2b:37:0d:3b:d4:0a:26:6c:3e:ae:d3:1a:f3:
+                    2a:22:4a:cf:2e:c5:cd:b5:f9:99:c8:d4:80:1e:11:
+                    a3:90:ed:d9:8d:e9:8c:fc:a5:9f:09:9d:51:9d:a7:
+                    b2:a7:b0:a5:db:0d:c5:d0:ef:13:a2:a2:5d:08:aa:
+                    2c:ab:5d:f6:ab:20:ff:83:cb:57:07:8c:d0:34:6a:
+                    f8:6a:55:fa:e5:db:43:a1:9f:1f:c4:46:e4:e9:6f:
+                    51:14:35:e7:4b:e9:04:48:d7:fe:a7:4f:7e:a3:a4:
+                    6d:d2:6f:8b:ad:46:ed:31:a4:66:63:48:08:8d:9b:
+                    0d:9a:a3:f5:95:7c:0f:bc:3b:59:3f:70:3a:a6:13:
+                    62:83
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                B1:B0:EA:31:9D:5C:4F:00:7F:CD:0D:1F:78:A9:18:5D:96:DE:AA:B1
+                35:93:04:00:81:D2:5B:CC:11:9E:9A:22:35:EC:CB:D2:45:DA:FC:26
             X509v3 Authority Key Identifier: 
-                keyid:F2:67:B1:5D:5F:51:5E:DA:51:89:E9:D9:E9:6B:CA:8B:AF:A5:2E:69
+                keyid:80:EE:21:48:46:6B:56:EA:9D:71:32:06:64:2F:4C:C1:B4:2D:A9:2E
 
     Signature Algorithm: sha1WithRSAEncryption
-        2b:9f:5d:f7:8c:42:89:45:d9:19:6f:d1:87:71:c7:74:ec:13:
-        c1:c3:7d:51:b5:6d:c3:f8:f4:cc:8a:d5:3b:ee:59:0e:0b:b8:
-        bf:7f:a3:4a:69:cb:ea:54:fc:58:98:34:05:0a:62:aa:73:61:
-        f2:15:8c:20:93:61:0b:9f:fd:64:d1:7d:87:b3:e5:43:1b:71:
-        36:b4:4c:b1:19:38:04:35:e7:f6:52:e5:3c:d0:a5:2d:55:99:
-        9e:5b:df:d5:60:6c:59:ac:e4:f7:4e:f7:55:ce:da:1c:9c:5e:
-        35:a8:d5:41:47:09:e0:df:7d:75:7e:8e:41:2c:93:34:bf:d2:
-        5e:5b:15:15:05:02:4d:24:1e:c4:5b:03:52:ab:0a:ac:6d:72:
-        00:3c:de:f9:0f:84:73:dc:b2:e6:52:6c:82:af:26:97:5a:58:
-        50:89:a3:c7:d9:5d:a5:8a:3c:e0:e8:3e:63:eb:4f:ff:fd:45:
-        b2:ec:a1:fb:45:03:0f:37:d0:a1:8d:42:bf:23:91:66:2e:09:
-        61:18:3e:5b:e7:b7:e4:6e:e0:2d:88:0d:c2:2a:e6:19:fa:35:
-        05:0d:8b:a4:f3:fb:05:54:98:87:66:5a:a2:f3:56:b5:39:7c:
-        1c:28:50:06:4a:3c:60:5a:e8:ec:19:4e:7e:cd:b1:56:5e:a3:
-        4d:f8:6c:72
+        ab:f2:56:8b:7d:60:7c:ec:1d:36:f0:ff:30:ef:a2:b0:b1:e3:
+        ec:b0:41:8c:46:78:dc:4c:6d:7c:1f:ff:54:97:8e:d4:33:ef:
+        e5:28:b3:2d:46:f5:08:b5:4a:cd:02:4c:8a:7a:1a:86:13:72:
+        50:18:bb:6b:2d:13:7e:95:98:59:20:38:75:ba:ad:46:1c:74:
+        85:1d:16:7d:43:0f:50:ca:14:4e:3d:c9:ab:4a:4c:1d:5b:85:
+        19:90:ae:f1:ad:20:88:16:f1:6f:9b:20:0e:76:58:2a:f4:55:
+        89:5b:b2:1a:6a:10:ef:dd:d3:98:93:22:c4:1f:d9:30:76:14:
+        03:6b:eb:e8:d2:dd:25:7a:1b:0f:87:64:34:d6:24:90:d9:93:
+        39:eb:be:04:d5:ad:e9:29:96:7c:82:b8:fd:16:e7:8f:50:c5:
+        1c:21:c7:81:67:aa:28:93:1b:32:f7:e4:f8:5b:95:d5:c6:60:
+        e8:a1:1f:20:7e:a6:d7:73:6e:4e:f8:94:0f:0b:c9:88:66:c8:
+        31:91:89:0a:8e:fc:2b:70:ce:cf:de:6f:60:2b:e8:32:47:3d:
+        d1:44:d9:dc:13:58:8a:dd:a1:53:31:e3:de:e9:2f:dd:35:8f:
+        73:5c:2e:1f:59:af:4c:97:89:11:e8:d5:20:f8:22:3f:07:43:
+        ca:7d:2d:bd
 -----BEGIN CERTIFICATE-----
-MIIDFDCCAfygAwIBAgIBAjANBgkqhkiG9w0BAQUFADAoMQ4wDAYDVQQKEwVYeVNT
-TDEWMBQGA1UEAxMNWHlTU0wgVGVzdCBDQTAeFw0wNzExMjkxOTUwMzhaFw0wOTEx
-MjgxOTUwMzhaMCQxDjAMBgNVBAoTBVh5U1NMMRIwEAYDVQQDEwlsb2NhbGhvc3Qw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM1FY4SebWf1Dn0gXImSUy
-RXHdHOFyPWiUwGjiLpWUhwNb/HBpxLOglOZxAhixAFu9kO4I0M0z0vteytbCWO3w
-UbdUrKSZIoujB7vXQRTeClqSnS0IHF+/m9wCu8LKBrjyjQRnUsqcOhWjujAvUQdN
-jGlcjJ9BVgPKtIi4zg/wKGcZ3UyWZI0cB7LGy1i/2StCOe0ogDBhIw6V1ycRb368
-vHtzAcOaVvvmroiolloPu6WxndVKdAAmaAg9Z5JJWKviagBFgzvh4+bHLMBAucpo
-C6SPum1Tr296V4RP2LCuDM4jGyUyE7Y6l3TKryyWdjSyJG45RRPsvhbbuEFxBgDt
-AgMBAAGjTTBLMAkGA1UdEwQCMAAwHQYDVR0OBBYEFLGw6jGdXE8Af80NH3ipGF2W
-3qqxMB8GA1UdIwQYMBaAFPJnsV1fUV7aUYnp2elryouvpS5pMA0GCSqGSIb3DQEB
-BQUAA4IBAQArn133jEKJRdkZb9GHccd07BPBw31RtW3D+PTMitU77lkOC7i/f6NK
-acvqVPxYmDQFCmKqc2HyFYwgk2ELn/1k0X2Hs+VDG3E2tEyxGTgENef2UuU80KUt
-VZmeW9/VYGxZrOT3TvdVztocnF41qNVBRwng3311fo5BLJM0v9JeWxUVBQJNJB7E
-WwNSqwqsbXIAPN75D4Rz3LLmUmyCryaXWlhQiaPH2V2lijzg6D5j60///UWy7KH7
-RQMPN9ChjUK/I5FmLglhGD5b57fkbuAtiA3CKuYZ+jUFDYuk8/sFVJiHZlqi81a1
-OXwcKFAGSjxgWujsGU5+zbFWXqNN+Gxy
+MIIDPzCCAiegAwIBAgIBAjANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER
+MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN
+MDkwMTE0MjI0MzM4WhcNMTEwMTE0MjI0MzM4WjA8MQswCQYDVQQGEwJOTDERMA8G
+A1UEChMIUG9sYXJTU0wxGjAYBgNVBAMTEVBvbGFyU1NMIFNlcnZlciAyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp9NknKBv8VXkt6G5T1pKAN2ObP3F
+6UjfE2rgHTnEdzbdLpH80mQ6yP+B+Dx3KToLvm66IlCx11Y0Z06wZxci4zqahyNR
+mt0OqH1K0BanPsAeUBOZxOdzbVKSkA6hqZ8LWIeM/lauuFwkjN/2H5LdwKwifndH
+46dz9Ss3DTvUCiZsPq7TGvMqIkrPLsXNtfmZyNSAHhGjkO3ZjemM/KWfCZ1Rnaey
+p7Cl2w3F0O8ToqJdCKosq132qyD/g8tXB4zQNGr4alX65dtDoZ8fxEbk6W9RFDXn
+S+kESNf+p09+o6Rt0m+LrUbtMaRmY0gIjZsNmqP1lXwPvDtZP3A6phNigwIDAQAB
+o00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQ1kwQAgdJbzBGemiI17MvSRdr8JjAf
+BgNVHSMEGDAWgBSA7iFIRmtW6p1xMgZkL0zBtC2pLjANBgkqhkiG9w0BAQUFAAOC
+AQEAq/JWi31gfOwdNvD/MO+isLHj7LBBjEZ43ExtfB//VJeO1DPv5SizLUb1CLVK
+zQJMinoahhNyUBi7ay0TfpWYWSA4dbqtRhx0hR0WfUMPUMoUTj3Jq0pMHVuFGZCu
+8a0giBbxb5sgDnZYKvRViVuyGmoQ793TmJMixB/ZMHYUA2vr6NLdJXobD4dkNNYk
+kNmTOeu+BNWt6SmWfIK4/Rbnj1DFHCHHgWeqKJMbMvfk+FuV1cZg6KEfIH6m13Nu
+TviUDwvJiGbIMZGJCo78K3DOz95vYCvoMkc90UTZ3BNYit2hUzHj3ukv3TWPc1wu
+H1mvTJeJEejVIPgiPwdDyn0tvQ==
 -----END CERTIFICATE-----
diff --git a/programs/ssl/test-ca/newcerts/03.pem b/programs/ssl/test-ca/newcerts/03.pem
index 679bbea..4e0dd27 100644
--- a/programs/ssl/test-ca/newcerts/03.pem
+++ b/programs/ssl/test-ca/newcerts/03.pem
@@ -3,74 +3,75 @@
         Version: 3 (0x2)
         Serial Number: 3 (0x3)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: O=XySSL, CN=XySSL Test CA
+        Issuer: C=NL, O=PolarSSL, CN=PolarSSL Test CA
         Validity
-            Not Before: Nov 29 19:50:42 2007 GMT
-            Not After : Nov 28 19:50:42 2009 GMT
-        Subject: O=XySSL, CN=Test User 1
+            Not Before: Jan 14 22:43:40 2009 GMT
+            Not After : Jan 14 22:43:40 2011 GMT
+        Subject: C=NL, O=PolarSSL, CN=PolarSSL Client 1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:a7:2b:e9:c3:d5:68:7c:e7:4b:23:20:31:c8:0e:
-                    be:9f:c8:e6:b6:a7:09:c5:59:67:ab:6d:e9:f3:7e:
-                    b2:e7:3b:1c:99:28:33:e0:b8:e9:8b:ee:45:a3:de:
-                    91:f8:03:59:34:f1:b6:e0:b3:62:33:45:87:64:8e:
-                    59:d3:34:4f:f9:fb:3c:64:53:a2:f2:53:20:97:a3:
-                    2b:fe:6d:c4:f3:38:83:02:92:c8:cb:8f:9e:d9:d3:
-                    5e:87:36:ec:17:b3:50:5b:68:b7:03:04:e2:90:2f:
-                    d4:0e:48:40:b1:ad:11:28:de:8a:a9:4c:df:20:05:
-                    47:8a:ef:ba:24:09:fa:ec:f6:d4:f1:0f:a1:31:b7:
-                    f0:54:d5:d5:23:19:1e:41:6d:b7:96:17:81:ff:b3:
-                    1e:83:92:76:4b:7c:ce:b1:8f:18:b0:69:20:60:f9:
-                    41:8b:04:ae:89:84:a8:20:48:ae:f3:1f:50:ec:1c:
-                    61:97:bd:81:50:54:61:5d:23:c3:c2:84:ed:19:1b:
-                    ee:0f:22:38:28:de:51:04:41:6d:e1:82:43:76:e7:
-                    7b:40:fd:84:ea:9e:e8:d8:da:c2:72:c4:31:c6:b0:
-                    ca:ce:ac:7b:5c:fa:43:15:5f:41:1c:21:be:dc:96:
-                    95:d6:77:16:ef:1d:51:8d:10:65:aa:f5:9e:f8:47:
-                    6a:41
+                    00:de:b1:57:8f:86:00:c3:84:99:f9:36:ba:c1:3b:
+                    7e:f8:0e:ff:0b:ee:73:e1:4a:69:2b:8f:2e:e6:cf:
+                    6e:ca:9c:4a:e6:c3:16:5c:e2:20:0f:ea:23:f2:ef:
+                    8f:21:94:42:f7:ec:d4:12:11:3f:1f:e1:9b:96:35:
+                    ff:1c:4a:b1:ec:cc:31:09:ba:5a:17:bd:7c:4d:6e:
+                    de:64:f9:ee:25:2a:a4:da:66:41:e0:f7:a7:05:1b:
+                    aa:0f:16:ff:00:40:bf:0a:10:90:56:d3:60:0e:ec:
+                    1b:c4:fc:99:73:e7:59:87:8f:f9:bb:27:d8:67:e7:
+                    67:0e:21:04:53:e9:ff:5e:8d:d8:34:7c:e7:b4:5c:
+                    18:85:3c:d3:80:d5:76:b6:0c:7d:87:15:fa:97:1e:
+                    87:bc:fe:ee:22:0c:44:6c:4a:25:f9:08:16:ab:92:
+                    a4:f0:4a:d8:82:d6:2a:0c:21:63:81:4d:a8:32:c0:
+                    7f:98:b0:04:3f:64:4c:15:5c:60:fc:b0:c0:e9:69:
+                    e5:06:61:f3:56:85:9a:ad:e5:8c:8c:72:5d:d0:81:
+                    25:46:ae:6c:0a:d6:64:74:2f:86:b3:08:3b:fe:eb:
+                    1b:9c:e0:41:fa:e7:24:aa:aa:e1:d2:3c:bf:54:34:
+                    28:2c:bf:92:5a:cd:81:65:c7:da:73:61:be:7a:f6:
+                    e8:b1
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                F2:C4:96:02:CF:BF:C1:AA:B0:D2:1A:DA:E7:F3:4B:2C:5D:D1:DF:14
+                AA:27:5F:B4:17:D6:BA:24:04:E5:D3:8D:83:AC:65:5D:EB:9D:7E:74
             X509v3 Authority Key Identifier: 
-                keyid:F2:67:B1:5D:5F:51:5E:DA:51:89:E9:D9:E9:6B:CA:8B:AF:A5:2E:69
+                keyid:80:EE:21:48:46:6B:56:EA:9D:71:32:06:64:2F:4C:C1:B4:2D:A9:2E
 
     Signature Algorithm: sha1WithRSAEncryption
-        ca:29:3f:44:90:8d:9c:c6:0d:f9:e2:a9:50:d8:e5:d6:0a:e0:
-        be:6e:48:fb:e8:7a:f4:5f:50:dc:6b:d1:76:a5:f9:88:91:96:
-        62:e5:66:89:da:eb:17:01:f7:d0:d2:f7:3b:35:78:dd:80:45:
-        d0:64:32:13:67:20:a8:fc:d8:62:e1:44:d4:ae:41:37:2e:e7:
-        63:94:37:66:61:3b:38:e9:7d:8a:b6:18:d4:b7:2c:59:ea:46:
-        a0:ed:ab:84:79:04:be:da:0f:9e:2d:68:34:a0:06:63:fa:33:
-        61:bc:8a:00:07:62:c3:81:11:0d:28:d9:80:8f:51:a2:db:be:
-        23:16:a4:37:65:18:72:34:17:c2:a9:63:e3:5f:f4:0e:7c:58:
-        5e:e4:a5:44:8f:6b:23:ba:18:4e:e3:0c:25:2a:86:ee:5d:c2:
-        a2:e7:92:8d:a8:84:77:ef:b5:9c:af:2c:53:5d:4c:1b:eb:96:
-        a4:56:27:f5:bf:cb:82:91:51:6e:8a:f4:49:6a:84:39:44:a3:
-        23:7e:d0:83:ce:2b:4a:5f:18:1b:d1:1f:74:14:6f:91:da:1a:
-        ee:95:1d:ee:c7:9e:77:a2:df:1c:22:72:c2:08:bc:98:60:a0:
-        d6:5f:eb:d8:e8:ad:b3:f5:05:c4:1a:9b:a9:8d:29:83:7e:26:
-        62:fa:e3:79
+        93:30:e0:12:65:5a:d8:5b:b8:2d:04:f9:74:b6:4a:40:c5:eb:
+        3e:c3:2d:6a:67:bf:08:cc:c1:89:21:fd:7f:8f:55:37:b5:bc:
+        27:9d:9b:99:cd:6f:43:f4:90:30:d9:49:68:91:58:ec:8f:5d:
+        55:ce:35:63:16:08:dc:ca:8a:f7:e2:9d:84:f9:6d:ae:e1:94:
+        6b:11:0d:26:da:3d:60:0b:8b:9b:5d:c8:76:6a:a2:f9:e3:61:
+        28:48:d6:0f:8e:aa:bf:65:76:82:c6:6a:e9:23:25:e3:f0:60:
+        43:98:62:64:81:cd:02:a9:a1:16:2c:33:18:e1:15:bd:cf:bf:
+        e2:0d:3e:fe:a3:5f:33:35:64:18:13:fd:76:71:a7:71:9d:8b:
+        e3:35:39:19:f3:4a:5a:0f:5a:c5:ed:63:82:f7:fd:73:94:ba:
+        20:ba:29:8f:2d:18:10:fd:2d:b6:cb:9d:49:8e:07:b8:75:34:
+        f4:63:a6:03:5b:73:76:82:a3:1c:16:c5:2a:6e:d1:92:d6:c0:
+        13:b1:92:f9:2a:74:a1:ae:5f:08:6f:16:d7:43:60:51:37:76:
+        aa:51:9f:44:fb:b5:35:0e:c2:3f:62:31:7a:b4:04:2b:29:96:
+        cc:98:32:2d:13:42:69:b4:79:72:6e:a9:ad:ed:6a:83:ce:6c:
+        9a:13:b0:87
 -----BEGIN CERTIFICATE-----
-MIIDFjCCAf6gAwIBAgIBAzANBgkqhkiG9w0BAQUFADAoMQ4wDAYDVQQKEwVYeVNT
-TDEWMBQGA1UEAxMNWHlTU0wgVGVzdCBDQTAeFw0wNzExMjkxOTUwNDJaFw0wOTEx
-MjgxOTUwNDJaMCYxDjAMBgNVBAoTBVh5U1NMMRQwEgYDVQQDEwtUZXN0IFVzZXIg
-MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcr6cPVaHznSyMgMcgO
-vp/I5ranCcVZZ6tt6fN+suc7HJkoM+C46YvuRaPekfgDWTTxtuCzYjNFh2SOWdM0
-T/n7PGRTovJTIJejK/5txPM4gwKSyMuPntnTXoc27BezUFtotwME4pAv1A5IQLGt
-ESjeiqlM3yAFR4rvuiQJ+uz21PEPoTG38FTV1SMZHkFtt5YXgf+zHoOSdkt8zrGP
-GLBpIGD5QYsEromEqCBIrvMfUOwcYZe9gVBUYV0jw8KE7Rkb7g8iOCjeUQRBbeGC
-Q3bne0D9hOqe6NjawnLEMcawys6se1z6QxVfQRwhvtyWldZ3Fu8dUY0QZar1nvhH
-akECAwEAAaNNMEswCQYDVR0TBAIwADAdBgNVHQ4EFgQU8sSWAs+/waqw0hra5/NL
-LF3R3xQwHwYDVR0jBBgwFoAU8mexXV9RXtpRienZ6WvKi6+lLmkwDQYJKoZIhvcN
-AQEFBQADggEBAMopP0SQjZzGDfniqVDY5dYK4L5uSPvoevRfUNxr0Xal+YiRlmLl
-Zona6xcB99DS9zs1eN2ARdBkMhNnIKj82GLhRNSuQTcu52OUN2ZhOzjpfYq2GNS3
-LFnqRqDtq4R5BL7aD54taDSgBmP6M2G8igAHYsOBEQ0o2YCPUaLbviMWpDdlGHI0
-F8KpY+Nf9A58WF7kpUSPayO6GE7jDCUqhu5dwqLnko2ohHfvtZyvLFNdTBvrlqRW
-J/W/y4KRUW6K9ElqhDlEoyN+0IPOK0pfGBvRH3QUb5HaGu6VHe7Hnnei3xwicsII
-vJhgoNZf69jorbP1BcQam6mNKYN+JmL643k=
+MIIDPzCCAiegAwIBAgIBAzANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER
+MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN
+MDkwMTE0MjI0MzQwWhcNMTEwMTE0MjI0MzQwWjA8MQswCQYDVQQGEwJOTDERMA8G
+A1UEChMIUG9sYXJTU0wxGjAYBgNVBAMTEVBvbGFyU1NMIENsaWVudCAxMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3rFXj4YAw4SZ+Ta6wTt++A7/C+5z
+4UppK48u5s9uypxK5sMWXOIgD+oj8u+PIZRC9+zUEhE/H+GbljX/HEqx7MwxCbpa
+F718TW7eZPnuJSqk2mZB4PenBRuqDxb/AEC/ChCQVtNgDuwbxPyZc+dZh4/5uyfY
+Z+dnDiEEU+n/Xo3YNHzntFwYhTzTgNV2tgx9hxX6lx6HvP7uIgxEbEol+QgWq5Kk
+8ErYgtYqDCFjgU2oMsB/mLAEP2RMFVxg/LDA6WnlBmHzVoWareWMjHJd0IElRq5s
+CtZkdC+Gswg7/usbnOBB+uckqqrh0jy/VDQoLL+SWs2BZcfac2G+evbosQIDAQAB
+o00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBSqJ1+0F9a6JATl042DrGVd651+dDAf
+BgNVHSMEGDAWgBSA7iFIRmtW6p1xMgZkL0zBtC2pLjANBgkqhkiG9w0BAQUFAAOC
+AQEAkzDgEmVa2Fu4LQT5dLZKQMXrPsMtame/CMzBiSH9f49VN7W8J52bmc1vQ/SQ
+MNlJaJFY7I9dVc41YxYI3MqK9+KdhPltruGUaxENJto9YAuLm13Idmqi+eNhKEjW
+D46qv2V2gsZq6SMl4/BgQ5hiZIHNAqmhFiwzGOEVvc+/4g0+/qNfMzVkGBP9dnGn
+cZ2L4zU5GfNKWg9axe1jgvf9c5S6ILopjy0YEP0ttsudSY4HuHU09GOmA1tzdoKj
+HBbFKm7RktbAE7GS+Sp0oa5fCG8W10NgUTd2qlGfRPu1NQ7CP2IxerQEKymWzJgy
+LRNCabR5cm6pre1qg85smhOwhw==
 -----END CERTIFICATE-----
diff --git a/programs/ssl/test-ca/newcerts/04.pem b/programs/ssl/test-ca/newcerts/04.pem
index 14a90ca..f9d8eb6 100644
--- a/programs/ssl/test-ca/newcerts/04.pem
+++ b/programs/ssl/test-ca/newcerts/04.pem
@@ -3,74 +3,75 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: O=XySSL, CN=XySSL Test CA
+        Issuer: C=NL, O=PolarSSL, CN=PolarSSL Test CA
         Validity
-            Not Before: Nov 29 19:50:48 2007 GMT
-            Not After : Nov 28 19:50:48 2009 GMT
-        Subject: O=XySSL, CN=Test User 2
+            Not Before: Jan 14 22:43:42 2009 GMT
+            Not After : Jan 14 22:43:42 2011 GMT
+        Subject: C=NL, O=PolarSSL, CN=PolarSSL Client 2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:e5:7b:e1:94:06:e5:dd:20:0a:0d:6a:4f:9e:2c:
-                    43:ea:74:f8:af:90:ab:60:7e:45:17:27:d9:1b:1d:
-                    90:44:97:42:45:67:22:32:d5:eb:97:4e:76:ef:45:
-                    99:3f:80:29:c5:45:94:7d:43:c0:0b:01:bd:ac:9c:
-                    9d:cf:ff:3f:ea:1e:04:1c:2a:70:94:ff:6b:d1:63:
-                    6f:cd:b0:5f:1d:bf:d6:45:f2:e1:32:17:18:87:b4:
-                    79:39:52:01:23:50:5d:8d:10:89:02:c7:e8:a8:67:
-                    a5:14:41:0f:1a:d7:25:2b:91:f8:6a:c6:5d:e3:b0:
-                    fe:30:7c:47:56:95:93:e1:e8:e4:74:e5:1f:bf:00:
-                    32:49:8e:f7:1d:29:07:68:4c:8e:ca:6f:84:96:37:
-                    37:3d:ee:92:1d:15:b3:18:30:ef:a0:46:b1:6e:7b:
-                    ec:d4:a6:27:8d:11:f9:35:31:9c:91:04:c8:e2:8a:
-                    ac:4f:cb:b4:49:b0:92:2b:82:59:4e:69:00:62:51:
-                    4f:5d:10:72:54:03:5c:24:39:8a:fb:39:6b:c1:da:
-                    84:10:15:c3:04:cb:31:26:91:b8:0a:b1:b5:32:69:
-                    ec:0f:64:a7:51:53:dc:64:13:b1:c2:ec:fc:55:0a:
-                    d8:f5:22:e7:c4:d9:4f:73:8d:85:b6:cc:8b:2a:51:
-                    76:e3
+                    00:ba:70:94:3f:4d:d7:04:0b:5b:61:ea:21:8d:1d:
+                    c2:8c:b5:df:6e:85:b0:14:41:b6:79:4e:90:87:78:
+                    99:9f:65:8e:78:80:63:51:fd:a2:de:31:4b:c3:be:
+                    dc:d5:fd:b2:ba:44:32:d5:a9:62:41:cc:7a:87:ef:
+                    57:21:2c:93:15:2d:68:95:7e:c1:ce:ab:e7:ed:45:
+                    6a:cf:9c:b6:ef:46:a0:10:25:a7:e1:21:d6:bd:bf:
+                    6f:9a:51:4f:21:2f:6a:b1:bd:89:a3:df:fb:36:ee:
+                    d6:0f:c1:c8:af:f9:47:dc:0f:76:a5:ad:b3:36:db:
+                    a2:4f:bf:fa:41:6a:d4:b4:97:81:49:42:d6:fd:8d:
+                    a1:e7:92:ba:fd:99:f6:42:9e:e8:5e:db:e0:bf:90:
+                    4c:ea:e3:81:df:22:24:a4:3c:74:05:24:c3:67:78:
+                    ee:00:03:75:99:4a:ae:e5:4c:8b:a9:49:5b:15:ce:
+                    4a:0a:ee:b9:df:e1:8a:61:e0:ae:1e:96:5a:15:07:
+                    e9:99:e0:11:08:f8:b2:3e:8f:fa:53:3b:e0:7f:56:
+                    34:bf:e2:3f:1a:d8:d4:69:4f:f4:e5:09:b2:3e:96:
+                    a9:9b:0c:6f:f4:46:d1:37:12:1d:b2:a7:16:05:0c:
+                    15:ec:88:64:a1:6e:0e:b2:77:2f:a9:f3:df:b1:03:
+                    2d:03
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                72:A9:55:09:13:A6:61:1E:1D:9F:00:BA:AF:93:D9:8D:69:86:1D:20
+                0A:D7:6D:86:0B:FA:78:67:00:E5:D0:79:80:58:06:4F:A7:D3:DD:B2
             X509v3 Authority Key Identifier: 
-                keyid:F2:67:B1:5D:5F:51:5E:DA:51:89:E9:D9:E9:6B:CA:8B:AF:A5:2E:69
+                keyid:80:EE:21:48:46:6B:56:EA:9D:71:32:06:64:2F:4C:C1:B4:2D:A9:2E
 
     Signature Algorithm: sha1WithRSAEncryption
-        68:32:9c:c5:ea:15:03:a3:2a:5b:e0:3b:ef:02:72:72:5e:5f:
-        57:b3:32:1f:a8:46:93:33:38:75:92:5f:41:e3:99:97:3a:f2:
-        0d:7d:2b:71:81:31:a7:ff:15:28:e8:f1:fe:d4:c1:83:2b:0b:
-        1a:1b:6c:b3:81:01:e1:4c:77:51:8b:09:2d:7f:da:52:2c:f5:
-        9e:38:a7:59:b8:cc:dc:f5:42:d4:3f:7f:22:96:7e:4a:89:f0:
-        cc:6e:77:f0:ee:79:d3:82:20:7a:0c:17:e2:c8:14:77:81:cd:
-        bf:34:27:76:7c:c2:eb:4f:93:dd:0a:a3:ee:2e:b9:f6:8a:d2:
-        7f:0b:f0:69:0f:90:05:6e:d6:ca:23:91:6d:38:68:28:2b:c7:
-        2d:99:17:c7:2a:1b:a6:1b:78:ea:68:56:cb:2e:83:d4:98:54:
-        1f:a5:77:cd:88:59:9c:bd:a2:88:70:4e:f4:68:f0:0e:70:45:
-        9c:c0:ef:d4:48:f0:14:cc:24:b5:47:40:08:07:2f:df:78:0b:
-        0b:50:f6:49:85:41:8c:48:12:78:3a:67:67:d9:82:09:0f:54:
-        a5:fe:14:7c:d4:21:60:a2:45:2b:ea:97:df:38:cc:f5:5a:cd:
-        4d:62:5a:a1:cf:51:cb:93:36:2e:c7:17:ec:77:89:06:f2:c9:
-        55:70:96:f3
+        58:fc:d6:71:a8:c2:4e:d8:38:17:38:f1:33:9b:96:62:4a:15:
+        6b:f9:63:03:a7:21:b0:2a:75:18:16:fc:86:6d:84:86:a7:81:
+        8c:a7:86:fa:34:74:ed:ef:e4:bd:09:29:00:ea:ae:fd:52:2e:
+        20:b4:fd:93:af:de:fd:b8:b1:a0:4a:d7:01:9b:a1:3f:6d:be:
+        06:cf:c1:52:32:52:cd:23:6c:0b:d1:0c:04:cb:01:b0:e8:d8:
+        f9:8d:fd:35:18:16:f0:3b:cb:40:ee:ae:57:af:e8:ce:5c:2c:
+        57:18:c1:bd:29:bf:92:03:14:dd:4f:bd:fd:04:7f:d6:ea:52:
+        5b:6b:4f:1e:a8:a4:b2:ed:42:e6:08:42:c9:b1:c7:fc:d2:34:
+        35:5d:72:32:89:32:cf:84:a5:a1:ac:c0:6f:f9:c3:4e:40:96:
+        a8:15:14:0a:a3:42:d6:b1:d8:bb:99:20:f5:7c:c2:cc:09:92:
+        a7:33:2c:ed:80:d6:23:32:99:7b:13:d1:a0:67:05:78:35:0d:
+        b3:7a:93:80:ea:d7:d2:7c:e4:74:00:03:04:7d:d6:c0:c1:78:
+        d1:84:7f:19:b9:ec:9c:d5:81:fc:25:13:16:36:bd:bc:1c:56:
+        c9:f8:82:90:ef:21:ea:58:f9:ab:61:a4:cd:fb:f3:a5:07:70:
+        1b:03:71:52
 -----BEGIN CERTIFICATE-----
-MIIDFjCCAf6gAwIBAgIBBDANBgkqhkiG9w0BAQUFADAoMQ4wDAYDVQQKEwVYeVNT
-TDEWMBQGA1UEAxMNWHlTU0wgVGVzdCBDQTAeFw0wNzExMjkxOTUwNDhaFw0wOTEx
-MjgxOTUwNDhaMCYxDjAMBgNVBAoTBVh5U1NMMRQwEgYDVQQDEwtUZXN0IFVzZXIg
-MjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOV74ZQG5d0gCg1qT54s
-Q+p0+K+Qq2B+RRcn2RsdkESXQkVnIjLV65dOdu9FmT+AKcVFlH1DwAsBvaycnc//
-P+oeBBwqcJT/a9Fjb82wXx2/1kXy4TIXGIe0eTlSASNQXY0QiQLH6KhnpRRBDxrX
-JSuR+GrGXeOw/jB8R1aVk+Ho5HTlH78AMkmO9x0pB2hMjspvhJY3Nz3ukh0Vsxgw
-76BGsW577NSmJ40R+TUxnJEEyOKKrE/LtEmwkiuCWU5pAGJRT10QclQDXCQ5ivs5
-a8HahBAVwwTLMSaRuAqxtTJp7A9kp1FT3GQTscLs/FUK2PUi58TZT3ONhbbMiypR
-duMCAwEAAaNNMEswCQYDVR0TBAIwADAdBgNVHQ4EFgQUcqlVCROmYR4dnwC6r5PZ
-jWmGHSAwHwYDVR0jBBgwFoAU8mexXV9RXtpRienZ6WvKi6+lLmkwDQYJKoZIhvcN
-AQEFBQADggEBAGgynMXqFQOjKlvgO+8CcnJeX1ezMh+oRpMzOHWSX0HjmZc68g19
-K3GBMaf/FSjo8f7UwYMrCxobbLOBAeFMd1GLCS1/2lIs9Z44p1m4zNz1QtQ/fyKW
-fkqJ8Mxud/DuedOCIHoMF+LIFHeBzb80J3Z8wutPk90Ko+4uufaK0n8L8GkPkAVu
-1sojkW04aCgrxy2ZF8cqG6YbeOpoVssug9SYVB+ld82IWZy9oohwTvRo8A5wRZzA
-79RI8BTMJLVHQAgHL994CwtQ9kmFQYxIEng6Z2fZggkPVKX+FHzUIWCiRSvql984
-zPVazU1iWqHPUcuTNi7HF+x3iQbyyVVwlvM=
+MIIDPzCCAiegAwIBAgIBBDANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER
+MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN
+MDkwMTE0MjI0MzQyWhcNMTEwMTE0MjI0MzQyWjA8MQswCQYDVQQGEwJOTDERMA8G
+A1UEChMIUG9sYXJTU0wxGjAYBgNVBAMTEVBvbGFyU1NMIENsaWVudCAyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAunCUP03XBAtbYeohjR3CjLXfboWw
+FEG2eU6Qh3iZn2WOeIBjUf2i3jFLw77c1f2yukQy1aliQcx6h+9XISyTFS1olX7B
+zqvn7UVqz5y270agECWn4SHWvb9vmlFPIS9qsb2Jo9/7Nu7WD8HIr/lH3A92pa2z
+NtuiT7/6QWrUtJeBSULW/Y2h55K6/Zn2Qp7oXtvgv5BM6uOB3yIkpDx0BSTDZ3ju
+AAN1mUqu5UyLqUlbFc5KCu653+GKYeCuHpZaFQfpmeARCPiyPo/6Uzvgf1Y0v+I/
+GtjUaU/05QmyPpapmwxv9EbRNxIdsqcWBQwV7IhkoW4OsncvqfPfsQMtAwIDAQAB
+o00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQK122GC/p4ZwDl0HmAWAZPp9PdsjAf
+BgNVHSMEGDAWgBSA7iFIRmtW6p1xMgZkL0zBtC2pLjANBgkqhkiG9w0BAQUFAAOC
+AQEAWPzWcajCTtg4FzjxM5uWYkoVa/ljA6chsCp1GBb8hm2EhqeBjKeG+jR07e/k
+vQkpAOqu/VIuILT9k6/e/bixoErXAZuhP22+Bs/BUjJSzSNsC9EMBMsBsOjY+Y39
+NRgW8DvLQO6uV6/ozlwsVxjBvSm/kgMU3U+9/QR/1upSW2tPHqiksu1C5ghCybHH
+/NI0NV1yMokyz4SloazAb/nDTkCWqBUUCqNC1rHYu5kg9XzCzAmSpzMs7YDWIzKZ
+exPRoGcFeDUNs3qTgOrX0nzkdAADBH3WwMF40YR/GbnsnNWB/CUTFja9vBxWyfiC
+kO8h6lj5q2GkzfvzpQdwGwNxUg==
 -----END CERTIFICATE-----
diff --git a/programs/ssl/test-ca/server1.crt b/programs/ssl/test-ca/server1.crt
index fb7dcd4..730b82f 100644
--- a/programs/ssl/test-ca/server1.crt
+++ b/programs/ssl/test-ca/server1.crt
@@ -3,74 +3,75 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: O=XySSL, CN=XySSL Test CA
+        Issuer: C=NL, O=PolarSSL, CN=PolarSSL Test CA
         Validity
-            Not Before: Nov 29 19:50:30 2007 GMT
-            Not After : Nov 28 19:50:30 2009 GMT
-        Subject: O=XySSL, CN=server1.test
+            Not Before: Jan 14 22:43:35 2009 GMT
+            Not After : Jan 14 22:43:35 2011 GMT
+        Subject: C=NL, O=PolarSSL, CN=PolarSSL Server 1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:c6:ca:48:5e:2b:f2:79:4b:32:0c:38:01:e1:4c:
-                    1c:d1:24:bb:ea:de:b8:2f:fb:7a:01:da:4b:3c:13:
-                    0b:d1:12:c0:69:dc:f3:37:2b:fd:b7:a3:b7:49:f2:
-                    57:c2:6d:f8:be:90:f6:7e:fa:80:37:89:17:b8:4c:
-                    85:22:36:f4:36:51:9f:91:6b:48:01:9e:bb:e6:8e:
-                    99:be:ab:45:01:c2:6f:f0:0f:ad:22:ba:83:06:38:
-                    aa:b2:3c:e7:f4:aa:c9:32:30:32:db:1c:1a:96:87:
-                    eb:2f:53:0d:97:2d:75:3c:bc:75:74:e5:04:51:67:
-                    4e:4e:81:d0:00:4c:ff:47:e7:c3:ca:1f:5d:1c:65:
-                    00:89:0b:d2:78:a5:d3:d2:8f:5c:f8:fe:e5:54:9d:
-                    64:83:bc:12:dc:38:cc:b4:68:3e:2b:c6:b9:d0:ef:
-                    b1:e8:bc:cf:5a:b5:b3:1f:47:0a:b1:0f:79:06:97:
-                    73:3b:75:f0:6e:26:1d:36:88:4a:e9:64:b6:e6:58:
-                    f8:92:12:a6:7c:08:cc:7b:69:47:6e:c6:65:ae:d8:
-                    31:39:30:3d:ca:0a:4b:2c:c2:01:3e:e9:05:c6:6e:
-                    1f:ce:38:21:22:f4:f5:00:1e:18:0e:d5:48:1a:6e:
-                    d5:22:82:af:be:09:a7:47:03:0b:d3:4d:52:5e:34:
-                    d1:15
+                    00:ad:68:ba:12:67:43:a7:11:2c:e0:d8:d7:a1:9b:
+                    89:af:a7:a3:92:2f:20:57:e9:bc:ae:89:f8:7c:86:
+                    00:48:08:cb:0b:b6:fc:d0:08:e7:fb:14:67:e4:2b:
+                    68:b2:0e:7e:01:d0:01:f7:22:2a:43:67:48:2b:88:
+                    5c:af:8c:1a:d2:4d:cf:18:c2:3e:e1:15:22:bc:d4:
+                    b1:7c:7c:b8:73:f3:ca:11:d2:3d:df:7d:c4:bd:fb:
+                    f2:fd:bb:e6:4e:ce:8d:c4:1b:c2:2a:e0:44:17:be:
+                    35:3e:25:db:d8:b0:98:9e:1d:68:38:fe:99:2a:5f:
+                    2b:e7:d0:52:4a:bf:f7:ed:6d:b3:14:b5:4f:c5:05:
+                    f3:06:2e:2f:b1:2b:9b:c7:fa:c7:4d:a6:16:60:f7:
+                    b2:e7:be:9a:b0:db:8d:eb:38:7a:2e:e1:26:25:36:
+                    08:9a:d9:7b:60:76:c4:7d:34:b3:b4:7e:ea:0b:a3:
+                    5d:5d:e1:12:88:d8:82:a1:25:25:44:de:11:48:46:
+                    a4:ab:13:df:e3:88:b0:b1:84:77:ce:0d:00:48:bb:
+                    aa:46:0b:13:08:9e:51:69:dc:ad:e6:c5:9b:97:d1:
+                    2c:5a:c4:06:fe:c0:4f:e2:7a:82:ac:3e:a7:0d:6a:
+                    54:0c:46:80:a4:c7:e9:29:a4:f3:cd:93:d3:e0:b4:
+                    38:15
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                F7:AB:E7:C0:58:5F:E0:01:C5:A4:26:83:44:CC:1E:7A:91:C9:44:65
+                D4:F8:74:59:8B:5F:AE:67:1C:33:7B:4B:F2:D4:EF:82:6A:E6:21:08
             X509v3 Authority Key Identifier: 
-                keyid:F2:67:B1:5D:5F:51:5E:DA:51:89:E9:D9:E9:6B:CA:8B:AF:A5:2E:69
+                keyid:80:EE:21:48:46:6B:56:EA:9D:71:32:06:64:2F:4C:C1:B4:2D:A9:2E
 
     Signature Algorithm: sha1WithRSAEncryption
-        06:9b:8d:63:8c:bb:8a:2b:1a:87:ae:3a:27:34:bc:24:60:f0:
-        95:12:0e:f5:4c:e6:e4:1f:bd:e2:83:a3:d4:1e:dd:ed:8e:c1:
-        93:bc:e6:20:96:34:65:73:ac:bb:85:64:54:49:53:82:da:27:
-        8d:86:e5:a3:12:a5:b6:8e:c6:40:87:0b:1a:a4:02:fe:47:a9:
-        bf:36:39:b1:54:a7:63:1f:92:b2:1a:4f:9e:05:98:e6:f5:b1:
-        16:fb:47:bb:57:1f:31:35:8e:f8:36:d1:36:48:6a:25:c8:0e:
-        1c:3d:02:90:cd:cd:1e:68:d2:af:09:e2:69:51:ce:3a:11:67:
-        20:40:44:c9:9a:4d:9c:3c:af:07:22:dc:99:77:71:40:46:d7:
-        fe:3c:00:30:fc:67:50:89:73:aa:04:4c:ef:e2:44:c1:2e:88:
-        83:89:83:80:47:88:47:ca:1b:db:67:7e:e7:a8:0a:54:b8:72:
-        f4:96:3f:eb:c1:ba:21:c1:fe:07:eb:ce:4d:b0:80:d6:d9:cf:
-        2d:e9:8e:c2:2f:6f:cc:8b:a9:13:fd:48:50:5e:2f:86:cd:9e:
-        8b:ad:16:7f:69:ab:b7:7b:7f:c6:d8:49:f8:06:d0:8a:37:71:
-        75:d8:4f:3f:02:29:3e:9e:29:cc:f6:e7:c3:10:42:77:6c:34:
-        63:f3:be:57
+        82:5b:53:0c:3c:00:13:cd:05:af:be:47:aa:b1:4a:f4:00:da:
+        d3:95:91:ef:97:6a:a8:c4:01:b9:33:6f:9f:d7:7f:6e:32:d6:
+        64:2d:49:d7:fd:d9:98:c2:7b:81:2d:2e:0a:a4:49:69:97:ea:
+        6e:3b:65:f4:5a:9e:a8:e0:b6:51:53:37:b9:d2:e3:07:8b:5d:
+        03:7c:4a:a8:75:c9:2f:c3:e7:78:bf:00:78:a2:64:b9:59:ee:
+        9c:0d:36:c7:f8:1a:66:91:c7:c9:50:c1:9a:8d:f3:59:9e:38:
+        35:6b:81:9f:74:28:37:47:29:c4:24:dc:64:3e:0a:51:17:26:
+        e9:3e:01:0a:8e:9c:15:a0:8d:5c:82:3d:11:f6:3a:20:d7:30:
+        f8:ed:7b:24:54:4a:8a:93:57:9d:6f:bc:d0:28:f3:86:7c:9e:
+        28:b5:95:2d:96:59:35:b2:9b:ae:5b:a6:4b:ad:52:e0:8a:04:
+        f4:5f:11:ed:14:1e:66:83:77:80:c3:d7:9d:fe:93:35:16:0a:
+        d1:9e:12:28:10:35:f4:b9:6b:7c:00:fe:7f:4c:80:c8:f6:e0:
+        95:92:8c:7d:5f:5c:a2:33:76:c9:32:3a:3d:87:68:30:e9:ff:
+        ca:42:ff:a5:c0:df:24:c1:40:78:65:8c:fa:70:4b:f7:79:aa:
+        9b:61:70:f5
 -----BEGIN CERTIFICATE-----
-MIIDFzCCAf+gAwIBAgIBATANBgkqhkiG9w0BAQUFADAoMQ4wDAYDVQQKEwVYeVNT
-TDEWMBQGA1UEAxMNWHlTU0wgVGVzdCBDQTAeFw0wNzExMjkxOTUwMzBaFw0wOTEx
-MjgxOTUwMzBaMCcxDjAMBgNVBAoTBVh5U1NMMRUwEwYDVQQDEwxzZXJ2ZXIxLnRl
-c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGykheK/J5SzIMOAHh
-TBzRJLvq3rgv+3oB2ks8EwvREsBp3PM3K/23o7dJ8lfCbfi+kPZ++oA3iRe4TIUi
-NvQ2UZ+Ra0gBnrvmjpm+q0UBwm/wD60iuoMGOKqyPOf0qskyMDLbHBqWh+svUw2X
-LXU8vHV05QRRZ05OgdAATP9H58PKH10cZQCJC9J4pdPSj1z4/uVUnWSDvBLcOMy0
-aD4rxrnQ77HovM9atbMfRwqxD3kGl3M7dfBuJh02iErpZLbmWPiSEqZ8CMx7aUdu
-xmWu2DE5MD3KCksswgE+6QXGbh/OOCEi9PUAHhgO1UgabtUigq++CadHAwvTTVJe
-NNEVAgMBAAGjTTBLMAkGA1UdEwQCMAAwHQYDVR0OBBYEFPer58BYX+ABxaQmg0TM
-HnqRyURlMB8GA1UdIwQYMBaAFPJnsV1fUV7aUYnp2elryouvpS5pMA0GCSqGSIb3
-DQEBBQUAA4IBAQAGm41jjLuKKxqHrjonNLwkYPCVEg71TObkH73ig6PUHt3tjsGT
-vOYgljRlc6y7hWRUSVOC2ieNhuWjEqW2jsZAhwsapAL+R6m/NjmxVKdjH5KyGk+e
-BZjm9bEW+0e7Vx8xNY74NtE2SGolyA4cPQKQzc0eaNKvCeJpUc46EWcgQETJmk2c
-PK8HItyZd3FARtf+PAAw/GdQiXOqBEzv4kTBLoiDiYOAR4hHyhvbZ37nqApUuHL0
-lj/rwbohwf4H685NsIDW2c8t6Y7CL2/Mi6kT/UhQXi+GzZ6LrRZ/aau3e3/G2En4
-BtCKN3F12E8/Aik+ninM9ufDEEJ3bDRj875X
+MIIDPzCCAiegAwIBAgIBATANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER
+MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN
+MDkwMTE0MjI0MzM1WhcNMTEwMTE0MjI0MzM1WjA8MQswCQYDVQQGEwJOTDERMA8G
+A1UEChMIUG9sYXJTU0wxGjAYBgNVBAMTEVBvbGFyU1NMIFNlcnZlciAxMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArWi6EmdDpxEs4NjXoZuJr6ejki8g
+V+m8ron4fIYASAjLC7b80Ajn+xRn5Ctosg5+AdAB9yIqQ2dIK4hcr4wa0k3PGMI+
+4RUivNSxfHy4c/PKEdI9333Evfvy/bvmTs6NxBvCKuBEF741PiXb2LCYnh1oOP6Z
+Kl8r59BSSr/37W2zFLVPxQXzBi4vsSubx/rHTaYWYPey576asNuN6zh6LuEmJTYI
+mtl7YHbEfTSztH7qC6NdXeESiNiCoSUlRN4RSEakqxPf44iwsYR3zg0ASLuqRgsT
+CJ5Radyt5sWbl9EsWsQG/sBP4nqCrD6nDWpUDEaApMfpKaTzzZPT4LQ4FQIDAQAB
+o00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBTU+HRZi1+uZxwze0vy1O+CauYhCDAf
+BgNVHSMEGDAWgBSA7iFIRmtW6p1xMgZkL0zBtC2pLjANBgkqhkiG9w0BAQUFAAOC
+AQEAgltTDDwAE80Fr75HqrFK9ADa05WR75dqqMQBuTNvn9d/bjLWZC1J1/3ZmMJ7
+gS0uCqRJaZfqbjtl9FqeqOC2UVM3udLjB4tdA3xKqHXJL8PneL8AeKJkuVnunA02
+x/gaZpHHyVDBmo3zWZ44NWuBn3QoN0cpxCTcZD4KURcm6T4BCo6cFaCNXII9EfY6
+INcw+O17JFRKipNXnW+80CjzhnyeKLWVLZZZNbKbrlumS61S4IoE9F8R7RQeZoN3
+gMPXnf6TNRYK0Z4SKBA19LlrfAD+f0yAyPbglZKMfV9cojN2yTI6PYdoMOn/ykL/
+pcDfJMFAeGWM+nBL93mqm2Fw9Q==
 -----END CERTIFICATE-----
diff --git a/programs/ssl/test-ca/server1.key b/programs/ssl/test-ca/server1.key
index b418c6d..5017098 100644
--- a/programs/ssl/test-ca/server1.key
+++ b/programs/ssl/test-ca/server1.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAxspIXivyeUsyDDgB4Uwc0SS76t64L/t6AdpLPBML0RLAadzz
-Nyv9t6O3SfJXwm34vpD2fvqAN4kXuEyFIjb0NlGfkWtIAZ675o6ZvqtFAcJv8A+t
-IrqDBjiqsjzn9KrJMjAy2xwalofrL1MNly11PLx1dOUEUWdOToHQAEz/R+fDyh9d
-HGUAiQvSeKXT0o9c+P7lVJ1kg7wS3DjMtGg+K8a50O+x6LzPWrWzH0cKsQ95Bpdz
-O3XwbiYdNohK6WS25lj4khKmfAjMe2lHbsZlrtgxOTA9ygpLLMIBPukFxm4fzjgh
-IvT1AB4YDtVIGm7VIoKvvgmnRwML001SXjTRFQIDAQABAoIBAHw0n4rXgqTuqtKf
-m+0dFVRH03IovoScZ9sIfcGHVPbI9JgwiXaLcfdvv3HgjZzaAXVwNdOYyMvqSHvK
-s9Rw6Z2W2lCN62u3tkeUCdPsRy2WQ0KHSPJN/tfASEcdbwCcRSGqo9vrb2FmgzgK
-eI9gw8OzLOBgx5XlKjQ7P68wbMCLoQ4z7UZQkqWRhBrO6r2yR6/+y91OgrFixp/D
-rpsWvvW4+EmPihYceA8CTqqZSz7DKcNvNyPqCFRav+856m/9oBxKOkuuvoR3811c
-GSn+c8Np/bbKQxZ6YA94QujoKMXO8i8ZEnRfMKa/NbBMpa1jSRTd/5uA6/CI+bUB
-io1nLgECgYEA4eVuezN7SvMN8ihB61Hg6fGwa2YiTPkCp7WWeRHB8f+2iq0hFCAn
-yu9YsyafVMVPwoebEMCkqaIrlrKdL0w3xUjDNwhgSyAQyXUnSQFwa3IkhLWNkj5P
-pQCAeZy9PEGwolPQKBNVaU+J7p7ipOv9VAyBmyqUq4XXwpYcdyH6NbUCgYEA4Ugd
-Kt3/iOJpv1PMIQpXI926lXbH6hquqlQbpb35YlNgC4N8eC/r4Q/yW7FI0kD72ipO
-EUlSFne8FJHPluNe6GahF9np6M48ogmv6QhiOFf5T+6kVXdJ+akqYhcWC5m/hArT
-/q27+PwTpYBwIwf54PaM/k9iOz0zH9bqY3TvSeECgYEAmChicroKokF1c1eKj2dn
-iC00GCODlzVjhHPcF1DOwqLr4h0b2uKN6zOtG384c3E0eGO/H1mjkF+b3LYTCnjc
-WBba54bM1c2TgR9YhuRhRP5teraP1aIDI7Fi2IerL5tPzweFfnkHXxgkYIbFQzFy
-QdrqsgnMenx9CKT0J4rLbsECgYA5a2gDxRGckhjh6zncMgaD3b/w2JWb1bEvOMDT
-PdiSdy3DwX+4In68npPnSwiEjouiz6WWQlnp4BrQI1oF224VThNBQQmdjPNnWZC8
-lKZ0NfgVp327SuxP9g4XckrsKgPmY9wkzaNbkuRvCo2KYD4QWMcXCqS+9JpTQzP6
-pZNYAQKBgQC5mvSC9zxQYX9Ia9PDL4q6AjdG0XweZuYHk2/bQ1LQjM7qI1mescol
-CXbNXUxhw2XAXkw8BFAfPJ3npIL7FX0htEiYx7KqpCYN7IXSpQ6xexZn6nEm+mBz
-VMWO8Roj95S3tyZOTzbmuUNbQsfLZlQ2hUeUBvJ5UH+LBFivjxy0pw==
+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
 -----END RSA PRIVATE KEY-----
diff --git a/programs/ssl/test-ca/server2.crt b/programs/ssl/test-ca/server2.crt
index 72b06f7..e805480 100644
--- a/programs/ssl/test-ca/server2.crt
+++ b/programs/ssl/test-ca/server2.crt
@@ -3,74 +3,75 @@
         Version: 3 (0x2)
         Serial Number: 2 (0x2)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: O=XySSL, CN=XySSL Test CA
+        Issuer: C=NL, O=PolarSSL, CN=PolarSSL Test CA
         Validity
-            Not Before: Nov 29 19:50:38 2007 GMT
-            Not After : Nov 28 19:50:38 2009 GMT
-        Subject: O=XySSL, CN=localhost
+            Not Before: Jan 14 22:43:38 2009 GMT
+            Not After : Jan 14 22:43:38 2011 GMT
+        Subject: C=NL, O=PolarSSL, CN=PolarSSL Server 2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:cc:d4:56:38:49:e6:d6:7f:50:e7:d2:05:c8:99:
-                    25:32:45:71:dd:1c:e1:72:3d:68:94:c0:68:e2:2e:
-                    95:94:87:03:5b:fc:70:69:c4:b3:a0:94:e6:71:02:
-                    18:b1:00:5b:bd:90:ee:08:d0:cd:33:d2:fb:5e:ca:
-                    d6:c2:58:ed:f0:51:b7:54:ac:a4:99:22:8b:a3:07:
-                    bb:d7:41:14:de:0a:5a:92:9d:2d:08:1c:5f:bf:9b:
-                    dc:02:bb:c2:ca:06:b8:f2:8d:04:67:52:ca:9c:3a:
-                    15:a3:ba:30:2f:51:07:4d:8c:69:5c:8c:9f:41:56:
-                    03:ca:b4:88:b8:ce:0f:f0:28:67:19:dd:4c:96:64:
-                    8d:1c:07:b2:c6:cb:58:bf:d9:2b:42:39:ed:28:80:
-                    30:61:23:0e:95:d7:27:11:6f:7e:bc:bc:7b:73:01:
-                    c3:9a:56:fb:e6:ae:88:a8:96:5a:0f:bb:a5:b1:9d:
-                    d5:4a:74:00:26:68:08:3d:67:92:49:58:ab:e2:6a:
-                    00:45:83:3b:e1:e3:e6:c7:2c:c0:40:b9:ca:68:0b:
-                    a4:8f:ba:6d:53:af:6f:7a:57:84:4f:d8:b0:ae:0c:
-                    ce:23:1b:25:32:13:b6:3a:97:74:ca:af:2c:96:76:
-                    34:b2:24:6e:39:45:13:ec:be:16:db:b8:41:71:06:
-                    00:ed
+                    00:a7:d3:64:9c:a0:6f:f1:55:e4:b7:a1:b9:4f:5a:
+                    4a:00:dd:8e:6c:fd:c5:e9:48:df:13:6a:e0:1d:39:
+                    c4:77:36:dd:2e:91:fc:d2:64:3a:c8:ff:81:f8:3c:
+                    77:29:3a:0b:be:6e:ba:22:50:b1:d7:56:34:67:4e:
+                    b0:67:17:22:e3:3a:9a:87:23:51:9a:dd:0e:a8:7d:
+                    4a:d0:16:a7:3e:c0:1e:50:13:99:c4:e7:73:6d:52:
+                    92:90:0e:a1:a9:9f:0b:58:87:8c:fe:56:ae:b8:5c:
+                    24:8c:df:f6:1f:92:dd:c0:ac:22:7e:77:47:e3:a7:
+                    73:f5:2b:37:0d:3b:d4:0a:26:6c:3e:ae:d3:1a:f3:
+                    2a:22:4a:cf:2e:c5:cd:b5:f9:99:c8:d4:80:1e:11:
+                    a3:90:ed:d9:8d:e9:8c:fc:a5:9f:09:9d:51:9d:a7:
+                    b2:a7:b0:a5:db:0d:c5:d0:ef:13:a2:a2:5d:08:aa:
+                    2c:ab:5d:f6:ab:20:ff:83:cb:57:07:8c:d0:34:6a:
+                    f8:6a:55:fa:e5:db:43:a1:9f:1f:c4:46:e4:e9:6f:
+                    51:14:35:e7:4b:e9:04:48:d7:fe:a7:4f:7e:a3:a4:
+                    6d:d2:6f:8b:ad:46:ed:31:a4:66:63:48:08:8d:9b:
+                    0d:9a:a3:f5:95:7c:0f:bc:3b:59:3f:70:3a:a6:13:
+                    62:83
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                B1:B0:EA:31:9D:5C:4F:00:7F:CD:0D:1F:78:A9:18:5D:96:DE:AA:B1
+                35:93:04:00:81:D2:5B:CC:11:9E:9A:22:35:EC:CB:D2:45:DA:FC:26
             X509v3 Authority Key Identifier: 
-                keyid:F2:67:B1:5D:5F:51:5E:DA:51:89:E9:D9:E9:6B:CA:8B:AF:A5:2E:69
+                keyid:80:EE:21:48:46:6B:56:EA:9D:71:32:06:64:2F:4C:C1:B4:2D:A9:2E
 
     Signature Algorithm: sha1WithRSAEncryption
-        2b:9f:5d:f7:8c:42:89:45:d9:19:6f:d1:87:71:c7:74:ec:13:
-        c1:c3:7d:51:b5:6d:c3:f8:f4:cc:8a:d5:3b:ee:59:0e:0b:b8:
-        bf:7f:a3:4a:69:cb:ea:54:fc:58:98:34:05:0a:62:aa:73:61:
-        f2:15:8c:20:93:61:0b:9f:fd:64:d1:7d:87:b3:e5:43:1b:71:
-        36:b4:4c:b1:19:38:04:35:e7:f6:52:e5:3c:d0:a5:2d:55:99:
-        9e:5b:df:d5:60:6c:59:ac:e4:f7:4e:f7:55:ce:da:1c:9c:5e:
-        35:a8:d5:41:47:09:e0:df:7d:75:7e:8e:41:2c:93:34:bf:d2:
-        5e:5b:15:15:05:02:4d:24:1e:c4:5b:03:52:ab:0a:ac:6d:72:
-        00:3c:de:f9:0f:84:73:dc:b2:e6:52:6c:82:af:26:97:5a:58:
-        50:89:a3:c7:d9:5d:a5:8a:3c:e0:e8:3e:63:eb:4f:ff:fd:45:
-        b2:ec:a1:fb:45:03:0f:37:d0:a1:8d:42:bf:23:91:66:2e:09:
-        61:18:3e:5b:e7:b7:e4:6e:e0:2d:88:0d:c2:2a:e6:19:fa:35:
-        05:0d:8b:a4:f3:fb:05:54:98:87:66:5a:a2:f3:56:b5:39:7c:
-        1c:28:50:06:4a:3c:60:5a:e8:ec:19:4e:7e:cd:b1:56:5e:a3:
-        4d:f8:6c:72
+        ab:f2:56:8b:7d:60:7c:ec:1d:36:f0:ff:30:ef:a2:b0:b1:e3:
+        ec:b0:41:8c:46:78:dc:4c:6d:7c:1f:ff:54:97:8e:d4:33:ef:
+        e5:28:b3:2d:46:f5:08:b5:4a:cd:02:4c:8a:7a:1a:86:13:72:
+        50:18:bb:6b:2d:13:7e:95:98:59:20:38:75:ba:ad:46:1c:74:
+        85:1d:16:7d:43:0f:50:ca:14:4e:3d:c9:ab:4a:4c:1d:5b:85:
+        19:90:ae:f1:ad:20:88:16:f1:6f:9b:20:0e:76:58:2a:f4:55:
+        89:5b:b2:1a:6a:10:ef:dd:d3:98:93:22:c4:1f:d9:30:76:14:
+        03:6b:eb:e8:d2:dd:25:7a:1b:0f:87:64:34:d6:24:90:d9:93:
+        39:eb:be:04:d5:ad:e9:29:96:7c:82:b8:fd:16:e7:8f:50:c5:
+        1c:21:c7:81:67:aa:28:93:1b:32:f7:e4:f8:5b:95:d5:c6:60:
+        e8:a1:1f:20:7e:a6:d7:73:6e:4e:f8:94:0f:0b:c9:88:66:c8:
+        31:91:89:0a:8e:fc:2b:70:ce:cf:de:6f:60:2b:e8:32:47:3d:
+        d1:44:d9:dc:13:58:8a:dd:a1:53:31:e3:de:e9:2f:dd:35:8f:
+        73:5c:2e:1f:59:af:4c:97:89:11:e8:d5:20:f8:22:3f:07:43:
+        ca:7d:2d:bd
 -----BEGIN CERTIFICATE-----
-MIIDFDCCAfygAwIBAgIBAjANBgkqhkiG9w0BAQUFADAoMQ4wDAYDVQQKEwVYeVNT
-TDEWMBQGA1UEAxMNWHlTU0wgVGVzdCBDQTAeFw0wNzExMjkxOTUwMzhaFw0wOTEx
-MjgxOTUwMzhaMCQxDjAMBgNVBAoTBVh5U1NMMRIwEAYDVQQDEwlsb2NhbGhvc3Qw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM1FY4SebWf1Dn0gXImSUy
-RXHdHOFyPWiUwGjiLpWUhwNb/HBpxLOglOZxAhixAFu9kO4I0M0z0vteytbCWO3w
-UbdUrKSZIoujB7vXQRTeClqSnS0IHF+/m9wCu8LKBrjyjQRnUsqcOhWjujAvUQdN
-jGlcjJ9BVgPKtIi4zg/wKGcZ3UyWZI0cB7LGy1i/2StCOe0ogDBhIw6V1ycRb368
-vHtzAcOaVvvmroiolloPu6WxndVKdAAmaAg9Z5JJWKviagBFgzvh4+bHLMBAucpo
-C6SPum1Tr296V4RP2LCuDM4jGyUyE7Y6l3TKryyWdjSyJG45RRPsvhbbuEFxBgDt
-AgMBAAGjTTBLMAkGA1UdEwQCMAAwHQYDVR0OBBYEFLGw6jGdXE8Af80NH3ipGF2W
-3qqxMB8GA1UdIwQYMBaAFPJnsV1fUV7aUYnp2elryouvpS5pMA0GCSqGSIb3DQEB
-BQUAA4IBAQArn133jEKJRdkZb9GHccd07BPBw31RtW3D+PTMitU77lkOC7i/f6NK
-acvqVPxYmDQFCmKqc2HyFYwgk2ELn/1k0X2Hs+VDG3E2tEyxGTgENef2UuU80KUt
-VZmeW9/VYGxZrOT3TvdVztocnF41qNVBRwng3311fo5BLJM0v9JeWxUVBQJNJB7E
-WwNSqwqsbXIAPN75D4Rz3LLmUmyCryaXWlhQiaPH2V2lijzg6D5j60///UWy7KH7
-RQMPN9ChjUK/I5FmLglhGD5b57fkbuAtiA3CKuYZ+jUFDYuk8/sFVJiHZlqi81a1
-OXwcKFAGSjxgWujsGU5+zbFWXqNN+Gxy
+MIIDPzCCAiegAwIBAgIBAjANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER
+MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN
+MDkwMTE0MjI0MzM4WhcNMTEwMTE0MjI0MzM4WjA8MQswCQYDVQQGEwJOTDERMA8G
+A1UEChMIUG9sYXJTU0wxGjAYBgNVBAMTEVBvbGFyU1NMIFNlcnZlciAyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp9NknKBv8VXkt6G5T1pKAN2ObP3F
+6UjfE2rgHTnEdzbdLpH80mQ6yP+B+Dx3KToLvm66IlCx11Y0Z06wZxci4zqahyNR
+mt0OqH1K0BanPsAeUBOZxOdzbVKSkA6hqZ8LWIeM/lauuFwkjN/2H5LdwKwifndH
+46dz9Ss3DTvUCiZsPq7TGvMqIkrPLsXNtfmZyNSAHhGjkO3ZjemM/KWfCZ1Rnaey
+p7Cl2w3F0O8ToqJdCKosq132qyD/g8tXB4zQNGr4alX65dtDoZ8fxEbk6W9RFDXn
+S+kESNf+p09+o6Rt0m+LrUbtMaRmY0gIjZsNmqP1lXwPvDtZP3A6phNigwIDAQAB
+o00wSzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQ1kwQAgdJbzBGemiI17MvSRdr8JjAf
+BgNVHSMEGDAWgBSA7iFIRmtW6p1xMgZkL0zBtC2pLjANBgkqhkiG9w0BAQUFAAOC
+AQEAq/JWi31gfOwdNvD/MO+isLHj7LBBjEZ43ExtfB//VJeO1DPv5SizLUb1CLVK
+zQJMinoahhNyUBi7ay0TfpWYWSA4dbqtRhx0hR0WfUMPUMoUTj3Jq0pMHVuFGZCu
+8a0giBbxb5sgDnZYKvRViVuyGmoQ793TmJMixB/ZMHYUA2vr6NLdJXobD4dkNNYk
+kNmTOeu+BNWt6SmWfIK4/Rbnj1DFHCHHgWeqKJMbMvfk+FuV1cZg6KEfIH6m13Nu
+TviUDwvJiGbIMZGJCo78K3DOz95vYCvoMkc90UTZ3BNYit2hUzHj3ukv3TWPc1wu
+H1mvTJeJEejVIPgiPwdDyn0tvQ==
 -----END CERTIFICATE-----
diff --git a/programs/ssl/test-ca/server2.key b/programs/ssl/test-ca/server2.key
index 72a355c..00ff58d 100644
--- a/programs/ssl/test-ca/server2.key
+++ b/programs/ssl/test-ca/server2.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEowIBAAKCAQEAp9NknKBv8VXkt6G5T1pKAN2ObP3F6UjfE2rgHTnEdzbdLpH8
+0mQ6yP+B+Dx3KToLvm66IlCx11Y0Z06wZxci4zqahyNRmt0OqH1K0BanPsAeUBOZ
+xOdzbVKSkA6hqZ8LWIeM/lauuFwkjN/2H5LdwKwifndH46dz9Ss3DTvUCiZsPq7T
+GvMqIkrPLsXNtfmZyNSAHhGjkO3ZjemM/KWfCZ1Rnaeyp7Cl2w3F0O8ToqJdCKos
+q132qyD/g8tXB4zQNGr4alX65dtDoZ8fxEbk6W9RFDXnS+kESNf+p09+o6Rt0m+L
+rUbtMaRmY0gIjZsNmqP1lXwPvDtZP3A6phNigwIDAQABAoIBAAcmUlr52ssFRcEs
++qAO0KhIyBCMnynZGOfS3clg9KW/iJy7S3ILIxX9DKRurwTqnCV4wiVEGs95tLHS
+AGHj8nCLxpmLP6bBVCaJb+59iJJ7zM7MhviEg75cjjHk7a40QF99JtyPBNKF2mjG
+Ac5Gi3vx2WZZ3o4sTBxdwvKlYdssxjMl2S/4faEA9TFEwKo3qAgEVRWE6OPSaIPg
+9kwS7IMNZtkqLQGCqRG7+bWkBevyZqsAh4zSL10p95lE7x9k0Fhuh3C3iaOr6Qxf
+wjsD+Qb07q8IFtyts9E8YkiLFd637XrGEQizKZg7/Ii4wl0aa4oXYNq/+j3VKz09
+M7mk5UECgYEA13zh09vTkdZyssXzfrVIzqY5JwZz1cG72L/pG9FtlELMWuPu7Pm5
+zbfOVvn3MlEgPfuYZXOrFzGEFva9LX8VN1KDvCQRqwmsePjN4FB/7yvPwAEL4l3A
+pXsowNZJn+bj5r0vDaQwR63J4/am71m7JDlyXwraspRm38chJBiNt90CgYEAx2Ca
+uEtwgK+7qz4ZSH7Ty+YOxvN9rLvSP0+zOPWPRxx2kOWjqu9HS6GvWK+Q3C+8kEB9
+X0zP1IgpTvKZfvVmwAMD2sjtij9u6LU2mienx/5cTH5fBrGXFkgqJqAeOMuf3h/t
+/QxfDhj7FLKP8cnO+03awxdkBhElEFrtcOHSDd8CgYBsWpVLbIwUFxsRncv0eL+l
+eZvfbbUtVP9Z3BYhMMvC81vCkD6B1oiBUt1kisir+nMV978HtIPhY7qhuWwixnYq
+nUk0f4aK1JBvO9x54MCTyRnr2Brbtny6ORWi8Z2P1A/g5FwWperJADA2er4yOJKL
+gn9qHxEdHtYjzAN0HQyV2QKBgQDFuCe3XBjVhXC3AX5RRnUDX8KHyjB3fEukPYWe
+lubfvnpWd2U3vtMVTeJ2MKWXtj9pTosGV0ZDnkRY5n0SSor7IAJSla/7yaxTWmIr
+vefFjZo6wZe7K6KJlkc2xtMxv71qqn940yvw7xUQEYRuY5O/5BVuI2QuIBKBhaqy
+pz+IQQKBgHx2M/dsRxZepOAkKDeiSg4ORoDD9FzQ5eWrW1EWI3W0+unqVIc0hqMB
+4d4vMaIQKH/KQAaxofTixMCXgcMt6Y7Sz6eMYxdkpywfd3cbMIdzVBvy3hceeurA
+PK2uD+d6Jg3HybfWEasGK1GUDfvnM0i77ChYC8gXsW/P8GXAdx6Y
 -----END RSA PRIVATE KEY-----
diff --git a/programs/ssl/test-ca/sslconf.txt b/programs/ssl/test-ca/sslconf.txt
index f468f1f..94e5954 100644
--- a/programs/ssl/test-ca/sslconf.txt
+++ b/programs/ssl/test-ca/sslconf.txt
@@ -25,12 +25,9 @@
 x509_extensions         = v3_usr
 
 [ my_policy ]
-countryName             = optional
-stateOrProvinceName     = optional
+countryName             = match
 organizationName        = match
-organizationalUnitName  = optional
 commonName              = supplied
-emailAddress            = optional
 
 [ req ]
 distinguished_name      = my_req_dn
@@ -38,16 +35,11 @@
 
 [ my_req_dn ]
 countryName             = Country Name..............
-countryName_min         = 2
-countryName_max         = 2
-stateOrProvinceName     = State or Province Name....
-localityName            = Locality Name.............
-0.organizationName      = Organization Name.........
-organizationalUnitName  = Org. Unit Name............
+countryName_default		= NL
+organizationName      = Organization Name.........
+organizationName_default = PolarSSL
 commonName              = Common Name (required)....
 commonName_max          = 64
-emailAddress            = Email Address.............
-emailAddress_max        = 64
 
 [ v3_ca ]
 basicConstraints        = CA:TRUE
diff --git a/programs/ssl/test-ca/test-ca.crt b/programs/ssl/test-ca/test-ca.crt
index 54b3d11..a96b81a 100644
--- a/programs/ssl/test-ca/test-ca.crt
+++ b/programs/ssl/test-ca/test-ca.crt
@@ -3,77 +3,78 @@
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: O=XySSL, CN=XySSL Test CA
+        Issuer: C=NL, O=PolarSSL, CN=PolarSSL Test CA
         Validity
-            Not Before: Nov 29 19:49:14 2007 GMT
-            Not After : Nov 29 19:49:14 2017 GMT
-        Subject: O=XySSL, CN=XySSL Test CA
+            Not Before: Jan 14 22:43:11 2009 GMT
+            Not After : Jan 15 22:43:11 2019 GMT
+        Subject: C=NL, O=PolarSSL, CN=PolarSSL Test CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:d1:f4:8c:48:85:e1:15:a8:92:f4:43:e4:e4:f8:
-                    ee:e7:63:bb:0a:50:39:09:0b:2f:09:be:4c:da:9d:
-                    f9:30:40:03:76:27:94:db:73:8a:af:77:bf:73:3a:
-                    e2:a5:9b:aa:0d:fd:26:b3:d1:37:98:e8:bc:21:82:
-                    86:17:92:90:bf:4d:d1:73:95:f4:a3:a8:07:be:51:
-                    15:2a:40:3b:29:d7:43:c0:f3:5e:1c:4a:37:34:f3:
-                    34:1f:06:d3:73:8a:4f:80:a1:e7:74:03:e3:b5:77:
-                    1f:63:54:ef:9b:9b:65:6b:d3:b5:0f:5f:6a:85:dc:
-                    ea:4f:5b:19:59:4d:e1:29:f5:ac:a7:8d:32:b3:83:
-                    0c:7f:f5:7d:44:ba:d4:82:ed:23:be:ae:51:c5:a8:
-                    57:1d:d9:53:f0:33:2f:36:3c:21:2c:cc:18:c4:6b:
-                    4f:57:ad:03:1e:80:92:a7:c8:15:8d:1c:e0:03:18:
-                    ae:d9:08:06:45:9a:af:72:68:f7:02:69:e6:01:e7:
-                    91:34:5f:ba:e7:7d:2e:4f:79:d7:c4:39:52:cc:3b:
-                    dc:8d:d9:2f:f3:67:94:5e:ed:3a:f8:1e:ad:39:e1:
-                    b4:df:f0:fb:5c:4d:4e:98:62:ac:5d:e5:45:ae:3a:
-                    b4:1a:a7:07:bd:40:c4:43:ba:64:58:c3:a0:e1:5b:
-                    93:77
+                    00:c2:89:ce:2a:17:e9:0c:14:33:8b:7c:8e:28:a8:
+                    57:73:0d:6d:59:d1:35:1d:a2:68:ad:99:dd:5b:bb:
+                    47:97:50:c8:b3:a6:f3:77:23:d8:5f:0f:06:14:a9:
+                    80:83:c1:a8:11:28:fd:c9:1c:1a:59:74:54:3f:ad:
+                    84:a5:ee:05:bb:e4:73:bf:70:aa:01:fb:8b:02:50:
+                    0a:dd:ad:b7:b5:36:35:89:3e:7c:48:b6:d5:b2:9b:
+                    a8:b6:79:cf:20:17:41:7d:72:2c:52:1b:66:b1:e2:
+                    4c:e7:86:43:fa:51:62:3d:6d:83:51:1b:aa:d6:10:
+                    c6:9b:43:c9:1c:9f:b1:e8:b3:d5:11:25:24:dc:57:
+                    17:42:6b:fc:26:54:50:67:5e:3f:54:c9:41:ba:fb:
+                    45:30:e6:62:05:b3:b9:cc:45:58:b0:9d:e8:fe:84:
+                    25:29:fe:b1:93:b6:11:e5:75:54:7f:d9:41:7b:0f:
+                    37:a7:4a:21:8d:b8:0d:18:5f:01:68:34:e2:4d:13:
+                    e9:a6:e1:f2:44:73:fe:a6:38:09:d1:11:22:04:78:
+                    f5:97:66:c7:56:c8:a3:6e:55:ed:45:f8:50:47:fd:
+                    84:a6:d6:a1:65:f2:08:17:2d:8a:ae:ea:54:8a:54:
+                    83:ca:d6:be:7c:fc:b0:ab:7a:df:63:b5:f3:ce:84:
+                    34:25
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:TRUE
             X509v3 Subject Key Identifier: 
-                F2:67:B1:5D:5F:51:5E:DA:51:89:E9:D9:E9:6B:CA:8B:AF:A5:2E:69
+                80:EE:21:48:46:6B:56:EA:9D:71:32:06:64:2F:4C:C1:B4:2D:A9:2E
             X509v3 Authority Key Identifier: 
-                keyid:F2:67:B1:5D:5F:51:5E:DA:51:89:E9:D9:E9:6B:CA:8B:AF:A5:2E:69
-                DirName:/O=XySSL/CN=XySSL Test CA
+                keyid:80:EE:21:48:46:6B:56:EA:9D:71:32:06:64:2F:4C:C1:B4:2D:A9:2E
+                DirName:/C=NL/O=PolarSSL/CN=PolarSSL Test CA
                 serial:00
 
     Signature Algorithm: sha1WithRSAEncryption
-        30:cf:17:9e:93:3b:0d:ec:3a:37:c3:fe:66:b2:eb:92:56:a4:
-        da:f6:c7:b1:95:e6:a5:a1:88:e5:b3:fd:d7:a3:ae:48:44:89:
-        4b:3e:ad:70:24:93:c8:5f:88:86:b0:c5:89:75:d7:14:86:9d:
-        af:66:d5:1c:de:cb:1d:45:12:fd:ba:61:61:a3:f0:f8:fa:8b:
-        12:2e:b2:75:62:8c:93:71:37:04:ba:ce:5e:0d:eb:bd:c2:41:
-        b5:d9:59:c8:d0:09:32:c4:58:bb:71:8d:0c:78:ee:b1:b0:9a:
-        f1:5c:05:49:79:82:84:bf:c2:19:fa:43:4b:e7:40:0a:20:86:
-        58:2d:a8:6e:9d:d4:16:d8:e8:88:5f:84:59:0b:fb:50:8b:40:
-        7d:7b:8a:e5:27:5d:c6:1c:51:3c:86:50:8f:22:1a:fa:c4:9b:
-        c2:84:68:9f:7d:96:15:47:94:de:3a:5c:cf:33:45:ba:92:44:
-        46:9c:a1:f5:42:4a:db:c1:e5:27:2a:1f:9f:cc:28:4c:94:53:
-        e6:b4:c6:0f:db:f5:65:19:e6:75:f2:ec:10:d1:99:27:94:9a:
-        fc:a1:0c:31:11:a8:28:4c:4c:88:10:58:60:05:83:33:e2:a9:
-        26:2d:5e:24:a5:76:63:12:23:4f:f1:6a:60:bd:38:fa:65:f4:
-        a9:da:f1:75
+        9a:e0:a9:b4:d5:0b:7d:cb:94:6d:f9:19:e9:27:ca:9f:b8:6f:
+        fa:4e:3d:06:4e:f3:d3:29:cb:1d:81:93:96:b2:3a:f3:e7:1a:
+        7e:35:64:ad:56:02:0f:d9:f0:d5:b4:dd:10:a0:4a:0a:e0:65:
+        4a:f5:3a:4e:44:40:c6:33:06:55:af:1a:ba:67:b2:10:1d:c6:
+        fd:e4:a3:77:09:9a:4a:92:c1:0f:39:35:4b:44:70:18:fa:63:
+        3c:cb:8c:b4:4e:37:96:3e:e3:fe:93:1b:18:cf:61:2b:12:8d:
+        34:cb:64:38:7b:8c:44:e8:e5:33:0d:8a:f8:e8:88:97:f4:01:
+        c9:0c:47:b5:6f:c9:ec:ec:b3:15:c1:9b:09:c5:05:66:52:80:
+        48:a3:33:00:b1:fe:8d:94:44:7d:4b:60:35:09:6a:de:51:a8:
+        82:3a:67:fb:ca:e3:92:e5:b8:2e:bb:22:a0:b7:4b:c4:06:2c:
+        94:80:3c:d9:7f:46:3c:0a:8d:7c:75:47:90:5a:57:f0:40:6e:
+        87:e8:93:20:80:0a:ce:05:c2:5d:40:94:9f:5e:c6:a0:53:6d:
+        86:74:3f:f8:6e:97:46:8b:3d:bd:1b:10:7d:4a:47:2e:81:38:
+        b9:d5:f5:57:aa:d0:0a:d1:b1:c9:dc:77:0e:80:02:c9:29:b2:
+        3f:75:34:44
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/programs/ssl/test-ca/test-ca.key b/programs/ssl/test-ca/test-ca.key
index 7814b49..5de4854 100644
--- a/programs/ssl/test-ca/test-ca.key
+++ b/programs/ssl/test-ca/test-ca.key
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,FED222215EA5FD24
+DEK-Info: DES-EDE3-CBC,56E8FCA0B56651D4
 
-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
+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
 -----END RSA PRIVATE KEY-----