Rename the files in the NIST X.509 certificate path validation suite to

be shorter, with no embedded spaces.

Also update the C++ test program to look for the new filenames.

476 files changed, 5 insertions, 5 deletions

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