Created new test certificates that will be valid until 2019.

git-svn-id: http://svn.osafoundation.org/m2crypto/trunk@698 2715db39-9adf-0310-9c64-84f055769b4b

12 files changed, 266 insertions, 257 deletions

diff --git a/tests/README b/tests/README
index f711705..28eac67 100644
--- a/tests/README
+++ b/tests/README
@@ -30,14 +30,14 @@ Making the server certificate and private key. make sure commonName
 field is localhost.
 
 CA.sh -newreq
-CA.sh -sign
+CA.sh -signreq
 cp newcert.pem ../server.pem
 openssl rsa <newkey.pem >>../server.pem
 
 Making the x509 certificate and key.
 
 CA.sh -newreq
-CA.sh -sign
+CA.sh -signreq
 cp newcert.pem ../x509.pem
 openssl rsa <newkey.pem >>../x509.pem
 openssl x509 -in ../x509.pem -out ../x509.der -outform DER
@@ -46,7 +46,7 @@ Making the signer certificate. Make sure the email address is
 signer@example.com.
 
 CA.sh -newreq
-CA.sh -sign
+CA.sh -signreq
 cp newcert.pem ../signer.pem
 openssl rsa <newkey.pem >../signer_key.pem
 
@@ -54,7 +54,7 @@ Making the recipient certificate. Make sure the email address is
 recipient@example.com.
 
 CA.sh -newreq
-CA.sh -sign
+CA.sh -signreq
 cp newcert.pem ../recipient.pem
 openssl rsa <newkey.pem >../recipient_key.pem
 
diff --git a/tests/ca.pem b/tests/ca.pem
index 62a4907..5450a68 100644
--- a/tests/ca.pem
+++ b/tests/ca.pem
@@ -1,59 +1,62 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 0 (0x0)
+        Serial Number:
+            d1:b6:bf:af:06:17:8c:bd
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=CA, O=M2Crypto, CN=localhost
+        Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Validity
-            Not Before: Dec 14 03:22:06 2006 GMT
-            Not After : Dec 13 03:22:06 2009 GMT
-        Subject: C=US, ST=CA, O=M2Crypto, CN=localhost
+            Not Before: Jul 28 04:30:50 2009 GMT
+            Not After : Jul 27 04:30:50 2012 GMT
+        Subject: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:c8:ee:96:31:80:55:c0:24:cf:e8:95:22:86:ac:
-                    23:86:1a:5a:44:1c:c8:1d:99:5a:9b:5a:8f:4b:08:
-                    6d:c1:c7:5b:16:b1:92:70:1c:a4:d3:d5:9e:8d:b8:
-                    ae:03:79:ae:1d:a4:6e:4b:ef:06:16:68:0d:79:a6:
-                    dc:7b:fc:a8:7c:f4:4c:fb:3a:e0:c9:8b:01:be:be:
-                    32:0f:b4:b7:55:32:fc:70:a5:0d:17:3d:5c:f8:50:
-                    8d:9a:44:3c:12:06:72:58:98:5f:3a:54:6c:90:82:
-                    15:76:c9:16:1c:13:b7:31:7e:65:f0:d0:75:23:cf:
-                    eb:ba:d5:64:16:2a:a5:13:bf
+                    00:c8:9b:59:18:c2:bf:21:68:dc:d4:62:30:1f:43:
+                    29:52:85:8d:36:fc:20:7f:11:1b:c6:f3:e6:c2:7a:
+                    d0:17:0e:6e:78:43:21:e9:e2:df:9f:31:87:e8:7a:
+                    37:88:1f:a4:56:a1:e9:cb:13:7b:1b:c0:28:cf:5a:
+                    db:a3:e7:50:6c:c6:55:76:e3:61:e8:73:4b:c2:8c:
+                    ee:1c:29:c1:ee:2d:fd:e2:30:34:69:06:ea:d0:af:
+                    bd:c5:db:86:70:92:26:0a:33:1b:70:a9:e7:6e:a4:
+                    2e:ee:4a:8a:f3:b2:6c:c9:97:28:39:28:28:3f:c5:
+                    90:4d:4e:83:0a:0e:cd:98:93
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:TRUE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                CD:06:38:23:C3:50:0C:F6:A8:5A:F0:A7:DB:51:03:21:00:41:DB:37
+                AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE
             X509v3 Authority Key Identifier: 
-                keyid:CD:06:38:23:C3:50:0C:F6:A8:5A:F0:A7:DB:51:03:21:00:41:DB:37
+                keyid:AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE
+                DirName:/C=US/ST=California/O=M2Crypto/CN=Heikki Toivonen
+                serial:D1:B6:BF:AF:06:17:8C:BD
 
+            X509v3 Basic Constraints: 
+                CA:TRUE
     Signature Algorithm: sha1WithRSAEncryption
-        9c:6a:71:13:dc:41:5e:dc:27:c4:aa:d8:76:bb:ac:f7:3e:d6:
-        02:d1:55:c0:b0:8b:07:c3:5e:4d:0d:c0:3b:dc:a9:98:04:e5:
-        23:fe:61:8a:16:93:d8:d3:bf:30:f1:ca:fb:ba:33:78:58:cf:
-        d6:8d:49:94:cc:66:01:42:61:27:79:95:f5:36:89:bb:9a:a5:
-        1d:e4:ac:fa:d3:53:50:10:58:40:90:1d:b7:ca:9e:0e:cb:16:
-        a1:49:5c:46:85:13:5a:61:39:44:c2:7c:7e:b2:d6:96:5c:3a:
-        bd:07:03:24:f2:9b:87:ec:f4:00:a5:11:50:a7:73:3c:96:34:
-        3b:01
+        c8:11:af:7d:6d:fb:1c:82:0d:c0:e7:41:f4:b2:a5:b0:69:6d:
+        18:e3:04:aa:49:e6:4a:69:6d:c3:e3:8b:ab:d1:18:ac:72:ef:
+        48:9e:49:c7:57:75:2d:00:1e:08:9f:c3:dc:ca:5f:91:38:0d:
+        ac:f8:1f:cc:fc:f7:c2:5b:ce:d7:0c:cf:b2:fe:c9:a9:ce:b8:
+        07:45:17:1c:cf:b3:07:f9:1f:69:6a:94:03:be:62:62:9c:af:
+        a2:24:25:2d:1f:63:0a:91:6b:bb:e3:6c:ec:20:de:80:d3:04:
+        b4:5e:42:1f:27:bc:1f:79:98:18:ba:fb:8a:34:24:a9:40:1e:
+        b9:7b
 -----BEGIN CERTIFICATE-----
-MIICdjCCAd+gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2NhbGhv
-c3QwHhcNMDYxMjE0MDMyMjA2WhcNMDkxMjEzMDMyMjA2WjBBMQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2Nh
-bGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMjuljGAVcAkz+iVIoas
-I4YaWkQcyB2ZWptaj0sIbcHHWxaxknAcpNPVno24rgN5rh2kbkvvBhZoDXmm3Hv8
-qHz0TPs64MmLAb6+Mg+0t1Uy/HClDRc9XPhQjZpEPBIGcliYXzpUbJCCFXbJFhwT
-tzF+ZfDQdSPP67rVZBYqpRO/AgMBAAGjfjB8MAwGA1UdEwQFMAMBAf8wLAYJYIZI
-AYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQW
-BBTNBjgjw1AM9qha8KfbUQMhAEHbNzAfBgNVHSMEGDAWgBTNBjgjw1AM9qha8Kfb
-UQMhAEHbNzANBgkqhkiG9w0BAQUFAAOBgQCcanET3EFe3CfEqth2u6z3PtYC0VXA
-sIsHw15NDcA73KmYBOUj/mGKFpPY078w8cr7ujN4WM/WjUmUzGYBQmEneZX1Nom7
-mqUd5Kz601NQEFhAkB23yp4OyxahSVxGhRNaYTlEwnx+staWXDq9BwMk8puH7PQA
-pRFQp3M8ljQ7AQ==
+MIICzjCCAjegAwIBAgIJANG2v68GF4y9MA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEY
+MBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMB4XDTA5MDcyODA0MzA1MFoXDTEyMDcy
+NzA0MzA1MFowTzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAP
+BgNVBAoTCE0yQ3J5cHRvMRgwFgYDVQQDEw9IZWlra2kgVG9pdm9uZW4wgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBAMibWRjCvyFo3NRiMB9DKVKFjTb8IH8RG8bz
+5sJ60BcObnhDIeni358xh+h6N4gfpFah6csTexvAKM9a26PnUGzGVXbjYehzS8KM
+7hwpwe4t/eIwNGkG6tCvvcXbhnCSJgozG3Cp526kLu5KivOybMmXKDkoKD/FkE1O
+gwoOzZiTAgMBAAGjgbEwga4wHQYDVR0OBBYEFK1kRXSPg8cs1deghZEQQJqcls/u
+MH8GA1UdIwR4MHaAFK1kRXSPg8cs1deghZEQQJqcls/uoVOkUTBPMQswCQYDVQQG
+EwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEChMITTJDcnlwdG8xGDAW
+BgNVBAMTD0hlaWtraSBUb2l2b25lboIJANG2v68GF4y9MAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADgYEAyBGvfW37HIINwOdB9LKlsGltGOMEqknmSmltw+OL
+q9EYrHLvSJ5Jx1d1LQAeCJ/D3MpfkTgNrPgfzPz3wlvO1wzPsv7Jqc64B0UXHM+z
+B/kfaWqUA75iYpyvoiQlLR9jCpFru+Ns7CDegNMEtF5CHye8H3mYGLr7ijQkqUAe
+uXs=
 -----END CERTIFICATE-----
diff --git a/tests/recipient.pem b/tests/recipient.pem
index 8f59e59..d766266 100644
--- a/tests/recipient.pem
+++ b/tests/recipient.pem
@@ -1,26 +1,27 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 4 (0x4)
+        Serial Number:
+            d1:b6:bf:af:06:17:8c:c1
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=CA, O=M2Crypto, CN=localhost
+        Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Validity
-            Not Before: Dec 14 03:47:02 2006 GMT
-            Not After : Dec 13 03:47:02 2009 GMT
-        Subject: C=US, ST=CA, O=M2Crypto, CN=localhost/emailAddress=recipient@example.com
+            Not Before: Jul 28 04:39:19 2009 GMT
+            Not After : Jul 26 04:39:19 2019 GMT
+        Subject: C=US, ST=California, O=M2Crypto, CN=Recipient/emailAddress=recipient@example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:cd:6c:81:f5:c3:3c:d7:3f:d9:40:27:93:73:93:
-                    1a:c3:0c:37:32:12:31:89:da:4a:ae:da:7d:2f:b3:
-                    78:95:ac:35:6d:33:3d:3b:5a:a8:7e:d9:cf:39:26:
-                    6a:80:49:06:06:fd:f7:fa:4c:71:4a:c4:ef:05:6e:
-                    05:03:36:14:27:12:75:65:6b:b3:a8:7b:69:fb:2a:
-                    4e:e1:ec:65:6e:01:ff:05:98:ad:04:73:73:08:8b:
-                    58:5d:70:b3:8b:f7:cf:10:8d:d2:79:2a:e3:4b:8d:
-                    79:e0:52:bf:9c:75:92:17:8b:ee:18:5b:3a:73:4b:
-                    0e:ea:4a:fa:e7:f4:f6:40:2f
+                    00:c2:21:a3:4f:64:59:9c:21:39:21:d2:3c:e7:0a:
+                    60:72:c8:39:b3:c3:27:4a:6d:56:8f:a0:5d:1b:c6:
+                    e4:3e:26:61:09:a9:ae:04:83:69:3f:9d:2b:12:7e:
+                    d4:f7:8e:d0:6e:a9:8c:9b:d1:bf:17:0c:bd:d0:73:
+                    99:02:6e:7e:cb:7a:80:2d:cf:b1:29:c0:30:36:3f:
+                    68:12:3e:4e:bf:f9:8b:3d:1d:56:af:24:94:ae:d5:
+                    59:b4:00:50:0c:c0:2b:59:c3:99:b3:8a:19:f1:86:
+                    14:bd:ee:e9:c4:f1:d7:6a:0c:e9:67:8a:94:9a:2d:
+                    2d:60:25:22:c6:72:68:c2:0d
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -28,32 +29,33 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                F4:33:02:B5:35:2D:52:7B:51:1C:F9:08:C7:D2:A8:8D:BE:CF:13:9E
+                11:CB:60:AC:55:85:52:84:C5:C8:20:5A:50:13:D0:89:C7:7A:B7:81
             X509v3 Authority Key Identifier: 
-                keyid:CD:06:38:23:C3:50:0C:F6:A8:5A:F0:A7:DB:51:03:21:00:41:DB:37
+                keyid:AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE
 
     Signature Algorithm: sha1WithRSAEncryption
-        69:61:e1:72:56:64:75:30:7c:a2:7a:cb:ef:02:f9:6d:cd:41:
-        d4:1d:a2:7b:14:bc:02:d3:d1:09:40:15:fc:08:ae:22:aa:73:
-        1f:85:de:41:a2:f9:90:23:e9:17:76:e8:a6:e8:13:b9:7f:67:
-        bb:f9:63:dc:b2:f0:e9:b0:eb:75:57:e5:b1:9e:18:93:e2:58:
-        32:e4:1a:f1:6b:7a:7e:e8:c7:50:a0:08:68:b7:b6:83:6f:c1:
-        d6:af:91:e6:65:b3:c2:d3:12:a8:aa:6f:be:ea:da:e4:2b:5c:
-        60:34:93:4e:e3:74:0e:d2:0e:9b:3e:0e:4a:37:e6:70:83:c2:
-        d7:c9
+        87:56:17:6d:ba:3b:a6:c4:22:af:20:f1:a0:e5:9d:27:c4:50:
+        bd:79:eb:d2:84:e5:9a:00:5f:5d:5a:c3:34:58:77:f5:a9:00:
+        f9:76:e9:2d:89:b4:3f:9d:e3:cf:15:0c:64:1b:0a:03:db:e4:
+        6f:2b:ff:1c:82:89:1a:0f:7e:83:58:0f:e6:da:af:26:97:49:
+        4a:59:d7:61:3f:4b:ed:1d:5b:51:00:3b:83:96:c7:1e:3d:84:
+        f4:91:1f:70:69:12:b9:a7:2c:5b:1b:05:cd:74:90:2b:a0:ba:
+        e7:70:cd:6b:7d:ac:be:d7:92:50:e9:f5:c0:42:29:04:ef:8f:
+        a1:68
 -----BEGIN CERTIFICATE-----
-MIICmTCCAgKgAwIBAgIBBDANBgkqhkiG9w0BAQUFADBBMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2NhbGhv
-c3QwHhcNMDYxMjE0MDM0NzAyWhcNMDkxMjEzMDM0NzAyWjBnMQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2Nh
-bGhvc3QxJDAiBgkqhkiG9w0BCQEWFXJlY2lwaWVudEBleGFtcGxlLmNvbTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzWyB9cM81z/ZQCeTc5Mawww3MhIxidpK
-rtp9L7N4law1bTM9O1qoftnPOSZqgEkGBv33+kxxSsTvBW4FAzYUJxJ1ZWuzqHtp
-+ypO4exlbgH/BZitBHNzCItYXXCzi/fPEI3SeSrjS4154FK/nHWSF4vuGFs6c0sO
-6kr65/T2QC8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
-blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFPQzArU1LVJ7URz5
-CMfSqI2+zxOeMB8GA1UdIwQYMBaAFM0GOCPDUAz2qFrwp9tRAyEAQds3MA0GCSqG
-SIb3DQEBBQUAA4GBAGlh4XJWZHUwfKJ6y+8C+W3NQdQdonsUvALT0QlAFfwIriKq
-cx+F3kGi+ZAj6Rd26KboE7l/Z7v5Y9yy8Omw63VX5bGeGJPiWDLkGvFren7ox1Cg
-CGi3toNvwdavkeZls8LTEqiqb77q2uQrXGA0k07jdA7SDps+Dko35nCDwtfJ
+MIICtzCCAiCgAwIBAgIJANG2v68GF4zBMA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEY
+MBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMB4XDTA5MDcyODA0MzkxOVoXDTE5MDcy
+NjA0MzkxOVowbzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAP
+BgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlSZWNpcGllbnQxJDAiBgkqhkiG9w0B
+CQEWFXJlY2lwaWVudEBleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEAwiGjT2RZnCE5IdI85wpgcsg5s8MnSm1Wj6BdG8bkPiZhCamuBINpP50r
+En7U947QbqmMm9G/Fwy90HOZAm5+y3qALc+xKcAwNj9oEj5Ov/mLPR1WrySUrtVZ
+tABQDMArWcOZs4oZ8YYUve7pxPHXagzpZ4qUmi0tYCUixnJowg0CAwEAAaN7MHkw
+CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
+dGlmaWNhdGUwHQYDVR0OBBYEFBHLYKxVhVKExcggWlAT0InHereBMB8GA1UdIwQY
+MBaAFK1kRXSPg8cs1deghZEQQJqcls/uMA0GCSqGSIb3DQEBBQUAA4GBAIdWF226
+O6bEIq8g8aDlnSfEUL1569KE5ZoAX11awzRYd/WpAPl26S2JtD+d488VDGQbCgPb
+5G8r/xyCiRoPfoNYD+baryaXSUpZ12E/S+0dW1EAO4OWxx49hPSRH3BpErmnLFsb
+Bc10kCuguudwzWt9rL7XklDp9cBCKQTvj6Fo
 -----END CERTIFICATE-----
diff --git a/tests/recipient_key.pem b/tests/recipient_key.pem
index 8ee65b1..5bf0f70 100644
--- a/tests/recipient_key.pem
+++ b/tests/recipient_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDNbIH1wzzXP9lAJ5NzkxrDDDcyEjGJ2kqu2n0vs3iVrDVtMz07
-Wqh+2c85JmqASQYG/ff6THFKxO8FbgUDNhQnEnVla7Ooe2n7Kk7h7GVuAf8FmK0E
-c3MIi1hdcLOL988QjdJ5KuNLjXngUr+cdZIXi+4YWzpzSw7qSvrn9PZALwIDAQAB
-AoGAEBel/qiyxXH9BOeUx4MIn6r/T+7Y7qGpJBV9pRT8J018Sfevnky10mohr6pw
-wWf3DukqWfNPFLpktxotTlkYLutzmRz5LhQQp9zyC5dzZKleoIbpAsq4l16+CI44
-usNVc+C/qs4AOvOsEJou9gCQ0L+9Fru/nEZqtFL0z0XrcjECQQDr7QvSbIjE8o2L
-eyUC8S0jiImHArzwIqvio3n5zRlGqp+jP/3bD35q6/6DazJgH91V4E+0amBfqHdF
-PzX/ppt1AkEA3ucQEjuAyPqsROCs+w6Go9vQD/4qNNv5w0OImaQUi9VliY9pk7Cm
-WI5EbYTfYv5HWPdr3Qwbyz05mKy5gEuMkwJAQu+0ZPVKMKaopiRAMf9/UQ+SBW4v
-cOpFXj4Hg2o/e585P7YOLjLNKUTfpyWo20DvKUhFFOkBguJnRIxUo73/aQJBAKn8
-toHhBO7AVD3WxbRUOJOfn4WCxDc5hrjFuNfKjKyzGdMVHmO2NLWWEVMgIKfC2TBc
-x9J0WIHe+ByZpIHVm6cCQDes1zGfpZKQFbA9xOTZr+FjPfQtSDxY+l5AXNDi+neC
-8DR/4UYE+3tsT0DyZWaO3mQW7mh1QG6B3/OlpnvGGqc=
+MIICXAIBAAKBgQDCIaNPZFmcITkh0jznCmByyDmzwydKbVaPoF0bxuQ+JmEJqa4E
+g2k/nSsSftT3jtBuqYyb0b8XDL3Qc5kCbn7LeoAtz7EpwDA2P2gSPk6/+Ys9HVav
+JJSu1Vm0AFAMwCtZw5mzihnxhhS97unE8ddqDOlnipSaLS1gJSLGcmjCDQIDAQAB
+AoGAZlrJ+kAUpyc1Mkng5ogoFhzPn6ITg0Bm1U9eCBkzmjkuDKQ0JhkLUwkQ/q10
+qBnad55ZjoZmVEbZhaCNWiTcIIy0nKAMWNKRcg3vTgrnbmbjco1HECDStfJKogZl
+7egoIImHnU1f/IeKQDUYUfs/INonmnnZ1d2jrU7QsdTz84ECQQDzhT0UwP8S1oma
+0IBgeUOt5ptZs7nFdZnbIKCd+ADra6NiQznokCHe5K0WZHqPKvN9asKx1u0h+97H
+Wmk6Fw7RAkEAzBR1+mTRSrlJT8/NTCsIDPtCK/+OhmGbNy1pfsOWq1lN58Za5HV7
+fmtaH2No+MP+DlfNigsg557GzAYl2ZumfQJAHQj33W+dehuGUKUniVksDqH+R9W8
+AqUg8RWU0QDu6yLsWhz13JrCzxao5JCaZFOUsJF4IUglAfZL+6z1+u0g4QJAH5aL
+LFaujoJfdpsTi9adSGUbuPO1e9dfzwqYaaaci6knBdkN+I62rrqvGGyqstajXFT6
+24MddLx+yNWqxiPxgQJBAKF8YiR4eLqLSnq4ftqCqVCC1XbA2H9b7G5RBWi00WFq
+3Nx+B/wjLzbqsMamTCIDUCEW+MzFx6otCxduDZRMKH8=
 -----END RSA PRIVATE KEY-----
diff --git a/tests/server.pem b/tests/server.pem
index eac419d..825abc6 100644
--- a/tests/server.pem
+++ b/tests/server.pem
@@ -1,26 +1,27 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 1 (0x1)
+        Serial Number:
+            d1:b6:bf:af:06:17:8c:be
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=CA, O=M2Crypto, CN=localhost
+        Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Validity
-            Not Before: Dec 14 03:24:08 2006 GMT
-            Not After : Dec 13 03:24:08 2009 GMT
-        Subject: C=US, ST=CA, O=M2Crypto, CN=localhost
+            Not Before: Jul 28 04:31:41 2009 GMT
+            Not After : Jul 26 04:31:41 2019 GMT
+        Subject: C=US, ST=California, O=M2Crypto, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:d4:a9:64:75:ed:bb:14:c5:7b:30:f2:f3:3e:3a:
-                    38:87:18:f7:f0:89:2e:94:1d:1f:76:22:c5:91:dd:
-                    55:87:ba:2d:e3:15:a3:bd:a6:bc:b2:6c:44:b1:dd:
-                    ff:96:b3:f8:72:3f:3a:41:3e:92:5d:fd:ca:67:e5:
-                    92:d6:8a:9f:5d:87:dc:35:ab:84:24:4c:f0:fb:9e:
-                    38:e0:25:14:09:ac:cd:62:5b:52:c4:15:dd:81:60:
-                    10:ed:84:3f:8e:72:41:64:95:2f:be:14:b6:88:ab:
-                    95:4f:ea:d7:71:73:93:fd:51:13:23:88:95:7c:7c:
-                    2a:ea:58:31:b1:a0:b9:7d:cf
+                    00:d4:99:6f:33:3f:e6:ac:0a:34:d8:0e:45:97:f3:
+                    2b:6a:50:2a:84:30:0a:52:9c:15:30:9f:05:29:3a:
+                    21:f4:c1:c3:01:9e:2f:55:56:4e:35:ac:f1:16:1e:
+                    26:8d:b5:26:b7:99:78:92:ea:1c:74:46:ab:41:12:
+                    ef:cc:53:62:cc:59:5c:9e:c4:86:df:d9:25:35:55:
+                    05:4b:16:ff:d9:90:e3:f4:51:b4:b4:fa:c5:98:4b:
+                    60:f0:60:7f:14:4e:1e:dd:61:9b:22:a2:9c:21:17:
+                    43:a3:cb:07:80:f5:75:59:9c:55:1c:fe:e0:66:d4:
+                    70:77:5e:13:06:0c:05:c7:1f
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -28,47 +29,47 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                FE:0E:47:67:E7:BC:3B:95:FF:98:93:97:C8:97:BC:E8:6C:17:7F:50
+                04:05:3D:6A:A7:E8:D7:52:BD:2F:C4:52:30:7C:2C:BD:D3:81:46:C6
             X509v3 Authority Key Identifier: 
-                keyid:CD:06:38:23:C3:50:0C:F6:A8:5A:F0:A7:DB:51:03:21:00:41:DB:37
+                keyid:AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE
 
     Signature Algorithm: sha1WithRSAEncryption
-        95:0f:12:23:a0:59:d0:23:7e:f5:a0:e9:78:7e:29:89:51:15:
-        d6:5f:76:2d:50:3c:0a:93:46:b2:7f:8b:b7:8e:7d:56:18:1a:
-        a2:af:f6:9c:13:be:01:f7:28:7b:b9:93:6e:21:d3:e8:ea:fb:
-        aa:0b:68:b9:77:32:6f:8b:2d:86:c8:30:80:9c:ea:53:86:0d:
-        27:7e:09:41:d0:98:13:e3:5e:49:77:fa:fa:ed:2e:c8:d9:7f:
-        0d:9f:a7:01:a1:1c:1a:b4:83:6d:af:8b:cc:43:85:f4:65:73:
-        2d:b3:23:d8:fb:24:2b:f1:36:7f:2b:38:2c:d0:65:95:01:b8:
-        f3:dc
+        ac:2b:ad:86:36:96:5c:fb:34:2c:02:ca:d9:5f:a7:8e:b6:58:
+        24:1d:27:b6:8e:81:aa:69:0e:60:26:64:2e:72:a1:ff:d8:ba:
+        bb:7e:5d:46:c7:07:2d:a8:c8:4c:df:1e:ba:c8:bc:21:5b:f2:
+        b3:01:4c:d6:3b:10:fd:49:70:e6:83:01:f3:24:e2:a9:97:d7:
+        c3:9c:5b:2d:d7:64:2b:e5:e2:0e:3e:d9:8c:e6:93:86:39:32:
+        50:43:5f:36:4a:3b:b0:05:e7:65:a3:b3:ef:50:56:7f:7e:dc:
+        f0:65:83:ac:42:7e:97:a0:c0:7e:63:c6:c8:c6:35:d3:60:d1:
+        4f:51
 -----BEGIN CERTIFICATE-----
-MIICczCCAdygAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2NhbGhv
-c3QwHhcNMDYxMjE0MDMyNDA4WhcNMDkxMjEzMDMyNDA4WjBBMQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2Nh
-bGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANSpZHXtuxTFezDy8z46
-OIcY9/CJLpQdH3YixZHdVYe6LeMVo72mvLJsRLHd/5az+HI/OkE+kl39ymflktaK
-n12H3DWrhCRM8PueOOAlFAmszWJbUsQV3YFgEO2EP45yQWSVL74UtoirlU/q13Fz
-k/1REyOIlXx8KupYMbGguX3PAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4
-QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT+
-Dkdn57w7lf+Yk5fIl7zobBd/UDAfBgNVHSMEGDAWgBTNBjgjw1AM9qha8KfbUQMh
-AEHbNzANBgkqhkiG9w0BAQUFAAOBgQCVDxIjoFnQI371oOl4fimJURXWX3YtUDwK
-k0ayf4u3jn1WGBqir/acE74B9yh7uZNuIdPo6vuqC2i5dzJviy2GyDCAnOpThg0n
-fglB0JgT415Jd/r67S7I2X8Nn6cBoRwatINtr4vMQ4X0ZXMtsyPY+yQr8TZ/Kzgs
-0GWVAbjz3A==
+MIICkTCCAfqgAwIBAgIJANG2v68GF4y+MA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEY
+MBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMB4XDTA5MDcyODA0MzE0MVoXDTE5MDcy
+NjA0MzE0MVowSTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAP
+BgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcN
+AQEBBQADgY0AMIGJAoGBANSZbzM/5qwKNNgORZfzK2pQKoQwClKcFTCfBSk6IfTB
+wwGeL1VWTjWs8RYeJo21JreZeJLqHHRGq0ES78xTYsxZXJ7Eht/ZJTVVBUsW/9mQ
+4/RRtLT6xZhLYPBgfxROHt1hmyKinCEXQ6PLB4D1dVmcVRz+4GbUcHdeEwYMBccf
+AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
+ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQEBT1qp+jXUr0vxFIwfCy904FG
+xjAfBgNVHSMEGDAWgBStZEV0j4PHLNXXoIWREECanJbP7jANBgkqhkiG9w0BAQUF
+AAOBgQCsK62GNpZc+zQsAsrZX6eOtlgkHSe2joGqaQ5gJmQucqH/2Lq7fl1Gxwct
+qMhM3x66yLwhW/KzAUzWOxD9SXDmgwHzJOKpl9fDnFst12Qr5eIOPtmM5pOGOTJQ
+Q182SjuwBedlo7PvUFZ/ftzwZYOsQn6XoMB+Y8bIxjXTYNFPUQ==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDUqWR17bsUxXsw8vM+OjiHGPfwiS6UHR92IsWR3VWHui3jFaO9
-pryybESx3f+Ws/hyPzpBPpJd/cpn5ZLWip9dh9w1q4QkTPD7njjgJRQJrM1iW1LE
-Fd2BYBDthD+OckFklS++FLaIq5VP6tdxc5P9URMjiJV8fCrqWDGxoLl9zwIDAQAB
-AoGAJyCLhU8aLrYu9lCdBIP9xo2HgNAcq8+37Cp1o2LPy8srii5/E/PLoCBfe0JX
-NkkimxKbC0oR8A0z4m3Q2Hxk2aCb51nDrLOPkQ2ZBD8MhOQBIh1hZlALGPSk4I6p
-LGxPuX6JcZA6N85Zi8dlPMf2vj6m1oRgYSPxG9hYRds8a0ECQQD2LLlqkyg+P5QJ
-h/K7Oo+gkbVNGO4lxp59b2G72ZnPNt2JXIhKm9jjN4DXMxZ3a2iCWg5Jl1GYNGms
-PZQRtgfxAkEA3SZAOGKEP1kdP6OuyA4hVbDd9dImwPhAF/dVyBtT7mgzmppaJLi6
-N1T5ZArag35Dl3Upjy73SwLyxvTgIJuhvwJAEKXVpC9veUYzbLGU6LR9Ig64hA47
-jLJx5Wmy4lFE5Y6ATNnFHcaMVFFclTEPQ+QvnSEZ9kAVdIWW398KNGhrAQJAHG7Q
-ju9LpYFlm0sGK751VrkYsIRGa0T/qJUqOEIbNmm7SMNTl6kQeBC6x7wFgCZ5tj1g
-DIKzVLeaUy4kqsyXrQJAG3gKIjrQ2GBFZMLp7TVln0+sN98BKYGqJHbkJferE4jm
-ioFZLk5ow5LytUroMIDAORj7B0V7mnsDzvr0kMIoaQ==
+MIICXgIBAAKBgQDUmW8zP+asCjTYDkWX8ytqUCqEMApSnBUwnwUpOiH0wcMBni9V
+Vk41rPEWHiaNtSa3mXiS6hx0RqtBEu/MU2LMWVyexIbf2SU1VQVLFv/ZkOP0UbS0
++sWYS2DwYH8UTh7dYZsiopwhF0OjyweA9XVZnFUc/uBm1HB3XhMGDAXHHwIDAQAB
+AoGBALBHrSm8kYMTT2/anZ/5tIUJhcdnohePbg6LvJbLqf4tb4l25V6IGn9tL9Yc
+F/GmRD02VwDSd9d+BWAG2Kj+d0rfdCLfKY9O8PVVm0DF6grLZ7ugItYqUHRDYOdV
+MOVOQrx+mCIzHtoEtQ6HLqmqt2rIX731L1TA7OLNm3XHyISJAkEA/mgNNNg0e23G
+64z83yxxwPEnBrnKd1+xjH9QJ0Z9SJJuF4sNXRIFA4YUNvv2MNe3gMS4Hg9w78HL
+PwcEzLnO9QJBANXuWAZGV58CdkM2w7H9+ukxMbQeLSnmgjpdddo31qqbfgFAYZMK
+LppRqyosj+a2qQ6vua0ndstTImSi7KPmCUMCQQDbwr5Fu836ISYIK830aswIw0fX
+A37mB3+zwfZXNwjaO8NmCvQMRZiXJqcnqBdOsckOLuBs9yGzuk/7rfBzeL5RAkA2
+uBcly7o/vsZ3HLvjfB5ApUecVZehvwcSXLN3VI8A5nLNaSVMEe+nozoPuIQ6NAB7
+9DCe/JgjG6mRaibzKTS3AkEAjTl5MTKkYR78+2u3NRU/ypa1iKCicSvI/Ryw7p/z
+Q8XmVA0CmNRvltf9gA1gJ04ZijBPtl+s09uppaCw9L3vuA==
 -----END RSA PRIVATE KEY-----
diff --git a/tests/signer.pem b/tests/signer.pem
index 904b3f7..816f5fa 100644
--- a/tests/signer.pem
+++ b/tests/signer.pem
@@ -1,26 +1,27 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 5 (0x5)
+        Serial Number:
+            d1:b6:bf:af:06:17:8c:c0
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=CA, O=M2Crypto, CN=localhost
+        Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Validity
-            Not Before: Dec 14 03:48:03 2006 GMT
-            Not After : Dec 13 03:48:03 2009 GMT
-        Subject: C=US, ST=CA, O=M2Crypto, CN=localhost/emailAddress=signer@example.com
+            Not Before: Jul 28 04:37:25 2009 GMT
+            Not After : Jul 26 04:37:25 2019 GMT
+        Subject: C=US, ST=California, O=M2Crypto, CN=Signer/emailAddress=signer@example.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:d1:85:16:87:28:14:0d:3e:39:fd:75:10:37:1d:
-                    a5:fd:ca:69:e5:36:03:93:0f:a6:9b:15:fd:f7:fa:
-                    c2:b7:3f:7b:26:1b:c5:02:93:95:29:a2:94:2c:38:
-                    e1:fa:5a:29:ad:0e:c7:f2:0e:7e:ac:4f:9d:09:00:
-                    64:e6:2e:60:7f:89:97:62:36:c4:10:49:2e:ef:4b:
-                    4f:e2:db:8e:69:2c:81:6c:62:b0:fa:39:4a:0d:bf:
-                    32:f3:41:45:cc:3d:5c:18:2c:ae:51:6d:e3:70:0a:
-                    62:33:5d:7e:62:31:72:cc:1e:d5:5c:19:31:5a:60:
-                    3a:1e:5e:18:66:6a:dc:89:95
+                    00:c3:9c:76:f3:21:aa:10:19:9f:77:e3:82:1d:9d:
+                    c3:4a:da:bc:c3:83:71:d1:89:78:8b:82:a4:b9:c5:
+                    70:bb:e3:00:bf:49:b8:99:96:67:0b:bf:fe:72:cb:
+                    d9:b6:63:85:f4:fb:86:55:32:22:1e:6e:ce:fd:88:
+                    5c:75:9d:77:3c:92:17:c5:b2:70:04:59:02:33:ef:
+                    be:33:26:f1:e4:72:41:45:72:f1:bf:c4:21:b1:fe:
+                    de:92:b9:f3:25:3e:1a:15:4b:26:47:29:cc:38:7f:
+                    58:3b:ae:b7:c5:69:e7:48:81:b6:55:61:45:c3:3f:
+                    b6:9d:06:e5:17:41:f6:f2:e9
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -28,32 +29,33 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                F9:92:29:8C:8C:DC:8D:1F:BA:F6:66:FA:93:EE:F0:4D:C4:06:7E:99
+                22:CA:29:B7:D7:39:B4:BF:35:F9:36:5E:EE:2B:E4:17:4E:F9:6E:EE
             X509v3 Authority Key Identifier: 
-                keyid:CD:06:38:23:C3:50:0C:F6:A8:5A:F0:A7:DB:51:03:21:00:41:DB:37
+                keyid:AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE
 
     Signature Algorithm: sha1WithRSAEncryption
-        98:4e:8e:77:f6:48:c1:b4:e2:43:43:02:32:c0:62:9b:65:c8:
-        46:bb:01:1d:02:7e:67:0d:a6:96:86:11:0e:fe:8b:96:ff:d2:
-        a5:a1:90:ea:c0:2d:4d:c6:fe:92:82:e8:5d:76:97:2c:1e:3e:
-        d5:30:0e:91:61:03:7e:a4:18:5c:67:97:f5:4b:ae:61:b4:73:
-        4b:95:9b:ae:a4:3d:dc:7e:9b:e1:21:cd:f2:ed:6f:99:46:99:
-        ea:8d:36:fe:84:f6:90:d9:46:c9:df:5c:55:26:28:04:60:f5:
-        b9:18:19:ed:37:57:b9:dc:9c:9d:7c:51:2d:79:23:89:f3:53:
-        b7:b5
+        5f:a0:da:6b:37:b4:bb:25:34:a7:ed:f3:f7:2e:f2:85:aa:91:
+        01:8f:c3:80:e5:44:87:df:9e:64:5e:5f:3e:5c:7f:c1:07:12:
+        2a:46:cc:bb:9f:a4:a5:c8:3f:84:9a:a4:9e:d5:26:33:af:b4:
+        5f:eb:8e:7d:81:65:f6:44:18:78:89:17:74:fb:07:dc:04:65:
+        fa:15:0c:b2:f3:e7:e7:af:1f:d9:02:c4:c4:44:b7:95:91:47:
+        fe:c0:2a:e1:7a:ae:dd:5f:f8:a9:fa:bb:dd:89:2d:0b:05:b6:
+        ce:ba:12:37:7f:97:4c:48:a9:fb:d4:b7:a5:d1:61:f6:85:ea:
+        30:8c
 -----BEGIN CERTIFICATE-----
-MIICljCCAf+gAwIBAgIBBTANBgkqhkiG9w0BAQUFADBBMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2NhbGhv
-c3QwHhcNMDYxMjE0MDM0ODAzWhcNMDkxMjEzMDM0ODAzWjBkMQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2Nh
-bGhvc3QxITAfBgkqhkiG9w0BCQEWEnNpZ25lckBleGFtcGxlLmNvbTCBnzANBgkq
-hkiG9w0BAQEFAAOBjQAwgYkCgYEA0YUWhygUDT45/XUQNx2l/cpp5TYDkw+mmxX9
-9/rCtz97JhvFApOVKaKULDjh+loprQ7H8g5+rE+dCQBk5i5gf4mXYjbEEEku70tP
-4tuOaSyBbGKw+jlKDb8y80FFzD1cGCyuUW3jcApiM11+YjFyzB7VXBkxWmA6Hl4Y
-ZmrciZUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNT
-TCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFPmSKYyM3I0fuvZm+pPu
-8E3EBn6ZMB8GA1UdIwQYMBaAFM0GOCPDUAz2qFrwp9tRAyEAQds3MA0GCSqGSIb3
-DQEBBQUAA4GBAJhOjnf2SMG04kNDAjLAYptlyEa7AR0CfmcNppaGEQ7+i5b/0qWh
-kOrALU3G/pKC6F12lywePtUwDpFhA36kGFxnl/VLrmG0c0uVm66kPdx+m+EhzfLt
-b5lGmeqNNv6E9pDZRsnfXFUmKARg9bkYGe03V7ncnJ18US15I4nzU7e1
+MIICsTCCAhqgAwIBAgIJANG2v68GF4zAMA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEY
+MBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMB4XDTA5MDcyODA0MzcyNVoXDTE5MDcy
+NjA0MzcyNVowaTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAP
+BgNVBAoTCE0yQ3J5cHRvMQ8wDQYDVQQDEwZTaWduZXIxITAfBgkqhkiG9w0BCQEW
+EnNpZ25lckBleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+w5x28yGqEBmfd+OCHZ3DStq8w4Nx0Yl4i4KkucVwu+MAv0m4mZZnC7/+csvZtmOF
+9PuGVTIiHm7O/YhcdZ13PJIXxbJwBFkCM+++Mybx5HJBRXLxv8Qhsf7ekrnzJT4a
+FUsmRynMOH9YO663xWnnSIG2VWFFwz+2nQblF0H28ukCAwEAAaN7MHkwCQYDVR0T
+BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh
+dGUwHQYDVR0OBBYEFCLKKbfXObS/Nfk2Xu4r5BdO+W7uMB8GA1UdIwQYMBaAFK1k
+RXSPg8cs1deghZEQQJqcls/uMA0GCSqGSIb3DQEBBQUAA4GBAF+g2ms3tLslNKft
+8/cu8oWqkQGPw4DlRIffnmReXz5cf8EHEipGzLufpKXIP4SapJ7VJjOvtF/rjn2B
+ZfZEGHiJF3T7B9wEZfoVDLLz5+evH9kCxMREt5WRR/7AKuF6rt1f+Kn6u92JLQsF
+ts66Ejd/l0xIqfvUt6XRYfaF6jCM
 -----END CERTIFICATE-----
diff --git a/tests/signer_key.pem b/tests/signer_key.pem
index ce4eed6..39abda1 100644
--- a/tests/signer_key.pem
+++ b/tests/signer_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDRhRaHKBQNPjn9dRA3HaX9ymnlNgOTD6abFf33+sK3P3smG8UC
-k5UpopQsOOH6WimtDsfyDn6sT50JAGTmLmB/iZdiNsQQSS7vS0/i245pLIFsYrD6
-OUoNvzLzQUXMPVwYLK5RbeNwCmIzXX5iMXLMHtVcGTFaYDoeXhhmatyJlQIDAQAB
-AoGAWfJfvIBJM3I+ZQAniPHSfAS0t3Eb0buLU9L6J8ZgZ1j6Xl7XkgaXp7sjD2UQ
-JnEkqSXKUrFEUmcPTHj92A+a3v5aH69DoYrh2Goh4IPXs6stQoT6hfk/bRmEPXS0
-bUkqYf5EiAoy3WW7ucR7zCi7TpU8u7tZn+lWn0n5/YZab5UCQQD6KZNfyVPBU7Tm
-cazzS1+j7pS2Acn11DBvXxQJJnaTwDd6WUwPzQ5X1fSypM0LDjr9/OX9HQd7dW7n
-h9QNsRtzAkEA1mi4pySoQOPL8Q2u5ih0Vqg+/crU6WnHI1uXup8C/is2bjGyJpD3
-hBQD7COdf36266i6deRqTj99HO2WC8CU1wJAHdOzNKqGh/h5CzjmjCOihaM+q+zO
-rbbdB4pokya44Kj8dGQNQ50JZsOl517q67SIqBvtOB6r87ZuwMBbMj65rQJAbtCR
-H1IC5AbYUS4RR0OBXYh3hhRfFoRlOBEOypWEpnkPGMT2npguVUVDAbkmnc6QHByI
-woXbq7WEpH7nHgva4QJBAOxB45CkSyTiWyXWf/0EvcLfkmYEMaAuiTF+dUkDMaaa
-eUVUu7l8YtNRgosWAxs4aqcF2fBMj+n35lu4bzfjiUw=
+MIICXAIBAAKBgQDDnHbzIaoQGZ9344IdncNK2rzDg3HRiXiLgqS5xXC74wC/SbiZ
+lmcLv/5yy9m2Y4X0+4ZVMiIebs79iFx1nXc8khfFsnAEWQIz774zJvHkckFFcvG/
+xCGx/t6SufMlPhoVSyZHKcw4f1g7rrfFaedIgbZVYUXDP7adBuUXQfby6QIDAQAB
+AoGAZL24JQ85XoFTt5Lb+BS/91Uf0jFn9Nov0um9nE8q+Bi40ctN3wuulkaS7Nw/
+i8dFvh2r2USwfavjvn7z3z7xoMG8V2c1ZFJCI2CKjocuWVkGwNnIsbO7/BOG03nu
+vir/i7TXN0YbN8zMhfuFC9APmR8bdmMa2KgHXzQcLuAmI4ECQQDhDIkC97l6rMKG
+QWbYrbc7GoMZNwCsPb/fasUknGmtPmq+s818i335u1yyhAk5pwKV7HF+WyZ76S2A
+P1bZf9+FAkEA3oN98qoklVmWSK0qV+CKHjZHSqtt32q2eu6+eAO5fVZOWHwXhS/B
+MkTtfKJbIDTLyUnwhKyht/hXOniVqHE5FQJAf99VgoArvc6oAQzsWTXrpQOddhhQ
+o426lkHenrzZNvz+PjmACsJf5CRXuX9Ylo+U4ockvb0hEssddX+H47HK2QJBAIYr
+aV1SJH79pvWpnLeiSAYRmok2tyiZMvELVkQNkuI1kUYfhRslAWxrTXvyddoEm8CC
+2glWAqlokEhMf4kyxEUCQCIQbV+XFoEqkECchik34PPmcPi2ends32dv/sW+AKjQ
+pxKpWbxVB4sEOPZzpmujP0LLxvCY4HOUJDlhENGQ8MM=
 -----END RSA PRIVATE KEY-----
diff --git a/tests/test_smime.py b/tests/test_smime.py
index 5c01bf8..a24464f 100644
--- a/tests/test_smime.py
+++ b/tests/test_smime.py
@@ -220,7 +220,7 @@ class WriteLoadTestCase(unittest.TestCase):
         buf = BIO.MemoryBuffer()
         assert SMIME.load_pkcs7(self.filename).write_der(buf) == 1
         s = buf.read()
-        assert len(s) == 1155, len(s)
+        assert len(s) == 1204, len(s)
         
     def test_load_pkcs7(self):
         assert SMIME.load_pkcs7(self.filename).type() == SMIME.PKCS7_SIGNED
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index 84df258..26f7036 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -1038,7 +1038,7 @@ class CheckerTestCase(unittest.TestCase):
         from M2Crypto import X509
 
         check = Checker.Checker(host=srv_host,
-                                peerCertHash='02C0CAD90DE6837700173A839BB8E84BF1F5B820')
+                                peerCertHash='7B754EFA41A264AAD370D43460BC8229F9354ECE')
         x509 = X509.load_cert('tests/server.pem')
         assert check(x509, srv_host)
         self.assertRaises(Checker.WrongHost, check, x509, 'example.com')
diff --git a/tests/test_x509.py b/tests/test_x509.py
index aefe450..7ea86df 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -340,14 +340,14 @@ class X509TestCase(unittest.TestCase):
     def test_fingerprint(self):
         x509 = X509.load_cert('tests/x509.pem')
         fp = x509.get_fingerprint('sha1')
-        expected = '128858B5222A5C78397530A5706233A9EB470AC4'
+        expected = '8D2EB9E203B5FFDC7F4FA7DC4103E852A55B808D'
         assert fp == expected, '%s != %s' % (fp, expected)
 
     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 = '128858B5222A5C78397530A5706233A9EB470AC4'
+        expected = '8D2EB9E203B5FFDC7F4FA7DC4103E852A55B808D'
         assert fp == expected, '%s != %s' % (fp, expected)
 
     def test_save_der_string(self):
@@ -412,7 +412,7 @@ class X509TestCase(unittest.TestCase):
         x509 = X509.load_cert('tests/x509.pem')
         f = open('tests/x509.pem', 'r')
         lTmp = f.readlines()
-        x509_pem = ''.join(lTmp[43:59])
+        x509_pem = ''.join(lTmp[44:60]) # -----BEGIN CERTIFICATE----- : -----END CERTIFICATE-----
         f.close()
         f = open('tests/x509.der', 'rb')
         x509_der = f.read()
@@ -421,13 +421,13 @@ class X509TestCase(unittest.TestCase):
         f = open('tests/tmpcert.pem')
         s = f.read()
         f.close()
-        assert s == x509_pem, '%s != %s' % (s, x509_pem)
+        self.assertEquals(s, x509_pem)
         os.remove('tests/tmpcert.pem')
         x509.save('tests/tmpcert.der', format=X509.FORMAT_DER)
         f = open('tests/tmpcert.der', 'rb')
         s = f.read()
         f.close()
-        assert s == x509_der, '%s != %s' % (s, x509_der)
+        self.assertEquals(s, x509_der)
         os.remove('tests/tmpcert.der')
 
     def test_malformed_data(self):
diff --git a/tests/x509.der b/tests/x509.der
index 56177f3..fbc9e81 100644
--- a/tests/x509.der
+++ b/tests/x509.der
diff --git a/tests/x509.pem b/tests/x509.pem
index 11e087c..4a1f1ee 100644
--- a/tests/x509.pem
+++ b/tests/x509.pem
@@ -1,26 +1,27 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 2 (0x2)
+        Serial Number:
+            d1:b6:bf:af:06:17:8c:bf
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=CA, O=M2Crypto, CN=localhost
+        Issuer: C=US, ST=California, O=M2Crypto, CN=Heikki Toivonen
         Validity
-            Not Before: Dec 14 03:25:36 2006 GMT
-            Not After : Dec 13 03:25:36 2009 GMT
-        Subject: C=US, ST=CA, O=M2Crypto, CN=localhost
+            Not Before: Jul 28 04:34:34 2009 GMT
+            Not After : Jul 26 04:34:34 2019 GMT
+        Subject: C=US, ST=California, O=M2Crypto, CN=X509
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:ed:20:bf:09:50:eb:e8:83:4e:de:60:d8:30:6e:
-                    ce:15:7d:95:f7:f3:06:dc:fa:d2:95:cb:5e:54:32:
-                    bb:9d:23:e1:33:80:32:72:ae:78:a4:82:5d:ad:03:
-                    57:62:8e:b4:7d:71:f8:0f:82:65:79:a4:0d:16:78:
-                    65:38:24:fd:06:39:6b:ec:c2:0e:fc:78:40:10:01:
-                    7d:78:33:18:b1:7f:2f:bd:65:ae:ca:a7:75:16:f2:
-                    3e:1a:dc:79:50:af:e4:61:0b:c1:52:3a:55:51:87:
-                    72:6b:1a:33:02:47:e3:cc:2c:49:e7:fe:cc:10:e9:
-                    8f:5c:60:c6:2e:c1:5a:c8:bb
+                    00:d3:62:55:12:30:b8:dc:84:7c:63:bd:80:1d:19:
+                    1a:72:f2:28:f8:59:0b:2a:6b:f2:2a:23:9d:bb:0f:
+                    7f:92:5e:dd:27:74:bc:78:0a:27:ab:1c:2e:23:1c:
+                    26:77:48:b6:8f:03:ef:57:1c:a0:54:ae:1a:e8:f5:
+                    24:a1:46:a1:27:48:55:33:98:fc:db:6a:83:2e:89:
+                    3f:e0:f3:91:9d:da:4f:db:74:90:9d:a6:8d:4a:46:
+                    cb:9f:ba:b8:60:df:ae:ee:22:4b:3f:80:55:f7:1d:
+                    89:3c:2b:28:df:46:19:d5:18:ac:e9:07:4e:40:81:
+                    75:bc:da:5b:d5:e1:c2:04:15
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -28,47 +29,47 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                77:DE:BA:B7:DE:8D:9B:E0:4E:7D:1E:67:77:03:B3:CE:73:EB:2C:BF
+                B1:C4:6F:98:6F:E8:3B:8C:A1:26:11:81:97:9A:12:50:4A:1A:6C:88
             X509v3 Authority Key Identifier: 
-                keyid:CD:06:38:23:C3:50:0C:F6:A8:5A:F0:A7:DB:51:03:21:00:41:DB:37
+                keyid:AD:64:45:74:8F:83:C7:2C:D5:D7:A0:85:91:10:40:9A:9C:96:CF:EE
 
     Signature Algorithm: sha1WithRSAEncryption
-        a5:b7:0b:21:36:79:59:1d:f2:c3:43:ff:79:09:54:bf:44:87:
-        05:3f:b4:dd:9a:ea:63:98:34:d5:0b:1c:e4:33:ea:37:7b:ec:
-        6b:81:b4:1c:ef:e6:da:dc:4b:37:4b:2f:96:73:de:94:75:62:
-        1f:ac:60:be:27:7e:3f:16:98:05:1a:4c:ec:7c:87:59:9f:94:
-        f0:9f:3b:84:f1:c1:b6:e9:54:03:e6:71:e0:4c:61:f5:93:a3:
-        be:56:6c:22:47:c8:e4:1c:fd:55:8b:a7:22:4d:f5:d2:32:59:
-        9b:a0:ef:2f:59:22:0b:0c:c7:70:b9:3b:5d:81:63:6d:f2:83:
-        e5:97
+        3f:0b:44:bc:d2:da:5f:a9:39:be:08:53:e6:fd:10:ff:d6:f0:
+        a3:51:f6:be:03:20:cc:b3:52:cf:0f:7c:3f:56:42:6f:9d:72:
+        9b:09:a5:64:3f:43:29:24:2b:d6:79:94:54:2f:99:e8:ce:fe:
+        fd:de:bb:ca:43:28:16:ff:32:ac:3d:c5:56:db:87:23:3c:d4:
+        69:f7:4e:1b:c4:be:c9:d8:27:99:2a:64:be:3a:6b:7e:51:85:
+        db:75:35:40:a5:6c:ae:53:c3:09:e7:00:35:17:64:1a:17:71:
+        c5:d5:59:e5:8f:fc:96:4a:f9:81:33:23:4c:c1:60:71:93:18:
+        0a:c4
 -----BEGIN CERTIFICATE-----
-MIICczCCAdygAwIBAgIBAjANBgkqhkiG9w0BAQUFADBBMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2NhbGhv
-c3QwHhcNMDYxMjE0MDMyNTM2WhcNMDkxMjEzMDMyNTM2WjBBMQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCQ0ExETAPBgNVBAoTCE0yQ3J5cHRvMRIwEAYDVQQDEwlsb2Nh
-bGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAO0gvwlQ6+iDTt5g2DBu
-zhV9lffzBtz60pXLXlQyu50j4TOAMnKueKSCXa0DV2KOtH1x+A+CZXmkDRZ4ZTgk
-/QY5a+zCDvx4QBABfXgzGLF/L71lrsqndRbyPhrceVCv5GELwVI6VVGHcmsaMwJH
-48wsSef+zBDpj1xgxi7BWsi7AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4
-QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBR3
-3rq33o2b4E59Hmd3A7POc+ssvzAfBgNVHSMEGDAWgBTNBjgjw1AM9qha8KfbUQMh
-AEHbNzANBgkqhkiG9w0BAQUFAAOBgQCltwshNnlZHfLDQ/95CVS/RIcFP7Tdmupj
-mDTVCxzkM+o3e+xrgbQc7+ba3Es3Sy+Wc96UdWIfrGC+J34/FpgFGkzsfIdZn5Tw
-nzuE8cG26VQD5nHgTGH1k6O+VmwiR8jkHP1Vi6ciTfXSMlmboO8vWSILDMdwuTtd
-gWNt8oPllw==
+MIICjDCCAfWgAwIBAgIJANG2v68GF4y/MA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEY
+MBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMB4XDTA5MDcyODA0MzQzNFoXDTE5MDcy
+NjA0MzQzNFowRDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAP
+BgNVBAoTCE0yQ3J5cHRvMQ0wCwYDVQQDEwRYNTA5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDTYlUSMLjchHxjvYAdGRpy8ij4WQsqa/IqI527D3+SXt0ndLx4
+CierHC4jHCZ3SLaPA+9XHKBUrhro9SShRqEnSFUzmPzbaoMuiT/g85Gd2k/bdJCd
+po1KRsufurhg367uIks/gFX3HYk8KyjfRhnVGKzpB05AgXW82lvV4cIEFQIDAQAB
+o3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRl
+ZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUscRvmG/oO4yhJhGBl5oSUEoabIgwHwYD
+VR0jBBgwFoAUrWRFdI+DxyzV16CFkRBAmpyWz+4wDQYJKoZIhvcNAQEFBQADgYEA
+PwtEvNLaX6k5vghT5v0Q/9bwo1H2vgMgzLNSzw98P1ZCb51ymwmlZD9DKSQr1nmU
+VC+Z6M7+/d67ykMoFv8yrD3FVtuHIzzUafdOG8S+ydgnmSpkvjprflGF23U1QKVs
+rlPDCecANRdkGhdxxdVZ5Y/8lkr5gTMjTMFgcZMYCsQ=
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDtIL8JUOvog07eYNgwbs4VfZX38wbc+tKVy15UMrudI+EzgDJy
-rnikgl2tA1dijrR9cfgPgmV5pA0WeGU4JP0GOWvswg78eEAQAX14Mxixfy+9Za7K
-p3UW8j4a3HlQr+RhC8FSOlVRh3JrGjMCR+PMLEnn/swQ6Y9cYMYuwVrIuwIDAQAB
-AoGBANa/yULOnlc8U7jhS+jQ8KJV0fNzjMuj/ALc4tit+Wsei1zwxL9HcsrJpbyC
-Qilnw9230Ud6eBvpjlDDSCfIl7vEx5+5dtYPnpJNUsWICCbvRKfBSHSNUZfDbiHf
-BgtDFGjkD3SxjlpYCBFXt/9YHWM9qxiH5NvfIpI/lCuAMJYBAkEA/1K6KFX6Jzd0
-M++eNKYrcWAdBsp081MiOZ90W78ChNj0V+spwX6iK63qYxJbnE9WeuvdN/jx6iXN
-FhlOMDJJ2wJBAO3Bq8fl3m/crJcvbknjMLBIx/4RM7C5e/9duMTO9u6gRDC/LIE+
-tClptiqCg5yVev5bfxVfIVOuxdYe8NXF4qECQAEvMQ3e2Do2V6OmCOXVn333JCtT
-5Rb727zIsJF8YVacawW9YYQ0QixRsjSjcSlYdN49GdmYngaoBjuEAojWsuECQEQd
-sHFc0hWKS4gk9pwEkvZuY53On9iJy5Sl7UG1admD4QV2P/HnXQZgWuhi7AH4cXxe
-ClK9JncrI1LtGmKkhwECQQDPrH/sGRTPZFjc0vRMwYYJM4QLRWCi3eKL8Pc8DSVk
-rillryZWYPMbkTBKitZmXlBEfrj3CGD1sp7Pa4SauLRi
+MIICXQIBAAKBgQDTYlUSMLjchHxjvYAdGRpy8ij4WQsqa/IqI527D3+SXt0ndLx4
+CierHC4jHCZ3SLaPA+9XHKBUrhro9SShRqEnSFUzmPzbaoMuiT/g85Gd2k/bdJCd
+po1KRsufurhg367uIks/gFX3HYk8KyjfRhnVGKzpB05AgXW82lvV4cIEFQIDAQAB
+AoGATPipcY48QlAb21XNqMrTTrfPI1+JKVFVRPLjJJJoKaxRa2SenDdWaoBAbJh7
+iUP49erA5D+QQkWDlwBs7i0B0NqSkZAUVTfzRjGackTNJUQ+smfeqRLMH+Oru6DS
+VFbb818nJOJKqMMhMz8SrPrrbg+qiHlJ3JUQnNzTYohOMAECQQDvTJBSSit34ZBO
+ABj4vWYucCnOygcpICQnIsG97sZmF8tuF55tA5e+0v9R7BPuyAjrQnKJqDj3r/AY
+AxhgngGVAkEA4iMGoHzoSQvh+gT0A2rPCtVo+URNswIEZhQmMuA0VjrFCphWkZE+
+3jgDsJTNQUJs4mczQMcBzL34Nh1cJThYgQJARMMrdXn6o6gdX0yH4HIMOqvgV5uW
+Eys5OEW0hm9mc0/DFQ+UZp7xq9PVqiS8VZEFfxTI9OVx+TqFM2EwUBMXQQJBAIge
+n0mRhl0Z6v+NZbh83X3e8h5BUCf1ieJMNKYhMT/KhnsXMdzTui0XOJldKKQksNgj
+WMWgROQSYctpJuM8pIECQQCNN27XVHs4YAQ6GvBkrHsK5w6LZkm6UaJgbCqDqyeS
+eqfPp9VRurZ/FhK1mPbgNN67U4Ik1nwjR0o8wD4mreIj
 -----END RSA PRIVATE KEY-----