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-----