Move all the various X509 test data files under src/tests/data/x509

659 files changed, 41 insertions, 41 deletions

diff --git a/src/tests/data/certstor/cert1.crt b/src/tests/data/x509/certstor/cert1.crt
index f94996195..f94996195 100644
--- a/src/tests/data/certstor/cert1.crt
+++ b/src/tests/data/x509/certstor/cert1.crt
diff --git a/src/tests/data/certstor/cert2.crt b/src/tests/data/x509/certstor/cert2.crt
index d80c024fc..d80c024fc 100644
--- a/src/tests/data/certstor/cert2.crt
+++ b/src/tests/data/x509/certstor/cert2.crt
diff --git a/src/tests/data/certstor/cert3.crt b/src/tests/data/x509/certstor/cert3.crt
index f77834c82..f77834c82 100644
--- a/src/tests/data/certstor/cert3.crt
+++ b/src/tests/data/x509/certstor/cert3.crt
diff --git a/src/tests/data/certstor/cert4.crt b/src/tests/data/x509/certstor/cert4.crt
index 31a0bc27c..31a0bc27c 100644
--- a/src/tests/data/certstor/cert4.crt
+++ b/src/tests/data/x509/certstor/cert4.crt
diff --git a/src/tests/data/certstor/cert5a.crt b/src/tests/data/x509/certstor/cert5a.crt
index 5a72e123a..5a72e123a 100644
--- a/src/tests/data/certstor/cert5a.crt
+++ b/src/tests/data/x509/certstor/cert5a.crt
diff --git a/src/tests/data/certstor/cert5b.crt b/src/tests/data/x509/certstor/cert5b.crt
index f766c17b2..f766c17b2 100644
--- a/src/tests/data/certstor/cert5b.crt
+++ b/src/tests/data/x509/certstor/cert5b.crt
diff --git a/src/tests/data/certstor/key01.pem b/src/tests/data/x509/certstor/key01.pem
index b77b9f3d9..b77b9f3d9 100644
--- a/src/tests/data/certstor/key01.pem
+++ b/src/tests/data/x509/certstor/key01.pem
diff --git a/src/tests/data/certstor/key03.pem b/src/tests/data/x509/certstor/key03.pem
index c7cc94801..c7cc94801 100644
--- a/src/tests/data/certstor/key03.pem
+++ b/src/tests/data/x509/certstor/key03.pem
diff --git a/src/tests/data/certstor/key04.pem b/src/tests/data/x509/certstor/key04.pem
index f148a1d72..f148a1d72 100644
--- a/src/tests/data/certstor/key04.pem
+++ b/src/tests/data/x509/certstor/key04.pem
diff --git a/src/tests/data/certstor/key05.pem b/src/tests/data/x509/certstor/key05.pem
index 75a5b7a0e..75a5b7a0e 100644
--- a/src/tests/data/certstor/key05.pem
+++ b/src/tests/data/x509/certstor/key05.pem
diff --git a/src/tests/data/certstor/key06.pem b/src/tests/data/x509/certstor/key06.pem
index 63006d613..63006d613 100644
--- a/src/tests/data/certstor/key06.pem
+++ b/src/tests/data/x509/certstor/key06.pem
diff --git a/src/tests/data/ecc/CSCA.CSCA.csca-germany.1.crt b/src/tests/data/x509/ecc/CSCA.CSCA.csca-germany.1.crt
index 8653f961a..8653f961a 100644
--- a/src/tests/data/ecc/CSCA.CSCA.csca-germany.1.crt
+++ b/src/tests/data/x509/ecc/CSCA.CSCA.csca-germany.1.crt
diff --git a/src/tests/data/ecc/ecc_private_with_rfc5915_ext.pem b/src/tests/data/x509/ecc/ecc_private_with_rfc5915_ext.pem
index 75ef9d0f3..75ef9d0f3 100644
--- a/src/tests/data/ecc/ecc_private_with_rfc5915_ext.pem
+++ b/src/tests/data/x509/ecc/ecc_private_with_rfc5915_ext.pem
diff --git a/src/tests/data/ecc/ecc_private_with_rfc5915_parameters.pem b/src/tests/data/x509/ecc/ecc_private_with_rfc5915_parameters.pem
index 9044ba49e..9044ba49e 100644
--- a/src/tests/data/ecc/ecc_private_with_rfc5915_parameters.pem
+++ b/src/tests/data/x509/ecc/ecc_private_with_rfc5915_parameters.pem
diff --git a/src/tests/data/ecc/link_SHA1.166.crt b/src/tests/data/x509/ecc/link_SHA1.166.crt
index 8f76b3203..8f76b3203 100644
--- a/src/tests/data/ecc/link_SHA1.166.crt
+++ b/src/tests/data/x509/ecc/link_SHA1.166.crt
diff --git a/src/tests/data/ecc/link_SHA256.cer b/src/tests/data/x509/ecc/link_SHA256.cer
index add40f738..add40f738 100644
--- a/src/tests/data/ecc/link_SHA256.cer
+++ b/src/tests/data/x509/ecc/link_SHA256.cer
diff --git a/src/tests/data/ecc/nodompar_private.pkcs8.pem b/src/tests/data/x509/ecc/nodompar_private.pkcs8.pem
index a2c64ec53..a2c64ec53 100644
--- a/src/tests/data/ecc/nodompar_private.pkcs8.pem
+++ b/src/tests/data/x509/ecc/nodompar_private.pkcs8.pem
diff --git a/src/tests/data/ecc/root2_SHA256.cer b/src/tests/data/x509/ecc/root2_SHA256.cer
index a2ecfed22..a2ecfed22 100644
--- a/src/tests/data/ecc/root2_SHA256.cer
+++ b/src/tests/data/x509/ecc/root2_SHA256.cer
diff --git a/src/tests/data/ecc/root_SHA1.163.crt b/src/tests/data/x509/ecc/root_SHA1.163.crt
index e1bf39f9a..e1bf39f9a 100644
--- a/src/tests/data/ecc/root_SHA1.163.crt
+++ b/src/tests/data/x509/ecc/root_SHA1.163.crt
diff --git a/src/tests/data/ecc/withdompar_private.pkcs8.pem b/src/tests/data/x509/ecc/withdompar_private.pkcs8.pem
index 85d7b575e..85d7b575e 100644
--- a/src/tests/data/ecc/withdompar_private.pkcs8.pem
+++ b/src/tests/data/x509/ecc/withdompar_private.pkcs8.pem
diff --git a/src/tests/data/extended_x509/01/end.crt b/src/tests/data/x509/extended/01/end.crt
index 5d05a8e5e..5d05a8e5e 100644
--- a/src/tests/data/extended_x509/01/end.crt
+++ b/src/tests/data/x509/extended/01/end.crt
diff --git a/src/tests/data/extended_x509/01/int.crt b/src/tests/data/x509/extended/01/int.crt
index b6708f169..b6708f169 100644
--- a/src/tests/data/extended_x509/01/int.crt
+++ b/src/tests/data/x509/extended/01/int.crt
diff --git a/src/tests/data/extended_x509/01/root.crt b/src/tests/data/x509/extended/01/root.crt
index f83c6c516..f83c6c516 100644
--- a/src/tests/data/extended_x509/01/root.crt
+++ b/src/tests/data/x509/extended/01/root.crt
diff --git a/src/tests/data/extended_x509/02/end.crt b/src/tests/data/x509/extended/02/end.crt
index b0dc343b6..b0dc343b6 100644
--- a/src/tests/data/extended_x509/02/end.crt
+++ b/src/tests/data/x509/extended/02/end.crt
diff --git a/src/tests/data/extended_x509/02/int1-2.crt b/src/tests/data/x509/extended/02/int1-2.crt
index 6c93d0492..6c93d0492 100644
--- a/src/tests/data/extended_x509/02/int1-2.crt
+++ b/src/tests/data/x509/extended/02/int1-2.crt
diff --git a/src/tests/data/extended_x509/02/int1.crt b/src/tests/data/x509/extended/02/int1.crt
index 66a5d9a8c..66a5d9a8c 100644
--- a/src/tests/data/extended_x509/02/int1.crt
+++ b/src/tests/data/x509/extended/02/int1.crt
diff --git a/src/tests/data/extended_x509/02/root.crt b/src/tests/data/x509/extended/02/root.crt
index c66ac1c00..c66ac1c00 100644
--- a/src/tests/data/extended_x509/02/root.crt
+++ b/src/tests/data/x509/extended/02/root.crt
diff --git a/src/tests/data/extended_x509/03/end.crt b/src/tests/data/x509/extended/03/end.crt
index d4ef54dcf..d4ef54dcf 100644
--- a/src/tests/data/extended_x509/03/end.crt
+++ b/src/tests/data/x509/extended/03/end.crt
diff --git a/src/tests/data/extended_x509/03/int1.crt b/src/tests/data/x509/extended/03/int1.crt
index 1e4ec713e..1e4ec713e 100644
--- a/src/tests/data/extended_x509/03/int1.crt
+++ b/src/tests/data/x509/extended/03/int1.crt
diff --git a/src/tests/data/extended_x509/03/root.crt b/src/tests/data/x509/extended/03/root.crt
index c66ac1c00..c66ac1c00 100644
--- a/src/tests/data/extended_x509/03/root.crt
+++ b/src/tests/data/x509/extended/03/root.crt
diff --git a/src/tests/data/extended_x509/expected.txt b/src/tests/data/x509/extended/expected.txt
index ee6fc5943..ee6fc5943 100644
--- a/src/tests/data/extended_x509/expected.txt
+++ b/src/tests/data/x509/extended/expected.txt
diff --git a/src/tests/data/x509test/contains_bmpstring.pem b/src/tests/data/x509/misc/contains_bmpstring.pem
index c204c4296..c204c4296 100644
--- a/src/tests/data/x509test/contains_bmpstring.pem
+++ b/src/tests/data/x509/misc/contains_bmpstring.pem
diff --git a/src/tests/data/x509test/contains_utf8string.pem b/src/tests/data/x509/misc/contains_utf8string.pem
index ddcd4b046..ddcd4b046 100644
--- a/src/tests/data/x509test/contains_utf8string.pem
+++ b/src/tests/data/x509/misc/contains_utf8string.pem
diff --git a/src/tests/data/misc_certs/opcuactt_ca.der b/src/tests/data/x509/misc/opcuactt_ca.der
index 35e8e5cb0..35e8e5cb0 100644
--- a/src/tests/data/misc_certs/opcuactt_ca.der
+++ b/src/tests/data/x509/misc/opcuactt_ca.der
diff --git a/src/tests/data/misc_certs/opcuactt_ca.pem b/src/tests/data/x509/misc/opcuactt_ca.pem
index 1987a0a07..1987a0a07 100644
--- a/src/tests/data/misc_certs/opcuactt_ca.pem
+++ b/src/tests/data/x509/misc/opcuactt_ca.pem
diff --git a/src/tests/data/name_constraint/Invalid_DN_Name_Constraint.crt b/src/tests/data/x509/name_constraint/Invalid_DN_Name_Constraint.crt
index 7c8c0aabc..7c8c0aabc 100644
--- a/src/tests/data/name_constraint/Invalid_DN_Name_Constraint.crt
+++ b/src/tests/data/x509/name_constraint/Invalid_DN_Name_Constraint.crt
diff --git a/src/tests/data/name_constraint/Invalid_Email_Name_Constraint.crt b/src/tests/data/x509/name_constraint/Invalid_Email_Name_Constraint.crt
index c7083a3dd..c7083a3dd 100644
--- a/src/tests/data/name_constraint/Invalid_Email_Name_Constraint.crt
+++ b/src/tests/data/x509/name_constraint/Invalid_Email_Name_Constraint.crt
diff --git a/src/tests/data/name_constraint/Invalid_IP_Name_Constraint.crt b/src/tests/data/x509/name_constraint/Invalid_IP_Name_Constraint.crt
index fad54841e..fad54841e 100644
--- a/src/tests/data/name_constraint/Invalid_IP_Name_Constraint.crt
+++ b/src/tests/data/x509/name_constraint/Invalid_IP_Name_Constraint.crt
diff --git a/src/tests/data/name_constraint/Root_DNS_Name_Constraint.crt b/src/tests/data/x509/name_constraint/Root_DNS_Name_Constraint.crt
index dd57ded87..dd57ded87 100644
--- a/src/tests/data/name_constraint/Root_DNS_Name_Constraint.crt
+++ b/src/tests/data/x509/name_constraint/Root_DNS_Name_Constraint.crt
diff --git a/src/tests/data/name_constraint/Root_DN_Name_Constraint.crt b/src/tests/data/x509/name_constraint/Root_DN_Name_Constraint.crt
index 7dc1c4c72..7dc1c4c72 100644
--- a/src/tests/data/name_constraint/Root_DN_Name_Constraint.crt
+++ b/src/tests/data/x509/name_constraint/Root_DN_Name_Constraint.crt
diff --git a/src/tests/data/name_constraint/Root_Email_Name_Constraint.crt b/src/tests/data/x509/name_constraint/Root_Email_Name_Constraint.crt
index d1181a837..d1181a837 100644
--- a/src/tests/data/name_constraint/Root_Email_Name_Constraint.crt
+++ b/src/tests/data/x509/name_constraint/Root_Email_Name_Constraint.crt
diff --git a/src/tests/data/name_constraint/Root_IP_Name_Constraint.crt b/src/tests/data/x509/name_constraint/Root_IP_Name_Constraint.crt
index 580ce508c..580ce508c 100644
--- a/src/tests/data/name_constraint/Root_IP_Name_Constraint.crt
+++ b/src/tests/data/x509/name_constraint/Root_IP_Name_Constraint.crt
diff --git a/src/tests/data/name_constraint/Valid_DNS_Name_Constraint.crt b/src/tests/data/x509/name_constraint/Valid_DNS_Name_Constraint.crt
index 77d30879a..77d30879a 100644
--- a/src/tests/data/name_constraint/Valid_DNS_Name_Constraint.crt
+++ b/src/tests/data/x509/name_constraint/Valid_DNS_Name_Constraint.crt
diff --git a/src/tests/data/name_constraint/Valid_DN_Name_Constraint.crt b/src/tests/data/x509/name_constraint/Valid_DN_Name_Constraint.crt
index c3575b376..c3575b376 100644
--- a/src/tests/data/name_constraint/Valid_DN_Name_Constraint.crt
+++ b/src/tests/data/x509/name_constraint/Valid_DN_Name_Constraint.crt
diff --git a/src/tests/data/name_constraint/Valid_IP_Name_Constraint.crt b/src/tests/data/x509/name_constraint/Valid_IP_Name_Constraint.crt
index 76a461ec4..76a461ec4 100644
--- a/src/tests/data/name_constraint/Valid_IP_Name_Constraint.crt
+++ b/src/tests/data/x509/name_constraint/Valid_IP_Name_Constraint.crt
diff --git a/src/tests/data/nist_x509/expected.txt b/src/tests/data/x509/nist/expected.txt
index 0b2535fca..0b2535fca 100644
--- a/src/tests/data/nist_x509/expected.txt
+++ b/src/tests/data/x509/nist/expected.txt
diff --git a/src/tests/data/nist_x509/root.crl b/src/tests/data/x509/nist/root.crl
index de65024ad..de65024ad 100644
--- a/src/tests/data/nist_x509/root.crl
+++ b/src/tests/data/x509/nist/root.crl
diff --git a/src/tests/data/nist_x509/root.crt b/src/tests/data/x509/nist/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/src/tests/data/nist_x509/root.crt
+++ b/src/tests/data/x509/nist/root.crt
diff --git a/src/tests/data/nist_x509/test01/end.crt b/src/tests/data/x509/nist/test01/end.crt
index d7e64d6de..d7e64d6de 100644
--- a/src/tests/data/nist_x509/test01/end.crt
+++ b/src/tests/data/x509/nist/test01/end.crt
diff --git a/src/tests/data/nist_x509/test02/end.crt b/src/tests/data/x509/nist/test02/end.crt
index f97da0509..f97da0509 100644
--- a/src/tests/data/nist_x509/test02/end.crt
+++ b/src/tests/data/x509/nist/test02/end.crt
diff --git a/src/tests/data/nist_x509/test02/int.crl b/src/tests/data/x509/nist/test02/int.crl
index e7dfa96ee..e7dfa96ee 100644
--- a/src/tests/data/nist_x509/test02/int.crl
+++ b/src/tests/data/x509/nist/test02/int.crl
diff --git a/src/tests/data/nist_x509/test02/int.crt b/src/tests/data/x509/nist/test02/int.crt
index 0aba75048..0aba75048 100644
--- a/src/tests/data/nist_x509/test02/int.crt
+++ b/src/tests/data/x509/nist/test02/int.crt
diff --git a/src/tests/data/nist_x509/test03/end.crt b/src/tests/data/x509/nist/test03/end.crt
index 9b0463a67..9b0463a67 100644
--- a/src/tests/data/nist_x509/test03/end.crt
+++ b/src/tests/data/x509/nist/test03/end.crt
diff --git a/src/tests/data/nist_x509/test03/int.crl b/src/tests/data/x509/nist/test03/int.crl
index 528f3237c..528f3237c 100644
--- a/src/tests/data/nist_x509/test03/int.crl
+++ b/src/tests/data/x509/nist/test03/int.crl
diff --git a/src/tests/data/nist_x509/test03/int.crt b/src/tests/data/x509/nist/test03/int.crt
index c8cfc0550..c8cfc0550 100644
--- a/src/tests/data/nist_x509/test03/int.crt
+++ b/src/tests/data/x509/nist/test03/int.crt
diff --git a/src/tests/data/nist_x509/test04/end.crt b/src/tests/data/x509/nist/test04/end.crt
index 75d2fd50e..75d2fd50e 100644
--- a/src/tests/data/nist_x509/test04/end.crt
+++ b/src/tests/data/x509/nist/test04/end.crt
diff --git a/src/tests/data/nist_x509/test04/int1.crl b/src/tests/data/x509/nist/test04/int1.crl
index 2f30c77b5..2f30c77b5 100644
--- a/src/tests/data/nist_x509/test04/int1.crl
+++ b/src/tests/data/x509/nist/test04/int1.crl
diff --git a/src/tests/data/nist_x509/test04/int1.crt b/src/tests/data/x509/nist/test04/int1.crt
index f4e88d58c..f4e88d58c 100644
--- a/src/tests/data/nist_x509/test04/int1.crt
+++ b/src/tests/data/x509/nist/test04/int1.crt
diff --git a/src/tests/data/nist_x509/test04/int2.crl b/src/tests/data/x509/nist/test04/int2.crl
index e8596c314..e8596c314 100644
--- a/src/tests/data/nist_x509/test04/int2.crl
+++ b/src/tests/data/x509/nist/test04/int2.crl
diff --git a/src/tests/data/nist_x509/test04/int2.crt b/src/tests/data/x509/nist/test04/int2.crt
index 727035b6c..727035b6c 100644
--- a/src/tests/data/nist_x509/test04/int2.crt
+++ b/src/tests/data/x509/nist/test04/int2.crt
diff --git a/src/tests/data/nist_x509/test05/end.crt b/src/tests/data/x509/nist/test05/end.crt
index a3a658923..a3a658923 100644
--- a/src/tests/data/nist_x509/test05/end.crt
+++ b/src/tests/data/x509/nist/test05/end.crt
diff --git a/src/tests/data/nist_x509/test05/int.crl b/src/tests/data/x509/nist/test05/int.crl
index a34ef279b..a34ef279b 100644
--- a/src/tests/data/nist_x509/test05/int.crl
+++ b/src/tests/data/x509/nist/test05/int.crl
diff --git a/src/tests/data/nist_x509/test05/int.crt b/src/tests/data/x509/nist/test05/int.crt
index 610df750e..610df750e 100644
--- a/src/tests/data/nist_x509/test05/int.crt
+++ b/src/tests/data/x509/nist/test05/int.crt
diff --git a/src/tests/data/nist_x509/test06/end.crt b/src/tests/data/x509/nist/test06/end.crt
index 1e68f0de1..1e68f0de1 100644
--- a/src/tests/data/nist_x509/test06/end.crt
+++ b/src/tests/data/x509/nist/test06/end.crt
diff --git a/src/tests/data/nist_x509/test06/int.crl b/src/tests/data/x509/nist/test06/int.crl
index d87cd7e26..d87cd7e26 100644
--- a/src/tests/data/nist_x509/test06/int.crl
+++ b/src/tests/data/x509/nist/test06/int.crl
diff --git a/src/tests/data/nist_x509/test06/int.crt b/src/tests/data/x509/nist/test06/int.crt
index 5bb74d259..5bb74d259 100644
--- a/src/tests/data/nist_x509/test06/int.crt
+++ b/src/tests/data/x509/nist/test06/int.crt
diff --git a/src/tests/data/nist_x509/test07/end.crt b/src/tests/data/x509/nist/test07/end.crt
index 0f97e6f5a..0f97e6f5a 100644
--- a/src/tests/data/nist_x509/test07/end.crt
+++ b/src/tests/data/x509/nist/test07/end.crt
diff --git a/src/tests/data/nist_x509/test07/int.crl b/src/tests/data/x509/nist/test07/int.crl
index 8064e91bc..8064e91bc 100644
--- a/src/tests/data/nist_x509/test07/int.crl
+++ b/src/tests/data/x509/nist/test07/int.crl
diff --git a/src/tests/data/nist_x509/test07/int.crt b/src/tests/data/x509/nist/test07/int.crt
index 5c1ddd3e3..5c1ddd3e3 100644
--- a/src/tests/data/nist_x509/test07/int.crt
+++ b/src/tests/data/x509/nist/test07/int.crt
diff --git a/src/tests/data/nist_x509/test08/end.crt b/src/tests/data/x509/nist/test08/end.crt
index cb99c2ac5..cb99c2ac5 100644
--- a/src/tests/data/nist_x509/test08/end.crt
+++ b/src/tests/data/x509/nist/test08/end.crt
diff --git a/src/tests/data/nist_x509/test08/int.crl b/src/tests/data/x509/nist/test08/int.crl
index d5ee3c3ce..d5ee3c3ce 100644
--- a/src/tests/data/nist_x509/test08/int.crl
+++ b/src/tests/data/x509/nist/test08/int.crl
diff --git a/src/tests/data/nist_x509/test08/int.crt b/src/tests/data/x509/nist/test08/int.crt
index d26979cdd..d26979cdd 100644
--- a/src/tests/data/nist_x509/test08/int.crt
+++ b/src/tests/data/x509/nist/test08/int.crt
diff --git a/src/tests/data/nist_x509/test09/end.crt b/src/tests/data/x509/nist/test09/end.crt
index 4dd2352b4..4dd2352b4 100644
--- a/src/tests/data/nist_x509/test09/end.crt
+++ b/src/tests/data/x509/nist/test09/end.crt
diff --git a/src/tests/data/nist_x509/test09/int.crl b/src/tests/data/x509/nist/test09/int.crl
index fbd85145c..fbd85145c 100644
--- a/src/tests/data/nist_x509/test09/int.crl
+++ b/src/tests/data/x509/nist/test09/int.crl
diff --git a/src/tests/data/nist_x509/test09/int.crt b/src/tests/data/x509/nist/test09/int.crt
index c107dd756..c107dd756 100644
--- a/src/tests/data/nist_x509/test09/int.crt
+++ b/src/tests/data/x509/nist/test09/int.crt
diff --git a/src/tests/data/nist_x509/test10/end.crt b/src/tests/data/x509/nist/test10/end.crt
index de3924003..de3924003 100644
--- a/src/tests/data/nist_x509/test10/end.crt
+++ b/src/tests/data/x509/nist/test10/end.crt
diff --git a/src/tests/data/nist_x509/test10/int.crl b/src/tests/data/x509/nist/test10/int.crl
index daefd50c8..daefd50c8 100644
--- a/src/tests/data/nist_x509/test10/int.crl
+++ b/src/tests/data/x509/nist/test10/int.crl
diff --git a/src/tests/data/nist_x509/test10/int.crt b/src/tests/data/x509/nist/test10/int.crt
index 2d691abce..2d691abce 100644
--- a/src/tests/data/nist_x509/test10/int.crt
+++ b/src/tests/data/x509/nist/test10/int.crt
diff --git a/src/tests/data/nist_x509/test11/end.crt b/src/tests/data/x509/nist/test11/end.crt
index 6e14527d2..6e14527d2 100644
--- a/src/tests/data/nist_x509/test11/end.crt
+++ b/src/tests/data/x509/nist/test11/end.crt
diff --git a/src/tests/data/nist_x509/test11/int.crl b/src/tests/data/x509/nist/test11/int.crl
index cc91ad51d..cc91ad51d 100644
--- a/src/tests/data/nist_x509/test11/int.crl
+++ b/src/tests/data/x509/nist/test11/int.crl
diff --git a/src/tests/data/nist_x509/test11/int.crt b/src/tests/data/x509/nist/test11/int.crt
index 87fa07962..87fa07962 100644
--- a/src/tests/data/nist_x509/test11/int.crt
+++ b/src/tests/data/x509/nist/test11/int.crt
diff --git a/src/tests/data/nist_x509/test12/end.crt b/src/tests/data/x509/nist/test12/end.crt
index 158c6ae01..158c6ae01 100644
--- a/src/tests/data/nist_x509/test12/end.crt
+++ b/src/tests/data/x509/nist/test12/end.crt
diff --git a/src/tests/data/nist_x509/test12/int.crl b/src/tests/data/x509/nist/test12/int.crl
index 7ce6928bb..7ce6928bb 100644
--- a/src/tests/data/nist_x509/test12/int.crl
+++ b/src/tests/data/x509/nist/test12/int.crl
diff --git a/src/tests/data/nist_x509/test12/int.crt b/src/tests/data/x509/nist/test12/int.crt
index a55333b63..a55333b63 100644
--- a/src/tests/data/nist_x509/test12/int.crt
+++ b/src/tests/data/x509/nist/test12/int.crt
diff --git a/src/tests/data/nist_x509/test13/end.crt b/src/tests/data/x509/nist/test13/end.crt
index d1ddf4b44..d1ddf4b44 100644
--- a/src/tests/data/nist_x509/test13/end.crt
+++ b/src/tests/data/x509/nist/test13/end.crt
diff --git a/src/tests/data/nist_x509/test13/int.crl b/src/tests/data/x509/nist/test13/int.crl
index df86506d8..df86506d8 100644
--- a/src/tests/data/nist_x509/test13/int.crl
+++ b/src/tests/data/x509/nist/test13/int.crl
diff --git a/src/tests/data/nist_x509/test13/int.crt b/src/tests/data/x509/nist/test13/int.crt
index abc6fe537..abc6fe537 100644
--- a/src/tests/data/nist_x509/test13/int.crt
+++ b/src/tests/data/x509/nist/test13/int.crt
diff --git a/src/tests/data/nist_x509/test14/end.crt b/src/tests/data/x509/nist/test14/end.crt
index f43e03826..f43e03826 100644
--- a/src/tests/data/nist_x509/test14/end.crt
+++ b/src/tests/data/x509/nist/test14/end.crt
diff --git a/src/tests/data/nist_x509/test14/int.crl b/src/tests/data/x509/nist/test14/int.crl
index ae372f38b..ae372f38b 100644
--- a/src/tests/data/nist_x509/test14/int.crl
+++ b/src/tests/data/x509/nist/test14/int.crl
diff --git a/src/tests/data/nist_x509/test14/int.crt b/src/tests/data/x509/nist/test14/int.crt
index 6e97ee2b8..6e97ee2b8 100644
--- a/src/tests/data/nist_x509/test14/int.crt
+++ b/src/tests/data/x509/nist/test14/int.crt
diff --git a/src/tests/data/nist_x509/test15/end.crt b/src/tests/data/x509/nist/test15/end.crt
index a2408315c..a2408315c 100644
--- a/src/tests/data/nist_x509/test15/end.crt
+++ b/src/tests/data/x509/nist/test15/end.crt
diff --git a/src/tests/data/nist_x509/test15/int.crl b/src/tests/data/x509/nist/test15/int.crl
index 626049aaf..626049aaf 100644
--- a/src/tests/data/nist_x509/test15/int.crl
+++ b/src/tests/data/x509/nist/test15/int.crl
diff --git a/src/tests/data/nist_x509/test15/int.crt b/src/tests/data/x509/nist/test15/int.crt
index 23fb78c0f..23fb78c0f 100644
--- a/src/tests/data/nist_x509/test15/int.crt
+++ b/src/tests/data/x509/nist/test15/int.crt
diff --git a/src/tests/data/nist_x509/test16/end.crt b/src/tests/data/x509/nist/test16/end.crt
index 108a75d73..108a75d73 100644
--- a/src/tests/data/nist_x509/test16/end.crt
+++ b/src/tests/data/x509/nist/test16/end.crt
diff --git a/src/tests/data/nist_x509/test16/int.crl b/src/tests/data/x509/nist/test16/int.crl
index d345a338e..d345a338e 100644
--- a/src/tests/data/nist_x509/test16/int.crl
+++ b/src/tests/data/x509/nist/test16/int.crl
diff --git a/src/tests/data/nist_x509/test16/int.crt b/src/tests/data/x509/nist/test16/int.crt
index 6f2a332ad..6f2a332ad 100644
--- a/src/tests/data/nist_x509/test16/int.crt
+++ b/src/tests/data/x509/nist/test16/int.crt
diff --git a/src/tests/data/nist_x509/test17/end.crt b/src/tests/data/x509/nist/test17/end.crt
index b90340872..b90340872 100644
--- a/src/tests/data/nist_x509/test17/end.crt
+++ b/src/tests/data/x509/nist/test17/end.crt
diff --git a/src/tests/data/nist_x509/test17/int.crl b/src/tests/data/x509/nist/test17/int.crl
index 0b1ba6fda..0b1ba6fda 100644
--- a/src/tests/data/nist_x509/test17/int.crl
+++ b/src/tests/data/x509/nist/test17/int.crl
diff --git a/src/tests/data/nist_x509/test17/int.crt b/src/tests/data/x509/nist/test17/int.crt
index 25e7b48e5..25e7b48e5 100644
--- a/src/tests/data/nist_x509/test17/int.crt
+++ b/src/tests/data/x509/nist/test17/int.crt
diff --git a/src/tests/data/nist_x509/test18/end.crt b/src/tests/data/x509/nist/test18/end.crt
index 2edb51394..2edb51394 100644
--- a/src/tests/data/nist_x509/test18/end.crt
+++ b/src/tests/data/x509/nist/test18/end.crt
diff --git a/src/tests/data/nist_x509/test18/int.crl b/src/tests/data/x509/nist/test18/int.crl
index 2948246d7..2948246d7 100644
--- a/src/tests/data/nist_x509/test18/int.crl
+++ b/src/tests/data/x509/nist/test18/int.crl
diff --git a/src/tests/data/nist_x509/test18/int.crt b/src/tests/data/x509/nist/test18/int.crt
index eac3e8693..eac3e8693 100644
--- a/src/tests/data/nist_x509/test18/int.crt
+++ b/src/tests/data/x509/nist/test18/int.crt
diff --git a/src/tests/data/nist_x509/test19/end.crt b/src/tests/data/x509/nist/test19/end.crt
index a9c7a1fc6..a9c7a1fc6 100644
--- a/src/tests/data/nist_x509/test19/end.crt
+++ b/src/tests/data/x509/nist/test19/end.crt
diff --git a/src/tests/data/nist_x509/test19/int.crt b/src/tests/data/x509/nist/test19/int.crt
index eff60dd15..eff60dd15 100644
--- a/src/tests/data/nist_x509/test19/int.crt
+++ b/src/tests/data/x509/nist/test19/int.crt
diff --git a/src/tests/data/nist_x509/test20/end.crt b/src/tests/data/x509/nist/test20/end.crt
index b26e77c19..b26e77c19 100644
--- a/src/tests/data/nist_x509/test20/end.crt
+++ b/src/tests/data/x509/nist/test20/end.crt
diff --git a/src/tests/data/nist_x509/test20/int.crl b/src/tests/data/x509/nist/test20/int.crl
index 5755a2eae..5755a2eae 100644
--- a/src/tests/data/nist_x509/test20/int.crl
+++ b/src/tests/data/x509/nist/test20/int.crl
diff --git a/src/tests/data/nist_x509/test20/int.crt b/src/tests/data/x509/nist/test20/int.crt
index d7daa69ef..d7daa69ef 100644
--- a/src/tests/data/nist_x509/test20/int.crt
+++ b/src/tests/data/x509/nist/test20/int.crt
diff --git a/src/tests/data/nist_x509/test21/end.crt b/src/tests/data/x509/nist/test21/end.crt
index 798e5cf17..798e5cf17 100644
--- a/src/tests/data/nist_x509/test21/end.crt
+++ b/src/tests/data/x509/nist/test21/end.crt
diff --git a/src/tests/data/nist_x509/test21/int.crl b/src/tests/data/x509/nist/test21/int.crl
index ea3cbb9d8..ea3cbb9d8 100644
--- a/src/tests/data/nist_x509/test21/int.crl
+++ b/src/tests/data/x509/nist/test21/int.crl
diff --git a/src/tests/data/nist_x509/test21/int.crt b/src/tests/data/x509/nist/test21/int.crt
index 9082c4d77..9082c4d77 100644
--- a/src/tests/data/nist_x509/test21/int.crt
+++ b/src/tests/data/x509/nist/test21/int.crt
diff --git a/src/tests/data/nist_x509/test22/end.crt b/src/tests/data/x509/nist/test22/end.crt
index d130c7506..d130c7506 100644
--- a/src/tests/data/nist_x509/test22/end.crt
+++ b/src/tests/data/x509/nist/test22/end.crt
diff --git a/src/tests/data/nist_x509/test22/int.crl b/src/tests/data/x509/nist/test22/int.crl
index 07e18398d..07e18398d 100644
--- a/src/tests/data/nist_x509/test22/int.crl
+++ b/src/tests/data/x509/nist/test22/int.crl
diff --git a/src/tests/data/nist_x509/test22/int.crt b/src/tests/data/x509/nist/test22/int.crt
index d0f401bae..d0f401bae 100644
--- a/src/tests/data/nist_x509/test22/int.crt
+++ b/src/tests/data/x509/nist/test22/int.crt
diff --git a/src/tests/data/nist_x509/test23/end.crt b/src/tests/data/x509/nist/test23/end.crt
index 787941b16..787941b16 100644
--- a/src/tests/data/nist_x509/test23/end.crt
+++ b/src/tests/data/x509/nist/test23/end.crt
diff --git a/src/tests/data/nist_x509/test23/int.crl b/src/tests/data/x509/nist/test23/int.crl
index 2841be769..2841be769 100644
--- a/src/tests/data/nist_x509/test23/int.crl
+++ b/src/tests/data/x509/nist/test23/int.crl
diff --git a/src/tests/data/nist_x509/test23/int.crt b/src/tests/data/x509/nist/test23/int.crt
index 2890b3967..2890b3967 100644
--- a/src/tests/data/nist_x509/test23/int.crt
+++ b/src/tests/data/x509/nist/test23/int.crt
diff --git a/src/tests/data/nist_x509/test24/end.crt b/src/tests/data/x509/nist/test24/end.crt
index 0d145b2fa..0d145b2fa 100644
--- a/src/tests/data/nist_x509/test24/end.crt
+++ b/src/tests/data/x509/nist/test24/end.crt
diff --git a/src/tests/data/nist_x509/test24/int.crl b/src/tests/data/x509/nist/test24/int.crl
index f608de6bb..f608de6bb 100644
--- a/src/tests/data/nist_x509/test24/int.crl
+++ b/src/tests/data/x509/nist/test24/int.crl
diff --git a/src/tests/data/nist_x509/test24/int.crt b/src/tests/data/x509/nist/test24/int.crt
index a4633ee9a..a4633ee9a 100644
--- a/src/tests/data/nist_x509/test24/int.crt
+++ b/src/tests/data/x509/nist/test24/int.crt
diff --git a/src/tests/data/nist_x509/test25/end.crt b/src/tests/data/x509/nist/test25/end.crt
index d12670188..d12670188 100644
--- a/src/tests/data/nist_x509/test25/end.crt
+++ b/src/tests/data/x509/nist/test25/end.crt
diff --git a/src/tests/data/nist_x509/test25/int.crl b/src/tests/data/x509/nist/test25/int.crl
index 553e1bbd1..553e1bbd1 100644
--- a/src/tests/data/nist_x509/test25/int.crl
+++ b/src/tests/data/x509/nist/test25/int.crl
diff --git a/src/tests/data/nist_x509/test25/int.crt b/src/tests/data/x509/nist/test25/int.crt
index 5d06aac4a..5d06aac4a 100644
--- a/src/tests/data/nist_x509/test25/int.crt
+++ b/src/tests/data/x509/nist/test25/int.crt
diff --git a/src/tests/data/nist_x509/test26/end.crt b/src/tests/data/x509/nist/test26/end.crt
index 5abc96600..5abc96600 100644
--- a/src/tests/data/nist_x509/test26/end.crt
+++ b/src/tests/data/x509/nist/test26/end.crt
diff --git a/src/tests/data/nist_x509/test26/int.crl b/src/tests/data/x509/nist/test26/int.crl
index 9f2f1b0a8..9f2f1b0a8 100644
--- a/src/tests/data/nist_x509/test26/int.crl
+++ b/src/tests/data/x509/nist/test26/int.crl
diff --git a/src/tests/data/nist_x509/test26/int.crt b/src/tests/data/x509/nist/test26/int.crt
index e9c273a05..e9c273a05 100644
--- a/src/tests/data/nist_x509/test26/int.crt
+++ b/src/tests/data/x509/nist/test26/int.crt
diff --git a/src/tests/data/nist_x509/test27/end.crt b/src/tests/data/x509/nist/test27/end.crt
index 2147dbd3a..2147dbd3a 100644
--- a/src/tests/data/nist_x509/test27/end.crt
+++ b/src/tests/data/x509/nist/test27/end.crt
diff --git a/src/tests/data/nist_x509/test27/int.crl b/src/tests/data/x509/nist/test27/int.crl
index fd769e5f3..fd769e5f3 100644
--- a/src/tests/data/nist_x509/test27/int.crl
+++ b/src/tests/data/x509/nist/test27/int.crl
diff --git a/src/tests/data/nist_x509/test27/int.crt b/src/tests/data/x509/nist/test27/int.crt
index 4de4a9f51..4de4a9f51 100644
--- a/src/tests/data/nist_x509/test27/int.crt
+++ b/src/tests/data/x509/nist/test27/int.crt
diff --git a/src/tests/data/nist_x509/test28/end.crt b/src/tests/data/x509/nist/test28/end.crt
index c72c97b81..c72c97b81 100644
--- a/src/tests/data/nist_x509/test28/end.crt
+++ b/src/tests/data/x509/nist/test28/end.crt
diff --git a/src/tests/data/nist_x509/test28/int.crl b/src/tests/data/x509/nist/test28/int.crl
index 35e87eb0b..35e87eb0b 100644
--- a/src/tests/data/nist_x509/test28/int.crl
+++ b/src/tests/data/x509/nist/test28/int.crl
diff --git a/src/tests/data/nist_x509/test28/int.crt b/src/tests/data/x509/nist/test28/int.crt
index fee01f21e..fee01f21e 100644
--- a/src/tests/data/nist_x509/test28/int.crt
+++ b/src/tests/data/x509/nist/test28/int.crt
diff --git a/src/tests/data/nist_x509/test29/end.crt b/src/tests/data/x509/nist/test29/end.crt
index e4e2dd072..e4e2dd072 100644
--- a/src/tests/data/nist_x509/test29/end.crt
+++ b/src/tests/data/x509/nist/test29/end.crt
diff --git a/src/tests/data/nist_x509/test29/int.crl b/src/tests/data/x509/nist/test29/int.crl
index 2739bd933..2739bd933 100644
--- a/src/tests/data/nist_x509/test29/int.crl
+++ b/src/tests/data/x509/nist/test29/int.crl
diff --git a/src/tests/data/nist_x509/test29/int.crt b/src/tests/data/x509/nist/test29/int.crt
index e830043fd..e830043fd 100644
--- a/src/tests/data/nist_x509/test29/int.crt
+++ b/src/tests/data/x509/nist/test29/int.crt
diff --git a/src/tests/data/nist_x509/test30/end.crt b/src/tests/data/x509/nist/test30/end.crt
index abdc0381f..abdc0381f 100644
--- a/src/tests/data/nist_x509/test30/end.crt
+++ b/src/tests/data/x509/nist/test30/end.crt
diff --git a/src/tests/data/nist_x509/test30/int.crl b/src/tests/data/x509/nist/test30/int.crl
index fed695a3b..fed695a3b 100644
--- a/src/tests/data/nist_x509/test30/int.crl
+++ b/src/tests/data/x509/nist/test30/int.crl
diff --git a/src/tests/data/nist_x509/test30/int.crt b/src/tests/data/x509/nist/test30/int.crt
index 26fd2cb6a..26fd2cb6a 100644
--- a/src/tests/data/nist_x509/test30/int.crt
+++ b/src/tests/data/x509/nist/test30/int.crt
diff --git a/src/tests/data/nist_x509/test31/end.crt b/src/tests/data/x509/nist/test31/end.crt
index cd766ef7f..cd766ef7f 100644
--- a/src/tests/data/nist_x509/test31/end.crt
+++ b/src/tests/data/x509/nist/test31/end.crt
diff --git a/src/tests/data/nist_x509/test31/int.crl b/src/tests/data/x509/nist/test31/int.crl
index 9014141f9..9014141f9 100644
--- a/src/tests/data/nist_x509/test31/int.crl
+++ b/src/tests/data/x509/nist/test31/int.crl
diff --git a/src/tests/data/nist_x509/test31/int.crt b/src/tests/data/x509/nist/test31/int.crt
index 396947b15..396947b15 100644
--- a/src/tests/data/nist_x509/test31/int.crt
+++ b/src/tests/data/x509/nist/test31/int.crt
diff --git a/src/tests/data/nist_x509/test32/end.crt b/src/tests/data/x509/nist/test32/end.crt
index 3804a27b4..3804a27b4 100644
--- a/src/tests/data/nist_x509/test32/end.crt
+++ b/src/tests/data/x509/nist/test32/end.crt
diff --git a/src/tests/data/nist_x509/test32/int.crl b/src/tests/data/x509/nist/test32/int.crl
index 2e2e505a0..2e2e505a0 100644
--- a/src/tests/data/nist_x509/test32/int.crl
+++ b/src/tests/data/x509/nist/test32/int.crl
diff --git a/src/tests/data/nist_x509/test32/int.crt b/src/tests/data/x509/nist/test32/int.crt
index 6df3396b7..6df3396b7 100644
--- a/src/tests/data/nist_x509/test32/int.crt
+++ b/src/tests/data/x509/nist/test32/int.crt
diff --git a/src/tests/data/nist_x509/test33/end.crt b/src/tests/data/x509/nist/test33/end.crt
index 6ef1d03a8..6ef1d03a8 100644
--- a/src/tests/data/nist_x509/test33/end.crt
+++ b/src/tests/data/x509/nist/test33/end.crt
diff --git a/src/tests/data/nist_x509/test33/int.crl b/src/tests/data/x509/nist/test33/int.crl
index 4008e3d46..4008e3d46 100644
--- a/src/tests/data/nist_x509/test33/int.crl
+++ b/src/tests/data/x509/nist/test33/int.crl
diff --git a/src/tests/data/nist_x509/test33/int.crt b/src/tests/data/x509/nist/test33/int.crt
index ba183696e..ba183696e 100644
--- a/src/tests/data/nist_x509/test33/int.crt
+++ b/src/tests/data/x509/nist/test33/int.crt
diff --git a/src/tests/data/nist_x509/test34/end.crt b/src/tests/data/x509/nist/test34/end.crt
index 695de1cb4..695de1cb4 100644
--- a/src/tests/data/nist_x509/test34/end.crt
+++ b/src/tests/data/x509/nist/test34/end.crt
diff --git a/src/tests/data/nist_x509/test34/int.crl b/src/tests/data/x509/nist/test34/int.crl
index a8d11e788..a8d11e788 100644
--- a/src/tests/data/nist_x509/test34/int.crl
+++ b/src/tests/data/x509/nist/test34/int.crl
diff --git a/src/tests/data/nist_x509/test34/int.crt b/src/tests/data/x509/nist/test34/int.crt
index 5657ddaf6..5657ddaf6 100644
--- a/src/tests/data/nist_x509/test34/int.crt
+++ b/src/tests/data/x509/nist/test34/int.crt
diff --git a/src/tests/data/nist_x509/test35/end.crt b/src/tests/data/x509/nist/test35/end.crt
index 26846be18..26846be18 100644
--- a/src/tests/data/nist_x509/test35/end.crt
+++ b/src/tests/data/x509/nist/test35/end.crt
diff --git a/src/tests/data/nist_x509/test35/int.crl b/src/tests/data/x509/nist/test35/int.crl
index f7021d32c..f7021d32c 100644
--- a/src/tests/data/nist_x509/test35/int.crl
+++ b/src/tests/data/x509/nist/test35/int.crl
diff --git a/src/tests/data/nist_x509/test35/int.crt b/src/tests/data/x509/nist/test35/int.crt
index 6a6641823..6a6641823 100644
--- a/src/tests/data/nist_x509/test35/int.crt
+++ b/src/tests/data/x509/nist/test35/int.crt
diff --git a/src/tests/data/nist_x509/test36/end.crt b/src/tests/data/x509/nist/test36/end.crt
index ee6ec5f4b..ee6ec5f4b 100644
--- a/src/tests/data/nist_x509/test36/end.crt
+++ b/src/tests/data/x509/nist/test36/end.crt
diff --git a/src/tests/data/nist_x509/test36/int1.crl b/src/tests/data/x509/nist/test36/int1.crl
index d4ad1013d..d4ad1013d 100644
--- a/src/tests/data/nist_x509/test36/int1.crl
+++ b/src/tests/data/x509/nist/test36/int1.crl
diff --git a/src/tests/data/nist_x509/test36/int1.crt b/src/tests/data/x509/nist/test36/int1.crt
index a300e8d67..a300e8d67 100644
--- a/src/tests/data/nist_x509/test36/int1.crt
+++ b/src/tests/data/x509/nist/test36/int1.crt
diff --git a/src/tests/data/nist_x509/test36/int2.crl b/src/tests/data/x509/nist/test36/int2.crl
index d45cedcee..d45cedcee 100644
--- a/src/tests/data/nist_x509/test36/int2.crl
+++ b/src/tests/data/x509/nist/test36/int2.crl
diff --git a/src/tests/data/nist_x509/test36/int2.crt b/src/tests/data/x509/nist/test36/int2.crt
index 87c8253c3..87c8253c3 100644
--- a/src/tests/data/nist_x509/test36/int2.crt
+++ b/src/tests/data/x509/nist/test36/int2.crt
diff --git a/src/tests/data/nist_x509/test37/end.crt b/src/tests/data/x509/nist/test37/end.crt
index e5c5ae8c7..e5c5ae8c7 100644
--- a/src/tests/data/nist_x509/test37/end.crt
+++ b/src/tests/data/x509/nist/test37/end.crt
diff --git a/src/tests/data/nist_x509/test37/int1.crl b/src/tests/data/x509/nist/test37/int1.crl
index 6b488fdb8..6b488fdb8 100644
--- a/src/tests/data/nist_x509/test37/int1.crl
+++ b/src/tests/data/x509/nist/test37/int1.crl
diff --git a/src/tests/data/nist_x509/test37/int1.crt b/src/tests/data/x509/nist/test37/int1.crt
index 26b6b9605..26b6b9605 100644
--- a/src/tests/data/nist_x509/test37/int1.crt
+++ b/src/tests/data/x509/nist/test37/int1.crt
diff --git a/src/tests/data/nist_x509/test37/int2.crl b/src/tests/data/x509/nist/test37/int2.crl
index 724051124..724051124 100644
--- a/src/tests/data/nist_x509/test37/int2.crl
+++ b/src/tests/data/x509/nist/test37/int2.crl
diff --git a/src/tests/data/nist_x509/test37/int2.crt b/src/tests/data/x509/nist/test37/int2.crt
index c0e986a08..c0e986a08 100644
--- a/src/tests/data/nist_x509/test37/int2.crt
+++ b/src/tests/data/x509/nist/test37/int2.crt
diff --git a/src/tests/data/nist_x509/test38/end.crt b/src/tests/data/x509/nist/test38/end.crt
index 9331b90a2..9331b90a2 100644
--- a/src/tests/data/nist_x509/test38/end.crt
+++ b/src/tests/data/x509/nist/test38/end.crt
diff --git a/src/tests/data/nist_x509/test38/int1.crl b/src/tests/data/x509/nist/test38/int1.crl
index 81f75d4e5..81f75d4e5 100644
--- a/src/tests/data/nist_x509/test38/int1.crl
+++ b/src/tests/data/x509/nist/test38/int1.crl
diff --git a/src/tests/data/nist_x509/test38/int1.crt b/src/tests/data/x509/nist/test38/int1.crt
index c8ee614f4..c8ee614f4 100644
--- a/src/tests/data/nist_x509/test38/int1.crt
+++ b/src/tests/data/x509/nist/test38/int1.crt
diff --git a/src/tests/data/nist_x509/test38/int2.crl b/src/tests/data/x509/nist/test38/int2.crl
index ae1d7d5e8..ae1d7d5e8 100644
--- a/src/tests/data/nist_x509/test38/int2.crl
+++ b/src/tests/data/x509/nist/test38/int2.crl
diff --git a/src/tests/data/nist_x509/test38/int2.crt b/src/tests/data/x509/nist/test38/int2.crt
index 8d2834294..8d2834294 100644
--- a/src/tests/data/nist_x509/test38/int2.crt
+++ b/src/tests/data/x509/nist/test38/int2.crt
diff --git a/src/tests/data/nist_x509/test39/end.crt b/src/tests/data/x509/nist/test39/end.crt
index 57263d4cb..57263d4cb 100644
--- a/src/tests/data/nist_x509/test39/end.crt
+++ b/src/tests/data/x509/nist/test39/end.crt
diff --git a/src/tests/data/nist_x509/test39/int1.crl b/src/tests/data/x509/nist/test39/int1.crl
index f2a01385e..f2a01385e 100644
--- a/src/tests/data/nist_x509/test39/int1.crl
+++ b/src/tests/data/x509/nist/test39/int1.crl
diff --git a/src/tests/data/nist_x509/test39/int1.crt b/src/tests/data/x509/nist/test39/int1.crt
index b7003f7eb..b7003f7eb 100644
--- a/src/tests/data/nist_x509/test39/int1.crt
+++ b/src/tests/data/x509/nist/test39/int1.crt
diff --git a/src/tests/data/nist_x509/test39/int2.crl b/src/tests/data/x509/nist/test39/int2.crl
index b6672d85a..b6672d85a 100644
--- a/src/tests/data/nist_x509/test39/int2.crl
+++ b/src/tests/data/x509/nist/test39/int2.crl
diff --git a/src/tests/data/nist_x509/test39/int2.crt b/src/tests/data/x509/nist/test39/int2.crt
index c56ce57f0..c56ce57f0 100644
--- a/src/tests/data/nist_x509/test39/int2.crt
+++ b/src/tests/data/x509/nist/test39/int2.crt
diff --git a/src/tests/data/nist_x509/test39/int3.crl b/src/tests/data/x509/nist/test39/int3.crl
index 453420be8..453420be8 100644
--- a/src/tests/data/nist_x509/test39/int3.crl
+++ b/src/tests/data/x509/nist/test39/int3.crl
diff --git a/src/tests/data/nist_x509/test39/int3.crt b/src/tests/data/x509/nist/test39/int3.crt
index ce1224ada..ce1224ada 100644
--- a/src/tests/data/nist_x509/test39/int3.crt
+++ b/src/tests/data/x509/nist/test39/int3.crt
diff --git a/src/tests/data/nist_x509/test40/end.crt b/src/tests/data/x509/nist/test40/end.crt
index 24ce9e4d8..24ce9e4d8 100644
--- a/src/tests/data/nist_x509/test40/end.crt
+++ b/src/tests/data/x509/nist/test40/end.crt
diff --git a/src/tests/data/nist_x509/test40/int1.crl b/src/tests/data/x509/nist/test40/int1.crl
index 5bd6a9f83..5bd6a9f83 100644
--- a/src/tests/data/nist_x509/test40/int1.crl
+++ b/src/tests/data/x509/nist/test40/int1.crl
diff --git a/src/tests/data/nist_x509/test40/int1.crt b/src/tests/data/x509/nist/test40/int1.crt
index 5a8ac5006..5a8ac5006 100644
--- a/src/tests/data/nist_x509/test40/int1.crt
+++ b/src/tests/data/x509/nist/test40/int1.crt
diff --git a/src/tests/data/nist_x509/test40/int2.crl b/src/tests/data/x509/nist/test40/int2.crl
index dde5a124c..dde5a124c 100644
--- a/src/tests/data/nist_x509/test40/int2.crl
+++ b/src/tests/data/x509/nist/test40/int2.crl
diff --git a/src/tests/data/nist_x509/test40/int2.crt b/src/tests/data/x509/nist/test40/int2.crt
index 70e4d9092..70e4d9092 100644
--- a/src/tests/data/nist_x509/test40/int2.crt
+++ b/src/tests/data/x509/nist/test40/int2.crt
diff --git a/src/tests/data/nist_x509/test40/int3.crl b/src/tests/data/x509/nist/test40/int3.crl
index 713fa4bbf..713fa4bbf 100644
--- a/src/tests/data/nist_x509/test40/int3.crl
+++ b/src/tests/data/x509/nist/test40/int3.crl
diff --git a/src/tests/data/nist_x509/test40/int3.crt b/src/tests/data/x509/nist/test40/int3.crt
index a0c673453..a0c673453 100644
--- a/src/tests/data/nist_x509/test40/int3.crt
+++ b/src/tests/data/x509/nist/test40/int3.crt
diff --git a/src/tests/data/nist_x509/test41/end.crt b/src/tests/data/x509/nist/test41/end.crt
index b88e38eb9..b88e38eb9 100644
--- a/src/tests/data/nist_x509/test41/end.crt
+++ b/src/tests/data/x509/nist/test41/end.crt
diff --git a/src/tests/data/nist_x509/test41/int1.crl b/src/tests/data/x509/nist/test41/int1.crl
index 2d4c41521..2d4c41521 100644
--- a/src/tests/data/nist_x509/test41/int1.crl
+++ b/src/tests/data/x509/nist/test41/int1.crl
diff --git a/src/tests/data/nist_x509/test41/int1.crt b/src/tests/data/x509/nist/test41/int1.crt
index 4b96b2afb..4b96b2afb 100644
--- a/src/tests/data/nist_x509/test41/int1.crt
+++ b/src/tests/data/x509/nist/test41/int1.crt
diff --git a/src/tests/data/nist_x509/test41/int2.crl b/src/tests/data/x509/nist/test41/int2.crl
index e389a7fd9..e389a7fd9 100644
--- a/src/tests/data/nist_x509/test41/int2.crl
+++ b/src/tests/data/x509/nist/test41/int2.crl
diff --git a/src/tests/data/nist_x509/test41/int2.crt b/src/tests/data/x509/nist/test41/int2.crt
index 4b1edc710..4b1edc710 100644
--- a/src/tests/data/nist_x509/test41/int2.crt
+++ b/src/tests/data/x509/nist/test41/int2.crt
diff --git a/src/tests/data/nist_x509/test41/int3.crl b/src/tests/data/x509/nist/test41/int3.crl
index d26dc1b75..d26dc1b75 100644
--- a/src/tests/data/nist_x509/test41/int3.crl
+++ b/src/tests/data/x509/nist/test41/int3.crl
diff --git a/src/tests/data/nist_x509/test41/int3.crt b/src/tests/data/x509/nist/test41/int3.crt
index 6012a3a5b..6012a3a5b 100644
--- a/src/tests/data/nist_x509/test41/int3.crt
+++ b/src/tests/data/x509/nist/test41/int3.crt
diff --git a/src/tests/data/nist_x509/test42/end.crt b/src/tests/data/x509/nist/test42/end.crt
index 9815c5d5c..9815c5d5c 100644
--- a/src/tests/data/nist_x509/test42/end.crt
+++ b/src/tests/data/x509/nist/test42/end.crt
diff --git a/src/tests/data/nist_x509/test42/int1.crl b/src/tests/data/x509/nist/test42/int1.crl
index d4f21dbe3..d4f21dbe3 100644
--- a/src/tests/data/nist_x509/test42/int1.crl
+++ b/src/tests/data/x509/nist/test42/int1.crl
diff --git a/src/tests/data/nist_x509/test42/int1.crt b/src/tests/data/x509/nist/test42/int1.crt
index f344a9f27..f344a9f27 100644
--- a/src/tests/data/nist_x509/test42/int1.crt
+++ b/src/tests/data/x509/nist/test42/int1.crt
diff --git a/src/tests/data/nist_x509/test42/int2.crl b/src/tests/data/x509/nist/test42/int2.crl
index 32906057a..32906057a 100644
--- a/src/tests/data/nist_x509/test42/int2.crl
+++ b/src/tests/data/x509/nist/test42/int2.crl
diff --git a/src/tests/data/nist_x509/test42/int2.crt b/src/tests/data/x509/nist/test42/int2.crt
index a2fd05ccb..a2fd05ccb 100644
--- a/src/tests/data/nist_x509/test42/int2.crt
+++ b/src/tests/data/x509/nist/test42/int2.crt
diff --git a/src/tests/data/nist_x509/test42/int3.crl b/src/tests/data/x509/nist/test42/int3.crl
index ee2b2b18c..ee2b2b18c 100644
--- a/src/tests/data/nist_x509/test42/int3.crl
+++ b/src/tests/data/x509/nist/test42/int3.crl
diff --git a/src/tests/data/nist_x509/test42/int3.crt b/src/tests/data/x509/nist/test42/int3.crt
index 8104a65f8..8104a65f8 100644
--- a/src/tests/data/nist_x509/test42/int3.crt
+++ b/src/tests/data/x509/nist/test42/int3.crt
diff --git a/src/tests/data/nist_x509/test42/int4.crl b/src/tests/data/x509/nist/test42/int4.crl
index 7602160fa..7602160fa 100644
--- a/src/tests/data/nist_x509/test42/int4.crl
+++ b/src/tests/data/x509/nist/test42/int4.crl
diff --git a/src/tests/data/nist_x509/test42/int4.crt b/src/tests/data/x509/nist/test42/int4.crt
index 5b6ffbd4e..5b6ffbd4e 100644
--- a/src/tests/data/nist_x509/test42/int4.crt
+++ b/src/tests/data/x509/nist/test42/int4.crt
diff --git a/src/tests/data/nist_x509/test43/end.crt b/src/tests/data/x509/nist/test43/end.crt
index 9465ea5bf..9465ea5bf 100644
--- a/src/tests/data/nist_x509/test43/end.crt
+++ b/src/tests/data/x509/nist/test43/end.crt
diff --git a/src/tests/data/nist_x509/test43/int1.crl b/src/tests/data/x509/nist/test43/int1.crl
index 4ce26fdb9..4ce26fdb9 100644
--- a/src/tests/data/nist_x509/test43/int1.crl
+++ b/src/tests/data/x509/nist/test43/int1.crl
diff --git a/src/tests/data/nist_x509/test43/int1.crt b/src/tests/data/x509/nist/test43/int1.crt
index e18a4e168..e18a4e168 100644
--- a/src/tests/data/nist_x509/test43/int1.crt
+++ b/src/tests/data/x509/nist/test43/int1.crt
diff --git a/src/tests/data/nist_x509/test43/int2.crl b/src/tests/data/x509/nist/test43/int2.crl
index 9820bc6f6..9820bc6f6 100644
--- a/src/tests/data/nist_x509/test43/int2.crl
+++ b/src/tests/data/x509/nist/test43/int2.crl
diff --git a/src/tests/data/nist_x509/test43/int2.crt b/src/tests/data/x509/nist/test43/int2.crt
index 1521fce98..1521fce98 100644
--- a/src/tests/data/nist_x509/test43/int2.crt
+++ b/src/tests/data/x509/nist/test43/int2.crt
diff --git a/src/tests/data/nist_x509/test43/int3.crl b/src/tests/data/x509/nist/test43/int3.crl
index b8dfd8dfd..b8dfd8dfd 100644
--- a/src/tests/data/nist_x509/test43/int3.crl
+++ b/src/tests/data/x509/nist/test43/int3.crl
diff --git a/src/tests/data/nist_x509/test43/int3.crt b/src/tests/data/x509/nist/test43/int3.crt
index 30b9706d8..30b9706d8 100644
--- a/src/tests/data/nist_x509/test43/int3.crt
+++ b/src/tests/data/x509/nist/test43/int3.crt
diff --git a/src/tests/data/nist_x509/test43/int4.crl b/src/tests/data/x509/nist/test43/int4.crl
index 4b4136209..4b4136209 100644
--- a/src/tests/data/nist_x509/test43/int4.crl
+++ b/src/tests/data/x509/nist/test43/int4.crl
diff --git a/src/tests/data/nist_x509/test43/int4.crt b/src/tests/data/x509/nist/test43/int4.crt
index 949562273..949562273 100644
--- a/src/tests/data/nist_x509/test43/int4.crt
+++ b/src/tests/data/x509/nist/test43/int4.crt
diff --git a/src/tests/data/nist_x509/test44/end.crt b/src/tests/data/x509/nist/test44/end.crt
index 5fc9bec78..5fc9bec78 100644
--- a/src/tests/data/nist_x509/test44/end.crt
+++ b/src/tests/data/x509/nist/test44/end.crt
diff --git a/src/tests/data/nist_x509/test44/int1.crl b/src/tests/data/x509/nist/test44/int1.crl
index 2d4478cfc..2d4478cfc 100644
--- a/src/tests/data/nist_x509/test44/int1.crl
+++ b/src/tests/data/x509/nist/test44/int1.crl
diff --git a/src/tests/data/nist_x509/test44/int1.crt b/src/tests/data/x509/nist/test44/int1.crt
index fbfd2a4d0..fbfd2a4d0 100644
--- a/src/tests/data/nist_x509/test44/int1.crt
+++ b/src/tests/data/x509/nist/test44/int1.crt
diff --git a/src/tests/data/nist_x509/test44/int2.crl b/src/tests/data/x509/nist/test44/int2.crl
index 780ef7c0f..780ef7c0f 100644
--- a/src/tests/data/nist_x509/test44/int2.crl
+++ b/src/tests/data/x509/nist/test44/int2.crl
diff --git a/src/tests/data/nist_x509/test44/int2.crt b/src/tests/data/x509/nist/test44/int2.crt
index 26f319399..26f319399 100644
--- a/src/tests/data/nist_x509/test44/int2.crt
+++ b/src/tests/data/x509/nist/test44/int2.crt
diff --git a/src/tests/data/nist_x509/test44/int3.crl b/src/tests/data/x509/nist/test44/int3.crl
index 5e5267ed9..5e5267ed9 100644
--- a/src/tests/data/nist_x509/test44/int3.crl
+++ b/src/tests/data/x509/nist/test44/int3.crl
diff --git a/src/tests/data/nist_x509/test44/int3.crt b/src/tests/data/x509/nist/test44/int3.crt
index 7f62ef6ef..7f62ef6ef 100644
--- a/src/tests/data/nist_x509/test44/int3.crt
+++ b/src/tests/data/x509/nist/test44/int3.crt
diff --git a/src/tests/data/nist_x509/test44/int4.crl b/src/tests/data/x509/nist/test44/int4.crl
index 5d775f551..5d775f551 100644
--- a/src/tests/data/nist_x509/test44/int4.crl
+++ b/src/tests/data/x509/nist/test44/int4.crl
diff --git a/src/tests/data/nist_x509/test44/int4.crt b/src/tests/data/x509/nist/test44/int4.crt
index 76d6111ec..76d6111ec 100644
--- a/src/tests/data/nist_x509/test44/int4.crt
+++ b/src/tests/data/x509/nist/test44/int4.crt
diff --git a/src/tests/data/nist_x509/test45/end.crt b/src/tests/data/x509/nist/test45/end.crt
index a2ddb0430..a2ddb0430 100644
--- a/src/tests/data/nist_x509/test45/end.crt
+++ b/src/tests/data/x509/nist/test45/end.crt
diff --git a/src/tests/data/nist_x509/test45/int1.crl b/src/tests/data/x509/nist/test45/int1.crl
index 079062c14..079062c14 100644
--- a/src/tests/data/nist_x509/test45/int1.crl
+++ b/src/tests/data/x509/nist/test45/int1.crl
diff --git a/src/tests/data/nist_x509/test45/int1.crt b/src/tests/data/x509/nist/test45/int1.crt
index 90ee8e3fe..90ee8e3fe 100644
--- a/src/tests/data/nist_x509/test45/int1.crt
+++ b/src/tests/data/x509/nist/test45/int1.crt
diff --git a/src/tests/data/nist_x509/test45/int2.crl b/src/tests/data/x509/nist/test45/int2.crl
index 7c12bd0c3..7c12bd0c3 100644
--- a/src/tests/data/nist_x509/test45/int2.crl
+++ b/src/tests/data/x509/nist/test45/int2.crl
diff --git a/src/tests/data/nist_x509/test45/int2.crt b/src/tests/data/x509/nist/test45/int2.crt
index 7fc0467ca..7fc0467ca 100644
--- a/src/tests/data/nist_x509/test45/int2.crt
+++ b/src/tests/data/x509/nist/test45/int2.crt
diff --git a/src/tests/data/nist_x509/test45/int3.crl b/src/tests/data/x509/nist/test45/int3.crl
index f81b5042f..f81b5042f 100644
--- a/src/tests/data/nist_x509/test45/int3.crl
+++ b/src/tests/data/x509/nist/test45/int3.crl
diff --git a/src/tests/data/nist_x509/test45/int3.crt b/src/tests/data/x509/nist/test45/int3.crt
index fb9500f12..fb9500f12 100644
--- a/src/tests/data/nist_x509/test45/int3.crt
+++ b/src/tests/data/x509/nist/test45/int3.crt
diff --git a/src/tests/data/nist_x509/test45/int4.crl b/src/tests/data/x509/nist/test45/int4.crl
index 9e67a4a91..9e67a4a91 100644
--- a/src/tests/data/nist_x509/test45/int4.crl
+++ b/src/tests/data/x509/nist/test45/int4.crl
diff --git a/src/tests/data/nist_x509/test45/int4.crt b/src/tests/data/x509/nist/test45/int4.crt
index 60b6c9133..60b6c9133 100644
--- a/src/tests/data/nist_x509/test45/int4.crt
+++ b/src/tests/data/x509/nist/test45/int4.crt
diff --git a/src/tests/data/nist_x509/test46/end.crt b/src/tests/data/x509/nist/test46/end.crt
index 39ebf20a3..39ebf20a3 100644
--- a/src/tests/data/nist_x509/test46/end.crt
+++ b/src/tests/data/x509/nist/test46/end.crt
diff --git a/src/tests/data/nist_x509/test46/int1.crl b/src/tests/data/x509/nist/test46/int1.crl
index f9a2236bc..f9a2236bc 100644
--- a/src/tests/data/nist_x509/test46/int1.crl
+++ b/src/tests/data/x509/nist/test46/int1.crl
diff --git a/src/tests/data/nist_x509/test46/int1.crt b/src/tests/data/x509/nist/test46/int1.crt
index 985a5d575..985a5d575 100644
--- a/src/tests/data/nist_x509/test46/int1.crt
+++ b/src/tests/data/x509/nist/test46/int1.crt
diff --git a/src/tests/data/nist_x509/test46/int2.crl b/src/tests/data/x509/nist/test46/int2.crl
index 02e82c48a..02e82c48a 100644
--- a/src/tests/data/nist_x509/test46/int2.crl
+++ b/src/tests/data/x509/nist/test46/int2.crl
diff --git a/src/tests/data/nist_x509/test46/int2.crt b/src/tests/data/x509/nist/test46/int2.crt
index ade64339c..ade64339c 100644
--- a/src/tests/data/nist_x509/test46/int2.crt
+++ b/src/tests/data/x509/nist/test46/int2.crt
diff --git a/src/tests/data/nist_x509/test46/int3.crl b/src/tests/data/x509/nist/test46/int3.crl
index ddd59a80c..ddd59a80c 100644
--- a/src/tests/data/nist_x509/test46/int3.crl
+++ b/src/tests/data/x509/nist/test46/int3.crl
diff --git a/src/tests/data/nist_x509/test46/int3.crt b/src/tests/data/x509/nist/test46/int3.crt
index 6e33faaaa..6e33faaaa 100644
--- a/src/tests/data/nist_x509/test46/int3.crt
+++ b/src/tests/data/x509/nist/test46/int3.crt
diff --git a/src/tests/data/nist_x509/test46/int4.crl b/src/tests/data/x509/nist/test46/int4.crl
index 3dedfb11e..3dedfb11e 100644
--- a/src/tests/data/nist_x509/test46/int4.crl
+++ b/src/tests/data/x509/nist/test46/int4.crl
diff --git a/src/tests/data/nist_x509/test46/int4.crt b/src/tests/data/x509/nist/test46/int4.crt
index 1b3fc5726..1b3fc5726 100644
--- a/src/tests/data/nist_x509/test46/int4.crt
+++ b/src/tests/data/x509/nist/test46/int4.crt
diff --git a/src/tests/data/nist_x509/test47/end.crt b/src/tests/data/x509/nist/test47/end.crt
index 7337bc5b5..7337bc5b5 100644
--- a/src/tests/data/nist_x509/test47/end.crt
+++ b/src/tests/data/x509/nist/test47/end.crt
diff --git a/src/tests/data/nist_x509/test47/int1.crl b/src/tests/data/x509/nist/test47/int1.crl
index 938e3f412..938e3f412 100644
--- a/src/tests/data/nist_x509/test47/int1.crl
+++ b/src/tests/data/x509/nist/test47/int1.crl
diff --git a/src/tests/data/nist_x509/test47/int1.crt b/src/tests/data/x509/nist/test47/int1.crt
index bf3e22239..bf3e22239 100644
--- a/src/tests/data/nist_x509/test47/int1.crt
+++ b/src/tests/data/x509/nist/test47/int1.crt
diff --git a/src/tests/data/nist_x509/test47/int2.crl b/src/tests/data/x509/nist/test47/int2.crl
index f715c112d..f715c112d 100644
--- a/src/tests/data/nist_x509/test47/int2.crl
+++ b/src/tests/data/x509/nist/test47/int2.crl
diff --git a/src/tests/data/nist_x509/test47/int2.crt b/src/tests/data/x509/nist/test47/int2.crt
index 1b7854e33..1b7854e33 100644
--- a/src/tests/data/nist_x509/test47/int2.crt
+++ b/src/tests/data/x509/nist/test47/int2.crt
diff --git a/src/tests/data/nist_x509/test47/int3.crl b/src/tests/data/x509/nist/test47/int3.crl
index 786aa5032..786aa5032 100644
--- a/src/tests/data/nist_x509/test47/int3.crl
+++ b/src/tests/data/x509/nist/test47/int3.crl
diff --git a/src/tests/data/nist_x509/test47/int3.crt b/src/tests/data/x509/nist/test47/int3.crt
index 62eb3b220..62eb3b220 100644
--- a/src/tests/data/nist_x509/test47/int3.crt
+++ b/src/tests/data/x509/nist/test47/int3.crt
diff --git a/src/tests/data/nist_x509/test47/int4.crl b/src/tests/data/x509/nist/test47/int4.crl
index 925b78324..925b78324 100644
--- a/src/tests/data/nist_x509/test47/int4.crl
+++ b/src/tests/data/x509/nist/test47/int4.crl
diff --git a/src/tests/data/nist_x509/test47/int4.crt b/src/tests/data/x509/nist/test47/int4.crt
index 1c9a14344..1c9a14344 100644
--- a/src/tests/data/nist_x509/test47/int4.crt
+++ b/src/tests/data/x509/nist/test47/int4.crt
diff --git a/src/tests/data/nist_x509/test48/end.crt b/src/tests/data/x509/nist/test48/end.crt
index 933f27912..933f27912 100644
--- a/src/tests/data/nist_x509/test48/end.crt
+++ b/src/tests/data/x509/nist/test48/end.crt
diff --git a/src/tests/data/nist_x509/test48/int.crl b/src/tests/data/x509/nist/test48/int.crl
index 89ad99cd1..89ad99cd1 100644
--- a/src/tests/data/nist_x509/test48/int.crl
+++ b/src/tests/data/x509/nist/test48/int.crl
diff --git a/src/tests/data/nist_x509/test48/int.crt b/src/tests/data/x509/nist/test48/int.crt
index b2eefc4ae..b2eefc4ae 100644
--- a/src/tests/data/nist_x509/test48/int.crt
+++ b/src/tests/data/x509/nist/test48/int.crt
diff --git a/src/tests/data/nist_x509/test49/end.crt b/src/tests/data/x509/nist/test49/end.crt
index d0e4a26e6..d0e4a26e6 100644
--- a/src/tests/data/nist_x509/test49/end.crt
+++ b/src/tests/data/x509/nist/test49/end.crt
diff --git a/src/tests/data/nist_x509/test49/int.crl b/src/tests/data/x509/nist/test49/int.crl
index 1defb1ef5..1defb1ef5 100644
--- a/src/tests/data/nist_x509/test49/int.crl
+++ b/src/tests/data/x509/nist/test49/int.crl
diff --git a/src/tests/data/nist_x509/test49/int.crt b/src/tests/data/x509/nist/test49/int.crt
index 037f68d8b..037f68d8b 100644
--- a/src/tests/data/nist_x509/test49/int.crt
+++ b/src/tests/data/x509/nist/test49/int.crt
diff --git a/src/tests/data/nist_x509/test50/end.crt b/src/tests/data/x509/nist/test50/end.crt
index ed9b0a3ce..ed9b0a3ce 100644
--- a/src/tests/data/nist_x509/test50/end.crt
+++ b/src/tests/data/x509/nist/test50/end.crt
diff --git a/src/tests/data/nist_x509/test50/int.crl b/src/tests/data/x509/nist/test50/int.crl
index 0c7cdfee5..0c7cdfee5 100644
--- a/src/tests/data/nist_x509/test50/int.crl
+++ b/src/tests/data/x509/nist/test50/int.crl
diff --git a/src/tests/data/nist_x509/test50/int.crt b/src/tests/data/x509/nist/test50/int.crt
index 74c41f021..74c41f021 100644
--- a/src/tests/data/nist_x509/test50/int.crt
+++ b/src/tests/data/x509/nist/test50/int.crt
diff --git a/src/tests/data/nist_x509/test51/end.crt b/src/tests/data/x509/nist/test51/end.crt
index 12ebc74c7..12ebc74c7 100644
--- a/src/tests/data/nist_x509/test51/end.crt
+++ b/src/tests/data/x509/nist/test51/end.crt
diff --git a/src/tests/data/nist_x509/test51/int.crl b/src/tests/data/x509/nist/test51/int.crl
index c887c9a2c..c887c9a2c 100644
--- a/src/tests/data/nist_x509/test51/int.crl
+++ b/src/tests/data/x509/nist/test51/int.crl
diff --git a/src/tests/data/nist_x509/test51/int.crt b/src/tests/data/x509/nist/test51/int.crt
index def7e90d1..def7e90d1 100644
--- a/src/tests/data/nist_x509/test51/int.crt
+++ b/src/tests/data/x509/nist/test51/int.crt
diff --git a/src/tests/data/nist_x509/test52/end.crt b/src/tests/data/x509/nist/test52/end.crt
index 0bd19185f..0bd19185f 100644
--- a/src/tests/data/nist_x509/test52/end.crt
+++ b/src/tests/data/x509/nist/test52/end.crt
diff --git a/src/tests/data/nist_x509/test52/int.crl b/src/tests/data/x509/nist/test52/int.crl
index ec220874c..ec220874c 100644
--- a/src/tests/data/nist_x509/test52/int.crl
+++ b/src/tests/data/x509/nist/test52/int.crl
diff --git a/src/tests/data/nist_x509/test52/int.crt b/src/tests/data/x509/nist/test52/int.crt
index 3429d7cf7..3429d7cf7 100644
--- a/src/tests/data/nist_x509/test52/int.crt
+++ b/src/tests/data/x509/nist/test52/int.crt
diff --git a/src/tests/data/nist_x509/test53/end.crt b/src/tests/data/x509/nist/test53/end.crt
index 9b99dc562..9b99dc562 100644
--- a/src/tests/data/nist_x509/test53/end.crt
+++ b/src/tests/data/x509/nist/test53/end.crt
diff --git a/src/tests/data/nist_x509/test53/int.crl b/src/tests/data/x509/nist/test53/int.crl
index 79fed242a..79fed242a 100644
--- a/src/tests/data/nist_x509/test53/int.crl
+++ b/src/tests/data/x509/nist/test53/int.crl
diff --git a/src/tests/data/nist_x509/test53/int.crt b/src/tests/data/x509/nist/test53/int.crt
index 72eac943f..72eac943f 100644
--- a/src/tests/data/nist_x509/test53/int.crt
+++ b/src/tests/data/x509/nist/test53/int.crt
diff --git a/src/tests/data/nist_x509/test54/end.crt b/src/tests/data/x509/nist/test54/end.crt
index 185f019cf..185f019cf 100644
--- a/src/tests/data/nist_x509/test54/end.crt
+++ b/src/tests/data/x509/nist/test54/end.crt
diff --git a/src/tests/data/nist_x509/test54/int1.crl b/src/tests/data/x509/nist/test54/int1.crl
index 5b1c4439c..5b1c4439c 100644
--- a/src/tests/data/nist_x509/test54/int1.crl
+++ b/src/tests/data/x509/nist/test54/int1.crl
diff --git a/src/tests/data/nist_x509/test54/int1.crt b/src/tests/data/x509/nist/test54/int1.crt
index 140ef0669..140ef0669 100644
--- a/src/tests/data/nist_x509/test54/int1.crt
+++ b/src/tests/data/x509/nist/test54/int1.crt
diff --git a/src/tests/data/nist_x509/test54/int2.crl b/src/tests/data/x509/nist/test54/int2.crl
index c531566a9..c531566a9 100644
--- a/src/tests/data/nist_x509/test54/int2.crl
+++ b/src/tests/data/x509/nist/test54/int2.crl
diff --git a/src/tests/data/nist_x509/test54/int2.crt b/src/tests/data/x509/nist/test54/int2.crt
index 506761d71..506761d71 100644
--- a/src/tests/data/nist_x509/test54/int2.crt
+++ b/src/tests/data/x509/nist/test54/int2.crt
diff --git a/src/tests/data/nist_x509/test55/end.crt b/src/tests/data/x509/nist/test55/end.crt
index 923d4c5a8..923d4c5a8 100644
--- a/src/tests/data/nist_x509/test55/end.crt
+++ b/src/tests/data/x509/nist/test55/end.crt
diff --git a/src/tests/data/nist_x509/test55/int1.crl b/src/tests/data/x509/nist/test55/int1.crl
index 371821e5e..371821e5e 100644
--- a/src/tests/data/nist_x509/test55/int1.crl
+++ b/src/tests/data/x509/nist/test55/int1.crl
diff --git a/src/tests/data/nist_x509/test55/int1.crt b/src/tests/data/x509/nist/test55/int1.crt
index 7597faf7f..7597faf7f 100644
--- a/src/tests/data/nist_x509/test55/int1.crt
+++ b/src/tests/data/x509/nist/test55/int1.crt
diff --git a/src/tests/data/nist_x509/test55/int2.crl b/src/tests/data/x509/nist/test55/int2.crl
index 9a242916e..9a242916e 100644
--- a/src/tests/data/nist_x509/test55/int2.crl
+++ b/src/tests/data/x509/nist/test55/int2.crl
diff --git a/src/tests/data/nist_x509/test55/int2.crt b/src/tests/data/x509/nist/test55/int2.crt
index 982235a21..982235a21 100644
--- a/src/tests/data/nist_x509/test55/int2.crt
+++ b/src/tests/data/x509/nist/test55/int2.crt
diff --git a/src/tests/data/nist_x509/test56/end.crt b/src/tests/data/x509/nist/test56/end.crt
index d1dc82186..d1dc82186 100644
--- a/src/tests/data/nist_x509/test56/end.crt
+++ b/src/tests/data/x509/nist/test56/end.crt
diff --git a/src/tests/data/nist_x509/test56/int.crl b/src/tests/data/x509/nist/test56/int.crl
index 840b209e0..840b209e0 100644
--- a/src/tests/data/nist_x509/test56/int.crl
+++ b/src/tests/data/x509/nist/test56/int.crl
diff --git a/src/tests/data/nist_x509/test56/int.crt b/src/tests/data/x509/nist/test56/int.crt
index 9b622cabd..9b622cabd 100644
--- a/src/tests/data/nist_x509/test56/int.crt
+++ b/src/tests/data/x509/nist/test56/int.crt
diff --git a/src/tests/data/nist_x509/test57/end.crt b/src/tests/data/x509/nist/test57/end.crt
index 2f939384a..2f939384a 100644
--- a/src/tests/data/nist_x509/test57/end.crt
+++ b/src/tests/data/x509/nist/test57/end.crt
diff --git a/src/tests/data/nist_x509/test57/int.crl b/src/tests/data/x509/nist/test57/int.crl
index a0be908ae..a0be908ae 100644
--- a/src/tests/data/nist_x509/test57/int.crl
+++ b/src/tests/data/x509/nist/test57/int.crl
diff --git a/src/tests/data/nist_x509/test57/int.crt b/src/tests/data/x509/nist/test57/int.crt
index 79f6d6b8a..79f6d6b8a 100644
--- a/src/tests/data/nist_x509/test57/int.crt
+++ b/src/tests/data/x509/nist/test57/int.crt
diff --git a/src/tests/data/nist_x509/test58/end.crt b/src/tests/data/x509/nist/test58/end.crt
index 674009c83..674009c83 100644
--- a/src/tests/data/nist_x509/test58/end.crt
+++ b/src/tests/data/x509/nist/test58/end.crt
diff --git a/src/tests/data/nist_x509/test58/int1.crl b/src/tests/data/x509/nist/test58/int1.crl
index aa9dc9d7f..aa9dc9d7f 100644
--- a/src/tests/data/nist_x509/test58/int1.crl
+++ b/src/tests/data/x509/nist/test58/int1.crl
diff --git a/src/tests/data/nist_x509/test58/int1.crt b/src/tests/data/x509/nist/test58/int1.crt
index 42e983122..42e983122 100644
--- a/src/tests/data/nist_x509/test58/int1.crt
+++ b/src/tests/data/x509/nist/test58/int1.crt
diff --git a/src/tests/data/nist_x509/test58/int2.crl b/src/tests/data/x509/nist/test58/int2.crl
index 7dec9c1eb..7dec9c1eb 100644
--- a/src/tests/data/nist_x509/test58/int2.crl
+++ b/src/tests/data/x509/nist/test58/int2.crl
diff --git a/src/tests/data/nist_x509/test58/int2.crt b/src/tests/data/x509/nist/test58/int2.crt
index 08eb808c4..08eb808c4 100644
--- a/src/tests/data/nist_x509/test58/int2.crt
+++ b/src/tests/data/x509/nist/test58/int2.crt
diff --git a/src/tests/data/nist_x509/test58/int3.crl b/src/tests/data/x509/nist/test58/int3.crl
index bec634480..bec634480 100644
--- a/src/tests/data/nist_x509/test58/int3.crl
+++ b/src/tests/data/x509/nist/test58/int3.crl
diff --git a/src/tests/data/nist_x509/test58/int3.crt b/src/tests/data/x509/nist/test58/int3.crt
index 6c5e6efae..6c5e6efae 100644
--- a/src/tests/data/nist_x509/test58/int3.crt
+++ b/src/tests/data/x509/nist/test58/int3.crt
diff --git a/src/tests/data/nist_x509/test59/end.crt b/src/tests/data/x509/nist/test59/end.crt
index da5ee9e69..da5ee9e69 100644
--- a/src/tests/data/nist_x509/test59/end.crt
+++ b/src/tests/data/x509/nist/test59/end.crt
diff --git a/src/tests/data/nist_x509/test59/int1.crl b/src/tests/data/x509/nist/test59/int1.crl
index eb7f0e883..eb7f0e883 100644
--- a/src/tests/data/nist_x509/test59/int1.crl
+++ b/src/tests/data/x509/nist/test59/int1.crl
diff --git a/src/tests/data/nist_x509/test59/int1.crt b/src/tests/data/x509/nist/test59/int1.crt
index be0ee21f2..be0ee21f2 100644
--- a/src/tests/data/nist_x509/test59/int1.crt
+++ b/src/tests/data/x509/nist/test59/int1.crt
diff --git a/src/tests/data/nist_x509/test59/int2.crl b/src/tests/data/x509/nist/test59/int2.crl
index 2b2fe9ced..2b2fe9ced 100644
--- a/src/tests/data/nist_x509/test59/int2.crl
+++ b/src/tests/data/x509/nist/test59/int2.crl
diff --git a/src/tests/data/nist_x509/test59/int2.crt b/src/tests/data/x509/nist/test59/int2.crt
index a84a7ba5e..a84a7ba5e 100644
--- a/src/tests/data/nist_x509/test59/int2.crt
+++ b/src/tests/data/x509/nist/test59/int2.crt
diff --git a/src/tests/data/nist_x509/test59/int3.crl b/src/tests/data/x509/nist/test59/int3.crl
index cb7885c17..cb7885c17 100644
--- a/src/tests/data/nist_x509/test59/int3.crl
+++ b/src/tests/data/x509/nist/test59/int3.crl
diff --git a/src/tests/data/nist_x509/test59/int3.crt b/src/tests/data/x509/nist/test59/int3.crt
index 0b13f9f9b..0b13f9f9b 100644
--- a/src/tests/data/nist_x509/test59/int3.crt
+++ b/src/tests/data/x509/nist/test59/int3.crt
diff --git a/src/tests/data/nist_x509/test60/end.crt b/src/tests/data/x509/nist/test60/end.crt
index 8741105ea..8741105ea 100644
--- a/src/tests/data/nist_x509/test60/end.crt
+++ b/src/tests/data/x509/nist/test60/end.crt
diff --git a/src/tests/data/nist_x509/test60/int1.crl b/src/tests/data/x509/nist/test60/int1.crl
index e778e911d..e778e911d 100644
--- a/src/tests/data/nist_x509/test60/int1.crl
+++ b/src/tests/data/x509/nist/test60/int1.crl
diff --git a/src/tests/data/nist_x509/test60/int1.crt b/src/tests/data/x509/nist/test60/int1.crt
index 01d844201..01d844201 100644
--- a/src/tests/data/nist_x509/test60/int1.crt
+++ b/src/tests/data/x509/nist/test60/int1.crt
diff --git a/src/tests/data/nist_x509/test60/int2.crl b/src/tests/data/x509/nist/test60/int2.crl
index 4f4ac6bc0..4f4ac6bc0 100644
--- a/src/tests/data/nist_x509/test60/int2.crl
+++ b/src/tests/data/x509/nist/test60/int2.crl
diff --git a/src/tests/data/nist_x509/test60/int2.crt b/src/tests/data/x509/nist/test60/int2.crt
index 0054dc622..0054dc622 100644
--- a/src/tests/data/nist_x509/test60/int2.crt
+++ b/src/tests/data/x509/nist/test60/int2.crt
diff --git a/src/tests/data/nist_x509/test60/int3.crl b/src/tests/data/x509/nist/test60/int3.crl
index 0b568e7cc..0b568e7cc 100644
--- a/src/tests/data/nist_x509/test60/int3.crl
+++ b/src/tests/data/x509/nist/test60/int3.crl
diff --git a/src/tests/data/nist_x509/test60/int3.crt b/src/tests/data/x509/nist/test60/int3.crt
index 6fff65cc7..6fff65cc7 100644
--- a/src/tests/data/nist_x509/test60/int3.crt
+++ b/src/tests/data/x509/nist/test60/int3.crt
diff --git a/src/tests/data/nist_x509/test60/int4.crl b/src/tests/data/x509/nist/test60/int4.crl
index 4cf694a98..4cf694a98 100644
--- a/src/tests/data/nist_x509/test60/int4.crl
+++ b/src/tests/data/x509/nist/test60/int4.crl
diff --git a/src/tests/data/nist_x509/test60/int4.crt b/src/tests/data/x509/nist/test60/int4.crt
index c5eebca96..c5eebca96 100644
--- a/src/tests/data/nist_x509/test60/int4.crt
+++ b/src/tests/data/x509/nist/test60/int4.crt
diff --git a/src/tests/data/nist_x509/test61/end.crt b/src/tests/data/x509/nist/test61/end.crt
index 7be023caf..7be023caf 100644
--- a/src/tests/data/nist_x509/test61/end.crt
+++ b/src/tests/data/x509/nist/test61/end.crt
diff --git a/src/tests/data/nist_x509/test61/int1.crl b/src/tests/data/x509/nist/test61/int1.crl
index 05c2809aa..05c2809aa 100644
--- a/src/tests/data/nist_x509/test61/int1.crl
+++ b/src/tests/data/x509/nist/test61/int1.crl
diff --git a/src/tests/data/nist_x509/test61/int1.crt b/src/tests/data/x509/nist/test61/int1.crt
index ba03f6c24..ba03f6c24 100644
--- a/src/tests/data/nist_x509/test61/int1.crt
+++ b/src/tests/data/x509/nist/test61/int1.crt
diff --git a/src/tests/data/nist_x509/test61/int2.crl b/src/tests/data/x509/nist/test61/int2.crl
index d74b9168c..d74b9168c 100644
--- a/src/tests/data/nist_x509/test61/int2.crl
+++ b/src/tests/data/x509/nist/test61/int2.crl
diff --git a/src/tests/data/nist_x509/test61/int2.crt b/src/tests/data/x509/nist/test61/int2.crt
index bd4e40ea3..bd4e40ea3 100644
--- a/src/tests/data/nist_x509/test61/int2.crt
+++ b/src/tests/data/x509/nist/test61/int2.crt
diff --git a/src/tests/data/nist_x509/test61/int3.crl b/src/tests/data/x509/nist/test61/int3.crl
index 7e6e83fb2..7e6e83fb2 100644
--- a/src/tests/data/nist_x509/test61/int3.crl
+++ b/src/tests/data/x509/nist/test61/int3.crl
diff --git a/src/tests/data/nist_x509/test61/int3.crt b/src/tests/data/x509/nist/test61/int3.crt
index 4f9342b20..4f9342b20 100644
--- a/src/tests/data/nist_x509/test61/int3.crt
+++ b/src/tests/data/x509/nist/test61/int3.crt
diff --git a/src/tests/data/nist_x509/test61/int4.crl b/src/tests/data/x509/nist/test61/int4.crl
index 7161f4192..7161f4192 100644
--- a/src/tests/data/nist_x509/test61/int4.crl
+++ b/src/tests/data/x509/nist/test61/int4.crl
diff --git a/src/tests/data/nist_x509/test61/int4.crt b/src/tests/data/x509/nist/test61/int4.crt
index 5962eedfa..5962eedfa 100644
--- a/src/tests/data/nist_x509/test61/int4.crt
+++ b/src/tests/data/x509/nist/test61/int4.crt
diff --git a/src/tests/data/nist_x509/test62/end.crt b/src/tests/data/x509/nist/test62/end.crt
index bff8ea4cb..bff8ea4cb 100644
--- a/src/tests/data/nist_x509/test62/end.crt
+++ b/src/tests/data/x509/nist/test62/end.crt
diff --git a/src/tests/data/nist_x509/test62/int1.crl b/src/tests/data/x509/nist/test62/int1.crl
index aa26a419a..aa26a419a 100644
--- a/src/tests/data/nist_x509/test62/int1.crl
+++ b/src/tests/data/x509/nist/test62/int1.crl
diff --git a/src/tests/data/nist_x509/test62/int1.crt b/src/tests/data/x509/nist/test62/int1.crt
index aee257d7e..aee257d7e 100644
--- a/src/tests/data/nist_x509/test62/int1.crt
+++ b/src/tests/data/x509/nist/test62/int1.crt
diff --git a/src/tests/data/nist_x509/test62/int2.crl b/src/tests/data/x509/nist/test62/int2.crl
index 61e712f0d..61e712f0d 100644
--- a/src/tests/data/nist_x509/test62/int2.crl
+++ b/src/tests/data/x509/nist/test62/int2.crl
diff --git a/src/tests/data/nist_x509/test62/int2.crt b/src/tests/data/x509/nist/test62/int2.crt
index a62d9a026..a62d9a026 100644
--- a/src/tests/data/nist_x509/test62/int2.crt
+++ b/src/tests/data/x509/nist/test62/int2.crt
diff --git a/src/tests/data/nist_x509/test62/int3.crl b/src/tests/data/x509/nist/test62/int3.crl
index 09707fd7b..09707fd7b 100644
--- a/src/tests/data/nist_x509/test62/int3.crl
+++ b/src/tests/data/x509/nist/test62/int3.crl
diff --git a/src/tests/data/nist_x509/test62/int3.crt b/src/tests/data/x509/nist/test62/int3.crt
index aa91f3427..aa91f3427 100644
--- a/src/tests/data/nist_x509/test62/int3.crt
+++ b/src/tests/data/x509/nist/test62/int3.crt
diff --git a/src/tests/data/nist_x509/test62/int4.crl b/src/tests/data/x509/nist/test62/int4.crl
index 997a057f2..997a057f2 100644
--- a/src/tests/data/nist_x509/test62/int4.crl
+++ b/src/tests/data/x509/nist/test62/int4.crl
diff --git a/src/tests/data/nist_x509/test62/int4.crt b/src/tests/data/x509/nist/test62/int4.crt
index 744603003..744603003 100644
--- a/src/tests/data/nist_x509/test62/int4.crt
+++ b/src/tests/data/x509/nist/test62/int4.crt
diff --git a/src/tests/data/nist_x509/test63/end.crt b/src/tests/data/x509/nist/test63/end.crt
index 16c1c687d..16c1c687d 100644
--- a/src/tests/data/nist_x509/test63/end.crt
+++ b/src/tests/data/x509/nist/test63/end.crt
diff --git a/src/tests/data/nist_x509/test63/int1.crl b/src/tests/data/x509/nist/test63/int1.crl
index 40c4afc45..40c4afc45 100644
--- a/src/tests/data/nist_x509/test63/int1.crl
+++ b/src/tests/data/x509/nist/test63/int1.crl
diff --git a/src/tests/data/nist_x509/test63/int1.crt b/src/tests/data/x509/nist/test63/int1.crt
index 6b3f6eb4b..6b3f6eb4b 100644
--- a/src/tests/data/nist_x509/test63/int1.crt
+++ b/src/tests/data/x509/nist/test63/int1.crt
diff --git a/src/tests/data/nist_x509/test63/int2.crl b/src/tests/data/x509/nist/test63/int2.crl
index 7bffd4661..7bffd4661 100644
--- a/src/tests/data/nist_x509/test63/int2.crl
+++ b/src/tests/data/x509/nist/test63/int2.crl
diff --git a/src/tests/data/nist_x509/test63/int2.crt b/src/tests/data/x509/nist/test63/int2.crt
index f2e88f9fe..f2e88f9fe 100644
--- a/src/tests/data/nist_x509/test63/int2.crt
+++ b/src/tests/data/x509/nist/test63/int2.crt
diff --git a/src/tests/data/nist_x509/test63/int3.crl b/src/tests/data/x509/nist/test63/int3.crl
index 20f503c6b..20f503c6b 100644
--- a/src/tests/data/nist_x509/test63/int3.crl
+++ b/src/tests/data/x509/nist/test63/int3.crl
diff --git a/src/tests/data/nist_x509/test63/int3.crt b/src/tests/data/x509/nist/test63/int3.crt
index 2d636dd43..2d636dd43 100644
--- a/src/tests/data/nist_x509/test63/int3.crt
+++ b/src/tests/data/x509/nist/test63/int3.crt
diff --git a/src/tests/data/nist_x509/test63/int4.crl b/src/tests/data/x509/nist/test63/int4.crl
index 71e622907..71e622907 100644
--- a/src/tests/data/nist_x509/test63/int4.crl
+++ b/src/tests/data/x509/nist/test63/int4.crl
diff --git a/src/tests/data/nist_x509/test63/int4.crt b/src/tests/data/x509/nist/test63/int4.crt
index a0ed3a167..a0ed3a167 100644
--- a/src/tests/data/nist_x509/test63/int4.crt
+++ b/src/tests/data/x509/nist/test63/int4.crt
diff --git a/src/tests/data/nist_x509/test64/end.crt b/src/tests/data/x509/nist/test64/end.crt
index 771423eca..771423eca 100644
--- a/src/tests/data/nist_x509/test64/end.crt
+++ b/src/tests/data/x509/nist/test64/end.crt
diff --git a/src/tests/data/nist_x509/test64/int.crl b/src/tests/data/x509/nist/test64/int.crl
index 0e3e2bd95..0e3e2bd95 100644
--- a/src/tests/data/nist_x509/test64/int.crl
+++ b/src/tests/data/x509/nist/test64/int.crl
diff --git a/src/tests/data/nist_x509/test64/int.crt b/src/tests/data/x509/nist/test64/int.crt
index 1ae82584e..1ae82584e 100644
--- a/src/tests/data/nist_x509/test64/int.crt
+++ b/src/tests/data/x509/nist/test64/int.crt
diff --git a/src/tests/data/nist_x509/test65/end.crt b/src/tests/data/x509/nist/test65/end.crt
index 29d51a7f9..29d51a7f9 100644
--- a/src/tests/data/nist_x509/test65/end.crt
+++ b/src/tests/data/x509/nist/test65/end.crt
diff --git a/src/tests/data/nist_x509/test65/int.crl b/src/tests/data/x509/nist/test65/int.crl
index bd2d906ff..bd2d906ff 100644
--- a/src/tests/data/nist_x509/test65/int.crl
+++ b/src/tests/data/x509/nist/test65/int.crl
diff --git a/src/tests/data/nist_x509/test65/int1.crt b/src/tests/data/x509/nist/test65/int1.crt
index 214c839fe..214c839fe 100644
--- a/src/tests/data/nist_x509/test65/int1.crt
+++ b/src/tests/data/x509/nist/test65/int1.crt
diff --git a/src/tests/data/nist_x509/test65/int2.crt b/src/tests/data/x509/nist/test65/int2.crt
index 57c2e5914..57c2e5914 100644
--- a/src/tests/data/nist_x509/test65/int2.crt
+++ b/src/tests/data/x509/nist/test65/int2.crt
diff --git a/src/tests/data/nist_x509/test66/end.crt b/src/tests/data/x509/nist/test66/end.crt
index ccdb0e086..ccdb0e086 100644
--- a/src/tests/data/nist_x509/test66/end.crt
+++ b/src/tests/data/x509/nist/test66/end.crt
diff --git a/src/tests/data/nist_x509/test66/int.crl b/src/tests/data/x509/nist/test66/int.crl
index f80b444e2..f80b444e2 100644
--- a/src/tests/data/nist_x509/test66/int.crl
+++ b/src/tests/data/x509/nist/test66/int.crl
diff --git a/src/tests/data/nist_x509/test66/int.crt b/src/tests/data/x509/nist/test66/int.crt
index 23f8b17c2..23f8b17c2 100644
--- a/src/tests/data/nist_x509/test66/int.crt
+++ b/src/tests/data/x509/nist/test66/int.crt
diff --git a/src/tests/data/nist_x509/test67/end.crt b/src/tests/data/x509/nist/test67/end.crt
index 85d5508db..85d5508db 100644
--- a/src/tests/data/nist_x509/test67/end.crt
+++ b/src/tests/data/x509/nist/test67/end.crt
diff --git a/src/tests/data/nist_x509/test67/int.crt b/src/tests/data/x509/nist/test67/int.crt
index 92a4b3a95..92a4b3a95 100644
--- a/src/tests/data/nist_x509/test67/int.crt
+++ b/src/tests/data/x509/nist/test67/int.crt
diff --git a/src/tests/data/nist_x509/test67/int1.crl b/src/tests/data/x509/nist/test67/int1.crl
index 3fe834938..3fe834938 100644
--- a/src/tests/data/nist_x509/test67/int1.crl
+++ b/src/tests/data/x509/nist/test67/int1.crl
diff --git a/src/tests/data/nist_x509/test67/int2.crl b/src/tests/data/x509/nist/test67/int2.crl
index 15593fa84..15593fa84 100644
--- a/src/tests/data/nist_x509/test67/int2.crl
+++ b/src/tests/data/x509/nist/test67/int2.crl
diff --git a/src/tests/data/nist_x509/test68/end.crt b/src/tests/data/x509/nist/test68/end.crt
index bddd72da6..bddd72da6 100644
--- a/src/tests/data/nist_x509/test68/end.crt
+++ b/src/tests/data/x509/nist/test68/end.crt
diff --git a/src/tests/data/nist_x509/test68/int1.crl b/src/tests/data/x509/nist/test68/int1.crl
index fdbf8ea0c..fdbf8ea0c 100644
--- a/src/tests/data/nist_x509/test68/int1.crl
+++ b/src/tests/data/x509/nist/test68/int1.crl
diff --git a/src/tests/data/nist_x509/test68/int1.crt b/src/tests/data/x509/nist/test68/int1.crt
index 4bc8127b3..4bc8127b3 100644
--- a/src/tests/data/nist_x509/test68/int1.crt
+++ b/src/tests/data/x509/nist/test68/int1.crt
diff --git a/src/tests/data/nist_x509/test68/int2.crl b/src/tests/data/x509/nist/test68/int2.crl
index 33b764094..33b764094 100644
--- a/src/tests/data/nist_x509/test68/int2.crl
+++ b/src/tests/data/x509/nist/test68/int2.crl
diff --git a/src/tests/data/nist_x509/test68/int2.crt b/src/tests/data/x509/nist/test68/int2.crt
index 1ca8d5c32..1ca8d5c32 100644
--- a/src/tests/data/nist_x509/test68/int2.crt
+++ b/src/tests/data/x509/nist/test68/int2.crt
diff --git a/src/tests/data/nist_x509/test69/end.crt b/src/tests/data/x509/nist/test69/end.crt
index 00fc716dc..00fc716dc 100644
--- a/src/tests/data/nist_x509/test69/end.crt
+++ b/src/tests/data/x509/nist/test69/end.crt
diff --git a/src/tests/data/nist_x509/test69/int.crl b/src/tests/data/x509/nist/test69/int.crl
index fc09d351a..fc09d351a 100644
--- a/src/tests/data/nist_x509/test69/int.crl
+++ b/src/tests/data/x509/nist/test69/int.crl
diff --git a/src/tests/data/nist_x509/test69/int.crt b/src/tests/data/x509/nist/test69/int.crt
index 6c19ee09e..6c19ee09e 100644
--- a/src/tests/data/nist_x509/test69/int.crt
+++ b/src/tests/data/x509/nist/test69/int.crt
diff --git a/src/tests/data/nist_x509/test70/end.crt b/src/tests/data/x509/nist/test70/end.crt
index c576960be..c576960be 100644
--- a/src/tests/data/nist_x509/test70/end.crt
+++ b/src/tests/data/x509/nist/test70/end.crt
diff --git a/src/tests/data/nist_x509/test70/int1.crl b/src/tests/data/x509/nist/test70/int1.crl
index 77dafb909..77dafb909 100644
--- a/src/tests/data/nist_x509/test70/int1.crl
+++ b/src/tests/data/x509/nist/test70/int1.crl
diff --git a/src/tests/data/nist_x509/test70/int1.crt b/src/tests/data/x509/nist/test70/int1.crt
index 5509c5438..5509c5438 100644
--- a/src/tests/data/nist_x509/test70/int1.crt
+++ b/src/tests/data/x509/nist/test70/int1.crt
diff --git a/src/tests/data/nist_x509/test70/int2.crl b/src/tests/data/x509/nist/test70/int2.crl
index 4e22f3966..4e22f3966 100644
--- a/src/tests/data/nist_x509/test70/int2.crl
+++ b/src/tests/data/x509/nist/test70/int2.crl
diff --git a/src/tests/data/nist_x509/test70/int2.crt b/src/tests/data/x509/nist/test70/int2.crt
index 9af80b8e4..9af80b8e4 100644
--- a/src/tests/data/nist_x509/test70/int2.crt
+++ b/src/tests/data/x509/nist/test70/int2.crt
diff --git a/src/tests/data/nist_x509/test71/end.crt b/src/tests/data/x509/nist/test71/end.crt
index 0cc1718ee..0cc1718ee 100644
--- a/src/tests/data/nist_x509/test71/end.crt
+++ b/src/tests/data/x509/nist/test71/end.crt
diff --git a/src/tests/data/nist_x509/test71/int.crl b/src/tests/data/x509/nist/test71/int.crl
index c34a95df1..c34a95df1 100644
--- a/src/tests/data/nist_x509/test71/int.crl
+++ b/src/tests/data/x509/nist/test71/int.crl
diff --git a/src/tests/data/nist_x509/test71/int.crt b/src/tests/data/x509/nist/test71/int.crt
index 07076019c..07076019c 100644
--- a/src/tests/data/nist_x509/test71/int.crt
+++ b/src/tests/data/x509/nist/test71/int.crt
diff --git a/src/tests/data/nist_x509/test72/end.crt b/src/tests/data/x509/nist/test72/end.crt
index 6c61375d8..6c61375d8 100644
--- a/src/tests/data/nist_x509/test72/end.crt
+++ b/src/tests/data/x509/nist/test72/end.crt
diff --git a/src/tests/data/nist_x509/test72/int.crl b/src/tests/data/x509/nist/test72/int.crl
index 643141b37..643141b37 100644
--- a/src/tests/data/nist_x509/test72/int.crl
+++ b/src/tests/data/x509/nist/test72/int.crl
diff --git a/src/tests/data/nist_x509/test72/int.crt b/src/tests/data/x509/nist/test72/int.crt
index 36b1f2052..36b1f2052 100644
--- a/src/tests/data/nist_x509/test72/int.crt
+++ b/src/tests/data/x509/nist/test72/int.crt
diff --git a/src/tests/data/nist_x509/test73/end.crt b/src/tests/data/x509/nist/test73/end.crt
index 9bae5325f..9bae5325f 100644
--- a/src/tests/data/nist_x509/test73/end.crt
+++ b/src/tests/data/x509/nist/test73/end.crt
diff --git a/src/tests/data/nist_x509/test73/int.crl b/src/tests/data/x509/nist/test73/int.crl
index 6b76dc0b8..6b76dc0b8 100644
--- a/src/tests/data/nist_x509/test73/int.crl
+++ b/src/tests/data/x509/nist/test73/int.crl
diff --git a/src/tests/data/nist_x509/test73/int.crt b/src/tests/data/x509/nist/test73/int.crt
index ff6df2598..ff6df2598 100644
--- a/src/tests/data/nist_x509/test73/int.crt
+++ b/src/tests/data/x509/nist/test73/int.crt
diff --git a/src/tests/data/nist_x509/test74/end.crt b/src/tests/data/x509/nist/test74/end.crt
index 93e05bd1e..93e05bd1e 100644
--- a/src/tests/data/nist_x509/test74/end.crt
+++ b/src/tests/data/x509/nist/test74/end.crt
diff --git a/src/tests/data/nist_x509/test74/int.crl b/src/tests/data/x509/nist/test74/int.crl
index 8733b183c..8733b183c 100644
--- a/src/tests/data/nist_x509/test74/int.crl
+++ b/src/tests/data/x509/nist/test74/int.crl
diff --git a/src/tests/data/nist_x509/test74/int.crt b/src/tests/data/x509/nist/test74/int.crt
index c9258148d..c9258148d 100644
--- a/src/tests/data/nist_x509/test74/int.crt
+++ b/src/tests/data/x509/nist/test74/int.crt
diff --git a/src/tests/data/nist_x509/test75/end.crt b/src/tests/data/x509/nist/test75/end.crt
index 7d8179be0..7d8179be0 100644
--- a/src/tests/data/nist_x509/test75/end.crt
+++ b/src/tests/data/x509/nist/test75/end.crt
diff --git a/src/tests/data/nist_x509/test75/int.crl b/src/tests/data/x509/nist/test75/int.crl
index 19f472c7f..19f472c7f 100644
--- a/src/tests/data/nist_x509/test75/int.crl
+++ b/src/tests/data/x509/nist/test75/int.crl
diff --git a/src/tests/data/nist_x509/test75/int.crt b/src/tests/data/x509/nist/test75/int.crt
index 4a4c27e8c..4a4c27e8c 100644
--- a/src/tests/data/nist_x509/test75/int.crt
+++ b/src/tests/data/x509/nist/test75/int.crt
diff --git a/src/tests/data/nist_x509/test76/end.crt b/src/tests/data/x509/nist/test76/end.crt
index bde477d89..bde477d89 100644
--- a/src/tests/data/nist_x509/test76/end.crt
+++ b/src/tests/data/x509/nist/test76/end.crt
diff --git a/src/tests/data/nist_x509/test76/int.crl b/src/tests/data/x509/nist/test76/int.crl
index dbbbd43be..dbbbd43be 100644
--- a/src/tests/data/nist_x509/test76/int.crl
+++ b/src/tests/data/x509/nist/test76/int.crl
diff --git a/src/tests/data/nist_x509/test76/int.crt b/src/tests/data/x509/nist/test76/int.crt
index ab1c64390..ab1c64390 100644
--- a/src/tests/data/nist_x509/test76/int.crt
+++ b/src/tests/data/x509/nist/test76/int.crt
diff --git a/src/tests/data/ocsp/geotrust.pem b/src/tests/data/x509/ocsp/geotrust.pem
index 33cc0023e..33cc0023e 100644
--- a/src/tests/data/ocsp/geotrust.pem
+++ b/src/tests/data/x509/ocsp/geotrust.pem
diff --git a/src/tests/data/ocsp/gmail.pem b/src/tests/data/x509/ocsp/gmail.pem
index f96928a64..f96928a64 100644
--- a/src/tests/data/ocsp/gmail.pem
+++ b/src/tests/data/x509/ocsp/gmail.pem
diff --git a/src/tests/data/ocsp/google_g2.pem b/src/tests/data/x509/ocsp/google_g2.pem
index b663266fc..b663266fc 100644
--- a/src/tests/data/ocsp/google_g2.pem
+++ b/src/tests/data/x509/ocsp/google_g2.pem
diff --git a/src/tests/data/ocsp/identrust.pem b/src/tests/data/x509/ocsp/identrust.pem
index b2e43c938..b2e43c938 100644
--- a/src/tests/data/ocsp/identrust.pem
+++ b/src/tests/data/x509/ocsp/identrust.pem
diff --git a/src/tests/data/ocsp/letsencrypt.pem b/src/tests/data/x509/ocsp/letsencrypt.pem
index 0002462ce..0002462ce 100644
--- a/src/tests/data/ocsp/letsencrypt.pem
+++ b/src/tests/data/x509/ocsp/letsencrypt.pem
diff --git a/src/tests/data/ocsp/randombit.pem b/src/tests/data/x509/ocsp/randombit.pem
index d5986c21c..d5986c21c 100644
--- a/src/tests/data/ocsp/randombit.pem
+++ b/src/tests/data/x509/ocsp/randombit.pem
diff --git a/src/tests/data/ocsp/randombit_ocsp.der b/src/tests/data/x509/ocsp/randombit_ocsp.der
index 93d1c6287..93d1c6287 100644
--- a/src/tests/data/ocsp/randombit_ocsp.der
+++ b/src/tests/data/x509/ocsp/randombit_ocsp.der
diff --git a/src/tests/data/ocsp/resp1.der b/src/tests/data/x509/ocsp/resp1.der
index dd5420378..dd5420378 100644
--- a/src/tests/data/ocsp/resp1.der
+++ b/src/tests/data/x509/ocsp/resp1.der
diff --git a/src/tests/data/ocsp/resp2.der b/src/tests/data/x509/ocsp/resp2.der
index ea993bf5d..ea993bf5d 100644
--- a/src/tests/data/ocsp/resp2.der
+++ b/src/tests/data/x509/ocsp/resp2.der
diff --git a/src/tests/data/ocsp/resp3.der b/src/tests/data/x509/ocsp/resp3.der
index 416678cae..416678cae 100644
--- a/src/tests/data/ocsp/resp3.der
+++ b/src/tests/data/x509/ocsp/resp3.der
diff --git a/src/tests/data/pss_x509/01/README.txt b/src/tests/data/x509/pss_certs/01/README.txt
index 300dbea58..300dbea58 100644
--- a/src/tests/data/pss_x509/01/README.txt
+++ b/src/tests/data/x509/pss_certs/01/README.txt
diff --git a/src/tests/data/pss_x509/01/end.crt b/src/tests/data/x509/pss_certs/01/end.crt
index 017738f90..017738f90 100644
--- a/src/tests/data/pss_x509/01/end.crt
+++ b/src/tests/data/x509/pss_certs/01/end.crt
diff --git a/src/tests/data/pss_x509/01/root.crt b/src/tests/data/x509/pss_certs/01/root.crt
index bc0d14590..bc0d14590 100644
--- a/src/tests/data/pss_x509/01/root.crt
+++ b/src/tests/data/x509/pss_certs/01/root.crt
diff --git a/src/tests/data/pss_x509/02/README.txt b/src/tests/data/x509/pss_certs/02/README.txt
index ec0a7e431..ec0a7e431 100644
--- a/src/tests/data/pss_x509/02/README.txt
+++ b/src/tests/data/x509/pss_certs/02/README.txt
diff --git a/src/tests/data/pss_x509/02/end.crt b/src/tests/data/x509/pss_certs/02/end.crt
index b94b89126..b94b89126 100644
--- a/src/tests/data/pss_x509/02/end.crt
+++ b/src/tests/data/x509/pss_certs/02/end.crt
diff --git a/src/tests/data/pss_x509/02/root.crt b/src/tests/data/x509/pss_certs/02/root.crt
index f069139d3..f069139d3 100644
--- a/src/tests/data/pss_x509/02/root.crt
+++ b/src/tests/data/x509/pss_certs/02/root.crt
diff --git a/src/tests/data/pss_x509/03/end.crt b/src/tests/data/x509/pss_certs/03/end.crt
index f6298057d..f6298057d 100644
--- a/src/tests/data/pss_x509/03/end.crt
+++ b/src/tests/data/x509/pss_certs/03/end.crt
diff --git a/src/tests/data/pss_x509/03/root.crt b/src/tests/data/x509/pss_certs/03/root.crt
index deb03ade9..deb03ade9 100644
--- a/src/tests/data/pss_x509/03/root.crt
+++ b/src/tests/data/x509/pss_certs/03/root.crt
diff --git a/src/tests/data/pss_x509/04/end.crt b/src/tests/data/x509/pss_certs/04/end.crt
index b4269b27f..b4269b27f 100644
--- a/src/tests/data/pss_x509/04/end.crt
+++ b/src/tests/data/x509/pss_certs/04/end.crt
diff --git a/src/tests/data/pss_x509/04/root.crt b/src/tests/data/x509/pss_certs/04/root.crt
index deb03ade9..deb03ade9 100644
--- a/src/tests/data/pss_x509/04/root.crt
+++ b/src/tests/data/x509/pss_certs/04/root.crt
diff --git a/src/tests/data/pss_x509/05/end.crt b/src/tests/data/x509/pss_certs/05/end.crt
index f47043633..f47043633 100644
--- a/src/tests/data/pss_x509/05/end.crt
+++ b/src/tests/data/x509/pss_certs/05/end.crt
diff --git a/src/tests/data/pss_x509/05/root.crt b/src/tests/data/x509/pss_certs/05/root.crt
index f990c8434..f990c8434 100644
--- a/src/tests/data/pss_x509/05/root.crt
+++ b/src/tests/data/x509/pss_certs/05/root.crt
diff --git a/src/tests/data/pss_x509/06/end.crt b/src/tests/data/x509/pss_certs/06/end.crt
index b6824290c..b6824290c 100644
--- a/src/tests/data/pss_x509/06/end.crt
+++ b/src/tests/data/x509/pss_certs/06/end.crt
diff --git a/src/tests/data/pss_x509/06/root.crt b/src/tests/data/x509/pss_certs/06/root.crt
index f990c8434..f990c8434 100644
--- a/src/tests/data/pss_x509/06/root.crt
+++ b/src/tests/data/x509/pss_certs/06/root.crt
diff --git a/src/tests/data/pss_x509/07/end.crt b/src/tests/data/x509/pss_certs/07/end.crt
index b27704edd..b27704edd 100644
--- a/src/tests/data/pss_x509/07/end.crt
+++ b/src/tests/data/x509/pss_certs/07/end.crt
diff --git a/src/tests/data/pss_x509/07/root.crt b/src/tests/data/x509/pss_certs/07/root.crt
index f990c8434..f990c8434 100644
--- a/src/tests/data/pss_x509/07/root.crt
+++ b/src/tests/data/x509/pss_certs/07/root.crt
diff --git a/src/tests/data/pss_x509/08/end.crt b/src/tests/data/x509/pss_certs/08/end.crt
index c75b64a57..c75b64a57 100644
--- a/src/tests/data/pss_x509/08/end.crt
+++ b/src/tests/data/x509/pss_certs/08/end.crt
diff --git a/src/tests/data/pss_x509/08/root.crt b/src/tests/data/x509/pss_certs/08/root.crt
index f990c8434..f990c8434 100644
--- a/src/tests/data/pss_x509/08/root.crt
+++ b/src/tests/data/x509/pss_certs/08/root.crt
diff --git a/src/tests/data/pss_x509/09/end.crt b/src/tests/data/x509/pss_certs/09/end.crt
index b0c5df2bd..b0c5df2bd 100644
--- a/src/tests/data/pss_x509/09/end.crt
+++ b/src/tests/data/x509/pss_certs/09/end.crt
diff --git a/src/tests/data/pss_x509/09/root.crt b/src/tests/data/x509/pss_certs/09/root.crt
index f990c8434..f990c8434 100644
--- a/src/tests/data/pss_x509/09/root.crt
+++ b/src/tests/data/x509/pss_certs/09/root.crt
diff --git a/src/tests/data/pss_x509/10/end.crt b/src/tests/data/x509/pss_certs/10/end.crt
index 916ab1999..916ab1999 100644
--- a/src/tests/data/pss_x509/10/end.crt
+++ b/src/tests/data/x509/pss_certs/10/end.crt
diff --git a/src/tests/data/pss_x509/10/root.crt b/src/tests/data/x509/pss_certs/10/root.crt
index f990c8434..f990c8434 100644
--- a/src/tests/data/pss_x509/10/root.crt
+++ b/src/tests/data/x509/pss_certs/10/root.crt
diff --git a/src/tests/data/pss_x509/100/end.crt b/src/tests/data/x509/pss_certs/100/end.crt
index 4ce5c8732..4ce5c8732 100644
--- a/src/tests/data/pss_x509/100/end.crt
+++ b/src/tests/data/x509/pss_certs/100/end.crt
diff --git a/src/tests/data/pss_x509/100/root.crt b/src/tests/data/x509/pss_certs/100/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/100/root.crt
+++ b/src/tests/data/x509/pss_certs/100/root.crt
diff --git a/src/tests/data/pss_x509/101/end.crt b/src/tests/data/x509/pss_certs/101/end.crt
index 1b05f313a..1b05f313a 100644
--- a/src/tests/data/pss_x509/101/end.crt
+++ b/src/tests/data/x509/pss_certs/101/end.crt
diff --git a/src/tests/data/pss_x509/101/root.crt b/src/tests/data/x509/pss_certs/101/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/101/root.crt
+++ b/src/tests/data/x509/pss_certs/101/root.crt
diff --git a/src/tests/data/pss_x509/102/end.crt b/src/tests/data/x509/pss_certs/102/end.crt
index 7d0aa3956..7d0aa3956 100644
--- a/src/tests/data/pss_x509/102/end.crt
+++ b/src/tests/data/x509/pss_certs/102/end.crt
diff --git a/src/tests/data/pss_x509/102/root.crt b/src/tests/data/x509/pss_certs/102/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/102/root.crt
+++ b/src/tests/data/x509/pss_certs/102/root.crt
diff --git a/src/tests/data/pss_x509/103/end.crt b/src/tests/data/x509/pss_certs/103/end.crt
index aaa63e6ed..aaa63e6ed 100644
--- a/src/tests/data/pss_x509/103/end.crt
+++ b/src/tests/data/x509/pss_certs/103/end.crt
diff --git a/src/tests/data/pss_x509/103/root.crt b/src/tests/data/x509/pss_certs/103/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/103/root.crt
+++ b/src/tests/data/x509/pss_certs/103/root.crt
diff --git a/src/tests/data/pss_x509/104/end.crt b/src/tests/data/x509/pss_certs/104/end.crt
index a211b921d..a211b921d 100644
--- a/src/tests/data/pss_x509/104/end.crt
+++ b/src/tests/data/x509/pss_certs/104/end.crt
diff --git a/src/tests/data/pss_x509/104/root.crt b/src/tests/data/x509/pss_certs/104/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/104/root.crt
+++ b/src/tests/data/x509/pss_certs/104/root.crt
diff --git a/src/tests/data/pss_x509/105/end.crt b/src/tests/data/x509/pss_certs/105/end.crt
index a6f9fbc76..a6f9fbc76 100644
--- a/src/tests/data/pss_x509/105/end.crt
+++ b/src/tests/data/x509/pss_certs/105/end.crt
diff --git a/src/tests/data/pss_x509/105/root.crt b/src/tests/data/x509/pss_certs/105/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/105/root.crt
+++ b/src/tests/data/x509/pss_certs/105/root.crt
diff --git a/src/tests/data/pss_x509/106/end.crt b/src/tests/data/x509/pss_certs/106/end.crt
index 21357be50..21357be50 100644
--- a/src/tests/data/pss_x509/106/end.crt
+++ b/src/tests/data/x509/pss_certs/106/end.crt
diff --git a/src/tests/data/pss_x509/106/root.crt b/src/tests/data/x509/pss_certs/106/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/106/root.crt
+++ b/src/tests/data/x509/pss_certs/106/root.crt
diff --git a/src/tests/data/pss_x509/107/end.crt b/src/tests/data/x509/pss_certs/107/end.crt
index 8165dc0e7..8165dc0e7 100644
--- a/src/tests/data/pss_x509/107/end.crt
+++ b/src/tests/data/x509/pss_certs/107/end.crt
diff --git a/src/tests/data/pss_x509/108/crl-rsa-pss-sha1.crl b/src/tests/data/x509/pss_certs/108/crl-rsa-pss-sha1.crl
index 59ca4f703..59ca4f703 100644
--- a/src/tests/data/pss_x509/108/crl-rsa-pss-sha1.crl
+++ b/src/tests/data/x509/pss_certs/108/crl-rsa-pss-sha1.crl
diff --git a/src/tests/data/pss_x509/108/end.crt b/src/tests/data/x509/pss_certs/108/end.crt
index 7d0aa3956..7d0aa3956 100644
--- a/src/tests/data/pss_x509/108/end.crt
+++ b/src/tests/data/x509/pss_certs/108/end.crt
diff --git a/src/tests/data/pss_x509/108/root.crt b/src/tests/data/x509/pss_certs/108/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/108/root.crt
+++ b/src/tests/data/x509/pss_certs/108/root.crt
diff --git a/src/tests/data/pss_x509/109/README.txt b/src/tests/data/x509/pss_certs/109/README.txt
index 27274f304..27274f304 100644
--- a/src/tests/data/pss_x509/109/README.txt
+++ b/src/tests/data/x509/pss_certs/109/README.txt
diff --git a/src/tests/data/pss_x509/109/crl-rsa-pss-sha1-badsign.crl b/src/tests/data/x509/pss_certs/109/crl-rsa-pss-sha1-badsign.crl
index 7e2a59677..7e2a59677 100644
--- a/src/tests/data/pss_x509/109/crl-rsa-pss-sha1-badsign.crl
+++ b/src/tests/data/x509/pss_certs/109/crl-rsa-pss-sha1-badsign.crl
diff --git a/src/tests/data/pss_x509/109/end.crt b/src/tests/data/x509/pss_certs/109/end.crt
index 7d0aa3956..7d0aa3956 100644
--- a/src/tests/data/pss_x509/109/end.crt
+++ b/src/tests/data/x509/pss_certs/109/end.crt
diff --git a/src/tests/data/pss_x509/109/root.crt b/src/tests/data/x509/pss_certs/109/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/109/root.crt
+++ b/src/tests/data/x509/pss_certs/109/root.crt
diff --git a/src/tests/data/pss_x509/11/end.crt b/src/tests/data/x509/pss_certs/11/end.crt
index 0ed3c04b5..0ed3c04b5 100644
--- a/src/tests/data/pss_x509/11/end.crt
+++ b/src/tests/data/x509/pss_certs/11/end.crt
diff --git a/src/tests/data/pss_x509/11/root.crt b/src/tests/data/x509/pss_certs/11/root.crt
index cbc90da2d..cbc90da2d 100644
--- a/src/tests/data/pss_x509/11/root.crt
+++ b/src/tests/data/x509/pss_certs/11/root.crt
diff --git a/src/tests/data/pss_x509/110/crl-rsa-pss-sha224.crl b/src/tests/data/x509/pss_certs/110/crl-rsa-pss-sha224.crl
index a51d5d911..a51d5d911 100644
--- a/src/tests/data/pss_x509/110/crl-rsa-pss-sha224.crl
+++ b/src/tests/data/x509/pss_certs/110/crl-rsa-pss-sha224.crl
diff --git a/src/tests/data/pss_x509/110/end.crt b/src/tests/data/x509/pss_certs/110/end.crt
index 7d0aa3956..7d0aa3956 100644
--- a/src/tests/data/pss_x509/110/end.crt
+++ b/src/tests/data/x509/pss_certs/110/end.crt
diff --git a/src/tests/data/pss_x509/110/root.crt b/src/tests/data/x509/pss_certs/110/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/110/root.crt
+++ b/src/tests/data/x509/pss_certs/110/root.crt
diff --git a/src/tests/data/pss_x509/111/crl-rsa-pss-sha256.crl b/src/tests/data/x509/pss_certs/111/crl-rsa-pss-sha256.crl
index f16a49118..f16a49118 100644
--- a/src/tests/data/pss_x509/111/crl-rsa-pss-sha256.crl
+++ b/src/tests/data/x509/pss_certs/111/crl-rsa-pss-sha256.crl
diff --git a/src/tests/data/pss_x509/111/end.crt b/src/tests/data/x509/pss_certs/111/end.crt
index 7d0aa3956..7d0aa3956 100644
--- a/src/tests/data/pss_x509/111/end.crt
+++ b/src/tests/data/x509/pss_certs/111/end.crt
diff --git a/src/tests/data/pss_x509/111/root.crt b/src/tests/data/x509/pss_certs/111/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/111/root.crt
+++ b/src/tests/data/x509/pss_certs/111/root.crt
diff --git a/src/tests/data/pss_x509/112/crl-rsa-pss-sha384.crl b/src/tests/data/x509/pss_certs/112/crl-rsa-pss-sha384.crl
index 50f7e4cd2..50f7e4cd2 100644
--- a/src/tests/data/pss_x509/112/crl-rsa-pss-sha384.crl
+++ b/src/tests/data/x509/pss_certs/112/crl-rsa-pss-sha384.crl
diff --git a/src/tests/data/pss_x509/112/end.crt b/src/tests/data/x509/pss_certs/112/end.crt
index 7d0aa3956..7d0aa3956 100644
--- a/src/tests/data/pss_x509/112/end.crt
+++ b/src/tests/data/x509/pss_certs/112/end.crt
diff --git a/src/tests/data/pss_x509/112/root.crt b/src/tests/data/x509/pss_certs/112/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/112/root.crt
+++ b/src/tests/data/x509/pss_certs/112/root.crt
diff --git a/src/tests/data/pss_x509/113/crl-rsa-pss-sha512.crl b/src/tests/data/x509/pss_certs/113/crl-rsa-pss-sha512.crl
index 0f1d6510b..0f1d6510b 100644
--- a/src/tests/data/pss_x509/113/crl-rsa-pss-sha512.crl
+++ b/src/tests/data/x509/pss_certs/113/crl-rsa-pss-sha512.crl
diff --git a/src/tests/data/pss_x509/113/end.crt b/src/tests/data/x509/pss_certs/113/end.crt
index 7d0aa3956..7d0aa3956 100644
--- a/src/tests/data/pss_x509/113/end.crt
+++ b/src/tests/data/x509/pss_certs/113/end.crt
diff --git a/src/tests/data/pss_x509/113/root.crt b/src/tests/data/x509/pss_certs/113/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/113/root.crt
+++ b/src/tests/data/x509/pss_certs/113/root.crt
diff --git a/src/tests/data/pss_x509/114/server9.req.sha1.csr b/src/tests/data/x509/pss_certs/114/server9.req.sha1.csr
index b9d005382..b9d005382 100644
--- a/src/tests/data/pss_x509/114/server9.req.sha1.csr
+++ b/src/tests/data/x509/pss_certs/114/server9.req.sha1.csr
diff --git a/src/tests/data/pss_x509/115/server9.req.sha224.csr b/src/tests/data/x509/pss_certs/115/server9.req.sha224.csr
index fe1c797ed..fe1c797ed 100644
--- a/src/tests/data/pss_x509/115/server9.req.sha224.csr
+++ b/src/tests/data/x509/pss_certs/115/server9.req.sha224.csr
diff --git a/src/tests/data/pss_x509/116/server9.req.sha256.csr b/src/tests/data/x509/pss_certs/116/server9.req.sha256.csr
index 0ef9ef028..0ef9ef028 100644
--- a/src/tests/data/pss_x509/116/server9.req.sha256.csr
+++ b/src/tests/data/x509/pss_certs/116/server9.req.sha256.csr
diff --git a/src/tests/data/pss_x509/117/server9.req.sha384.csr b/src/tests/data/x509/pss_certs/117/server9.req.sha384.csr
index 010345027..010345027 100644
--- a/src/tests/data/pss_x509/117/server9.req.sha384.csr
+++ b/src/tests/data/x509/pss_certs/117/server9.req.sha384.csr
diff --git a/src/tests/data/pss_x509/118/server9.req.sha512.csr b/src/tests/data/x509/pss_certs/118/server9.req.sha512.csr
index 676b5c996..676b5c996 100644
--- a/src/tests/data/pss_x509/118/server9.req.sha512.csr
+++ b/src/tests/data/x509/pss_certs/118/server9.req.sha512.csr
diff --git a/src/tests/data/pss_x509/12/end.crt b/src/tests/data/x509/pss_certs/12/end.crt
index 2ff368bd6..2ff368bd6 100644
--- a/src/tests/data/pss_x509/12/end.crt
+++ b/src/tests/data/x509/pss_certs/12/end.crt
diff --git a/src/tests/data/pss_x509/12/root.crt b/src/tests/data/x509/pss_certs/12/root.crt
index cbc90da2d..cbc90da2d 100644
--- a/src/tests/data/pss_x509/12/root.crt
+++ b/src/tests/data/x509/pss_certs/12/root.crt
diff --git a/src/tests/data/pss_x509/13/end.crt b/src/tests/data/x509/pss_certs/13/end.crt
index c191560d3..c191560d3 100644
--- a/src/tests/data/pss_x509/13/end.crt
+++ b/src/tests/data/x509/pss_certs/13/end.crt
diff --git a/src/tests/data/pss_x509/13/root.crt b/src/tests/data/x509/pss_certs/13/root.crt
index cbc90da2d..cbc90da2d 100644
--- a/src/tests/data/pss_x509/13/root.crt
+++ b/src/tests/data/x509/pss_certs/13/root.crt
diff --git a/src/tests/data/pss_x509/14/end.crt b/src/tests/data/x509/pss_certs/14/end.crt
index d3cd8d60b..d3cd8d60b 100644
--- a/src/tests/data/pss_x509/14/end.crt
+++ b/src/tests/data/x509/pss_certs/14/end.crt
diff --git a/src/tests/data/pss_x509/14/root.crt b/src/tests/data/x509/pss_certs/14/root.crt
index cbc90da2d..cbc90da2d 100644
--- a/src/tests/data/pss_x509/14/root.crt
+++ b/src/tests/data/x509/pss_certs/14/root.crt
diff --git a/src/tests/data/pss_x509/15/end.crt b/src/tests/data/x509/pss_certs/15/end.crt
index 7ea29b187..7ea29b187 100644
--- a/src/tests/data/pss_x509/15/end.crt
+++ b/src/tests/data/x509/pss_certs/15/end.crt
diff --git a/src/tests/data/pss_x509/15/root.crt b/src/tests/data/x509/pss_certs/15/root.crt
index cbc90da2d..cbc90da2d 100644
--- a/src/tests/data/pss_x509/15/root.crt
+++ b/src/tests/data/x509/pss_certs/15/root.crt
diff --git a/src/tests/data/pss_x509/16/end.crt b/src/tests/data/x509/pss_certs/16/end.crt
index f99602bc9..f99602bc9 100644
--- a/src/tests/data/pss_x509/16/end.crt
+++ b/src/tests/data/x509/pss_certs/16/end.crt
diff --git a/src/tests/data/pss_x509/16/root.crt b/src/tests/data/x509/pss_certs/16/root.crt
index b9f9d3a2f..b9f9d3a2f 100644
--- a/src/tests/data/pss_x509/16/root.crt
+++ b/src/tests/data/x509/pss_certs/16/root.crt
diff --git a/src/tests/data/pss_x509/17/end.crt b/src/tests/data/x509/pss_certs/17/end.crt
index ff542bb23..ff542bb23 100644
--- a/src/tests/data/pss_x509/17/end.crt
+++ b/src/tests/data/x509/pss_certs/17/end.crt
diff --git a/src/tests/data/pss_x509/17/root.crt b/src/tests/data/x509/pss_certs/17/root.crt
index b9f9d3a2f..b9f9d3a2f 100644
--- a/src/tests/data/pss_x509/17/root.crt
+++ b/src/tests/data/x509/pss_certs/17/root.crt
diff --git a/src/tests/data/pss_x509/18/end.crt b/src/tests/data/x509/pss_certs/18/end.crt
index 20a438eea..20a438eea 100644
--- a/src/tests/data/pss_x509/18/end.crt
+++ b/src/tests/data/x509/pss_certs/18/end.crt
diff --git a/src/tests/data/pss_x509/18/root.crt b/src/tests/data/x509/pss_certs/18/root.crt
index b9f9d3a2f..b9f9d3a2f 100644
--- a/src/tests/data/pss_x509/18/root.crt
+++ b/src/tests/data/x509/pss_certs/18/root.crt
diff --git a/src/tests/data/pss_x509/19/end.crt b/src/tests/data/x509/pss_certs/19/end.crt
index 682cafcb3..682cafcb3 100644
--- a/src/tests/data/pss_x509/19/end.crt
+++ b/src/tests/data/x509/pss_certs/19/end.crt
diff --git a/src/tests/data/pss_x509/19/root.crt b/src/tests/data/x509/pss_certs/19/root.crt
index b9f9d3a2f..b9f9d3a2f 100644
--- a/src/tests/data/pss_x509/19/root.crt
+++ b/src/tests/data/x509/pss_certs/19/root.crt
diff --git a/src/tests/data/pss_x509/20/end.crt b/src/tests/data/x509/pss_certs/20/end.crt
index 7d0fdfd93..7d0fdfd93 100644
--- a/src/tests/data/pss_x509/20/end.crt
+++ b/src/tests/data/x509/pss_certs/20/end.crt
diff --git a/src/tests/data/pss_x509/20/root.crt b/src/tests/data/x509/pss_certs/20/root.crt
index b9f9d3a2f..b9f9d3a2f 100644
--- a/src/tests/data/pss_x509/20/root.crt
+++ b/src/tests/data/x509/pss_certs/20/root.crt
diff --git a/src/tests/data/pss_x509/21/end.crt b/src/tests/data/x509/pss_certs/21/end.crt
index 95e8e0b1a..95e8e0b1a 100644
--- a/src/tests/data/pss_x509/21/end.crt
+++ b/src/tests/data/x509/pss_certs/21/end.crt
diff --git a/src/tests/data/pss_x509/21/root.crt b/src/tests/data/x509/pss_certs/21/root.crt
index b3332e399..b3332e399 100644
--- a/src/tests/data/pss_x509/21/root.crt
+++ b/src/tests/data/x509/pss_certs/21/root.crt
diff --git a/src/tests/data/pss_x509/22/end.crt b/src/tests/data/x509/pss_certs/22/end.crt
index 43218fbe5..43218fbe5 100644
--- a/src/tests/data/pss_x509/22/end.crt
+++ b/src/tests/data/x509/pss_certs/22/end.crt
diff --git a/src/tests/data/pss_x509/22/root.crt b/src/tests/data/x509/pss_certs/22/root.crt
index b3332e399..b3332e399 100644
--- a/src/tests/data/pss_x509/22/root.crt
+++ b/src/tests/data/x509/pss_certs/22/root.crt
diff --git a/src/tests/data/pss_x509/23/end.crt b/src/tests/data/x509/pss_certs/23/end.crt
index e95631826..e95631826 100644
--- a/src/tests/data/pss_x509/23/end.crt
+++ b/src/tests/data/x509/pss_certs/23/end.crt
diff --git a/src/tests/data/pss_x509/23/root.crt b/src/tests/data/x509/pss_certs/23/root.crt
index b3332e399..b3332e399 100644
--- a/src/tests/data/pss_x509/23/root.crt
+++ b/src/tests/data/x509/pss_certs/23/root.crt
diff --git a/src/tests/data/pss_x509/24/end.crt b/src/tests/data/x509/pss_certs/24/end.crt
index 724db77f0..724db77f0 100644
--- a/src/tests/data/pss_x509/24/end.crt
+++ b/src/tests/data/x509/pss_certs/24/end.crt
diff --git a/src/tests/data/pss_x509/24/root.crt b/src/tests/data/x509/pss_certs/24/root.crt
index b3332e399..b3332e399 100644
--- a/src/tests/data/pss_x509/24/root.crt
+++ b/src/tests/data/x509/pss_certs/24/root.crt
diff --git a/src/tests/data/pss_x509/25/end.crt b/src/tests/data/x509/pss_certs/25/end.crt
index e77507547..e77507547 100644
--- a/src/tests/data/pss_x509/25/end.crt
+++ b/src/tests/data/x509/pss_certs/25/end.crt
diff --git a/src/tests/data/pss_x509/25/root.crt b/src/tests/data/x509/pss_certs/25/root.crt
index b3332e399..b3332e399 100644
--- a/src/tests/data/pss_x509/25/root.crt
+++ b/src/tests/data/x509/pss_certs/25/root.crt
diff --git a/src/tests/data/pss_x509/26/end.crt b/src/tests/data/x509/pss_certs/26/end.crt
index f13802d4b..f13802d4b 100644
--- a/src/tests/data/pss_x509/26/end.crt
+++ b/src/tests/data/x509/pss_certs/26/end.crt
diff --git a/src/tests/data/pss_x509/26/root.crt b/src/tests/data/x509/pss_certs/26/root.crt
index 3f930da5d..3f930da5d 100644
--- a/src/tests/data/pss_x509/26/root.crt
+++ b/src/tests/data/x509/pss_certs/26/root.crt
diff --git a/src/tests/data/pss_x509/27/end.crt b/src/tests/data/x509/pss_certs/27/end.crt
index 650445e0e..650445e0e 100644
--- a/src/tests/data/pss_x509/27/end.crt
+++ b/src/tests/data/x509/pss_certs/27/end.crt
diff --git a/src/tests/data/pss_x509/27/root.crt b/src/tests/data/x509/pss_certs/27/root.crt
index 3f930da5d..3f930da5d 100644
--- a/src/tests/data/pss_x509/27/root.crt
+++ b/src/tests/data/x509/pss_certs/27/root.crt
diff --git a/src/tests/data/pss_x509/28/end.crt b/src/tests/data/x509/pss_certs/28/end.crt
index e6b785241..e6b785241 100644
--- a/src/tests/data/pss_x509/28/end.crt
+++ b/src/tests/data/x509/pss_certs/28/end.crt
diff --git a/src/tests/data/pss_x509/28/root.crt b/src/tests/data/x509/pss_certs/28/root.crt
index 3f930da5d..3f930da5d 100644
--- a/src/tests/data/pss_x509/28/root.crt
+++ b/src/tests/data/x509/pss_certs/28/root.crt
diff --git a/src/tests/data/pss_x509/29/end.crt b/src/tests/data/x509/pss_certs/29/end.crt
index 53d795214..53d795214 100644
--- a/src/tests/data/pss_x509/29/end.crt
+++ b/src/tests/data/x509/pss_certs/29/end.crt
diff --git a/src/tests/data/pss_x509/29/root.crt b/src/tests/data/x509/pss_certs/29/root.crt
index 3f930da5d..3f930da5d 100644
--- a/src/tests/data/pss_x509/29/root.crt
+++ b/src/tests/data/x509/pss_certs/29/root.crt
diff --git a/src/tests/data/pss_x509/30/end.crt b/src/tests/data/x509/pss_certs/30/end.crt
index e327374a7..e327374a7 100644
--- a/src/tests/data/pss_x509/30/end.crt
+++ b/src/tests/data/x509/pss_certs/30/end.crt
diff --git a/src/tests/data/pss_x509/30/root.crt b/src/tests/data/x509/pss_certs/30/root.crt
index 3f930da5d..3f930da5d 100644
--- a/src/tests/data/pss_x509/30/root.crt
+++ b/src/tests/data/x509/pss_certs/30/root.crt
diff --git a/src/tests/data/pss_x509/31/end.crt b/src/tests/data/x509/pss_certs/31/end.crt
index 719f045b5..719f045b5 100644
--- a/src/tests/data/pss_x509/31/end.crt
+++ b/src/tests/data/x509/pss_certs/31/end.crt
diff --git a/src/tests/data/pss_x509/31/root.crt b/src/tests/data/x509/pss_certs/31/root.crt
index 6a9dda47e..6a9dda47e 100644
--- a/src/tests/data/pss_x509/31/root.crt
+++ b/src/tests/data/x509/pss_certs/31/root.crt
diff --git a/src/tests/data/pss_x509/32/end.crt b/src/tests/data/x509/pss_certs/32/end.crt
index aa02b258b..aa02b258b 100644
--- a/src/tests/data/pss_x509/32/end.crt
+++ b/src/tests/data/x509/pss_certs/32/end.crt
diff --git a/src/tests/data/pss_x509/32/root.crt b/src/tests/data/x509/pss_certs/32/root.crt
index 6a9dda47e..6a9dda47e 100644
--- a/src/tests/data/pss_x509/32/root.crt
+++ b/src/tests/data/x509/pss_certs/32/root.crt
diff --git a/src/tests/data/pss_x509/33/end.crt b/src/tests/data/x509/pss_certs/33/end.crt
index 3725dbbc7..3725dbbc7 100644
--- a/src/tests/data/pss_x509/33/end.crt
+++ b/src/tests/data/x509/pss_certs/33/end.crt
diff --git a/src/tests/data/pss_x509/33/root.crt b/src/tests/data/x509/pss_certs/33/root.crt
index 6a9dda47e..6a9dda47e 100644
--- a/src/tests/data/pss_x509/33/root.crt
+++ b/src/tests/data/x509/pss_certs/33/root.crt
diff --git a/src/tests/data/pss_x509/34/end.crt b/src/tests/data/x509/pss_certs/34/end.crt
index a7cb5e6ec..a7cb5e6ec 100644
--- a/src/tests/data/pss_x509/34/end.crt
+++ b/src/tests/data/x509/pss_certs/34/end.crt
diff --git a/src/tests/data/pss_x509/34/root.crt b/src/tests/data/x509/pss_certs/34/root.crt
index 6a9dda47e..6a9dda47e 100644
--- a/src/tests/data/pss_x509/34/root.crt
+++ b/src/tests/data/x509/pss_certs/34/root.crt
diff --git a/src/tests/data/pss_x509/35/end.crt b/src/tests/data/x509/pss_certs/35/end.crt
index 969a02024..969a02024 100644
--- a/src/tests/data/pss_x509/35/end.crt
+++ b/src/tests/data/x509/pss_certs/35/end.crt
diff --git a/src/tests/data/pss_x509/35/root.crt b/src/tests/data/x509/pss_certs/35/root.crt
index 6a9dda47e..6a9dda47e 100644
--- a/src/tests/data/pss_x509/35/root.crt
+++ b/src/tests/data/x509/pss_certs/35/root.crt
diff --git a/src/tests/data/pss_x509/36/end.crt b/src/tests/data/x509/pss_certs/36/end.crt
index 5dddfc7d2..5dddfc7d2 100644
--- a/src/tests/data/pss_x509/36/end.crt
+++ b/src/tests/data/x509/pss_certs/36/end.crt
diff --git a/src/tests/data/pss_x509/36/root.crt b/src/tests/data/x509/pss_certs/36/root.crt
index 4c5f8fd3d..4c5f8fd3d 100644
--- a/src/tests/data/pss_x509/36/root.crt
+++ b/src/tests/data/x509/pss_certs/36/root.crt
diff --git a/src/tests/data/pss_x509/37/end.crt b/src/tests/data/x509/pss_certs/37/end.crt
index 0f9158a74..0f9158a74 100644
--- a/src/tests/data/pss_x509/37/end.crt
+++ b/src/tests/data/x509/pss_certs/37/end.crt
diff --git a/src/tests/data/pss_x509/37/root.crt b/src/tests/data/x509/pss_certs/37/root.crt
index 4c5f8fd3d..4c5f8fd3d 100644
--- a/src/tests/data/pss_x509/37/root.crt
+++ b/src/tests/data/x509/pss_certs/37/root.crt
diff --git a/src/tests/data/pss_x509/38/end.crt b/src/tests/data/x509/pss_certs/38/end.crt
index 9a5734644..9a5734644 100644
--- a/src/tests/data/pss_x509/38/end.crt
+++ b/src/tests/data/x509/pss_certs/38/end.crt
diff --git a/src/tests/data/pss_x509/38/root.crt b/src/tests/data/x509/pss_certs/38/root.crt
index 4c5f8fd3d..4c5f8fd3d 100644
--- a/src/tests/data/pss_x509/38/root.crt
+++ b/src/tests/data/x509/pss_certs/38/root.crt
diff --git a/src/tests/data/pss_x509/39/end.crt b/src/tests/data/x509/pss_certs/39/end.crt
index 5ceb7e8e3..5ceb7e8e3 100644
--- a/src/tests/data/pss_x509/39/end.crt
+++ b/src/tests/data/x509/pss_certs/39/end.crt
diff --git a/src/tests/data/pss_x509/39/root.crt b/src/tests/data/x509/pss_certs/39/root.crt
index 4c5f8fd3d..4c5f8fd3d 100644
--- a/src/tests/data/pss_x509/39/root.crt
+++ b/src/tests/data/x509/pss_certs/39/root.crt
diff --git a/src/tests/data/pss_x509/40/end.crt b/src/tests/data/x509/pss_certs/40/end.crt
index 9f611ec30..9f611ec30 100644
--- a/src/tests/data/pss_x509/40/end.crt
+++ b/src/tests/data/x509/pss_certs/40/end.crt
diff --git a/src/tests/data/pss_x509/40/root.crt b/src/tests/data/x509/pss_certs/40/root.crt
index 4c5f8fd3d..4c5f8fd3d 100644
--- a/src/tests/data/pss_x509/40/root.crt
+++ b/src/tests/data/x509/pss_certs/40/root.crt
diff --git a/src/tests/data/pss_x509/41/end.crt b/src/tests/data/x509/pss_certs/41/end.crt
index 4eb61565c..4eb61565c 100644
--- a/src/tests/data/pss_x509/41/end.crt
+++ b/src/tests/data/x509/pss_certs/41/end.crt
diff --git a/src/tests/data/pss_x509/41/root.crt b/src/tests/data/x509/pss_certs/41/root.crt
index 27f142b6e..27f142b6e 100644
--- a/src/tests/data/pss_x509/41/root.crt
+++ b/src/tests/data/x509/pss_certs/41/root.crt
diff --git a/src/tests/data/pss_x509/42/end.crt b/src/tests/data/x509/pss_certs/42/end.crt
index c445afeeb..c445afeeb 100644
--- a/src/tests/data/pss_x509/42/end.crt
+++ b/src/tests/data/x509/pss_certs/42/end.crt
diff --git a/src/tests/data/pss_x509/42/root.crt b/src/tests/data/x509/pss_certs/42/root.crt
index 27f142b6e..27f142b6e 100644
--- a/src/tests/data/pss_x509/42/root.crt
+++ b/src/tests/data/x509/pss_certs/42/root.crt
diff --git a/src/tests/data/pss_x509/43/end.crt b/src/tests/data/x509/pss_certs/43/end.crt
index a00daa82f..a00daa82f 100644
--- a/src/tests/data/pss_x509/43/end.crt
+++ b/src/tests/data/x509/pss_certs/43/end.crt
diff --git a/src/tests/data/pss_x509/43/root.crt b/src/tests/data/x509/pss_certs/43/root.crt
index 27f142b6e..27f142b6e 100644
--- a/src/tests/data/pss_x509/43/root.crt
+++ b/src/tests/data/x509/pss_certs/43/root.crt
diff --git a/src/tests/data/pss_x509/44/end.crt b/src/tests/data/x509/pss_certs/44/end.crt
index b7a7c2c23..b7a7c2c23 100644
--- a/src/tests/data/pss_x509/44/end.crt
+++ b/src/tests/data/x509/pss_certs/44/end.crt
diff --git a/src/tests/data/pss_x509/44/root.crt b/src/tests/data/x509/pss_certs/44/root.crt
index 27f142b6e..27f142b6e 100644
--- a/src/tests/data/pss_x509/44/root.crt
+++ b/src/tests/data/x509/pss_certs/44/root.crt
diff --git a/src/tests/data/pss_x509/45/end.crt b/src/tests/data/x509/pss_certs/45/end.crt
index b67e29723..b67e29723 100644
--- a/src/tests/data/pss_x509/45/end.crt
+++ b/src/tests/data/x509/pss_certs/45/end.crt
diff --git a/src/tests/data/pss_x509/45/root.crt b/src/tests/data/x509/pss_certs/45/root.crt
index 27f142b6e..27f142b6e 100644
--- a/src/tests/data/pss_x509/45/root.crt
+++ b/src/tests/data/x509/pss_certs/45/root.crt
diff --git a/src/tests/data/pss_x509/46/end.crt b/src/tests/data/x509/pss_certs/46/end.crt
index 0b6f90082..0b6f90082 100644
--- a/src/tests/data/pss_x509/46/end.crt
+++ b/src/tests/data/x509/pss_certs/46/end.crt
diff --git a/src/tests/data/pss_x509/46/root.crt b/src/tests/data/x509/pss_certs/46/root.crt
index c22375e1a..c22375e1a 100644
--- a/src/tests/data/pss_x509/46/root.crt
+++ b/src/tests/data/x509/pss_certs/46/root.crt
diff --git a/src/tests/data/pss_x509/47/end.crt b/src/tests/data/x509/pss_certs/47/end.crt
index eda066a3e..eda066a3e 100644
--- a/src/tests/data/pss_x509/47/end.crt
+++ b/src/tests/data/x509/pss_certs/47/end.crt
diff --git a/src/tests/data/pss_x509/47/root.crt b/src/tests/data/x509/pss_certs/47/root.crt
index c22375e1a..c22375e1a 100644
--- a/src/tests/data/pss_x509/47/root.crt
+++ b/src/tests/data/x509/pss_certs/47/root.crt
diff --git a/src/tests/data/pss_x509/48/end.crt b/src/tests/data/x509/pss_certs/48/end.crt
index 22022b2a5..22022b2a5 100644
--- a/src/tests/data/pss_x509/48/end.crt
+++ b/src/tests/data/x509/pss_certs/48/end.crt
diff --git a/src/tests/data/pss_x509/48/root.crt b/src/tests/data/x509/pss_certs/48/root.crt
index c22375e1a..c22375e1a 100644
--- a/src/tests/data/pss_x509/48/root.crt
+++ b/src/tests/data/x509/pss_certs/48/root.crt
diff --git a/src/tests/data/pss_x509/49/end.crt b/src/tests/data/x509/pss_certs/49/end.crt
index afcf358a5..afcf358a5 100644
--- a/src/tests/data/pss_x509/49/end.crt
+++ b/src/tests/data/x509/pss_certs/49/end.crt
diff --git a/src/tests/data/pss_x509/49/root.crt b/src/tests/data/x509/pss_certs/49/root.crt
index c22375e1a..c22375e1a 100644
--- a/src/tests/data/pss_x509/49/root.crt
+++ b/src/tests/data/x509/pss_certs/49/root.crt
diff --git a/src/tests/data/pss_x509/50/end.crt b/src/tests/data/x509/pss_certs/50/end.crt
index 10cca890c..10cca890c 100644
--- a/src/tests/data/pss_x509/50/end.crt
+++ b/src/tests/data/x509/pss_certs/50/end.crt
diff --git a/src/tests/data/pss_x509/50/root.crt b/src/tests/data/x509/pss_certs/50/root.crt
index c22375e1a..c22375e1a 100644
--- a/src/tests/data/pss_x509/50/root.crt
+++ b/src/tests/data/x509/pss_certs/50/root.crt
diff --git a/src/tests/data/pss_x509/51/end.crt b/src/tests/data/x509/pss_certs/51/end.crt
index 23508bdf3..23508bdf3 100644
--- a/src/tests/data/pss_x509/51/end.crt
+++ b/src/tests/data/x509/pss_certs/51/end.crt
diff --git a/src/tests/data/pss_x509/51/root.crt b/src/tests/data/x509/pss_certs/51/root.crt
index 247b2cd2c..247b2cd2c 100644
--- a/src/tests/data/pss_x509/51/root.crt
+++ b/src/tests/data/x509/pss_certs/51/root.crt
diff --git a/src/tests/data/pss_x509/52/end.crt b/src/tests/data/x509/pss_certs/52/end.crt
index 4398c10b3..4398c10b3 100644
--- a/src/tests/data/pss_x509/52/end.crt
+++ b/src/tests/data/x509/pss_certs/52/end.crt
diff --git a/src/tests/data/pss_x509/52/root.crt b/src/tests/data/x509/pss_certs/52/root.crt
index 247b2cd2c..247b2cd2c 100644
--- a/src/tests/data/pss_x509/52/root.crt
+++ b/src/tests/data/x509/pss_certs/52/root.crt
diff --git a/src/tests/data/pss_x509/53/end.crt b/src/tests/data/x509/pss_certs/53/end.crt
index 038e16d19..038e16d19 100644
--- a/src/tests/data/pss_x509/53/end.crt
+++ b/src/tests/data/x509/pss_certs/53/end.crt
diff --git a/src/tests/data/pss_x509/53/root.crt b/src/tests/data/x509/pss_certs/53/root.crt
index 247b2cd2c..247b2cd2c 100644
--- a/src/tests/data/pss_x509/53/root.crt
+++ b/src/tests/data/x509/pss_certs/53/root.crt
diff --git a/src/tests/data/pss_x509/54/end.crt b/src/tests/data/x509/pss_certs/54/end.crt
index 66d1accf1..66d1accf1 100644
--- a/src/tests/data/pss_x509/54/end.crt
+++ b/src/tests/data/x509/pss_certs/54/end.crt
diff --git a/src/tests/data/pss_x509/54/root.crt b/src/tests/data/x509/pss_certs/54/root.crt
index 247b2cd2c..247b2cd2c 100644
--- a/src/tests/data/pss_x509/54/root.crt
+++ b/src/tests/data/x509/pss_certs/54/root.crt
diff --git a/src/tests/data/pss_x509/55/end.crt b/src/tests/data/x509/pss_certs/55/end.crt
index d33ffe292..d33ffe292 100644
--- a/src/tests/data/pss_x509/55/end.crt
+++ b/src/tests/data/x509/pss_certs/55/end.crt
diff --git a/src/tests/data/pss_x509/55/root.crt b/src/tests/data/x509/pss_certs/55/root.crt
index 247b2cd2c..247b2cd2c 100644
--- a/src/tests/data/pss_x509/55/root.crt
+++ b/src/tests/data/x509/pss_certs/55/root.crt
diff --git a/src/tests/data/pss_x509/56/end.crt b/src/tests/data/x509/pss_certs/56/end.crt
index 39e8fdaa3..39e8fdaa3 100644
--- a/src/tests/data/pss_x509/56/end.crt
+++ b/src/tests/data/x509/pss_certs/56/end.crt
diff --git a/src/tests/data/pss_x509/56/root.crt b/src/tests/data/x509/pss_certs/56/root.crt
index bf00b14ba..bf00b14ba 100644
--- a/src/tests/data/pss_x509/56/root.crt
+++ b/src/tests/data/x509/pss_certs/56/root.crt
diff --git a/src/tests/data/pss_x509/57/end.crt b/src/tests/data/x509/pss_certs/57/end.crt
index ecf917c0a..ecf917c0a 100644
--- a/src/tests/data/pss_x509/57/end.crt
+++ b/src/tests/data/x509/pss_certs/57/end.crt
diff --git a/src/tests/data/pss_x509/57/root.crt b/src/tests/data/x509/pss_certs/57/root.crt
index bf00b14ba..bf00b14ba 100644
--- a/src/tests/data/pss_x509/57/root.crt
+++ b/src/tests/data/x509/pss_certs/57/root.crt
diff --git a/src/tests/data/pss_x509/58/end.crt b/src/tests/data/x509/pss_certs/58/end.crt
index a46641292..a46641292 100644
--- a/src/tests/data/pss_x509/58/end.crt
+++ b/src/tests/data/x509/pss_certs/58/end.crt
diff --git a/src/tests/data/pss_x509/58/root.crt b/src/tests/data/x509/pss_certs/58/root.crt
index bf00b14ba..bf00b14ba 100644
--- a/src/tests/data/pss_x509/58/root.crt
+++ b/src/tests/data/x509/pss_certs/58/root.crt
diff --git a/src/tests/data/pss_x509/59/end.crt b/src/tests/data/x509/pss_certs/59/end.crt
index 49eff2be7..49eff2be7 100644
--- a/src/tests/data/pss_x509/59/end.crt
+++ b/src/tests/data/x509/pss_certs/59/end.crt
diff --git a/src/tests/data/pss_x509/59/root.crt b/src/tests/data/x509/pss_certs/59/root.crt
index bf00b14ba..bf00b14ba 100644
--- a/src/tests/data/pss_x509/59/root.crt
+++ b/src/tests/data/x509/pss_certs/59/root.crt
diff --git a/src/tests/data/pss_x509/60/end.crt b/src/tests/data/x509/pss_certs/60/end.crt
index aaee07c1c..aaee07c1c 100644
--- a/src/tests/data/pss_x509/60/end.crt
+++ b/src/tests/data/x509/pss_certs/60/end.crt
diff --git a/src/tests/data/pss_x509/60/root.crt b/src/tests/data/x509/pss_certs/60/root.crt
index bf00b14ba..bf00b14ba 100644
--- a/src/tests/data/pss_x509/60/root.crt
+++ b/src/tests/data/x509/pss_certs/60/root.crt
diff --git a/src/tests/data/pss_x509/61/end.crt b/src/tests/data/x509/pss_certs/61/end.crt
index 75fd98f85..75fd98f85 100644
--- a/src/tests/data/pss_x509/61/end.crt
+++ b/src/tests/data/x509/pss_certs/61/end.crt
diff --git a/src/tests/data/pss_x509/61/root.crt b/src/tests/data/x509/pss_certs/61/root.crt
index cf221947f..cf221947f 100644
--- a/src/tests/data/pss_x509/61/root.crt
+++ b/src/tests/data/x509/pss_certs/61/root.crt
diff --git a/src/tests/data/pss_x509/62/end.crt b/src/tests/data/x509/pss_certs/62/end.crt
index 2e685d078..2e685d078 100644
--- a/src/tests/data/pss_x509/62/end.crt
+++ b/src/tests/data/x509/pss_certs/62/end.crt
diff --git a/src/tests/data/pss_x509/62/root.crt b/src/tests/data/x509/pss_certs/62/root.crt
index cf221947f..cf221947f 100644
--- a/src/tests/data/pss_x509/62/root.crt
+++ b/src/tests/data/x509/pss_certs/62/root.crt
diff --git a/src/tests/data/pss_x509/63/end.crt b/src/tests/data/x509/pss_certs/63/end.crt
index 45ef8d7e3..45ef8d7e3 100644
--- a/src/tests/data/pss_x509/63/end.crt
+++ b/src/tests/data/x509/pss_certs/63/end.crt
diff --git a/src/tests/data/pss_x509/63/root.crt b/src/tests/data/x509/pss_certs/63/root.crt
index cf221947f..cf221947f 100644
--- a/src/tests/data/pss_x509/63/root.crt
+++ b/src/tests/data/x509/pss_certs/63/root.crt
diff --git a/src/tests/data/pss_x509/64/end.crt b/src/tests/data/x509/pss_certs/64/end.crt
index 049c7bb65..049c7bb65 100644
--- a/src/tests/data/pss_x509/64/end.crt
+++ b/src/tests/data/x509/pss_certs/64/end.crt
diff --git a/src/tests/data/pss_x509/64/root.crt b/src/tests/data/x509/pss_certs/64/root.crt
index cf221947f..cf221947f 100644
--- a/src/tests/data/pss_x509/64/root.crt
+++ b/src/tests/data/x509/pss_certs/64/root.crt
diff --git a/src/tests/data/pss_x509/65/end.crt b/src/tests/data/x509/pss_certs/65/end.crt
index 28ffd71b0..28ffd71b0 100644
--- a/src/tests/data/pss_x509/65/end.crt
+++ b/src/tests/data/x509/pss_certs/65/end.crt
diff --git a/src/tests/data/pss_x509/65/root.crt b/src/tests/data/x509/pss_certs/65/root.crt
index cf221947f..cf221947f 100644
--- a/src/tests/data/pss_x509/65/root.crt
+++ b/src/tests/data/x509/pss_certs/65/root.crt
diff --git a/src/tests/data/pss_x509/66/end.crt b/src/tests/data/x509/pss_certs/66/end.crt
index 4c44763b5..4c44763b5 100644
--- a/src/tests/data/pss_x509/66/end.crt
+++ b/src/tests/data/x509/pss_certs/66/end.crt
diff --git a/src/tests/data/pss_x509/66/root.crt b/src/tests/data/x509/pss_certs/66/root.crt
index 5157fab6a..5157fab6a 100644
--- a/src/tests/data/pss_x509/66/root.crt
+++ b/src/tests/data/x509/pss_certs/66/root.crt
diff --git a/src/tests/data/pss_x509/67/end.crt b/src/tests/data/x509/pss_certs/67/end.crt
index a231a2ded..a231a2ded 100644
--- a/src/tests/data/pss_x509/67/end.crt
+++ b/src/tests/data/x509/pss_certs/67/end.crt
diff --git a/src/tests/data/pss_x509/67/root.crt b/src/tests/data/x509/pss_certs/67/root.crt
index 5157fab6a..5157fab6a 100644
--- a/src/tests/data/pss_x509/67/root.crt
+++ b/src/tests/data/x509/pss_certs/67/root.crt
diff --git a/src/tests/data/pss_x509/68/end.crt b/src/tests/data/x509/pss_certs/68/end.crt
index b083b3412..b083b3412 100644
--- a/src/tests/data/pss_x509/68/end.crt
+++ b/src/tests/data/x509/pss_certs/68/end.crt
diff --git a/src/tests/data/pss_x509/68/root.crt b/src/tests/data/x509/pss_certs/68/root.crt
index 5157fab6a..5157fab6a 100644
--- a/src/tests/data/pss_x509/68/root.crt
+++ b/src/tests/data/x509/pss_certs/68/root.crt
diff --git a/src/tests/data/pss_x509/69/end.crt b/src/tests/data/x509/pss_certs/69/end.crt
index 808e6873a..808e6873a 100644
--- a/src/tests/data/pss_x509/69/end.crt
+++ b/src/tests/data/x509/pss_certs/69/end.crt
diff --git a/src/tests/data/pss_x509/69/root.crt b/src/tests/data/x509/pss_certs/69/root.crt
index 5157fab6a..5157fab6a 100644
--- a/src/tests/data/pss_x509/69/root.crt
+++ b/src/tests/data/x509/pss_certs/69/root.crt
diff --git a/src/tests/data/pss_x509/70/end.crt b/src/tests/data/x509/pss_certs/70/end.crt
index 4a73382b3..4a73382b3 100644
--- a/src/tests/data/pss_x509/70/end.crt
+++ b/src/tests/data/x509/pss_certs/70/end.crt
diff --git a/src/tests/data/pss_x509/70/root.crt b/src/tests/data/x509/pss_certs/70/root.crt
index 5157fab6a..5157fab6a 100644
--- a/src/tests/data/pss_x509/70/root.crt
+++ b/src/tests/data/x509/pss_certs/70/root.crt
diff --git a/src/tests/data/pss_x509/71/end.crt b/src/tests/data/x509/pss_certs/71/end.crt
index 24d569421..24d569421 100644
--- a/src/tests/data/pss_x509/71/end.crt
+++ b/src/tests/data/x509/pss_certs/71/end.crt
diff --git a/src/tests/data/pss_x509/71/root.crt b/src/tests/data/x509/pss_certs/71/root.crt
index 7215ab9b4..7215ab9b4 100644
--- a/src/tests/data/pss_x509/71/root.crt
+++ b/src/tests/data/x509/pss_certs/71/root.crt
diff --git a/src/tests/data/pss_x509/72/end.crt b/src/tests/data/x509/pss_certs/72/end.crt
index 895f717af..895f717af 100644
--- a/src/tests/data/pss_x509/72/end.crt
+++ b/src/tests/data/x509/pss_certs/72/end.crt
diff --git a/src/tests/data/pss_x509/72/root.crt b/src/tests/data/x509/pss_certs/72/root.crt
index 7215ab9b4..7215ab9b4 100644
--- a/src/tests/data/pss_x509/72/root.crt
+++ b/src/tests/data/x509/pss_certs/72/root.crt
diff --git a/src/tests/data/pss_x509/73/end.crt b/src/tests/data/x509/pss_certs/73/end.crt
index b75bad62f..b75bad62f 100644
--- a/src/tests/data/pss_x509/73/end.crt
+++ b/src/tests/data/x509/pss_certs/73/end.crt
diff --git a/src/tests/data/pss_x509/73/root.crt b/src/tests/data/x509/pss_certs/73/root.crt
index 7215ab9b4..7215ab9b4 100644
--- a/src/tests/data/pss_x509/73/root.crt
+++ b/src/tests/data/x509/pss_certs/73/root.crt
diff --git a/src/tests/data/pss_x509/74/end.crt b/src/tests/data/x509/pss_certs/74/end.crt
index 02c21fe2b..02c21fe2b 100644
--- a/src/tests/data/pss_x509/74/end.crt
+++ b/src/tests/data/x509/pss_certs/74/end.crt
diff --git a/src/tests/data/pss_x509/74/root.crt b/src/tests/data/x509/pss_certs/74/root.crt
index 7215ab9b4..7215ab9b4 100644
--- a/src/tests/data/pss_x509/74/root.crt
+++ b/src/tests/data/x509/pss_certs/74/root.crt
diff --git a/src/tests/data/pss_x509/75/end.crt b/src/tests/data/x509/pss_certs/75/end.crt
index f9d009607..f9d009607 100644
--- a/src/tests/data/pss_x509/75/end.crt
+++ b/src/tests/data/x509/pss_certs/75/end.crt
diff --git a/src/tests/data/pss_x509/75/root.crt b/src/tests/data/x509/pss_certs/75/root.crt
index 7215ab9b4..7215ab9b4 100644
--- a/src/tests/data/pss_x509/75/root.crt
+++ b/src/tests/data/x509/pss_certs/75/root.crt
diff --git a/src/tests/data/pss_x509/76/end.crt b/src/tests/data/x509/pss_certs/76/end.crt
index 86dec0ff0..86dec0ff0 100644
--- a/src/tests/data/pss_x509/76/end.crt
+++ b/src/tests/data/x509/pss_certs/76/end.crt
diff --git a/src/tests/data/pss_x509/76/root.crt b/src/tests/data/x509/pss_certs/76/root.crt
index ffaee16c2..ffaee16c2 100644
--- a/src/tests/data/pss_x509/76/root.crt
+++ b/src/tests/data/x509/pss_certs/76/root.crt
diff --git a/src/tests/data/pss_x509/77/end.crt b/src/tests/data/x509/pss_certs/77/end.crt
index 1a30d0087..1a30d0087 100644
--- a/src/tests/data/pss_x509/77/end.crt
+++ b/src/tests/data/x509/pss_certs/77/end.crt
diff --git a/src/tests/data/pss_x509/77/root.crt b/src/tests/data/x509/pss_certs/77/root.crt
index ffaee16c2..ffaee16c2 100644
--- a/src/tests/data/pss_x509/77/root.crt
+++ b/src/tests/data/x509/pss_certs/77/root.crt
diff --git a/src/tests/data/pss_x509/78/end.crt b/src/tests/data/x509/pss_certs/78/end.crt
index 6ce8b090d..6ce8b090d 100644
--- a/src/tests/data/pss_x509/78/end.crt
+++ b/src/tests/data/x509/pss_certs/78/end.crt
diff --git a/src/tests/data/pss_x509/78/root.crt b/src/tests/data/x509/pss_certs/78/root.crt
index ffaee16c2..ffaee16c2 100644
--- a/src/tests/data/pss_x509/78/root.crt
+++ b/src/tests/data/x509/pss_certs/78/root.crt
diff --git a/src/tests/data/pss_x509/79/end.crt b/src/tests/data/x509/pss_certs/79/end.crt
index 53d7c92df..53d7c92df 100644
--- a/src/tests/data/pss_x509/79/end.crt
+++ b/src/tests/data/x509/pss_certs/79/end.crt
diff --git a/src/tests/data/pss_x509/79/root.crt b/src/tests/data/x509/pss_certs/79/root.crt
index ffaee16c2..ffaee16c2 100644
--- a/src/tests/data/pss_x509/79/root.crt
+++ b/src/tests/data/x509/pss_certs/79/root.crt
diff --git a/src/tests/data/pss_x509/80/end.crt b/src/tests/data/x509/pss_certs/80/end.crt
index 9e5b22d09..9e5b22d09 100644
--- a/src/tests/data/pss_x509/80/end.crt
+++ b/src/tests/data/x509/pss_certs/80/end.crt
diff --git a/src/tests/data/pss_x509/80/root.crt b/src/tests/data/x509/pss_certs/80/root.crt
index ffaee16c2..ffaee16c2 100644
--- a/src/tests/data/pss_x509/80/root.crt
+++ b/src/tests/data/x509/pss_certs/80/root.crt
diff --git a/src/tests/data/pss_x509/81/end.crt b/src/tests/data/x509/pss_certs/81/end.crt
index 995e9addb..995e9addb 100644
--- a/src/tests/data/pss_x509/81/end.crt
+++ b/src/tests/data/x509/pss_certs/81/end.crt
diff --git a/src/tests/data/pss_x509/81/root.crt b/src/tests/data/x509/pss_certs/81/root.crt
index 50c8e0c2f..50c8e0c2f 100644
--- a/src/tests/data/pss_x509/81/root.crt
+++ b/src/tests/data/x509/pss_certs/81/root.crt
diff --git a/src/tests/data/pss_x509/82/end.crt b/src/tests/data/x509/pss_certs/82/end.crt
index f990c8434..f990c8434 100644
--- a/src/tests/data/pss_x509/82/end.crt
+++ b/src/tests/data/x509/pss_certs/82/end.crt
diff --git a/src/tests/data/pss_x509/83/end.crt b/src/tests/data/x509/pss_certs/83/end.crt
index 08abf9013..08abf9013 100644
--- a/src/tests/data/pss_x509/83/end.crt
+++ b/src/tests/data/x509/pss_certs/83/end.crt
diff --git a/src/tests/data/pss_x509/84/end.crt b/src/tests/data/x509/pss_certs/84/end.crt
index b9650a732..b9650a732 100644
--- a/src/tests/data/pss_x509/84/end.crt
+++ b/src/tests/data/x509/pss_certs/84/end.crt
diff --git a/src/tests/data/pss_x509/85/end.crt b/src/tests/data/x509/pss_certs/85/end.crt
index 461cde372..461cde372 100644
--- a/src/tests/data/pss_x509/85/end.crt
+++ b/src/tests/data/x509/pss_certs/85/end.crt
diff --git a/src/tests/data/pss_x509/86/end.crt b/src/tests/data/x509/pss_certs/86/end.crt
index 94bbd7a9a..94bbd7a9a 100644
--- a/src/tests/data/pss_x509/86/end.crt
+++ b/src/tests/data/x509/pss_certs/86/end.crt
diff --git a/src/tests/data/pss_x509/87/end.crt b/src/tests/data/x509/pss_certs/87/end.crt
index bbd851bad..bbd851bad 100644
--- a/src/tests/data/pss_x509/87/end.crt
+++ b/src/tests/data/x509/pss_certs/87/end.crt
diff --git a/src/tests/data/pss_x509/88/end.crt b/src/tests/data/x509/pss_certs/88/end.crt
index ce92e040b..ce92e040b 100644
--- a/src/tests/data/pss_x509/88/end.crt
+++ b/src/tests/data/x509/pss_certs/88/end.crt
diff --git a/src/tests/data/pss_x509/89/end.crt b/src/tests/data/x509/pss_certs/89/end.crt
index a20b04230..a20b04230 100644
--- a/src/tests/data/pss_x509/89/end.crt
+++ b/src/tests/data/x509/pss_certs/89/end.crt
diff --git a/src/tests/data/pss_x509/90/end.crt b/src/tests/data/x509/pss_certs/90/end.crt
index 645418547..645418547 100644
--- a/src/tests/data/pss_x509/90/end.crt
+++ b/src/tests/data/x509/pss_certs/90/end.crt
diff --git a/src/tests/data/pss_x509/91/end.crt b/src/tests/data/x509/pss_certs/91/end.crt
index 5288f1cab..5288f1cab 100644
--- a/src/tests/data/pss_x509/91/end.crt
+++ b/src/tests/data/x509/pss_certs/91/end.crt
diff --git a/src/tests/data/pss_x509/92/end.crt b/src/tests/data/x509/pss_certs/92/end.crt
index 93062aebc..93062aebc 100644
--- a/src/tests/data/pss_x509/92/end.crt
+++ b/src/tests/data/x509/pss_certs/92/end.crt
diff --git a/src/tests/data/pss_x509/93/end.crt b/src/tests/data/x509/pss_certs/93/end.crt
index d6dbc476f..d6dbc476f 100644
--- a/src/tests/data/pss_x509/93/end.crt
+++ b/src/tests/data/x509/pss_certs/93/end.crt
diff --git a/src/tests/data/pss_x509/94/end.crt b/src/tests/data/x509/pss_certs/94/end.crt
index 60e4b8d65..60e4b8d65 100644
--- a/src/tests/data/pss_x509/94/end.crt
+++ b/src/tests/data/x509/pss_certs/94/end.crt
diff --git a/src/tests/data/pss_x509/95/end.crt b/src/tests/data/x509/pss_certs/95/end.crt
index 1cf56fffd..1cf56fffd 100644
--- a/src/tests/data/pss_x509/95/end.crt
+++ b/src/tests/data/x509/pss_certs/95/end.crt
diff --git a/src/tests/data/pss_x509/96/end.crt b/src/tests/data/x509/pss_certs/96/end.crt
index 8ae04efd3..8ae04efd3 100644
--- a/src/tests/data/pss_x509/96/end.crt
+++ b/src/tests/data/x509/pss_certs/96/end.crt
diff --git a/src/tests/data/pss_x509/97/README.txt b/src/tests/data/x509/pss_certs/97/README.txt
index 5d745e900..5d745e900 100644
--- a/src/tests/data/pss_x509/97/README.txt
+++ b/src/tests/data/x509/pss_certs/97/README.txt
diff --git a/src/tests/data/pss_x509/97/end.crt b/src/tests/data/x509/pss_certs/97/end.crt
index 34ef69e03..34ef69e03 100644
--- a/src/tests/data/pss_x509/97/end.crt
+++ b/src/tests/data/x509/pss_certs/97/end.crt
diff --git a/src/tests/data/pss_x509/97/root.crt b/src/tests/data/x509/pss_certs/97/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/97/root.crt
+++ b/src/tests/data/x509/pss_certs/97/root.crt
diff --git a/src/tests/data/pss_x509/98/README.txt b/src/tests/data/x509/pss_certs/98/README.txt
index 546043b7f..546043b7f 100644
--- a/src/tests/data/pss_x509/98/README.txt
+++ b/src/tests/data/x509/pss_certs/98/README.txt
diff --git a/src/tests/data/pss_x509/98/end.crt b/src/tests/data/x509/pss_certs/98/end.crt
index f4da8832f..f4da8832f 100644
--- a/src/tests/data/pss_x509/98/end.crt
+++ b/src/tests/data/x509/pss_certs/98/end.crt
diff --git a/src/tests/data/pss_x509/98/root.crt b/src/tests/data/x509/pss_certs/98/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/98/root.crt
+++ b/src/tests/data/x509/pss_certs/98/root.crt
diff --git a/src/tests/data/pss_x509/99/README.txt b/src/tests/data/x509/pss_certs/99/README.txt
index 8b2fba01f..8b2fba01f 100644
--- a/src/tests/data/pss_x509/99/README.txt
+++ b/src/tests/data/x509/pss_certs/99/README.txt
diff --git a/src/tests/data/pss_x509/99/end.crt b/src/tests/data/x509/pss_certs/99/end.crt
index 9e565419e..9e565419e 100644
--- a/src/tests/data/pss_x509/99/end.crt
+++ b/src/tests/data/x509/pss_certs/99/end.crt
diff --git a/src/tests/data/pss_x509/99/root.crt b/src/tests/data/x509/pss_certs/99/root.crt
index c2c9a6300..c2c9a6300 100644
--- a/src/tests/data/pss_x509/99/root.crt
+++ b/src/tests/data/x509/pss_certs/99/root.crt
diff --git a/src/tests/data/pss_x509/Sources.txt b/src/tests/data/x509/pss_certs/Sources.txt
index 1c5a535a9..1c5a535a9 100644
--- a/src/tests/data/pss_x509/Sources.txt
+++ b/src/tests/data/x509/pss_certs/Sources.txt
diff --git a/src/tests/data/pss_x509/expected.txt b/src/tests/data/x509/pss_certs/expected.txt
index 45fffd433..45fffd433 100644
--- a/src/tests/data/pss_x509/expected.txt
+++ b/src/tests/data/x509/pss_certs/expected.txt
diff --git a/src/tests/data/pss_x509/validation_times.txt b/src/tests/data/x509/pss_certs/validation_times.txt
index 99fbbfda4..99fbbfda4 100644
--- a/src/tests/data/pss_x509/validation_times.txt
+++ b/src/tests/data/x509/pss_certs/validation_times.txt
diff --git a/src/tests/data/x509test/InvalidExtendedKeyUsage.pem b/src/tests/data/x509/x509test/InvalidExtendedKeyUsage.pem
index 1077d478f..1077d478f 100644
--- a/src/tests/data/x509test/InvalidExtendedKeyUsage.pem
+++ b/src/tests/data/x509/x509test/InvalidExtendedKeyUsage.pem
diff --git a/src/tests/data/x509test/InvalidIntCAFlag.pem b/src/tests/data/x509/x509test/InvalidIntCAFlag.pem
index bf8eadbb4..bf8eadbb4 100644
--- a/src/tests/data/x509test/InvalidIntCAFlag.pem
+++ b/src/tests/data/x509/x509test/InvalidIntCAFlag.pem
diff --git a/src/tests/data/x509test/InvalidIntCAKeyUsage.pem b/src/tests/data/x509/x509test/InvalidIntCAKeyUsage.pem
index 46ea7094f..46ea7094f 100644
--- a/src/tests/data/x509test/InvalidIntCAKeyUsage.pem
+++ b/src/tests/data/x509/x509test/InvalidIntCAKeyUsage.pem
diff --git a/src/tests/data/x509test/InvalidIntCALen.pem b/src/tests/data/x509/x509test/InvalidIntCALen.pem
index 66b70d725..66b70d725 100644
--- a/src/tests/data/x509test/InvalidIntCALen.pem
+++ b/src/tests/data/x509/x509test/InvalidIntCALen.pem
diff --git a/src/tests/data/x509test/InvalidIntCALoop.pem b/src/tests/data/x509/x509test/InvalidIntCALoop.pem
index bdc130f46..bdc130f46 100644
--- a/src/tests/data/x509test/InvalidIntCALoop.pem
+++ b/src/tests/data/x509/x509test/InvalidIntCALoop.pem
diff --git a/src/tests/data/x509test/InvalidIntCASelfSign.pem b/src/tests/data/x509/x509test/InvalidIntCASelfSign.pem
index 212cad56f..212cad56f 100644
--- a/src/tests/data/x509test/InvalidIntCASelfSign.pem
+++ b/src/tests/data/x509/x509test/InvalidIntCASelfSign.pem
diff --git a/src/tests/data/x509test/InvalidIntCAVersionOne.pem b/src/tests/data/x509/x509test/InvalidIntCAVersionOne.pem
index 135b25929..135b25929 100644
--- a/src/tests/data/x509test/InvalidIntCAVersionOne.pem
+++ b/src/tests/data/x509/x509test/InvalidIntCAVersionOne.pem
diff --git a/src/tests/data/x509test/InvalidIntCAVersionTwo.pem b/src/tests/data/x509/x509test/InvalidIntCAVersionTwo.pem
index 09e51407d..09e51407d 100644
--- a/src/tests/data/x509test/InvalidIntCAVersionTwo.pem
+++ b/src/tests/data/x509/x509test/InvalidIntCAVersionTwo.pem
diff --git a/src/tests/data/x509test/InvalidKeyUsage.pem b/src/tests/data/x509/x509test/InvalidKeyUsage.pem
index dfaf41b5c..dfaf41b5c 100644
--- a/src/tests/data/x509test/InvalidKeyUsage.pem
+++ b/src/tests/data/x509/x509test/InvalidKeyUsage.pem
diff --git a/src/tests/data/x509test/InvalidName.pem b/src/tests/data/x509/x509test/InvalidName.pem
index 1d911713d..1d911713d 100644
--- a/src/tests/data/x509test/InvalidName.pem
+++ b/src/tests/data/x509/x509test/InvalidName.pem
diff --git a/src/tests/data/x509test/InvalidNameAltName.pem b/src/tests/data/x509/x509test/InvalidNameAltName.pem
index 432c5f7b4..432c5f7b4 100644
--- a/src/tests/data/x509test/InvalidNameAltName.pem
+++ b/src/tests/data/x509/x509test/InvalidNameAltName.pem
diff --git a/src/tests/data/x509test/InvalidNameAltNameWithSubj.pem b/src/tests/data/x509/x509test/InvalidNameAltNameWithSubj.pem
index 906df5abf..906df5abf 100644
--- a/src/tests/data/x509test/InvalidNameAltNameWithSubj.pem
+++ b/src/tests/data/x509/x509test/InvalidNameAltNameWithSubj.pem
diff --git a/src/tests/data/x509test/InvalidNameConstraintExclude.pem b/src/tests/data/x509/x509test/InvalidNameConstraintExclude.pem
index 9cc79586d..9cc79586d 100644
--- a/src/tests/data/x509test/InvalidNameConstraintExclude.pem
+++ b/src/tests/data/x509/x509test/InvalidNameConstraintExclude.pem
diff --git a/src/tests/data/x509test/InvalidNameConstraintPermit.pem b/src/tests/data/x509/x509test/InvalidNameConstraintPermit.pem
index 3aece322f..3aece322f 100644
--- a/src/tests/data/x509test/InvalidNameConstraintPermit.pem
+++ b/src/tests/data/x509/x509test/InvalidNameConstraintPermit.pem
diff --git a/src/tests/data/x509test/InvalidNameConstraintPermitRight.pem b/src/tests/data/x509/x509test/InvalidNameConstraintPermitRight.pem
index 00da5076a..00da5076a 100644
--- a/src/tests/data/x509test/InvalidNameConstraintPermitRight.pem
+++ b/src/tests/data/x509/x509test/InvalidNameConstraintPermitRight.pem
diff --git a/src/tests/data/x509test/InvalidNameConstraintPermitThenExclude.pem b/src/tests/data/x509/x509test/InvalidNameConstraintPermitThenExclude.pem
index fedfe2893..fedfe2893 100644
--- a/src/tests/data/x509test/InvalidNameConstraintPermitThenExclude.pem
+++ b/src/tests/data/x509/x509test/InvalidNameConstraintPermitThenExclude.pem
diff --git a/src/tests/data/x509test/InvalidNotAfter.pem b/src/tests/data/x509/x509test/InvalidNotAfter.pem
index 710607051..710607051 100644
--- a/src/tests/data/x509test/InvalidNotAfter.pem
+++ b/src/tests/data/x509/x509test/InvalidNotAfter.pem
diff --git a/src/tests/data/x509test/InvalidNotAfterChained.pem b/src/tests/data/x509/x509test/InvalidNotAfterChained.pem
index 25ae1c861..25ae1c861 100644
--- a/src/tests/data/x509test/InvalidNotAfterChained.pem
+++ b/src/tests/data/x509/x509test/InvalidNotAfterChained.pem
diff --git a/src/tests/data/x509test/InvalidNotBefore.pem b/src/tests/data/x509/x509test/InvalidNotBefore.pem
index 4e18b4bdf..4e18b4bdf 100644
--- a/src/tests/data/x509test/InvalidNotBefore.pem
+++ b/src/tests/data/x509/x509test/InvalidNotBefore.pem
diff --git a/src/tests/data/x509test/InvalidNotBeforeChained.pem b/src/tests/data/x509/x509test/InvalidNotBeforeChained.pem
index 412eb578c..412eb578c 100644
--- a/src/tests/data/x509test/InvalidNotBeforeChained.pem
+++ b/src/tests/data/x509/x509test/InvalidNotBeforeChained.pem
diff --git a/src/tests/data/x509test/InvalidSelfSign.pem b/src/tests/data/x509/x509test/InvalidSelfSign.pem
index e86d22825..e86d22825 100644
--- a/src/tests/data/x509test/InvalidSelfSign.pem
+++ b/src/tests/data/x509/x509test/InvalidSelfSign.pem
diff --git a/src/tests/data/x509test/InvalidWildcardAll.pem b/src/tests/data/x509/x509test/InvalidWildcardAll.pem
index d5eaf6b12..d5eaf6b12 100644
--- a/src/tests/data/x509test/InvalidWildcardAll.pem
+++ b/src/tests/data/x509/x509test/InvalidWildcardAll.pem
diff --git a/src/tests/data/x509test/InvalidWildcardAllAltName.pem b/src/tests/data/x509/x509test/InvalidWildcardAllAltName.pem
index b1bd6c1af..b1bd6c1af 100644
--- a/src/tests/data/x509test/InvalidWildcardAllAltName.pem
+++ b/src/tests/data/x509/x509test/InvalidWildcardAllAltName.pem
diff --git a/src/tests/data/x509test/InvalidWildcardLeft.pem b/src/tests/data/x509/x509test/InvalidWildcardLeft.pem
index e7e0fe605..e7e0fe605 100644
--- a/src/tests/data/x509test/InvalidWildcardLeft.pem
+++ b/src/tests/data/x509/x509test/InvalidWildcardLeft.pem
diff --git a/src/tests/data/x509test/InvalidWildcardLeftAltName.pem b/src/tests/data/x509/x509test/InvalidWildcardLeftAltName.pem
index f91e83b32..f91e83b32 100644
--- a/src/tests/data/x509test/InvalidWildcardLeftAltName.pem
+++ b/src/tests/data/x509/x509test/InvalidWildcardLeftAltName.pem
diff --git a/src/tests/data/x509test/InvalidWildcardMid.pem b/src/tests/data/x509/x509test/InvalidWildcardMid.pem
index 11a9547d1..11a9547d1 100644
--- a/src/tests/data/x509test/InvalidWildcardMid.pem
+++ b/src/tests/data/x509/x509test/InvalidWildcardMid.pem
diff --git a/src/tests/data/x509test/InvalidWildcardMidAltName.pem b/src/tests/data/x509/x509test/InvalidWildcardMidAltName.pem
index d4a7e0b03..d4a7e0b03 100644
--- a/src/tests/data/x509test/InvalidWildcardMidAltName.pem
+++ b/src/tests/data/x509/x509test/InvalidWildcardMidAltName.pem
diff --git a/src/tests/data/x509test/InvalidWildcardMidMixed.pem b/src/tests/data/x509/x509test/InvalidWildcardMidMixed.pem
index 82c554554..82c554554 100644
--- a/src/tests/data/x509test/InvalidWildcardMidMixed.pem
+++ b/src/tests/data/x509/x509test/InvalidWildcardMidMixed.pem
diff --git a/src/tests/data/x509test/InvalidWildcardMidMixedAltName.pem b/src/tests/data/x509/x509test/InvalidWildcardMidMixedAltName.pem
index 3e3c4fdd8..3e3c4fdd8 100644
--- a/src/tests/data/x509test/InvalidWildcardMidMixedAltName.pem
+++ b/src/tests/data/x509/x509test/InvalidWildcardMidMixedAltName.pem
diff --git a/src/tests/data/x509test/InvalidWildcardSingle.pem b/src/tests/data/x509/x509test/InvalidWildcardSingle.pem
index ef6992c09..ef6992c09 100644
--- a/src/tests/data/x509test/InvalidWildcardSingle.pem
+++ b/src/tests/data/x509/x509test/InvalidWildcardSingle.pem
diff --git a/src/tests/data/x509test/InvalidWildcardSingleAltName.pem b/src/tests/data/x509/x509test/InvalidWildcardSingleAltName.pem
index 2c4157cc5..2c4157cc5 100644
--- a/src/tests/data/x509test/InvalidWildcardSingleAltName.pem
+++ b/src/tests/data/x509/x509test/InvalidWildcardSingleAltName.pem
diff --git a/src/tests/data/x509test/MissingIntCABasicConstraintWithCertSign.pem b/src/tests/data/x509/x509test/MissingIntCABasicConstraintWithCertSign.pem
index 7ed001ef8..7ed001ef8 100644
--- a/src/tests/data/x509test/MissingIntCABasicConstraintWithCertSign.pem
+++ b/src/tests/data/x509/x509test/MissingIntCABasicConstraintWithCertSign.pem
diff --git a/src/tests/data/x509test/MissingIntCAExtensions.pem b/src/tests/data/x509/x509test/MissingIntCAExtensions.pem
index ce5d7ca25..ce5d7ca25 100644
--- a/src/tests/data/x509test/MissingIntCAExtensions.pem
+++ b/src/tests/data/x509/x509test/MissingIntCAExtensions.pem
diff --git a/src/tests/data/x509test/ValidAltName.pem b/src/tests/data/x509/x509test/ValidAltName.pem
index 5ac372128..5ac372128 100644
--- a/src/tests/data/x509test/ValidAltName.pem
+++ b/src/tests/data/x509/x509test/ValidAltName.pem
diff --git a/src/tests/data/x509test/ValidCert.pem b/src/tests/data/x509/x509test/ValidCert.pem
index 204789966..204789966 100644
--- a/src/tests/data/x509test/ValidCert.pem
+++ b/src/tests/data/x509/x509test/ValidCert.pem
diff --git a/src/tests/data/x509test/ValidChained.pem b/src/tests/data/x509/x509test/ValidChained.pem
index a7248de4c..a7248de4c 100644
--- a/src/tests/data/x509test/ValidChained.pem
+++ b/src/tests/data/x509/x509test/ValidChained.pem
diff --git a/src/tests/data/x509test/ValidIntCALen.pem b/src/tests/data/x509/x509test/ValidIntCALen.pem
index 68e6cf91c..68e6cf91c 100644
--- a/src/tests/data/x509test/ValidIntCALen.pem
+++ b/src/tests/data/x509/x509test/ValidIntCALen.pem
diff --git a/src/tests/data/x509test/ValidNameConstraint.pem b/src/tests/data/x509/x509test/ValidNameConstraint.pem
index 3085e0cb3..3085e0cb3 100644
--- a/src/tests/data/x509test/ValidNameConstraint.pem
+++ b/src/tests/data/x509/x509test/ValidNameConstraint.pem
diff --git a/src/tests/data/x509test/ValidWildcard.pem b/src/tests/data/x509/x509test/ValidWildcard.pem
index 80e38c6f4..80e38c6f4 100644
--- a/src/tests/data/x509test/ValidWildcard.pem
+++ b/src/tests/data/x509/x509test/ValidWildcard.pem
diff --git a/src/tests/data/x509test/expected.txt b/src/tests/data/x509/x509test/expected.txt
index 14782ecf8..14782ecf8 100644
--- a/src/tests/data/x509test/expected.txt
+++ b/src/tests/data/x509/x509test/expected.txt
diff --git a/src/tests/data/x509test/root.pem b/src/tests/data/x509/x509test/root.pem
index b6b894a04..b6b894a04 100644
--- a/src/tests/data/x509test/root.pem
+++ b/src/tests/data/x509/x509test/root.pem
diff --git a/src/tests/test_certstor.cpp b/src/tests/test_certstor.cpp
index fff1ff8cc..9b3848f21 100644
--- a/src/tests/test_certstor.cpp
+++ b/src/tests/test_certstor.cpp
@@ -267,7 +267,7 @@ class Certstor_Tests final : public Test
    public:
       std::vector<Test::Result> run() override
          {
-         const std::string test_dir = Test::data_dir() + "/certstor";
+         const std::string test_dir = Test::data_dir() + "/x509/certstor";
          struct CertificateAndKeyFilenames
             {
             const std::string certificate;
diff --git a/src/tests/test_ffi.cpp b/src/tests/test_ffi.cpp
index d1879ff93..26325d21f 100644
--- a/src/tests/test_ffi.cpp
+++ b/src/tests/test_ffi.cpp
@@ -269,7 +269,7 @@ class FFI_Unit_Tests final : public Test
 #if defined(BOTAN_HAS_ECDSA)
          // x509 cert test
          botan_x509_cert_t cert;
-         if(TEST_FFI_OK(botan_x509_cert_load_file, (&cert, Test::data_file("ecc/CSCA.CSCA.csca-germany.1.crt").c_str())))
+         if(TEST_FFI_OK(botan_x509_cert_load_file, (&cert, Test::data_file("x509/ecc/CSCA.CSCA.csca-germany.1.crt").c_str())))
             {
             size_t date_len = 0;
             TEST_FFI_RC(BOTAN_FFI_ERROR_INSUFFICIENT_BUFFER_SPACE, botan_x509_cert_get_time_starts, (cert, nullptr, &date_len));
diff --git a/src/tests/test_name_constraint.cpp b/src/tests/test_name_constraint.cpp
index 62c014fde..93fb66a6b 100644
--- a/src/tests/test_name_constraint.cpp
+++ b/src/tests/test_name_constraint.cpp
@@ -65,8 +65,8 @@ class Name_Constraint_Tests final : public Test
 
          for(const auto& t : test_cases)
             {
-            Botan::X509_Certificate root(Test::data_file("name_constraint/" + std::get<0>(t)));
-            Botan::X509_Certificate sub(Test::data_file("name_constraint/" + std::get<1>(t)));
+            Botan::X509_Certificate root(Test::data_file("x509/name_constraint/" + std::get<0>(t)));
+            Botan::X509_Certificate sub(Test::data_file("x509/name_constraint/" + std::get<1>(t)));
             Botan::Certificate_Store_In_Memory trusted;
             Test::Result result("X509v3 Name Constraints: " + std::get<1>(t));
 
diff --git a/src/tests/test_ocsp.cpp b/src/tests/test_ocsp.cpp
index b0384acb8..1d64018cc 100644
--- a/src/tests/test_ocsp.cpp
+++ b/src/tests/test_ocsp.cpp
@@ -66,9 +66,9 @@ class OCSP_Tests final : public Test
          // Simple parsing tests
          const std::vector<std::string> ocsp_input_paths =
             {
-            "ocsp/resp1.der",
-            "ocsp/resp2.der",
-            "ocsp/resp3.der"
+            "x509/ocsp/resp1.der",
+            "x509/ocsp/resp2.der",
+            "x509/ocsp/resp3.der"
             };
 
          for(std::string ocsp_input_path : ocsp_input_paths)
@@ -93,7 +93,7 @@ class OCSP_Tests final : public Test
 
          try
             {
-            Botan::OCSP::Response resp1(slurp_data_file("ocsp/resp1.der"));
+            Botan::OCSP::Response resp1(slurp_data_file("x509/ocsp/resp1.der"));
             const auto &certs1 = resp1.certificates();
             if(result.test_eq("Expected count of certificates", certs1.size(), 1))
                {
@@ -105,7 +105,7 @@ class OCSP_Tests final : public Test
                result.test_eq("CN matches expected", matches, true);
                }
 
-            Botan::OCSP::Response resp2(slurp_data_file("ocsp/resp2.der"));
+            Botan::OCSP::Response resp2(slurp_data_file("x509/ocsp/resp2.der"));
             const auto &certs2 = resp2.certificates();
             result.test_eq("Expect no certificates", certs2.size(), 0);
             }
@@ -121,8 +121,8 @@ class OCSP_Tests final : public Test
          {
          Test::Result result("OCSP request encoding");
 
-         const Botan::X509_Certificate end_entity(Test::data_file("ocsp/gmail.pem"));
-         const Botan::X509_Certificate issuer(Test::data_file("ocsp/google_g2.pem"));
+         const Botan::X509_Certificate end_entity(Test::data_file("x509/ocsp/gmail.pem"));
+         const Botan::X509_Certificate issuer(Test::data_file("x509/ocsp/google_g2.pem"));
 
          try
             {
@@ -155,13 +155,13 @@ class OCSP_Tests final : public Test
          {
          Test::Result result("OCSP request check");
 
-         std::shared_ptr<const Botan::X509_Certificate> ee = load_test_X509_cert("ocsp/randombit.pem");
-         std::shared_ptr<const Botan::X509_Certificate> ca = load_test_X509_cert("ocsp/letsencrypt.pem");
-         std::shared_ptr<const Botan::X509_Certificate> trust_root = load_test_X509_cert("ocsp/geotrust.pem");
+         std::shared_ptr<const Botan::X509_Certificate> ee = load_test_X509_cert("x509/ocsp/randombit.pem");
+         std::shared_ptr<const Botan::X509_Certificate> ca = load_test_X509_cert("x509/ocsp/letsencrypt.pem");
+         std::shared_ptr<const Botan::X509_Certificate> trust_root = load_test_X509_cert("x509/ocsp/geotrust.pem");
 
          const std::vector<std::shared_ptr<const Botan::X509_Certificate>> cert_path = { ee, ca, trust_root };
 
-         std::shared_ptr<const Botan::OCSP::Response> ocsp = load_test_OCSP_resp("ocsp/randombit_ocsp.der");
+         std::shared_ptr<const Botan::OCSP::Response> ocsp = load_test_OCSP_resp("x509/ocsp/randombit_ocsp.der");
 
          Botan::Certificate_Store_In_Memory certstore;
          certstore.add_certificate(trust_root);
@@ -187,9 +187,9 @@ class OCSP_Tests final : public Test
          Test::Result result("OCSP online check");
 
          // Expired end-entity certificate:
-         std::shared_ptr<const Botan::X509_Certificate> ee = load_test_X509_cert("ocsp/randombit.pem");
-         std::shared_ptr<const Botan::X509_Certificate> ca = load_test_X509_cert("ocsp/letsencrypt.pem");
-         std::shared_ptr<const Botan::X509_Certificate> trust_root = load_test_X509_cert("ocsp/identrust.pem");
+         std::shared_ptr<const Botan::X509_Certificate> ee = load_test_X509_cert("x509/ocsp/randombit.pem");
+         std::shared_ptr<const Botan::X509_Certificate> ca = load_test_X509_cert("x509/ocsp/letsencrypt.pem");
+         std::shared_ptr<const Botan::X509_Certificate> trust_root = load_test_X509_cert("x509/ocsp/identrust.pem");
 
          const std::vector<std::shared_ptr<const Botan::X509_Certificate>> cert_path = { ee, ca, trust_root };
 
diff --git a/src/tests/test_x509_path.cpp b/src/tests/test_x509_path.cpp
index c1d8a5b17..2ac4a3fce 100644
--- a/src/tests/test_x509_path.cpp
+++ b/src/tests/test_x509_path.cpp
@@ -72,12 +72,12 @@ class X509test_Path_Validation_Tests final : public Test
          // Test certs generated by https://github.com/yymax/x509test
 
          std::map<std::string, std::string> expected =
-            read_results(Test::data_file("x509test/expected.txt"));
+            read_results(Test::data_file("x509/x509test/expected.txt"));
 
          // Current tests use SHA-1
          const Botan::Path_Validation_Restrictions restrictions(false, 80);
 
-         Botan::X509_Certificate root(Test::data_file("x509test/root.pem"));
+         Botan::X509_Certificate root(Test::data_file("x509/x509test/root.pem"));
          Botan::Certificate_Store_In_Memory trusted;
          trusted.add_certificate(root);
 
@@ -91,7 +91,7 @@ class X509test_Path_Validation_Tests final : public Test
             const std::string expected_result = i->second;
 
             std::vector<Botan::X509_Certificate> certs =
-               load_cert_file(Test::data_file("x509test/" + filename));
+               load_cert_file(Test::data_file("x509/x509test/" + filename));
 
             if(certs.empty())
                {
@@ -159,7 +159,7 @@ std::vector<Test::Result> NIST_Path_Validation_Tests::run()
    *  - Tests #75 and #76 are skipped as they make use of relatively
    *    obscure CRL extensions which are not supported.
    */
-   const std::string nist_test_dir = Test::data_dir() + "/nist_x509";
+   const std::string nist_test_dir = Test::data_dir() + "/x509/nist";
 
    try
       {
@@ -175,7 +175,7 @@ std::vector<Test::Result> NIST_Path_Validation_Tests::run()
       }
 
    std::map<std::string, std::string> expected =
-      read_results(Test::data_file("nist_x509/expected.txt"));
+      read_results(Test::data_file("x509/nist/expected.txt"));
 
    const Botan::X509_Certificate root_cert(nist_test_dir + "/root.crt");
    const Botan::X509_CRL root_crl(nist_test_dir + "/root.crl");
@@ -259,7 +259,7 @@ std::vector<Test::Result> Extended_Path_Validation_Tests::run()
    {
    std::vector<Test::Result> results;
 
-   const std::string extended_x509_test_dir = Test::data_dir() + "/extended_x509";
+   const std::string extended_x509_test_dir = Test::data_dir() + "/x509/extended";
 
    try
       {
@@ -275,7 +275,7 @@ std::vector<Test::Result> Extended_Path_Validation_Tests::run()
       }
 
    std::map<std::string, std::string> expected =
-      read_results(Test::data_file("extended_x509/expected.txt"));
+      read_results(Test::data_file("x509/extended/expected.txt"));
 
    for(auto i = expected.begin(); i != expected.end(); ++i)
       {
@@ -337,7 +337,7 @@ std::vector<Test::Result> PSS_Path_Validation_Tests::run()
    {
    std::vector<Test::Result> results;
 
-   const std::string pss_x509_test_dir = Test::data_dir() + "/pss_x509";
+   const std::string pss_x509_test_dir = Test::data_dir() + "/x509/pss_certs";
 
    try
       {
@@ -353,10 +353,10 @@ std::vector<Test::Result> PSS_Path_Validation_Tests::run()
       }
 
    std::map<std::string, std::string> expected =
-      read_results(Test::data_file("pss_x509/expected.txt"));
+      read_results(Test::data_file("x509/pss_certs/expected.txt"));
 
    std::map<std::string, std::string> validation_times =
-      read_results(Test::data_file("pss_x509/validation_times.txt"));
+      read_results(Test::data_file("x509/pss_certs/validation_times.txt"));
 
    auto validation_times_iter = validation_times.begin();
    for(auto i = expected.begin(); i != expected.end(); ++i)
diff --git a/src/tests/unit_ecdsa.cpp b/src/tests/unit_ecdsa.cpp
index 584fa5e1d..a406878fb 100644
--- a/src/tests/unit_ecdsa.cpp
+++ b/src/tests/unit_ecdsa.cpp
@@ -80,7 +80,7 @@ Test::Result test_hash_larger_than_n()
 Test::Result test_decode_ecdsa_X509()
    {
    Test::Result result("ECDSA Unit");
-   Botan::X509_Certificate cert(Test::data_file("ecc/CSCA.CSCA.csca-germany.1.crt"));
+   Botan::X509_Certificate cert(Test::data_file("x509/ecc/CSCA.CSCA.csca-germany.1.crt"));
 
    result.test_eq("correct signature oid", Botan::OIDS::lookup(cert.signature_algorithm().oid), "ECDSA/EMSA1(SHA-224)");
 
@@ -98,8 +98,8 @@ Test::Result test_decode_ecdsa_X509()
 Test::Result test_decode_ver_link_SHA256()
    {
    Test::Result result("ECDSA Unit");
-   Botan::X509_Certificate root_cert(Test::data_file("ecc/root2_SHA256.cer"));
-   Botan::X509_Certificate link_cert(Test::data_file("ecc/link_SHA256.cer"));
+   Botan::X509_Certificate root_cert(Test::data_file("x509/ecc/root2_SHA256.cer"));
+   Botan::X509_Certificate link_cert(Test::data_file("x509/ecc/link_SHA256.cer"));
 
    std::unique_ptr<Botan::Public_Key> pubkey(root_cert.subject_public_key());
    result.confirm("verified self-signed signature", link_cert.check_signature(*pubkey));
@@ -108,8 +108,8 @@ Test::Result test_decode_ver_link_SHA256()
 
 Test::Result test_decode_ver_link_SHA1()
    {
-   Botan::X509_Certificate root_cert(Test::data_file("ecc/root_SHA1.163.crt"));
-   Botan::X509_Certificate link_cert(Test::data_file("ecc/link_SHA1.166.crt"));
+   Botan::X509_Certificate root_cert(Test::data_file("x509/ecc/root_SHA1.163.crt"));
+   Botan::X509_Certificate link_cert(Test::data_file("x509/ecc/link_SHA1.166.crt"));
 
    Test::Result result("ECDSA Unit");
    std::unique_ptr<Botan::Public_Key> pubkey(root_cert.subject_public_key());
@@ -269,7 +269,7 @@ Test::Result test_read_pkcs8()
    try
       {
       std::unique_ptr<Botan::Private_Key> loaded_key_nodp(Botan::PKCS8::load_key(
-               Test::data_file("ecc/nodompar_private.pkcs8.pem"), Test::rng()));
+               Test::data_file("x509/ecc/nodompar_private.pkcs8.pem"), Test::rng()));
       // anew in each test with unregistered domain-parameters
       Botan::ECDSA_PrivateKey* ecdsa_nodp = dynamic_cast<Botan::ECDSA_PrivateKey*>(loaded_key_nodp.get());
       if(!ecdsa_nodp)
@@ -287,7 +287,7 @@ Test::Result test_read_pkcs8()
       try
          {
          std::unique_ptr<Botan::Private_Key> loaded_key_withdp(
-            Botan::PKCS8::load_key(Test::data_file("ecc/withdompar_private.pkcs8.pem"), Test::rng()));
+            Botan::PKCS8::load_key(Test::data_file("x509/ecc/withdompar_private.pkcs8.pem"), Test::rng()));
 
          result.test_failure("loaded key with unknown OID");
          }
@@ -369,7 +369,7 @@ Test::Result test_ecc_key_with_rfc5915_extensions()
    try
       {
       std::unique_ptr<Botan::Private_Key> pkcs8(
-         Botan::PKCS8::load_key(Test::data_file("ecc/ecc_private_with_rfc5915_ext.pem"), Test::rng()));
+         Botan::PKCS8::load_key(Test::data_file("x509/ecc/ecc_private_with_rfc5915_ext.pem"), Test::rng()));
 
       result.confirm("loaded RFC 5915 key", pkcs8.get());
       result.test_eq("key is ECDSA", pkcs8->algo_name(), "ECDSA");
@@ -390,7 +390,7 @@ Test::Result test_ecc_key_with_rfc5915_parameters()
    try
       {
       std::unique_ptr<Botan::Private_Key> pkcs8(
-         Botan::PKCS8::load_key(Test::data_file("ecc/ecc_private_with_rfc5915_parameters.pem"), Test::rng()));
+         Botan::PKCS8::load_key(Test::data_file("x509/ecc/ecc_private_with_rfc5915_parameters.pem"), Test::rng()));
 
       result.confirm("loaded RFC 5915 key", pkcs8.get());
       result.test_eq("key is ECDSA", pkcs8->algo_name(), "ECDSA");
diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
index d2156cf60..72c497ca7 100644
--- a/src/tests/unit_x509.cpp
+++ b/src/tests/unit_x509.cpp
@@ -367,9 +367,9 @@ Test::Result test_crl_dn_name()
 
    const Botan::OID dc_oid("0.9.2342.19200300.100.1.25");
 
-   Botan::X509_Certificate cert(Test::data_file("misc_certs/opcuactt_ca.der"));
+   Botan::X509_Certificate cert(Test::data_file("x509/misc/opcuactt_ca.der"));
 
-   Botan::DataSource_Stream key_input(Test::data_file("misc_certs/opcuactt_ca.pem"));
+   Botan::DataSource_Stream key_input(Test::data_file("x509/misc/opcuactt_ca.pem"));
    std::unique_ptr<Botan::Private_Key> key = Botan::PKCS8::load_key(key_input);
    Botan::X509_CA ca(cert, *key, "SHA-256", Test::rng());
 
@@ -389,7 +389,7 @@ Test::Result test_x509_utf8()
 
    try
       {
-      Botan::X509_Certificate utf8_cert(Test::data_file("x509test/contains_utf8string.pem"));
+      Botan::X509_Certificate utf8_cert(Test::data_file("x509/misc/contains_utf8string.pem"));
 
       // UTF-8 encoded fields of test certificate (contains cyrillic letters)
       const std::string organization =
@@ -425,7 +425,7 @@ Test::Result test_x509_bmpstring()
 
    try
       {
-      Botan::X509_Certificate ucs2_cert(Test::data_file("x509test/contains_bmpstring.pem"));
+      Botan::X509_Certificate ucs2_cert(Test::data_file("x509/misc/contains_bmpstring.pem"));
 
       // UTF-8 encoded fields of test certificate (contains cyrillic and greek letters)
       const std::string organization =