Shuffle things around. Add NIST X.509 test to build.

475 files changed, 0 insertions, 0 deletions

diff --git a/src/test-data/nist_x509/test01/end.crt b/src/test-data/nist_x509/test01/end.crt
new file mode 100644
index 000000000..d7e64d6de
--- /dev/null
+++ b/src/test-data/nist_x509/test01/end.crt
diff --git a/src/test-data/nist_x509/test01/root.crl b/src/test-data/nist_x509/test01/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test01/root.crl
diff --git a/src/test-data/nist_x509/test01/root.crt b/src/test-data/nist_x509/test01/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test01/root.crt
diff --git a/src/test-data/nist_x509/test02/end.crt b/src/test-data/nist_x509/test02/end.crt
new file mode 100644
index 000000000..f97da0509
--- /dev/null
+++ b/src/test-data/nist_x509/test02/end.crt
diff --git a/src/test-data/nist_x509/test02/int.crl b/src/test-data/nist_x509/test02/int.crl
new file mode 100644
index 000000000..e7dfa96ee
--- /dev/null
+++ b/src/test-data/nist_x509/test02/int.crl
diff --git a/src/test-data/nist_x509/test02/int.crt b/src/test-data/nist_x509/test02/int.crt
new file mode 100644
index 000000000..0aba75048
--- /dev/null
+++ b/src/test-data/nist_x509/test02/int.crt
diff --git a/src/test-data/nist_x509/test02/root.crl b/src/test-data/nist_x509/test02/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test02/root.crl
diff --git a/src/test-data/nist_x509/test02/root.crt b/src/test-data/nist_x509/test02/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test02/root.crt
diff --git a/src/test-data/nist_x509/test03/end.crt b/src/test-data/nist_x509/test03/end.crt
new file mode 100644
index 000000000..9b0463a67
--- /dev/null
+++ b/src/test-data/nist_x509/test03/end.crt
diff --git a/src/test-data/nist_x509/test03/int.crl b/src/test-data/nist_x509/test03/int.crl
new file mode 100644
index 000000000..528f3237c
--- /dev/null
+++ b/src/test-data/nist_x509/test03/int.crl
diff --git a/src/test-data/nist_x509/test03/int.crt b/src/test-data/nist_x509/test03/int.crt
new file mode 100644
index 000000000..c8cfc0550
--- /dev/null
+++ b/src/test-data/nist_x509/test03/int.crt
diff --git a/src/test-data/nist_x509/test03/root.crl b/src/test-data/nist_x509/test03/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test03/root.crl
diff --git a/src/test-data/nist_x509/test03/root.crt b/src/test-data/nist_x509/test03/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test03/root.crt
diff --git a/src/test-data/nist_x509/test04/end.crt b/src/test-data/nist_x509/test04/end.crt
new file mode 100644
index 000000000..75d2fd50e
--- /dev/null
+++ b/src/test-data/nist_x509/test04/end.crt
diff --git a/src/test-data/nist_x509/test04/int1.crl b/src/test-data/nist_x509/test04/int1.crl
new file mode 100644
index 000000000..2f30c77b5
--- /dev/null
+++ b/src/test-data/nist_x509/test04/int1.crl
diff --git a/src/test-data/nist_x509/test04/int1.crt b/src/test-data/nist_x509/test04/int1.crt
new file mode 100644
index 000000000..f4e88d58c
--- /dev/null
+++ b/src/test-data/nist_x509/test04/int1.crt
diff --git a/src/test-data/nist_x509/test04/int2.crl b/src/test-data/nist_x509/test04/int2.crl
new file mode 100644
index 000000000..e8596c314
--- /dev/null
+++ b/src/test-data/nist_x509/test04/int2.crl
diff --git a/src/test-data/nist_x509/test04/int2.crt b/src/test-data/nist_x509/test04/int2.crt
new file mode 100644
index 000000000..727035b6c
--- /dev/null
+++ b/src/test-data/nist_x509/test04/int2.crt
diff --git a/src/test-data/nist_x509/test04/root.crl b/src/test-data/nist_x509/test04/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test04/root.crl
diff --git a/src/test-data/nist_x509/test04/root.crt b/src/test-data/nist_x509/test04/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test04/root.crt
diff --git a/src/test-data/nist_x509/test05/end.crt b/src/test-data/nist_x509/test05/end.crt
new file mode 100644
index 000000000..a3a658923
--- /dev/null
+++ b/src/test-data/nist_x509/test05/end.crt
diff --git a/src/test-data/nist_x509/test05/int.crl b/src/test-data/nist_x509/test05/int.crl
new file mode 100644
index 000000000..a34ef279b
--- /dev/null
+++ b/src/test-data/nist_x509/test05/int.crl
diff --git a/src/test-data/nist_x509/test05/int.crt b/src/test-data/nist_x509/test05/int.crt
new file mode 100644
index 000000000..610df750e
--- /dev/null
+++ b/src/test-data/nist_x509/test05/int.crt
diff --git a/src/test-data/nist_x509/test05/root.crl b/src/test-data/nist_x509/test05/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test05/root.crl
diff --git a/src/test-data/nist_x509/test05/root.crt b/src/test-data/nist_x509/test05/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test05/root.crt
diff --git a/src/test-data/nist_x509/test06/end.crt b/src/test-data/nist_x509/test06/end.crt
new file mode 100644
index 000000000..1e68f0de1
--- /dev/null
+++ b/src/test-data/nist_x509/test06/end.crt
diff --git a/src/test-data/nist_x509/test06/int.crl b/src/test-data/nist_x509/test06/int.crl
new file mode 100644
index 000000000..d87cd7e26
--- /dev/null
+++ b/src/test-data/nist_x509/test06/int.crl
diff --git a/src/test-data/nist_x509/test06/int.crt b/src/test-data/nist_x509/test06/int.crt
new file mode 100644
index 000000000..5bb74d259
--- /dev/null
+++ b/src/test-data/nist_x509/test06/int.crt
diff --git a/src/test-data/nist_x509/test06/root.crl b/src/test-data/nist_x509/test06/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test06/root.crl
diff --git a/src/test-data/nist_x509/test06/root.crt b/src/test-data/nist_x509/test06/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test06/root.crt
diff --git a/src/test-data/nist_x509/test07/end.crt b/src/test-data/nist_x509/test07/end.crt
new file mode 100644
index 000000000..0f97e6f5a
--- /dev/null
+++ b/src/test-data/nist_x509/test07/end.crt
diff --git a/src/test-data/nist_x509/test07/int.crl b/src/test-data/nist_x509/test07/int.crl
new file mode 100644
index 000000000..8064e91bc
--- /dev/null
+++ b/src/test-data/nist_x509/test07/int.crl
diff --git a/src/test-data/nist_x509/test07/int.crt b/src/test-data/nist_x509/test07/int.crt
new file mode 100644
index 000000000..5c1ddd3e3
--- /dev/null
+++ b/src/test-data/nist_x509/test07/int.crt
diff --git a/src/test-data/nist_x509/test07/root.crl b/src/test-data/nist_x509/test07/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test07/root.crl
diff --git a/src/test-data/nist_x509/test07/root.crt b/src/test-data/nist_x509/test07/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test07/root.crt
diff --git a/src/test-data/nist_x509/test08/end.crt b/src/test-data/nist_x509/test08/end.crt
new file mode 100644
index 000000000..cb99c2ac5
--- /dev/null
+++ b/src/test-data/nist_x509/test08/end.crt
diff --git a/src/test-data/nist_x509/test08/int.crl b/src/test-data/nist_x509/test08/int.crl
new file mode 100644
index 000000000..d5ee3c3ce
--- /dev/null
+++ b/src/test-data/nist_x509/test08/int.crl
diff --git a/src/test-data/nist_x509/test08/int.crt b/src/test-data/nist_x509/test08/int.crt
new file mode 100644
index 000000000..d26979cdd
--- /dev/null
+++ b/src/test-data/nist_x509/test08/int.crt
diff --git a/src/test-data/nist_x509/test08/root.crl b/src/test-data/nist_x509/test08/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test08/root.crl
diff --git a/src/test-data/nist_x509/test08/root.crt b/src/test-data/nist_x509/test08/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test08/root.crt
diff --git a/src/test-data/nist_x509/test09/end.crt b/src/test-data/nist_x509/test09/end.crt
new file mode 100644
index 000000000..4dd2352b4
--- /dev/null
+++ b/src/test-data/nist_x509/test09/end.crt
diff --git a/src/test-data/nist_x509/test09/int.crl b/src/test-data/nist_x509/test09/int.crl
new file mode 100644
index 000000000..fbd85145c
--- /dev/null
+++ b/src/test-data/nist_x509/test09/int.crl
diff --git a/src/test-data/nist_x509/test09/int.crt b/src/test-data/nist_x509/test09/int.crt
new file mode 100644
index 000000000..c107dd756
--- /dev/null
+++ b/src/test-data/nist_x509/test09/int.crt
diff --git a/src/test-data/nist_x509/test09/root.crl b/src/test-data/nist_x509/test09/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test09/root.crl
diff --git a/src/test-data/nist_x509/test09/root.crt b/src/test-data/nist_x509/test09/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test09/root.crt
diff --git a/src/test-data/nist_x509/test10/end.crt b/src/test-data/nist_x509/test10/end.crt
new file mode 100644
index 000000000..de3924003
--- /dev/null
+++ b/src/test-data/nist_x509/test10/end.crt
diff --git a/src/test-data/nist_x509/test10/int.crl b/src/test-data/nist_x509/test10/int.crl
new file mode 100644
index 000000000..daefd50c8
--- /dev/null
+++ b/src/test-data/nist_x509/test10/int.crl
diff --git a/src/test-data/nist_x509/test10/int.crt b/src/test-data/nist_x509/test10/int.crt
new file mode 100644
index 000000000..2d691abce
--- /dev/null
+++ b/src/test-data/nist_x509/test10/int.crt
diff --git a/src/test-data/nist_x509/test10/root.crl b/src/test-data/nist_x509/test10/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test10/root.crl
diff --git a/src/test-data/nist_x509/test10/root.crt b/src/test-data/nist_x509/test10/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test10/root.crt
diff --git a/src/test-data/nist_x509/test11/end.crt b/src/test-data/nist_x509/test11/end.crt
new file mode 100644
index 000000000..6e14527d2
--- /dev/null
+++ b/src/test-data/nist_x509/test11/end.crt
diff --git a/src/test-data/nist_x509/test11/int.crl b/src/test-data/nist_x509/test11/int.crl
new file mode 100644
index 000000000..cc91ad51d
--- /dev/null
+++ b/src/test-data/nist_x509/test11/int.crl
diff --git a/src/test-data/nist_x509/test11/int.crt b/src/test-data/nist_x509/test11/int.crt
new file mode 100644
index 000000000..87fa07962
--- /dev/null
+++ b/src/test-data/nist_x509/test11/int.crt
diff --git a/src/test-data/nist_x509/test11/root.crl b/src/test-data/nist_x509/test11/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test11/root.crl
diff --git a/src/test-data/nist_x509/test11/root.crt b/src/test-data/nist_x509/test11/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test11/root.crt
diff --git a/src/test-data/nist_x509/test12/end.crt b/src/test-data/nist_x509/test12/end.crt
new file mode 100644
index 000000000..158c6ae01
--- /dev/null
+++ b/src/test-data/nist_x509/test12/end.crt
diff --git a/src/test-data/nist_x509/test12/int.crl b/src/test-data/nist_x509/test12/int.crl
new file mode 100644
index 000000000..7ce6928bb
--- /dev/null
+++ b/src/test-data/nist_x509/test12/int.crl
diff --git a/src/test-data/nist_x509/test12/int.crt b/src/test-data/nist_x509/test12/int.crt
new file mode 100644
index 000000000..a55333b63
--- /dev/null
+++ b/src/test-data/nist_x509/test12/int.crt
diff --git a/src/test-data/nist_x509/test12/root.crl b/src/test-data/nist_x509/test12/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test12/root.crl
diff --git a/src/test-data/nist_x509/test12/root.crt b/src/test-data/nist_x509/test12/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test12/root.crt
diff --git a/src/test-data/nist_x509/test13/end.crt b/src/test-data/nist_x509/test13/end.crt
new file mode 100644
index 000000000..d1ddf4b44
--- /dev/null
+++ b/src/test-data/nist_x509/test13/end.crt
diff --git a/src/test-data/nist_x509/test13/int.crl b/src/test-data/nist_x509/test13/int.crl
new file mode 100644
index 000000000..df86506d8
--- /dev/null
+++ b/src/test-data/nist_x509/test13/int.crl
diff --git a/src/test-data/nist_x509/test13/int.crt b/src/test-data/nist_x509/test13/int.crt
new file mode 100644
index 000000000..abc6fe537
--- /dev/null
+++ b/src/test-data/nist_x509/test13/int.crt
diff --git a/src/test-data/nist_x509/test13/root.crl b/src/test-data/nist_x509/test13/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test13/root.crl
diff --git a/src/test-data/nist_x509/test13/root.crt b/src/test-data/nist_x509/test13/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test13/root.crt
diff --git a/src/test-data/nist_x509/test14/end.crt b/src/test-data/nist_x509/test14/end.crt
new file mode 100644
index 000000000..f43e03826
--- /dev/null
+++ b/src/test-data/nist_x509/test14/end.crt
diff --git a/src/test-data/nist_x509/test14/int.crl b/src/test-data/nist_x509/test14/int.crl
new file mode 100644
index 000000000..ae372f38b
--- /dev/null
+++ b/src/test-data/nist_x509/test14/int.crl
diff --git a/src/test-data/nist_x509/test14/int.crt b/src/test-data/nist_x509/test14/int.crt
new file mode 100644
index 000000000..6e97ee2b8
--- /dev/null
+++ b/src/test-data/nist_x509/test14/int.crt
diff --git a/src/test-data/nist_x509/test14/root.crl b/src/test-data/nist_x509/test14/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test14/root.crl
diff --git a/src/test-data/nist_x509/test14/root.crt b/src/test-data/nist_x509/test14/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test14/root.crt
diff --git a/src/test-data/nist_x509/test15/end.crt b/src/test-data/nist_x509/test15/end.crt
new file mode 100644
index 000000000..a2408315c
--- /dev/null
+++ b/src/test-data/nist_x509/test15/end.crt
diff --git a/src/test-data/nist_x509/test15/int.crl b/src/test-data/nist_x509/test15/int.crl
new file mode 100644
index 000000000..626049aaf
--- /dev/null
+++ b/src/test-data/nist_x509/test15/int.crl
diff --git a/src/test-data/nist_x509/test15/int.crt b/src/test-data/nist_x509/test15/int.crt
new file mode 100644
index 000000000..23fb78c0f
--- /dev/null
+++ b/src/test-data/nist_x509/test15/int.crt
diff --git a/src/test-data/nist_x509/test15/root.crl b/src/test-data/nist_x509/test15/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test15/root.crl
diff --git a/src/test-data/nist_x509/test15/root.crt b/src/test-data/nist_x509/test15/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test15/root.crt
diff --git a/src/test-data/nist_x509/test16/end.crt b/src/test-data/nist_x509/test16/end.crt
new file mode 100644
index 000000000..108a75d73
--- /dev/null
+++ b/src/test-data/nist_x509/test16/end.crt
diff --git a/src/test-data/nist_x509/test16/int.crl b/src/test-data/nist_x509/test16/int.crl
new file mode 100644
index 000000000..d345a338e
--- /dev/null
+++ b/src/test-data/nist_x509/test16/int.crl
diff --git a/src/test-data/nist_x509/test16/int.crt b/src/test-data/nist_x509/test16/int.crt
new file mode 100644
index 000000000..6f2a332ad
--- /dev/null
+++ b/src/test-data/nist_x509/test16/int.crt
diff --git a/src/test-data/nist_x509/test16/root.crl b/src/test-data/nist_x509/test16/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test16/root.crl
diff --git a/src/test-data/nist_x509/test16/root.crt b/src/test-data/nist_x509/test16/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test16/root.crt
diff --git a/src/test-data/nist_x509/test17/end.crt b/src/test-data/nist_x509/test17/end.crt
new file mode 100644
index 000000000..b90340872
--- /dev/null
+++ b/src/test-data/nist_x509/test17/end.crt
diff --git a/src/test-data/nist_x509/test17/int.crl b/src/test-data/nist_x509/test17/int.crl
new file mode 100644
index 000000000..0b1ba6fda
--- /dev/null
+++ b/src/test-data/nist_x509/test17/int.crl
diff --git a/src/test-data/nist_x509/test17/int.crt b/src/test-data/nist_x509/test17/int.crt
new file mode 100644
index 000000000..25e7b48e5
--- /dev/null
+++ b/src/test-data/nist_x509/test17/int.crt
diff --git a/src/test-data/nist_x509/test17/root.crl b/src/test-data/nist_x509/test17/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test17/root.crl
diff --git a/src/test-data/nist_x509/test17/root.crt b/src/test-data/nist_x509/test17/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test17/root.crt
diff --git a/src/test-data/nist_x509/test18/end.crt b/src/test-data/nist_x509/test18/end.crt
new file mode 100644
index 000000000..2edb51394
--- /dev/null
+++ b/src/test-data/nist_x509/test18/end.crt
diff --git a/src/test-data/nist_x509/test18/int.crl b/src/test-data/nist_x509/test18/int.crl
new file mode 100644
index 000000000..2948246d7
--- /dev/null
+++ b/src/test-data/nist_x509/test18/int.crl
diff --git a/src/test-data/nist_x509/test18/int.crt b/src/test-data/nist_x509/test18/int.crt
new file mode 100644
index 000000000..eac3e8693
--- /dev/null
+++ b/src/test-data/nist_x509/test18/int.crt
diff --git a/src/test-data/nist_x509/test18/root.crl b/src/test-data/nist_x509/test18/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test18/root.crl
diff --git a/src/test-data/nist_x509/test18/root.crt b/src/test-data/nist_x509/test18/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test18/root.crt
diff --git a/src/test-data/nist_x509/test19/end.crt b/src/test-data/nist_x509/test19/end.crt
new file mode 100644
index 000000000..a9c7a1fc6
--- /dev/null
+++ b/src/test-data/nist_x509/test19/end.crt
diff --git a/src/test-data/nist_x509/test19/int.crt b/src/test-data/nist_x509/test19/int.crt
new file mode 100644
index 000000000..eff60dd15
--- /dev/null
+++ b/src/test-data/nist_x509/test19/int.crt
diff --git a/src/test-data/nist_x509/test19/root.crl b/src/test-data/nist_x509/test19/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test19/root.crl
diff --git a/src/test-data/nist_x509/test19/root.crt b/src/test-data/nist_x509/test19/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test19/root.crt
diff --git a/src/test-data/nist_x509/test20/end.crt b/src/test-data/nist_x509/test20/end.crt
new file mode 100644
index 000000000..b26e77c19
--- /dev/null
+++ b/src/test-data/nist_x509/test20/end.crt
diff --git a/src/test-data/nist_x509/test20/int.crl b/src/test-data/nist_x509/test20/int.crl
new file mode 100644
index 000000000..5755a2eae
--- /dev/null
+++ b/src/test-data/nist_x509/test20/int.crl
diff --git a/src/test-data/nist_x509/test20/int.crt b/src/test-data/nist_x509/test20/int.crt
new file mode 100644
index 000000000..d7daa69ef
--- /dev/null
+++ b/src/test-data/nist_x509/test20/int.crt
diff --git a/src/test-data/nist_x509/test20/root.crl b/src/test-data/nist_x509/test20/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test20/root.crl
diff --git a/src/test-data/nist_x509/test20/root.crt b/src/test-data/nist_x509/test20/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test20/root.crt
diff --git a/src/test-data/nist_x509/test21/end.crt b/src/test-data/nist_x509/test21/end.crt
new file mode 100644
index 000000000..798e5cf17
--- /dev/null
+++ b/src/test-data/nist_x509/test21/end.crt
diff --git a/src/test-data/nist_x509/test21/int.crl b/src/test-data/nist_x509/test21/int.crl
new file mode 100644
index 000000000..ea3cbb9d8
--- /dev/null
+++ b/src/test-data/nist_x509/test21/int.crl
diff --git a/src/test-data/nist_x509/test21/int.crt b/src/test-data/nist_x509/test21/int.crt
new file mode 100644
index 000000000..9082c4d77
--- /dev/null
+++ b/src/test-data/nist_x509/test21/int.crt
diff --git a/src/test-data/nist_x509/test21/root.crl b/src/test-data/nist_x509/test21/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test21/root.crl
diff --git a/src/test-data/nist_x509/test21/root.crt b/src/test-data/nist_x509/test21/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test21/root.crt
diff --git a/src/test-data/nist_x509/test22/end.crt b/src/test-data/nist_x509/test22/end.crt
new file mode 100644
index 000000000..d130c7506
--- /dev/null
+++ b/src/test-data/nist_x509/test22/end.crt
diff --git a/src/test-data/nist_x509/test22/int.crl b/src/test-data/nist_x509/test22/int.crl
new file mode 100644
index 000000000..07e18398d
--- /dev/null
+++ b/src/test-data/nist_x509/test22/int.crl
diff --git a/src/test-data/nist_x509/test22/int.crt b/src/test-data/nist_x509/test22/int.crt
new file mode 100644
index 000000000..d0f401bae
--- /dev/null
+++ b/src/test-data/nist_x509/test22/int.crt
diff --git a/src/test-data/nist_x509/test22/root.crl b/src/test-data/nist_x509/test22/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test22/root.crl
diff --git a/src/test-data/nist_x509/test22/root.crt b/src/test-data/nist_x509/test22/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test22/root.crt
diff --git a/src/test-data/nist_x509/test23/end.crt b/src/test-data/nist_x509/test23/end.crt
new file mode 100644
index 000000000..787941b16
--- /dev/null
+++ b/src/test-data/nist_x509/test23/end.crt
diff --git a/src/test-data/nist_x509/test23/int.crl b/src/test-data/nist_x509/test23/int.crl
new file mode 100644
index 000000000..2841be769
--- /dev/null
+++ b/src/test-data/nist_x509/test23/int.crl
diff --git a/src/test-data/nist_x509/test23/int.crt b/src/test-data/nist_x509/test23/int.crt
new file mode 100644
index 000000000..2890b3967
--- /dev/null
+++ b/src/test-data/nist_x509/test23/int.crt
diff --git a/src/test-data/nist_x509/test23/root.crl b/src/test-data/nist_x509/test23/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test23/root.crl
diff --git a/src/test-data/nist_x509/test23/root.crt b/src/test-data/nist_x509/test23/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test23/root.crt
diff --git a/src/test-data/nist_x509/test24/end.crt b/src/test-data/nist_x509/test24/end.crt
new file mode 100644
index 000000000..0d145b2fa
--- /dev/null
+++ b/src/test-data/nist_x509/test24/end.crt
diff --git a/src/test-data/nist_x509/test24/int.crl b/src/test-data/nist_x509/test24/int.crl
new file mode 100644
index 000000000..f608de6bb
--- /dev/null
+++ b/src/test-data/nist_x509/test24/int.crl
diff --git a/src/test-data/nist_x509/test24/int.crt b/src/test-data/nist_x509/test24/int.crt
new file mode 100644
index 000000000..a4633ee9a
--- /dev/null
+++ b/src/test-data/nist_x509/test24/int.crt
diff --git a/src/test-data/nist_x509/test24/root.crl b/src/test-data/nist_x509/test24/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test24/root.crl
diff --git a/src/test-data/nist_x509/test24/root.crt b/src/test-data/nist_x509/test24/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test24/root.crt
diff --git a/src/test-data/nist_x509/test25/end.crt b/src/test-data/nist_x509/test25/end.crt
new file mode 100644
index 000000000..d12670188
--- /dev/null
+++ b/src/test-data/nist_x509/test25/end.crt
diff --git a/src/test-data/nist_x509/test25/int.crl b/src/test-data/nist_x509/test25/int.crl
new file mode 100644
index 000000000..553e1bbd1
--- /dev/null
+++ b/src/test-data/nist_x509/test25/int.crl
diff --git a/src/test-data/nist_x509/test25/int.crt b/src/test-data/nist_x509/test25/int.crt
new file mode 100644
index 000000000..5d06aac4a
--- /dev/null
+++ b/src/test-data/nist_x509/test25/int.crt
diff --git a/src/test-data/nist_x509/test25/root.crl b/src/test-data/nist_x509/test25/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test25/root.crl
diff --git a/src/test-data/nist_x509/test25/root.crt b/src/test-data/nist_x509/test25/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test25/root.crt
diff --git a/src/test-data/nist_x509/test26/end.crt b/src/test-data/nist_x509/test26/end.crt
new file mode 100644
index 000000000..5abc96600
--- /dev/null
+++ b/src/test-data/nist_x509/test26/end.crt
diff --git a/src/test-data/nist_x509/test26/int.crl b/src/test-data/nist_x509/test26/int.crl
new file mode 100644
index 000000000..9f2f1b0a8
--- /dev/null
+++ b/src/test-data/nist_x509/test26/int.crl
diff --git a/src/test-data/nist_x509/test26/int.crt b/src/test-data/nist_x509/test26/int.crt
new file mode 100644
index 000000000..e9c273a05
--- /dev/null
+++ b/src/test-data/nist_x509/test26/int.crt
diff --git a/src/test-data/nist_x509/test26/root.crl b/src/test-data/nist_x509/test26/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test26/root.crl
diff --git a/src/test-data/nist_x509/test26/root.crt b/src/test-data/nist_x509/test26/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test26/root.crt
diff --git a/src/test-data/nist_x509/test27/end.crt b/src/test-data/nist_x509/test27/end.crt
new file mode 100644
index 000000000..2147dbd3a
--- /dev/null
+++ b/src/test-data/nist_x509/test27/end.crt
diff --git a/src/test-data/nist_x509/test27/int.crl b/src/test-data/nist_x509/test27/int.crl
new file mode 100644
index 000000000..fd769e5f3
--- /dev/null
+++ b/src/test-data/nist_x509/test27/int.crl
diff --git a/src/test-data/nist_x509/test27/int.crt b/src/test-data/nist_x509/test27/int.crt
new file mode 100644
index 000000000..4de4a9f51
--- /dev/null
+++ b/src/test-data/nist_x509/test27/int.crt
diff --git a/src/test-data/nist_x509/test27/root.crl b/src/test-data/nist_x509/test27/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test27/root.crl
diff --git a/src/test-data/nist_x509/test27/root.crt b/src/test-data/nist_x509/test27/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test27/root.crt
diff --git a/src/test-data/nist_x509/test28/end.crt b/src/test-data/nist_x509/test28/end.crt
new file mode 100644
index 000000000..c72c97b81
--- /dev/null
+++ b/src/test-data/nist_x509/test28/end.crt
diff --git a/src/test-data/nist_x509/test28/int.crl b/src/test-data/nist_x509/test28/int.crl
new file mode 100644
index 000000000..35e87eb0b
--- /dev/null
+++ b/src/test-data/nist_x509/test28/int.crl
diff --git a/src/test-data/nist_x509/test28/int.crt b/src/test-data/nist_x509/test28/int.crt
new file mode 100644
index 000000000..fee01f21e
--- /dev/null
+++ b/src/test-data/nist_x509/test28/int.crt
diff --git a/src/test-data/nist_x509/test28/root.crl b/src/test-data/nist_x509/test28/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test28/root.crl
diff --git a/src/test-data/nist_x509/test28/root.crt b/src/test-data/nist_x509/test28/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test28/root.crt
diff --git a/src/test-data/nist_x509/test29/end.crt b/src/test-data/nist_x509/test29/end.crt
new file mode 100644
index 000000000..e4e2dd072
--- /dev/null
+++ b/src/test-data/nist_x509/test29/end.crt
diff --git a/src/test-data/nist_x509/test29/int.crl b/src/test-data/nist_x509/test29/int.crl
new file mode 100644
index 000000000..2739bd933
--- /dev/null
+++ b/src/test-data/nist_x509/test29/int.crl
diff --git a/src/test-data/nist_x509/test29/int.crt b/src/test-data/nist_x509/test29/int.crt
new file mode 100644
index 000000000..e830043fd
--- /dev/null
+++ b/src/test-data/nist_x509/test29/int.crt
diff --git a/src/test-data/nist_x509/test29/root.crl b/src/test-data/nist_x509/test29/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test29/root.crl
diff --git a/src/test-data/nist_x509/test29/root.crt b/src/test-data/nist_x509/test29/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test29/root.crt
diff --git a/src/test-data/nist_x509/test30/end.crt b/src/test-data/nist_x509/test30/end.crt
new file mode 100644
index 000000000..abdc0381f
--- /dev/null
+++ b/src/test-data/nist_x509/test30/end.crt
diff --git a/src/test-data/nist_x509/test30/int.crl b/src/test-data/nist_x509/test30/int.crl
new file mode 100644
index 000000000..fed695a3b
--- /dev/null
+++ b/src/test-data/nist_x509/test30/int.crl
diff --git a/src/test-data/nist_x509/test30/int.crt b/src/test-data/nist_x509/test30/int.crt
new file mode 100644
index 000000000..26fd2cb6a
--- /dev/null
+++ b/src/test-data/nist_x509/test30/int.crt
diff --git a/src/test-data/nist_x509/test30/root.crl b/src/test-data/nist_x509/test30/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test30/root.crl
diff --git a/src/test-data/nist_x509/test30/root.crt b/src/test-data/nist_x509/test30/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test30/root.crt
diff --git a/src/test-data/nist_x509/test31/end.crt b/src/test-data/nist_x509/test31/end.crt
new file mode 100644
index 000000000..cd766ef7f
--- /dev/null
+++ b/src/test-data/nist_x509/test31/end.crt
diff --git a/src/test-data/nist_x509/test31/int.crl b/src/test-data/nist_x509/test31/int.crl
new file mode 100644
index 000000000..9014141f9
--- /dev/null
+++ b/src/test-data/nist_x509/test31/int.crl
diff --git a/src/test-data/nist_x509/test31/int.crt b/src/test-data/nist_x509/test31/int.crt
new file mode 100644
index 000000000..396947b15
--- /dev/null
+++ b/src/test-data/nist_x509/test31/int.crt
diff --git a/src/test-data/nist_x509/test31/root.crl b/src/test-data/nist_x509/test31/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test31/root.crl
diff --git a/src/test-data/nist_x509/test31/root.crt b/src/test-data/nist_x509/test31/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test31/root.crt
diff --git a/src/test-data/nist_x509/test32/end.crt b/src/test-data/nist_x509/test32/end.crt
new file mode 100644
index 000000000..3804a27b4
--- /dev/null
+++ b/src/test-data/nist_x509/test32/end.crt
diff --git a/src/test-data/nist_x509/test32/int.crl b/src/test-data/nist_x509/test32/int.crl
new file mode 100644
index 000000000..2e2e505a0
--- /dev/null
+++ b/src/test-data/nist_x509/test32/int.crl
diff --git a/src/test-data/nist_x509/test32/int.crt b/src/test-data/nist_x509/test32/int.crt
new file mode 100644
index 000000000..6df3396b7
--- /dev/null
+++ b/src/test-data/nist_x509/test32/int.crt
diff --git a/src/test-data/nist_x509/test32/root.crl b/src/test-data/nist_x509/test32/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test32/root.crl
diff --git a/src/test-data/nist_x509/test32/root.crt b/src/test-data/nist_x509/test32/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test32/root.crt
diff --git a/src/test-data/nist_x509/test33/end.crt b/src/test-data/nist_x509/test33/end.crt
new file mode 100644
index 000000000..6ef1d03a8
--- /dev/null
+++ b/src/test-data/nist_x509/test33/end.crt
diff --git a/src/test-data/nist_x509/test33/int.crl b/src/test-data/nist_x509/test33/int.crl
new file mode 100644
index 000000000..4008e3d46
--- /dev/null
+++ b/src/test-data/nist_x509/test33/int.crl
diff --git a/src/test-data/nist_x509/test33/int.crt b/src/test-data/nist_x509/test33/int.crt
new file mode 100644
index 000000000..ba183696e
--- /dev/null
+++ b/src/test-data/nist_x509/test33/int.crt
diff --git a/src/test-data/nist_x509/test33/root.crl b/src/test-data/nist_x509/test33/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test33/root.crl
diff --git a/src/test-data/nist_x509/test33/root.crt b/src/test-data/nist_x509/test33/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test33/root.crt
diff --git a/src/test-data/nist_x509/test34/end.crt b/src/test-data/nist_x509/test34/end.crt
new file mode 100644
index 000000000..695de1cb4
--- /dev/null
+++ b/src/test-data/nist_x509/test34/end.crt
diff --git a/src/test-data/nist_x509/test34/int.crl b/src/test-data/nist_x509/test34/int.crl
new file mode 100644
index 000000000..a8d11e788
--- /dev/null
+++ b/src/test-data/nist_x509/test34/int.crl
diff --git a/src/test-data/nist_x509/test34/int.crt b/src/test-data/nist_x509/test34/int.crt
new file mode 100644
index 000000000..5657ddaf6
--- /dev/null
+++ b/src/test-data/nist_x509/test34/int.crt
diff --git a/src/test-data/nist_x509/test34/root.crl b/src/test-data/nist_x509/test34/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test34/root.crl
diff --git a/src/test-data/nist_x509/test34/root.crt b/src/test-data/nist_x509/test34/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test34/root.crt
diff --git a/src/test-data/nist_x509/test35/end.crt b/src/test-data/nist_x509/test35/end.crt
new file mode 100644
index 000000000..26846be18
--- /dev/null
+++ b/src/test-data/nist_x509/test35/end.crt
diff --git a/src/test-data/nist_x509/test35/int.crl b/src/test-data/nist_x509/test35/int.crl
new file mode 100644
index 000000000..f7021d32c
--- /dev/null
+++ b/src/test-data/nist_x509/test35/int.crl
diff --git a/src/test-data/nist_x509/test35/int.crt b/src/test-data/nist_x509/test35/int.crt
new file mode 100644
index 000000000..6a6641823
--- /dev/null
+++ b/src/test-data/nist_x509/test35/int.crt
diff --git a/src/test-data/nist_x509/test35/root.crl b/src/test-data/nist_x509/test35/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test35/root.crl
diff --git a/src/test-data/nist_x509/test35/root.crt b/src/test-data/nist_x509/test35/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test35/root.crt
diff --git a/src/test-data/nist_x509/test36/end.crt b/src/test-data/nist_x509/test36/end.crt
new file mode 100644
index 000000000..ee6ec5f4b
--- /dev/null
+++ b/src/test-data/nist_x509/test36/end.crt
diff --git a/src/test-data/nist_x509/test36/int1.crl b/src/test-data/nist_x509/test36/int1.crl
new file mode 100644
index 000000000..d4ad1013d
--- /dev/null
+++ b/src/test-data/nist_x509/test36/int1.crl
diff --git a/src/test-data/nist_x509/test36/int1.crt b/src/test-data/nist_x509/test36/int1.crt
new file mode 100644
index 000000000..a300e8d67
--- /dev/null
+++ b/src/test-data/nist_x509/test36/int1.crt
diff --git a/src/test-data/nist_x509/test36/int2.crl b/src/test-data/nist_x509/test36/int2.crl
new file mode 100644
index 000000000..d45cedcee
--- /dev/null
+++ b/src/test-data/nist_x509/test36/int2.crl
diff --git a/src/test-data/nist_x509/test36/int2.crt b/src/test-data/nist_x509/test36/int2.crt
new file mode 100644
index 000000000..87c8253c3
--- /dev/null
+++ b/src/test-data/nist_x509/test36/int2.crt
diff --git a/src/test-data/nist_x509/test36/root.crl b/src/test-data/nist_x509/test36/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test36/root.crl
diff --git a/src/test-data/nist_x509/test36/root.crt b/src/test-data/nist_x509/test36/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test36/root.crt
diff --git a/src/test-data/nist_x509/test37/end.crt b/src/test-data/nist_x509/test37/end.crt
new file mode 100644
index 000000000..e5c5ae8c7
--- /dev/null
+++ b/src/test-data/nist_x509/test37/end.crt
diff --git a/src/test-data/nist_x509/test37/int1.crl b/src/test-data/nist_x509/test37/int1.crl
new file mode 100644
index 000000000..6b488fdb8
--- /dev/null
+++ b/src/test-data/nist_x509/test37/int1.crl
diff --git a/src/test-data/nist_x509/test37/int1.crt b/src/test-data/nist_x509/test37/int1.crt
new file mode 100644
index 000000000..26b6b9605
--- /dev/null
+++ b/src/test-data/nist_x509/test37/int1.crt
diff --git a/src/test-data/nist_x509/test37/int2.crl b/src/test-data/nist_x509/test37/int2.crl
new file mode 100644
index 000000000..724051124
--- /dev/null
+++ b/src/test-data/nist_x509/test37/int2.crl
diff --git a/src/test-data/nist_x509/test37/int2.crt b/src/test-data/nist_x509/test37/int2.crt
new file mode 100644
index 000000000..c0e986a08
--- /dev/null
+++ b/src/test-data/nist_x509/test37/int2.crt
diff --git a/src/test-data/nist_x509/test37/root.crl b/src/test-data/nist_x509/test37/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test37/root.crl
diff --git a/src/test-data/nist_x509/test37/root.crt b/src/test-data/nist_x509/test37/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test37/root.crt
diff --git a/src/test-data/nist_x509/test38/end.crt b/src/test-data/nist_x509/test38/end.crt
new file mode 100644
index 000000000..9331b90a2
--- /dev/null
+++ b/src/test-data/nist_x509/test38/end.crt
diff --git a/src/test-data/nist_x509/test38/int1.crl b/src/test-data/nist_x509/test38/int1.crl
new file mode 100644
index 000000000..81f75d4e5
--- /dev/null
+++ b/src/test-data/nist_x509/test38/int1.crl
diff --git a/src/test-data/nist_x509/test38/int1.crt b/src/test-data/nist_x509/test38/int1.crt
new file mode 100644
index 000000000..c8ee614f4
--- /dev/null
+++ b/src/test-data/nist_x509/test38/int1.crt
diff --git a/src/test-data/nist_x509/test38/int2.crl b/src/test-data/nist_x509/test38/int2.crl
new file mode 100644
index 000000000..ae1d7d5e8
--- /dev/null
+++ b/src/test-data/nist_x509/test38/int2.crl
diff --git a/src/test-data/nist_x509/test38/int2.crt b/src/test-data/nist_x509/test38/int2.crt
new file mode 100644
index 000000000..8d2834294
--- /dev/null
+++ b/src/test-data/nist_x509/test38/int2.crt
diff --git a/src/test-data/nist_x509/test38/root.crl b/src/test-data/nist_x509/test38/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test38/root.crl
diff --git a/src/test-data/nist_x509/test38/root.crt b/src/test-data/nist_x509/test38/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test38/root.crt
diff --git a/src/test-data/nist_x509/test39/end.crt b/src/test-data/nist_x509/test39/end.crt
new file mode 100644
index 000000000..57263d4cb
--- /dev/null
+++ b/src/test-data/nist_x509/test39/end.crt
diff --git a/src/test-data/nist_x509/test39/int1.crl b/src/test-data/nist_x509/test39/int1.crl
new file mode 100644
index 000000000..f2a01385e
--- /dev/null
+++ b/src/test-data/nist_x509/test39/int1.crl
diff --git a/src/test-data/nist_x509/test39/int1.crt b/src/test-data/nist_x509/test39/int1.crt
new file mode 100644
index 000000000..b7003f7eb
--- /dev/null
+++ b/src/test-data/nist_x509/test39/int1.crt
diff --git a/src/test-data/nist_x509/test39/int2.crl b/src/test-data/nist_x509/test39/int2.crl
new file mode 100644
index 000000000..b6672d85a
--- /dev/null
+++ b/src/test-data/nist_x509/test39/int2.crl
diff --git a/src/test-data/nist_x509/test39/int2.crt b/src/test-data/nist_x509/test39/int2.crt
new file mode 100644
index 000000000..c56ce57f0
--- /dev/null
+++ b/src/test-data/nist_x509/test39/int2.crt
diff --git a/src/test-data/nist_x509/test39/int3.crl b/src/test-data/nist_x509/test39/int3.crl
new file mode 100644
index 000000000..453420be8
--- /dev/null
+++ b/src/test-data/nist_x509/test39/int3.crl
diff --git a/src/test-data/nist_x509/test39/int3.crt b/src/test-data/nist_x509/test39/int3.crt
new file mode 100644
index 000000000..ce1224ada
--- /dev/null
+++ b/src/test-data/nist_x509/test39/int3.crt
diff --git a/src/test-data/nist_x509/test39/root.crl b/src/test-data/nist_x509/test39/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test39/root.crl
diff --git a/src/test-data/nist_x509/test39/root.crt b/src/test-data/nist_x509/test39/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test39/root.crt
diff --git a/src/test-data/nist_x509/test40/end.crt b/src/test-data/nist_x509/test40/end.crt
new file mode 100644
index 000000000..24ce9e4d8
--- /dev/null
+++ b/src/test-data/nist_x509/test40/end.crt
diff --git a/src/test-data/nist_x509/test40/int1.crl b/src/test-data/nist_x509/test40/int1.crl
new file mode 100644
index 000000000..5bd6a9f83
--- /dev/null
+++ b/src/test-data/nist_x509/test40/int1.crl
diff --git a/src/test-data/nist_x509/test40/int1.crt b/src/test-data/nist_x509/test40/int1.crt
new file mode 100644
index 000000000..5a8ac5006
--- /dev/null
+++ b/src/test-data/nist_x509/test40/int1.crt
diff --git a/src/test-data/nist_x509/test40/int2.crl b/src/test-data/nist_x509/test40/int2.crl
new file mode 100644
index 000000000..dde5a124c
--- /dev/null
+++ b/src/test-data/nist_x509/test40/int2.crl
diff --git a/src/test-data/nist_x509/test40/int2.crt b/src/test-data/nist_x509/test40/int2.crt
new file mode 100644
index 000000000..70e4d9092
--- /dev/null
+++ b/src/test-data/nist_x509/test40/int2.crt
diff --git a/src/test-data/nist_x509/test40/int3.crl b/src/test-data/nist_x509/test40/int3.crl
new file mode 100644
index 000000000..713fa4bbf
--- /dev/null
+++ b/src/test-data/nist_x509/test40/int3.crl
diff --git a/src/test-data/nist_x509/test40/int3.crt b/src/test-data/nist_x509/test40/int3.crt
new file mode 100644
index 000000000..a0c673453
--- /dev/null
+++ b/src/test-data/nist_x509/test40/int3.crt
diff --git a/src/test-data/nist_x509/test40/root.crl b/src/test-data/nist_x509/test40/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test40/root.crl
diff --git a/src/test-data/nist_x509/test40/root.crt b/src/test-data/nist_x509/test40/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test40/root.crt
diff --git a/src/test-data/nist_x509/test41/end.crt b/src/test-data/nist_x509/test41/end.crt
new file mode 100644
index 000000000..b88e38eb9
--- /dev/null
+++ b/src/test-data/nist_x509/test41/end.crt
diff --git a/src/test-data/nist_x509/test41/int1.crl b/src/test-data/nist_x509/test41/int1.crl
new file mode 100644
index 000000000..2d4c41521
--- /dev/null
+++ b/src/test-data/nist_x509/test41/int1.crl
diff --git a/src/test-data/nist_x509/test41/int1.crt b/src/test-data/nist_x509/test41/int1.crt
new file mode 100644
index 000000000..4b96b2afb
--- /dev/null
+++ b/src/test-data/nist_x509/test41/int1.crt
diff --git a/src/test-data/nist_x509/test41/int2.crl b/src/test-data/nist_x509/test41/int2.crl
new file mode 100644
index 000000000..e389a7fd9
--- /dev/null
+++ b/src/test-data/nist_x509/test41/int2.crl
diff --git a/src/test-data/nist_x509/test41/int2.crt b/src/test-data/nist_x509/test41/int2.crt
new file mode 100644
index 000000000..4b1edc710
--- /dev/null
+++ b/src/test-data/nist_x509/test41/int2.crt
diff --git a/src/test-data/nist_x509/test41/int3.crl b/src/test-data/nist_x509/test41/int3.crl
new file mode 100644
index 000000000..d26dc1b75
--- /dev/null
+++ b/src/test-data/nist_x509/test41/int3.crl
diff --git a/src/test-data/nist_x509/test41/int3.crt b/src/test-data/nist_x509/test41/int3.crt
new file mode 100644
index 000000000..6012a3a5b
--- /dev/null
+++ b/src/test-data/nist_x509/test41/int3.crt
diff --git a/src/test-data/nist_x509/test41/root.crl b/src/test-data/nist_x509/test41/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test41/root.crl
diff --git a/src/test-data/nist_x509/test41/root.crt b/src/test-data/nist_x509/test41/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test41/root.crt
diff --git a/src/test-data/nist_x509/test42/end.crt b/src/test-data/nist_x509/test42/end.crt
new file mode 100644
index 000000000..9815c5d5c
--- /dev/null
+++ b/src/test-data/nist_x509/test42/end.crt
diff --git a/src/test-data/nist_x509/test42/int1.crl b/src/test-data/nist_x509/test42/int1.crl
new file mode 100644
index 000000000..d4f21dbe3
--- /dev/null
+++ b/src/test-data/nist_x509/test42/int1.crl
diff --git a/src/test-data/nist_x509/test42/int1.crt b/src/test-data/nist_x509/test42/int1.crt
new file mode 100644
index 000000000..f344a9f27
--- /dev/null
+++ b/src/test-data/nist_x509/test42/int1.crt
diff --git a/src/test-data/nist_x509/test42/int2.crl b/src/test-data/nist_x509/test42/int2.crl
new file mode 100644
index 000000000..32906057a
--- /dev/null
+++ b/src/test-data/nist_x509/test42/int2.crl
diff --git a/src/test-data/nist_x509/test42/int2.crt b/src/test-data/nist_x509/test42/int2.crt
new file mode 100644
index 000000000..a2fd05ccb
--- /dev/null
+++ b/src/test-data/nist_x509/test42/int2.crt
diff --git a/src/test-data/nist_x509/test42/int3.crl b/src/test-data/nist_x509/test42/int3.crl
new file mode 100644
index 000000000..ee2b2b18c
--- /dev/null
+++ b/src/test-data/nist_x509/test42/int3.crl
diff --git a/src/test-data/nist_x509/test42/int3.crt b/src/test-data/nist_x509/test42/int3.crt
new file mode 100644
index 000000000..8104a65f8
--- /dev/null
+++ b/src/test-data/nist_x509/test42/int3.crt
diff --git a/src/test-data/nist_x509/test42/int4.crl b/src/test-data/nist_x509/test42/int4.crl
new file mode 100644
index 000000000..7602160fa
--- /dev/null
+++ b/src/test-data/nist_x509/test42/int4.crl
diff --git a/src/test-data/nist_x509/test42/int4.crt b/src/test-data/nist_x509/test42/int4.crt
new file mode 100644
index 000000000..5b6ffbd4e
--- /dev/null
+++ b/src/test-data/nist_x509/test42/int4.crt
diff --git a/src/test-data/nist_x509/test42/root.crl b/src/test-data/nist_x509/test42/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test42/root.crl
diff --git a/src/test-data/nist_x509/test42/root.crt b/src/test-data/nist_x509/test42/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test42/root.crt
diff --git a/src/test-data/nist_x509/test43/end.crt b/src/test-data/nist_x509/test43/end.crt
new file mode 100644
index 000000000..9465ea5bf
--- /dev/null
+++ b/src/test-data/nist_x509/test43/end.crt
diff --git a/src/test-data/nist_x509/test43/int1.crl b/src/test-data/nist_x509/test43/int1.crl
new file mode 100644
index 000000000..4ce26fdb9
--- /dev/null
+++ b/src/test-data/nist_x509/test43/int1.crl
diff --git a/src/test-data/nist_x509/test43/int1.crt b/src/test-data/nist_x509/test43/int1.crt
new file mode 100644
index 000000000..e18a4e168
--- /dev/null
+++ b/src/test-data/nist_x509/test43/int1.crt
diff --git a/src/test-data/nist_x509/test43/int2.crl b/src/test-data/nist_x509/test43/int2.crl
new file mode 100644
index 000000000..9820bc6f6
--- /dev/null
+++ b/src/test-data/nist_x509/test43/int2.crl
diff --git a/src/test-data/nist_x509/test43/int2.crt b/src/test-data/nist_x509/test43/int2.crt
new file mode 100644
index 000000000..1521fce98
--- /dev/null
+++ b/src/test-data/nist_x509/test43/int2.crt
diff --git a/src/test-data/nist_x509/test43/int3.crl b/src/test-data/nist_x509/test43/int3.crl
new file mode 100644
index 000000000..b8dfd8dfd
--- /dev/null
+++ b/src/test-data/nist_x509/test43/int3.crl
diff --git a/src/test-data/nist_x509/test43/int3.crt b/src/test-data/nist_x509/test43/int3.crt
new file mode 100644
index 000000000..30b9706d8
--- /dev/null
+++ b/src/test-data/nist_x509/test43/int3.crt
diff --git a/src/test-data/nist_x509/test43/int4.crl b/src/test-data/nist_x509/test43/int4.crl
new file mode 100644
index 000000000..4b4136209
--- /dev/null
+++ b/src/test-data/nist_x509/test43/int4.crl
diff --git a/src/test-data/nist_x509/test43/int4.crt b/src/test-data/nist_x509/test43/int4.crt
new file mode 100644
index 000000000..949562273
--- /dev/null
+++ b/src/test-data/nist_x509/test43/int4.crt
diff --git a/src/test-data/nist_x509/test43/root.crl b/src/test-data/nist_x509/test43/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test43/root.crl
diff --git a/src/test-data/nist_x509/test43/root.crt b/src/test-data/nist_x509/test43/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test43/root.crt
diff --git a/src/test-data/nist_x509/test44/end.crt b/src/test-data/nist_x509/test44/end.crt
new file mode 100644
index 000000000..5fc9bec78
--- /dev/null
+++ b/src/test-data/nist_x509/test44/end.crt
diff --git a/src/test-data/nist_x509/test44/int1.crl b/src/test-data/nist_x509/test44/int1.crl
new file mode 100644
index 000000000..2d4478cfc
--- /dev/null
+++ b/src/test-data/nist_x509/test44/int1.crl
diff --git a/src/test-data/nist_x509/test44/int1.crt b/src/test-data/nist_x509/test44/int1.crt
new file mode 100644
index 000000000..fbfd2a4d0
--- /dev/null
+++ b/src/test-data/nist_x509/test44/int1.crt
diff --git a/src/test-data/nist_x509/test44/int2.crl b/src/test-data/nist_x509/test44/int2.crl
new file mode 100644
index 000000000..780ef7c0f
--- /dev/null
+++ b/src/test-data/nist_x509/test44/int2.crl
diff --git a/src/test-data/nist_x509/test44/int2.crt b/src/test-data/nist_x509/test44/int2.crt
new file mode 100644
index 000000000..26f319399
--- /dev/null
+++ b/src/test-data/nist_x509/test44/int2.crt
diff --git a/src/test-data/nist_x509/test44/int3.crl b/src/test-data/nist_x509/test44/int3.crl
new file mode 100644
index 000000000..5e5267ed9
--- /dev/null
+++ b/src/test-data/nist_x509/test44/int3.crl
diff --git a/src/test-data/nist_x509/test44/int3.crt b/src/test-data/nist_x509/test44/int3.crt
new file mode 100644
index 000000000..7f62ef6ef
--- /dev/null
+++ b/src/test-data/nist_x509/test44/int3.crt
diff --git a/src/test-data/nist_x509/test44/int4.crl b/src/test-data/nist_x509/test44/int4.crl
new file mode 100644
index 000000000..5d775f551
--- /dev/null
+++ b/src/test-data/nist_x509/test44/int4.crl
diff --git a/src/test-data/nist_x509/test44/int4.crt b/src/test-data/nist_x509/test44/int4.crt
new file mode 100644
index 000000000..76d6111ec
--- /dev/null
+++ b/src/test-data/nist_x509/test44/int4.crt
diff --git a/src/test-data/nist_x509/test44/root.crl b/src/test-data/nist_x509/test44/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test44/root.crl
diff --git a/src/test-data/nist_x509/test44/root.crt b/src/test-data/nist_x509/test44/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test44/root.crt
diff --git a/src/test-data/nist_x509/test45/end.crt b/src/test-data/nist_x509/test45/end.crt
new file mode 100644
index 000000000..a2ddb0430
--- /dev/null
+++ b/src/test-data/nist_x509/test45/end.crt
diff --git a/src/test-data/nist_x509/test45/int1.crl b/src/test-data/nist_x509/test45/int1.crl
new file mode 100644
index 000000000..079062c14
--- /dev/null
+++ b/src/test-data/nist_x509/test45/int1.crl
diff --git a/src/test-data/nist_x509/test45/int1.crt b/src/test-data/nist_x509/test45/int1.crt
new file mode 100644
index 000000000..90ee8e3fe
--- /dev/null
+++ b/src/test-data/nist_x509/test45/int1.crt
diff --git a/src/test-data/nist_x509/test45/int2.crl b/src/test-data/nist_x509/test45/int2.crl
new file mode 100644
index 000000000..7c12bd0c3
--- /dev/null
+++ b/src/test-data/nist_x509/test45/int2.crl
diff --git a/src/test-data/nist_x509/test45/int2.crt b/src/test-data/nist_x509/test45/int2.crt
new file mode 100644
index 000000000..7fc0467ca
--- /dev/null
+++ b/src/test-data/nist_x509/test45/int2.crt
diff --git a/src/test-data/nist_x509/test45/int3.crl b/src/test-data/nist_x509/test45/int3.crl
new file mode 100644
index 000000000..f81b5042f
--- /dev/null
+++ b/src/test-data/nist_x509/test45/int3.crl
diff --git a/src/test-data/nist_x509/test45/int3.crt b/src/test-data/nist_x509/test45/int3.crt
new file mode 100644
index 000000000..fb9500f12
--- /dev/null
+++ b/src/test-data/nist_x509/test45/int3.crt
diff --git a/src/test-data/nist_x509/test45/int4.crl b/src/test-data/nist_x509/test45/int4.crl
new file mode 100644
index 000000000..9e67a4a91
--- /dev/null
+++ b/src/test-data/nist_x509/test45/int4.crl
diff --git a/src/test-data/nist_x509/test45/int4.crt b/src/test-data/nist_x509/test45/int4.crt
new file mode 100644
index 000000000..60b6c9133
--- /dev/null
+++ b/src/test-data/nist_x509/test45/int4.crt
diff --git a/src/test-data/nist_x509/test45/root.crl b/src/test-data/nist_x509/test45/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test45/root.crl
diff --git a/src/test-data/nist_x509/test45/root.crt b/src/test-data/nist_x509/test45/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test45/root.crt
diff --git a/src/test-data/nist_x509/test46/end.crt b/src/test-data/nist_x509/test46/end.crt
new file mode 100644
index 000000000..39ebf20a3
--- /dev/null
+++ b/src/test-data/nist_x509/test46/end.crt
diff --git a/src/test-data/nist_x509/test46/int1.crl b/src/test-data/nist_x509/test46/int1.crl
new file mode 100644
index 000000000..f9a2236bc
--- /dev/null
+++ b/src/test-data/nist_x509/test46/int1.crl
diff --git a/src/test-data/nist_x509/test46/int1.crt b/src/test-data/nist_x509/test46/int1.crt
new file mode 100644
index 000000000..985a5d575
--- /dev/null
+++ b/src/test-data/nist_x509/test46/int1.crt
diff --git a/src/test-data/nist_x509/test46/int2.crl b/src/test-data/nist_x509/test46/int2.crl
new file mode 100644
index 000000000..02e82c48a
--- /dev/null
+++ b/src/test-data/nist_x509/test46/int2.crl
diff --git a/src/test-data/nist_x509/test46/int2.crt b/src/test-data/nist_x509/test46/int2.crt
new file mode 100644
index 000000000..ade64339c
--- /dev/null
+++ b/src/test-data/nist_x509/test46/int2.crt
diff --git a/src/test-data/nist_x509/test46/int3.crl b/src/test-data/nist_x509/test46/int3.crl
new file mode 100644
index 000000000..ddd59a80c
--- /dev/null
+++ b/src/test-data/nist_x509/test46/int3.crl
diff --git a/src/test-data/nist_x509/test46/int3.crt b/src/test-data/nist_x509/test46/int3.crt
new file mode 100644
index 000000000..6e33faaaa
--- /dev/null
+++ b/src/test-data/nist_x509/test46/int3.crt
diff --git a/src/test-data/nist_x509/test46/int4.crl b/src/test-data/nist_x509/test46/int4.crl
new file mode 100644
index 000000000..3dedfb11e
--- /dev/null
+++ b/src/test-data/nist_x509/test46/int4.crl
diff --git a/src/test-data/nist_x509/test46/int4.crt b/src/test-data/nist_x509/test46/int4.crt
new file mode 100644
index 000000000..1b3fc5726
--- /dev/null
+++ b/src/test-data/nist_x509/test46/int4.crt
diff --git a/src/test-data/nist_x509/test46/root.crl b/src/test-data/nist_x509/test46/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test46/root.crl
diff --git a/src/test-data/nist_x509/test46/root.crt b/src/test-data/nist_x509/test46/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test46/root.crt
diff --git a/src/test-data/nist_x509/test47/end.crt b/src/test-data/nist_x509/test47/end.crt
new file mode 100644
index 000000000..7337bc5b5
--- /dev/null
+++ b/src/test-data/nist_x509/test47/end.crt
diff --git a/src/test-data/nist_x509/test47/int1.crl b/src/test-data/nist_x509/test47/int1.crl
new file mode 100644
index 000000000..938e3f412
--- /dev/null
+++ b/src/test-data/nist_x509/test47/int1.crl
diff --git a/src/test-data/nist_x509/test47/int1.crt b/src/test-data/nist_x509/test47/int1.crt
new file mode 100644
index 000000000..bf3e22239
--- /dev/null
+++ b/src/test-data/nist_x509/test47/int1.crt
diff --git a/src/test-data/nist_x509/test47/int2.crl b/src/test-data/nist_x509/test47/int2.crl
new file mode 100644
index 000000000..f715c112d
--- /dev/null
+++ b/src/test-data/nist_x509/test47/int2.crl
diff --git a/src/test-data/nist_x509/test47/int2.crt b/src/test-data/nist_x509/test47/int2.crt
new file mode 100644
index 000000000..1b7854e33
--- /dev/null
+++ b/src/test-data/nist_x509/test47/int2.crt
diff --git a/src/test-data/nist_x509/test47/int3.crl b/src/test-data/nist_x509/test47/int3.crl
new file mode 100644
index 000000000..786aa5032
--- /dev/null
+++ b/src/test-data/nist_x509/test47/int3.crl
diff --git a/src/test-data/nist_x509/test47/int3.crt b/src/test-data/nist_x509/test47/int3.crt
new file mode 100644
index 000000000..62eb3b220
--- /dev/null
+++ b/src/test-data/nist_x509/test47/int3.crt
diff --git a/src/test-data/nist_x509/test47/int4.crl b/src/test-data/nist_x509/test47/int4.crl
new file mode 100644
index 000000000..925b78324
--- /dev/null
+++ b/src/test-data/nist_x509/test47/int4.crl
diff --git a/src/test-data/nist_x509/test47/int4.crt b/src/test-data/nist_x509/test47/int4.crt
new file mode 100644
index 000000000..1c9a14344
--- /dev/null
+++ b/src/test-data/nist_x509/test47/int4.crt
diff --git a/src/test-data/nist_x509/test47/root.crl b/src/test-data/nist_x509/test47/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test47/root.crl
diff --git a/src/test-data/nist_x509/test47/root.crt b/src/test-data/nist_x509/test47/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test47/root.crt
diff --git a/src/test-data/nist_x509/test48/end.crt b/src/test-data/nist_x509/test48/end.crt
new file mode 100644
index 000000000..933f27912
--- /dev/null
+++ b/src/test-data/nist_x509/test48/end.crt
diff --git a/src/test-data/nist_x509/test48/int.crl b/src/test-data/nist_x509/test48/int.crl
new file mode 100644
index 000000000..89ad99cd1
--- /dev/null
+++ b/src/test-data/nist_x509/test48/int.crl
diff --git a/src/test-data/nist_x509/test48/int.crt b/src/test-data/nist_x509/test48/int.crt
new file mode 100644
index 000000000..b2eefc4ae
--- /dev/null
+++ b/src/test-data/nist_x509/test48/int.crt
diff --git a/src/test-data/nist_x509/test48/root.crl b/src/test-data/nist_x509/test48/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test48/root.crl
diff --git a/src/test-data/nist_x509/test48/root.crt b/src/test-data/nist_x509/test48/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test48/root.crt
diff --git a/src/test-data/nist_x509/test49/end.crt b/src/test-data/nist_x509/test49/end.crt
new file mode 100644
index 000000000..d0e4a26e6
--- /dev/null
+++ b/src/test-data/nist_x509/test49/end.crt
diff --git a/src/test-data/nist_x509/test49/int.crl b/src/test-data/nist_x509/test49/int.crl
new file mode 100644
index 000000000..1defb1ef5
--- /dev/null
+++ b/src/test-data/nist_x509/test49/int.crl
diff --git a/src/test-data/nist_x509/test49/int.crt b/src/test-data/nist_x509/test49/int.crt
new file mode 100644
index 000000000..037f68d8b
--- /dev/null
+++ b/src/test-data/nist_x509/test49/int.crt
diff --git a/src/test-data/nist_x509/test49/root.crl b/src/test-data/nist_x509/test49/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test49/root.crl
diff --git a/src/test-data/nist_x509/test49/root.crt b/src/test-data/nist_x509/test49/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test49/root.crt
diff --git a/src/test-data/nist_x509/test50/end.crt b/src/test-data/nist_x509/test50/end.crt
new file mode 100644
index 000000000..ed9b0a3ce
--- /dev/null
+++ b/src/test-data/nist_x509/test50/end.crt
diff --git a/src/test-data/nist_x509/test50/int.crl b/src/test-data/nist_x509/test50/int.crl
new file mode 100644
index 000000000..0c7cdfee5
--- /dev/null
+++ b/src/test-data/nist_x509/test50/int.crl
diff --git a/src/test-data/nist_x509/test50/int.crt b/src/test-data/nist_x509/test50/int.crt
new file mode 100644
index 000000000..74c41f021
--- /dev/null
+++ b/src/test-data/nist_x509/test50/int.crt
diff --git a/src/test-data/nist_x509/test50/root.crl b/src/test-data/nist_x509/test50/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test50/root.crl
diff --git a/src/test-data/nist_x509/test50/root.crt b/src/test-data/nist_x509/test50/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test50/root.crt
diff --git a/src/test-data/nist_x509/test51/end.crt b/src/test-data/nist_x509/test51/end.crt
new file mode 100644
index 000000000..12ebc74c7
--- /dev/null
+++ b/src/test-data/nist_x509/test51/end.crt
diff --git a/src/test-data/nist_x509/test51/int.crl b/src/test-data/nist_x509/test51/int.crl
new file mode 100644
index 000000000..c887c9a2c
--- /dev/null
+++ b/src/test-data/nist_x509/test51/int.crl
diff --git a/src/test-data/nist_x509/test51/int.crt b/src/test-data/nist_x509/test51/int.crt
new file mode 100644
index 000000000..def7e90d1
--- /dev/null
+++ b/src/test-data/nist_x509/test51/int.crt
diff --git a/src/test-data/nist_x509/test51/root.crl b/src/test-data/nist_x509/test51/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test51/root.crl
diff --git a/src/test-data/nist_x509/test51/root.crt b/src/test-data/nist_x509/test51/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test51/root.crt
diff --git a/src/test-data/nist_x509/test52/end.crt b/src/test-data/nist_x509/test52/end.crt
new file mode 100644
index 000000000..0bd19185f
--- /dev/null
+++ b/src/test-data/nist_x509/test52/end.crt
diff --git a/src/test-data/nist_x509/test52/int.crl b/src/test-data/nist_x509/test52/int.crl
new file mode 100644
index 000000000..ec220874c
--- /dev/null
+++ b/src/test-data/nist_x509/test52/int.crl
diff --git a/src/test-data/nist_x509/test52/int.crt b/src/test-data/nist_x509/test52/int.crt
new file mode 100644
index 000000000..3429d7cf7
--- /dev/null
+++ b/src/test-data/nist_x509/test52/int.crt
diff --git a/src/test-data/nist_x509/test52/root.crl b/src/test-data/nist_x509/test52/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test52/root.crl
diff --git a/src/test-data/nist_x509/test52/root.crt b/src/test-data/nist_x509/test52/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test52/root.crt
diff --git a/src/test-data/nist_x509/test53/end.crt b/src/test-data/nist_x509/test53/end.crt
new file mode 100644
index 000000000..9b99dc562
--- /dev/null
+++ b/src/test-data/nist_x509/test53/end.crt
diff --git a/src/test-data/nist_x509/test53/int.crl b/src/test-data/nist_x509/test53/int.crl
new file mode 100644
index 000000000..79fed242a
--- /dev/null
+++ b/src/test-data/nist_x509/test53/int.crl
diff --git a/src/test-data/nist_x509/test53/int.crt b/src/test-data/nist_x509/test53/int.crt
new file mode 100644
index 000000000..72eac943f
--- /dev/null
+++ b/src/test-data/nist_x509/test53/int.crt
diff --git a/src/test-data/nist_x509/test53/root.crl b/src/test-data/nist_x509/test53/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test53/root.crl
diff --git a/src/test-data/nist_x509/test53/root.crt b/src/test-data/nist_x509/test53/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test53/root.crt
diff --git a/src/test-data/nist_x509/test54/end.crt b/src/test-data/nist_x509/test54/end.crt
new file mode 100644
index 000000000..185f019cf
--- /dev/null
+++ b/src/test-data/nist_x509/test54/end.crt
diff --git a/src/test-data/nist_x509/test54/int1.crl b/src/test-data/nist_x509/test54/int1.crl
new file mode 100644
index 000000000..5b1c4439c
--- /dev/null
+++ b/src/test-data/nist_x509/test54/int1.crl
diff --git a/src/test-data/nist_x509/test54/int1.crt b/src/test-data/nist_x509/test54/int1.crt
new file mode 100644
index 000000000..140ef0669
--- /dev/null
+++ b/src/test-data/nist_x509/test54/int1.crt
diff --git a/src/test-data/nist_x509/test54/int2.crl b/src/test-data/nist_x509/test54/int2.crl
new file mode 100644
index 000000000..c531566a9
--- /dev/null
+++ b/src/test-data/nist_x509/test54/int2.crl
diff --git a/src/test-data/nist_x509/test54/int2.crt b/src/test-data/nist_x509/test54/int2.crt
new file mode 100644
index 000000000..506761d71
--- /dev/null
+++ b/src/test-data/nist_x509/test54/int2.crt
diff --git a/src/test-data/nist_x509/test54/root.crl b/src/test-data/nist_x509/test54/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test54/root.crl
diff --git a/src/test-data/nist_x509/test54/root.crt b/src/test-data/nist_x509/test54/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test54/root.crt
diff --git a/src/test-data/nist_x509/test55/end.crt b/src/test-data/nist_x509/test55/end.crt
new file mode 100644
index 000000000..923d4c5a8
--- /dev/null
+++ b/src/test-data/nist_x509/test55/end.crt
diff --git a/src/test-data/nist_x509/test55/int1.crl b/src/test-data/nist_x509/test55/int1.crl
new file mode 100644
index 000000000..371821e5e
--- /dev/null
+++ b/src/test-data/nist_x509/test55/int1.crl
diff --git a/src/test-data/nist_x509/test55/int1.crt b/src/test-data/nist_x509/test55/int1.crt
new file mode 100644
index 000000000..7597faf7f
--- /dev/null
+++ b/src/test-data/nist_x509/test55/int1.crt
diff --git a/src/test-data/nist_x509/test55/int2.crl b/src/test-data/nist_x509/test55/int2.crl
new file mode 100644
index 000000000..9a242916e
--- /dev/null
+++ b/src/test-data/nist_x509/test55/int2.crl
diff --git a/src/test-data/nist_x509/test55/int2.crt b/src/test-data/nist_x509/test55/int2.crt
new file mode 100644
index 000000000..982235a21
--- /dev/null
+++ b/src/test-data/nist_x509/test55/int2.crt
diff --git a/src/test-data/nist_x509/test55/root.crl b/src/test-data/nist_x509/test55/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test55/root.crl
diff --git a/src/test-data/nist_x509/test55/root.crt b/src/test-data/nist_x509/test55/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test55/root.crt
diff --git a/src/test-data/nist_x509/test56/end.crt b/src/test-data/nist_x509/test56/end.crt
new file mode 100644
index 000000000..d1dc82186
--- /dev/null
+++ b/src/test-data/nist_x509/test56/end.crt
diff --git a/src/test-data/nist_x509/test56/int.crl b/src/test-data/nist_x509/test56/int.crl
new file mode 100644
index 000000000..840b209e0
--- /dev/null
+++ b/src/test-data/nist_x509/test56/int.crl
diff --git a/src/test-data/nist_x509/test56/int.crt b/src/test-data/nist_x509/test56/int.crt
new file mode 100644
index 000000000..9b622cabd
--- /dev/null
+++ b/src/test-data/nist_x509/test56/int.crt
diff --git a/src/test-data/nist_x509/test56/root.crl b/src/test-data/nist_x509/test56/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test56/root.crl
diff --git a/src/test-data/nist_x509/test56/root.crt b/src/test-data/nist_x509/test56/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test56/root.crt
diff --git a/src/test-data/nist_x509/test57/end.crt b/src/test-data/nist_x509/test57/end.crt
new file mode 100644
index 000000000..2f939384a
--- /dev/null
+++ b/src/test-data/nist_x509/test57/end.crt
diff --git a/src/test-data/nist_x509/test57/int.crl b/src/test-data/nist_x509/test57/int.crl
new file mode 100644
index 000000000..a0be908ae
--- /dev/null
+++ b/src/test-data/nist_x509/test57/int.crl
diff --git a/src/test-data/nist_x509/test57/int.crt b/src/test-data/nist_x509/test57/int.crt
new file mode 100644
index 000000000..79f6d6b8a
--- /dev/null
+++ b/src/test-data/nist_x509/test57/int.crt
diff --git a/src/test-data/nist_x509/test57/root.crl b/src/test-data/nist_x509/test57/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test57/root.crl
diff --git a/src/test-data/nist_x509/test57/root.crt b/src/test-data/nist_x509/test57/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test57/root.crt
diff --git a/src/test-data/nist_x509/test58/end.crt b/src/test-data/nist_x509/test58/end.crt
new file mode 100644
index 000000000..674009c83
--- /dev/null
+++ b/src/test-data/nist_x509/test58/end.crt
diff --git a/src/test-data/nist_x509/test58/int1.crl b/src/test-data/nist_x509/test58/int1.crl
new file mode 100644
index 000000000..aa9dc9d7f
--- /dev/null
+++ b/src/test-data/nist_x509/test58/int1.crl
diff --git a/src/test-data/nist_x509/test58/int1.crt b/src/test-data/nist_x509/test58/int1.crt
new file mode 100644
index 000000000..42e983122
--- /dev/null
+++ b/src/test-data/nist_x509/test58/int1.crt
diff --git a/src/test-data/nist_x509/test58/int2.crl b/src/test-data/nist_x509/test58/int2.crl
new file mode 100644
index 000000000..7dec9c1eb
--- /dev/null
+++ b/src/test-data/nist_x509/test58/int2.crl
diff --git a/src/test-data/nist_x509/test58/int2.crt b/src/test-data/nist_x509/test58/int2.crt
new file mode 100644
index 000000000..08eb808c4
--- /dev/null
+++ b/src/test-data/nist_x509/test58/int2.crt
diff --git a/src/test-data/nist_x509/test58/int3.crl b/src/test-data/nist_x509/test58/int3.crl
new file mode 100644
index 000000000..bec634480
--- /dev/null
+++ b/src/test-data/nist_x509/test58/int3.crl
diff --git a/src/test-data/nist_x509/test58/int3.crt b/src/test-data/nist_x509/test58/int3.crt
new file mode 100644
index 000000000..6c5e6efae
--- /dev/null
+++ b/src/test-data/nist_x509/test58/int3.crt
diff --git a/src/test-data/nist_x509/test58/root.crl b/src/test-data/nist_x509/test58/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test58/root.crl
diff --git a/src/test-data/nist_x509/test58/root.crt b/src/test-data/nist_x509/test58/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test58/root.crt
diff --git a/src/test-data/nist_x509/test59/end.crt b/src/test-data/nist_x509/test59/end.crt
new file mode 100644
index 000000000..da5ee9e69
--- /dev/null
+++ b/src/test-data/nist_x509/test59/end.crt
diff --git a/src/test-data/nist_x509/test59/int1.crl b/src/test-data/nist_x509/test59/int1.crl
new file mode 100644
index 000000000..eb7f0e883
--- /dev/null
+++ b/src/test-data/nist_x509/test59/int1.crl
diff --git a/src/test-data/nist_x509/test59/int1.crt b/src/test-data/nist_x509/test59/int1.crt
new file mode 100644
index 000000000..be0ee21f2
--- /dev/null
+++ b/src/test-data/nist_x509/test59/int1.crt
diff --git a/src/test-data/nist_x509/test59/int2.crl b/src/test-data/nist_x509/test59/int2.crl
new file mode 100644
index 000000000..2b2fe9ced
--- /dev/null
+++ b/src/test-data/nist_x509/test59/int2.crl
diff --git a/src/test-data/nist_x509/test59/int2.crt b/src/test-data/nist_x509/test59/int2.crt
new file mode 100644
index 000000000..a84a7ba5e
--- /dev/null
+++ b/src/test-data/nist_x509/test59/int2.crt
diff --git a/src/test-data/nist_x509/test59/int3.crl b/src/test-data/nist_x509/test59/int3.crl
new file mode 100644
index 000000000..cb7885c17
--- /dev/null
+++ b/src/test-data/nist_x509/test59/int3.crl
diff --git a/src/test-data/nist_x509/test59/int3.crt b/src/test-data/nist_x509/test59/int3.crt
new file mode 100644
index 000000000..0b13f9f9b
--- /dev/null
+++ b/src/test-data/nist_x509/test59/int3.crt
diff --git a/src/test-data/nist_x509/test59/root.crl b/src/test-data/nist_x509/test59/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test59/root.crl
diff --git a/src/test-data/nist_x509/test59/root.crt b/src/test-data/nist_x509/test59/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test59/root.crt
diff --git a/src/test-data/nist_x509/test60/end.crt b/src/test-data/nist_x509/test60/end.crt
new file mode 100644
index 000000000..8741105ea
--- /dev/null
+++ b/src/test-data/nist_x509/test60/end.crt
diff --git a/src/test-data/nist_x509/test60/int1.crl b/src/test-data/nist_x509/test60/int1.crl
new file mode 100644
index 000000000..e778e911d
--- /dev/null
+++ b/src/test-data/nist_x509/test60/int1.crl
diff --git a/src/test-data/nist_x509/test60/int1.crt b/src/test-data/nist_x509/test60/int1.crt
new file mode 100644
index 000000000..01d844201
--- /dev/null
+++ b/src/test-data/nist_x509/test60/int1.crt
diff --git a/src/test-data/nist_x509/test60/int2.crl b/src/test-data/nist_x509/test60/int2.crl
new file mode 100644
index 000000000..4f4ac6bc0
--- /dev/null
+++ b/src/test-data/nist_x509/test60/int2.crl
diff --git a/src/test-data/nist_x509/test60/int2.crt b/src/test-data/nist_x509/test60/int2.crt
new file mode 100644
index 000000000..0054dc622
--- /dev/null
+++ b/src/test-data/nist_x509/test60/int2.crt
diff --git a/src/test-data/nist_x509/test60/int3.crl b/src/test-data/nist_x509/test60/int3.crl
new file mode 100644
index 000000000..0b568e7cc
--- /dev/null
+++ b/src/test-data/nist_x509/test60/int3.crl
diff --git a/src/test-data/nist_x509/test60/int3.crt b/src/test-data/nist_x509/test60/int3.crt
new file mode 100644
index 000000000..6fff65cc7
--- /dev/null
+++ b/src/test-data/nist_x509/test60/int3.crt
diff --git a/src/test-data/nist_x509/test60/int4.crl b/src/test-data/nist_x509/test60/int4.crl
new file mode 100644
index 000000000..4cf694a98
--- /dev/null
+++ b/src/test-data/nist_x509/test60/int4.crl
diff --git a/src/test-data/nist_x509/test60/int4.crt b/src/test-data/nist_x509/test60/int4.crt
new file mode 100644
index 000000000..c5eebca96
--- /dev/null
+++ b/src/test-data/nist_x509/test60/int4.crt
diff --git a/src/test-data/nist_x509/test60/root.crl b/src/test-data/nist_x509/test60/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test60/root.crl
diff --git a/src/test-data/nist_x509/test60/root.crt b/src/test-data/nist_x509/test60/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test60/root.crt
diff --git a/src/test-data/nist_x509/test61/end.crt b/src/test-data/nist_x509/test61/end.crt
new file mode 100644
index 000000000..7be023caf
--- /dev/null
+++ b/src/test-data/nist_x509/test61/end.crt
diff --git a/src/test-data/nist_x509/test61/int1.crl b/src/test-data/nist_x509/test61/int1.crl
new file mode 100644
index 000000000..05c2809aa
--- /dev/null
+++ b/src/test-data/nist_x509/test61/int1.crl
diff --git a/src/test-data/nist_x509/test61/int1.crt b/src/test-data/nist_x509/test61/int1.crt
new file mode 100644
index 000000000..ba03f6c24
--- /dev/null
+++ b/src/test-data/nist_x509/test61/int1.crt
diff --git a/src/test-data/nist_x509/test61/int2.crl b/src/test-data/nist_x509/test61/int2.crl
new file mode 100644
index 000000000..d74b9168c
--- /dev/null
+++ b/src/test-data/nist_x509/test61/int2.crl
diff --git a/src/test-data/nist_x509/test61/int2.crt b/src/test-data/nist_x509/test61/int2.crt
new file mode 100644
index 000000000..bd4e40ea3
--- /dev/null
+++ b/src/test-data/nist_x509/test61/int2.crt
diff --git a/src/test-data/nist_x509/test61/int3.crl b/src/test-data/nist_x509/test61/int3.crl
new file mode 100644
index 000000000..7e6e83fb2
--- /dev/null
+++ b/src/test-data/nist_x509/test61/int3.crl
diff --git a/src/test-data/nist_x509/test61/int3.crt b/src/test-data/nist_x509/test61/int3.crt
new file mode 100644
index 000000000..4f9342b20
--- /dev/null
+++ b/src/test-data/nist_x509/test61/int3.crt
diff --git a/src/test-data/nist_x509/test61/int4.crl b/src/test-data/nist_x509/test61/int4.crl
new file mode 100644
index 000000000..7161f4192
--- /dev/null
+++ b/src/test-data/nist_x509/test61/int4.crl
diff --git a/src/test-data/nist_x509/test61/int4.crt b/src/test-data/nist_x509/test61/int4.crt
new file mode 100644
index 000000000..5962eedfa
--- /dev/null
+++ b/src/test-data/nist_x509/test61/int4.crt
diff --git a/src/test-data/nist_x509/test61/root.crl b/src/test-data/nist_x509/test61/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test61/root.crl
diff --git a/src/test-data/nist_x509/test61/root.crt b/src/test-data/nist_x509/test61/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test61/root.crt
diff --git a/src/test-data/nist_x509/test62/end.crt b/src/test-data/nist_x509/test62/end.crt
new file mode 100644
index 000000000..bff8ea4cb
--- /dev/null
+++ b/src/test-data/nist_x509/test62/end.crt
diff --git a/src/test-data/nist_x509/test62/int1.crl b/src/test-data/nist_x509/test62/int1.crl
new file mode 100644
index 000000000..aa26a419a
--- /dev/null
+++ b/src/test-data/nist_x509/test62/int1.crl
diff --git a/src/test-data/nist_x509/test62/int1.crt b/src/test-data/nist_x509/test62/int1.crt
new file mode 100644
index 000000000..aee257d7e
--- /dev/null
+++ b/src/test-data/nist_x509/test62/int1.crt
diff --git a/src/test-data/nist_x509/test62/int2.crl b/src/test-data/nist_x509/test62/int2.crl
new file mode 100644
index 000000000..61e712f0d
--- /dev/null
+++ b/src/test-data/nist_x509/test62/int2.crl
diff --git a/src/test-data/nist_x509/test62/int2.crt b/src/test-data/nist_x509/test62/int2.crt
new file mode 100644
index 000000000..a62d9a026
--- /dev/null
+++ b/src/test-data/nist_x509/test62/int2.crt
diff --git a/src/test-data/nist_x509/test62/int3.crl b/src/test-data/nist_x509/test62/int3.crl
new file mode 100644
index 000000000..09707fd7b
--- /dev/null
+++ b/src/test-data/nist_x509/test62/int3.crl
diff --git a/src/test-data/nist_x509/test62/int3.crt b/src/test-data/nist_x509/test62/int3.crt
new file mode 100644
index 000000000..aa91f3427
--- /dev/null
+++ b/src/test-data/nist_x509/test62/int3.crt
diff --git a/src/test-data/nist_x509/test62/int4.crl b/src/test-data/nist_x509/test62/int4.crl
new file mode 100644
index 000000000..997a057f2
--- /dev/null
+++ b/src/test-data/nist_x509/test62/int4.crl
diff --git a/src/test-data/nist_x509/test62/int4.crt b/src/test-data/nist_x509/test62/int4.crt
new file mode 100644
index 000000000..744603003
--- /dev/null
+++ b/src/test-data/nist_x509/test62/int4.crt
diff --git a/src/test-data/nist_x509/test62/root.crl b/src/test-data/nist_x509/test62/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test62/root.crl
diff --git a/src/test-data/nist_x509/test62/root.crt b/src/test-data/nist_x509/test62/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test62/root.crt
diff --git a/src/test-data/nist_x509/test63/end.crt b/src/test-data/nist_x509/test63/end.crt
new file mode 100644
index 000000000..16c1c687d
--- /dev/null
+++ b/src/test-data/nist_x509/test63/end.crt
diff --git a/src/test-data/nist_x509/test63/int1.crl b/src/test-data/nist_x509/test63/int1.crl
new file mode 100644
index 000000000..40c4afc45
--- /dev/null
+++ b/src/test-data/nist_x509/test63/int1.crl
diff --git a/src/test-data/nist_x509/test63/int1.crt b/src/test-data/nist_x509/test63/int1.crt
new file mode 100644
index 000000000..6b3f6eb4b
--- /dev/null
+++ b/src/test-data/nist_x509/test63/int1.crt
diff --git a/src/test-data/nist_x509/test63/int2.crl b/src/test-data/nist_x509/test63/int2.crl
new file mode 100644
index 000000000..7bffd4661
--- /dev/null
+++ b/src/test-data/nist_x509/test63/int2.crl
diff --git a/src/test-data/nist_x509/test63/int2.crt b/src/test-data/nist_x509/test63/int2.crt
new file mode 100644
index 000000000..f2e88f9fe
--- /dev/null
+++ b/src/test-data/nist_x509/test63/int2.crt
diff --git a/src/test-data/nist_x509/test63/int3.crl b/src/test-data/nist_x509/test63/int3.crl
new file mode 100644
index 000000000..20f503c6b
--- /dev/null
+++ b/src/test-data/nist_x509/test63/int3.crl
diff --git a/src/test-data/nist_x509/test63/int3.crt b/src/test-data/nist_x509/test63/int3.crt
new file mode 100644
index 000000000..2d636dd43
--- /dev/null
+++ b/src/test-data/nist_x509/test63/int3.crt
diff --git a/src/test-data/nist_x509/test63/int4.crl b/src/test-data/nist_x509/test63/int4.crl
new file mode 100644
index 000000000..71e622907
--- /dev/null
+++ b/src/test-data/nist_x509/test63/int4.crl
diff --git a/src/test-data/nist_x509/test63/int4.crt b/src/test-data/nist_x509/test63/int4.crt
new file mode 100644
index 000000000..a0ed3a167
--- /dev/null
+++ b/src/test-data/nist_x509/test63/int4.crt
diff --git a/src/test-data/nist_x509/test63/root.crl b/src/test-data/nist_x509/test63/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test63/root.crl
diff --git a/src/test-data/nist_x509/test63/root.crt b/src/test-data/nist_x509/test63/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test63/root.crt
diff --git a/src/test-data/nist_x509/test64/end.crt b/src/test-data/nist_x509/test64/end.crt
new file mode 100644
index 000000000..771423eca
--- /dev/null
+++ b/src/test-data/nist_x509/test64/end.crt
diff --git a/src/test-data/nist_x509/test64/int.crl b/src/test-data/nist_x509/test64/int.crl
new file mode 100644
index 000000000..0e3e2bd95
--- /dev/null
+++ b/src/test-data/nist_x509/test64/int.crl
diff --git a/src/test-data/nist_x509/test64/int.crt b/src/test-data/nist_x509/test64/int.crt
new file mode 100644
index 000000000..1ae82584e
--- /dev/null
+++ b/src/test-data/nist_x509/test64/int.crt
diff --git a/src/test-data/nist_x509/test64/root.crl b/src/test-data/nist_x509/test64/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test64/root.crl
diff --git a/src/test-data/nist_x509/test64/root.crt b/src/test-data/nist_x509/test64/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test64/root.crt
diff --git a/src/test-data/nist_x509/test65/end.crt b/src/test-data/nist_x509/test65/end.crt
new file mode 100644
index 000000000..29d51a7f9
--- /dev/null
+++ b/src/test-data/nist_x509/test65/end.crt
diff --git a/src/test-data/nist_x509/test65/int.crl b/src/test-data/nist_x509/test65/int.crl
new file mode 100644
index 000000000..bd2d906ff
--- /dev/null
+++ b/src/test-data/nist_x509/test65/int.crl
diff --git a/src/test-data/nist_x509/test65/int1.crt b/src/test-data/nist_x509/test65/int1.crt
new file mode 100644
index 000000000..214c839fe
--- /dev/null
+++ b/src/test-data/nist_x509/test65/int1.crt
diff --git a/src/test-data/nist_x509/test65/int2.crt b/src/test-data/nist_x509/test65/int2.crt
new file mode 100644
index 000000000..57c2e5914
--- /dev/null
+++ b/src/test-data/nist_x509/test65/int2.crt
diff --git a/src/test-data/nist_x509/test65/root.crl b/src/test-data/nist_x509/test65/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test65/root.crl
diff --git a/src/test-data/nist_x509/test65/root.crt b/src/test-data/nist_x509/test65/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test65/root.crt
diff --git a/src/test-data/nist_x509/test66/end.crt b/src/test-data/nist_x509/test66/end.crt
new file mode 100644
index 000000000..ccdb0e086
--- /dev/null
+++ b/src/test-data/nist_x509/test66/end.crt
diff --git a/src/test-data/nist_x509/test66/int.crl b/src/test-data/nist_x509/test66/int.crl
new file mode 100644
index 000000000..f80b444e2
--- /dev/null
+++ b/src/test-data/nist_x509/test66/int.crl
diff --git a/src/test-data/nist_x509/test66/int.crt b/src/test-data/nist_x509/test66/int.crt
new file mode 100644
index 000000000..23f8b17c2
--- /dev/null
+++ b/src/test-data/nist_x509/test66/int.crt
diff --git a/src/test-data/nist_x509/test66/root.crl b/src/test-data/nist_x509/test66/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test66/root.crl
diff --git a/src/test-data/nist_x509/test66/root.crt b/src/test-data/nist_x509/test66/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test66/root.crt
diff --git a/src/test-data/nist_x509/test67/end.crt b/src/test-data/nist_x509/test67/end.crt
new file mode 100644
index 000000000..85d5508db
--- /dev/null
+++ b/src/test-data/nist_x509/test67/end.crt
diff --git a/src/test-data/nist_x509/test67/int.crt b/src/test-data/nist_x509/test67/int.crt
new file mode 100644
index 000000000..92a4b3a95
--- /dev/null
+++ b/src/test-data/nist_x509/test67/int.crt
diff --git a/src/test-data/nist_x509/test67/int1.crl b/src/test-data/nist_x509/test67/int1.crl
new file mode 100644
index 000000000..3fe834938
--- /dev/null
+++ b/src/test-data/nist_x509/test67/int1.crl
diff --git a/src/test-data/nist_x509/test67/int2.crl b/src/test-data/nist_x509/test67/int2.crl
new file mode 100644
index 000000000..15593fa84
--- /dev/null
+++ b/src/test-data/nist_x509/test67/int2.crl
diff --git a/src/test-data/nist_x509/test67/root.crl b/src/test-data/nist_x509/test67/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test67/root.crl
diff --git a/src/test-data/nist_x509/test67/root.crt b/src/test-data/nist_x509/test67/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test67/root.crt
diff --git a/src/test-data/nist_x509/test68/end.crt b/src/test-data/nist_x509/test68/end.crt
new file mode 100644
index 000000000..bddd72da6
--- /dev/null
+++ b/src/test-data/nist_x509/test68/end.crt
diff --git a/src/test-data/nist_x509/test68/int1.crl b/src/test-data/nist_x509/test68/int1.crl
new file mode 100644
index 000000000..fdbf8ea0c
--- /dev/null
+++ b/src/test-data/nist_x509/test68/int1.crl
diff --git a/src/test-data/nist_x509/test68/int1.crt b/src/test-data/nist_x509/test68/int1.crt
new file mode 100644
index 000000000..4bc8127b3
--- /dev/null
+++ b/src/test-data/nist_x509/test68/int1.crt
diff --git a/src/test-data/nist_x509/test68/int2.crl b/src/test-data/nist_x509/test68/int2.crl
new file mode 100644
index 000000000..33b764094
--- /dev/null
+++ b/src/test-data/nist_x509/test68/int2.crl
diff --git a/src/test-data/nist_x509/test68/int2.crt b/src/test-data/nist_x509/test68/int2.crt
new file mode 100644
index 000000000..1ca8d5c32
--- /dev/null
+++ b/src/test-data/nist_x509/test68/int2.crt
diff --git a/src/test-data/nist_x509/test68/root.crl b/src/test-data/nist_x509/test68/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test68/root.crl
diff --git a/src/test-data/nist_x509/test68/root.crt b/src/test-data/nist_x509/test68/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test68/root.crt
diff --git a/src/test-data/nist_x509/test69/end.crt b/src/test-data/nist_x509/test69/end.crt
new file mode 100644
index 000000000..00fc716dc
--- /dev/null
+++ b/src/test-data/nist_x509/test69/end.crt
diff --git a/src/test-data/nist_x509/test69/int.crl b/src/test-data/nist_x509/test69/int.crl
new file mode 100644
index 000000000..fc09d351a
--- /dev/null
+++ b/src/test-data/nist_x509/test69/int.crl
diff --git a/src/test-data/nist_x509/test69/int.crt b/src/test-data/nist_x509/test69/int.crt
new file mode 100644
index 000000000..6c19ee09e
--- /dev/null
+++ b/src/test-data/nist_x509/test69/int.crt
diff --git a/src/test-data/nist_x509/test69/root.crl b/src/test-data/nist_x509/test69/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test69/root.crl
diff --git a/src/test-data/nist_x509/test69/root.crt b/src/test-data/nist_x509/test69/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test69/root.crt
diff --git a/src/test-data/nist_x509/test70/end.crt b/src/test-data/nist_x509/test70/end.crt
new file mode 100644
index 000000000..c576960be
--- /dev/null
+++ b/src/test-data/nist_x509/test70/end.crt
diff --git a/src/test-data/nist_x509/test70/int1.crl b/src/test-data/nist_x509/test70/int1.crl
new file mode 100644
index 000000000..77dafb909
--- /dev/null
+++ b/src/test-data/nist_x509/test70/int1.crl
diff --git a/src/test-data/nist_x509/test70/int1.crt b/src/test-data/nist_x509/test70/int1.crt
new file mode 100644
index 000000000..5509c5438
--- /dev/null
+++ b/src/test-data/nist_x509/test70/int1.crt
diff --git a/src/test-data/nist_x509/test70/int2.crl b/src/test-data/nist_x509/test70/int2.crl
new file mode 100644
index 000000000..4e22f3966
--- /dev/null
+++ b/src/test-data/nist_x509/test70/int2.crl
diff --git a/src/test-data/nist_x509/test70/int2.crt b/src/test-data/nist_x509/test70/int2.crt
new file mode 100644
index 000000000..9af80b8e4
--- /dev/null
+++ b/src/test-data/nist_x509/test70/int2.crt
diff --git a/src/test-data/nist_x509/test70/root.crl b/src/test-data/nist_x509/test70/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test70/root.crl
diff --git a/src/test-data/nist_x509/test70/root.crt b/src/test-data/nist_x509/test70/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test70/root.crt
diff --git a/src/test-data/nist_x509/test71/end.crt b/src/test-data/nist_x509/test71/end.crt
new file mode 100644
index 000000000..0cc1718ee
--- /dev/null
+++ b/src/test-data/nist_x509/test71/end.crt
diff --git a/src/test-data/nist_x509/test71/int.crl b/src/test-data/nist_x509/test71/int.crl
new file mode 100644
index 000000000..c34a95df1
--- /dev/null
+++ b/src/test-data/nist_x509/test71/int.crl
diff --git a/src/test-data/nist_x509/test71/int.crt b/src/test-data/nist_x509/test71/int.crt
new file mode 100644
index 000000000..07076019c
--- /dev/null
+++ b/src/test-data/nist_x509/test71/int.crt
diff --git a/src/test-data/nist_x509/test71/root.crl b/src/test-data/nist_x509/test71/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test71/root.crl
diff --git a/src/test-data/nist_x509/test71/root.crt b/src/test-data/nist_x509/test71/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test71/root.crt
diff --git a/src/test-data/nist_x509/test72/end.crt b/src/test-data/nist_x509/test72/end.crt
new file mode 100644
index 000000000..6c61375d8
--- /dev/null
+++ b/src/test-data/nist_x509/test72/end.crt
diff --git a/src/test-data/nist_x509/test72/int.crl b/src/test-data/nist_x509/test72/int.crl
new file mode 100644
index 000000000..643141b37
--- /dev/null
+++ b/src/test-data/nist_x509/test72/int.crl
diff --git a/src/test-data/nist_x509/test72/int.crt b/src/test-data/nist_x509/test72/int.crt
new file mode 100644
index 000000000..36b1f2052
--- /dev/null
+++ b/src/test-data/nist_x509/test72/int.crt
diff --git a/src/test-data/nist_x509/test72/root.crl b/src/test-data/nist_x509/test72/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test72/root.crl
diff --git a/src/test-data/nist_x509/test72/root.crt b/src/test-data/nist_x509/test72/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test72/root.crt
diff --git a/src/test-data/nist_x509/test73/end.crt b/src/test-data/nist_x509/test73/end.crt
new file mode 100644
index 000000000..9bae5325f
--- /dev/null
+++ b/src/test-data/nist_x509/test73/end.crt
diff --git a/src/test-data/nist_x509/test73/int.crl b/src/test-data/nist_x509/test73/int.crl
new file mode 100644
index 000000000..6b76dc0b8
--- /dev/null
+++ b/src/test-data/nist_x509/test73/int.crl
diff --git a/src/test-data/nist_x509/test73/int.crt b/src/test-data/nist_x509/test73/int.crt
new file mode 100644
index 000000000..ff6df2598
--- /dev/null
+++ b/src/test-data/nist_x509/test73/int.crt
diff --git a/src/test-data/nist_x509/test73/root.crl b/src/test-data/nist_x509/test73/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test73/root.crl
diff --git a/src/test-data/nist_x509/test73/root.crt b/src/test-data/nist_x509/test73/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test73/root.crt
diff --git a/src/test-data/nist_x509/test74/end.crt b/src/test-data/nist_x509/test74/end.crt
new file mode 100644
index 000000000..93e05bd1e
--- /dev/null
+++ b/src/test-data/nist_x509/test74/end.crt
diff --git a/src/test-data/nist_x509/test74/int.crl b/src/test-data/nist_x509/test74/int.crl
new file mode 100644
index 000000000..8733b183c
--- /dev/null
+++ b/src/test-data/nist_x509/test74/int.crl
diff --git a/src/test-data/nist_x509/test74/int.crt b/src/test-data/nist_x509/test74/int.crt
new file mode 100644
index 000000000..c9258148d
--- /dev/null
+++ b/src/test-data/nist_x509/test74/int.crt
diff --git a/src/test-data/nist_x509/test74/root.crl b/src/test-data/nist_x509/test74/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test74/root.crl
diff --git a/src/test-data/nist_x509/test74/root.crt b/src/test-data/nist_x509/test74/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test74/root.crt
diff --git a/src/test-data/nist_x509/test75/end.crt b/src/test-data/nist_x509/test75/end.crt
new file mode 100644
index 000000000..7d8179be0
--- /dev/null
+++ b/src/test-data/nist_x509/test75/end.crt
diff --git a/src/test-data/nist_x509/test75/int.crl b/src/test-data/nist_x509/test75/int.crl
new file mode 100644
index 000000000..19f472c7f
--- /dev/null
+++ b/src/test-data/nist_x509/test75/int.crl
diff --git a/src/test-data/nist_x509/test75/int.crt b/src/test-data/nist_x509/test75/int.crt
new file mode 100644
index 000000000..4a4c27e8c
--- /dev/null
+++ b/src/test-data/nist_x509/test75/int.crt
diff --git a/src/test-data/nist_x509/test75/root.crl b/src/test-data/nist_x509/test75/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test75/root.crl
diff --git a/src/test-data/nist_x509/test75/root.crt b/src/test-data/nist_x509/test75/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test75/root.crt
diff --git a/src/test-data/nist_x509/test76/end.crt b/src/test-data/nist_x509/test76/end.crt
new file mode 100644
index 000000000..bde477d89
--- /dev/null
+++ b/src/test-data/nist_x509/test76/end.crt
diff --git a/src/test-data/nist_x509/test76/int.crl b/src/test-data/nist_x509/test76/int.crl
new file mode 100644
index 000000000..dbbbd43be
--- /dev/null
+++ b/src/test-data/nist_x509/test76/int.crl
diff --git a/src/test-data/nist_x509/test76/int.crt b/src/test-data/nist_x509/test76/int.crt
new file mode 100644
index 000000000..ab1c64390
--- /dev/null
+++ b/src/test-data/nist_x509/test76/int.crt
diff --git a/src/test-data/nist_x509/test76/root.crl b/src/test-data/nist_x509/test76/root.crl
new file mode 100644
index 000000000..de65024ad
--- /dev/null
+++ b/src/test-data/nist_x509/test76/root.crl
diff --git a/src/test-data/nist_x509/test76/root.crt b/src/test-data/nist_x509/test76/root.crt
new file mode 100644
index 000000000..d7dfd9d48
--- /dev/null
+++ b/src/test-data/nist_x509/test76/root.crt