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