Create 2048 bit test keys

14 files changed, 521 insertions, 307 deletions

diff --git a/tests/ca.pem b/tests/ca.pem
index dbf39ca..a1ec319 100644
--- a/tests/ca.pem
+++ b/tests/ca.pem
@@ -2,67 +2,100 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Validity
-            Not Before: Nov 26 21:33:12 2015 GMT
-            Not After : Nov 23 21:33:12 2025 GMT
+            Not Before: Oct  7 15:12:02 2018 GMT
+            Not After : Oct  4 15:12:02 2028 GMT
         Subject: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:b4:c1:ca:4f:95:3c:05:b2:5f:66:dd:40:4f:e8:
-                    67:c7:21:16:35:92:84:04:9b:79:93:9e:70:99:77:
-                    62:53:80:89:35:38:a4:fc:61:1f:b5:8c:10:cb:a5:
-                    44:a2:d2:73:46:9a:1c:5d:54:1d:6f:23:e9:25:e4:
-                    78:79:e9:05:4a:79:7d:b4:4c:db:e1:39:5d:ba:cc:
-                    73:b0:67:a8:4f:5d:82:00:b8:6b:31:f3:e6:6e:21:
-                    dd:7e:d8:c9:54:55:76:f7:e0:a5:26:26:03:a7:a0:
-                    f8:e0:79:09:e3:a1:83:da:a2:c6:be:04:19:ec:aa:
-                    ed:48:50:45:33:b1:53:05:a7
+                    00:b8:14:c3:7e:10:d4:0e:55:5e:8c:5c:14:07:14:
+                    da:a6:32:d4:35:37:23:7c:27:bd:29:69:4a:dd:ee:
+                    a7:9f:f3:7f:1b:f4:73:3d:0b:89:6a:a1:f7:35:ac:
+                    b0:20:42:b8:e6:f5:36:9f:83:d9:d6:d0:45:b9:60:
+                    0c:a9:dd:f6:28:b9:c4:b7:02:ee:63:cc:ba:3a:70:
+                    0c:34:75:46:9d:f1:7b:d5:5f:46:17:84:94:fc:00:
+                    f6:21:c3:e2:cd:6c:d1:33:bf:d9:c2:1c:5f:c8:af:
+                    91:20:0b:ed:c9:68:44:00:45:ec:9e:82:5a:62:c2:
+                    a7:53:de:58:db:7d:d5:2c:9e:8f:7c:15:b4:34:30:
+                    ab:b7:3d:ed:72:a2:5c:4a:51:d1:85:33:ad:e0:23:
+                    e9:12:02:b9:64:0b:d8:de:61:f8:d9:18:4e:43:32:
+                    73:d0:f2:df:c6:de:28:cf:f5:48:7e:46:7c:85:c6:
+                    1e:96:a2:32:b8:16:ff:96:71:81:a7:d1:87:d2:d9:
+                    0e:b8:9f:ad:45:14:a1:d3:b9:52:c8:59:63:77:17:
+                    fe:22:ac:f9:c1:97:12:97:98:99:ae:ac:48:1b:97:
+                    83:fa:88:e0:63:9b:bc:55:ea:e0:c7:ec:55:28:e9:
+                    28:2a:b4:be:08:e1:50:43:4e:41:df:10:b7:98:1e:
+                    dd:37
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:TRUE
             X509v3 Subject Key Identifier: 
-                F3:5C:99:6F:32:FE:98:E4:34:76:75:9A:45:FB:CC:C1:7C:07:5B:D1
-    Signature Algorithm: sha1WithRSAEncryption
-         95:9a:3f:ec:3b:dc:fb:64:1c:53:54:10:e5:04:5b:dc:4d:54:
-         a7:0f:bf:d4:e4:c2:9d:71:90:ff:eb:93:0b:6d:6f:e4:74:47:
-         91:c0:bb:13:c5:4a:ff:c4:87:94:5c:67:57:58:18:c7:49:79:
-         70:e3:d3:e5:de:4b:e6:fc:e9:e3:13:a8:3a:c8:05:8e:5a:b3:
-         97:f5:b1:66:3d:d7:d7:6c:e8:09:05:e0:34:46:a9:80:e8:52:
-         0e:d0:2c:5d:30:a5:fa:fb:27:93:f0:87:fc:fb:11:37:0a:0f:
-         2d:7c:2a:eb:c0:04:81:93:e0:1b:30:d9:cd:f6:07:36:c3:5a:
-         cc:2c
+                49:6E:7E:9B:16:48:9F:E9:B8:A7:DC:7C:0E:73:F6:26:2A:9C:9D:7C
+    Signature Algorithm: sha256WithRSAEncryption
+         a5:88:b0:1a:e3:fc:89:21:8f:d2:3f:39:5d:bd:84:1c:c9:1b:
+         58:16:8d:cc:f7:9d:6d:f1:19:29:05:51:c6:20:c5:cc:00:d5:
+         61:5f:8f:de:64:3a:43:81:eb:b2:21:7a:ec:19:6b:21:30:33:
+         bc:a3:7b:f7:2a:49:f5:8b:d3:48:dc:65:f0:29:f2:fd:3c:f5:
+         03:37:19:a3:56:d5:3c:42:60:29:df:ab:aa:36:95:16:eb:6c:
+         f2:2d:22:ca:5c:0d:e7:14:6e:f3:10:70:b9:d2:82:59:68:9e:
+         31:9d:39:f2:8a:6e:00:c3:2c:b5:ed:f9:fa:6f:f4:43:f1:98:
+         81:f3:89:ef:23:6d:fc:f1:33:2f:d7:fc:cc:28:2a:dd:3e:da:
+         27:8a:1f:5e:a9:7a:df:2e:c1:e5:c6:db:a9:74:c2:e2:9c:3e:
+         9b:2c:22:b1:2e:5d:90:09:c9:45:95:35:21:ca:08:12:19:4c:
+         8d:ca:a5:1d:2b:55:b3:44:d5:43:5d:86:bc:36:4c:e6:7a:29:
+         b6:21:ab:e8:a2:23:ec:e4:00:a0:6b:0f:bd:d5:77:64:64:30:
+         ed:d7:31:88:18:91:24:08:7b:9b:0f:62:8f:31:5c:11:f1:df:
+         d3:2d:e6:52:27:11:a0:8a:f9:5e:a9:a3:ea:e3:0c:83:56:2b:
+         95:6b:b9:f6
 -----BEGIN CERTIFICATE-----
-MIICQzCCAaygAwIBAgIBADANBgkqhkiG9w0BAQUFADBPMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEChMITTJDcnlwdG8xGDAWBgNVBAMT
-D0hlaWtraSBUb2l2b25lbjAeFw0xNTExMjYyMTMzMTJaFw0yNTExMjMyMTMzMTJa
-ME8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhN
-MkNyeXB0bzEYMBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQC0wcpPlTwFsl9m3UBP6GfHIRY1koQEm3mTnnCZd2JTgIk1
-OKT8YR+1jBDLpUSi0nNGmhxdVB1vI+kl5Hh56QVKeX20TNvhOV26zHOwZ6hPXYIA
-uGsx8+ZuId1+2MlUVXb34KUmJgOnoPjgeQnjoYPaosa+BBnsqu1IUEUzsVMFpwID
-AQABoy8wLTAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBTzXJlvMv6Y5DR2dZpF+8zB
-fAdb0TANBgkqhkiG9w0BAQUFAAOBgQCVmj/sO9z7ZBxTVBDlBFvcTVSnD7/U5MKd
-cZD/65MLbW/kdEeRwLsTxUr/xIeUXGdXWBjHSXlw49Pl3kvm/OnjE6g6yAWOWrOX
-9bFmPdfXbOgJBeA0RqmA6FIO0CxdMKX6+yeT8If8+xE3Cg8tfCrrwASBk+AbMNnN
-9gc2w1rMLA==
+MIIDSDCCAjCgAwIBAgIBADANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UECgwITTJDcnlwdG8xGDAWBgNVBAMM
+D0hlaWtraSBUb2l2b25lbjAeFw0xODEwMDcxNTEyMDJaFw0yODEwMDQxNTEyMDJa
+ME8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQKDAhN
+MkNyeXB0bzEYMBYGA1UEAwwPSGVpa2tpIFRvaXZvbmVuMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAuBTDfhDUDlVejFwUBxTapjLUNTcjfCe9KWlK3e6n
+n/N/G/RzPQuJaqH3NaywIEK45vU2n4PZ1tBFuWAMqd32KLnEtwLuY8y6OnAMNHVG
+nfF71V9GF4SU/AD2IcPizWzRM7/ZwhxfyK+RIAvtyWhEAEXsnoJaYsKnU95Y233V
+LJ6PfBW0NDCrtz3tcqJcSlHRhTOt4CPpEgK5ZAvY3mH42RhOQzJz0PLfxt4oz/VI
+fkZ8hcYelqIyuBb/lnGBp9GH0tkOuJ+tRRSh07lSyFljdxf+Iqz5wZcSl5iZrqxI
+G5eD+ojgY5u8Vergx+xVKOkoKrS+COFQQ05B3xC3mB7dNwIDAQABoy8wLTAMBgNV
+HRMEBTADAQH/MB0GA1UdDgQWBBRJbn6bFkif6bin3HwOc/YmKpydfDANBgkqhkiG
+9w0BAQsFAAOCAQEApYiwGuP8iSGP0j85Xb2EHMkbWBaNzPedbfEZKQVRxiDFzADV
+YV+P3mQ6Q4HrsiF67BlrITAzvKN79ypJ9YvTSNxl8Cny/Tz1AzcZo1bVPEJgKd+r
+qjaVFuts8i0iylwN5xRu8xBwudKCWWieMZ058opuAMMste35+m/0Q/GYgfOJ7yNt
+/PEzL9f8zCgq3T7aJ4ofXql63y7B5cbbqXTC4pw+mywisS5dkAnJRZU1IcoIEhlM
+jcqlHStVs0TVQ12GvDZM5noptiGr6KIj7OQAoGsPvdV3ZGQw7dcxiBiRJAh7mw9i
+jzFcEfHf0y3mUicRoIr5Xqmj6uMMg1YrlWu59g==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/ca_key.pem b/tests/ca_key.pem
index d2954a9..a5525db 100644
--- a/tests/ca_key.pem
+++ b/tests/ca_key.pem
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/makecerts.py b/tests/makecerts.py
index 4013aa7..e25a07b 100755
--- a/tests/makecerts.py
+++ b/tests/makecerts.py
@@ -18,10 +18,7 @@ import time
 
 from M2Crypto import ASN1, EC, EVP, RSA, X509, m2, util
 
-from tests.test_ec_curves import tested_curve
-
-
-t = time.time() + time.timezone
+t = int(time.time() + time.timezone)
 before = ASN1.ASN1_TIME()
 before.set_time(t)
 after = ASN1.ASN1_TIME()
@@ -34,7 +31,7 @@ def callback(self, *args):
     return ' '
 
 
-def gen_identifier(cert, dig='sha1'):
+def gen_identifier(cert, dig='sha256'):
     instr = cert.get_pubkey().get_rsa().as_pem()
     h = hashlib.new(dig)
     h.update(instr)
@@ -64,7 +61,7 @@ def req(name):
     reqqed = X509.Request()
     reqqed.set_pubkey(pk)
     reqqed.set_subject(make_subject())
-    reqqed.sign(pk, 'sha1')
+    reqqed.sign(pk, 'sha256')
     return reqqed, pk
 
 
@@ -111,7 +108,7 @@ def issue(request, ca, capk):
     # ext = X509.new_extension('authorityKeyIdentifier', 'keyid:%s' % auth_id)
     # # cert.add_ext(ext)
 
-    cert.sign(capk, 'sha1')
+    cert.sign(capk, 'sha256')
 
     assert cert.verify(capk)
 
@@ -150,7 +147,7 @@ def mk_ca():
     # ext = X509.new_extension('authorityKeyIdentifier', 'keyid:%s' % ski)
     # cert.add_ext(ext)
 
-    cert.sign(pk, 'sha1')
+    cert.sign(pk, 'sha256')
 
     save_text_pem_key(cert, 'ca')
 
@@ -190,7 +187,7 @@ def mk_recipient(ca, capk):
 
 
 def mk_ec_pair():
-    priv_key = EC.gen_params(tested_curve[0])
+    priv_key = EC.gen_params(EC.NID_secp384r1)
     priv_key.gen_key()
     priv_key.save_key('ec.priv.pem',
                       callback=util.no_passphrase_callback)
@@ -203,7 +200,7 @@ if __name__ == '__main__':
     os.chdir(os.path.dirname(sys.argv[0]))
 
     for key_name in names:
-        genned_key = RSA.gen_key(1024, m2.RSA_F4)
+        genned_key = RSA.gen_key(2048, m2.RSA_F4)
         genned_key.save_key('%s_key.pem' % key_name, None)
 
     ca_bits, pk_bits = mk_ca()
diff --git a/tests/recipient.pem b/tests/recipient.pem
index 18c1a8c..0a03e4d 100644
--- a/tests/recipient.pem
+++ b/tests/recipient.pem
@@ -2,67 +2,101 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Validity
-            Not Before: Nov 26 21:33:12 2015 GMT
-            Not After : Nov 23 21:33:12 2025 GMT
+            Not Before: Oct  7 15:12:02 2018 GMT
+            Not After : Oct  4 15:12:02 2028 GMT
         Subject: C=US, ST=California, O=M2Crypto, CN=Recipient/emailAddress=recipient@example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:96:8c:84:8c:7c:18:1a:d3:c2:62:5d:0f:08:a5:
-                    98:3d:8b:91:4c:34:6f:cd:15:af:56:1c:7d:f9:36:
-                    a6:01:3c:9c:63:cf:20:64:fa:77:24:a5:e1:cb:fe:
-                    8f:5a:c0:a8:90:1b:99:a3:02:6a:43:ef:f9:31:ac:
-                    79:01:f9:cc:46:11:7c:aa:d1:87:df:95:d4:f1:a4:
-                    7a:cb:fc:4c:2e:8b:33:22:f5:33:f8:53:6a:e8:22:
-                    48:18:96:f2:49:39:ff:33:99:03:e5:3d:c2:22:52:
-                    f1:33:96:20:bc:d1:c8:21:bb:4b:75:3d:2b:3d:51:
-                    4e:aa:0f:d5:73:5d:66:44:bf
+                    00:cf:c6:83:2b:8c:ea:4e:10:7c:5a:c6:45:07:45:
+                    f2:a6:17:55:33:f4:e8:24:df:4e:55:de:3d:0c:e6:
+                    a0:a5:e0:b0:eb:bd:0e:55:2f:4e:f3:69:38:f0:31:
+                    1d:0d:54:0c:39:d6:da:37:89:4c:ab:c1:9c:10:9f:
+                    8d:e1:e6:c1:eb:ad:97:c0:8a:a2:4f:6f:e6:10:a0:
+                    ad:f2:a0:11:4e:58:16:25:81:3a:5b:7d:6c:b4:e0:
+                    76:83:f2:67:eb:17:be:44:d9:5a:38:2c:2c:b6:f5:
+                    1a:d3:f5:48:85:6a:50:81:f1:74:0b:b1:22:92:cd:
+                    e9:1f:fb:a3:1d:ec:03:be:1b:66:05:e9:24:4e:0a:
+                    d7:7f:35:a3:92:d8:00:99:06:e9:ad:32:a0:df:7f:
+                    72:d0:de:82:f8:a7:7c:d7:41:73:68:97:7e:f3:de:
+                    ea:73:e6:7e:0b:d8:eb:a6:4e:eb:a2:20:e0:2e:5a:
+                    8a:5e:79:b1:dd:e1:a6:64:3e:a2:7a:70:be:6a:5b:
+                    65:e8:bb:a0:d0:4c:00:b3:a4:aa:2f:c3:0a:30:4d:
+                    9e:d1:89:c2:c0:67:51:a0:13:a1:d3:0a:a4:db:82:
+                    85:96:dd:c9:06:49:68:c7:36:e6:ba:60:2a:de:71:
+                    36:5c:3b:16:a9:fe:c8:e3:91:48:6a:62:05:c1:b8:
+                    11:ef
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                53:8D:DD:4F:8A:5E:49:19:AB:DC:2F:9D:AB:EA:C7:C3:CA:F6:F5:D4
-    Signature Algorithm: sha1WithRSAEncryption
-         10:b1:dd:34:bb:97:3e:3e:d8:e0:de:6a:99:c9:be:8c:b7:80:
-         c7:1d:30:db:3a:68:d5:a4:d9:02:76:2b:76:62:00:86:30:5a:
-         06:03:65:92:b9:00:a4:42:94:5f:74:c6:94:44:2e:8c:07:55:
-         f3:c1:6e:7a:0a:17:66:56:ef:50:af:a3:5f:f1:f7:97:66:29:
-         d3:b4:14:13:34:79:96:98:ad:58:db:20:e6:fc:fa:70:ac:1c:
-         22:90:bf:7b:c3:ea:e3:8a:0a:bd:ba:48:ff:e5:c9:50:83:18:
-         d9:1e:61:30:c0:c7:6c:ea:33:fe:d0:fc:a8:1a:f1:9b:a3:dc:
-         91:10
+                24:C1:B1:83:79:31:5E:54:5E:60:65:04:17:FB:76:D3:21:85:3B:68
+    Signature Algorithm: sha256WithRSAEncryption
+         11:54:e9:1d:b4:5b:36:d8:40:63:45:58:f9:e8:29:53:ff:3e:
+         c9:3a:2a:89:b7:98:99:50:d4:29:96:03:e2:7e:16:1c:f7:86:
+         2d:a3:92:2a:d8:60:16:d1:48:25:5d:9a:65:3e:27:16:c2:ca:
+         d9:20:62:88:d7:41:7a:9e:cc:bc:d3:a6:0a:af:d4:ea:14:72:
+         f1:00:13:ff:5a:a1:a1:d4:2e:89:76:98:23:28:60:1e:7f:6b:
+         0c:a7:41:f6:56:d3:48:60:7a:63:9d:11:19:b7:57:60:b2:2a:
+         23:a4:16:42:2f:9a:41:f3:3d:51:69:fc:30:c1:b2:34:26:89:
+         c3:b6:13:19:b9:ee:10:2c:52:36:b5:89:37:4b:ae:5a:76:b0:
+         ec:2c:c7:0f:8b:88:51:61:06:b7:9e:3b:df:d4:8e:2f:43:2d:
+         34:79:51:5f:19:4c:21:b4:fc:db:99:c4:08:11:a1:5c:80:31:
+         84:74:b5:0d:e2:3d:a4:e9:59:8d:f6:98:53:34:f1:df:18:0f:
+         c8:ce:42:47:fd:7d:3a:8b:c3:65:4e:e6:a1:40:0b:8b:0b:b4:
+         5c:dd:1b:d2:56:c2:52:ab:08:c1:36:e4:e9:f4:b8:63:4f:f6:
+         98:20:95:07:e5:d0:b3:f7:99:b4:ed:c7:ce:6a:3b:bb:19:94:
+         df:a5:ef:ce
 -----BEGIN CERTIFICATE-----
-MIICYDCCAcmgAwIBAgIBBDANBgkqhkiG9w0BAQUFADBPMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEChMITTJDcnlwdG8xGDAWBgNVBAMT
-D0hlaWtraSBUb2l2b25lbjAeFw0xNTExMjYyMTMzMTJaFw0yNTExMjMyMTMzMTJa
-MG8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhN
-MkNyeXB0bzESMBAGA1UEAxMJUmVjaXBpZW50MSQwIgYJKoZIhvcNAQkBFhVyZWNp
-cGllbnRAZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJaM
-hIx8GBrTwmJdDwilmD2LkUw0b80Vr1Ycffk2pgE8nGPPIGT6dySl4cv+j1rAqJAb
-maMCakPv+TGseQH5zEYRfKrRh9+V1PGkesv8TC6LMyL1M/hTaugiSBiW8kk5/zOZ
-A+U9wiJS8TOWILzRyCG7S3U9Kz1RTqoP1XNdZkS/AgMBAAGjLDAqMAkGA1UdEwQC
-MAAwHQYDVR0OBBYEFFON3U+KXkkZq9wvnavqx8PK9vXUMA0GCSqGSIb3DQEBBQUA
-A4GBABCx3TS7lz4+2ODeapnJvoy3gMcdMNs6aNWk2QJ2K3ZiAIYwWgYDZZK5AKRC
-lF90xpRELowHVfPBbnoKF2ZW71Cvo1/x95dmKdO0FBM0eZaYrVjbIOb8+nCsHCKQ
-v3vD6uOKCr26SP/lyVCDGNkeYTDAx2zqM/7Q/Kga8Zuj3JEQ
+MIIDZTCCAk2gAwIBAgIBBDANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UECgwITTJDcnlwdG8xGDAWBgNVBAMM
+D0hlaWtraSBUb2l2b25lbjAeFw0xODEwMDcxNTEyMDJaFw0yODEwMDQxNTEyMDJa
+MG8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQKDAhN
+MkNyeXB0bzESMBAGA1UEAwwJUmVjaXBpZW50MSQwIgYJKoZIhvcNAQkBFhVyZWNp
+cGllbnRAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDPxoMrjOpOEHxaxkUHRfKmF1Uz9Ogk305V3j0M5qCl4LDrvQ5VL07zaTjwMR0N
+VAw51to3iUyrwZwQn43h5sHrrZfAiqJPb+YQoK3yoBFOWBYlgTpbfWy04HaD8mfr
+F75E2Vo4LCy29RrT9UiFalCB8XQLsSKSzekf+6Md7AO+G2YF6SROCtd/NaOS2ACZ
+BumtMqDff3LQ3oL4p3zXQXNol37z3upz5n4L2OumTuuiIOAuWopeebHd4aZkPqJ6
+cL5qW2Xou6DQTACzpKovwwowTZ7RicLAZ1GgE6HTCqTbgoWW3ckGSWjHNua6YCre
+cTZcOxap/sjjkUhqYgXBuBHvAgMBAAGjLDAqMAkGA1UdEwQCMAAwHQYDVR0OBBYE
+FCTBsYN5MV5UXmBlBBf7dtMhhTtoMA0GCSqGSIb3DQEBCwUAA4IBAQARVOkdtFs2
+2EBjRVj56ClT/z7JOiqJt5iZUNQplgPifhYc94Yto5Iq2GAW0UglXZplPicWwsrZ
+IGKI10F6nsy806YKr9TqFHLxABP/WqGh1C6JdpgjKGAef2sMp0H2VtNIYHpjnREZ
+t1dgsiojpBZCL5pB8z1RafwwwbI0JonDthMZue4QLFI2tYk3S65adrDsLMcPi4hR
+YQa3njvf1I4vQy00eVFfGUwhtPzbmcQIEaFcgDGEdLUN4j2k6VmN9phTNPHfGA/I
+zkJH/X06i8NlTuahQAuLC7Rc3RvSVsJSqwjBNuTp9LhjT/aYIJUH5dCz95m07cfO
+aju7GZTfpe/O
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCWjISMfBga08JiXQ8IpZg9i5FMNG/NFa9WHH35NqYBPJxjzyBk
-+nckpeHL/o9awKiQG5mjAmpD7/kxrHkB+cxGEXyq0YffldTxpHrL/EwuizMi9TP4
-U2roIkgYlvJJOf8zmQPlPcIiUvEzliC80cghu0t1PSs9UU6qD9VzXWZEvwIDAQAB
-AoGATd8TNMN/iGjeVBjEjPlyvOrzVhKNfexojEcilgTBa0RZtHrPy8uOUyOGnwjm
-R8/9oMTV/G5kXw3CvQH0eaQnF5Ab83YWFhxdj96yxTl94x4UObQCXvN/puyxqxcx
-59HNzE7UVLmnVGYKFPVoR3jWYZEDaPMqtMFVKNqSeCWvSaECQQDGHzgWf1/egvhz
-94TIIMBmR/P/d6SUxEGDJQ1ekKbFyioArtbWDel9o0NiY4Rs3U9WCOSo+DMbdSYk
-8xcSQaPPAkEAwod+FppNBlKRdoN5njBsyu2loLlWPtD7unKLMeEYMmsbm+gxNi+m
-IsZzXc0WbsQXy0VA5SCm18bn+VQV/BRcEQJAHGIqmeaDqJAg4hRK3JT8m2qhhS7x
-0DJRpGUxhiO5EMsGu3RQ6PezRMGYDMdvGF2YWR4LDD4KrFtbLJ365y2qNwJBAJoj
-NDSCtQ+SczJeAQroQfwVjAyrbnw9qYjV5Bd0zXB90BWcSQovfUvGxXkI3YKNHHFz
-gXVMhwco03yLNRRVqZECQD3bL7xlxhZ9lPYiL2IKt4+CC7oqjr+02m/C/nyHdfwF
-apMtTW/vAlO09PT6IQTWAT1YxsWHWnu4plklK6OsEE8=
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/recipient_key.pem b/tests/recipient_key.pem
index af6f3a2..70ef775 100644
--- a/tests/recipient_key.pem
+++ b/tests/recipient_key.pem
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCWjISMfBga08JiXQ8IpZg9i5FMNG/NFa9WHH35NqYBPJxjzyBk
-+nckpeHL/o9awKiQG5mjAmpD7/kxrHkB+cxGEXyq0YffldTxpHrL/EwuizMi9TP4
-U2roIkgYlvJJOf8zmQPlPcIiUvEzliC80cghu0t1PSs9UU6qD9VzXWZEvwIDAQAB
-AoGATd8TNMN/iGjeVBjEjPlyvOrzVhKNfexojEcilgTBa0RZtHrPy8uOUyOGnwjm
-R8/9oMTV/G5kXw3CvQH0eaQnF5Ab83YWFhxdj96yxTl94x4UObQCXvN/puyxqxcx
-59HNzE7UVLmnVGYKFPVoR3jWYZEDaPMqtMFVKNqSeCWvSaECQQDGHzgWf1/egvhz
-94TIIMBmR/P/d6SUxEGDJQ1ekKbFyioArtbWDel9o0NiY4Rs3U9WCOSo+DMbdSYk
-8xcSQaPPAkEAwod+FppNBlKRdoN5njBsyu2loLlWPtD7unKLMeEYMmsbm+gxNi+m
-IsZzXc0WbsQXy0VA5SCm18bn+VQV/BRcEQJAHGIqmeaDqJAg4hRK3JT8m2qhhS7x
-0DJRpGUxhiO5EMsGu3RQ6PezRMGYDMdvGF2YWR4LDD4KrFtbLJ365y2qNwJBAJoj
-NDSCtQ+SczJeAQroQfwVjAyrbnw9qYjV5Bd0zXB90BWcSQovfUvGxXkI3YKNHHFz
-gXVMhwco03yLNRRVqZECQD3bL7xlxhZ9lPYiL2IKt4+CC7oqjr+02m/C/nyHdfwF
-apMtTW/vAlO09PT6IQTWAT1YxsWHWnu4plklK6OsEE8=
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/server.pem b/tests/server.pem
index 18f454c..681528d 100644
--- a/tests/server.pem
+++ b/tests/server.pem
@@ -2,66 +2,100 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Validity
-            Not Before: Nov 26 21:33:12 2015 GMT
-            Not After : Nov 23 21:33:12 2025 GMT
+            Not Before: Oct  7 15:12:02 2018 GMT
+            Not After : Oct  4 15:12:02 2028 GMT
         Subject: C=US, ST=California, O=M2Crypto, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:e3:10:2a:42:60:bf:b2:a7:d9:66:77:e8:00:d1:
-                    3f:52:ad:03:9d:9e:02:11:c6:63:d1:28:71:82:f2:
-                    17:e6:25:92:9f:51:5b:36:a7:9b:6a:b1:e2:40:ed:
-                    a8:92:48:7e:fd:a4:79:ed:f0:68:5b:7c:5a:ad:b4:
-                    8c:b3:d2:33:1d:f9:8e:c5:e6:f3:2f:2a:3a:e7:1a:
-                    81:6c:05:d8:03:0b:1b:fe:c8:a9:47:d7:d4:eb:af:
-                    79:b3:de:dc:62:83:42:5b:d8:9d:ac:ce:aa:b5:b8:
-                    01:28:82:ce:96:20:b4:b7:20:5d:18:cb:38:14:56:
-                    bc:8f:80:98:8c:64:92:a4:df
+                    00:f4:f3:38:31:09:92:0d:5d:8b:06:f0:43:e0:62:
+                    62:e1:71:eb:30:ba:d7:b9:57:db:8c:10:9b:9e:1e:
+                    76:45:ab:14:92:54:d4:47:34:ab:0f:95:f3:83:c5:
+                    f1:45:75:58:72:0a:e1:67:77:d0:d3:7e:6a:6f:5d:
+                    1a:a4:df:aa:96:c0:0f:8d:0a:95:9e:aa:e5:bc:7a:
+                    6f:ab:61:41:75:31:0c:da:a6:d5:0d:b3:42:f0:20:
+                    f6:2c:74:69:39:79:90:a0:c9:c2:23:ba:5a:c5:9c:
+                    8f:fa:4f:06:bb:04:8e:2d:a1:36:82:c4:23:99:18:
+                    1a:b7:56:0f:8a:ef:ff:57:22:51:96:ca:69:8f:a3:
+                    ae:91:b7:84:02:07:be:4d:55:f2:1c:f9:11:2a:ff:
+                    20:ab:0f:27:fb:79:75:6c:b2:53:e3:04:ea:4f:e5:
+                    51:3f:1e:b0:b5:7f:fa:de:0f:f6:e8:e6:85:a3:17:
+                    8c:b1:a6:dd:fc:e9:b8:92:d5:1c:73:d7:82:6e:60:
+                    6c:10:b3:22:ca:a5:d8:c5:d2:41:93:b3:57:3f:1b:
+                    cf:cf:78:4c:15:85:b1:ca:b6:84:13:1b:8f:42:ed:
+                    21:bb:90:a2:b7:39:9d:68:bf:4d:da:31:06:53:98:
+                    e3:de:8f:f8:3e:7d:25:f2:75:7e:d3:09:e4:eb:4d:
+                    59:c9
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                E0:A4:78:68:75:F4:4E:99:88:30:02:0D:4A:21:25:46:0C:0B:8A:29
-    Signature Algorithm: sha1WithRSAEncryption
-         1e:27:06:b3:3b:2d:b0:94:f3:94:79:8b:37:65:2a:7c:da:e2:
-         0b:9d:e0:6a:79:ba:f8:6b:e7:15:91:95:57:d9:95:55:7e:29:
-         84:86:54:26:d1:ed:1f:ca:92:cb:89:67:55:90:25:b4:10:06:
-         95:56:ae:15:5a:86:de:ae:4b:05:02:7f:c5:33:94:99:bf:2c:
-         0d:72:4b:56:2f:cc:b5:97:42:90:cf:46:d3:cd:b5:5d:8a:99:
-         29:fb:a6:72:43:dc:40:27:c8:84:78:77:88:00:61:c4:bd:55:
-         f5:57:1a:57:f6:49:16:94:f4:32:17:b0:63:90:02:11:39:76:
-         14:89
+                56:FF:B6:FD:ED:A3:76:04:AA:CB:1F:25:FB:A5:8D:9D:9A:D5:85:D3
+    Signature Algorithm: sha256WithRSAEncryption
+         53:99:54:2e:26:26:0c:81:b2:c6:5c:61:6f:1c:60:28:ed:f3:
+         1b:74:8e:e8:c1:3c:b5:35:e3:db:51:07:38:43:b0:57:0b:e5:
+         7e:fa:0a:9e:bd:bd:82:5a:ed:9b:67:0d:2b:61:4d:44:58:64:
+         a2:fe:bc:fb:90:80:d2:6b:e4:25:09:ea:ca:a1:17:e6:33:31:
+         09:62:b6:db:4c:21:f3:52:02:7d:ca:9a:f9:42:04:50:b4:d8:
+         a6:49:ea:bd:c0:13:05:c6:c4:d2:59:d6:30:87:80:c6:a3:92:
+         45:49:02:43:9c:4a:aa:c1:84:d0:ea:01:29:40:73:87:cd:8e:
+         aa:93:d3:33:7e:01:cf:b5:c1:4b:35:e7:20:1f:6d:7a:c5:d4:
+         a9:4a:c1:e2:26:f5:b7:a2:f5:04:31:45:74:30:9a:51:e7:19:
+         62:e4:d1:ab:f9:36:29:58:ec:90:f9:8c:3b:28:39:28:d7:8a:
+         a0:c3:ae:aa:a9:c2:05:6e:a9:f4:b6:62:1b:01:db:f9:3e:b9:
+         a4:d7:05:ac:76:b8:8a:12:57:b3:66:de:b0:d2:78:0d:07:9c:
+         15:1b:85:84:76:31:23:64:ce:1e:7f:be:1e:cc:d9:9f:c0:0c:
+         9c:20:b9:f0:2e:09:04:ca:d0:61:fc:ce:ba:df:28:c8:20:c8:
+         fb:63:1d:52
 -----BEGIN CERTIFICATE-----
-MIICOjCCAaOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBPMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEChMITTJDcnlwdG8xGDAWBgNVBAMT
-D0hlaWtraSBUb2l2b25lbjAeFw0xNTExMjYyMTMzMTJaFw0yNTExMjMyMTMzMTJa
-MEkxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhN
-MkNyeXB0bzESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDjECpCYL+yp9lmd+gA0T9SrQOdngIRxmPRKHGC8hfmJZKfUVs2p5tq
-seJA7aiSSH79pHnt8GhbfFqttIyz0jMd+Y7F5vMvKjrnGoFsBdgDCxv+yKlH19Tr
-r3mz3txig0Jb2J2szqq1uAEogs6WILS3IF0YyzgUVryPgJiMZJKk3wIDAQABoyww
-KjAJBgNVHRMEAjAAMB0GA1UdDgQWBBTgpHhodfROmYgwAg1KISVGDAuKKTANBgkq
-hkiG9w0BAQUFAAOBgQAeJwazOy2wlPOUeYs3ZSp82uILneBqebr4a+cVkZVX2ZVV
-fimEhlQm0e0fypLLiWdVkCW0EAaVVq4VWoberksFAn/FM5SZvywNcktWL8y1l0KQ
-z0bTzbVdipkp+6ZyQ9xAJ8iEeHeIAGHEvVX1VxpX9kkWlPQyF7BjkAIROXYUiQ==
+MIIDPzCCAiegAwIBAgIBATANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UECgwITTJDcnlwdG8xGDAWBgNVBAMM
+D0hlaWtraSBUb2l2b25lbjAeFw0xODEwMDcxNTEyMDJaFw0yODEwMDQxNTEyMDJa
+MEkxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQKDAhN
+MkNyeXB0bzESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA9PM4MQmSDV2LBvBD4GJi4XHrMLrXuVfbjBCbnh52RasUklTU
+RzSrD5Xzg8XxRXVYcgrhZ3fQ035qb10apN+qlsAPjQqVnqrlvHpvq2FBdTEM2qbV
+DbNC8CD2LHRpOXmQoMnCI7paxZyP+k8GuwSOLaE2gsQjmRgat1YPiu//VyJRlspp
+j6OukbeEAge+TVXyHPkRKv8gqw8n+3l1bLJT4wTqT+VRPx6wtX/63g/26OaFoxeM
+sabd/Om4ktUcc9eCbmBsELMiyqXYxdJBk7NXPxvPz3hMFYWxyraEExuPQu0hu5Ci
+tzmdaL9N2jEGU5jj3o/4Pn0l8nV+0wnk601ZyQIDAQABoywwKjAJBgNVHRMEAjAA
+MB0GA1UdDgQWBBRW/7b97aN2BKrLHyX7pY2dmtWF0zANBgkqhkiG9w0BAQsFAAOC
+AQEAU5lULiYmDIGyxlxhbxxgKO3zG3SO6ME8tTXj21EHOEOwVwvlfvoKnr29glrt
+m2cNK2FNRFhkov68+5CA0mvkJQnqyqEX5jMxCWK220wh81ICfcqa+UIEULTYpknq
+vcATBcbE0lnWMIeAxqOSRUkCQ5xKqsGE0OoBKUBzh82OqpPTM34Bz7XBSzXnIB9t
+esXUqUrB4ib1t6L1BDFFdDCaUecZYuTRq/k2KVjskPmMOyg5KNeKoMOuqqnCBW6p
+9LZiGwHb+T65pNcFrHa4ihJXs2besNJ4DQecFRuFhHYxI2TOHn++HszZn8AMnCC5
+8C4JBMrQYfzOut8oyCDI+2MdUg==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/server_key.pem b/tests/server_key.pem
index fdbdcdc..5994dc4 100644
--- a/tests/server_key.pem
+++ b/tests/server_key.pem
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/signer.pem b/tests/signer.pem
index 1e8d0c4..a7e2fb9 100644
--- a/tests/signer.pem
+++ b/tests/signer.pem
@@ -2,52 +2,74 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 3 (0x3)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Validity
-            Not Before: Nov 26 21:33:12 2015 GMT
-            Not After : Nov 23 21:33:12 2025 GMT
+            Not Before: Oct  7 15:12:02 2018 GMT
+            Not After : Oct  4 15:12:02 2028 GMT
         Subject: C=US, ST=California, O=M2Crypto, CN=Signer/emailAddress=signer@example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:cc:30:9e:34:85:38:82:c4:8d:f7:83:2e:8b:af:
-                    3c:a4:84:67:18:90:81:1c:f8:58:ab:d8:93:87:a1:
-                    a4:51:5b:6c:15:18:10:35:0d:29:7c:06:da:72:a7:
-                    a7:c4:1e:ae:55:82:ce:a9:69:c1:29:cd:6e:37:21:
-                    a6:92:ba:01:c2:da:09:7b:a5:9e:bc:81:60:6d:59:
-                    af:40:d3:91:11:d6:ea:31:1a:b8:35:a4:5d:0e:f2:
-                    3f:09:d1:ed:7d:34:98:bc:5f:94:f6:fd:ef:1e:56:
-                    33:af:12:d1:1a:f7:ea:ea:a5:06:cf:31:7a:4f:2f:
-                    1e:bd:61:26:cc:99:41:f7:93
+                    00:c8:85:86:3d:72:aa:91:d8:7b:11:02:05:92:b7:
+                    1b:bf:9f:35:be:88:56:db:96:f2:70:3e:98:3c:c3:
+                    62:42:ff:54:74:7a:63:e7:a9:4c:ae:52:48:a2:4f:
+                    ab:c5:6b:1d:de:39:b8:f0:89:36:15:f7:70:3d:a8:
+                    a6:c3:49:3e:10:d8:ae:ba:cf:1a:e6:dd:0b:d8:cd:
+                    d9:00:ea:57:f2:7c:2e:6d:89:80:95:68:b1:fd:06:
+                    bc:ea:ba:44:c1:fa:20:87:57:d3:ac:e5:b4:5d:ba:
+                    4f:10:20:82:5b:1b:27:75:b3:0c:ce:4f:79:3f:49:
+                    8e:e3:ba:14:30:cf:8a:82:11:65:59:78:7b:41:16:
+                    43:e8:ea:7f:a4:60:52:46:93:53:4e:de:87:3f:50:
+                    8a:56:c5:d3:04:5c:3c:a2:d3:b0:64:d8:ce:1e:75:
+                    ad:ce:cd:91:b1:58:cc:2d:a6:dc:da:b5:b2:c2:0e:
+                    2f:68:74:a7:a5:6e:61:4c:01:f2:d0:7d:83:66:78:
+                    66:9f:b9:87:33:cc:59:dc:03:82:6f:bb:98:0c:e9:
+                    10:63:12:ee:e9:05:c1:5b:98:7e:94:65:98:df:31:
+                    bf:59:90:f0:1c:6c:ac:2c:1b:dd:90:71:ab:11:95:
+                    8b:9c:f7:2a:2f:c0:0f:2d:b1:c8:5a:65:d6:a9:34:
+                    44:81
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                BD:A0:68:1F:3A:D8:6E:2B:DA:DB:54:09:D2:E6:39:3B:9B:04:6C:C4
-    Signature Algorithm: sha1WithRSAEncryption
-         9b:4b:80:33:97:ef:d6:b7:09:a5:f5:7f:43:20:71:d5:9b:83:
-         5d:52:3d:83:8e:df:51:d9:e5:bb:e3:d5:8a:aa:9d:5c:ff:2d:
-         e5:b7:4d:67:06:ee:f8:fd:62:99:1e:e6:ea:26:7a:24:09:87:
-         5b:3c:5a:4f:5f:e3:5a:a7:4d:98:10:82:b2:7e:38:13:07:f1:
-         62:33:0a:67:dd:61:f2:bd:9d:fb:83:0f:45:e0:b1:22:71:9f:
-         3c:c8:f6:98:a0:95:a9:cc:fa:57:ea:b7:26:86:c4:28:c0:97:
-         e4:a6:e2:86:85:39:aa:8f:41:ba:45:da:92:71:06:aa:38:b0:
-         2b:fd
+                68:03:33:27:D9:87:9A:EA:7D:41:D8:2D:EB:F9:EE:AB:C9:6A:C5:FA
+    Signature Algorithm: sha256WithRSAEncryption
+         47:27:62:6d:43:f3:f6:87:0a:8f:1f:f1:4b:2b:67:05:11:85:
+         b1:13:69:ca:de:1e:6f:8f:78:ae:b5:b7:75:ca:84:f3:58:26:
+         9d:c5:0b:0e:4c:e9:ce:1c:5d:69:03:6e:d7:2e:88:28:75:78:
+         c5:54:37:e6:70:4f:8f:92:fb:5f:ce:c2:b3:a3:74:77:e6:c3:
+         94:ab:c6:d2:69:bb:dd:d8:16:9d:36:2a:d1:c1:e1:0d:81:da:
+         96:9f:f1:ae:a4:b9:73:16:b1:98:b5:f9:6a:4c:8b:08:30:c3:
+         d6:31:3a:79:e2:ef:7f:db:4f:6f:13:f8:98:d6:b2:04:72:c3:
+         03:b2:ff:63:ad:ce:4e:8d:95:37:a6:dc:52:5e:5c:26:35:9f:
+         14:7e:9d:a0:04:46:00:ff:52:94:f1:2b:75:1c:52:f0:79:eb:
+         41:a8:39:a2:5a:63:cc:de:70:cd:82:72:77:1d:77:e1:3d:ff:
+         38:86:2d:12:4f:ab:4c:72:35:69:4f:ad:55:1d:da:ae:9d:0a:
+         23:4a:cc:2a:40:d8:4e:f5:bd:33:4c:eb:b7:47:41:82:2a:c9:
+         fc:64:0d:33:76:00:61:ba:b6:40:ca:24:96:5e:84:d5:4f:d2:
+         4d:2e:7a:31:a5:50:53:ba:eb:31:7b:78:9f:f4:43:f1:e5:54:
+         4f:59:dc:ba
 -----BEGIN CERTIFICATE-----
-MIICWjCCAcOgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBPMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEChMITTJDcnlwdG8xGDAWBgNVBAMT
-D0hlaWtraSBUb2l2b25lbjAeFw0xNTExMjYyMTMzMTJaFw0yNTExMjMyMTMzMTJa
-MGkxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhN
-MkNyeXB0bzEPMA0GA1UEAxMGU2lnbmVyMSEwHwYJKoZIhvcNAQkBFhJzaWduZXJA
-ZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMwwnjSFOILE
-jfeDLouvPKSEZxiQgRz4WKvYk4ehpFFbbBUYEDUNKXwG2nKnp8QerlWCzqlpwSnN
-bjchppK6AcLaCXulnryBYG1Zr0DTkRHW6jEauDWkXQ7yPwnR7X00mLxflPb97x5W
-M68S0Rr36uqlBs8xek8vHr1hJsyZQfeTAgMBAAGjLDAqMAkGA1UdEwQCMAAwHQYD
-VR0OBBYEFL2gaB862G4r2ttUCdLmOTubBGzEMA0GCSqGSIb3DQEBBQUAA4GBAJtL
-gDOX79a3CaX1f0MgcdWbg11SPYOO31HZ5bvj1YqqnVz/LeW3TWcG7vj9Ypke5uom
-eiQJh1s8Wk9f41qnTZgQgrJ+OBMH8WIzCmfdYfK9nfuDD0XgsSJxnzzI9piglanM
-+lfqtyaGxCjAl+Sm4oaFOaqPQbpF2pJxBqo4sCv9
+MIIDXzCCAkegAwIBAgIBAzANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UECgwITTJDcnlwdG8xGDAWBgNVBAMM
+D0hlaWtraSBUb2l2b25lbjAeFw0xODEwMDcxNTEyMDJaFw0yODEwMDQxNTEyMDJa
+MGkxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQKDAhN
+MkNyeXB0bzEPMA0GA1UEAwwGU2lnbmVyMSEwHwYJKoZIhvcNAQkBFhJzaWduZXJA
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIhYY9
+cqqR2HsRAgWStxu/nzW+iFbblvJwPpg8w2JC/1R0emPnqUyuUkiiT6vFax3eObjw
+iTYV93A9qKbDST4Q2K66zxrm3QvYzdkA6lfyfC5tiYCVaLH9BrzqukTB+iCHV9Os
+5bRduk8QIIJbGyd1swzOT3k/SY7juhQwz4qCEWVZeHtBFkPo6n+kYFJGk1NO3oc/
+UIpWxdMEXDyi07Bk2M4eda3OzZGxWMwtptzatbLCDi9odKelbmFMAfLQfYNmeGaf
+uYczzFncA4Jvu5gM6RBjEu7pBcFbmH6UZZjfMb9ZkPAcbKwsG92QcasRlYuc9yov
+wA8tschaZdapNESBAgMBAAGjLDAqMAkGA1UdEwQCMAAwHQYDVR0OBBYEFGgDMyfZ
+h5rqfUHYLev57qvJasX6MA0GCSqGSIb3DQEBCwUAA4IBAQBHJ2JtQ/P2hwqPH/FL
+K2cFEYWxE2nK3h5vj3iutbd1yoTzWCadxQsOTOnOHF1pA27XLogodXjFVDfmcE+P
+kvtfzsKzo3R35sOUq8bSabvd2BadNirRweENgdqWn/GupLlzFrGYtflqTIsIMMPW
+MTp54u9/209vE/iY1rIEcsMDsv9jrc5OjZU3ptxSXlwmNZ8Ufp2gBEYA/1KU8St1
+HFLweetBqDmiWmPM3nDNgnJ3HXfhPf84hi0ST6tMcjVpT61VHdqunQojSswqQNhO
+9b0zTOu3R0GCKsn8ZA0zdgBhurZAyiSWXoTVT9JNLnoxpVBTuusxe3if9EPx5VRP
+Wdy6
 -----END CERTIFICATE-----
diff --git a/tests/signer_key.pem b/tests/signer_key.pem
index ea97895..dda4f85 100644
--- a/tests/signer_key.pem
+++ b/tests/signer_key.pem
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/test_ssl_offline.py b/tests/test_ssl_offline.py
index b9e2a1a..3ffc1f1 100644
--- a/tests/test_ssl_offline.py
+++ b/tests/test_ssl_offline.py
@@ -19,7 +19,7 @@ class CheckerTestCase(unittest.TestCase):
 
         check = SSL.Checker.Checker(
             host=srv_host,
-            peerCertHash='0C6BBAFAD2D6F775C38596399E6C4E5680A701C2')
+            peerCertHash='0305E329FF3C9F1931B8DD3F0CF9F8E350E29839')
         x509 = X509.load_cert('tests/server.pem')
         self.assertTrue(check(x509, srv_host))
         with self.assertRaises(SSL.Checker.WrongHost):
diff --git a/tests/test_x509.py b/tests/test_x509.py
index 644c811..057d7da 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -27,7 +27,7 @@ class X509TestCase(unittest.TestCase):
         pass
 
     def setUp(self):
-        self.expected_hash = 'F0429E180321BB3C0CBEAB811360BB0E27CC0259'
+        self.expected_hash = 'BA4212E8B55527570828E7F5A0005D17C64BDC4C'
 
     def mkreq(self, bits, ca=0):
         pk = EVP.PKey()
diff --git a/tests/x509.der b/tests/x509.der
index 37252df..e3d1f11 100644
--- a/tests/x509.der
+++ b/tests/x509.der
diff --git a/tests/x509.pem b/tests/x509.pem
index bad9cb6..bd13265 100644
--- a/tests/x509.pem
+++ b/tests/x509.pem
@@ -2,66 +2,100 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 2 (0x2)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Validity
-            Not Before: Nov 26 21:33:12 2015 GMT
-            Not After : Nov 23 21:33:12 2025 GMT
+            Not Before: Oct  7 15:12:02 2018 GMT
+            Not After : Oct  4 15:12:02 2028 GMT
         Subject: C=US, ST=California, O=M2Crypto, CN=X509
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:da:2f:7b:77:b1:51:af:2c:29:c6:b0:4c:ae:c8:
-                    54:4e:b6:fa:15:9d:0a:21:9a:d6:e3:eb:e0:bf:41:
-                    66:58:c6:73:13:a4:81:29:8f:f0:1e:68:ff:ce:07:
-                    8a:2f:f4:13:bb:d2:a5:73:a4:1d:09:36:75:2a:8b:
-                    fb:be:11:d3:2b:8b:e8:34:b1:d4:5c:21:7e:82:5f:
-                    cc:aa:52:67:d5:92:e8:e3:b2:06:5e:04:72:5f:66:
-                    43:9e:6c:53:d8:21:3f:38:dd:78:29:a3:d8:d5:ae:
-                    23:49:88:28:40:b4:4e:61:70:0a:a5:bc:4e:fd:83:
-                    8b:cf:43:c0:c2:03:f7:cf:6b
+                    00:ef:90:05:eb:97:7f:e3:10:d7:09:f4:1d:64:2a:
+                    21:d2:ba:39:e6:2c:81:ea:93:2b:58:af:5d:2e:a3:
+                    34:90:7a:e4:60:af:5a:ef:f1:19:2a:e9:b7:18:43:
+                    f3:81:5e:77:4c:19:82:6f:00:4a:41:94:29:5a:0a:
+                    43:1a:a4:e9:c3:48:a8:66:04:ca:ee:ea:01:b6:54:
+                    02:1e:46:1a:a1:de:56:d1:47:6b:ab:09:20:d5:63:
+                    b3:b4:c7:84:bd:02:1d:79:56:8a:f1:f4:d6:27:72:
+                    b4:15:d2:5f:7a:73:db:d0:8f:0a:51:05:be:e7:79:
+                    0b:39:2a:d6:65:89:7d:d3:93:b5:25:8d:ce:9e:bb:
+                    67:7b:39:4a:83:2e:5d:e2:de:fd:e9:30:81:51:f4:
+                    1b:34:4b:d2:76:a0:9f:38:a8:53:6e:d9:9b:99:16:
+                    18:d7:41:5b:0e:e4:e4:a7:4c:cd:38:d3:ae:24:a0:
+                    ce:0f:1e:4f:25:24:a3:31:e6:94:97:92:f8:f5:4b:
+                    48:4b:5b:c1:cc:95:b8:4d:c6:66:c1:5c:3e:24:4f:
+                    b4:f3:98:f5:03:91:43:9b:de:a8:71:15:ef:2d:84:
+                    69:c7:35:02:fa:0f:41:95:cf:9e:b5:15:4f:7a:c6:
+                    2d:04:61:93:54:74:26:df:cc:22:2b:f7:c2:e8:06:
+                    04:0b
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                8E:13:25:4F:EF:B6:B0:60:C3:45:6D:4A:5C:28:CF:C9:04:EF:6B:1A
-    Signature Algorithm: sha1WithRSAEncryption
-         31:2f:60:27:3b:47:a5:4c:99:3b:c9:a7:02:b8:bf:39:72:f0:
-         bd:52:24:64:a1:ad:d0:a4:92:5f:71:a9:05:0f:25:38:43:51:
-         9f:59:ea:f6:bf:e1:ed:f4:c1:14:c0:af:1a:26:9c:a8:5c:d8:
-         6f:f5:a6:ab:8b:63:a6:6a:cb:8c:9a:29:8c:3d:b2:be:05:92:
-         e2:48:3f:36:30:95:c6:9d:1f:41:6c:d4:1f:ab:32:57:50:79:
-         07:0b:99:83:79:c0:28:6c:d2:ef:0c:72:e8:c3:dd:42:90:8c:
-         41:eb:69:1e:67:a3:53:20:ec:86:2b:db:e9:7b:74:1f:46:85:
-         df:c2
+                AD:29:34:8E:8E:5A:8A:93:76:3C:ED:9F:2C:E6:6A:18:D2:D0:AF:C2
+    Signature Algorithm: sha256WithRSAEncryption
+         35:d2:e4:c4:eb:01:ea:25:bc:31:91:06:6d:38:c0:86:f4:ad:
+         ef:59:f1:fa:f7:f1:26:04:4f:a3:92:4d:ea:7c:6a:8e:94:4d:
+         59:cf:55:3e:d2:21:19:e1:ec:1f:01:89:53:80:1e:3d:c1:23:
+         44:71:3d:f0:43:f4:3e:c7:d6:0e:45:62:64:7f:68:71:87:fe:
+         26:5f:a5:13:ce:05:ae:66:1a:2a:f0:98:4a:62:23:19:44:22:
+         cf:0f:38:be:0d:ec:60:fd:45:f3:29:c2:cd:f5:1d:6d:44:05:
+         11:ac:d2:a3:2f:63:3f:5e:7e:34:3c:fb:f6:70:2f:ae:d3:50:
+         16:57:57:58:ba:41:a0:65:f3:45:a9:f6:ae:2f:a1:8f:83:84:
+         59:4a:75:c4:58:b2:6b:4b:b5:25:5f:5a:a0:dd:d9:18:e2:d7:
+         a9:5a:da:0a:83:15:ab:08:a7:98:86:e2:fa:ba:4f:47:70:b6:
+         90:70:8d:05:ca:08:a9:94:be:27:af:43:a9:6e:ec:12:6a:b2:
+         8e:83:26:b8:72:cd:63:9b:19:a1:c9:ff:b2:c5:cf:ec:ce:7a:
+         13:b8:dd:06:9f:55:85:0d:23:a1:ae:5e:50:67:57:b4:8d:e3:
+         49:0f:c0:ee:42:06:64:6d:72:c4:7b:2b:7d:87:28:17:36:59:
+         01:44:dc:38
 -----BEGIN CERTIFICATE-----
-MIICNTCCAZ6gAwIBAgIBAjANBgkqhkiG9w0BAQUFADBPMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEChMITTJDcnlwdG8xGDAWBgNVBAMT
-D0hlaWtraSBUb2l2b25lbjAeFw0xNTExMjYyMTMzMTJaFw0yNTExMjMyMTMzMTJa
-MEQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhN
-MkNyeXB0bzENMAsGA1UEAxMEWDUwOTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
-gYEA2i97d7FRrywpxrBMrshUTrb6FZ0KIZrW4+vgv0FmWMZzE6SBKY/wHmj/zgeK
-L/QTu9Klc6QdCTZ1Kov7vhHTK4voNLHUXCF+gl/MqlJn1ZLo47IGXgRyX2ZDnmxT
-2CE/ON14KaPY1a4jSYgoQLROYXAKpbxO/YOLz0PAwgP3z2sCAwEAAaMsMCowCQYD
-VR0TBAIwADAdBgNVHQ4EFgQUjhMlT++2sGDDRW1KXCjPyQTvaxowDQYJKoZIhvcN
-AQEFBQADgYEAMS9gJztHpUyZO8mnAri/OXLwvVIkZKGt0KSSX3GpBQ8lOENRn1nq
-9r/h7fTBFMCvGiacqFzYb/Wmq4tjpmrLjJopjD2yvgWS4kg/NjCVxp0fQWzUH6sy
-V1B5BwuZg3nAKGzS7wxy6MPdQpCMQetpHmejUyDshivb6Xt0H0aF38I=
+MIIDOjCCAiKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UECgwITTJDcnlwdG8xGDAWBgNVBAMM
+D0hlaWtraSBUb2l2b25lbjAeFw0xODEwMDcxNTEyMDJaFw0yODEwMDQxNTEyMDJa
+MEQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQKDAhN
+MkNyeXB0bzENMAsGA1UEAwwEWDUwOTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAO+QBeuXf+MQ1wn0HWQqIdK6OeYsgeqTK1ivXS6jNJB65GCvWu/xGSrp
+txhD84Fed0wZgm8ASkGUKVoKQxqk6cNIqGYEyu7qAbZUAh5GGqHeVtFHa6sJINVj
+s7THhL0CHXlWivH01idytBXSX3pz29CPClEFvud5Czkq1mWJfdOTtSWNzp67Z3s5
+SoMuXeLe/ekwgVH0GzRL0nagnzioU27Zm5kWGNdBWw7k5KdMzTjTriSgzg8eTyUk
+ozHmlJeS+PVLSEtbwcyVuE3GZsFcPiRPtPOY9QORQ5veqHEV7y2Eacc1AvoPQZXP
+nrUVT3rGLQRhk1R0Jt/MIiv3wugGBAsCAwEAAaMsMCowCQYDVR0TBAIwADAdBgNV
+HQ4EFgQUrSk0jo5aipN2PO2fLOZqGNLQr8IwDQYJKoZIhvcNAQELBQADggEBADXS
+5MTrAeolvDGRBm04wIb0re9Z8fr38SYET6OSTep8ao6UTVnPVT7SIRnh7B8BiVOA
+Hj3BI0RxPfBD9D7H1g5FYmR/aHGH/iZfpRPOBa5mGirwmEpiIxlEIs8POL4N7GD9
+RfMpws31HW1EBRGs0qMvYz9efjQ8+/ZwL67TUBZXV1i6QaBl80Wp9q4voY+DhFlK
+dcRYsmtLtSVfWqDd2Rji16la2gqDFasIp5iG4vq6T0dwtpBwjQXKCKmUvievQ6lu
+7BJqso6DJrhyzWObGaHJ/7LFz+zOehO43QafVYUNI6GuXlBnV7SN40kPwO5CBmRt
+csR7K32HKBc2WQFE3Dg=
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/x509_key.pem b/tests/x509_key.pem
index 37e1508..0615b4d 100644
--- a/tests/x509_key.pem
+++ b/tests/x509_key.pem
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDaL3t3sVGvLCnGsEyuyFROtvoVnQohmtbj6+C/QWZYxnMTpIEp
-j/AeaP/OB4ov9BO70qVzpB0JNnUqi/u+EdMri+g0sdRcIX6CX8yqUmfVkujjsgZe
-BHJfZkOebFPYIT843Xgpo9jVriNJiChAtE5hcAqlvE79g4vPQ8DCA/fPawIDAQAB
-AoGBAKaIc27qUvSnesOCsST/Fwp1svBoSuFXdAnHcmXInzvHTPKDL2rvyFENx6IU
-My9i1uUXZN2dN+ReQpPVALMUm95KLoVGeKUyZTUSvLufbiUs6axcXROpADPSGmVB
-b1Ix2zH4epPlHGUJxHgg95maTsPCtFzSbDqgNOIv+7FThHKxAkEA8aWzJW2nUG1a
-0oADBn0DwzduQpwG++bcsAtyoCuC6F1NLQStr23BgtbYtKrEUAn+J1IXh/k2+YcX
-kTX7z++4dwJBAOclCnQPxIh27cM7MzxEtGD7UmDiROfqNybcJaL3isyK+zKc9N5H
-BLPVGGowU+vF4xEUg3vdlcEo2MtqOphZ0a0CQQDOrJ3QATz8uMrZBsuPnRS+voX7
-Sl9ey1Es8F2VSCGqg0IiosG6LPE46nBl9Tf6DNHm53tgvHGccUJi2/0HF0x5AkEA
-3UTvMdWaTQyUZQ056drXVfOgk5BnaB8lNrUN7mjL3Sy6dWQdYN9ZWBGJcrXa0Fw6
-FzKs/5lKb4N7rZZ+izOIbQJAL0JUFCqMb06v+vyft4Nerf5dFvXKApX1fX95GXVq
-jP+5aUP6nt96XLvMksCKPWBRmZvsgTqrlYE/bqMofubyTg==
+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
 -----END RSA PRIVATE KEY-----