diff --git a/tests/certs/CACert.pem b/tests/certs/CACert.pem
index bfffc5d..d90ffa4 100644
--- a/tests/certs/CACert.pem
+++ b/tests/certs/CACert.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgIUD5zM9oBx4OIRM05wnRjq2Ap2dlowDQYJKoZIhvcNAQEL
+MIIDoTCCAomgAwIBAgIUcgDbUQ4mXwbCHE7QpTszY3UoUh8wDQYJKoZIhvcNAQEL
 BQAwWDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxEDAOBgNVBAMMB1Jvb3QgQ0EwHhcN
 MTcwMTAxMDAwMDAwWhcNMjYxMTEwMDAwMDAwWjBYMQswCQYDVQQGEwJQTDEVMBMG
 A1UECgwMb3NzbHNpZ25jb2RlMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv
 cml0eTEQMA4GA1UEAwwHUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKap6aiOWSWzu26AxjlHa4L8sTzYGxQZysvbys3FIxqsztIsWRB0jKq7
-V4x2why9Sgi6tGKWatk0xOckTDiyFFD7BRYf3qDxFivzTkKCvhbvbbxX/6VwcOfR
-XQ0JTQeWFD2o26WWO2MbM0ZXyfZBbiRgIqVi+fbmoEASfYz7eGYET/w7807ERDch
-E3o1XbCgc4mFO/pS3sMykW+2zCz09SGLGKmdkReWXhpiTZ1ZEk9GrqVqKKZ14UIA
-h6nCwoNQpjmQx8KDfjnTYRPYg0N03MjL9i3F11qpYgu6VdZ2l/xaun3NYFBrJ+44
-Pdc+QOqVZZB1YqWqQYPm/OoSlY5p2xECAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUc2QE5V0j8b3ef6gx5kBosb0lE1IwHwYDVR0jBBgwFoAUc2QE
-5V0j8b3ef6gx5kBosb0lE1IwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUA
-A4IBAQA1jjltAjaXdGmNTLmbD/EvsqCtmX0gS0tXsncbxHEmBNq/gStZg4IhqApw
-LE8uVkjGVxRd3JPsqNL2furjzK1axMZsaNkJD1dWxcT8kfC3+cngTPiWOlCmbjJW
-CjuUWlAUnlFU9VfW0xKMToEC3yU16MSM6L3dIgkp7TC1AfhQLj5Iokn5Cc4r5kzT
-i/sQPlzPYVE+3Onq5VGMMkzK8gmS81Zqndfd0KQvKVdHZrsM88U3+1nKEsQ4dd/3
-8HV+C7LE+ydPV3ywJa6KTtmCMhUlLb2IpNbBgRkro69rkJWtSVDIHjoqwKokGDzx
-kolS+GurfGkHKTbY8HwyfBTQjZR1
+AQoCggEBAKWIB5m55xy8zwXcQ24YEBAKekyU1qCgimZpUR7FP8MV8LJHRihk7A5Y
+gIpHPi3kroTogbJ1p206uff2eaytOj0XNI+quU7Ij550lgjLC4NKV2iLK4xJfPzr
+i3a2ahW6r5axqMo5uSBBYnuQA5UIS6f5x1RHu3R+Q1uaQzv+oGC0ucOT2IXbPZfy
+dC+NfDWRPr6OomsXwijzQMBfCjQX8SgI7KWJFoAoJRnU1tISuk1IbMDTrFQF8uLB
+lrb52Mb/m5orWEmc6mJ7k+pQL23L6if9zOYVHGYHjNR0GVcrckGTLG4/DI8OfquH
+bER7rkDM+OtXtXAv6QX7otuNsMDly28CAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUyIUKeIY2dOA6OuTNJEC5Q6VkSbMwHwYDVR0jBBgwFoAUyIUK
+eIY2dOA6OuTNJEC5Q6VkSbMwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUA
+A4IBAQAAVTgdOXYQeYfgPOtZElEjc2xaRtMeDmFyXqJW5qeoLlQ0pLaG1eJDq3Bl
+x7nXXtUW3NvtiUqN2dxaxK2IYp9HNl5iErCVRpCFceFdZ/tmRPmTfnMtFoJ0auXR
+CdJhdul9vaq551YN+BUlN/tzP7KK2wwORC5QlNey3MunX2fvfExJsk0MtLeHDh6o
+DnEP8OCvlstnlQ+r1uA1ooqBhj/7uQ4WLkyCeUc4DfMNusr0q2AaT0j0jZf2rdtJ
+66sEqzYoiOJKh4ukVxiaRIDyBwt7y9Rz3BfwigEyRyRlP8jjVkJh30hCkNnWlxlq
+uMp1/BXdGThQN0hXYKbfZFzwuaqQ
 -----END CERTIFICATE-----
diff --git a/tests/certs/CACertCRL.der b/tests/certs/CACertCRL.der
new file mode 100644
index 0000000..96cff5d
Binary files /dev/null and b/tests/certs/CACertCRL.der differ
diff --git a/tests/certs/CACertCRL.pem b/tests/certs/CACertCRL.pem
index 305530a..f94a1d6 100644
--- a/tests/certs/CACertCRL.pem
+++ b/tests/certs/CACertCRL.pem
@@ -1,13 +1,13 @@
 -----BEGIN X509 CRL-----
-MIIB9zCB4AIBATANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
 CgwMb3NzbHNpZ25jb2RlMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
 eTEYMBYGA1UEAwwPSW50ZXJtZWRpYXRlIENBFw0xOTAxMDEwMDAwMDBaFw00MzAx
-MDEwMDAwMDBaMCcwJQIUDNLHzkIApmatwuk4ju+Cl74nPlsXDTIyMTEyODE0MjIy
-NVqgIzAhMB8GA1UdIwQYMBaAFDOp0wp8AlPBt9gaqapVpq6gXOmcMA0GCSqGSIb3
-DQEBCwUAA4IBAQC2ThTTU7HzwKakJGaeAXsv57I9gQwZJh1sM0CW1bYhQCFQXx9n
-hNnpKu3CezoldjTYgZHphAwrZfLz/u8bKuxuOn/gBT6tRNU7YhFd605Qp6AzCQus
-bENda7LYc+cWbrxtndc54zmEMZ1LkpYE62APN/aCC29BlWQQw+/IvprI10MROlB2
-z3tUjiBNmabHyD2tVLPfuoK3Wdm0upWSYhDJNuFwdIhyZgkYo04YxHrmnfkIp6fD
-HuD341PRMTAItN4334HaJwgu2Oa8MdiiG+ZPlIUSFePgFLgFeNE3EgwTxIu8SQNo
-k5EM7M5+03i7C8p9bBS88n2LzHhoHDI8gfvQ
+MDEwMDAwMDBaMCcwJQIUZgDukdSnO8kxz6hKmIZP4obj1NMXDTIzMDQwNDEyMzc1
+NVqgMDAuMB8GA1UdIwQYMBaAFAAlGvggxNxiRRwadSm8yqzEt6i0MAsGA1UdFAQE
+AgIQATANBgkqhkiG9w0BAQsFAAOCAQEAi2ltqUTxYRCMkc3qJuP9k4sRe0/Z7cUs
+vJr5ODRYc8w6OE1Bd/jMcxfBhejHrIdDFzzIi9acU4wbimtjTpw6xZVyifndOyHx
+NhDj7U8X5mybMTSM9R4pf/2A1+SB24Y4cOnLVDSQnCBGPf6ZrEiRAd0HIB4HSP1c
+Jhf0EXtIDE1wqfO5jvBlHTMpn3hHtGf+CJ2/m9CRGCA/VxpbYXIVHxBIfW92tjiT
+5S3WxIjz9VKc2B8AkdWyYmG1O7h3Qx+1JyQvmMSA78zubtpzxIwP+hPlSeTHiFmF
+aBARQyT971XbSTrAqAOfvwTYF7VrjAxR97NJ+TTrRRZZfm3AVk8t8Q==
 -----END X509 CRL-----
diff --git a/tests/certs/TSA.key b/tests/certs/TSA.key
index 1d46366..56ce8aa 100644
--- a/tests/certs/TSA.key
+++ b/tests/certs/TSA.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDngzpJn/umy8rb
-AySHhXZ4jxljzZ/xDW/8txby3fg1LLP1zeP9g5Vwq70B5Z2V1QWevuiCzzEhMKxU
-6JvFUgJnCAqKLxcPxmplgLHIOftq6ly3XicmvwXzD8uE0mDNP50v4hABl66OlRF+
-3cGlwEHlr/A4VYcyEc70xBI2cUjmutr2O2+Ncpamw/iAl60zuKD9CGP7AMfcfUC1
-CdlomyMAk3ROvWoJXxV5jCg7LoTQWSzdzQLi2/mBjG0y9Hl4dlR27jsoeUNlkluS
-C8Dh3mPGQ/rfIEc/en1UO+sVZRo9iBJCw88zjv6uCf2nlevaAUptRuvQqEv4WMNa
-MDe0LqKFAgMBAAECggEADGeQHnTHf5Lozh5XfTlt9Ry5wAq6+Kf/KZvHy4CQNY0t
-IU0EW8eKoMxa5rieXnJZCD3zaFrgp4YbnbsO6Z4wycN5CRln020Os1yXagKNUZe4
-Gw0c7OsMTw84GOhKzoSLkA69S9CMRlB/bPxFzXNFNKDeLq6KfWjN3XiJ/0fHn7Em
-RnHB3C7/z+u70YbkN1T7edzn70NRhBNCVIXuXxrQ946BRJOGyHlarDHQPffGfYzs
-r4Ym7DRd2RyIH3xWdJfEdcQOgioYpQqMiXk+afMNRNbkSpi2ImPACIpX54Zxkjni
-/zjST+CBC/8PZfdmVCW/mRNs2IOmZWCK3yka7JKRgQKBgQD1S9VJbBLHpKAtnahr
-yqwAD82dnaw21BKJaPqeOq4it+EF8p2xmjDCuOXl8qw5t0+SgIalQwWzWVCLoav9
-58ajCJwuTcqnrrmhx0oX3eAYt6z/hnInWdLpDppg8BOxMmFzgPI2+6g3SyXDex29
-RslygQ8/xReUV//LOYayK4GPQQKBgQDxnWt8MnGiQGVaA1x7wM96C0Y8RfuaqfNX
-/eyuw9Z4AB+wg4G2d0NhsbSNdmZ72KuKXaa2Gl3MJ7ImUGbskgTNybQfIwftwcSZ
-Road4j3ZVfNN6QdOEu+c/8xyf4wEf1ygD7qp/geXRSOf1eAC3bg+qAPFRi4Ml9vZ
-WPtQHoeGRQKBgQC1ZeQPzPVCYHL36NxRAmsaDJXA1oYxcblXlqOnebum/xZQgK+v
-VFh016lj2IcWk4Ir1BI+iobfr9AJwoBfXxSdIlPlRi/0uxiaE7euWK1Neh9cQ7+N
-bDa1lNADmebmJly8vwHgOVCXu2Hs4tIGVB/LJrfxL76VPFJ0plD+13+TQQKBgQCu
-tXLMerlaZpAi930/axtbl51w5fXaT3vLq6wiby+80/IWM/FunGyXzuTMycmvUeww
-gCmVUhlzD10tgUP7Wlao62oYfb8098EOSEX9EmRArHrjYlZK6TxkXT9bp8j6U5IJ
-l3YVh7+7bV4mLIPv7p1UiS84zddseb6aOlJ3C6xZtQKBgQCSBAvt4wrMU62+0Zu/
-RAPl0QOR+4WtbVIuoROeYk3Vm5CFooZmE2PcCmatXw2LL9VPQ+wIsc8Ov/c6SNjW
-8FUj2ihdLEhA4pLl7hADAnNBwSnK2nODP1TDoIKG1Hw5yZoYIS4xFz/F96brkaLE
-IiONCCr/bs9tYZNfl92oXvIc/A==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC4i7wvNv2G2fUg
+Heus5XRyBqksp3+VYQbngT9lbom+SsZ83BuJuf5prKmDvVSVGD8ASHDSaMFwY7CB
+9vEbxM15eT9qH47b/32aFuL+UkuBoXdb41sS7MOidiATYK7PdI/ObpipAJvFNlyO
+N1HpZrDjTA9MTJrSSUj7ano4EPcPgSWNZmM/+PR5k9LrSpPVEZElesl2QZcpJecm
+5iZYmdeQ7h+EWDKXqVgVbksiIv+Ls7uJg8G4UU/yadvusnZTG4qPY/uQFZFvG57F
+zhyWMOLggSrXGi7sns1YZCJRpg3eKjVi31cXarItfXY64TkxN1KOhLI7MbR1lji7
+lHV5cGixAgMBAAECggEAC4F6zB7Lk7rHE6eJ6A+uQOW1anlO9QtFmO1v/Gz13Y1f
+7qzycpXMDN6c+v+05E7MrsHVdujdFprAiHnS8n5EqUwr7fvltkWpmQ/QOzb6Siy8
++lekd/uW/uwKd+rRO1HzHVW74t2M2LDY+GzuiHTElodJdOJZzL6Q9EvhLtmv7aFu
+kHjwI9oGD9FMZwVs12wL+nBYbakdk+Pyiw8r3Lo92QGg/5N67fQDrWlyH2C0qSNX
+Hqe+k7Rt6dfYnRuXFTkLUy3SCagrYL5cG4wgkgJ13LDhK651N07XQOZW2ugmAdlP
+Xkip9U2yzgjV9pYVRM4vztEFteSs0636rZfx2bquGQKBgQDdKo2eS1spyvYU60At
++gwhLEUSpy9rDzpeRidll5/nftiTvmA8M2vsHCqzp2U0exYjwN90Ud7WAUw3R//l
+Fccact9uhhDSGhy3zPvzEwkNhBAi4b0XT7Zv5sxKP1mve/HeFgM8waBqVi8mcOJJ
+OLycopQajWPqaqd0yS/zHAO4LwKBgQDVnKTatZPFzhupLenTsh2otOXXAxn9LH69
+8c37h1Q/T6Rk+nEaA5HmryNKvZpUSOC9oF1NTzPY6BvcOit5waUZwvpDJDHK7aJ/
+mbL0H5keN44cWSFj8FucfSWUlC18dQ8KAw11Tyui9IZS1SUqLqVGtmHWBh7RKbUa
+LyCAwaLVHwKBgF9orA9NktZEqEP9+IHdDL6CyolxdhNJTnS87uH0txa2sdeKmRlf
+VX9V51X5ML+jGbnyynLznp3TkX2HoezBqFLQm3Kigz8f5KOl2krSO2WJQyzJFTmp
+OZqshhTBn38EiSK1fFAJd5pn848xw2yy/SrVN+78b84AlJzc7cKCo1ghAoGARVCJ
+JfcZtmwFCca+Q1Vezmm00ypMepy/m78lCeOF8O1U+PdTUA+sfmCCYTRZKdRkKOQq
+onV6632V3MZ7aQzvGAbu0m6iQakOu70SFqlSND3uvUAm15kdARCS6z2R7PrHIIaR
+DWndTQlvtN05LBDqzKFN6fcedNzFyXNVZrJuth0CgYBQFqCAedQpzDovexVhGug0
+OGJemx8R/UvqZiD2lBdLhdUwPo29HcGcwYulB1DYlhGRgETQh7/+9x+wG0F6hHvC
+2LnzpsJBlyEsQV9Y8mJUuyKygf7ctWoheupwiZm2EGap1bHqfhXG24wpHOoNjcUw
+vc9UGF7uiU/EiGbXnjHloQ==
 -----END PRIVATE KEY-----
diff --git a/tests/certs/TSA.pem b/tests/certs/TSA.pem
index 0425894..410447b 100644
--- a/tests/certs/TSA.pem
+++ b/tests/certs/TSA.pem
@@ -1,28 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEzTCCA7WgAwIBAgIUaDV4MOupysdYAfwy1BiaGDN6KWwwDQYJKoZIhvcNAQEL
+MIIEMjCCAxqgAwIBAgIUZLV0uiTcqZkfRcm75kKFcnFi8pAwDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
 CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
 dCBDQTAeFw0xODAxMDEwMDAwMDBaFw0yODAxMDEwMDAwMDBaMFUxCzAJBgNVBAYT
 AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxHDAaBgNVBAsME1RpbWVzdGFtcCBB
 dXRob3JpdHkxETAPBgNVBAMMCFRlc3QgVFNBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA54M6SZ/7psvK2wMkh4V2eI8ZY82f8Q1v/LcW8t34NSyz9c3j
-/YOVcKu9AeWdldUFnr7ogs8xITCsVOibxVICZwgKii8XD8ZqZYCxyDn7aupct14n
-Jr8F8w/LhNJgzT+dL+IQAZeujpURft3BpcBB5a/wOFWHMhHO9MQSNnFI5rra9jtv
-jXKWpsP4gJetM7ig/Qhj+wDH3H1AtQnZaJsjAJN0Tr1qCV8VeYwoOy6E0Fks3c0C
-4tv5gYxtMvR5eHZUdu47KHlDZZJbkgvA4d5jxkP63yBHP3p9VDvrFWUaPYgSQsPP
-M47+rgn9p5Xr2gFKbUbr0KhL+FjDWjA3tC6ihQIDAQABo4IBiDCCAYQwDAYDVR0T
-AQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAdBgNVHQ4EFgQUVzwbd6xW
-ZJQxaV7Vq7t+rbzjtJQwHwYDVR0jBBgwFoAUZiXazafm/zg+I4wbylR/skX0dWow
-gYQGCCsGAQUFBwEBBHgwdjA5BggrBgEFBQcwAoYtaHR0cDovL1RTQUNBLnRpbWVz
-dGFtcGF1dGhvcml0eS5jb20vVFNBQ0EuY3J0MDkGCCsGAQUFBzABhi1odHRwOi8v
-b2NzcC5UU0FDQS50aW1lc3RhbXBhdXRob3JpdHkuY29tOjkwODAwPgYDVR0fBDcw
-NTAzoDGgL4YtaHR0cDovL1RTQUNBLnRpbWVzdGFtcGF1dGhvcml0eS5jb20vVFNB
-Q0EuY3JsMFUGA1UdHgROMEygGDAKggh0ZXN0LmNvbTAKggh0ZXN0Lm9yZ6EwMAqH
-CAAAAAAAAAAAMCKHIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMA0G
-CSqGSIb3DQEBCwUAA4IBAQBdZ/Zgc0e6F4H7J/rdAegE3MhZPLLAPGq/H5IPC4ij
-ksW6ujTejCJgtSWAfkUXjaCDQvT7bkq4AMo18ELc3I2kpTp1dvftc3aMoDBuGz/7
-K0sxlA1DFncmY6hhh3cg2Gjb1vlnuWnwwSrfy46UuNvsJi4DjBZXHt+gY8KM4Gas
-i3MIqlM/ZIlljc2LRGUKxftkM3odP1kA65yNlcMV9BESRGsAOH8nb6f7Qb4I6vjk
-Oijzs75JPWy9C+vMutH5LSfMAjrdRmNKnDoWVCe22QT1jReIRMNsRjdX0j+SkyyL
-HpqLVmczWLFHPspm8tRyAI7Vc0CpY9ixJyeidD4mg7iv
+AQ8AMIIBCgKCAQEAuIu8Lzb9htn1IB3rrOV0cgapLKd/lWEG54E/ZW6JvkrGfNwb
+ibn+aaypg71UlRg/AEhw0mjBcGOwgfbxG8TNeXk/ah+O2/99mhbi/lJLgaF3W+Nb
+EuzDonYgE2Cuz3SPzm6YqQCbxTZcjjdR6Waw40wPTEya0klI+2p6OBD3D4EljWZj
+P/j0eZPS60qT1RGRJXrJdkGXKSXnJuYmWJnXkO4fhFgyl6lYFW5LIiL/i7O7iYPB
+uFFP8mnb7rJ2UxuKj2P7kBWRbxuexc4cljDi4IEq1xou7J7NWGQiUaYN3io1Yt9X
+F2qyLX12OuE5MTdSjoSyOzG0dZY4u5R1eXBosQIDAQABo4HuMIHrMAwGA1UdEwEB
+/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwHQYDVR0OBBYEFHKq3yZ0xgcX
+JBsmzT281F3OjZrYMB8GA1UdIwQYMBaAFEb1RokusIypoHJC5xTAi+oI2nYpMCwG
+A1UdHwQlMCMwIaAfoB2GG2h0dHA6Ly8xMjcuMC4wLjE6ODA4MC9UU0FDQTBVBgNV
+HR4ETjBMoBgwCoIIdGVzdC5jb20wCoIIdGVzdC5vcmehMDAKhwgAAAAAAAAAADAi
+hyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADANBgkqhkiG9w0BAQsF
+AAOCAQEAvmUJ0aq51iHRyYudXQZWi2qci5qXOmwsiD/DXa7iOs2823YqWA5QdjDI
+wX79S9qTrg8lyeIxEBDoVxPet760d3if1mbrLO5AUH9weZ/5a3bqVrhACgaqVBBO
+nBAASd1IEiJDl+Qkj1/goaNy+2lSBpq+INgfPkYD1KCdpUWecpC8qrXHH8KoTfLk
+vMnGfxFLayxuELzCOs9Z0PszruMeWrdv8tNYjMq5sS+dOcPHGlmjcdORvLx9uj6S
+belAqubJMamFGRjG/4OlqG0WpRKKoAUWB1w26x7PgRsAEHtNVk3sj85KGoAlS04M
+SasH4TTkfY9zhgdrK3cdCar/iwoDlA==
 -----END CERTIFICATE-----
diff --git a/tests/certs/TSACA.pem b/tests/certs/TSACA.pem
index 22481a4..efe569c 100644
--- a/tests/certs/TSACA.pem
+++ b/tests/certs/TSACA.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDkDCCAnigAwIBAgIUWSzkBFwFSMGVBrF88OJwBUP9eNkwDQYJKoZIhvcNAQEL
-BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
-CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
-dCBDQTAeFw0xNzAxMDEwMDAwMDBaFw0yNjExMTAwMDAwMDBaMGAxCzAJBgNVBAYT
-AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxJDAiBgNVBAsMG1RpbWVzdGFtcCBB
-dXRob3JpdHkgUm9vdCBDQTEUMBIGA1UEAwwLVFNBIFJvb3QgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1iXUDwCHsyISjyimEvnvIPer4aqdpZ26y
-uKI2oURQQpAlL+PlbP5/wm63tyxCY/Oo6cadcXEk9TGEi/SpGMKJtfaZAFzygEQC
-dU995pfpLsQ9Aaf53ErE4L7RsB+noDnYd0UWklBHBmKmWSszfaS/qcsqexP+BBzy
-GgUK1/bVg2SjYESoQ7lWA0o/s9VTYBQ0k36EqykBjWhy87goKBvvDkafqbWRcG+8
-RMgbzvD4vBjOyZWhXH6cKj6Hg7QfDjuTQWV7tQ+zCq0pGMsftcH+N7z5oXyNUiwj
-ALPWxOvrViNRDG2I3GUXU3yWQIHNhmNkIrNE5GJRmx1dkYX0oEW3AgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFGYl2s2n5v84PiOMG8pUf7JF9HVq
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAmCnnUVQoKhbKLqyp
-qNdyT5FFEKyoCd9defa5bKzPhzdkkuxPjidsLsxvP58n6EB8i2inddBfdUxv/0lG
-kGHO+7Lz8qjMlJ9+VlLTmA96Q4SHBP9XKUmyYPx3PpEZcxiJZNXoUO1ZokTps0/Q
-BSoQ+9SPIIzxEzr0BNijtY/x6TJV5M9J1ePWuK1Vu0mhTs3FPE+/wXzxZG94ZQLg
-pX9hkkXmvRIe7dg3XZDUtKglH2p4c22vX7UP4qyqpPWFWKw1lCYt9K7QOVAdEfCI
-TlpZh6MQPZIk0FUAWOxDeRTAJk/Pe0I7wf+L1hwxi1y4JfgebNXynp46T6v/I5Wm
-UApdTw==
+MIIDjzCCAnegAwIBAgITYFaTV+djNEuQqJ6krYv+F4HtqDANBgkqhkiG9w0BAQsF
+ADBgMQswCQYDVQQGEwJQTDEVMBMGA1UECgwMb3NzbHNpZ25jb2RlMSQwIgYDVQQL
+DBtUaW1lc3RhbXAgQXV0aG9yaXR5IFJvb3QgQ0ExFDASBgNVBAMMC1RTQSBSb290
+IENBMB4XDTE3MDEwMTAwMDAwMFoXDTI2MTExMDAwMDAwMFowYDELMAkGA1UEBhMC
+UEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UECwwbVGltZXN0YW1wIEF1
+dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9vdCBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAPHQvI/o81ZggyjEkXuitQlP5f/re7Unjzb3
+FpSpgZMWSLLLepO3FsP2OrPs/S8HIGfPM9am2Y4jd8SmLijrtAyiLiTZAUe1OCsv
+RSQqAYzzd0mqAHSNDSyhL0fW3n3I4wgCRaVEtLmqW3sAtMXn725DlsIsc7u3JSVp
+m2tuh1p4lQc8wXdsxL9i+b4nz4mY0KbDlYBT5CFuHZ7uvgAdnEhHo+4ssz9aHY2w
+DGwk+HF8hRGIfdBduWl6k9Rc3/njLw0JEnxTisblRSs/Ju+VT4fnuQBHGNwa1MyL
+w+xhiGU2nYc0z2enR6Ul6fXhl1dAKS/GqBjUNgm6bWyQadAMnmkCAwEAAaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQURvVGiS6wjKmgckLnFMCL6gjadikw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQAiWxAjzB3G3Fqz//0C
+3uyK5gjLx3osnGhGzleXJ3iz8wODC37c26z0WU8BcK2xfU4yLzi/ZdjjTfyKYNUq
+kUEVFcMsZp0fmv1BN+g50Mxo+TQn6KlrWWhhuonQmFzQiwYPjyhUtmv8C90ONFrb
+/rpcgBOFpf//PutWJ1y9mzlMQCG//bMDIItBFW8/zt7X0WMI7RlWssXIB8k9ZNls
+698hRvBkJ9wwbzCUyeEForZO0MpvND86F/ZshpCtiINY/F36Al5/Jrrx5XiZz9XB
+tELgQudLi68x8IeizvmKPeEVz7snCW0vExvV02c8+Aye0s1vcYrNQugNqdTWtz7k
+bMSp
 -----END CERTIFICATE-----
diff --git a/tests/certs/TSACertCRL.der b/tests/certs/TSACertCRL.der
new file mode 100644
index 0000000..1883abc
Binary files /dev/null and b/tests/certs/TSACertCRL.der differ
diff --git a/tests/certs/TSACertCRL.pem b/tests/certs/TSACertCRL.pem
new file mode 100644
index 0000000..4b30991
--- /dev/null
+++ b/tests/certs/TSACertCRL.pem
@@ -0,0 +1,14 @@
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwYDELMAkGA1UEBhMCUEwxFTATBgNV
+BAoMDG9zc2xzaWduY29kZTEkMCIGA1UECwwbVGltZXN0YW1wIEF1dGhvcml0eSBS
+b290IENBMRQwEgYDVQQDDAtUU0EgUm9vdCBDQRcNMTkwMTAxMDAwMDAwWhcNNDMw
+MTAxMDAwMDAwWjBOMCUCFGYA7pHUpzvJMc+oSpiGT+KG49TTFw0yMzA0MDQxMjM3
+NTVaMCUCFHzAIeMi1IEamyKuw2jUbRACPsXeFw0yMzA0MDQxMjM3NTVaoDAwLjAf
+BgNVHSMEGDAWgBRG9UaJLrCMqaByQucUwIvqCNp2KTALBgNVHRQEBAICEAIwDQYJ
+KoZIhvcNAQELBQADggEBAH3wqsK5cDRaESaGrqbcsyG17LtUW2dDPdip8DIAnPNv
+ozGihXLfYbeTcTHq84Q7oj3TZVhkGo103pHaWwFC43MwNNPYe4xAWBjjCGuORlJJ
+61yZ4ma7jVmR2udh6wTn5ORQVuWjRfsxCMwsH/jAg/Kh48CNwXwIsp9160N9TvSv
+f/hmD6VtpVqCgrgFlTE1xr+8xatwScXtdLixmyE/Yd1OrEHWzKzl9UmgN9vqsGvC
+ivYzEJ/qsH0dyIZ1xZGT5LZLMkbUWW24SXhZn6Xaal32isrBz5D4EAFMAw4QsnFR
+LMRU9ozATB+q3n7MTvQ4vajVckZNry9opcGRx6C0QtY=
+-----END X509 CRL-----
diff --git a/tests/certs/TSA_revoked.key b/tests/certs/TSA_revoked.key
new file mode 100644
index 0000000..115b941
--- /dev/null
+++ b/tests/certs/TSA_revoked.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDApxb2+fqWiOEc
+Phc5hVtWkU57NZJT2cVWT1sUlL3aws5pB6husy7YpAg2J11Z69Qk+kypdTy01FbO
+65BAh866Dhu2OKI1WjzJeMnmm5lqnqnN8b3W0OriIZbD0RxmOlOU5KkCevyc6We3
+Uk+mOZ9gtchGzV3zp6+R7EWb5HwQk7LaRe70E1ppjR2KQ83Xv2SsVOnn/4FhAFQ1
+oWklYCBtGOL34czrqJteY3eF5XOkBeBeSg47CdomUCeMcodIsNo9X/ruHOM9PK7+
+qAjgzhmKk4ZhBlgd7AtfvlYd8SaXAZe0c35Vu9izcAwPY1+DFwLEbBj0rw5j91vT
+PxzZibyJAgMBAAECggEARMHdwlvJgbxsi0XlyBO+W5EUr4iZJvAMLBe6bAgCEneA
+b5/aD1hIGe3BOIKoIJW4a1Ih1kEPX4KBUOxl2YIe1+x9G3Xu/pesJkPD21ghUxo5
+hFUI6gg6LGbMhiq1tg6PEg7h+w6l5eKvr4/i+XKLXVrDlfFp3LI2SSBIX7EWTluo
+nvAl7I8UZX+yZyKSdHPOeV04/uMrsTaUD+q7NPehT+k9t0aZWRjTc9SufhS6i78P
+RiR9mx1SKowFJsxFGfm4j/xAmqHeOhlU17mOsKjVUCOosIsLocUnkj9f95VCsK/o
+WmPxMe7mB/pnmN4QUAEPI08tErLjU727jWQKOOPmAQKBgQD8hAZKZUyqqiPqIg5W
+i+K7TfWwPKWa/P8e4SCxBR4uGPSSp6w0LqX5zJAgXjBHSOP1PaiTTULXqrWuaD2k
+QW015Wcosk69pYV64iuQ6Q2mzmvqkLSVXbX3fBKKO1HCsSv5/zxAhL3CWdQpfZNz
+prEG7qBzfzZObR+LxLyUpR1CIQKBgQDDT5uMVwiyBJTT+xP6sGBn0W1zG1CtlSqA
+DlwKrOPGKQj0p874jYeVSEZS0AavAqid0mCwf0o5cwVGvg2/yIT0dpCZEec5GMKe
+owmsrQDvft/0YJNL7LRSobqdB+MoYVn4vm2ZHqJer5Y9/Sm4yqF9Q89GnLhnoeY+
+6msSDk/9aQKBgQDSGAqf1V6PVFXjVIh3a5WuX3O+OQdUR5EAITEw92Af3HWIm2cE
+V5eSmaeEtrkWZkf74FwkipDFnWvh+yrmQeVahU5qJsiqs0+2aPz0aWMJWQ+irtkA
+uWJP0fQe/LHO+dfr/Xck+wxi6phCGRAYliUN7najAcGuSM6JXJvGVQZd4QKBgQC+
+4efhIhKygT2/a60cHhMqhAkXLYQNEjMmUmJsYIqAWgyRqAvk6dWv9aIdP4i4tL18
++WZcORueyCZI/GhNnrkqf1JU96VnLSbQigFjjPXUG8jfex+aXa3i8IOFA3dkOLkJ
+HXvZ4ZHJPox06x9Cpm9sEMDcf0DOr/FqXgrk664LuQKBgGL0s3AlyisiPt3K14dB
+3nHStFsTrbsMvM576ajGi9ZGaGNppIVh8wqK/oJB0Kd+MsIO5zoP46ZMUZI7zRGz
+UrPYWea6p8H4OaRkPtuvgUIUptlMprQPSvXkvH0qgxeHoniK/g59tcsAouoSL6KL
+oKRZ9HXDV2TdMML0lac2ipiV
+-----END PRIVATE KEY-----
diff --git a/tests/certs/TSA_revoked.pem b/tests/certs/TSA_revoked.pem
new file mode 100644
index 0000000..829d4f0
--- /dev/null
+++ b/tests/certs/TSA_revoked.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEITCCAwmgAwIBAgIUfMAh4yLUgRqbIq7DaNRtEAI+xd4wDQYJKoZIhvcNAQEL
+BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
+CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
+dCBDQTAeFw0xODAxMDEwMDAwMDBaFw0yODAxMDEwMDAwMDBaMEQxCzAJBgNVBAYT
+AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNVBAsMA1RTQTEQMA4GA1UE
+AwwHUmV2b2tlZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCnFvb5
++paI4Rw+FzmFW1aRTns1klPZxVZPWxSUvdrCzmkHqG6zLtikCDYnXVnr1CT6TKl1
+PLTUVs7rkECHzroOG7Y4ojVaPMl4yeabmWqeqc3xvdbQ6uIhlsPRHGY6U5TkqQJ6
+/JzpZ7dST6Y5n2C1yEbNXfOnr5HsRZvkfBCTstpF7vQTWmmNHYpDzde/ZKxU6ef/
+gWEAVDWhaSVgIG0Y4vfhzOuom15jd4Xlc6QF4F5KDjsJ2iZQJ4xyh0iw2j1f+u4c
+4z08rv6oCODOGYqThmEGWB3sC1++Vh3xJpcBl7RzflW72LNwDA9jX4MXAsRsGPSv
+DmP3W9M/HNmJvIkCAwEAAaOB7jCB6zAMBgNVHRMBAf8EAjAAMBYGA1UdJQEB/wQM
+MAoGCCsGAQUFBwMIMB0GA1UdDgQWBBRox9wIQpZpFKVd2ZuQpm0W3IMbIjAfBgNV
+HSMEGDAWgBRG9UaJLrCMqaByQucUwIvqCNp2KTAsBgNVHR8EJTAjMCGgH6Adhhto
+dHRwOi8vMTI3LjAuMC4xOjgwODAvVFNBQ0EwVQYDVR0eBE4wTKAYMAqCCHRlc3Qu
+Y29tMAqCCHRlc3Qub3JnoTAwCocIAAAAAAAAAAAwIocgAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAwDQYJKoZIhvcNAQELBQADggEBALZ0WXas4Ds0vPkd
+Hsk31o3+Y7i9W+SaQ4HgOhPe3eSA71wrLXsRDBS08nw9ZePrHly9Otuz0122O4Tl
+DZFWt4QdhX74L9AgwSdcv1PpC05nUXn70Ira13jQ1SEH1pye4x6M1tzUxwEeMbWV
+KtvPAafe4Ey7/HVSS1ACzYUcK2+j8Yqrui1WjgYNCLsokhPzLGq1Yj7x75L8WIgt
+S/ATVs35T6YMO8LqwOEAozPnllXTaRlpm5/ODgfaa7kgpJhNWfroXZ1DazEKSa6O
+qsE51vIfdoXH8uh13iWNxdwf9YxLv64WHrBqg0BZcTyAIJ1YS8+rc0K/7JNL8Niy
+8iR2Pak=
+-----END CERTIFICATE-----
diff --git a/tests/certs/cert.der b/tests/certs/cert.der
index 5a7b0f8..376cdd9 100644
Binary files a/tests/certs/cert.der and b/tests/certs/cert.der differ
diff --git a/tests/certs/cert.p12 b/tests/certs/cert.p12
index 9966a41..efe830b 100644
Binary files a/tests/certs/cert.p12 and b/tests/certs/cert.p12 differ
diff --git a/tests/certs/cert.pem b/tests/certs/cert.pem
index 0627b67..5b18ad2 100644
--- a/tests/certs/cert.pem
+++ b/tests/certs/cert.pem
@@ -1,46 +1,47 @@
 -----BEGIN CERTIFICATE-----
-MIID7jCCAtagAwIBAgIUa9RRoV7Ah+0wEQjOlKzlNOaZ+CIwDQYJKoZIhvcNAQEL
+MIIEJzCCAw+gAwIBAgIUWKSaOJKyCD0hqj+Gay8GZwmGLh4wDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGDAWBgNVBAMMD0ludGVybWVkaWF0
 ZSBDQTAeFw0xODAxMDEwMDAwMDBaFw0yNDEyMzEwMDAwMDBaMIGdMQswCQYDVQQG
 EwJQTDEZMBcGA1UECAwQTWF6b3ZpYSBQcm92aW5jZTEPMA0GA1UEBwwGV2Fyc2F3
 MRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNVBAsMA0NTUDEUMBIGA1UEAwwL
 Q2VydGlmaWNhdGUxJzAlBgkqhkiG9w0BCQEWGG9zc2xzaWduY29kZUBleGFtcGxl
-LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeV2F3cRYWmG2li
-Bh1qMgaJbK62gE8Cxu/LG6WSFwOutmKSg5BJQDnpkHe8d0a0mpq1mTWlTb2Y+NVh
-vHIMOj/X0EdUg8h7NctODJdb5rHcVQEAs5e8QpDY5cpF3Ec+kDE4meHGvetKzBrv
-PH8lMa/I8HEUnU3qWdTCrMqIvMmjokkaAAHJ22h8uUWnoXhLRh2Az1nqQPrmiVW0
-T8UWFRiWYZr5aFbfrqLamdJxMcS0UnbF6vJzhmpaZVE+7UK4vQYN87MgNbJkAfJQ
-5m5DZWiowQGqiXU3O6Du9EgCRBWv5qlTs0GSdZKh4ziC+ovFT7XQUG9iNoiY+YTV
-b3YGo/ECAwEAAaNiMGAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUA4795c7ElDG1YAeM
-Ei7zxnd53pYwHwYDVR0jBBgwFoAUM6nTCnwCU8G32BqpqlWmrqBc6ZwwEwYDVR0l
-BAwwCgYIKwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAC61GBFi9ao1WEsiRhY4
-MA4Dh5PA8fugwrFmczaDiC34rrVjhCATK8HybLivkLemzN7NxXiNKYjLC7ehYnEt
-dk6vLSUhf1BPxSbzt5aOOYcsATHQlKVYbPs9h2/RIQMCU0w1YEKWsCoDayf92mdG
-aqc1byYDbH2prnwEJsOxgqIH9kBeIOhA91SugoGG5Ppu9J6jCHeuujLXILg3TYA8
-xwlzgIOaQ/pkr65G/7bPUnb+FmZbVZ9fvVzMeqPfGDN3In2VNNt1ukE6syOjrQVQ
-tanpymo51YHCrmFog1731u261eh1k7qlc/gdMtuwcIuS5fgLcw9JuteQ2D2yOMRc
-Hps=
+LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALtdE+IrD93PMLvO
+asiiqQLo5yM13u2QrX0TQ4Sc55AyPdgQ0pNNZDITqo5Bqq/dqsk61H5vRsPpNI6i
+9BhikBN4ic/s+/YozKEZ8BBhojW8Ix6NZ8xGQPaQN3UxQ88Zk5e4uVOyVuylrAko
+4fkq+bt2M/bzTXGKDV9BkhAKFMOeh25F2MTHkNUdN1/FxwCkc+0T0EfQYiWSSi+t
+AkvGlmbiL6Oe4QysDNDIWXRpVkst64E+vHrjc0IblgJx86jVP70FmwyM2aOP6LcV
+YmKjd+asR5EpJjOgWdOw5AdeeiOT6/QdEa9SAOwGhgH192MyW8J00l6xXzowRguu
+W7IN44UCAwEAAaOBmjCBlzAJBgNVHRMEAjAAMB0GA1UdDgQWBBTGMEac/FT9GiaI
+/jWAiO9qvHikMzAfBgNVHSMEGDAWgBQAJRr4IMTcYkUcGnUpvMqsxLeotDATBgNV
+HSUEDDAKBggrBgEFBQcDAzA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vMTI3LjAu
+MC4xOjgwODAvaW50ZXJtZWRpYXRlQ0EwDQYJKoZIhvcNAQELBQADggEBAEMr0+9D
+pvstXddvvGdfit3FxutGNn+WXQGPyxzL4Hu9mSrYCojZ788DdZl6bdy4IqtjV8LW
+dnAv62ftwWspszKXFbpdZ64xQaT0eTsRYGDTCDdyrbHkrAhlgDLM61xE+S4sASxv
+TyRhaOsts0DoM3FSlKhUIOmaKrbesDf1HmL83yFUrOE2wG7XpiyXM+7KS/C7cGo2
+5p30+CT5qEgE7iOwiRWn9Wo/T0BaRJgqk7HJQq/VzYTXgW5TAtz1Ev34i4O9i+np
+dYGwRjFJBXxdB3t2AULtJrSge+JWm1hyMiWzeWJxv5baTpFqsUYjeQ+gr3BuHPfz
+amT/muDxHHDnCGQ=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+AAOCAQ8AMIIBCgKCAQEArsj0SSXTwJI+9+LyQKJmOGyZOR0Rlo/wXPOdDJl9NYYz
+CzaipduWDB9p89o0vbQv6PeS5BipxrDwZbAyttaxN5YULs8THpxX4T1QMULa59WZ
+53OoFPn60Cf35gp+tzocKkLIVukls+CG/+GPH7CwfN+36o5WUyCWytM8FGtF7dr5
+ittC9pRbhOpWkuXXu4VHACGQxmDKEecnSz6WiJSuGd6QeKW0MJwv3nS7e2OVn35S
+LsahDx0JPr0jyVdedpA5pDO/3LziuaXbWuvOsUGGiswatd7jghqYYDqK+sp+l6Xx
+lIVCvL0avoEtMrLAkIGwoAqmVmUD2l5drBXg+1vdvQIDAQABo2YwZDASBgNVHRMB
+Af8ECDAGAQH/AgEAMB0GA1UdDgQWBBQAJRr4IMTcYkUcGnUpvMqsxLeotDAfBgNV
+HSMEGDAWgBTIhQp4hjZ04Do65M0kQLlDpWRJszAOBgNVHQ8BAf8EBAMCAYYwDQYJ
+KoZIhvcNAQELBQADggEBAKIo9WYlM05GtIhYQlWkq2F0ZGFiRnbkAZ95pyReMXCq
+DyDj0vLKDUHPVgoMYWhulaa5CaRtYrcnANjDDgx/s2pPd/+KXerv9aOH4+fvgM6n
+ZXMzIqC3rwgMdh9W5U6WV7OkpFc8mcmYMAnlHBzq3/XKaOmC8HND5jBYZ/rAlPbO
+5YvuqKuNdT7Niimlzf170RQCRy/Ll4X5a6jSuwbH0m0rt85tdZv0zAjLhVOcPP5C
+K9LZGHitedw6t3RaGZXCj6WSqLmNpcbEpw42KMaX/UDYiURTzY18Ir2v88NKccvk
+T21Eeb8/6Ooy+hCew3wRKawZz80/Ds27lGS0SjQ4dFk=
 -----END CERTIFICATE-----
diff --git a/tests/certs/cert.spc b/tests/certs/cert.spc
index bfd2371..97e9980 100644
Binary files a/tests/certs/cert.spc and b/tests/certs/cert.spc differ
diff --git a/tests/certs/crosscert.pem b/tests/certs/crosscert.pem
index 0da5dad..c91e410 100644
--- a/tests/certs/crosscert.pem
+++ b/tests/certs/crosscert.pem
@@ -1,25 +1,23 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
+c7eaqUFm+GyTKCFNNUoJ4Nyj
 -----END CERTIFICATE-----
diff --git a/tests/certs/expired.pem b/tests/certs/expired.pem
index 3ebee92..4096b28 100644
--- a/tests/certs/expired.pem
+++ b/tests/certs/expired.pem
@@ -1,45 +1,47 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIEIzCCAwugAwIBAgIUY1xHA+BVMhTe7FqFnCG+wdzCX3UwDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGDAWBgNVBAMMD0ludGVybWVkaWF0
 ZSBDQTAeFw0xODAxMDEwMDAwMDBaFw0xOTAxMDEwMDAwMDBaMIGZMQswCQYDVQQG
 EwJQTDEZMBcGA1UECAwQTWF6b3ZpYSBQcm92aW5jZTEPMA0GA1UEBwwGV2Fyc2F3
 MRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNVBAsMA0NTUDEQMA4GA1UEAwwH
 RXhwaXJlZDEnMCUGCSqGSIb3DQEJARYYb3NzbHNpZ25jb2RlQGV4YW1wbGUuY29t
-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
+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
+m4/C5hVQ5Q==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/tests/certs/intermediate.pem b/tests/certs/intermediate.pem
deleted file mode 100644
index 6326abc..0000000
--- a/tests/certs/intermediate.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrDCCApSgAwIBAgIUFXuEwy7PJbkt3nd3ZfAc5VsLJKcwDQYJKoZIhvcNAQEL
-BQAwWDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
-CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxEDAOBgNVBAMMB1Jvb3QgQ0EwHhcN
-MTgwMTAxMDAwMDAwWhcNMjYwMTAxMDAwMDAwWjBgMQswCQYDVQQGEwJQTDEVMBMG
-A1UECgwMb3NzbHNpZ25jb2RlMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTEYMBYGA1UEAwwPSW50ZXJtZWRpYXRlIENBMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA1Jo5DoM/cVNHQ66L+8o4yO20tG3cz5yIJmf157HxpgFA
-UsXOTslEGSt0zM9CbRRuJpV4e6xRQeXJNmoAwT4HyU0vDRE17zPpAkX4bJSM9koj
-dYYjj8ktvu0D9Lou7l3RL4wybqhYO4eFNvDm0CXlAf0GYmuQ+q3o+ykGNMA3P3es
-JpmuMj5fKazV9LUCDjgG9lJxwSb2i/iT3hNTaa/aEvBXoeBqcmRZmjZDD3sUHqEr
-iZFR1v1ezoQKafjKi7eXHoB02Hpy2MnCM6TU8krdpjQhkBC978bZUs6WNkfpfTiT
-6835UsvRWcL0Ea/rGje4Y0FlU0AmAvO5/7j+IqD+NQIDAQABo2YwZDASBgNVHRMB
-Af8ECDAGAQH/AgEAMB0GA1UdDgQWBBQzqdMKfAJTwbfYGqmqVaauoFzpnDAfBgNV
-HSMEGDAWgBRzZATlXSPxvd5/qDHmQGixvSUTUjAOBgNVHQ8BAf8EBAMCAYYwDQYJ
-KoZIhvcNAQELBQADggEBAF4qZoBV9bhp/f86BwaGcuVcY66muoTnFLTgW7TsGDnx
-MKsW5/2CeY4+Yev9LngraEt3DadZJFq+Fl2RzKhRi7KyUmYAzGq3dtGWmYiNgHVH
-gyT1Hl4Kjq9EEsrB8ra+s5/j+zWCkutLn593ROxbj637d7/8BCq73SMBPzQqJVqn
-uluFKOWbDigCGpuEdb8NKDimVQXhg/9ee1tn77btLYkA9+M9fmjoOE0/XVxClYB0
-WulU76/9MdPbgkUnD49AalyBBojQdyj+LqDG3LnYjBBVevuqoF2op8Vna1D5+nVZ
-3+wTPzAR97/mzTDVi1C/R6Dh9gAcKFwhHPrK+R+lWeg=
------END CERTIFICATE-----
diff --git a/tests/certs/intermediateCA.pem b/tests/certs/intermediateCA.pem
new file mode 100644
index 0000000..11d6894
--- /dev/null
+++ b/tests/certs/intermediateCA.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDrDCCApSgAwIBAgIUAagJ9uDK/UMomw2ukVT7P7WVwdYwDQYJKoZIhvcNAQEL
+BQAwWDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
+CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxEDAOBgNVBAMMB1Jvb3QgQ0EwHhcN
+MTgwMTAxMDAwMDAwWhcNMjYwMTAxMDAwMDAwWjBgMQswCQYDVQQGEwJQTDEVMBMG
+A1UECgwMb3NzbHNpZ25jb2RlMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTEYMBYGA1UEAwwPSW50ZXJtZWRpYXRlIENBMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArsj0SSXTwJI+9+LyQKJmOGyZOR0Rlo/wXPOdDJl9NYYz
+CzaipduWDB9p89o0vbQv6PeS5BipxrDwZbAyttaxN5YULs8THpxX4T1QMULa59WZ
+53OoFPn60Cf35gp+tzocKkLIVukls+CG/+GPH7CwfN+36o5WUyCWytM8FGtF7dr5
+ittC9pRbhOpWkuXXu4VHACGQxmDKEecnSz6WiJSuGd6QeKW0MJwv3nS7e2OVn35S
+LsahDx0JPr0jyVdedpA5pDO/3LziuaXbWuvOsUGGiswatd7jghqYYDqK+sp+l6Xx
+lIVCvL0avoEtMrLAkIGwoAqmVmUD2l5drBXg+1vdvQIDAQABo2YwZDASBgNVHRMB
+Af8ECDAGAQH/AgEAMB0GA1UdDgQWBBQAJRr4IMTcYkUcGnUpvMqsxLeotDAfBgNV
+HSMEGDAWgBTIhQp4hjZ04Do65M0kQLlDpWRJszAOBgNVHQ8BAf8EBAMCAYYwDQYJ
+KoZIhvcNAQELBQADggEBAKIo9WYlM05GtIhYQlWkq2F0ZGFiRnbkAZ95pyReMXCq
+DyDj0vLKDUHPVgoMYWhulaa5CaRtYrcnANjDDgx/s2pPd/+KXerv9aOH4+fvgM6n
+ZXMzIqC3rwgMdh9W5U6WV7OkpFc8mcmYMAnlHBzq3/XKaOmC8HND5jBYZ/rAlPbO
+5YvuqKuNdT7Niimlzf170RQCRy/Ll4X5a6jSuwbH0m0rt85tdZv0zAjLhVOcPP5C
+K9LZGHitedw6t3RaGZXCj6WSqLmNpcbEpw42KMaX/UDYiURTzY18Ir2v88NKccvk
+T21Eeb8/6Ooy+hCew3wRKawZz80/Ds27lGS0SjQ4dFk=
+-----END CERTIFICATE-----
diff --git a/tests/certs/key.der b/tests/certs/key.der
index 8a674c9..a27b80d 100644
Binary files a/tests/certs/key.der and b/tests/certs/key.der differ
diff --git a/tests/certs/key.pem b/tests/certs/key.pem
index f204f7e..c9d6a62 100644
--- a/tests/certs/key.pem
+++ b/tests/certs/key.pem
@@ -1,28 +1,27 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC3ldhd3EWFphtp
-YgYdajIGiWyutoBPAsbvyxulkhcDrrZikoOQSUA56ZB3vHdGtJqatZk1pU29mPjV
-YbxyDDo/19BHVIPIezXLTgyXW+ax3FUBALOXvEKQ2OXKRdxHPpAxOJnhxr3rSswa
-7zx/JTGvyPBxFJ1N6lnUwqzKiLzJo6JJGgABydtofLlFp6F4S0YdgM9Z6kD65olV
-tE/FFhUYlmGa+WhW366i2pnScTHEtFJ2xeryc4ZqWmVRPu1CuL0GDfOzIDWyZAHy
-UOZuQ2VoqMEBqol1Nzug7vRIAkQVr+apU7NBknWSoeM4gvqLxU+10FBvYjaImPmE
-1W92BqPxAgMBAAECggEABgXOcVXWmgnXAGAM304qkfhULm8iSnVG3XsGTyo5ww8q
-QJWZ51Pf3YaCDMuMBi/KmqS2gAIKSNwJ3cY1DnDEQG/uD0kAgcU5AJBw7U5AhTk7
-OKszORkd/e5/q2EbVuMAi/zVX4jLljp/86pBi9JGjQPEj5Ejj/jONaKlVIej2eGM
-EqD5vmTP4TyCVybByXnYve7NxqhBvrgGgfoyGZLckohUPCBNc7Xr69M+X07Hmxtw
-uyx7PqSJEBm22bBzAjqZYAgLU6rIZ/HNdhkue/r1MlTQvaYFZsEiMUgm46G5yxXf
-3LKAMl0LJRg4lO6bljfKf883sOB4ukHGvOydOS3I2QKBgQDBk9Dl72SUspeISTMi
-v7ceNpDKpKnIygfXMeC5BJTEPu8DsQiyAQltlfeAi4yNALHyWlGso0Cr8kbt49Wc
-puGT8fmcJ4Y0LJTrhoYhZvdpKfthubLTbvZ0BXEk9dRvO24vdidiK3mzYgvIUBBy
-TW1t97gg1lGzugghJxWV9VhFLwKBgQDyySoZbrpCaxK59PErGzZNje1u+3/ER4U/
-WzqxsG9wHl5nn5OmYN2uJf2/Mcy4i3IVBimn6NMoBt4CkmgKg9XHXbvUmlpp+rXq
-YIXgwKLEIOiKkTlQAiQXGLY6gnK45MY/HAfGYt48Gczqban0+ZhVDLbYqm3opNTV
-qcsGTCug3wKBgEy4PtTCmkRsu63iBQhCn1q0GZKWzEut9omNVRk+/Y8BukzmPyH9
-UzVBeIRTynKf0ebRcQlQ8nKzZPUnlSOu6DxwbJM8/u1ytdrayBI48tmVL/I9XOh7
-U+YLuhoB7B3hmfvpghZgUK2NsEnFoZ8LnNE2mp05E8x9cHdjPCTgxgk1AoGAVr4G
-u5VzGL3Wr/fSnpsXWLgnp6pVqNQAyHUY0FmARyeihRVflGcxbMIIGeJ6CUlRFi/g
-fCxUHQ3vDi4u2+rkW1mi/T+0o/6+NiIMUxOgU8CKNM/UEUDikhnzKY5n3KVoKy4h
-nQC/8+sn6m4J9gujIGftgBXMNP2HSVtjvTlDsTMCgYANc6p+FuMMDsXfcV19iAQB
-Vtioc7xi2HlvqgrOLIqJa+P7CQjYbF382l9ncpG7LmkPVf1D0CK/unCz13P4ZR0L
-voYHOtkWDb33+L61v0IWw1FC9hE1rFe//LRKFCkjcILpAdRhumNpPHak0/wNTqjB
-MKUIYvx+w976iv/A5rSEXA==
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAu10T4isP3c8wu85qyKKpAujnIzXe7ZCtfRNDhJznkDI92BDS
+k01kMhOqjkGqr92qyTrUfm9Gw+k0jqL0GGKQE3iJz+z79ijMoRnwEGGiNbwjHo1n
+zEZA9pA3dTFDzxmTl7i5U7JW7KWsCSjh+Sr5u3Yz9vNNcYoNX0GSEAoUw56HbkXY
+xMeQ1R03X8XHAKRz7RPQR9BiJZJKL60CS8aWZuIvo57hDKwM0MhZdGlWSy3rgT68
+euNzQhuWAnHzqNU/vQWbDIzZo4/otxViYqN35qxHkSkmM6BZ07DkB156I5Pr9B0R
+r1IA7AaGAfX3YzJbwnTSXrFfOjBGC65bsg3jhQIDAQABAoIBAH3eYqwu16LgPNH+
+MriEpdwBkL2TxCZ+aj47QcGGEv5I8kkDzCMO+7+0fIDC1qL83G4BKp2hrb2RHjCw
+giEbncSm1pYrk3zkHcwge6jVnj5RHJq6zj9p9txtOARvyykG+qMTgtUaWtDx32fr
+4hsc5tYr6278NkuPPbp/d1t1GkvrPpLk4K80hkQf0TropccnkaMW6L84GX9irmKY
+TDUngro9+xgLlhmnRJjIcHmpghhnv9TAbGExWNCPCTRRLLvhHBQUCE243145oxLZ
+Lmd+3Rx5bYd5DXQyj31yYpEdku5ELXLFPEyZLShkP0cSmGVY5HubJ+E5+fQkgnKh
+zZ1AgiECgYEA4fL/eRtyJ3XzmSK+ky+S7+Jp8qGHOkJvTTabmHuJXsHLoYf2QftO
+gXPg1eHaiVqNuD/VqM29OmoXRwXLB6bNAYHJPcFB6y3UpstZsJRrFrtYwte8cL1+
+EQuoRKluNL0dsXFSG1YTAaw5HCekt4BJ1lN0M6EZCbU6eexJVeZqFGkCgYEA1EhW
+FNapxGzANu0JhjX9m5ZGaeK6xOn0x+DJvNxmLRq7Jzrcm+XA8BzH1CCnywz6jtUv
++IS+wbtkcWPTCAFG9y/16wzNUV8ou7p1auvlfpnRdoURBMP5XOTi8xaydKaVsuuU
+brTOWJ3Vf2rXINkpTAje7uYN0Tl+0jQypjJ0Ar0CgYBcu08wVBxQp68XTVQrsh27
+CBB1fOez+GoXpW7McP8a/axmGhfuUoaQyI8hGLWJI7oAQWqeAfpEjCALjQwbktCW
+ar698p/sNn4NCm4/81nUFYXDSalUF+Eye7dOnr7VNDyIg7qv726ThCxYKskGasdj
+CBMr0VUmT9O1EE20zIEC6QKBgQCYc+KuUIPXdyqLx6vhYQDjLgcfoB71r/eFXGBF
+bBtNJTdnMxSgOV5YkrLIGzOl1YpT7bLnzZ2ZUFUQQdqakyA+AYmg5q7FU4vTVlNh
+GEzWoO0XKvVP8NYy6oY6ggBjWgeEWT9eSicu6RscyMP66TqJSo2gEEO4EIyNtcLy
+LKW4GQKBgGDgUaeYiVQPpzHEAgqcykcVfZ3kBxsAbcJa44AyiQcVtpQhFCTCICB8
+MlDRNy2lEwfORN9U3QDWy1yxy0m3HzSkpI0kI2mkIimZbcTsWEpme4Rws5dBGf5h
+CxwRPrOm0q1WibHjUmZm8u+pdF8mVKQIBcsnRhYxO8DTFvvOqTo/
+-----END RSA PRIVATE KEY-----
diff --git a/tests/certs/key.pvk b/tests/certs/key.pvk
index d931068..3f434bf 100644
Binary files a/tests/certs/key.pvk and b/tests/certs/key.pvk differ
diff --git a/tests/certs/keyp.pem b/tests/certs/keyp.pem
index c1a36cf..15a1803 100644
--- a/tests/certs/keyp.pem
+++ b/tests/certs/keyp.pem
@@ -1,30 +1,30 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIOTZv8WJMOWACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJGTN+jUwUhuBIIEyJghDPvGvTtV
-0zIVbjh6xm5Uwp9KuhnKq87SW1C8cvL3sQFxcYalUkR5etejHDsrgw6r/jpijh+T
-mRW2GncLHUJjzS/nM3j8UbbY5ELAhcJSQSw5UdtUVJ3kQxL/f4GIlbhx711s4ARV
-YH4BZuOxC0eaobMSOzsYOAY2JPHdRWqhr63acsnn+1nJAhlH7Sz8B7Y5tVNl99O+
-QIsKi6K4s0ySZlU34DMTI78oM49fsi1sAGIR+klbyNvkyqsVmy8YlKLZPpCUzaJd
-a4KZl4rDJtLv4AMXJYJpxOAnP/WDWrnyfguJB9uHie6bgwp/cHUqNGeFBHNgxv5a
-e1/Hk7iNPS9CW23MrFWLOEwB6yv4QuQQg1MlbVsmAT+cc7dEI1h7g6aWzGrZoW+l
-xaElJ9j/0+/8BzXUYy1Uq5Gs2ZwpY6nRHBI4gPOLN8J1piIhPzURIQoPlmsr/47v
-O+duE9zqPZjqEEZMrE00XpJvPmnAOc5eSHCGkf7xiCaqxsVKgCHNGMF+EtYNbOh4
-e/riE7mhhV7SCmJNcnTFTjP6pWskb/HEOyAVbxuN4BQ6GIQTUcbOT9Yy/Azzzs03
-4s1+qYqlzM2RV9WbLd0U21K6emE5JvR80Gis6xol+BiTyjchhGjhuPjyDDPIqQKm
-JCh44UdI7dm4xGd473SbVDxkRRf5WB0VC2BsZMb+RLAaZWsxF1WbGAUsF3coo8Q1
-dnjCjerK6CD7SDSMRyQLvd0SyyDY13GKQkSjGsghl3rEB4FhuyhNPxGxSxrVSkCX
-FvsIiJhc80VBdkJmSg+l1UTisrrBgpGQ+pA8cOtSAwtm+notUvj84iRpAVxN/cuv
-jCL5BrCNuCtrhJEjs24gnMJHEk7FYCp4iPXKh1dveL+NyEDVVR8gJiKddWmdcJ/G
-Cez40UIxuTgHyCDRa2oN8JxSzVt5/QU34WIP+HnZ61rqmZ7nm8CJxp5Hp6Z4bX1J
-QujW3E3FHJ7BtM4wZR7MumKfZsxswvdXU6X1owXiZ4wiL7dqt5jA82LrL7cTq25l
-vg17mZf4Gtwhrbl+/RnTpzPg/qUI1bw2S+Cbtd39Gy6KH/CvVov+E1dQdsFXBATz
-9Cb8JtulYSz6mcfEQUGcz82lP9m6pd2bEYvnljkzd4D6AqtI9bqjuKnOfTlR+E8r
-5trNm3i/sexs3YNWcNJY7IbJ8Lg3LS3ByJG3g9nxueU0tAzzxcRC2VwcjIci1cyY
-lY71JWiEoBsjNR8AlbVvWDtRCo2bu8q3wFLKZMlMZlZG95CqcqXy3QWby1AN4sVv
-tfFldCNVCFLXBVo2lMvw2+J8D129t5bUchd96dGHkQ0aPSnVdMg1AK3g1XxLWc17
-yafjWcR/Pua8zMosN1YqZSDgav7lzEuFDs94cukduop+98T/TjlxejoOimppCtXs
-bKQ+tDUbCg6HRn6vMyWMonrVTaT+RFXtoTfwFEONfjaJ7Wgh2yG/xB6ZjOpMF5Mq
-SbbmF1fh+xJfb6J68RT9mhY9PwOZXKzfcQ4FWonvo14JbQIve8xlJ+gHBUEwBZli
-hkBmZAd0ZGoszPbArcgn3EoIoogG1LcHjWaq+Dw2HYBCtvxZf4e4npg59IG12WOP
-cpkk1XK/52QEeuTSf9x4OA==
------END ENCRYPTED PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,AA7D2B5F43E74F2C
+
+RumvVgYaU1vZX2kF4B0O5tZCqTQPcBya77rRTt5GCUMcqBIT/w+SflndZkOJpDGE
+OUZggItBZO/lbRe3ZVo3RCS7xsN25rjhafcn2Nocl156CjNwm2kkO3wrLXg4QDb8
+VNi70ew3nAZsFeArAFIzCMtDtFndECdHkmggNZtNTxSt0FAW+lFX/OshBXdm7ezA
+n+lBq8IK8z8sIoIcqWsJeQBGGot6c3qo8IGkTik34QPZlEXOCyOpfyuKog1zpYC/
+56fP1nW21AjccoTWjsX0eXAMoHA7yRpQPpP5jVRrXfbDPD9PNOqqAyX9vb0j6hBC
+vD7DnM/+I0PuHbbV+CX7zSgySr5Ysh0AAl23bVq2fDJHO6hpueVohcz5307khTb8
+oQ91JKnEpKPHdXNzElrFfkfG7+p8zwcDIZBqkE2/hLDeYyEOZF8hLT0MP0Sfkldg
+V8tjt4IaA3W0vSZFesN+VdyUKquc0p5gzU8VCSWrGoFnYlXJzwtYoO2GONwVGKZ8
+pM1MgGPiSnknEdadT6+le/sVCU03XOObyz3cERXAQVL4jytuHbESSaxVjgkLc/H4
+bZ+LfUQRy7uxT9rqWxjRIBdo6sB9EEwCS0tNmufe8JUWns9xCPbQmS4cQQMDoWDu
+gU5lAmOEf81Bgf+f8bb6qmw1L7iTdGZnZXsI1SeCbQBBz7w64pmN1nBgEdhmOePB
+vp4MhFIYwiNASui8Q7Fggx0SwLKj+E1qdd8b/7/XWaD7EKIvnvl5bz+JOdavy8Sq
+VgIttRa6ODF6HurHgqhhT8PAmpj225U5fQolhTabTAuNoxQg6XPT1BMamiXeekwT
+ApG34aFaAwfU2pWKGiSXe5jq8bzPdSDZOeRhgxkdACVWoU/w0Fd4XdhuoJTny42J
+R/apI3kmly6WDBj9VPO0+EpcNDwe5cHfRCb/q7hxUe6Spo2up3y0X/kvUf2JCJcD
+TgUCYOaqpHIR4fu+qecv1wNDVUYL5IDdEuZFKUHrS21pCELCQKQjpzAmhcDgU3Pz
+GJi6RsNer3ywCjqTU4WzUVyrxAhzi4DHpEE+AXEuK1ka/HVeoyHi9LsGQfqriHld
+wN3sp4xGQkDWohRKC0jtbFTM6HtjDXjRPT9ouH2YVSelqsRx6IpcyjaxjUvyHxGL
+g/sSXjPMA6liZK6ZqjSWKuVBsKzUlNzs5f+7iNTKzogXlAfF0gbs4zfpRUPFG0lY
+ZchiNJW2oC20oxBnSTUDrLxUUWT4shZBEgScM+ldDMrfgjRR6evd4qHXF+tSzQcQ
+JAk1HRmRh3myObLrPQRlvGsNRvK9EDeq8uzYlB8RHV5fU8HK8MTQJ+bFBx2A6FAp
+JnJNYlXWEhLKWM2eFZvZnjKyW+ikOAkiCtXhS5nWCm+Xj+v/2RKRkd6b6F819vPN
+PxSDampQ7SzkKlokoz76h08OYwOuyX09xhUH30zBug748hLqW53iVTgvGsk/uzCR
+gJruqMW0S4tIPHB7FD5yVwVwqwEOzVletjYdg2En+E7WH00ztUhG+h6Snv8jKllo
+gpxWEXJu2LtP6LxtOmFS08H8IBpP2xR6lIed0LReIU+5YtxMA6238A==
+-----END RSA PRIVATE KEY-----
diff --git a/tests/certs/legacy.p12 b/tests/certs/legacy.p12
index df2f4ae..dc9e9b0 100644
Binary files a/tests/certs/legacy.p12 and b/tests/certs/legacy.p12 differ
diff --git a/tests/certs/revoked.pem b/tests/certs/revoked.pem
index 30be7c7..4cebee0 100644
--- a/tests/certs/revoked.pem
+++ b/tests/certs/revoked.pem
@@ -1,45 +1,46 @@
 -----BEGIN CERTIFICATE-----
-MIIDvTCCAqWgAwIBAgIUDNLHzkIApmatwuk4ju+Cl74nPlswDQYJKoZIhvcNAQEL
+MIID9jCCAt6gAwIBAgIUZgDukdSnO8kxz6hKmIZP4obj1NMwDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGDAWBgNVBAMMD0ludGVybWVkaWF0
 ZSBDQTAeFw0xODAxMDEwMDAwMDBaFw0yNDEyMzEwMDAwMDBaMG0xCzAJBgNVBAYT
 AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNVBAsMA0NTUDEQMA4GA1UE
 AwwHUmV2b2tlZDEnMCUGCSqGSIb3DQEJARYYb3NzbHNpZ25jb2RlQGV4YW1wbGUu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt5XYXdxFhaYbaWIG
-HWoyBolsrraATwLG78sbpZIXA662YpKDkElAOemQd7x3RrSamrWZNaVNvZj41WG8
-cgw6P9fQR1SDyHs1y04Ml1vmsdxVAQCzl7xCkNjlykXcRz6QMTiZ4ca960rMGu88
-fyUxr8jwcRSdTepZ1MKsyoi8yaOiSRoAAcnbaHy5RaeheEtGHYDPWepA+uaJVbRP
-xRYVGJZhmvloVt+uotqZ0nExxLRSdsXq8nOGalplUT7tQri9Bg3zsyA1smQB8lDm
-bkNlaKjBAaqJdTc7oO70SAJEFa/mqVOzQZJ1kqHjOIL6i8VPtdBQb2I2iJj5hNVv
-dgaj8QIDAQABo2IwYDAJBgNVHRMEAjAAMB0GA1UdDgQWBBQDjv3lzsSUMbVgB4wS
-LvPGd3neljAfBgNVHSMEGDAWgBQzqdMKfAJTwbfYGqmqVaauoFzpnDATBgNVHSUE
-DDAKBggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAQEAcB1h5O55YyIuLSPwBKy3
-L36Msm0EutKj07soEVzWyq1/2elOvIksS/O/25zzenR/0Sf1/CBBU1kSQlb0PnkR
-f0cgWKW3I9eqJevkyABE7CS5V8y9YYkrWl+XedRmPBuMYElTs79LQllFPhbga4lQ
-bPtyCM+BpnsK5dkVf0AOoXkMOg7Ib3yg5LAvU2caZ3l7MnX/aXJEeVnJ4tGF6nzI
-1e9X+ypOJ1GOpA/hXEHiDri5FVEMZamVFDRprdB2vA1Go7utNHZ/lvcoHRsU3rR9
-K/uN2Hw4XhFZoN+9F8N0wD8CXk/hjJwPTAcUfzgSjhymgHzZEJa4G40O4fN4jWTr
-Cg==
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu10T4isP3c8wu85q
+yKKpAujnIzXe7ZCtfRNDhJznkDI92BDSk01kMhOqjkGqr92qyTrUfm9Gw+k0jqL0
+GGKQE3iJz+z79ijMoRnwEGGiNbwjHo1nzEZA9pA3dTFDzxmTl7i5U7JW7KWsCSjh
++Sr5u3Yz9vNNcYoNX0GSEAoUw56HbkXYxMeQ1R03X8XHAKRz7RPQR9BiJZJKL60C
+S8aWZuIvo57hDKwM0MhZdGlWSy3rgT68euNzQhuWAnHzqNU/vQWbDIzZo4/otxVi
+YqN35qxHkSkmM6BZ07DkB156I5Pr9B0Rr1IA7AaGAfX3YzJbwnTSXrFfOjBGC65b
+sg3jhQIDAQABo4GaMIGXMAkGA1UdEwQCMAAwHQYDVR0OBBYEFMYwRpz8VP0aJoj+
+NYCI72q8eKQzMB8GA1UdIwQYMBaAFAAlGvggxNxiRRwadSm8yqzEt6i0MBMGA1Ud
+JQQMMAoGCCsGAQUFBwMDMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly8xMjcuMC4w
+LjE6ODA4MC9pbnRlcm1lZGlhdGVDQTANBgkqhkiG9w0BAQsFAAOCAQEAUbrdGaV6
+n18Iye5hbkkY1/edAhRoZg7mFVkgwIKZcBXHOQ7a88tQyLD2oWTJ9vycvcD+tlou
+IOwc7STdktGZ7gmAGGXSys/BHIn9rvYhwkHzWBY8yiEq2vHWKyxlws4YBHiYMfvN
+U7ryD8zuvLoCcfz9WfGv6iYpsclA1V/8Au+uzcofKkuryePCR51nugm89e2nLAuj
+5KnAFfMytgu0c14kvU4HkJCKVfhL1l2EtDOG4MClHeL5ORyOzyPQlcjC/IL1P2yi
+9NV36I3lD/UD4nqDfRYlXCWf725Oay5O1qrsUrX17dLgXm/eePrrGclSfku3Eyh/
+ZVxmVarzr9CYzg==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+AAOCAQ8AMIIBCgKCAQEArsj0SSXTwJI+9+LyQKJmOGyZOR0Rlo/wXPOdDJl9NYYz
+CzaipduWDB9p89o0vbQv6PeS5BipxrDwZbAyttaxN5YULs8THpxX4T1QMULa59WZ
+53OoFPn60Cf35gp+tzocKkLIVukls+CG/+GPH7CwfN+36o5WUyCWytM8FGtF7dr5
+ittC9pRbhOpWkuXXu4VHACGQxmDKEecnSz6WiJSuGd6QeKW0MJwv3nS7e2OVn35S
+LsahDx0JPr0jyVdedpA5pDO/3LziuaXbWuvOsUGGiswatd7jghqYYDqK+sp+l6Xx
+lIVCvL0avoEtMrLAkIGwoAqmVmUD2l5drBXg+1vdvQIDAQABo2YwZDASBgNVHRMB
+Af8ECDAGAQH/AgEAMB0GA1UdDgQWBBQAJRr4IMTcYkUcGnUpvMqsxLeotDAfBgNV
+HSMEGDAWgBTIhQp4hjZ04Do65M0kQLlDpWRJszAOBgNVHQ8BAf8EBAMCAYYwDQYJ
+KoZIhvcNAQELBQADggEBAKIo9WYlM05GtIhYQlWkq2F0ZGFiRnbkAZ95pyReMXCq
+DyDj0vLKDUHPVgoMYWhulaa5CaRtYrcnANjDDgx/s2pPd/+KXerv9aOH4+fvgM6n
+ZXMzIqC3rwgMdh9W5U6WV7OkpFc8mcmYMAnlHBzq3/XKaOmC8HND5jBYZ/rAlPbO
+5YvuqKuNdT7Niimlzf170RQCRy/Ll4X5a6jSuwbH0m0rt85tdZv0zAjLhVOcPP5C
+K9LZGHitedw6t3RaGZXCj6WSqLmNpcbEpw42KMaX/UDYiURTzY18Ir2v88NKccvk
+T21Eeb8/6Ooy+hCew3wRKawZz80/Ds27lGS0SjQ4dFk=
 -----END CERTIFICATE-----
diff --git a/tests/certs/revoked.spc b/tests/certs/revoked.spc
index 6123d81..683ae72 100644
Binary files a/tests/certs/revoked.spc and b/tests/certs/revoked.spc differ
diff --git a/tests/certs/tsa-chain.pem b/tests/certs/tsa-chain.pem
index cd3d99f..7c341e0 100644
--- a/tests/certs/tsa-chain.pem
+++ b/tests/certs/tsa-chain.pem
@@ -1,50 +1,47 @@
 -----BEGIN CERTIFICATE-----
-MIIEzTCCA7WgAwIBAgIUaDV4MOupysdYAfwy1BiaGDN6KWwwDQYJKoZIhvcNAQEL
+MIIEMjCCAxqgAwIBAgIUZLV0uiTcqZkfRcm75kKFcnFi8pAwDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
 CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
 dCBDQTAeFw0xODAxMDEwMDAwMDBaFw0yODAxMDEwMDAwMDBaMFUxCzAJBgNVBAYT
 AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxHDAaBgNVBAsME1RpbWVzdGFtcCBB
 dXRob3JpdHkxETAPBgNVBAMMCFRlc3QgVFNBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA54M6SZ/7psvK2wMkh4V2eI8ZY82f8Q1v/LcW8t34NSyz9c3j
-/YOVcKu9AeWdldUFnr7ogs8xITCsVOibxVICZwgKii8XD8ZqZYCxyDn7aupct14n
-Jr8F8w/LhNJgzT+dL+IQAZeujpURft3BpcBB5a/wOFWHMhHO9MQSNnFI5rra9jtv
-jXKWpsP4gJetM7ig/Qhj+wDH3H1AtQnZaJsjAJN0Tr1qCV8VeYwoOy6E0Fks3c0C
-4tv5gYxtMvR5eHZUdu47KHlDZZJbkgvA4d5jxkP63yBHP3p9VDvrFWUaPYgSQsPP
-M47+rgn9p5Xr2gFKbUbr0KhL+FjDWjA3tC6ihQIDAQABo4IBiDCCAYQwDAYDVR0T
-AQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAdBgNVHQ4EFgQUVzwbd6xW
-ZJQxaV7Vq7t+rbzjtJQwHwYDVR0jBBgwFoAUZiXazafm/zg+I4wbylR/skX0dWow
-gYQGCCsGAQUFBwEBBHgwdjA5BggrBgEFBQcwAoYtaHR0cDovL1RTQUNBLnRpbWVz
-dGFtcGF1dGhvcml0eS5jb20vVFNBQ0EuY3J0MDkGCCsGAQUFBzABhi1odHRwOi8v
-b2NzcC5UU0FDQS50aW1lc3RhbXBhdXRob3JpdHkuY29tOjkwODAwPgYDVR0fBDcw
-NTAzoDGgL4YtaHR0cDovL1RTQUNBLnRpbWVzdGFtcGF1dGhvcml0eS5jb20vVFNB
-Q0EuY3JsMFUGA1UdHgROMEygGDAKggh0ZXN0LmNvbTAKggh0ZXN0Lm9yZ6EwMAqH
-CAAAAAAAAAAAMCKHIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMA0G
-CSqGSIb3DQEBCwUAA4IBAQBdZ/Zgc0e6F4H7J/rdAegE3MhZPLLAPGq/H5IPC4ij
-ksW6ujTejCJgtSWAfkUXjaCDQvT7bkq4AMo18ELc3I2kpTp1dvftc3aMoDBuGz/7
-K0sxlA1DFncmY6hhh3cg2Gjb1vlnuWnwwSrfy46UuNvsJi4DjBZXHt+gY8KM4Gas
-i3MIqlM/ZIlljc2LRGUKxftkM3odP1kA65yNlcMV9BESRGsAOH8nb6f7Qb4I6vjk
-Oijzs75JPWy9C+vMutH5LSfMAjrdRmNKnDoWVCe22QT1jReIRMNsRjdX0j+SkyyL
-HpqLVmczWLFHPspm8tRyAI7Vc0CpY9ixJyeidD4mg7iv
+AQ8AMIIBCgKCAQEAuIu8Lzb9htn1IB3rrOV0cgapLKd/lWEG54E/ZW6JvkrGfNwb
+ibn+aaypg71UlRg/AEhw0mjBcGOwgfbxG8TNeXk/ah+O2/99mhbi/lJLgaF3W+Nb
+EuzDonYgE2Cuz3SPzm6YqQCbxTZcjjdR6Waw40wPTEya0klI+2p6OBD3D4EljWZj
+P/j0eZPS60qT1RGRJXrJdkGXKSXnJuYmWJnXkO4fhFgyl6lYFW5LIiL/i7O7iYPB
+uFFP8mnb7rJ2UxuKj2P7kBWRbxuexc4cljDi4IEq1xou7J7NWGQiUaYN3io1Yt9X
+F2qyLX12OuE5MTdSjoSyOzG0dZY4u5R1eXBosQIDAQABo4HuMIHrMAwGA1UdEwEB
+/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwHQYDVR0OBBYEFHKq3yZ0xgcX
+JBsmzT281F3OjZrYMB8GA1UdIwQYMBaAFEb1RokusIypoHJC5xTAi+oI2nYpMCwG
+A1UdHwQlMCMwIaAfoB2GG2h0dHA6Ly8xMjcuMC4wLjE6ODA4MC9UU0FDQTBVBgNV
+HR4ETjBMoBgwCoIIdGVzdC5jb20wCoIIdGVzdC5vcmehMDAKhwgAAAAAAAAAADAi
+hyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADANBgkqhkiG9w0BAQsF
+AAOCAQEAvmUJ0aq51iHRyYudXQZWi2qci5qXOmwsiD/DXa7iOs2823YqWA5QdjDI
+wX79S9qTrg8lyeIxEBDoVxPet760d3if1mbrLO5AUH9weZ/5a3bqVrhACgaqVBBO
+nBAASd1IEiJDl+Qkj1/goaNy+2lSBpq+INgfPkYD1KCdpUWecpC8qrXHH8KoTfLk
+vMnGfxFLayxuELzCOs9Z0PszruMeWrdv8tNYjMq5sS+dOcPHGlmjcdORvLx9uj6S
+belAqubJMamFGRjG/4OlqG0WpRKKoAUWB1w26x7PgRsAEHtNVk3sj85KGoAlS04M
+SasH4TTkfY9zhgdrK3cdCar/iwoDlA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDkDCCAnigAwIBAgIUWSzkBFwFSMGVBrF88OJwBUP9eNkwDQYJKoZIhvcNAQEL
-BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
-CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
-dCBDQTAeFw0xNzAxMDEwMDAwMDBaFw0yNjExMTAwMDAwMDBaMGAxCzAJBgNVBAYT
-AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxJDAiBgNVBAsMG1RpbWVzdGFtcCBB
-dXRob3JpdHkgUm9vdCBDQTEUMBIGA1UEAwwLVFNBIFJvb3QgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1iXUDwCHsyISjyimEvnvIPer4aqdpZ26y
-uKI2oURQQpAlL+PlbP5/wm63tyxCY/Oo6cadcXEk9TGEi/SpGMKJtfaZAFzygEQC
-dU995pfpLsQ9Aaf53ErE4L7RsB+noDnYd0UWklBHBmKmWSszfaS/qcsqexP+BBzy
-GgUK1/bVg2SjYESoQ7lWA0o/s9VTYBQ0k36EqykBjWhy87goKBvvDkafqbWRcG+8
-RMgbzvD4vBjOyZWhXH6cKj6Hg7QfDjuTQWV7tQ+zCq0pGMsftcH+N7z5oXyNUiwj
-ALPWxOvrViNRDG2I3GUXU3yWQIHNhmNkIrNE5GJRmx1dkYX0oEW3AgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFGYl2s2n5v84PiOMG8pUf7JF9HVq
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAmCnnUVQoKhbKLqyp
-qNdyT5FFEKyoCd9defa5bKzPhzdkkuxPjidsLsxvP58n6EB8i2inddBfdUxv/0lG
-kGHO+7Lz8qjMlJ9+VlLTmA96Q4SHBP9XKUmyYPx3PpEZcxiJZNXoUO1ZokTps0/Q
-BSoQ+9SPIIzxEzr0BNijtY/x6TJV5M9J1ePWuK1Vu0mhTs3FPE+/wXzxZG94ZQLg
-pX9hkkXmvRIe7dg3XZDUtKglH2p4c22vX7UP4qyqpPWFWKw1lCYt9K7QOVAdEfCI
-TlpZh6MQPZIk0FUAWOxDeRTAJk/Pe0I7wf+L1hwxi1y4JfgebNXynp46T6v/I5Wm
-UApdTw==
+MIIDjzCCAnegAwIBAgITYFaTV+djNEuQqJ6krYv+F4HtqDANBgkqhkiG9w0BAQsF
+ADBgMQswCQYDVQQGEwJQTDEVMBMGA1UECgwMb3NzbHNpZ25jb2RlMSQwIgYDVQQL
+DBtUaW1lc3RhbXAgQXV0aG9yaXR5IFJvb3QgQ0ExFDASBgNVBAMMC1RTQSBSb290
+IENBMB4XDTE3MDEwMTAwMDAwMFoXDTI2MTExMDAwMDAwMFowYDELMAkGA1UEBhMC
+UEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UECwwbVGltZXN0YW1wIEF1
+dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9vdCBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAPHQvI/o81ZggyjEkXuitQlP5f/re7Unjzb3
+FpSpgZMWSLLLepO3FsP2OrPs/S8HIGfPM9am2Y4jd8SmLijrtAyiLiTZAUe1OCsv
+RSQqAYzzd0mqAHSNDSyhL0fW3n3I4wgCRaVEtLmqW3sAtMXn725DlsIsc7u3JSVp
+m2tuh1p4lQc8wXdsxL9i+b4nz4mY0KbDlYBT5CFuHZ7uvgAdnEhHo+4ssz9aHY2w
+DGwk+HF8hRGIfdBduWl6k9Rc3/njLw0JEnxTisblRSs/Ju+VT4fnuQBHGNwa1MyL
+w+xhiGU2nYc0z2enR6Ul6fXhl1dAKS/GqBjUNgm6bWyQadAMnmkCAwEAAaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQURvVGiS6wjKmgckLnFMCL6gjadikw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQAiWxAjzB3G3Fqz//0C
+3uyK5gjLx3osnGhGzleXJ3iz8wODC37c26z0WU8BcK2xfU4yLzi/ZdjjTfyKYNUq
+kUEVFcMsZp0fmv1BN+g50Mxo+TQn6KlrWWhhuonQmFzQiwYPjyhUtmv8C90ONFrb
+/rpcgBOFpf//PutWJ1y9mzlMQCG//bMDIItBFW8/zt7X0WMI7RlWssXIB8k9ZNls
+698hRvBkJ9wwbzCUyeEForZO0MpvND86F/ZshpCtiINY/F36Al5/Jrrx5XiZz9XB
+tELgQudLi68x8IeizvmKPeEVz7snCW0vExvV02c8+Aye0s1vcYrNQugNqdTWtz7k
+bMSp
 -----END CERTIFICATE-----
diff --git a/tests/certs/tsa-serial b/tests/certs/tsa-serial
index 15afeb2..a905e14 100644
--- a/tests/certs/tsa-serial
+++ b/tests/certs/tsa-serial
@@ -1 +1 @@
-ba458168626824fa059d68686df0f1eb
+5cc02bcab4fad4c88cb5108db71dbc55