diff --git a/tests/certs/CACert.pem b/tests/certs/CACert.pem
index d90ffa4..aa2ccb6 100644
--- a/tests/certs/CACert.pem
+++ b/tests/certs/CACert.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgIUcgDbUQ4mXwbCHE7QpTszY3UoUh8wDQYJKoZIhvcNAQEL
+MIIDoTCCAomgAwIBAgIUfuEVHNA/1VLDJI9mhANrBndIj6swDQYJKoZIhvcNAQEL
 BQAwWDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxEDAOBgNVBAMMB1Jvb3QgQ0EwHhcN
 MTcwMTAxMDAwMDAwWhcNMjYxMTEwMDAwMDAwWjBYMQswCQYDVQQGEwJQTDEVMBMG
 A1UECgwMb3NzbHNpZ25jb2RlMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv
 cml0eTEQMA4GA1UEAwwHUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-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
+AQoCggEBAMRykK9mZCSpkVUbCq1r12OXvIDkcjj+g4JpyZOrmPpz5RvmLvYBBgeV
+IsUcqHm3/uSLpOFu/pwFJ2CBZVPJ1d49Y9DVnNR1dUbneWX9tE7A6NV9IG1kVagM
+veI/ANLuRi0H51aAZS9L8c6WxlR4+pxJoCZp1tyTGmfjxzBEXUWvyUrIMrW/r9TH
+u5gGgR6k86EbH7q71XRLhLeEi9QGCG24gobngYNZa5mb8DgLCkUeFtRsrYGEUT0G
+HTpAGXUrpAb3U7+4LkGaS6mc0NPTW4lz06Z3VhyYwwAbgU2DZQjMpqYWv6UctOP+
+5elPDc/PrTAdHAgbOhgvt1HUlqgn7lUCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUWIpzlJI+vefcJwcNGHwwRms/2ncwHwYDVR0jBBgwFoAUWIpz
+lJI+vefcJwcNGHwwRms/2ncwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUA
+A4IBAQAl+G1nXXW5u3notmAG5y8kwufFqNi5Jn1HVbT08w4IiteWMw3D9GEOCueM
+g5A03bC/Xv1PRvMatXQSARRvvVl3y1l98sA+97SP/FFUla3W5Rn91OsWd4qkcXhv
+CtPKHpz0SCjKLv3HG/C7fBJPG9XHMgkGZarM2KsQUlkn7DjdBccYcp/zJvtvm+be
+nR5ZqE6LI52WCXg0w/KlJlildU5LE/bvHbfmRUVm/4GhUNN8ko8eG67ueuftkeTD
+banKmnuSay02I42A0th2w8Hz7oaOUEpl8S9TfqeFuqLhtUP0FzUNMPAg0o5YTpe4
+xAArbPbFvH2l3plEaYccKYvbAGT/
 -----END CERTIFICATE-----
diff --git a/tests/certs/CACertCRL.der b/tests/certs/CACertCRL.der
index 96cff5d..784355a 100644
Binary files a/tests/certs/CACertCRL.der and b/tests/certs/CACertCRL.der differ
diff --git a/tests/certs/CACertCRL.pem b/tests/certs/CACertCRL.pem
index f94a1d6..87bd1a6 100644
--- a/tests/certs/CACertCRL.pem
+++ b/tests/certs/CACertCRL.pem
@@ -2,12 +2,12 @@
 MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
 CgwMb3NzbHNpZ25jb2RlMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
 eTEYMBYGA1UEAwwPSW50ZXJtZWRpYXRlIENBFw0xOTAxMDEwMDAwMDBaFw00MzAx
-MDEwMDAwMDBaMCcwJQIUZgDukdSnO8kxz6hKmIZP4obj1NMXDTIzMDQwNDEyMzc1
-NVqgMDAuMB8GA1UdIwQYMBaAFAAlGvggxNxiRRwadSm8yqzEt6i0MAsGA1UdFAQE
-AgIQATANBgkqhkiG9w0BAQsFAAOCAQEAi2ltqUTxYRCMkc3qJuP9k4sRe0/Z7cUs
-vJr5ODRYc8w6OE1Bd/jMcxfBhejHrIdDFzzIi9acU4wbimtjTpw6xZVyifndOyHx
-NhDj7U8X5mybMTSM9R4pf/2A1+SB24Y4cOnLVDSQnCBGPf6ZrEiRAd0HIB4HSP1c
-Jhf0EXtIDE1wqfO5jvBlHTMpn3hHtGf+CJ2/m9CRGCA/VxpbYXIVHxBIfW92tjiT
-5S3WxIjz9VKc2B8AkdWyYmG1O7h3Qx+1JyQvmMSA78zubtpzxIwP+hPlSeTHiFmF
-aBARQyT971XbSTrAqAOfvwTYF7VrjAxR97NJ+TTrRRZZfm3AVk8t8Q==
+MDEwMDAwMDBaMCcwJQIUSXAaPeUatfheDTFo77LnMBHgyeMXDTIzMDQyODEyMzMz
+OVqgMDAuMB8GA1UdIwQYMBaAFOP6v42ECbVR/AiLDZ7f2WKtYXILMAsGA1UdFAQE
+AgIQATANBgkqhkiG9w0BAQsFAAOCAQEARMWBcG6sanX3nwoSPGcUNEkYG2+qB8/w
+wlcWWY7RfOGQWVHqbVvklJdTYFDw+mA6RuATMOd5S6hXa8tms4L2YQUmYyfNOyJu
++INPDnqueQshFZ8PqBTaP6O/NRI/LOLpcIIohgemwfPYPrbd/JqcLlQ2Vbgb9Lnb
+CYZWGOF7AKC0ugTTvLuWr9LPwmWFdORtmm3UJfFOPDX6zmHPAPhBUuyrxl8UoNZB
+ZPvgeBjbyQy3MaJsbaniwoOahmT+MbYV/0/YRwI5XDxjiOdJSBz3Wd5YDNDozvG6
+zZMHtF9TkUZjmLUe3Jm0GnS33gU8SB6YdYpnnPg+Up4w5sye90pk9A==
 -----END X509 CRL-----
diff --git a/tests/certs/CACertCRL_crldp.pem b/tests/certs/CACertCRL_crldp.pem
new file mode 100644
index 0000000..c0db98b
--- /dev/null
+++ b/tests/certs/CACertCRL_crldp.pem
@@ -0,0 +1,14 @@
+-----BEGIN X509 CRL-----
+MIICMzCCARsCAQEwDQYJKoZIhvcNAQELBQAwZzELMAkGA1UEBhMCUEwxFTATBgNV
+BAoMDG9zc2xzaWduY29kZTEgMB4GA1UECwwXQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkxHzAdBgNVBAMMFkludGVybWVkaWF0ZSBDQSBDUkwgRFAXDTE5MDEwMTAwMDAw
+MFoXDTQzMDEwMTAwMDAwMFowTjAlAhQxdzwUXgMSEn/RzOwbdKtxlLgYJhcNMjMw
+NDI4MTIzMzQwWjAlAhRJcBo95Rq1+F4NMWjvsucwEeDJ4xcNMjMwNDI4MTIzMzM5
+WqAwMC4wHwYDVR0jBBgwFoAUYbtAOknHjmiu3l8ONAUY387kFi8wCwYDVR0UBAQC
+AhACMA0GCSqGSIb3DQEBCwUAA4IBAQBOPbjiBQ1jOEjfQ1Q3/DBfzFKxeL7Cdoiq
+6l1psqamZRTmU0a+1qRH/qokB0gA1XeeYIZRcruthHDk87F+WZPCKIr5cqfH2RFA
+xjDEkwgA8OZSdSMh+ZhBLBoGjZhFdnX/FknMcA23cLnzuv4RmsbiokwWrysebDNY
+DbTQpa/OFvqmHmgXbhrBqUinF7gl1ppzXs/d+FjSg1aAre/lx3KEXCgc126kldS9
+9+c//UPmltYB17ipVWBmVOyVHNphnHtqPElD9Gz1DooVZ1opsqRBh0APu7fqmm6A
+5d/lvNlPrlu835/fgUF3YmyU+w4x5sQCBjprTD6QIbIzCXDXfpBj
+-----END X509 CRL-----
diff --git a/tests/certs/TSA.key b/tests/certs/TSA.key
index 56ce8aa..c0c8a54 100644
--- a/tests/certs/TSA.key
+++ b/tests/certs/TSA.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-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==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDhMfTdugKYNDCN
+opsz9rTpYF710kq3fDN3JdmEFPoZfhZ58CBm+iZBJRCc8KoXMbKAgAZsFaUyU63M
+07fYIxJeu3CTOi7kFQRy5bfGrEOnTBMKUqR+KcOZNeNYtfkv4eca25AtTyziJeBV
+TOqDoVG5x75ad0+Ab4xA9bhbN4+7m5jS1aJeHtj8eDBkJOIOKGbZ0WEstffAIzWO
+qCC+YFqxsXLO2hOxRgxgpsY9Va4bynn6HW0FZUcUQGEDH0Y17o2KInSyYASad7VI
+F5jjiJnAzzvU701URZ7kjJFGbT9W7523Ljytl/Mvg+5qTG5JNQjVDsWHte6j1Kq8
+bAHpZ6NjAgMBAAECggEBAKDpXmv1FxeE61C5aSc3WMwNxaznZ+Y2RFwV2phrmM4Q
+b6UP9Uc/5YfVIUrTGObb5w207WHcEZ+ldWIPwqUZYm34h5dcEtd9QSGMjcXTn7/y
+NwTASrOvygk3HU1tMjKJu+ZQD3Sgx5SMtgCdplEKO2iBlr3z1QYULubX7bSYPgcx
+7sOOpEpITayd8HdOkqkqUvLKxAW5xhL2AzBQHaJiGL/zaW0uKEoOVuTrhNw4+Lnw
+2IYGrdXpGLAd6hno4kOg2ZkJKWA4Yd+adroeV3BjJ2G1hLJAbPDtS/uB4ZnT1zQx
+OlkqiPgnoH+16I+aLOs7MvIwQ7VRdF46Exk/9qIdHEECgYEA/sUoOQya1/JgPpbd
+QeAViTvu9vCFJCnJMkyobG/CVHRDIsNwE/CpaQE+vCn/LpUeKD1KCHIjTOvLF4HM
+CHt9SECApJESIdexKGP6DVoW+xnomojN/k0YW1JkrnXqmvDw5u/nvFz/JPncKZzB
++Ahx6ocORz+t10V8IRn6SlN0E4MCgYEA4khANwZ0Ys0CwVJkx5+mX3ukgXGsLDcB
+p1bGrnXhbZOiZxxeWjbR/7b4PyAzsoqxiC/F3RGnU5TEPGnUUeGWv8UFsVsgd8tG
+QvTOC5iEio6fs/IPZK4Asy4a5ByX6bXjbqSnypN+vf+9lFOvI/+yZ9zKejdoD5Xw
+k150XRhWyqECfzDDi+9fekPbIJDaT39MZNLfpd2eK93AIcJ+6b3XplqD5lXBErK+
+Xa67jkZ1w2InKJ6LHKCBOECA4V6eeW8mM9Sgg/77xXy0zDPu7u2fUMa/LsZlaQhD
+uWXBX4QFDeKaO4H4aWKkajGpoXpVhsry0tsQ/qqkhaGuqxOq5T1Uu+MCgYEAhz2J
+a5mm+9ntmJ9m7kxDwnOCWX8X2QEzMtFRQ7nedoAzIw84cRCsp/myGwBjBYWRH4T1
+6+9+Ix0Zv8W8iQeb8peNlHeTSyWpo6DueM26AZnGZ2T3wEOi1XRrzAQu4xa7jEhK
+pG9M47+yjbEKTyimdx7lwO/WeOIze9CLGYzPaqECgYBfgaE2HpG0SYKfDy0ipyxe
+p5ZoGQUXksi7WHSWSTl3tA/0NTtYKCHKb1/hRezjmdRgTuqBaV3y2nF1XmlKw9EX
+nYx/xAfhnyh9K7EZEMtDP2zL6tV1sp6b4Jd7sbFvM/bMJBY6KtKx59Y0u4nkgcH2
+gt3jad7Axl6C3faOfjzeyw==
 -----END PRIVATE KEY-----
diff --git a/tests/certs/TSA.pem b/tests/certs/TSA.pem
index 410447b..c67486a 100644
--- a/tests/certs/TSA.pem
+++ b/tests/certs/TSA.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIUZLV0uiTcqZkfRcm75kKFcnFi8pAwDQYJKoZIhvcNAQEL
+MIIEMzCCAxugAwIBAgIUBxGrWWn+gk2O0nxUeOQvpcu0HUQwDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
 CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
 dCBDQTAeFw0xODAxMDEwMDAwMDBaFw0yODAxMDEwMDAwMDBaMFUxCzAJBgNVBAYT
 AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxHDAaBgNVBAsME1RpbWVzdGFtcCBB
 dXRob3JpdHkxETAPBgNVBAMMCFRlc3QgVFNBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-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==
+AQ8AMIIBCgKCAQEA4TH03boCmDQwjaKbM/a06WBe9dJKt3wzdyXZhBT6GX4WefAg
+ZvomQSUQnPCqFzGygIAGbBWlMlOtzNO32CMSXrtwkzou5BUEcuW3xqxDp0wTClKk
+finDmTXjWLX5L+HnGtuQLU8s4iXgVUzqg6FRuce+WndPgG+MQPW4WzePu5uY0tWi
+Xh7Y/HgwZCTiDihm2dFhLLX3wCM1jqggvmBasbFyztoTsUYMYKbGPVWuG8p5+h1t
+BWVHFEBhAx9GNe6NiiJ0smAEmne1SBeY44iZwM871O9NVEWe5IyRRm0/Vu+dty48
+rZfzL4PuakxuSTUI1Q7Fh7Xuo9SqvGwB6WejYwIDAQABo4HvMIHsMAwGA1UdEwEB
+/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwHQYDVR0OBBYEFHnEl41jHza4
+2tqVE1fctzcQRFMNMB8GA1UdIwQYMBaAFE6fD2uX/Q6n9KjFBO5tB++jGixmMC0G
+A1UdHwQmMCQwIqAgoB6GHGh0dHA6Ly8xMjcuMC4wLjE6MTkyNTQvVFNBQ0EwVQYD
+VR0eBE4wTKAYMAqCCHRlc3QuY29tMAqCCHRlc3Qub3JnoTAwCocIAAAAAAAAAAAw
+IocgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwDQYJKoZIhvcNAQEL
+BQADggEBAKMnM+tX2AM6g9SSAbgAz25vHRs+/hzZN2EMZOz+ZsNZufRwRbDH4eC5
+mm+s9PKw99vk/67vJk+IxfOLsZSleRX6h7DqXKhh5j8S/IPfOuIxWUfQGMlnfHNt
+IdePg1vIQCwcj998e0NIdnioSnGrKRay0A1Y+7zY+9B8/sRCAamyAFyqjG5UG70q
+NOZcuG52+ZHYfA3poW4MTBWTi+k9tK786RpRWj+I1ORBAJIFZ1SRzPQ5QL4XqE14
+iKowHAJbo1/X6Xr/SW2B+oC+p5jmONRi/rwHnUEqWbkbi+CKWdlI+7HTApncofLi
+JVHLUWz0r6IIp0mHrMwoI94yZBVXje0=
 -----END CERTIFICATE-----
diff --git a/tests/certs/TSACA.pem b/tests/certs/TSACA.pem
index efe569c..f83153a 100644
--- a/tests/certs/TSACA.pem
+++ b/tests/certs/TSACA.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIDkDCCAnigAwIBAgIUf2df9lAckuBxsAT7UktJTpH8H3EwDQYJKoZIhvcNAQEL
+BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
+CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
+dCBDQTAeFw0xNzAxMDEwMDAwMDBaFw0yNjExMTAwMDAwMDBaMGAxCzAJBgNVBAYT
+AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxJDAiBgNVBAsMG1RpbWVzdGFtcCBB
+dXRob3JpdHkgUm9vdCBDQTEUMBIGA1UEAwwLVFNBIFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH7Zl2oFIq75eVCHtPSH5apYifPyFvIAnB
+J8D3/ylM+Ll5X0/mBkyU5yR7CN0T+WsroWmkkGLuDbrqRrGG30Zs6/DIgHnLn25l
+rM/6C4B3TApIoBPLqLWaYd0EUwn5hyh5vJdolzCwZtr3swS1BZ23WlPXXWIO8F+m
+E5QZiFWqjufoHWECyoa3OwJ+U/UcR+Tr/HnlBXaZswTJdr91R9imWZgAE6EF6qM5
+ZnzNqgsjKPIN62FIcL3SD57CcR8fYvOAHGlY9r/CoDMuAs64wp/+oovC4J8WHvqV
+xg/z32V7osNq4ko9IArTDESj1ZlL33uVGy/GnTAMZv1CKFMrCfMNAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE6fD2uX/Q6n9KjFBO5tB++jGixm
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEArE8W97mfL9a8NcaX
+UmJwiBsoA8zGQ1uWV051JHuW+YbC1az2pRR0kXOLkXeCNhwHfxb8pvEjOToa341K
+5NYFSRPJVkR09AaF7KjuLzZO821roxbZPPbS8GsFGJ5GbLe6F8EW06rCyLN03Y2q
+bOAQvAof421193HIO0baBWE13QsLk2wQEYyB/Yld3919ub9plQLxapojRdK2s+cY
+Juftt8hE3UDlfQkpnVbIpU4Q/LFtPztfxkcd9rkz/kujH+juBd2UnirjK3n86ReU
+1MM2QvtnMlXyZiXHujrOkWGS57KaYdkDAV98zWk9Bx7g6K97cy0JPdBq2cnucUJw
+0mCOiQ==
 -----END CERTIFICATE-----
diff --git a/tests/certs/TSACertCRL.der b/tests/certs/TSACertCRL.der
index 1883abc..91796d5 100644
Binary files a/tests/certs/TSACertCRL.der and b/tests/certs/TSACertCRL.der differ
diff --git a/tests/certs/TSACertCRL.pem b/tests/certs/TSACertCRL.pem
index 4b30991..9553617 100644
--- a/tests/certs/TSACertCRL.pem
+++ b/tests/certs/TSACertCRL.pem
@@ -1,14 +1,15 @@
 -----BEGIN X509 CRL-----
-MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwYDELMAkGA1UEBhMCUEwxFTATBgNV
+MIICUzCCATsCAQEwDQYJKoZIhvcNAQELBQAwYDELMAkGA1UEBhMCUEwxFTATBgNV
 BAoMDG9zc2xzaWduY29kZTEkMCIGA1UECwwbVGltZXN0YW1wIEF1dGhvcml0eSBS
 b290IENBMRQwEgYDVQQDDAtUU0EgUm9vdCBDQRcNMTkwMTAxMDAwMDAwWhcNNDMw
-MTAxMDAwMDAwWjBOMCUCFGYA7pHUpzvJMc+oSpiGT+KG49TTFw0yMzA0MDQxMjM3
-NTVaMCUCFHzAIeMi1IEamyKuw2jUbRACPsXeFw0yMzA0MDQxMjM3NTVaoDAwLjAf
-BgNVHSMEGDAWgBRG9UaJLrCMqaByQucUwIvqCNp2KTALBgNVHRQEBAICEAIwDQYJ
-KoZIhvcNAQELBQADggEBAH3wqsK5cDRaESaGrqbcsyG17LtUW2dDPdip8DIAnPNv
-ozGihXLfYbeTcTHq84Q7oj3TZVhkGo103pHaWwFC43MwNNPYe4xAWBjjCGuORlJJ
-61yZ4ma7jVmR2udh6wTn5ORQVuWjRfsxCMwsH/jAg/Kh48CNwXwIsp9160N9TvSv
-f/hmD6VtpVqCgrgFlTE1xr+8xatwScXtdLixmyE/Yd1OrEHWzKzl9UmgN9vqsGvC
-ivYzEJ/qsH0dyIZ1xZGT5LZLMkbUWW24SXhZn6Xaal32isrBz5D4EAFMAw4QsnFR
-LMRU9ozATB+q3n7MTvQ4vajVckZNry9opcGRx6C0QtY=
+MTAxMDAwMDAwWjB1MCUCFDF3PBReAxISf9HM7Bt0q3GUuBgmFw0yMzA0MjgxMjMz
+NDBaMCUCFElwGj3lGrX4Xg0xaO+y5zAR4MnjFw0yMzA0MjgxMjMzMzlaMCUCFFcV
+Ys5TRUZVMGFWN3Et/yQQme62Fw0yMzA0MjgxMjMzNDBaoDAwLjAfBgNVHSMEGDAW
+gBROnw9rl/0Op/SoxQTubQfvoxosZjALBgNVHRQEBAICEAMwDQYJKoZIhvcNAQEL
+BQADggEBAEu9tNvUMHJ69vCPdJH3FUuGPHuTyC32aLBoV/g/t9OD+95fDwwijKbX
+QcypdgGEp4KEH4WQQ8JyhScgxd3gjnNoB9ITIZ14eZ9uslIZPaQztMDqvzLZcsLf
+PXWWvCs8GO1K30VVqVual+OT8ojWBAgF49rg2OZX4JUAhXyaP360MtWEWVNghRwk
+FhK7q6HOaNtxrIar1ZuDkvqEvmaEexJ/3HOGAM0DWmhneO2hIpCAfpYnGic66I69
+17FQWE6WLTS+Hjc8qQEDPeGsSK3NWhGiOKDr1Zpjae5PknghxzfxE8u56t6pMBHj
+DWYGMc57TpovDpTdla7YipkVxSrTkhI=
 -----END X509 CRL-----
diff --git a/tests/certs/TSA_revoked.key b/tests/certs/TSA_revoked.key
index 115b941..30ac58c 100644
--- a/tests/certs/TSA_revoked.key
+++ b/tests/certs/TSA_revoked.key
@@ -1,28 +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
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDPPtqTsdzCK99B
+5zSNIiu429Tbc/S4Aa9eSsbjcefTy7NkCPankl8QeBIvQ75P98qH828iDlSH2u3N
+Rp121r9wjEaM3qmkkyP0oWwjoK0du6y3hI59rHhOt3FqO0ec40Rf1yxrCKE+pCMd
+TI+Ifozlxe/T7FhwxLjOIBIt4gDF6sOn06ToTC1CoVi/nd9E5vgKjuQW0F1Y7Hey
+Ft64YStUXxvLB03mw8+bciZI3BQGrgOD9CCTWZVK7OO147qc8TEoQle1xKISM5wh
+vaHbNUuhMRJG4qVyrZ54BICRW7r5cJZBBDVc5i1XD50Nup4wIjJtBAnPZDAwEwac
+XZ53hHAPAgMBAAECggEAeGmume3XtEHFYAcz82SNPsULcc53u4nPGNwdnv0Jk3dh
+bZf/p/FVpr384tVbeB8i38bDJWhqGN1NGd4Tk37GkGAQhbzBmEudsn8v06uBqirm
++WHdYIubAzF2hiCXRUKO8ZiVyEKlXT4E4Psg0k+lEcPlyp4h7LOAJNNhfKM5i8QF
+3K7Pp/VcFqtwJSmu0vSycJOJWyUfqRLxgWS95r2EG1rwD46KFBCoHOa50kiZFdiI
+q2h1XOiXtdaG1yn6HRS75gV4CR+MCGkczs9onSl4IpwNlq595NMCujhFcHjjKzwV
+F4E/83ehtj7WruyNFwrFbabNAvLSY8nVBHabn/3L4QKBgQDrYHKn0njihjbaPT5v
+1yoJyz/1eX/fscvDhQFvhQoirk/A3iSwOd1jszGvvYxRnfRnLDOszTCq/+CRSv09
+sU7ECDcJPFJY8GzDMLjoBJRDtHdsFjU6tliHgyXFVpu46sIt0Z03Wglowyytc9ws
+9e5uf3xolNbhdLTWfovoRp5LJwKBgQDhZ2qWOyGkVyuPn0GSVJVnOgK/PUd9b7Ze
+R77i/P6sgp9d3eAXK46oYJM+6TPnQwZYE9CHUMMqHmtCm2iHqCEitZ9mvZgPt6p+
+sR8HxJ/JAowDB8mOQ8usd/1S0M5e8SwSpuRajkYw0cndvwn+ezAlKsZyCN6sm73B
+3ruQvVjk2QKBgAJG6pUJCjZWyg0Obp4yXKu/lZzQUhZd5/S6QqtLhC+VtBvPildS
+F/ww7Zgfo03e01B0MwPG8GOXGhsNuKlyH6rx0WZ7eOh3WvYAcKl98dk907Ht/RHW
+VcDp2eGw1szRKJO85WJ1soWa7cG3zzd4IZhcD14LopCHyoAQtVXH6RwdAoGAddQM
+yNnCXVlgIST8LxVeQGb31qae/3htWd2hcKEWNHHYA0agBRy051oMvv9DLapA37wD
+7yiNzS+3nEsHGpsOL0nIOPn1SooVa0MF2Ja1fGuDa3Yfq+nOx6q11xvmNYVXJ6zs
+hFYJZS3Vm8Bo5gnZgiRZNnViidKkIHthi2kf1gkCgYBzaNgT4fbNPpgia/Vz3rd9
+UIYpVzMEP6HkTVYXQH+qLzRpjl4HG6LanMbxtf/0MBHBwtEyVftKopgvkcJCDUCS
+Ls+BYieF547/2W+pnV7lbz7eD6w2o7zNPNj/l+RB2PXgBZGQv1N4HgLsz+yk7eyI
+s3UnnC/9NhgSMwB82OPX3g==
 -----END PRIVATE KEY-----
diff --git a/tests/certs/TSA_revoked.pem b/tests/certs/TSA_revoked.pem
index 829d4f0..7ec91ff 100644
--- a/tests/certs/TSA_revoked.pem
+++ b/tests/certs/TSA_revoked.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEITCCAwmgAwIBAgIUfMAh4yLUgRqbIq7DaNRtEAI+xd4wDQYJKoZIhvcNAQEL
+MIIEIjCCAwqgAwIBAgIUVxVizlNFRlUwYVY3cS3/JBCZ7rYwDQYJKoZIhvcNAQEL
 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=
+AwwHUmV2b2tlZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8+2pOx
+3MIr30HnNI0iK7jb1Ntz9LgBr15KxuNx59PLs2QI9qeSXxB4Ei9Dvk/3yofzbyIO
+VIfa7c1GnXbWv3CMRozeqaSTI/ShbCOgrR27rLeEjn2seE63cWo7R5zjRF/XLGsI
+oT6kIx1Mj4h+jOXF79PsWHDEuM4gEi3iAMXqw6fTpOhMLUKhWL+d30Tm+AqO5BbQ
+XVjsd7IW3rhhK1RfG8sHTebDz5tyJkjcFAauA4P0IJNZlUrs47XjupzxMShCV7XE
+ohIznCG9ods1S6ExEkbipXKtnngEgJFbuvlwlkEENVzmLVcPnQ26njAiMm0ECc9k
+MDATBpxdnneEcA8CAwEAAaOB7zCB7DAMBgNVHRMBAf8EAjAAMBYGA1UdJQEB/wQM
+MAoGCCsGAQUFBwMIMB0GA1UdDgQWBBRWRawwlcW57baAiuBVmi0WFKIZqjAfBgNV
+HSMEGDAWgBROnw9rl/0Op/SoxQTubQfvoxosZjAtBgNVHR8EJjAkMCKgIKAehhxo
+dHRwOi8vMTI3LjAuMC4xOjE5MjU0L1RTQUNBMFUGA1UdHgROMEygGDAKggh0ZXN0
+LmNvbTAKggh0ZXN0Lm9yZ6EwMAqHCAAAAAAAAAAAMCKHIAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAMA0GCSqGSIb3DQEBCwUAA4IBAQCQbgXQtFr5lWjs
+tzlGJAuZfIq1f1arWWrJNSHrha9RUtm6uMoh2aMYByfEcopB9StqMo8QH4yS4LGZ
+/6B81EF+dugIIb9BrE00ASgXxZ6aGGAe79VwqdG8DXp+VgRbBQA87S2KeSN8wfm+
+G2AGRZF0JWS4iW5kGgrqeC14IN1FajHklrh7rOIwo/h7uVIOINWtQnHyBjlCQ6N4
+OTFFgtIOY5KXtYM1A+Gx2nt3uZnEh/U/ZxHslUb55O017Qfkbf11JXFil4+ZfqMx
+QuRuwMAWlyEg+1UfNae4Sg3XqPheshBzZ7ykwKGZZPeA/8kKfbXoE6Kdy5HmT/El
+8e7rP/mN
 -----END CERTIFICATE-----
diff --git a/tests/certs/cert.der b/tests/certs/cert.der
index 376cdd9..9456a95 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 efe830b..5423672 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 5b18ad2..c6fd8c8 100644
--- a/tests/certs/cert.pem
+++ b/tests/certs/cert.pem
@@ -1,47 +1,46 @@
 -----BEGIN CERTIFICATE-----
-MIIEJzCCAw+gAwIBAgIUWKSaOJKyCD0hqj+Gay8GZwmGLh4wDQYJKoZIhvcNAQEL
+MIID7jCCAtagAwIBAgIULWwn/gLcPMAO/7oGqx5A306mxckwDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGDAWBgNVBAMMD0ludGVybWVkaWF0
 ZSBDQTAeFw0xODAxMDEwMDAwMDBaFw0yNDEyMzEwMDAwMDBaMIGdMQswCQYDVQQG
 EwJQTDEZMBcGA1UECAwQTWF6b3ZpYSBQcm92aW5jZTEPMA0GA1UEBwwGV2Fyc2F3
 MRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNVBAsMA0NTUDEUMBIGA1UEAwwL
 Q2VydGlmaWNhdGUxJzAlBgkqhkiG9w0BCQEWGG9zc2xzaWduY29kZUBleGFtcGxl
-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=
+LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL64qSULdxvTp7A4
+2dl/JbLq7GJ4ZcPbtfUyvVTB5WuntN08bpgnxljON0Ig9lFpN2OOlms/SnodlE6Z
+O8GY8kYu/aK3zHIHp3EykzRP1glf7ukcCMpcSaS5VUho0QQ9PVvvMHVNtaQ00r2i
+34m8DbGj4aRUNI5eA6Xlzz8QnhvCgtRTVbp5ZRjxo1ZNq2eEZxa6UnFshlx6i0/o
+kYPrdKTIvUv2zoRFd9H/7+B2Xwse+qppcZe0BiKSa4l6PrL2iHteYE29ggLLSqe+
+zavGN7Ev7jP+bZLU/5eq58SBy8uFBDkh1FvZEPAnJ2X/vwNzySi6KTliCPc9Jf5G
+wSJr+5MCAwEAAaNiMGAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUVeUILLpF5PWz5rAD
+iWzV/2oEP3UwHwYDVR0jBBgwFoAU4/q/jYQJtVH8CIsNnt/ZYq1hcgswEwYDVR0l
+BAwwCgYIKwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAHckjLcj9mswr08aF7MV
+EZTKKh0IOaHj7oh6vLR5Yg2n+E+9Gog/+ulbKXNe/5A9QU2R1NdwZKEeUeSuF4qW
+P3JB79BepgR6/VYKyVWH7St4ixy1GtNEFrHWsID212Jd0Rr3+kc9OJUO0aw3nvg7
+Apsr1dztjwlUN2ugLzVoDJ2wMqlu5ZQW8pINIYet127cX5knW/acPCPcqPVD7jmm
+C40xgqeKD2a6OafSS5hjO4UeCoeHnXlJ4Sep8wz8VDlu39Hr4dwFm8v9MuvBusCr
+/sdwzTRAc6mhBL/4PyJrBRhibbTxSaDKBHeWcKpmNp4DIk1vc8h6yhDUb1fgafgX
+7nI=
 -----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/cert.spc b/tests/certs/cert.spc
index 97e9980..ad61ec2 100644
Binary files a/tests/certs/cert.spc and b/tests/certs/cert.spc differ
diff --git a/tests/certs/cert_crldp.pem b/tests/certs/cert_crldp.pem
new file mode 100644
index 0000000..313e982
--- /dev/null
+++ b/tests/certs/cert_crldp.pem
@@ -0,0 +1,47 @@
+-----BEGIN CERTIFICATE-----
+MIIEPTCCAyWgAwIBAgIUZp72ahjzVryMA56ev7+Z8Rxyo2kwDQYJKoZIhvcNAQEL
+BQAwZzELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
+CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNVBAMMFkludGVybWVkaWF0
+ZSBDQSBDUkwgRFAwHhcNMTgwMTAxMDAwMDAwWhcNMjQxMjMxMDAwMDAwWjCBqzEL
+MAkGA1UEBhMCUEwxGTAXBgNVBAgMEE1hem92aWEgUHJvdmluY2UxDzANBgNVBAcM
+BldhcnNhdzEVMBMGA1UECgwMb3NzbHNpZ25jb2RlMQwwCgYDVQQLDANDU1AxIjAg
+BgNVBAMMGUNlcnRpZmljYXRlIFg1MDl2MyBDUkwgRFAxJzAlBgkqhkiG9w0BCQEW
+GG9zc2xzaWduY29kZUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL64qSULdxvTp7A42dl/JbLq7GJ4ZcPbtfUyvVTB5WuntN08bpgn
+xljON0Ig9lFpN2OOlms/SnodlE6ZO8GY8kYu/aK3zHIHp3EykzRP1glf7ukcCMpc
+SaS5VUho0QQ9PVvvMHVNtaQ00r2i34m8DbGj4aRUNI5eA6Xlzz8QnhvCgtRTVbp5
+ZRjxo1ZNq2eEZxa6UnFshlx6i0/okYPrdKTIvUv2zoRFd9H/7+B2Xwse+qppcZe0
+BiKSa4l6PrL2iHteYE29ggLLSqe+zavGN7Ev7jP+bZLU/5eq58SBy8uFBDkh1FvZ
+EPAnJ2X/vwNzySi6KTliCPc9Jf5GwSJr+5MCAwEAAaOBmzCBmDAJBgNVHRMEAjAA
+MB0GA1UdDgQWBBRV5QgsukXk9bPmsAOJbNX/agQ/dTAfBgNVHSMEGDAWgBRhu0A6
+SceOaK7eXw40BRjfzuQWLzATBgNVHSUEDDAKBggrBgEFBQcDAzA2BgNVHR8ELzAt
+MCugKaAnhiVodHRwOi8vMTI3LjAuMC4xOjE5MjU0L2ludGVybWVkaWF0ZUNBMA0G
+CSqGSIb3DQEBCwUAA4IBAQC2yNGXw1VZqBWY7cnJtiZpupKYCifRC1dEFlKcozpd
+dhWHDKpGDCzqaL/WKpqFjOIrCbG6gsfB+nu2VQv4nE8lwwelMgpeVB+v197A1SvE
+wLl71R5a7sxF0x5aBdUyWeCTeBLu6KuWQrpPcZVM3uMqhqCJ8CiSUtS1cKn1K1K0
+KRSgFTs4AFUc0rOa3wYvytps4cw/TyDXArlvGVMlDHNLffEsx3vElZafaGvyEK0J
+TsBM2dakcpP/ceuJU1gd8hLadzjfKOFml7z+qHfUa/mky+veK2M5vKn1ph55qYHc
+WtEY/wwBjgqE2VseqMLb06J3tXmTKgESGXISAnqoau+t
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDszCCApugAwIBAgIUdUqeYLe6em9A4BIXcQhE2lS8KTUwDQYJKoZIhvcNAQEL
+BQAwWDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
+CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxEDAOBgNVBAMMB1Jvb3QgQ0EwHhcN
+MTgwMTAxMDAwMDAwWhcNMjYwMTAxMDAwMDAwWjBnMQswCQYDVQQGEwJQTDEVMBMG
+A1UECgwMb3NzbHNpZ25jb2RlMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTEfMB0GA1UEAwwWSW50ZXJtZWRpYXRlIENBIENSTCBEUDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANoHRxZ1qxQKLm8MLYswvTf9FBq05unFxE9j
+nea4njWqBkg3cT/jZo2sDHlkN+q3BFEL/K+mej0/LqfW6eXrskHj6OLyXas2/HR4
+UYsby8djwazvt4LLiMS5yfo3GlRv5p44F1ruYu7/km7J/6pUxQMB+lTXKA4TzUWe
+n/xa2xGm0ZDXvQC1GlPJ1mD/fm0JeS6g8iMdTfvKPKKFMArz+wGWBiqbAKnmuDfp
+J3j64nWyRCArH+tGgvOmqkXAUBh9A0T1AfdF1Q5kFKzFq38zKI6lPELo0qEio9SO
+W+aOVVDtknTXmqKtawFyhn2e3UEzISYmFv2Wfc/dLnmBzRLNR9cCAwEAAaNmMGQw
+EgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUYbtAOknHjmiu3l8ONAUY387k
+Fi8wHwYDVR0jBBgwFoAUWIpzlJI+vefcJwcNGHwwRms/2ncwDgYDVR0PAQH/BAQD
+AgGGMA0GCSqGSIb3DQEBCwUAA4IBAQBJ69rsOHP4qKnu/wRS/D3fV/voLHB624Rg
+RpC4RshZMPVL60LaouJo1GMHj3IwyHVHGFkTxGYP0IIgcMUCnkmpSfX1tahYU+kB
+4fSCxheLg79g2y3Z1jTQxFOvRjn5t4BIk4Rq4o9E7n1x+8jcaCBSjmna9j6i5lgA
+QjazvdXrhhgrkvvMtk2wtk1laiHUHFgb9zxzNhhZFzy+QXwQv+Zj1N0swKfTP2gK
+Rxls7e47SnMdvthINZpdvUwT5pBZnMKHqgQK6YbWcopBpuw7zOTJp6Ghqzqzwa4d
+CwUtEB7f0e7dWeG7DFJ2cNPcpXaigNtvfdRR3W1RduX9FCODihFF
+-----END CERTIFICATE-----
diff --git a/tests/certs/crosscert.pem b/tests/certs/crosscert.pem
index c91e410..5276ace 100644
--- a/tests/certs/crosscert.pem
+++ b/tests/certs/crosscert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIIDzjCCAragAwIBAgIUY7EmFNcqBlB5nKd8EbzwhPhW2M8wDQYJKoZIhvcNAQEL
+MIIDzjCCAragAwIBAgIUKUVnRllbtypXICoznroWil39jU4wDQYJKoZIhvcNAQEL
 BQAwbzELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEMMAoGA1UE
 CwwDQ1NQMRIwEAYDVQQDDAljcm9zc2NlcnQxJzAlBgkqhkiG9w0BCQEWGG9zc2xz
 aWduY29kZUBleGFtcGxlLmNvbTAeFw0xODAxMDEwMDAwMDBaFw0yMDA2MTkwMDAw
 MDBaMG8xCzAJBgNVBAYTAlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNV
 BAsMA0NTUDESMBAGA1UEAwwJY3Jvc3NjZXJ0MScwJQYJKoZIhvcNAQkBFhhvc3Ns
 c2lnbmNvZGVAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC0XYQ0/knhI9JtW4xVf070A92qwW893Djh3hoX7NX0nrAstnLWd+AXkpzI
-U9NL/+ZpZBOGO7TMMrA4/4m8GwblIdeSaFXGTHY/ubnTyHYKuX75OT1EUGm1lWq2
-3oUxrG19v9A2muYhoaZW2uVPkPfRSSTcJR4cugGsPLXZnGSs8fzEalCJwvDHi3XR
-iO6RGTLbg4PzE86tllViwYfNrAEuaMCxvIN7PUzRe2TXLgUatLUcjm/LKDGjIDgd
-c81/Q/j2Uzu2/OMjh6IPJmoDuNI1Rqg5qwwLBz/SiL5CvXXlbuknc6bPDzPU7cDI
-9tLmvxgd4Gcbq81c1McbfnpZ8L7zAgMBAAGjYjBgMAkGA1UdEwQCMAAwHQYDVR0O
-BBYEFNEI/hVzuPA57YakxGJqC5Z7wLHeMB8GA1UdIwQYMBaAFNEI/hVzuPA57Yak
-xGJqC5Z7wLHeMBMGA1UdJQQMMAoGCCsGAQUFBwMDMA0GCSqGSIb3DQEBCwUAA4IB
-AQBEKabqU7o1mU47ZJoHC1JHoEjlM201D8LPjDCOPc8+xvW0x0fcePEtxtHGhrMK
-jx7Q/Fm5LY4AYuZ3e5v4Az+vN3IjvicBkm6BDWS1/pUaY9ym4KJF+rXMXCZbdS0B
-c+c2jW/URavpg27HLcmCpJAoVOzsvej1/kTK6BnuwmmUsNciAzNmSoVnjgbvlSPO
-5oIe47rZ3yKRUYhBV5647YSXir5Le5+ya8NG/6n+FcxVzhSHWW1BEPryAaNXRjNy
-sizP8QZB9ljsHDcZ5dq8gYkxz9K+DYVTL/N5Lc4ETsgbjaUb37oefTYhYFH76XWk
-c7eaqUFm+GyTKCFNNUoJ4Nyj
+AoIBAQDFCjBrTLeh9wyMb6tJi1SMz+Pe6Eb8SCg4+soxBAu1EEVo4Ao810j2NVdc
+aoQ2Ki097hl9LHcA0DMT8AFRHfXMXHSSHoYHsPcwHO6RJHXcDE4fSgkl41GtCnf+
+qUOA+QZUqNNKNOELUHboydFMytNGjuSaO29BObkiHCRB8gnfKuqGZn9YrfU8AoGu
+xv7RzKgD+uC/dTZSONAW+h7TuRn4/qtqTqfk5SnmTeEDbW3lyYLToRRKUKcYR68a
+lT/IZ2cHCrZMqvykR2cCMCARbTyI8ZQ6ogzXS/tncJYu/RTtEoKiN1EweG5R0cgU
+G0xQISw5RXMUSgWkWUL8rYpFcmahAgMBAAGjYjBgMAkGA1UdEwQCMAAwHQYDVR0O
+BBYEFBt9u2LhSzaQrQLcja2QtFexM2tKMB8GA1UdIwQYMBaAFBt9u2LhSzaQrQLc
+ja2QtFexM2tKMBMGA1UdJQQMMAoGCCsGAQUFBwMDMA0GCSqGSIb3DQEBCwUAA4IB
+AQATfeXQ2kj+97IHUOtFZTjcIH47U6k8Po11WD+Af4PRmacOKaSv+rlmgpgHfQJV
+nM90mxUvKzaoJeId/yR++U86rcu8a87njHoyDzx2HMcc47P/2VkErT9W4gyJE0Ws
+JyIR0k0XZiYJ+pJOSjnd7SY2gs1oBT3+Go5TyClAfzAP+U10fK52q802XNPw5MY0
+LEyRqCH4QYb71Hd4kGqROVy1EPv18d26apD9vK/zZuvOsbz23l0mdochYrtmfAA0
+LuNwefIgxzki22+bZe7lJyuV5WsqSNGVty+fvqmw9JUfzeOpIzVK/SxqANJnZBBI
+kapgFmTwk4JEfB3n2WTmbs9C
 -----END CERTIFICATE-----
diff --git a/tests/certs/expired.pem b/tests/certs/expired.pem
index 4096b28..90b756f 100644
--- a/tests/certs/expired.pem
+++ b/tests/certs/expired.pem
@@ -1,47 +1,45 @@
 -----BEGIN CERTIFICATE-----
-MIIEIzCCAwugAwIBAgIUY1xHA+BVMhTe7FqFnCG+wdzCX3UwDQYJKoZIhvcNAQEL
+MIID6jCCAtKgAwIBAgIUW4SefwoiLUfTBaHpZyd8knsGVBswDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGDAWBgNVBAMMD0ludGVybWVkaWF0
 ZSBDQTAeFw0xODAxMDEwMDAwMDBaFw0xOTAxMDEwMDAwMDBaMIGZMQswCQYDVQQG
 EwJQTDEZMBcGA1UECAwQTWF6b3ZpYSBQcm92aW5jZTEPMA0GA1UEBwwGV2Fyc2F3
 MRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNVBAsMA0NTUDEQMA4GA1UEAwwH
 RXhwaXJlZDEnMCUGCSqGSIb3DQEJARYYb3NzbHNpZ25jb2RlQGV4YW1wbGUuY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu10T4isP3c8wu85qyKKp
-AujnIzXe7ZCtfRNDhJznkDI92BDSk01kMhOqjkGqr92qyTrUfm9Gw+k0jqL0GGKQ
-E3iJz+z79ijMoRnwEGGiNbwjHo1nzEZA9pA3dTFDzxmTl7i5U7JW7KWsCSjh+Sr5
-u3Yz9vNNcYoNX0GSEAoUw56HbkXYxMeQ1R03X8XHAKRz7RPQR9BiJZJKL60CS8aW
-ZuIvo57hDKwM0MhZdGlWSy3rgT68euNzQhuWAnHzqNU/vQWbDIzZo4/otxViYqN3
-5qxHkSkmM6BZ07DkB156I5Pr9B0Rr1IA7AaGAfX3YzJbwnTSXrFfOjBGC65bsg3j
-hQIDAQABo4GaMIGXMAkGA1UdEwQCMAAwHQYDVR0OBBYEFMYwRpz8VP0aJoj+NYCI
-72q8eKQzMB8GA1UdIwQYMBaAFAAlGvggxNxiRRwadSm8yqzEt6i0MBMGA1UdJQQM
-MAoGCCsGAQUFBwMDMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly8xMjcuMC4wLjE6
-ODA4MC9pbnRlcm1lZGlhdGVDQTANBgkqhkiG9w0BAQsFAAOCAQEABfcVOfewnFUW
-idXXHvh+kSCbQ617DUKBOs1NbMwUDB1XYoCvmkcztpSZDKS/QwYo7Mnd2UfJdt9G
-FpDlq1f0cn+R1A8eRFaNcAX3qQl47wQBn5A/f3GH0qXEx4ijclpC0GCBKuUGeyVt
-TYkWchmZop+AGcDSAEogGEodjViDJ2fyZsk9Ccrg4MPytw5f7gdou6lPqqqRe5KU
-ZxZB2wUjwUXF2DQMAxeAkT/BRt4JwIgKOZ/90+a1XiByP8YXJWncPGC4IOvFTFsQ
-+9McDU5ZruZkpsdDDNjoaKRyn2cUivZoF2GwAL8yyakhxR89f0oomZ1L0mEYaSGt
-m4/C5hVQ5Q==
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvripJQt3G9OnsDjZ2X8l
+sursYnhlw9u19TK9VMHla6e03TxumCfGWM43QiD2UWk3Y46Waz9Keh2UTpk7wZjy
+Ri79orfMcgencTKTNE/WCV/u6RwIylxJpLlVSGjRBD09W+8wdU21pDTSvaLfibwN
+saPhpFQ0jl4DpeXPPxCeG8KC1FNVunllGPGjVk2rZ4RnFrpScWyGXHqLT+iRg+t0
+pMi9S/bOhEV30f/v4HZfCx76qmlxl7QGIpJriXo+svaIe15gTb2CAstKp77Nq8Y3
+sS/uM/5tktT/l6rnxIHLy4UEOSHUW9kQ8CcnZf+/A3PJKLopOWII9z0l/kbBImv7
+kwIDAQABo2IwYDAJBgNVHRMEAjAAMB0GA1UdDgQWBBRV5QgsukXk9bPmsAOJbNX/
+agQ/dTAfBgNVHSMEGDAWgBTj+r+NhAm1UfwIiw2e39lirWFyCzATBgNVHSUEDDAK
+BggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAQEAp06uHnxO63Ecn+knaXkfrNGg
+pr+4WCc0onXYOE37+IwsCFaUqCIr1UsnnKWSzSlSR07FHI+VaV9r3knT6VPMVsUU
+L89jHC2vLUvyJJOtuTpuOVGIzzCquYWvYRZrp2wmTceMSNhLcO1VGs28uwQojWEQ
+ZsEdFvkYeWFInUQ1mF0dLnfQjh7RcTxMJ0CxZblJ086j3AbyzM6ZF6XAVPAqBH/S
+gsBfLVGnZnMOwvKwsxViG1ikRusO6GtcIy6yxmNCUhWbIL+R59EYy++x3xLVUU90
+YnScDN+xM9A2wHO1hQpLK6DIiHpbAzAgll5xD0JWh+efRWHEtGN5JTybowG9yA==
 -----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/intermediateCA.pem b/tests/certs/intermediateCA.pem
index 11d6894..8228886 100644
--- a/tests/certs/intermediateCA.pem
+++ b/tests/certs/intermediateCA.pem
@@ -1,22 +1,22 @@
 -----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/intermediateCA_crldp.pem b/tests/certs/intermediateCA_crldp.pem
new file mode 100644
index 0000000..4b2def1
--- /dev/null
+++ b/tests/certs/intermediateCA_crldp.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDszCCApugAwIBAgIUdUqeYLe6em9A4BIXcQhE2lS8KTUwDQYJKoZIhvcNAQEL
+BQAwWDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
+CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxEDAOBgNVBAMMB1Jvb3QgQ0EwHhcN
+MTgwMTAxMDAwMDAwWhcNMjYwMTAxMDAwMDAwWjBnMQswCQYDVQQGEwJQTDEVMBMG
+A1UECgwMb3NzbHNpZ25jb2RlMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTEfMB0GA1UEAwwWSW50ZXJtZWRpYXRlIENBIENSTCBEUDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANoHRxZ1qxQKLm8MLYswvTf9FBq05unFxE9j
+nea4njWqBkg3cT/jZo2sDHlkN+q3BFEL/K+mej0/LqfW6eXrskHj6OLyXas2/HR4
+UYsby8djwazvt4LLiMS5yfo3GlRv5p44F1ruYu7/km7J/6pUxQMB+lTXKA4TzUWe
+n/xa2xGm0ZDXvQC1GlPJ1mD/fm0JeS6g8iMdTfvKPKKFMArz+wGWBiqbAKnmuDfp
+J3j64nWyRCArH+tGgvOmqkXAUBh9A0T1AfdF1Q5kFKzFq38zKI6lPELo0qEio9SO
+W+aOVVDtknTXmqKtawFyhn2e3UEzISYmFv2Wfc/dLnmBzRLNR9cCAwEAAaNmMGQw
+EgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUYbtAOknHjmiu3l8ONAUY387k
+Fi8wHwYDVR0jBBgwFoAUWIpzlJI+vefcJwcNGHwwRms/2ncwDgYDVR0PAQH/BAQD
+AgGGMA0GCSqGSIb3DQEBCwUAA4IBAQBJ69rsOHP4qKnu/wRS/D3fV/voLHB624Rg
+RpC4RshZMPVL60LaouJo1GMHj3IwyHVHGFkTxGYP0IIgcMUCnkmpSfX1tahYU+kB
+4fSCxheLg79g2y3Z1jTQxFOvRjn5t4BIk4Rq4o9E7n1x+8jcaCBSjmna9j6i5lgA
+QjazvdXrhhgrkvvMtk2wtk1laiHUHFgb9zxzNhhZFzy+QXwQv+Zj1N0swKfTP2gK
+Rxls7e47SnMdvthINZpdvUwT5pBZnMKHqgQK6YbWcopBpuw7zOTJp6Ghqzqzwa4d
+CwUtEB7f0e7dWeG7DFJ2cNPcpXaigNtvfdRR3W1RduX9FCODihFF
+-----END CERTIFICATE-----
diff --git a/tests/certs/key.der b/tests/certs/key.der
index a27b80d..a844d64 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 c9d6a62..b0a2c4c 100644
--- a/tests/certs/key.pem
+++ b/tests/certs/key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/certs/key.pvk b/tests/certs/key.pvk
index 3f434bf..cfd6d56 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 15a1803..d412382 100644
--- a/tests/certs/keyp.pem
+++ b/tests/certs/keyp.pem
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,AA7D2B5F43E74F2C
+DEK-Info: DES-EDE3-CBC,B9C24663685D6009
 
-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==
+GMA8W6sGC+xtNYoPzX2j0driKlngRIbmABYMbm8TSac8du7/S8uBcG2i6z/d0Plu
+pHr06uIcZDjCN0iWkhMGS7ai40ddBjxjDS/f9ppUZdOtTX4MzGfqb/d9LGVi1P8W
+zYSuz7BI0B2ttcbpmMIhxdGMtRz8A/MDPm8eBnEmIYjRiW/ES2HfHlrm7CFlrd72
+vgiAmFPtx9P5AE+KMFiSJDkSVMKX52yvLfBQAeBU2aQI7z5BTfwIpGgVKBT5qhq4
+EwL24FrEJ1+20Q/Resd/nfqv6lzNPl6SQLhCgY25Yz0Ke9u8Xnhn1aoz1BCDtw8u
+fnzmaqexf6w70rC1qX+CyrHLxO19lRUn5wChyPYaU2oAt3a0iKktQWdqHUIAGi+d
+Q3DpgsXlQXuXHDeBh5KKePz6g1f7pjacpjH8t8Y3VqurQop8Ku5KiVln+WyVklbS
+9ipr4Btf8NnWWD+kAvdo01ObRRGYxZwj/mlr9ePQ2d2vd9wNLe8zS0FZSzBE7cZH
+OPMuZnjU9Ruub0GJpHzsNBhMNIl6M6c2DSphrUTZBG6Sogx/aVSxe3Z5sojULfNT
+aifhUP/qR94nFokwRs77zXwWJlIF02g6caL8P/fPAcxIaItl+Q3DFo0wEZOzDI2X
+7ijPoEj/TReVajulxCcISJs5F6gaPKhNW8FKxvFH+3LnMLW/BeHNSGgnIFftkI3Z
+GqwcLN+X76qhPzS1UFF12fW9wYXjhMnR6bvVaadP6+XadZonyE+eGdRjZH0M2IIF
+Jv6si9Zxw+sesmmFXzjU0jzv825rD0NtPpYKWaCdtX1x5fkk+A4T28Yu1uLWfJcs
+4LhEkfhgILjLY02idjX4OKmwKm4w+QqBeajBCZiGTl6Fk2mvC0wCy53AEH3UTu8I
+KRkEAcl1CxsYAHZb9B00ymk3iyGTQ/1luLZfPkGS6CMJPXjSjR0i8NmOaYa+Xhe7
+bsCPYWeGT1ttJh+A5Dh39K00lSrIuQS9m3lKzdlHhZ8YL8DdeUAMBM6JKI3p8V9s
+xeb/w9Vf7iZRLsL6yDqj4zm5HFifRpFDpD/E2rC6zpUvdFiy2p6J7Xpo2cu3wMIV
+QL1te4aHVQhWsijV7LoaS3452NOnknxiNxXFWk2POwPHL1i6rmS7MlQwqDlLBilj
+O2R4YZGjmRg69zr9xJJGQQnroFEagKdhedSJ2y+lqwxl1Kb+Lp0+SOVesxfjfoeZ
+y0ctY7IJZksM0htETT6fhfJKSbMfM2uRL3FJkv1QyexnIlwmZxZgUyYAJemTZJBY
+BbAhhmTRswhp5FWdfFbYez7cV9AIhtNCoGcNQuQ+wL9OmIQbmZjFUqLIcHVyX1xA
+Zj5Jh6aybmnJTdXyIwUP3RdkHrD5JW8+d/0xMm1G89PtDJ6Q2+D3drtTB7A3ruUD
+uyDhYtpyY9m940miAsvByK2jIUlA0hLb+9+1oiWcWarl7IwxpjP8CUG6nAF7BU6v
+J/Hbikx0XMfycYp1EsQYUP4ku+S/PoJsMNU4bt248E+dDALxoyQN1Z41sYILBz4Y
+ga6z4zCA5+66ug8z2yMbC4bCo0FZxuJLcw+Ok05+PT0fW9Z3egpybXVwwY4wc6vs
 -----END RSA PRIVATE KEY-----
diff --git a/tests/certs/legacy.p12 b/tests/certs/legacy.p12
index dc9e9b0..90d91c0 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 4cebee0..326089b 100644
--- a/tests/certs/revoked.pem
+++ b/tests/certs/revoked.pem
@@ -1,46 +1,45 @@
 -----BEGIN CERTIFICATE-----
-MIID9jCCAt6gAwIBAgIUZgDukdSnO8kxz6hKmIZP4obj1NMwDQYJKoZIhvcNAQEL
+MIIDvTCCAqWgAwIBAgIUSXAaPeUatfheDTFo77LnMBHgyeMwDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGDAWBgNVBAMMD0ludGVybWVkaWF0
 ZSBDQTAeFw0xODAxMDEwMDAwMDBaFw0yNDEyMzEwMDAwMDBaMG0xCzAJBgNVBAYT
 AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNVBAsMA0NTUDEQMA4GA1UE
 AwwHUmV2b2tlZDEnMCUGCSqGSIb3DQEJARYYb3NzbHNpZ25jb2RlQGV4YW1wbGUu
-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==
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvripJQt3G9OnsDjZ
+2X8lsursYnhlw9u19TK9VMHla6e03TxumCfGWM43QiD2UWk3Y46Waz9Keh2UTpk7
+wZjyRi79orfMcgencTKTNE/WCV/u6RwIylxJpLlVSGjRBD09W+8wdU21pDTSvaLf
+ibwNsaPhpFQ0jl4DpeXPPxCeG8KC1FNVunllGPGjVk2rZ4RnFrpScWyGXHqLT+iR
+g+t0pMi9S/bOhEV30f/v4HZfCx76qmlxl7QGIpJriXo+svaIe15gTb2CAstKp77N
+q8Y3sS/uM/5tktT/l6rnxIHLy4UEOSHUW9kQ8CcnZf+/A3PJKLopOWII9z0l/kbB
+Imv7kwIDAQABo2IwYDAJBgNVHRMEAjAAMB0GA1UdDgQWBBRV5QgsukXk9bPmsAOJ
+bNX/agQ/dTAfBgNVHSMEGDAWgBTj+r+NhAm1UfwIiw2e39lirWFyCzATBgNVHSUE
+DDAKBggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAQEAK/bCZPrxN+5HGQjZLIQg
+jKfjTRL5xwBGs8+VW4i+xnaA14pyZjDlYzASmCE/ZiryVSMJ7fuQ0TVXGtz3N7PM
+v9pRgtcohs62NJZ5dIrq4f/Op1bii29pAA8+2EHPJUyFBt23vyvlI/dBpkgQG6mi
+OUEsXQ+Q2LUD4OOJffkc/gowXcB4WFjrtFAUuu9HeZUNzV5Mm5FQTGm9nCnWsDIb
+b7Yx08hMy+6jtvkNPCDcFnos2bsipmVN4fCXkm5LPZNyMFoWReDbIKWASXaao2hN
+gzWhwWsPlAGAlBPMVWEo3k2Cz/entbAijoyqS2koN4mZABy7m5+vfzFw/yvh1/lu
+8w==
 -----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/revoked.spc b/tests/certs/revoked.spc
deleted file mode 100644
index 683ae72..0000000
Binary files a/tests/certs/revoked.spc and /dev/null differ
diff --git a/tests/certs/revoked_crldp.pem b/tests/certs/revoked_crldp.pem
new file mode 100644
index 0000000..4579175
--- /dev/null
+++ b/tests/certs/revoked_crldp.pem
@@ -0,0 +1,46 @@
+-----BEGIN CERTIFICATE-----
+MIIEDDCCAvSgAwIBAgIUMXc8FF4DEhJ/0czsG3SrcZS4GCYwDQYJKoZIhvcNAQEL
+BQAwZzELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
+CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNVBAMMFkludGVybWVkaWF0
+ZSBDQSBDUkwgRFAwHhcNMTgwMTAxMDAwMDAwWhcNMjQxMjMxMDAwMDAwWjB7MQsw
+CQYDVQQGEwJQTDEVMBMGA1UECgwMb3NzbHNpZ25jb2RlMQwwCgYDVQQLDANDU1Ax
+HjAcBgNVBAMMFVJldm9rZWQgWDUwOXYzIENSTCBEUDEnMCUGCSqGSIb3DQEJARYY
+b3NzbHNpZ25jb2RlQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvripJQt3G9OnsDjZ2X8lsursYnhlw9u19TK9VMHla6e03TxumCfG
+WM43QiD2UWk3Y46Waz9Keh2UTpk7wZjyRi79orfMcgencTKTNE/WCV/u6RwIylxJ
+pLlVSGjRBD09W+8wdU21pDTSvaLfibwNsaPhpFQ0jl4DpeXPPxCeG8KC1FNVunll
+GPGjVk2rZ4RnFrpScWyGXHqLT+iRg+t0pMi9S/bOhEV30f/v4HZfCx76qmlxl7QG
+IpJriXo+svaIe15gTb2CAstKp77Nq8Y3sS/uM/5tktT/l6rnxIHLy4UEOSHUW9kQ
+8CcnZf+/A3PJKLopOWII9z0l/kbBImv7kwIDAQABo4GbMIGYMAkGA1UdEwQCMAAw
+HQYDVR0OBBYEFFXlCCy6ReT1s+awA4ls1f9qBD91MB8GA1UdIwQYMBaAFGG7QDpJ
+x45ort5fDjQFGN/O5BYvMBMGA1UdJQQMMAoGCCsGAQUFBwMDMDYGA1UdHwQvMC0w
+K6ApoCeGJWh0dHA6Ly8xMjcuMC4wLjE6MTkyNTQvaW50ZXJtZWRpYXRlQ0EwDQYJ
+KoZIhvcNAQELBQADggEBALwDivFFBjB7AkLO1jPJFyJnq8C0gadoYq0Dq5roAFMq
+Lirl0LGsdFTrZ2ljKOzNrFVfw4EQHedDCsKCtsgOXG1xxLQczwsuBcIaWGzSdW15
+iNz+IKjHXSNOLEUvVcO6N6s1rt5U15lynaXFSdskBgJYA7vq6uA8RTWzhQC7aCv8
+n3Tbpe8c7j6/y5NThffBu/YZypMoraZvPohCDfMZoFNT5GYXNWSeq7gipxtaCHcK
+OdWBi5yajIZL05hg29y7r677KBbvo07EykhxQ10zEnskzuqc7hCCsuDrXbmt5brv
+REYpeGvJAu0YrFg9yLSl8FJwk/XUzGvxa2MLPyL/sj4=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDszCCApugAwIBAgIUdUqeYLe6em9A4BIXcQhE2lS8KTUwDQYJKoZIhvcNAQEL
+BQAwWDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
+CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxEDAOBgNVBAMMB1Jvb3QgQ0EwHhcN
+MTgwMTAxMDAwMDAwWhcNMjYwMTAxMDAwMDAwWjBnMQswCQYDVQQGEwJQTDEVMBMG
+A1UECgwMb3NzbHNpZ25jb2RlMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTEfMB0GA1UEAwwWSW50ZXJtZWRpYXRlIENBIENSTCBEUDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANoHRxZ1qxQKLm8MLYswvTf9FBq05unFxE9j
+nea4njWqBkg3cT/jZo2sDHlkN+q3BFEL/K+mej0/LqfW6eXrskHj6OLyXas2/HR4
+UYsby8djwazvt4LLiMS5yfo3GlRv5p44F1ruYu7/km7J/6pUxQMB+lTXKA4TzUWe
+n/xa2xGm0ZDXvQC1GlPJ1mD/fm0JeS6g8iMdTfvKPKKFMArz+wGWBiqbAKnmuDfp
+J3j64nWyRCArH+tGgvOmqkXAUBh9A0T1AfdF1Q5kFKzFq38zKI6lPELo0qEio9SO
+W+aOVVDtknTXmqKtawFyhn2e3UEzISYmFv2Wfc/dLnmBzRLNR9cCAwEAAaNmMGQw
+EgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUYbtAOknHjmiu3l8ONAUY387k
+Fi8wHwYDVR0jBBgwFoAUWIpzlJI+vefcJwcNGHwwRms/2ncwDgYDVR0PAQH/BAQD
+AgGGMA0GCSqGSIb3DQEBCwUAA4IBAQBJ69rsOHP4qKnu/wRS/D3fV/voLHB624Rg
+RpC4RshZMPVL60LaouJo1GMHj3IwyHVHGFkTxGYP0IIgcMUCnkmpSfX1tahYU+kB
+4fSCxheLg79g2y3Z1jTQxFOvRjn5t4BIk4Rq4o9E7n1x+8jcaCBSjmna9j6i5lgA
+QjazvdXrhhgrkvvMtk2wtk1laiHUHFgb9zxzNhhZFzy+QXwQv+Zj1N0swKfTP2gK
+Rxls7e47SnMdvthINZpdvUwT5pBZnMKHqgQK6YbWcopBpuw7zOTJp6Ghqzqzwa4d
+CwUtEB7f0e7dWeG7DFJ2cNPcpXaigNtvfdRR3W1RduX9FCODihFF
+-----END CERTIFICATE-----
diff --git a/tests/certs/tsa-chain.pem b/tests/certs/tsa-chain.pem
index 7c341e0..0998483 100644
--- a/tests/certs/tsa-chain.pem
+++ b/tests/certs/tsa-chain.pem
@@ -1,47 +1,47 @@
 -----BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIUZLV0uiTcqZkfRcm75kKFcnFi8pAwDQYJKoZIhvcNAQEL
+MIIEMzCCAxugAwIBAgIUBxGrWWn+gk2O0nxUeOQvpcu0HUQwDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
 CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
 dCBDQTAeFw0xODAxMDEwMDAwMDBaFw0yODAxMDEwMDAwMDBaMFUxCzAJBgNVBAYT
 AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxHDAaBgNVBAsME1RpbWVzdGFtcCBB
 dXRob3JpdHkxETAPBgNVBAMMCFRlc3QgVFNBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-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==
+AQ8AMIIBCgKCAQEA4TH03boCmDQwjaKbM/a06WBe9dJKt3wzdyXZhBT6GX4WefAg
+ZvomQSUQnPCqFzGygIAGbBWlMlOtzNO32CMSXrtwkzou5BUEcuW3xqxDp0wTClKk
+finDmTXjWLX5L+HnGtuQLU8s4iXgVUzqg6FRuce+WndPgG+MQPW4WzePu5uY0tWi
+Xh7Y/HgwZCTiDihm2dFhLLX3wCM1jqggvmBasbFyztoTsUYMYKbGPVWuG8p5+h1t
+BWVHFEBhAx9GNe6NiiJ0smAEmne1SBeY44iZwM871O9NVEWe5IyRRm0/Vu+dty48
+rZfzL4PuakxuSTUI1Q7Fh7Xuo9SqvGwB6WejYwIDAQABo4HvMIHsMAwGA1UdEwEB
+/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwHQYDVR0OBBYEFHnEl41jHza4
+2tqVE1fctzcQRFMNMB8GA1UdIwQYMBaAFE6fD2uX/Q6n9KjFBO5tB++jGixmMC0G
+A1UdHwQmMCQwIqAgoB6GHGh0dHA6Ly8xMjcuMC4wLjE6MTkyNTQvVFNBQ0EwVQYD
+VR0eBE4wTKAYMAqCCHRlc3QuY29tMAqCCHRlc3Qub3JnoTAwCocIAAAAAAAAAAAw
+IocgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwDQYJKoZIhvcNAQEL
+BQADggEBAKMnM+tX2AM6g9SSAbgAz25vHRs+/hzZN2EMZOz+ZsNZufRwRbDH4eC5
+mm+s9PKw99vk/67vJk+IxfOLsZSleRX6h7DqXKhh5j8S/IPfOuIxWUfQGMlnfHNt
+IdePg1vIQCwcj998e0NIdnioSnGrKRay0A1Y+7zY+9B8/sRCAamyAFyqjG5UG70q
+NOZcuG52+ZHYfA3poW4MTBWTi+k9tK786RpRWj+I1ORBAJIFZ1SRzPQ5QL4XqE14
+iKowHAJbo1/X6Xr/SW2B+oC+p5jmONRi/rwHnUEqWbkbi+CKWdlI+7HTApncofLi
+JVHLUWz0r6IIp0mHrMwoI94yZBVXje0=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+MIIDkDCCAnigAwIBAgIUf2df9lAckuBxsAT7UktJTpH8H3EwDQYJKoZIhvcNAQEL
+BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
+CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
+dCBDQTAeFw0xNzAxMDEwMDAwMDBaFw0yNjExMTAwMDAwMDBaMGAxCzAJBgNVBAYT
+AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxJDAiBgNVBAsMG1RpbWVzdGFtcCBB
+dXRob3JpdHkgUm9vdCBDQTEUMBIGA1UEAwwLVFNBIFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH7Zl2oFIq75eVCHtPSH5apYifPyFvIAnB
+J8D3/ylM+Ll5X0/mBkyU5yR7CN0T+WsroWmkkGLuDbrqRrGG30Zs6/DIgHnLn25l
+rM/6C4B3TApIoBPLqLWaYd0EUwn5hyh5vJdolzCwZtr3swS1BZ23WlPXXWIO8F+m
+E5QZiFWqjufoHWECyoa3OwJ+U/UcR+Tr/HnlBXaZswTJdr91R9imWZgAE6EF6qM5
+ZnzNqgsjKPIN62FIcL3SD57CcR8fYvOAHGlY9r/CoDMuAs64wp/+oovC4J8WHvqV
+xg/z32V7osNq4ko9IArTDESj1ZlL33uVGy/GnTAMZv1CKFMrCfMNAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE6fD2uX/Q6n9KjFBO5tB++jGixm
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEArE8W97mfL9a8NcaX
+UmJwiBsoA8zGQ1uWV051JHuW+YbC1az2pRR0kXOLkXeCNhwHfxb8pvEjOToa341K
+5NYFSRPJVkR09AaF7KjuLzZO821roxbZPPbS8GsFGJ5GbLe6F8EW06rCyLN03Y2q
+bOAQvAof421193HIO0baBWE13QsLk2wQEYyB/Yld3919ub9plQLxapojRdK2s+cY
+Juftt8hE3UDlfQkpnVbIpU4Q/LFtPztfxkcd9rkz/kujH+juBd2UnirjK3n86ReU
+1MM2QvtnMlXyZiXHujrOkWGS57KaYdkDAV98zWk9Bx7g6K97cy0JPdBq2cnucUJw
+0mCOiQ==
 -----END CERTIFICATE-----
diff --git a/tests/certs/tsa-serial b/tests/certs/tsa-serial
index a905e14..80d951e 100644
--- a/tests/certs/tsa-serial
+++ b/tests/certs/tsa-serial
@@ -1 +1 @@
-5cc02bcab4fad4c88cb5108db71dbc55
+55c4d523e595564af0ab635fd1e3aaba