Regenerate testing PEM files

And fix expected values to new certs.

Fix #77

14 files changed, 572 insertions, 292 deletions

diff --git a/tests/ca.pem b/tests/ca.pem
index 1444470..4ba2268 100644
--- a/tests/ca.pem
+++ b/tests/ca.pem
@@ -1,57 +1,100 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number:
-            b4:7e:b2:de:87:00:03:0b
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
+        Serial Number: 0 (0x0)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=M2Crypto ca, CN=localhost
         Validity
-            Not Before: Nov 21 15:31:30 2012 GMT
-            Not After : Nov 21 15:31:30 2015 GMT
-        Subject: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
+            Not Before: Nov 25 09:53:33 2015 GMT
+            Not After : Nov 22 09:53:33 2025 GMT
+        Subject: C=US, O=M2Crypto ca, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d2:2f:57:58:be:05:6d:45:14:d0:70:90:56:10:
-                    80:f6:e3:e6:8a:ff:1e:0b:58:fa:a1:e6:95:a1:23:
-                    8d:01:c6:48:85:99:ab:f9:1b:e0:9a:15:6a:d1:50:
-                    73:fb:8f:7c:d2:73:4e:4a:c0:88:f9:54:f9:86:d9:
-                    01:86:4e:02:68:bc:d0:1c:8d:d2:2e:ce:7e:54:ac:
-                    45:a5:b7:39:c6:e9:f4:e0:70:2c:57:e6:21:24:f6:
-                    52:f8:fa:0b:b3:63:53:ea:eb:11:ca:ef:90:32:9f:
-                    15:08:6b:2d:0e:3d:61:69:22:f2:0f:dc:08:65:45:
-                    34:a2:29:8e:66:5e:45:95:91
+                    00:ac:2d:ba:c7:d4:eb:43:79:61:9b:58:76:08:da:
+                    0e:68:e6:9a:45:98:6e:00:1e:43:b7:1e:b2:c7:90:
+                    86:65:bf:22:f2:c5:fe:d5:a5:55:4a:25:db:e6:c1:
+                    08:61:e0:75:1e:64:88:a9:83:ba:a9:13:e4:11:db:
+                    2b:3e:ae:c8:fb:2a:bc:a3:c3:99:20:98:38:f2:45:
+                    13:3f:77:40:bb:e4:17:c2:d8:e4:fd:9e:2e:c0:64:
+                    8f:77:9d:1c:b3:7b:fe:b4:4a:e5:b2:7b:5e:a5:b1:
+                    6f:bb:57:c9:24:34:99:76:43:f3:db:c4:b3:9b:cf:
+                    1e:e3:f2:d3:e9:dd:b9:e0:e0:d2:81:12:5b:d1:9a:
+                    0c:86:a1:8e:7c:78:75:04:18:b2:b4:ac:23:9c:04:
+                    bb:a8:4c:c4:59:3b:a1:c1:79:7d:ee:df:25:ad:2f:
+                    9e:32:32:69:91:b8:66:73:1b:fe:82:49:18:b9:37:
+                    51:80:73:60:3f:a5:b4:cb:4a:c0:80:90:6c:45:10:
+                    60:c9:3b:11:b1:c1:43:a7:14:64:f6:79:ce:35:3e:
+                    dd:bf:25:2e:86:e4:58:61:d3:dd:d2:47:5b:5b:53:
+                    4b:c6:1a:7f:75:7c:a4:7f:c5:5c:66:90:21:87:71:
+                    8f:9a:89:3a:c7:d8:c5:49:9a:25:d3:62:6a:a0:21:
+                    1e:1f
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                80:D9:6A:1E:15:FE:8B:61:51:62:60:4D:B3:CC:95:44:78:2D:89:E6
-            X509v3 Authority Key Identifier: 
-                keyid:80:D9:6A:1E:15:FE:8B:61:51:62:60:4D:B3:CC:95:44:78:2D:89:E6
-
             X509v3 Basic Constraints: 
                 CA:TRUE
+            X509v3 Subject Key Identifier: 
+                CB:9C:7B:A1:83:6E:F8:BA:25:5D:3A:E7:2F:ED:79:97:35:21:33:9E
     Signature Algorithm: sha1WithRSAEncryption
-        b0:37:88:ab:56:c5:19:e7:1b:d2:d3:c0:00:98:ff:f0:0a:35:
-        89:ff:a0:a8:14:bd:fc:84:b6:ee:6b:05:92:20:87:58:38:69:
-        b2:16:b8:89:f3:4f:3c:9d:0f:da:b6:ea:35:9f:cf:e9:4f:05:
-        19:8b:6a:06:68:51:96:1c:0f:60:23:80:19:ff:cd:3e:2b:4b:
-        0c:1a:ff:bd:f6:0d:6b:11:25:0f:ba:87:2c:46:47:c0:32:e8:
-        8a:14:4c:30:26:35:2b:58:9c:6b:c6:0e:d1:e3:c8:6a:b0:c0:
-        e0:82:98:77:07:2e:67:ba:0c:e5:a5:04:0d:81:ca:54:92:b5:
-        27:fa
+         1f:47:dc:2c:39:3e:26:20:c7:54:78:ca:d8:12:0f:f0:24:78:
+         a9:7c:11:7a:45:ef:03:7d:db:92:80:1b:41:17:b2:b8:9a:5d:
+         56:e7:37:c8:89:ad:f7:be:48:55:47:71:7a:d3:5e:c6:cc:38:
+         70:7c:1e:d1:96:22:5f:69:6a:17:8a:3b:a9:20:87:a0:41:26:
+         8d:35:61:96:c5:84:5f:05:c1:9a:f2:08:2c:fd:12:58:51:19:
+         24:6a:5f:16:19:41:bf:78:df:d4:b1:c3:0f:7b:2b:25:80:67:
+         79:dd:20:d0:dc:a0:27:01:5c:f2:6b:2a:ea:01:25:66:07:de:
+         cd:6a:25:4f:10:24:05:ca:01:94:78:4b:a3:9b:03:a7:61:42:
+         bd:f4:25:67:95:0e:f5:4e:46:d1:14:91:92:e4:ec:73:7a:62:
+         fc:e0:83:0a:ed:68:ad:dd:d7:1c:e6:92:d8:b1:37:b9:d8:87:
+         70:b2:a1:1a:a8:21:e8:cc:29:3e:9a:aa:10:ab:73:b6:40:24:
+         eb:de:21:5a:68:4c:2a:25:c9:68:09:9b:aa:ea:80:80:03:7d:
+         ad:cf:3d:f7:7b:5d:18:ee:8e:84:a0:62:4b:09:02:ad:42:a0:
+         d2:6e:aa:24:05:30:5f:47:00:32:77:40:31:60:86:e9:67:bc:
+         d3:d7:cf:a1
 -----BEGIN CERTIFICATE-----
-MIICbDCCAdWgAwIBAgIJALR+st6HAAMLMA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQKDAhNMkNyeXB0bzEY
-MBYGA1UEAwwPSGVpa2tpIFRvaXZvbmVuMB4XDTEyMTEyMTE1MzEzMFoXDTE1MTEy
-MTE1MzEzMFowTzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExETAP
-BgNVBAoMCE0yQ3J5cHRvMRgwFgYDVQQDDA9IZWlra2kgVG9pdm9uZW4wgZ8wDQYJ
-KoZIhvcNAQEBBQADgY0AMIGJAoGBANIvV1i+BW1FFNBwkFYQgPbj5or/HgtY+qHm
-laEjjQHGSIWZq/kb4JoVatFQc/uPfNJzTkrAiPlU+YbZAYZOAmi80ByN0i7OflSs
-RaW3Ocbp9OBwLFfmIST2Uvj6C7NjU+rrEcrvkDKfFQhrLQ49YWki8g/cCGVFNKIp
-jmZeRZWRAgMBAAGjUDBOMB0GA1UdDgQWBBSA2WoeFf6LYVFiYE2zzJVEeC2J5jAf
-BgNVHSMEGDAWgBSA2WoeFf6LYVFiYE2zzJVEeC2J5jAMBgNVHRMEBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4GBALA3iKtWxRnnG9LTwACY//AKNYn/oKgUvfyEtu5rBZIg
-h1g4abIWuInzTzydD9q26jWfz+lPBRmLagZoUZYcD2AjgBn/zT4rSwwa/732DWsR
-JQ+6hyxGR8Ay6IoUTDAmNStYnGvGDtHjyGqwwOCCmHcHLme6DOWlBA2BylSStSf6
+MIIDGDCCAgCgAwIBAgIBADANBgkqhkiG9w0BAQUFADA3MQswCQYDVQQGEwJVUzEU
+MBIGA1UEChMLTTJDcnlwdG8gY2ExEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNTEx
+MjUwOTUzMzNaFw0yNTExMjIwOTUzMzNaMDcxCzAJBgNVBAYTAlVTMRQwEgYDVQQK
+EwtNMkNyeXB0byBjYTESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEArC26x9TrQ3lhm1h2CNoOaOaaRZhuAB5Dtx6yx5CG
+Zb8i8sX+1aVVSiXb5sEIYeB1HmSIqYO6qRPkEdsrPq7I+yq8o8OZIJg48kUTP3dA
+u+QXwtjk/Z4uwGSPd50cs3v+tErlsntepbFvu1fJJDSZdkPz28Szm88e4/LT6d25
+4ODSgRJb0ZoMhqGOfHh1BBiytKwjnAS7qEzEWTuhwXl97t8lrS+eMjJpkbhmcxv+
+gkkYuTdRgHNgP6W0y0rAgJBsRRBgyTsRscFDpxRk9nnONT7dvyUuhuRYYdPd0kdb
+W1NLxhp/dXykf8VcZpAhh3GPmok6x9jFSZol02JqoCEeHwIDAQABoy8wLTAMBgNV
+HRMEBTADAQH/MB0GA1UdDgQWBBTLnHuhg274uiVdOucv7XmXNSEznjANBgkqhkiG
+9w0BAQUFAAOCAQEAH0fcLDk+JiDHVHjK2BIP8CR4qXwRekXvA33bkoAbQReyuJpd
+Vuc3yImt975IVUdxetNexsw4cHwe0ZYiX2lqF4o7qSCHoEEmjTVhlsWEXwXBmvII
+LP0SWFEZJGpfFhlBv3jf1LHDD3srJYBned0g0NygJwFc8msq6gElZgfezWolTxAk
+BcoBlHhLo5sDp2FCvfQlZ5UO9U5G0RSRkuTsc3pi/OCDCu1ord3XHOaS2LE3udiH
+cLKhGqgh6MwpPpqqEKtztkAk694hWmhMKiXJaAmbquqAgAN9rc8993tdGO6OhKBi
+SwkCrUKg0m6qJAUwX0cAMndAMWCG6We809fPoQ==
 -----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEArC26x9TrQ3lhm1h2CNoOaOaaRZhuAB5Dtx6yx5CGZb8i8sX+
+1aVVSiXb5sEIYeB1HmSIqYO6qRPkEdsrPq7I+yq8o8OZIJg48kUTP3dAu+QXwtjk
+/Z4uwGSPd50cs3v+tErlsntepbFvu1fJJDSZdkPz28Szm88e4/LT6d254ODSgRJb
+0ZoMhqGOfHh1BBiytKwjnAS7qEzEWTuhwXl97t8lrS+eMjJpkbhmcxv+gkkYuTdR
+gHNgP6W0y0rAgJBsRRBgyTsRscFDpxRk9nnONT7dvyUuhuRYYdPd0kdbW1NLxhp/
+dXykf8VcZpAhh3GPmok6x9jFSZol02JqoCEeHwIDAQABAoIBAQCc1qMXuLn9oqno
+yfHrKkaKA9Vvo+Q/s1HXkt0jsGDcefmpz/XMQ2invEjNr/Skw8OrxcQ/NcFolrfg
+FBcWaDynnkxrmJb5+++TsJxR6Z1MCgAi+1PMOrU3h+KwAKvOSxq+vKLzrDGRGUpA
+Cz0r/8Xy1v9hp5I8UbU/y0iB9fmF/4Ymxlckhp7Ozb+HJ0S5kaCJGrPMuLI9yXN9
+agRtLFNsp3xe0VcZy91KjmP+Y0ZLknkeLZ6nqlADG2fJ56aVwArwcStdDAhOqRDG
+RqErBcnEe02ZAh6+GUM6nuitGLUIqS8GZql0/Hs8tDhpi80B2dowhnxFTQJLbiec
+rNBrzbqhAoGBAOCIu85CjXeKn2Jsg9jECBZLvogjx3xS4gYVKOUBAL3BvmnVeIhw
+vp8++2QFvv7lseAE95dzj7zx1t0tVFu2R5IOz4wHmpOCAbiKBeUunm3VEUHubqbk
+nPyIUBEAeRpGRGhrWoeJQCev3MyIxj36mrWU1vJvFhwqkVZwP2LK9r6XAoGBAMRO
+t/CCwF/Apev98zRO25uVWWAw/fulVYlhJk9AI2UQW76Iy6J3KJQMnkKnPZsF2Mkw
+i4W2BbJS6dq5hWwDn9dEorT6v7+a590tIa23yf9BFXCSPAHJv27FGihh2/etvqOd
+n0i01RRnwfrm8Ffxf3uPHWQgfjjNLairW5RQKRW5AoGBAMpNaCkm/Z8/XuunKgQc
+W8z64eh3lD0H0G36kqYCiVBvR8jDdZ45Nwb0EDzGkJfJDMLytsHWdSOgIh+Vv/QB
+/+oxPf7Euxk8gaBre3RK1KPQ3YOx+DCWunsttjYbXwG1Xd1XHHIRz6PyZ9ZBRZyC
+NvJz8Fbuj9VA5UIkUHgKttZxAoGBAKVTjoIV/CIoQxS/KUYSa81aOI1UdXKryaAL
+m5H++FAzOLD80FMhe6FEBz0nUDDw+aRnJ/oSVDXcsmqs9/sCCmnnugglbbvWoBOb
+4NNHB+3bSE0oOzVeTcTiZqc/01uCjh2JsA4xjYrD35CJUj0efDj5TM14uBTqZ9u3
+hUchQ5ixAoGANhKmodj8VBWpomcCKOJ+ZXkdhbtlGowX1I5+O/UIy8INa9I7B9sd
+zAF6qmTHCXyKJHvQD1W5tBKWkrRhwkNdy0IOnv6bJtRMpAfmD0waPovStnQK0UVu
+fQq4G6A7R1csGhoRl8AhE8yYYt99czBwMA/0Vxm+anv2xf5Cp44JiDo=
+-----END RSA PRIVATE KEY-----
diff --git a/tests/ca_key.pem b/tests/ca_key.pem
new file mode 100644
index 0000000..49cf9cb
--- /dev/null
+++ b/tests/ca_key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEArC26x9TrQ3lhm1h2CNoOaOaaRZhuAB5Dtx6yx5CGZb8i8sX+
+1aVVSiXb5sEIYeB1HmSIqYO6qRPkEdsrPq7I+yq8o8OZIJg48kUTP3dAu+QXwtjk
+/Z4uwGSPd50cs3v+tErlsntepbFvu1fJJDSZdkPz28Szm88e4/LT6d254ODSgRJb
+0ZoMhqGOfHh1BBiytKwjnAS7qEzEWTuhwXl97t8lrS+eMjJpkbhmcxv+gkkYuTdR
+gHNgP6W0y0rAgJBsRRBgyTsRscFDpxRk9nnONT7dvyUuhuRYYdPd0kdbW1NLxhp/
+dXykf8VcZpAhh3GPmok6x9jFSZol02JqoCEeHwIDAQABAoIBAQCc1qMXuLn9oqno
+yfHrKkaKA9Vvo+Q/s1HXkt0jsGDcefmpz/XMQ2invEjNr/Skw8OrxcQ/NcFolrfg
+FBcWaDynnkxrmJb5+++TsJxR6Z1MCgAi+1PMOrU3h+KwAKvOSxq+vKLzrDGRGUpA
+Cz0r/8Xy1v9hp5I8UbU/y0iB9fmF/4Ymxlckhp7Ozb+HJ0S5kaCJGrPMuLI9yXN9
+agRtLFNsp3xe0VcZy91KjmP+Y0ZLknkeLZ6nqlADG2fJ56aVwArwcStdDAhOqRDG
+RqErBcnEe02ZAh6+GUM6nuitGLUIqS8GZql0/Hs8tDhpi80B2dowhnxFTQJLbiec
+rNBrzbqhAoGBAOCIu85CjXeKn2Jsg9jECBZLvogjx3xS4gYVKOUBAL3BvmnVeIhw
+vp8++2QFvv7lseAE95dzj7zx1t0tVFu2R5IOz4wHmpOCAbiKBeUunm3VEUHubqbk
+nPyIUBEAeRpGRGhrWoeJQCev3MyIxj36mrWU1vJvFhwqkVZwP2LK9r6XAoGBAMRO
+t/CCwF/Apev98zRO25uVWWAw/fulVYlhJk9AI2UQW76Iy6J3KJQMnkKnPZsF2Mkw
+i4W2BbJS6dq5hWwDn9dEorT6v7+a590tIa23yf9BFXCSPAHJv27FGihh2/etvqOd
+n0i01RRnwfrm8Ffxf3uPHWQgfjjNLairW5RQKRW5AoGBAMpNaCkm/Z8/XuunKgQc
+W8z64eh3lD0H0G36kqYCiVBvR8jDdZ45Nwb0EDzGkJfJDMLytsHWdSOgIh+Vv/QB
+/+oxPf7Euxk8gaBre3RK1KPQ3YOx+DCWunsttjYbXwG1Xd1XHHIRz6PyZ9ZBRZyC
+NvJz8Fbuj9VA5UIkUHgKttZxAoGBAKVTjoIV/CIoQxS/KUYSa81aOI1UdXKryaAL
+m5H++FAzOLD80FMhe6FEBz0nUDDw+aRnJ/oSVDXcsmqs9/sCCmnnugglbbvWoBOb
+4NNHB+3bSE0oOzVeTcTiZqc/01uCjh2JsA4xjYrD35CJUj0efDj5TM14uBTqZ9u3
+hUchQ5ixAoGANhKmodj8VBWpomcCKOJ+ZXkdhbtlGowX1I5+O/UIy8INa9I7B9sd
+zAF6qmTHCXyKJHvQD1W5tBKWkrRhwkNdy0IOnv6bJtRMpAfmD0waPovStnQK0UVu
+fQq4G6A7R1csGhoRl8AhE8yYYt99czBwMA/0Vxm+anv2xf5Cp44JiDo=
+-----END RSA PRIVATE KEY-----
diff --git a/tests/recipient.pem b/tests/recipient.pem
index e717a0f..ce6a02e 100644
--- a/tests/recipient.pem
+++ b/tests/recipient.pem
@@ -1,61 +1,101 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number:
-            b4:7e:b2:de:87:00:03:0f
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
+        Serial Number: 4 (0x4)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=M2Crypto ca, CN=localhost
         Validity
-            Not Before: Nov 21 15:39:34 2012 GMT
-            Not After : Jan  8 15:39:34 2023 GMT
-        Subject: C=US, ST=California, O=M2Crypto, CN=Recipient/emailAddress=recipient@example.com
+            Not Before: Nov 25 09:53:33 2015 GMT
+            Not After : Nov 22 09:53:33 2025 GMT
+        Subject: C=US, O=M2Crypto recipient, CN=localhost/emailAddress=recipient@example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:ac:b6:2e:f0:34:34:7d:d4:e6:63:79:60:53:b9:
-                    fe:91:a5:bf:49:ec:99:4c:33:2f:85:96:55:e8:09:
-                    dc:18:47:1a:72:49:04:a2:e8:78:73:57:c7:bb:e9:
-                    c7:aa:c5:07:84:14:b6:01:1c:e3:8a:fd:f3:19:01:
-                    11:9d:48:bc:24:8a:0f:c6:40:ed:d7:30:b1:92:ab:
-                    c2:61:8c:5d:ea:08:c6:c4:d6:a5:22:00:d9:aa:da:
-                    57:5d:cc:2f:1a:35:1b:31:de:dc:c7:3b:83:91:38:
-                    d9:07:e1:c7:a7:54:bd:94:95:10:c6:2d:dc:00:e1:
-                    28:99:b5:3b:28:95:aa:4e:d5
+                    00:a0:8b:36:9d:89:42:c2:7e:44:e1:f0:12:34:c7:
+                    47:00:87:70:b4:10:48:89:f5:45:1e:fb:bf:3b:c2:
+                    f7:21:79:52:eb:26:98:d9:a9:ea:91:98:60:9e:8a:
+                    a0:f3:53:3b:8b:c0:86:05:06:f9:00:7e:6e:e8:d9:
+                    35:71:1f:0d:a2:aa:2d:ac:06:26:a8:79:08:91:f3:
+                    45:b6:4a:c5:22:27:e2:21:88:5f:fd:6d:65:68:b3:
+                    29:28:34:d2:1f:71:62:bc:c7:2e:93:e7:b3:6c:5b:
+                    7d:a4:1c:73:42:50:9b:45:40:48:d8:75:c8:fb:b7:
+                    11:02:e5:09:61:8a:1b:b6:62:00:03:f2:d5:1d:65:
+                    2a:92:de:5b:5f:22:39:c4:13:47:b0:19:38:c9:4d:
+                    09:8c:30:68:3d:54:33:0e:46:04:ef:45:f3:2b:dd:
+                    a6:3c:2e:39:e9:72:d6:bb:86:11:f2:ca:b3:47:15:
+                    c5:b0:fd:2b:e5:51:bb:c2:8b:07:01:fb:da:5e:46:
+                    47:c4:04:a9:24:9a:49:33:25:c3:04:09:db:04:c3:
+                    89:00:2d:77:77:60:c7:99:b8:6c:6c:ee:80:6c:83:
+                    b2:67:9b:5f:2d:0a:a8:d7:39:f0:d5:44:4f:b6:98:
+                    09:f4:59:8a:14:3a:78:86:36:2b:2e:cd:6f:16:72:
+                    9f:55
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                CD:26:EB:42:79:6D:04:7F:95:23:46:1E:03:C9:40:2D:D2:00:AE:71
-            X509v3 Authority Key Identifier: 
-                keyid:80:D9:6A:1E:15:FE:8B:61:51:62:60:4D:B3:CC:95:44:78:2D:89:E6
-
+                08:E2:7D:A8:3F:05:93:AE:CA:CA:CE:73:8D:DC:65:FB:B9:0B:87:8B
     Signature Algorithm: sha1WithRSAEncryption
-        a9:5e:b2:4c:24:15:dd:49:d1:4d:e3:dd:e3:da:6b:23:99:45:
-        2d:a1:84:f2:9b:6e:48:3c:e9:ce:f8:7f:f3:1f:d3:85:99:94:
-        7e:19:8c:ca:be:3a:ca:97:b9:de:c8:4f:08:28:fc:7f:24:37:
-        95:e1:d5:60:97:07:2b:be:62:f4:02:1d:27:8f:9e:0d:36:1a:
-        d5:45:6f:27:c3:34:21:13:1b:28:93:9d:cb:a6:30:0d:8f:4a:
-        5f:4c:4a:97:7b:fe:ed:ce:18:84:5a:ec:4f:f8:84:2e:cb:72:
-        28:90:cb:e3:5a:f4:83:16:bd:a8:ef:f0:f5:12:6c:26:3e:af:
-        c7:a8
+         18:c2:e4:64:11:fd:92:8c:b0:67:00:e2:28:be:fd:4c:da:f7:
+         9a:4a:32:58:1c:db:aa:64:35:97:15:57:07:ca:a0:11:d3:a4:
+         68:01:c3:c8:58:70:d0:ee:7e:97:26:be:de:5e:eb:83:4c:9d:
+         a7:04:e7:ce:64:d6:d0:15:a8:e8:0e:a3:2f:9e:af:af:b7:05:
+         f7:20:0d:ba:32:ed:5b:33:97:b3:f1:b0:98:63:81:75:1d:2f:
+         83:26:e6:f0:7e:dd:aa:58:a7:ce:b6:62:0e:3b:22:07:08:08:
+         02:36:82:4d:55:05:ae:5d:cf:84:c1:10:fd:e2:74:db:76:78:
+         c2:05:f8:19:63:d7:2b:5a:bf:f7:73:79:73:7d:2e:90:ba:41:
+         fb:36:63:cb:76:ce:ec:69:a8:a3:ad:a4:13:fe:b7:66:18:56:
+         04:e8:c3:df:79:e0:50:fe:a6:fe:d9:1d:b7:ab:c0:36:ea:f5:
+         22:06:91:57:c2:2a:69:72:f2:3e:f3:34:7e:7a:f0:68:84:90:
+         56:d1:0e:2e:f3:34:f3:9a:c0:f7:70:e2:6a:fa:af:20:fb:2c:
+         cb:19:1e:cd:46:5c:64:b1:2e:4f:9b:d5:dc:d8:ae:6b:61:33:
+         78:cc:ac:a3:73:c5:0f:cb:22:5a:d0:3c:30:42:33:48:31:8e:
+         44:92:59:66
 -----BEGIN CERTIFICATE-----
-MIICtzCCAiCgAwIBAgIJALR+st6HAAMPMA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQKDAhNMkNyeXB0bzEY
-MBYGA1UEAwwPSGVpa2tpIFRvaXZvbmVuMB4XDTEyMTEyMTE1MzkzNFoXDTIzMDEw
-ODE1MzkzNFowbzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExETAP
-BgNVBAoMCE0yQ3J5cHRvMRIwEAYDVQQDDAlSZWNpcGllbnQxJDAiBgkqhkiG9w0B
-CQEWFXJlY2lwaWVudEBleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEArLYu8DQ0fdTmY3lgU7n+kaW/SeyZTDMvhZZV6AncGEcackkEouh4c1fH
-u+nHqsUHhBS2ARzjiv3zGQERnUi8JIoPxkDt1zCxkqvCYYxd6gjGxNalIgDZqtpX
-XcwvGjUbMd7cxzuDkTjZB+HHp1S9lJUQxi3cAOEombU7KJWqTtUCAwEAAaN7MHkw
-CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
-dGlmaWNhdGUwHQYDVR0OBBYEFM0m60J5bQR/lSNGHgPJQC3SAK5xMB8GA1UdIwQY
-MBaAFIDZah4V/othUWJgTbPMlUR4LYnmMA0GCSqGSIb3DQEBBQUAA4GBAKleskwk
-Fd1J0U3j3ePaayOZRS2hhPKbbkg86c74f/Mf04WZlH4ZjMq+OsqXud7ITwgo/H8k
-N5Xh1WCXByu+YvQCHSePng02GtVFbyfDNCETGyiTncumMA2PSl9MSpd7/u3OGIRa
-7E/4hC7LciiQy+Na9IMWvajv8PUSbCY+r8eo
+MIIDQjCCAiqgAwIBAgIBBDANBgkqhkiG9w0BAQUFADA3MQswCQYDVQQGEwJVUzEU
+MBIGA1UEChMLTTJDcnlwdG8gY2ExEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNTEx
+MjUwOTUzMzNaFw0yNTExMjIwOTUzMzNaMGQxCzAJBgNVBAYTAlVTMRswGQYDVQQK
+ExJNMkNyeXB0byByZWNpcGllbnQxEjAQBgNVBAMTCWxvY2FsaG9zdDEkMCIGCSqG
+SIb3DQEJARYVcmVjaXBpZW50QGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAoIs2nYlCwn5E4fASNMdHAIdwtBBIifVFHvu/O8L3IXlS
+6yaY2anqkZhgnoqg81M7i8CGBQb5AH5u6Nk1cR8NoqotrAYmqHkIkfNFtkrFIifi
+IYhf/W1laLMpKDTSH3FivMcuk+ezbFt9pBxzQlCbRUBI2HXI+7cRAuUJYYobtmIA
+A/LVHWUqkt5bXyI5xBNHsBk4yU0JjDBoPVQzDkYE70XzK92mPC456XLWu4YR8sqz
+RxXFsP0r5VG7wosHAfvaXkZHxASpJJpJMyXDBAnbBMOJAC13d2DHmbhsbO6AbIOy
+Z5tfLQqo1znw1URPtpgJ9FmKFDp4hjYrLs1vFnKfVQIDAQABoywwKjAJBgNVHRME
+AjAAMB0GA1UdDgQWBBQI4n2oPwWTrsrKznON3GX7uQuHizANBgkqhkiG9w0BAQUF
+AAOCAQEAGMLkZBH9koywZwDiKL79TNr3mkoyWBzbqmQ1lxVXB8qgEdOkaAHDyFhw
+0O5+lya+3l7rg0ydpwTnzmTW0BWo6A6jL56vr7cF9yANujLtWzOXs/GwmGOBdR0v
+gybm8H7dqlinzrZiDjsiBwgIAjaCTVUFrl3PhMEQ/eJ023Z4wgX4GWPXK1q/93N5
+c30ukLpB+zZjy3bO7Gmoo62kE/63ZhhWBOjD33ngUP6m/tkdt6vANur1IgaRV8Iq
+aXLyPvM0fnrwaISQVtEOLvM085rA93DiavqvIPssyxkezUZcZLEuT5vV3Niua2Ez
+eMyso3PFD8siWtA8MEIzSDGORJJZZg==
 -----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAoIs2nYlCwn5E4fASNMdHAIdwtBBIifVFHvu/O8L3IXlS6yaY
+2anqkZhgnoqg81M7i8CGBQb5AH5u6Nk1cR8NoqotrAYmqHkIkfNFtkrFIifiIYhf
+/W1laLMpKDTSH3FivMcuk+ezbFt9pBxzQlCbRUBI2HXI+7cRAuUJYYobtmIAA/LV
+HWUqkt5bXyI5xBNHsBk4yU0JjDBoPVQzDkYE70XzK92mPC456XLWu4YR8sqzRxXF
+sP0r5VG7wosHAfvaXkZHxASpJJpJMyXDBAnbBMOJAC13d2DHmbhsbO6AbIOyZ5tf
+LQqo1znw1URPtpgJ9FmKFDp4hjYrLs1vFnKfVQIDAQABAoIBAFc8LhoeCpuadx16
+ELqDCg68ib4eFvx3vO5gBwKXJygWP7stBuNHVAF3FhEv7NMrB/EhVPGIX2coTGXU
+GRj1sbgQ1q5hzUHAOqrr0JaEPGgZ2eM0skwH1JG2wIdrZD3Xo7pGVQXjYfhgIn45
+Q1vmZuiTTMHqBqLYT7MN9zH8FKDd9O0WD6hjp7AWdwp9xlyliuaw0/KO9icOaTRt
+EzU88+X2hCOff8W0uwVRyEN2od9EvE439faNLilEb62dMB//88cxY8ctJgcDX95y
+yyBnUZY5BCRr9+7qfI6ETvwGIRnf4uadwOhfaJVzTuEEq4nYJKjwHI+H1G7J7Zk1
+0GhZW4ECgYEA1ENS5BXx4m3LP9LfjUbWeyUr2XnmBhFkHBcw7rkDtxYqdLuXYfQg
+m+TM9BTZMunOC725P81qFB8Ks1NDXNHxxlUsSTPEASB4v1wDH03Bt71X0CgVXs0C
+S2fimbByNPzLU5iTKIkOZH6xpjqsEakfkHjG16cwSzv2p/3tCB7TK7UCgYEAwZ/A
+In/GJ1RwwyIeiWtUtlAyX3ctumt9MoPR74KgVR3WIOd7SdRpI8PmZLOjLacFWx68
+QTt6YxaX8XOm1PWonT83sQVopz0T5RxLPNbLIctQ/dMY3O1v/l6HZ33TxFg6Mb7q
+1D8nNo8J38peERNrA3ThxSQT8l3DWEtfGaaSKSECgYB0d9xrun7Wt1fm1VZEtrHJ
+MEQ3OGO2wKQlpbP7yRj4xPjWxHf0D3g1Ef5Dj4z+GrwsRRX4pEWodL/yVaWIsMnx
+AZsjL3xFAgQ/O8Waz5eTshkU5mmTcvnnVkFIA0EnQe5vGDDm9Q0opzvi8h6oMhxX
+sW2pttsQ7P4Sf4ooAoHsYQKBgQCVfCVVPTqZwLpyHJRg2cmEG7RYOeXHCBeXeWgK
+Ntpb/HYF31Ey9dfacfMdCgdQRqN+7uK+phHeEGJsWjKSNbrg9B6l/5wFicUjXE3G
+AbrAM30rCeAnKPUO+KInR2DINKlxIImiJcO7foFMEqu/GTPEbmej0S/JLZSURVR9
+tDkhoQKBgQC3NLgszAMrxZvbr/zaaacR/oEqKH22DfXmg46n3L/HbuhRNcW8XcLp
+K9DJBkg6r094Y/Vbt7VZmvYVJHvFbL0svopLvTn31s6MnYbJIOElc/6JQn6KpLAi
+0cEG5KNl9rq53ujYzTP0uOcqoNvFoFdq5F9i8DYuQSvJ7C9dt3j2wQ==
+-----END RSA PRIVATE KEY-----
diff --git a/tests/recipient_key.pem b/tests/recipient_key.pem
index 3f0bf13..b5c5991 100644
--- a/tests/recipient_key.pem
+++ b/tests/recipient_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/server.pem b/tests/server.pem
index 3feaa08..6311f83 100644
--- a/tests/server.pem
+++ b/tests/server.pem
@@ -1,75 +1,100 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number:
-            b4:7e:b2:de:87:00:03:0c
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=M2Crypto ca, CN=localhost
         Validity
-            Not Before: Nov 21 15:33:54 2012 GMT
-            Not After : Jan  8 15:33:54 2023 GMT
-        Subject: C=US, ST=California, O=M2Crypto, CN=localhost
+            Not Before: Nov 25 09:53:33 2015 GMT
+            Not After : Nov 22 09:53:33 2025 GMT
+        Subject: C=US, O=M2Crypto server, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:dd:9d:eb:7f:82:43:ed:f2:06:1c:1d:b3:fa:e1:
-                    41:8a:4b:bd:b4:1d:82:04:ee:63:b3:22:af:cf:94:
-                    88:36:52:18:3e:01:b6:37:15:59:93:7f:cc:88:5a:
-                    56:ea:02:c1:a2:bd:9f:c2:87:a4:f6:0e:cb:ca:e9:
-                    b8:c6:50:3c:87:30:15:7e:e0:4b:1d:b9:5f:8e:4f:
-                    2b:af:64:9b:24:14:01:a7:6a:47:ab:72:f5:26:66:
-                    a5:73:33:11:bf:81:28:4f:88:14:76:49:e1:7b:ce:
-                    b8:11:fd:3c:ad:83:95:8f:be:30:ec:78:ab:d7:68:
-                    b9:70:f5:87:7a:96:f7:35:dd
+                    00:b6:e3:fc:53:ac:1b:07:00:d0:fe:67:32:bf:06:
+                    1b:a7:cb:b3:b1:1b:1e:e4:1f:3a:47:c4:11:b1:98:
+                    02:4b:56:48:be:3d:3f:dd:62:47:35:3f:20:d8:2c:
+                    26:54:0d:0f:31:ed:7d:39:cb:b8:b8:19:87:0a:23:
+                    58:c5:b7:f5:a0:a3:9d:84:d7:99:be:9a:ef:a6:5e:
+                    9b:33:15:f0:52:a4:d9:8d:8c:c4:3c:cb:72:71:ff:
+                    ac:d6:2c:44:8a:55:62:12:7b:a5:a0:3a:07:0c:69:
+                    74:23:b5:2e:a2:18:ae:42:f5:c5:d1:09:da:89:45:
+                    f2:57:b3:b5:5a:14:af:a1:db:49:bb:05:92:11:d6:
+                    4a:b1:fa:a3:63:da:48:b7:f9:7e:a2:66:98:ea:4f:
+                    86:8b:fb:c5:39:74:76:0b:77:19:0c:50:16:0f:93:
+                    e8:e0:68:c5:34:05:40:c5:f1:f7:90:38:a1:ac:cf:
+                    27:2c:d3:94:c7:03:24:95:07:8a:10:bc:f5:4d:29:
+                    e7:e4:8a:69:e6:8e:0c:3e:15:d5:fc:92:d8:40:a6:
+                    fb:6c:61:bb:da:a2:54:57:d7:4f:0d:01:b7:f0:8f:
+                    94:77:a6:68:7c:45:3e:2a:31:24:d9:2c:44:07:2c:
+                    27:92:31:9c:50:dd:50:59:00:ca:4a:56:ea:52:2b:
+                    c1:c3
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                14:E4:DE:06:C8:F0:45:E8:3B:FD:48:7A:6C:9C:AC:14:1F:D5:DB:E0
-            X509v3 Authority Key Identifier: 
-                keyid:80:D9:6A:1E:15:FE:8B:61:51:62:60:4D:B3:CC:95:44:78:2D:89:E6
-
+                76:F8:21:52:19:69:E9:73:4C:28:29:4B:67:09:5A:A0:9C:83:79:BB
     Signature Algorithm: sha1WithRSAEncryption
-        74:b4:9d:87:61:b0:e5:8e:7b:38:11:1b:26:18:ba:f6:03:38:
-        1b:84:3f:be:95:70:eb:d6:1d:2c:d7:1e:d8:b7:26:62:84:db:
-        cb:f4:40:6b:af:97:0e:76:5f:fb:da:d7:2b:bb:c8:bd:38:a3:
-        02:c1:f2:60:f4:ec:11:d8:81:54:b6:7a:a4:5b:66:72:40:cb:
-        72:ff:12:a3:8f:e7:6a:76:73:b3:9f:72:4e:68:40:0c:11:bd:
-        bd:4d:93:2e:33:27:7d:8d:0a:93:c2:71:de:4f:a2:58:0c:8e:
-        f0:ad:d2:28:05:bc:04:72:30:6d:5b:d1:4e:73:48:f1:1d:83:
-        65:a6
+         23:19:69:7c:e1:c8:13:2f:a9:ae:0d:32:93:c8:73:9d:bb:80:
+         fc:86:37:b8:eb:e7:2d:24:74:4b:43:00:75:54:03:a2:fc:0a:
+         62:a2:1a:b2:5d:9b:54:db:b3:e0:56:25:f4:a4:bb:d3:89:51:
+         6b:a2:a6:31:93:68:cd:04:f2:a7:9a:a2:ff:13:ea:d0:7e:f3:
+         55:28:cf:71:4f:63:43:17:84:01:b9:fd:5e:8c:d2:a6:ef:7e:
+         1e:c0:03:10:19:1f:c7:5f:2f:7e:88:84:44:bb:da:49:d4:10:
+         02:17:5a:43:af:ef:4d:cb:b9:ef:07:7d:37:87:5d:7e:8f:d0:
+         25:58:32:c4:68:a6:45:7d:35:2d:3a:66:ef:99:dc:f9:5d:0f:
+         0f:5f:4d:af:58:9d:d5:09:2e:b0:28:de:25:42:09:0b:4d:74:
+         07:87:f9:8c:2e:a2:fa:00:20:37:11:8b:e3:51:41:b5:d3:54:
+         76:3e:4d:15:87:e0:e3:ef:2f:ba:1f:7e:4e:b4:dd:f6:bd:d2:
+         83:1f:0e:14:b7:05:30:9a:41:e4:16:ff:2d:a4:63:b9:dc:87:
+         5b:35:3d:0c:39:4c:9a:11:4f:59:2a:27:38:57:6a:15:12:d0:
+         af:16:82:bd:ab:93:36:04:b8:ca:ae:4a:65:30:72:8d:34:fa:
+         36:95:79:11
 -----BEGIN CERTIFICATE-----
-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
+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
 -----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
new file mode 100644
index 0000000..1b7b709
--- /dev/null
+++ b/tests/server_key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAtuP8U6wbBwDQ/mcyvwYbp8uzsRse5B86R8QRsZgCS1ZIvj0/
+3WJHNT8g2CwmVA0PMe19Ocu4uBmHCiNYxbf1oKOdhNeZvprvpl6bMxXwUqTZjYzE
+PMtycf+s1ixEilViEnuloDoHDGl0I7UuohiuQvXF0QnaiUXyV7O1WhSvodtJuwWS
+EdZKsfqjY9pIt/l+omaY6k+Gi/vFOXR2C3cZDFAWD5Po4GjFNAVAxfH3kDihrM8n
+LNOUxwMklQeKELz1TSnn5Ipp5o4MPhXV/JLYQKb7bGG72qJUV9dPDQG38I+Ud6Zo
+fEU+KjEk2SxEBywnkjGcUN1QWQDKSlbqUivBwwIDAQABAoIBAGfKKkAxw4TN6cz2
+M85EYR1wdKFlirpbHm/rzT7DzUmDxfRwPfYc99w33yPOqlG4t47V/+L0wfd4RTJz
+rMVICJUJRTNGR3Hr62S2+8yZ/rBn7S5vXE5EBsa7GhLRPHRk0Cs9EFlFlQpuLgK1
+p6lF6F8HqyNePC77CvTKf3iHlMR9AEBbo0TJu44x4b8/8kMcO6NQn5eigLmCF6yf
+Q/K6/mSLuNgnxHCZkf8quzVo+sBknqj3lec4lTKzMniSxZPCGItH3EWw+m4OIlB4
++VaYIFGF9v1P6NxWhPSJyM9EsNmffyEB2kTmCND7Uxb/wUvnaqUNO+dNaT6laUjF
+G4f6IUECgYEA3sRI+9DgrM3cBcPwCQ9xxjHWc2wXa9LasqaLp+POBqKWeZ8bwOxI
+E66R/MwUYISwEkNEe7ETh9URXFom3a1PN8M0UbUZ+QgBSRSXWO/MWdopLpdfjujl
+Clm8L/CO9GUjoFOq90RoFX8q1xItw3at8tz/yHkQWDiiA3R3J5Xckq8CgYEA0izI
+yVoI8ULLhanQsBTMq9UxlCxSenRjTu9C/7NCT9B2gQuHpycTvDLt73MJQYTKz4Z2
+lCTP4QkDpJObd/newq2VgBDXd8JaNacvrVhs6NSwgxOgK95qaAmRecwDwDJ9BNJs
+W/izmZ1I57mJ3wglSPDxEFQvUAnNdYQc2plb1y0CgYBTmq8Zcucfc5MjxsmLXPSC
+QaoOX37axKO3cLHxLJnh+5slwgUUfpj+agH4Mk9jeejqsbw9/9Moo1qEooD7qVOV
+xfkYwTMiN1LkLoouorC6+BmEluMSK23qWIs8IrhEGMEqJrx/WHkHuFZHqVbriNr3
+zuFgR69OrNKBIXCmtqO1mQKBgQDJa3/1b6K4TDIt48OKrDRFzSgZf6x/jIELycKk
+uM+pG/glzb3wVEPWjdx3KQDK2I9g+NU1Pl42pOPn2koZXc69NYvb0sgcDpdTaekI
+MIEXVZXf2HQc9qd1Ew5m8jz5+ajUcTDFp3+/jPusj6RwqSbKU5ZC9trs0qgjojvg
+xy479QKBgQCFvwKvwuArGcyIfbHe0beUNh3AxdfkP/Tbqk7HOhtMjp6yQlYA5AKF
+IPlt9srAvToN8Osft7YKauyzEFkPIRqr05uQR5F9a76/Nf0hYUYM2J/8wj8i6FBv
+wSVTm+f/weTa0weNB0bcgz1ebAmR5ybRviHPZ4fQ0rHRTtpncna+mw==
+-----END RSA PRIVATE KEY-----
diff --git a/tests/signer.pem b/tests/signer.pem
index b619f27..cdbf0b8 100644
--- a/tests/signer.pem
+++ b/tests/signer.pem
@@ -1,61 +1,101 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number:
-            b4:7e:b2:de:87:00:03:0e
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
+        Serial Number: 3 (0x3)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=M2Crypto ca, CN=localhost
         Validity
-            Not Before: Nov 21 15:37:55 2012 GMT
-            Not After : Jan  8 15:37:55 2023 GMT
-        Subject: C=US, ST=California, O=M2Crypto, CN=Signer/emailAddress=signer@example.com
+            Not Before: Nov 25 09:53:33 2015 GMT
+            Not After : Nov 22 09:53:33 2025 GMT
+        Subject: C=US, O=M2Crypto signer, CN=localhost/emailAddress=signer@example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a1:f3:c0:4b:84:03:54:c4:db:dd:95:75:4b:d2:
-                    e3:4b:63:5e:fb:e9:68:32:3a:79:3a:5b:3c:f1:ae:
-                    3c:65:11:a1:a2:86:d9:45:20:c1:a8:3c:e9:64:c6:
-                    5c:9a:58:ee:ae:d3:4e:af:07:95:80:5f:4c:fe:64:
-                    bd:65:ae:2c:91:fc:fa:bf:dc:aa:5f:da:36:4c:0a:
-                    77:61:e6:a4:f6:a3:54:92:bf:39:12:84:44:d9:ab:
-                    12:da:78:43:20:b6:50:6c:9d:87:3a:27:86:95:14:
-                    a7:9c:f2:d8:36:29:fb:1e:24:64:61:13:48:b5:de:
-                    17:61:49:6c:2a:61:da:03:b1
+                    00:e7:21:54:32:3c:2c:cf:74:fd:b3:7a:95:66:64:
+                    ef:3a:1b:25:69:a5:a8:32:a8:52:c9:1b:f7:e8:78:
+                    37:d4:04:75:c6:50:eb:11:de:bf:e1:c7:33:9c:e9:
+                    d1:22:9c:a8:f5:67:35:85:6a:8e:55:f8:db:ad:ad:
+                    7a:09:8d:5c:24:c7:cb:ea:16:0f:9c:bd:c5:f9:f7:
+                    b7:12:e5:4a:8e:a8:6a:a5:5b:d2:59:3b:06:0c:f4:
+                    41:e7:cc:a0:03:27:29:50:b9:a4:2b:2c:f1:80:7d:
+                    e7:bf:b9:ac:38:07:20:de:f7:da:36:1b:29:03:1e:
+                    9a:74:9b:94:86:3e:2c:b6:5a:ba:42:90:2a:4a:aa:
+                    60:f7:2d:a8:01:dd:43:c3:a4:02:98:94:c2:a2:ee:
+                    96:ba:0d:b3:8a:a6:7e:df:a2:af:77:1b:7b:95:df:
+                    b4:2e:13:c4:c3:53:bb:d4:56:c7:89:a3:af:88:99:
+                    d7:e0:9a:e5:c7:ca:86:5a:79:4f:8d:1a:30:6c:7e:
+                    96:6d:c4:44:e7:33:82:ba:12:0e:51:ec:37:23:20:
+                    f2:42:65:c9:1e:49:87:06:af:78:13:e5:c1:53:54:
+                    a4:53:69:c0:44:f6:21:ca:db:1f:d9:7e:bd:14:01:
+                    4a:6a:47:c9:1d:cf:05:05:9e:13:e3:f0:8d:88:c8:
+                    1e:ed
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                07:7D:13:C0:AF:F5:E4:63:CD:7C:64:68:FF:D2:67:FC:27:46:DC:04
-            X509v3 Authority Key Identifier: 
-                keyid:80:D9:6A:1E:15:FE:8B:61:51:62:60:4D:B3:CC:95:44:78:2D:89:E6
-
+                CD:C8:A1:2A:46:55:12:7D:1C:80:A8:FC:02:40:44:AF:2C:10:0A:C3
     Signature Algorithm: sha1WithRSAEncryption
-        00:64:bc:be:4b:42:72:54:ca:7e:02:28:87:90:07:c8:cb:ad:
-        ac:18:fa:89:bb:1e:a8:20:c1:1a:39:d2:e3:ba:b6:d9:1c:b6:
-        bf:bb:c7:dc:46:3b:99:ac:81:13:99:f7:88:9f:b2:ae:19:ff:
-        d7:37:c2:83:aa:ca:c8:d2:03:1f:ce:00:b8:86:2a:b0:2d:80:
-        e8:83:c0:83:34:8a:dd:9f:75:c5:df:61:ff:cc:c1:8b:ab:e0:
-        e1:13:02:ff:63:4b:1d:58:0b:5d:3a:a4:e9:a3:b5:3a:19:2f:
-        dc:a4:c2:4a:b4:46:5e:0c:fa:59:4e:c5:31:5f:a2:18:aa:c8:
-        a4:92
+         15:4c:84:77:01:c7:2a:7e:6a:d8:aa:21:0c:45:11:7c:50:2b:
+         79:2f:a9:a8:1c:e5:fb:08:43:0f:6e:2c:2c:3b:d5:1f:36:92:
+         65:3e:29:e3:5c:87:04:2c:8b:1a:63:77:19:9e:40:52:7a:06:
+         18:7d:76:6b:b5:16:66:50:47:a4:4e:29:77:0c:eb:e3:0e:88:
+         52:ba:cf:fb:1a:b0:fc:19:36:84:25:db:e8:e2:ae:89:0e:bb:
+         51:0c:e4:13:0b:b3:a5:70:83:66:98:b4:51:85:cf:fe:0c:5d:
+         f3:ec:08:af:34:20:70:d4:af:6d:66:07:52:71:60:03:03:eb:
+         01:76:a0:eb:66:62:6a:68:9d:72:fe:07:3e:56:6f:b7:01:6c:
+         f7:63:72:79:b2:c0:fe:5f:dc:42:ef:0e:35:36:10:38:06:8b:
+         de:63:d1:ca:f5:ed:1e:b7:73:c4:c3:df:b0:a4:8d:b9:f6:8c:
+         2d:1d:be:c0:07:2d:7c:ea:6f:78:d7:cd:00:bd:02:55:6a:01:
+         61:48:f2:13:a7:ea:9f:e0:0f:72:12:58:e2:9d:f4:ba:21:42:
+         a1:42:cd:1c:b4:e9:96:0b:8e:1e:75:6d:f6:4b:7b:94:c8:10:
+         4d:c0:a7:2c:8f:5f:97:ad:97:ba:a7:b1:16:1c:bb:96:d4:c0:
+         ef:cb:19:41
 -----BEGIN CERTIFICATE-----
-MIICsTCCAhqgAwIBAgIJALR+st6HAAMOMA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQKDAhNMkNyeXB0bzEY
-MBYGA1UEAwwPSGVpa2tpIFRvaXZvbmVuMB4XDTEyMTEyMTE1Mzc1NVoXDTIzMDEw
-ODE1Mzc1NVowaTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExETAP
-BgNVBAoMCE0yQ3J5cHRvMQ8wDQYDVQQDDAZTaWduZXIxITAfBgkqhkiG9w0BCQEW
-EnNpZ25lckBleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-ofPAS4QDVMTb3ZV1S9LjS2Ne++loMjp5Ols88a48ZRGhoobZRSDBqDzpZMZcmlju
-rtNOrweVgF9M/mS9Za4skfz6v9yqX9o2TAp3Yeak9qNUkr85EoRE2asS2nhDILZQ
-bJ2HOieGlRSnnPLYNin7HiRkYRNItd4XYUlsKmHaA7ECAwEAAaN7MHkwCQYDVR0T
-BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh
-dGUwHQYDVR0OBBYEFAd9E8Cv9eRjzXxkaP/SZ/wnRtwEMB8GA1UdIwQYMBaAFIDZ
-ah4V/othUWJgTbPMlUR4LYnmMA0GCSqGSIb3DQEBBQUAA4GBAABkvL5LQnJUyn4C
-KIeQB8jLrawY+om7HqggwRo50uO6ttkctr+7x9xGO5msgROZ94ifsq4Z/9c3woOq
-ysjSAx/OALiGKrAtgOiDwIM0it2fdcXfYf/MwYur4OETAv9jSx1YC106pOmjtToZ
-L9ykwkq0Rl4M+llOxTFfohiqyKSS
+MIIDPDCCAiSgAwIBAgIBAzANBgkqhkiG9w0BAQUFADA3MQswCQYDVQQGEwJVUzEU
+MBIGA1UEChMLTTJDcnlwdG8gY2ExEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNTEx
+MjUwOTUzMzNaFw0yNTExMjIwOTUzMzNaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQK
+Ew9NMkNyeXB0byBzaWduZXIxEjAQBgNVBAMTCWxvY2FsaG9zdDEhMB8GCSqGSIb3
+DQEJARYSc2lnbmVyQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA5yFUMjwsz3T9s3qVZmTvOhslaaWoMqhSyRv36Hg31AR1xlDrEd6/
+4ccznOnRIpyo9Wc1hWqOVfjbra16CY1cJMfL6hYPnL3F+fe3EuVKjqhqpVvSWTsG
+DPRB58ygAycpULmkKyzxgH3nv7msOAcg3vfaNhspAx6adJuUhj4stlq6QpAqSqpg
+9y2oAd1Dw6QCmJTCou6Wug2ziqZ+36Kvdxt7ld+0LhPEw1O71FbHiaOviJnX4Jrl
+x8qGWnlPjRowbH6WbcRE5zOCuhIOUew3IyDyQmXJHkmHBq94E+XBU1SkU2nARPYh
+ytsf2X69FAFKakfJHc8FBZ4T4/CNiMge7QIDAQABoywwKjAJBgNVHRMEAjAAMB0G
+A1UdDgQWBBTNyKEqRlUSfRyAqPwCQESvLBAKwzANBgkqhkiG9w0BAQUFAAOCAQEA
+FUyEdwHHKn5q2KohDEURfFAreS+pqBzl+whDD24sLDvVHzaSZT4p41yHBCyLGmN3
+GZ5AUnoGGH12a7UWZlBHpE4pdwzr4w6IUrrP+xqw/Bk2hCXb6OKuiQ67UQzkEwuz
+pXCDZpi0UYXP/gxd8+wIrzQgcNSvbWYHUnFgAwPrAXag62Ziamidcv4HPlZvtwFs
+92NyebLA/l/cQu8ONTYQOAaL3mPRyvXtHrdzxMPfsKSNufaMLR2+wActfOpveNfN
+AL0CVWoBYUjyE6fqn+APchJY4p30uiFCoULNHLTplguOHnVt9kt7lMgQTcCnLI9f
+l62XuqexFhy7ltTA78sZQQ==
 -----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA5yFUMjwsz3T9s3qVZmTvOhslaaWoMqhSyRv36Hg31AR1xlDr
+Ed6/4ccznOnRIpyo9Wc1hWqOVfjbra16CY1cJMfL6hYPnL3F+fe3EuVKjqhqpVvS
+WTsGDPRB58ygAycpULmkKyzxgH3nv7msOAcg3vfaNhspAx6adJuUhj4stlq6QpAq
+Sqpg9y2oAd1Dw6QCmJTCou6Wug2ziqZ+36Kvdxt7ld+0LhPEw1O71FbHiaOviJnX
+4Jrlx8qGWnlPjRowbH6WbcRE5zOCuhIOUew3IyDyQmXJHkmHBq94E+XBU1SkU2nA
+RPYhytsf2X69FAFKakfJHc8FBZ4T4/CNiMge7QIDAQABAoIBADli/RS7/CRGV/eI
+KDAUP5Gdy9w/VVO+l093skX2E2aA9P0YekUlmV7lptr+8v41B35m8dL+cfjGoUSu
+He7hOk+ni+nDMH0qYU1/Q+VdKPXiuxfzhHbDQO1WeEald9VQk+GHNkvCDPRqTnA8
+GZaPromt4HAurjAoGRF6z5XFOjTMOSzirUqRTzNVd+w3CLqRU2eAoY0A9+zU1I2k
+/khlTMW6IpJ/wVDgbUwqgapia0DQLTSUh6kx6KXJoajygGA6YrCjQqIw9bWBnEWC
+kLMqP9hI/MCXrWQNgFOpdQKIidfjR/vbvpOCMKmvZkwDiuBHCW40c9tli6Dh1GSy
+lksrIgECgYEA/asEEmzeXLW03azWchcYhsVm5EIWVpM2rb96+NYk1zBbV/B/r6lE
+wLx2Zdud8lXdpXk29EYmvVR+vFUVuqtReBPUlDwo0AvM5eRUWD7ibqXkVSTyD5FA
+FlgVp4MEM0gveXGfGfJOY4jddPMSh1juisRRrlv2vVPJqdapwG/P0MkCgYEA6UFF
+s/oC/WLgku1Vh6SVVSw5jp66eFHvavJJy00l6bkswIVesvOJ0j1dfuzTraGYgk7K
+6KxtVSK1pXsg+wmja2XpZAcCiaXrvrSIP6zrRxCbLnV8EDXFJ6oq69Ca4NpbShvh
+ZGI/9/d7BljNA5QGw9hWu5vwVbCccwLYoFOZMwUCgYAPi1tEhcdahwf+TYkWlLO8
+DnyvoB0eUQcYvpMajITVavEuAl7QtN6xsNrQgxS6tOhQK41iiqn1ECh0AgLC3Zyw
+bwanzsfxd8emjsdcYP4fKatETG9I5O24cM1i5nRrcBD4sC2/uUl0b/6iHAMWqCx1
+9HHM7XXBRFEnRzA/yppBgQKBgHUT5SesItoKSkyVQev+qVICC7XRaClCfxjAGlgo
+FhKVdqf/iYPrB892K7qspqctSD6HzAMzoQEtld1Ey04WDWe31Ij3l8d9d7HWLdlA
+MywNYsbUA3yjcJ0zJa4Nm9+m2lF9Ywme4xrUpnSOGAFmyGp+6THr2Js6NZzo3dDD
+hU79AoGABwcWCKe8E3LoQsgnMX+HypAq1gLxRsnmz8MEjVN/TaIxTahgcjOy/2zu
+YvUzuPQPkM3qt+SU8iR05wOsDb4qRigAiRiHGExu2hi82nqvTfpuMjMnHHOsALtA
+DjXHHYMJSSMFAs2p1F70IbiCwKu27tAxLA+ZN6VaHodQlHIBPj4=
+-----END RSA PRIVATE KEY-----
diff --git a/tests/signer_key.pem b/tests/signer_key.pem
index ea55dea..300bf37 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_smime.py b/tests/test_smime.py
index 3879533..a637edd 100644
--- a/tests/test_smime.py
+++ b/tests/test_smime.py
@@ -241,7 +241,7 @@ class WriteLoadTestCase(unittest.TestCase):
         buf = BIO.MemoryBuffer()
         self.assertEqual(SMIME.load_pkcs7(self.filename).write_der(buf), 1)
         s = buf.read()
-        assert len(s) in (1188, 1204, 1243, 1263), len(s)
+        assert len(s) in (1188, 1204, 1433, 1243, 1263), len(s)
 
     def test_load_pkcs7(self):
         self.assertEqual(SMIME.load_pkcs7(self.filename).type(), SMIME.PKCS7_SIGNED)
diff --git a/tests/test_ssl_offline.py b/tests/test_ssl_offline.py
index 6088fbd..9612772 100644
--- a/tests/test_ssl_offline.py
+++ b/tests/test_ssl_offline.py
@@ -11,23 +11,22 @@ try:
 except ImportError:
     import unittest
 
-from M2Crypto.SSL import Checker
-from M2Crypto import X509
-from M2Crypto import SSL
+from M2Crypto import Rand, SSL, X509
 from test_ssl import srv_host
 
 
 class CheckerTestCase(unittest.TestCase):
     def test_checker(self):
 
-        check = Checker.Checker(host=srv_host,
-                                peerCertHash='6D5C51BF6C90686A87E015A07731B252B7638D93')
+        check = SSL.Checker.Checker(
+            host=srv_host,
+            peerCertHash='A889D8A9861AB18265E0D504F60F81BBDC288128')
         x509 = X509.load_cert('tests/server.pem')
-        assert check(x509, srv_host)
-        with self.assertRaises(Checker.WrongHost):
+        self.assertTrue(check(x509, srv_host))
+        with self.assertRaises(SSL.Checker.WrongHost):
             check(x509, 'example.com')
 
-        doctest.testmod(Checker)
+        doctest.testmod(SSL.Checker)
 
 
 class ContextTestCase(unittest.TestCase):
diff --git a/tests/test_x509.py b/tests/test_x509.py
index d666572..ae533bd 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -22,7 +22,7 @@ except ImportError:
 # Python 3 and higher only has int().
 # Work around this.
 if sys.version_info > (3,):
-   long = int
+    long = int
 
 from M2Crypto import ASN1, BIO, EVP, RSA, Rand, X509, m2
 
@@ -32,6 +32,9 @@ class X509TestCase(unittest.TestCase):
     def callback(self, *args):
         pass
 
+    def setUp(self):
+        self.expected_hash = 'F68ED986C59F092FEA55E8504F7361967BB4C867'
+
     def mkreq(self, bits, ca=0):
         pk = EVP.PKey()
         x = X509.Request()
@@ -425,15 +428,13 @@ class X509TestCase(unittest.TestCase):
     def test_fingerprint(self):
         x509 = X509.load_cert('tests/x509.pem')
         fp = x509.get_fingerprint('sha1')
-        expected = 'B2522F9B4F6F2461475D0C6267911537E738494F'
-        self.assertEqual(fp, expected)
+        self.assertEqual(fp, self.expected_hash)
 
     def test_load_der_string(self):
         f = open('tests/x509.der', 'rb')
         x509 = X509.load_cert_der_string(''.join(f.readlines()))
         fp = x509.get_fingerprint('sha1')
-        expected = 'B2522F9B4F6F2461475D0C6267911537E738494F'
-        self.assertEqual(fp, expected)
+        self.assertEqual(fp, self.expected_hash)
 
     def test_save_der_string(self):
         x509 = X509.load_cert('tests/x509.pem')
@@ -500,7 +501,9 @@ class X509TestCase(unittest.TestCase):
         f = open('tests/x509.pem', 'r')
         l_tmp = f.readlines()
         # -----BEGIN CERTIFICATE----- : -----END CERTIFICATE-----
-        x509_pem = ''.join(l_tmp[44:60])
+        beg_idx = l_tmp.index('-----BEGIN CERTIFICATE-----\n')
+        end_idx = l_tmp.index('-----END CERTIFICATE-----\n')
+        x509_pem = ''.join(l_tmp[beg_idx:end_idx+1])
         f.close()
         f = open('tests/x509.der', 'rb')
         x509_der = f.read()
diff --git a/tests/x509.der b/tests/x509.der
index 01bfec6..4be4fed 100644
--- a/tests/x509.der
+++ b/tests/x509.der
diff --git a/tests/x509.pem b/tests/x509.pem
index 0050630..96f2626 100644
--- a/tests/x509.pem
+++ b/tests/x509.pem
@@ -1,75 +1,100 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number:
-            b4:7e:b2:de:87:00:03:0d
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=M2Crypto ca, CN=localhost
         Validity
-            Not Before: Nov 21 15:35:24 2012 GMT
-            Not After : Jan  8 15:35:24 2023 GMT
-        Subject: C=US, ST=California, O=M2Crypto, CN=X509
+            Not Before: Nov 25 09:53:33 2015 GMT
+            Not After : Nov 22 09:53:33 2025 GMT
+        Subject: C=US, O=M2Crypto x509, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:ba:3b:21:75:3a:4f:78:99:14:56:ae:68:36:6f:
-                    52:f3:01:a4:c4:0c:cc:27:eb:e2:c5:e1:78:19:ba:
-                    d4:47:05:35:df:d4:1c:10:8b:70:33:a2:f3:27:31:
-                    9e:1d:b7:2d:f8:ff:01:4a:4b:90:a7:29:4e:79:09:
-                    ad:df:3a:85:96:fc:fd:cb:ea:8c:37:b6:e4:b2:67:
-                    ec:fd:20:e1:0c:45:98:42:31:80:74:0e:78:fa:58:
-                    09:0d:2e:e5:82:38:8d:30:23:80:12:0c:40:c7:3f:
-                    26:94:e9:5b:43:f1:64:e2:1e:5d:fc:77:92:93:b4:
-                    4f:5f:8d:88:a0:03:b7:5e:a1
+                    00:d1:df:c9:88:e2:aa:38:8e:05:ad:f2:73:77:30:
+                    ac:a3:e3:ac:c1:1e:9a:9d:07:81:dc:1d:a2:89:f9:
+                    e7:2f:52:78:5b:e4:1d:94:94:b7:1e:19:f1:45:46:
+                    e5:df:55:c5:62:19:62:3c:f0:d8:1c:1c:98:4f:eb:
+                    d3:17:3d:f1:c8:00:b1:78:08:4d:e6:ca:08:e7:35:
+                    f1:a5:6d:63:b9:31:b2:ec:9c:21:23:97:8f:ab:a3:
+                    50:6d:44:17:20:a0:49:e4:8c:48:a9:85:eb:4c:80:
+                    57:72:3e:77:41:7f:dd:99:06:19:4c:75:11:ab:8a:
+                    1f:46:da:17:41:22:6e:85:a9:99:d0:6d:a9:3a:05:
+                    69:c5:26:b8:e8:81:3f:60:90:1a:11:46:e5:c0:ac:
+                    9e:a4:98:c9:ad:5f:6e:a0:1a:26:46:7d:51:5a:0e:
+                    0c:46:68:b7:d4:bb:0e:48:7a:45:77:cf:28:b2:1a:
+                    5a:51:60:09:5a:0e:c0:2e:a9:e7:8c:7a:39:ee:03:
+                    02:ec:a9:10:b8:07:d1:be:96:a6:0a:d8:b1:e2:c8:
+                    a6:9e:5c:87:dc:b1:9d:c5:15:97:bf:3f:72:12:27:
+                    fe:94:79:ac:5e:c6:19:96:f0:9c:59:5d:10:1e:02:
+                    6e:48:9d:c9:88:f0:d1:a0:5e:19:bf:06:27:d5:87:
+                    86:87
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                E8:C1:6E:60:19:13:82:40:65:B9:67:26:B7:8E:D6:7C:EE:33:8D:72
-            X509v3 Authority Key Identifier: 
-                keyid:80:D9:6A:1E:15:FE:8B:61:51:62:60:4D:B3:CC:95:44:78:2D:89:E6
-
+                62:0D:15:04:B4:0E:65:7F:0F:08:05:49:53:6F:EC:FA:54:B1:C2:92
     Signature Algorithm: sha1WithRSAEncryption
-        cf:57:f4:f6:7d:be:e0:32:d1:44:ba:15:f7:44:2c:69:df:54:
-        a1:09:28:7f:7f:66:37:db:71:6f:2f:4b:b0:61:f5:96:09:56:
-        50:e4:14:87:81:70:93:bb:9d:1e:8a:65:06:e8:67:c5:fb:24:
-        b1:17:b5:36:83:cb:53:88:0e:55:5c:91:80:26:56:f2:0b:50:
-        19:86:6c:3b:1b:37:64:e1:64:2b:18:c3:5b:aa:d3:78:84:75:
-        4f:59:c4:46:6e:9a:fb:a2:3b:86:79:87:09:a7:a6:e3:c8:91:
-        5d:ea:2c:76:d4:ff:a3:3e:ad:6c:bd:bb:e2:c1:1d:1e:d3:81:
-        6c:4a
+         86:c9:bd:d4:e5:83:e5:b3:a4:70:9a:ec:a7:6d:03:bb:c2:e4:
+         c2:30:19:7e:9c:6a:ec:e7:a7:d1:42:e4:2c:9d:30:5d:7a:c7:
+         7a:03:e8:85:ad:a8:00:d4:2d:ef:03:67:63:97:9a:b5:95:b4:
+         14:ca:df:dc:99:53:a4:74:9f:49:fe:17:76:62:59:11:4c:c8:
+         a5:32:bd:dc:bb:32:12:d6:27:f7:f2:4a:12:01:4b:c6:a4:81:
+         73:a4:fc:c5:b1:f7:27:7b:7b:62:44:74:9e:68:ca:aa:b3:a4:
+         06:44:ec:d6:35:6b:54:aa:8b:29:5b:40:0e:f0:71:dd:77:c6:
+         8c:9a:f5:bb:d0:60:1d:6c:8a:bd:f6:40:3c:e3:b8:ea:ca:e5:
+         15:33:73:2c:2e:66:e7:5f:57:64:24:a7:10:22:90:2c:c5:83:
+         f1:fe:78:5e:79:33:a1:99:49:14:26:28:5e:c8:43:13:84:f9:
+         68:0e:9a:bc:0c:ac:06:8d:b1:8a:93:ee:f0:de:de:e7:a2:33:
+         a2:62:ec:e4:45:29:63:e0:f9:93:5e:72:d6:37:25:63:b6:c5:
+         75:c1:7e:16:3d:09:a4:9a:fe:1b:31:06:dc:9d:a6:52:5a:8c:
+         e5:5f:7d:88:c8:b3:39:4a:36:90:a6:21:b2:2c:18:76:8e:3e:
+         7f:53:40:6b
 -----BEGIN CERTIFICATE-----
-MIICjDCCAfWgAwIBAgIJALR+st6HAAMNMA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQKDAhNMkNyeXB0bzEY
-MBYGA1UEAwwPSGVpa2tpIFRvaXZvbmVuMB4XDTEyMTEyMTE1MzUyNFoXDTIzMDEw
-ODE1MzUyNFowRDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExETAP
-BgNVBAoMCE0yQ3J5cHRvMQ0wCwYDVQQDDARYNTA5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQC6OyF1Ok94mRRWrmg2b1LzAaTEDMwn6+LF4XgZutRHBTXf1BwQ
-i3AzovMnMZ4dty34/wFKS5CnKU55Ca3fOoWW/P3L6ow3tuSyZ+z9IOEMRZhCMYB0
-Dnj6WAkNLuWCOI0wI4ASDEDHPyaU6VtD8WTiHl38d5KTtE9fjYigA7deoQIDAQAB
-o3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRl
-ZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU6MFuYBkTgkBluWcmt47WfO4zjXIwHwYD
-VR0jBBgwFoAUgNlqHhX+i2FRYmBNs8yVRHgtieYwDQYJKoZIhvcNAQEFBQADgYEA
-z1f09n2+4DLRRLoV90Qsad9UoQkof39mN9txby9LsGH1lglWUOQUh4Fwk7udHopl
-BuhnxfsksRe1NoPLU4gOVVyRgCZW8gtQGYZsOxs3ZOFkKxjDW6rTeIR1T1nERm6a
-+6I7hnmHCaem48iRXeosdtT/oz6tbL274sEdHtOBbEo=
+MIIDFzCCAf+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADA3MQswCQYDVQQGEwJVUzEU
+MBIGA1UEChMLTTJDcnlwdG8gY2ExEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNTEx
+MjUwOTUzMzNaFw0yNTExMjIwOTUzMzNaMDkxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1NMkNyeXB0byB4NTA5MRIwEAYDVQQDEwlsb2NhbGhvc3QwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDR38mI4qo4jgWt8nN3MKyj46zBHpqdB4HcHaKJ
++ecvUnhb5B2UlLceGfFFRuXfVcViGWI88NgcHJhP69MXPfHIALF4CE3mygjnNfGl
+bWO5MbLsnCEjl4+ro1BtRBcgoEnkjEiphetMgFdyPndBf92ZBhlMdRGrih9G2hdB
+Im6FqZnQbak6BWnFJrjogT9gkBoRRuXArJ6kmMmtX26gGiZGfVFaDgxGaLfUuw5I
+ekV3zyiyGlpRYAlaDsAuqeeMejnuAwLsqRC4B9G+lqYK2LHiyKaeXIfcsZ3FFZe/
+P3ISJ/6UeaxexhmW8JxZXRAeAm5IncmI8NGgXhm/BifVh4aHAgMBAAGjLDAqMAkG
+A1UdEwQCMAAwHQYDVR0OBBYEFGINFQS0DmV/DwgFSVNv7PpUscKSMA0GCSqGSIb3
+DQEBBQUAA4IBAQCGyb3U5YPls6RwmuynbQO7wuTCMBl+nGrs56fRQuQsnTBdesd6
+A+iFragA1C3vA2djl5q1lbQUyt/cmVOkdJ9J/hd2YlkRTMilMr3cuzIS1if38koS
+AUvGpIFzpPzFsfcne3tiRHSeaMqqs6QGROzWNWtUqospW0AO8HHdd8aMmvW70GAd
+bIq99kA847jqyuUVM3MsLmbnX1dkJKcQIpAsxYPx/nheeTOhmUkUJiheyEMThPlo
+Dpq8DKwGjbGKk+7w3t7nojOiYuzkRSlj4PmTXnLWNyVjtsV1wX4WPQmkmv4bMQbc
+naZSWozlX32IyLM5SjaQpiGyLBh2jj5/U0Br
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQC6OyF1Ok94mRRWrmg2b1LzAaTEDMwn6+LF4XgZutRHBTXf1BwQ
-i3AzovMnMZ4dty34/wFKS5CnKU55Ca3fOoWW/P3L6ow3tuSyZ+z9IOEMRZhCMYB0
-Dnj6WAkNLuWCOI0wI4ASDEDHPyaU6VtD8WTiHl38d5KTtE9fjYigA7deoQIDAQAB
-AoGBALdK8ZBGtuc0i28RM2K4SQUCDiAjlGCKa2Vll+aDGuFXwIGva3vhMaqw6+8c
-h8ope6cBnUx5eUL9hc3dd/Moz0dxM34p2zu/fZbiFD2yrKlkVSXHv6YobYhUagod
-htPwb+tQOrQqYpHZ/zPeVkAa/EfmM88RD603nlFHbCz5PpFBAkEA5HWMYUaXD+1M
-kX3YjXy3ESmKr3zPdbQkw6tDiQ6ijl1jUX+b4BKGSgINFYsmXlaFYM/GeJWJ0z64
-BiPkSnhueQJBANCuYg0ykia6miTUWzXv3i8r8voVt593KmrAf23JwUM+jZnAd4yl
-xwSHkJSX5Ualp1cYDfKD9wzKj8vjq4mCx2kCQQCYlJFvHnAhqQDsYrpQtKynf7Eq
-RxdfqzKqpCV00htrLZ/5fFqkqnqZzwjiDI9RjkOCRwJs4qKsPUU2hJ4hxpExAkEA
-llzwfb3wnUNbiioRRr39hFPQke5QDvEYeS8XIo57WO6brSuHeKqCynq77LW+GLeH
-6jOE6Te5LVhPYIQ9t6mp8QJAKPE2g1wc0kmlzaOkNrlj67PPcRKqRVqL1RWIaSz9
-Dh3KWyvOnOQAKbShI9EbXqdINKM7JxJAhSL4LPBd3ejxSA==
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/x509_key.pem b/tests/x509_key.pem
new file mode 100644
index 0000000..0b1c112
--- /dev/null
+++ b/tests/x509_key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA0d/JiOKqOI4FrfJzdzCso+OswR6anQeB3B2iifnnL1J4W+Qd
+lJS3HhnxRUbl31XFYhliPPDYHByYT+vTFz3xyACxeAhN5soI5zXxpW1juTGy7Jwh
+I5ePq6NQbUQXIKBJ5IxIqYXrTIBXcj53QX/dmQYZTHURq4ofRtoXQSJuhamZ0G2p
+OgVpxSa46IE/YJAaEUblwKyepJjJrV9uoBomRn1RWg4MRmi31LsOSHpFd88oshpa
+UWAJWg7ALqnnjHo57gMC7KkQuAfRvpamCtix4simnlyH3LGdxRWXvz9yEif+lHms
+XsYZlvCcWV0QHgJuSJ3JiPDRoF4ZvwYn1YeGhwIDAQABAoIBAC4572byHfIU/hVB
+OMOA+hWjGTL0LbP2qli0Qk/Htm8K6C29QfKvCuJbbnQG2KzndHFWC/hGSCNw/O9l
+jvooj6+wz2YT1izGRU2/6Pi57mQlGTbacMYpJOD2OMnIXJu4Em5/o6WLNLeF8Tzd
+m2DW7BU/baUUiA7Tfm4ZrVOQZO2Vdn4Kle3+cu3qyyHqG+pbyWY3tBK9S7NzVAup
+xHNQ4GCKKHpL+F8BZNjwAfjCEJVkmA1xxp5BAPkU8mZErJz9eRiljPCVHz4RbRKw
+dyYPLscFoNPrZXkuR81m3jqFo72qaJx2h2SiY18NBWqKiE/QQY+6z2mxF9hRZs1e
+r+MwwfkCgYEA7xTMt/+MPP9Vfaqn7NT3zObzCm0ao5hx96nv9ZWic5oeXXm41Ebx
+jImFLRkUxsL6mKRbv/3LzwZNLTD8zhDr2l0wigAMxwX9wtcl+UHRcrHgt4DrOVz+
+adHRFG40BSvEgIZ6/hS0C0sWDjj/2HXzEM9ONj/fKeh1jjmSh8okLHsCgYEA4Lnf
+Ht3/f6h4qeArixxQrOWjrOOj4oZg5ILGEbea+kdPKyElKeY3KtOp4jxTC3ngix9t
+1okAp1Ks/lE9mo/BIN8b+OCn/vDBRcpzvvQ5XjAHoOnCgblcG7ZtAf0JrsdiwqeX
+pRmR8MKiNC8Vtrys5US9GiYRyZogozySOww1zmUCgYEAtBIVcwxtws+Jw4HSwuVQ
+0qqsKZEtfERoqmH7Uxxl4+4TqtHwLSpV6kT14pa+eEoI1wkL9dohNIeJf10jO82w
+5qJD2dzZwtk3XRYRCuDQ8TMajvvxrx3knS0j7eBnG/HwKeGgJ1jOlqbyMLorsQx9
+i46oWOHYosbsK7gfLllIz5sCgYEArx5ozmb0eQhRrx8vD2JrQ7BXkZx600UgMDHw
+I1JOhIYZHWTgzvvFNaxnkBKuLB03a3J8Z1evmLQGds/cD5vCRdlWtORsRXBbTAVt
+mPo70jffWfePSQOm0TmhTJFggECDp2ht9Ywte85QFBY094eju62LJttPtShUEqBa
+24SyUTkCgYEA1jAp+PoNInbsaTGqTdi5YyR+97bfNflPPcpJoBQMPTPU8rdOfw7O
+G3oZTs0LjKNiu6Kp1kFewfClAbnHwfwegxRTLGJFwMf7FSNCYiwQkgt+bG5nuWmn
+tzBnhocBUxOw/cj7qKlQnWNp7bBPMdfknaCMX3MMs/qpRT2dA0dLSUk=
+-----END RSA PRIVATE KEY-----