588 files changed, 78 insertions, 71 deletions

diff --git a/configure.py b/configure.py
index 5dc94ddcc..59f4b98f1 100755
--- a/configure.py
+++ b/configure.py
@@ -115,7 +115,7 @@ class BuildConfigurationInformation(object):
 
         self.build_dir = os.path.join(options.with_build_dir, 'build')
 
-        self.checkobj_dir = os.path.join(self.build_dir, 'checks')
+        self.testobj_dir = os.path.join(self.build_dir, 'tests')
         self.libobj_dir = os.path.join(self.build_dir, 'lib')
 
         self.python_dir = os.path.join(options.src_dir, 'wrap', 'python')
@@ -142,10 +142,10 @@ class BuildConfigurationInformation(object):
 
         self.public_headers = sorted(flatten([m.public_headers() for m in modules]))
 
-        checks_dir = os.path.join(options.base_dir, 'checks')
+        tests_dir = os.path.join(options.base_dir, 'tests')
 
-        self.check_sources = sorted(
-            [os.path.join(checks_dir, file) for file in os.listdir(checks_dir)
+        self.test_sources = sorted(
+            [os.path.join(tests_dir, file) for file in os.listdir(tests_dir)
              if file.endswith('.cpp')])
 
         self.python_sources = sorted(
@@ -170,7 +170,7 @@ class BuildConfigurationInformation(object):
         self.build_doc_commands = '\n'.join(['\t' + s for s in build_doc_commands()])
 
         def build_dirs():
-            yield self.checkobj_dir
+            yield self.testobj_dir
             yield self.libobj_dir
             yield self.botan_include_dir
             yield self.internal_include_dir
@@ -764,7 +764,7 @@ class CompilerInfo(object):
                         'add_lib_dir_option': '-L',
                         'add_lib_option': '-l',
                         'lib_opt_flags': '',
-                        'check_opt_flags': '',
+                        'test_opt_flags': '',
                         'debug_flags': '',
                         'no_debug_flags': '',
                         'shared_flags': '',
@@ -1168,7 +1168,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
               ('' if not options.via_amalgamation else all_isa_specific_flags()),
 
         'lib_opt': cc.library_opt_flags(options),
-        'check_opt': '' if options.no_optimizations else cc.check_opt_flags,
+        'test_opt': '' if options.no_optimizations else cc.test_opt_flags,
         'lang_flags': cc.lang_flags,
         'warn_flags': warning_flags(cc.warning_flags,
                                     cc.maintainer_warning_flags,
@@ -1195,17 +1195,17 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
             objectfile_list(build_config.build_sources,
                             build_config.libobj_dir)),
 
-        'check_objs': makefile_list(
-            objectfile_list(build_config.check_sources,
-                            build_config.checkobj_dir)),
+        'test_objs': makefile_list(
+            objectfile_list(build_config.test_sources,
+                            build_config.testobj_dir)),
 
         'lib_build_cmds': '\n'.join(
             build_commands(build_config.build_sources,
                            build_config.libobj_dir, 'LIB')),
 
-        'check_build_cmds': '\n'.join(
-            build_commands(build_config.check_sources,
-                           build_config.checkobj_dir, 'CHECK')),
+        'test_build_cmds': '\n'.join(
+            build_commands(build_config.test_sources,
+                           build_config.testobj_dir, 'TEST')),
 
         'python_obj_dir': build_config.pyobject_dir,
 
@@ -1222,7 +1222,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
         'install_cmd_exec': osinfo.install_cmd_exec,
         'install_cmd_data': osinfo.install_cmd_data,
 
-        'check_prefix': prefix_with_build_dir(''),
+        'test_prefix': prefix_with_build_dir(''),
         'lib_prefix': prefix_with_build_dir(''),
 
         'static_suffix': osinfo.static_suffix,
diff --git a/src/build-data/cc/bcc.txt b/src/build-data/cc/bcc.txt
index f2ea46ef2..9a810d7cd 100644
--- a/src/build-data/cc/bcc.txt
+++ b/src/build-data/cc/bcc.txt
@@ -10,7 +10,7 @@ add_lib_option ""
 
 no_debug_flags "-O2"
 debug_flags ""
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 lang_flags ""
 warning_flags ""
 
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 6202d2263..16c7d37f8 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -15,7 +15,7 @@ warning_flags "-Wextra -Wall"
 makefile_style unix
 
 lib_opt_flags "-O3"
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 shared_flags "-fPIC"
 debug_flags "-g -fno-inline-functions"
 no_debug_flags ""
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index c6e8b6550..a95093876 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O3 -OPT:Ofast:alias=disjoint"
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 lang_flags "-D_REENTRANT -ansi -Wno-long-long"
 warning_flags "-W -Wall"
 
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 38bc44676..78f54bd56 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -13,7 +13,7 @@ maintainer_warning_flags "-Werror -Wno-error=old-style-cast -Wno-error=zero-as-n
 warning_flags "-Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast -Wzero-as-null-pointer-constant"
 
 lib_opt_flags "-O3"
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 shared_flags "-fPIC"
 debug_flags "-g -fno-inline-functions"
 
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
index 4b21a03de..b3cd58c2f 100644
--- a/src/build-data/cc/hpcc.txt
+++ b/src/build-data/cc/hpcc.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "+O2"
-check_opt_flags "+O2"
+test_opt_flags "+O2"
 debug_flags -g
 no_debug_flags ""
 lang_flags "-AA -ext +eh -z"
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index e11875cb1..eac9fc218 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O2 -ip -unroll"
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 debug_flags -g
 no_debug_flags "-fomit-frame-pointer"
 lang_flags "-std=c++0x"
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index 034ea7444..4e75d5ba1 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -10,7 +10,7 @@ add_lib_option ""
 
 no_debug_flags "/O2"
 debug_flags "/Od /Zi /DDEBUG"
-check_opt_flags "/O2 /D_CONSOLE"
+test_opt_flags "/O2 /D_CONSOLE"
 lang_flags "/EHs /GR"
 warning_flags "/W3 /wd4275 /wd4267"
 
diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt
index 52f35a7e8..543d84021 100644
--- a/src/build-data/cc/open64.txt
+++ b/src/build-data/cc/open64.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O3 -OPT:alias=TYPED"
-check_opt_flags "-O3 -OPT:alias=TYPED"
+test_opt_flags "-O3 -OPT:alias=TYPED"
 debug_flags "-g3"
 no_debug_flags "-fomit-frame-pointer"
 shared_flags "-fPIC"
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index 985c534b9..6a2f104ff 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-fast -Minline"
-check_opt_flags "-fast"
+test_opt_flags "-fast"
 shared_flags "-fPIC"
 
 makefile_style unix
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index 43e5fcf8a..75cf1a758 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-xO5"
-check_opt_flags "-xO2"
+test_opt_flags "-xO2"
 debug_flags -g
 no_debug_flags ""
 shared_flags "-KPIC"
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index 609439243..73ae91747 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O2"
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 lang_flags ""
 debug_flags -g
 no_debug_flags ""
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 26fb450a3..1b6a33773 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -1,7 +1,7 @@
 ### Compiler Options
 CXX           = %{cc}
 LIB_OPT       = %{lib_opt}
-CHECK_OPT     = %{check_opt}
+TEST_OPT      = %{test_opt}
 LANG_FLAGS    = %{lang_flags}
 WARN_FLAGS    = %{warn_flags}
 SO_OBJ_FLAGS  = %{shared_flags}
@@ -9,7 +9,7 @@ LIB_LINK_CMD  = %{so_link}
 LINK_TO       = %{link_to}
 
 LIB_FLAGS     = $(LIB_OPT) $(LANG_FLAGS) $(WARN_FLAGS) $(SO_OBJ_FLAGS)
-CHECK_FLAGS   = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
+TEST_FLAGS    = $(TEST_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
 
 ### Version Numbers
 VERSION       = %{version}
@@ -31,13 +31,13 @@ RM_R          = $(RM) /S
 RMDIR         = @rmdir
 
 ### File Lists
-CHECK         = check
+TEST         = test
 
 HEADERS       = %{include_files}
 
 LIBOBJS       = %{lib_objs}
 
-CHECKOBJS     = %{check_objs}
+TESTOBJS     = %{test_objs}
 
 LIBNAME       = botan
 
@@ -51,11 +51,13 @@ all: $(LIBRARIES)
 ### Build Commands
 %{lib_build_cmds}
 
-%{check_build_cmds}
+%{test_build_cmds}
 
 ### Link Commands
-$(CHECK): $(LIBRARIES) $(CHECKOBJS)
-	$(CXX) /Fe$@ $(CHECKOBJS) $(BOTAN_LIB) $(LINK_TO)
+check: $(TEST)
+
+$(TEST): $(LIBRARIES) $(TESTOBJS)
+	$(CXX) /Fe$@ $(TESTOBJS) $(BOTAN_LIB) $(LINK_TO)
 
 $(BOTAN_LIB): $(LIBOBJS)
 !If "$(SO_OBJ_FLAGS)" == ""
@@ -69,18 +71,18 @@ docs:
 %{build_doc_commands}
 
 clean:
-	$(RM) %{build_dir}\lib\* %{build_dir}\checks\*
+	$(RM) %{build_dir}\lib\* %{build_dir}\tests\*
 	$(RM) *.manifest *.exp *.dll
-	$(RM) $(LIBRARIES) $(CHECK)
+	$(RM) $(LIBRARIES) $(TEST)
 
 distclean: clean
 	$(RM_R) %{build_dir}
 	$(RMDIR) %{build_dir}\include\botan\internal
 	$(RMDIR) %{build_dir}\include\botan
 	$(RMDIR) %{build_dir}\include
-	$(RMDIR) %{build_dir}\lib %{build_dir}\checks
+	$(RMDIR) %{build_dir}\lib %{build_dir}\tests
 	$(RMDIR) %{build_dir}
-	$(RM) Makefile $(LIBNAME).* $(CHECK).*
+	$(RM) Makefile $(LIBNAME).* $(TEST).*
 
 ### Install Commands
 install: $(LIBRARIES)
diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in
index fbc45a681..4eda9d5c9 100644
--- a/src/build-data/makefile/unix.in
+++ b/src/build-data/makefile/unix.in
@@ -1,13 +1,13 @@
 # Compiler Options
 CXX           = %{cc}
 LIB_OPT       = %{lib_opt}
-CHECK_OPT     = %{check_opt}
+TEST_OPT     = %{test_opt}
 LANG_FLAGS    = %{lang_flags}
 WARN_FLAGS    = %{warn_flags}
 LINK_TO       = %{link_to}
 
 LIB_FLAGS     = $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS)
-CHECK_FLAGS   = $(LANG_FLAGS) $(CHECK_OPT) $(WARN_FLAGS)
+TEST_FLAGS   = $(LANG_FLAGS) $(TEST_OPT) $(WARN_FLAGS)
 
 # Version Numbers
 VERSION       = %{version}
@@ -49,22 +49,24 @@ STATIC_LIB    = $(LIBNAME)-$(SERIES).a
 all: $(LIBRARIES)
 
 # File Lists
-CHECK         = %{check_prefix}check
+TEST         = %{test_prefix}test
 
 HEADERS       = %{include_files}
 
 LIBOBJS       = %{lib_objs}
 
-CHECKOBJS     = %{check_objs}
+TESTOBJS     = %{test_objs}
 
 # Build Commands
 %{lib_build_cmds}
 
-%{check_build_cmds}
+%{test_build_cmds}
 
 # Link Commands
-$(CHECK): $(LIBRARIES) $(CHECKOBJS)
-	$(CXX) $(CHECKOBJS) $(STATIC_LIB) $(LINK_TO) -o $(CHECK)
+check: $(TEST)
+
+$(TEST): $(LIBRARIES) $(TESTOBJS)
+	$(CXX) $(TESTOBJS) $(STATIC_LIB) $(LINK_TO) -o $(TEST)
 
 $(STATIC_LIB): $(LIBOBJS)
 	$(RM) $(STATIC_LIB)
@@ -80,8 +82,8 @@ docs:
 %{build_doc_commands}
 
 clean:
-	$(RM_R) %{build_dir}/lib/* %{build_dir}/checks/*
-	$(RM) $(LIBRARIES) $(SYMLINK) $(CHECK)
+	$(RM_R) %{build_dir}/lib/* %{build_dir}/tests/*
+	$(RM) $(LIBRARIES) $(SYMLINK) $(TEST)
 
 distclean: clean
 	$(RM_R) %{build_dir}
diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in
index 610367dc5..ea37fb835 100644
--- a/src/build-data/makefile/unix_shr.in
+++ b/src/build-data/makefile/unix_shr.in
@@ -1,7 +1,7 @@
 # Compiler Options
 CXX           = %{cc}
 LIB_OPT       = %{lib_opt}
-CHECK_OPT     = %{check_opt}
+TEST_OPT      = %{test_opt}
 LANG_FLAGS    = %{lang_flags}
 WARN_FLAGS    = %{warn_flags}
 SO_OBJ_FLAGS  = %{shared_flags}
@@ -9,7 +9,7 @@ SO_LINK_CMD   = %{so_link}
 LINK_TO       = %{link_to}
 
 LIB_FLAGS     = $(SO_OBJ_FLAGS) $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS)
-CHECK_FLAGS   = $(LANG_FLAGS) $(CHECK_OPT) $(WARN_FLAGS)
+TEST_FLAGS    = $(LANG_FLAGS) $(TEST_OPT) $(WARN_FLAGS)
 
 # Version Numbers
 VERSION       = %{version}
@@ -56,22 +56,24 @@ SYMLINK       = $(LIBNAME)-$(SERIES).%{so_suffix}
 all: $(LIBRARIES)
 
 # File Lists
-CHECK         = %{check_prefix}check
+TEST         = %{test_prefix}test
 
 HEADERS       = %{include_files}
 
 LIBOBJS       = %{lib_objs}
 
-CHECKOBJS     = %{check_objs}
+TESTOBJS     = %{test_objs}
 
 # Build Commands
 %{lib_build_cmds}
 
-%{check_build_cmds}
+%{test_build_cmds}
 
 # Link Commands
-$(CHECK): $(LIBRARIES) $(CHECKOBJS)
-	$(CXX) $(LDFLAGS) $(CHECKOBJS) $(SHARED_LIB) $(LINK_TO) -lboost_regex -o $(CHECK)
+check: $(TEST)
+
+$(TEST): $(LIBRARIES) $(TESTOBJS)
+	$(CXX) $(LDFLAGS) $(TESTOBJS) $(SHARED_LIB) $(LINK_TO) -lboost_regex -o $(TEST)
 
 $(STATIC_LIB): $(LIBOBJS)
 	$(RM) $(STATIC_LIB)
@@ -94,8 +96,8 @@ docs:
 %{build_doc_commands}
 
 clean:
-	$(RM_R) %{build_dir}/lib/* %{build_dir}/checks/*
-	$(RM) $(LIBRARIES) $(SYMLINK) $(SONAME) $(CHECK)
+	$(RM_R) %{build_dir}/lib/* %{build_dir}/tests/*
+	$(RM) $(LIBRARIES) $(SYMLINK) $(SONAME) $(TEST)
 
 distclean: clean
 	$(RM_R) %{build_dir}
diff --git a/src/cert/x509/x509path.cpp b/src/cert/x509/x509path.cpp
index 6aa7251e7..28b4a6d99 100644
--- a/src/cert/x509/x509path.cpp
+++ b/src/cert/x509/x509path.cpp
@@ -159,7 +159,6 @@ Certificate_Status_Code check_chain(const std::vector<X509_Certificate>& cert_pa
          {
          if(restrictions.require_revocation_information())
             return Certificate_Status_Code::NO_REVOCATION_DATA;
-         std::cout << "No revocation information for " << subject.subject_dn() << "\n";
          continue;
          }
 
diff --git a/checks/aead.vec b/tests/aead.vec
index d9b47a6d9..d9b47a6d9 100644
--- a/checks/aead.vec
+++ b/tests/aead.vec
diff --git a/checks/bench.cpp b/tests/bench.cpp
index 16eddd563..16eddd563 100644
--- a/checks/bench.cpp
+++ b/tests/bench.cpp
diff --git a/checks/bench.h b/tests/bench.h
index ba27a1c16..ba27a1c16 100644
--- a/checks/bench.h
+++ b/tests/bench.h
diff --git a/checks/block.vec b/tests/block.vec
index 78eacbe7f..78eacbe7f 100644
--- a/checks/block.vec
+++ b/tests/block.vec
diff --git a/checks/check.cpp b/tests/check.cpp
index cdd64b20e..cdd64b20e 100644
--- a/checks/check.cpp
+++ b/tests/check.cpp
diff --git a/checks/common.cpp b/tests/common.cpp
index 31bc60435..31bc60435 100644
--- a/checks/common.cpp
+++ b/tests/common.cpp
diff --git a/checks/common.h b/tests/common.h
index 4b5a6c3d9..4b5a6c3d9 100644
--- a/checks/common.h
+++ b/tests/common.h
diff --git a/checks/eax.vec b/tests/eax.vec
index 95cd7c1ab..95cd7c1ab 100644
--- a/checks/eax.vec
+++ b/tests/eax.vec
diff --git a/checks/ecc_testdata/CSCA.CSCA.csca-germany.1.crt b/tests/ecc_testdata/CSCA.CSCA.csca-germany.1.crt
index 8653f961a..8653f961a 100644
--- a/checks/ecc_testdata/CSCA.CSCA.csca-germany.1.crt
+++ b/tests/ecc_testdata/CSCA.CSCA.csca-germany.1.crt
diff --git a/checks/ecc_testdata/CSCA.CSCA.csca-germany.1.pem b/tests/ecc_testdata/CSCA.CSCA.csca-germany.1.pem
index 725e1634e..725e1634e 100644
--- a/checks/ecc_testdata/CSCA.CSCA.csca-germany.1.pem
+++ b/tests/ecc_testdata/CSCA.CSCA.csca-germany.1.pem
diff --git a/checks/ecc_testdata/DE1_flen_chars_cvcRequest_ECDSA.der b/tests/ecc_testdata/DE1_flen_chars_cvcRequest_ECDSA.der
index 358ca8f34..358ca8f34 100644
--- a/checks/ecc_testdata/DE1_flen_chars_cvcRequest_ECDSA.der
+++ b/tests/ecc_testdata/DE1_flen_chars_cvcRequest_ECDSA.der
diff --git a/checks/ecc_testdata/Lidia.cer b/tests/ecc_testdata/Lidia.cer
index 58c55689b..58c55689b 100644
--- a/checks/ecc_testdata/Lidia.cer
+++ b/tests/ecc_testdata/Lidia.cer
diff --git a/checks/ecc_testdata/Lidia.pem b/tests/ecc_testdata/Lidia.pem
index c0612d9ca..c0612d9ca 100644
--- a/checks/ecc_testdata/Lidia.pem
+++ b/tests/ecc_testdata/Lidia.pem
diff --git a/checks/ecc_testdata/ado b/tests/ecc_testdata/ado
index baa79177c..baa79177c 100644
--- a/checks/ecc_testdata/ado
+++ b/tests/ecc_testdata/ado
diff --git a/checks/ecc_testdata/ado.cvcreq b/tests/ecc_testdata/ado.cvcreq
index 09a14bbb4..09a14bbb4 100644
--- a/checks/ecc_testdata/ado.cvcreq
+++ b/tests/ecc_testdata/ado.cvcreq
diff --git a/checks/ecc_testdata/cvc_chain_cvca.cer b/tests/ecc_testdata/cvc_chain_cvca.cer
index 4a7281aa6..4a7281aa6 100644
--- a/checks/ecc_testdata/cvc_chain_cvca.cer
+++ b/tests/ecc_testdata/cvc_chain_cvca.cer
diff --git a/checks/ecc_testdata/cvc_chain_dvca_ado2.cer b/tests/ecc_testdata/cvc_chain_dvca_ado2.cer
index 1d6f7c173..1d6f7c173 100644
--- a/checks/ecc_testdata/cvc_chain_dvca_ado2.cer
+++ b/tests/ecc_testdata/cvc_chain_dvca_ado2.cer
diff --git a/checks/ecc_testdata/cvc_chain_dvca_cert1.cer b/tests/ecc_testdata/cvc_chain_dvca_cert1.cer
index c16c2d279..c16c2d279 100644
--- a/checks/ecc_testdata/cvc_chain_dvca_cert1.cer
+++ b/tests/ecc_testdata/cvc_chain_dvca_cert1.cer
diff --git a/checks/ecc_testdata/cvc_chain_dvca_req.cer b/tests/ecc_testdata/cvc_chain_dvca_req.cer
index 382351d6a..382351d6a 100644
--- a/checks/ecc_testdata/cvc_chain_dvca_req.cer
+++ b/tests/ecc_testdata/cvc_chain_dvca_req.cer
diff --git a/checks/ecc_testdata/cvc_chain_dvca_req2.cer b/tests/ecc_testdata/cvc_chain_dvca_req2.cer
index 1b39cee00..1b39cee00 100644
--- a/checks/ecc_testdata/cvc_chain_dvca_req2.cer
+++ b/tests/ecc_testdata/cvc_chain_dvca_req2.cer
diff --git a/checks/ecc_testdata/cvc_chain_dvca_req2b.cer b/tests/ecc_testdata/cvc_chain_dvca_req2b.cer
index 1b39cee00..1b39cee00 100644
--- a/checks/ecc_testdata/cvc_chain_dvca_req2b.cer
+++ b/tests/ecc_testdata/cvc_chain_dvca_req2b.cer
diff --git a/checks/ecc_testdata/cvc_chain_is_cert.cer b/tests/ecc_testdata/cvc_chain_is_cert.cer
index f9ee2d20f..f9ee2d20f 100644
--- a/checks/ecc_testdata/cvc_chain_is_cert.cer
+++ b/tests/ecc_testdata/cvc_chain_is_cert.cer
diff --git a/checks/ecc_testdata/cvc_chain_is_req.cer b/tests/ecc_testdata/cvc_chain_is_req.cer
index 144495f8b..144495f8b 100644
--- a/checks/ecc_testdata/cvc_chain_is_req.cer
+++ b/tests/ecc_testdata/cvc_chain_is_req.cer
diff --git a/checks/ecc_testdata/cvc_chain_link12.cer b/tests/ecc_testdata/cvc_chain_link12.cer
index 27df92d9d..27df92d9d 100644
--- a/checks/ecc_testdata/cvc_chain_link12.cer
+++ b/tests/ecc_testdata/cvc_chain_link12.cer
diff --git a/checks/ecc_testdata/cvca01.cv.crt b/tests/ecc_testdata/cvca01.cv.crt
index 8f278167c..8f278167c 100644
--- a/checks/ecc_testdata/cvca01.cv.crt
+++ b/tests/ecc_testdata/cvca01.cv.crt
diff --git a/checks/ecc_testdata/cvca_illegal_chars.cv.crt b/tests/ecc_testdata/cvca_illegal_chars.cv.crt
index b1a3d266c..b1a3d266c 100644
--- a/checks/ecc_testdata/cvca_illegal_chars.cv.crt
+++ b/tests/ecc_testdata/cvca_illegal_chars.cv.crt
diff --git a/checks/ecc_testdata/cvca_illegal_chars2.cv.crt b/tests/ecc_testdata/cvca_illegal_chars2.cv.crt
index 00f09b618..00f09b618 100644
--- a/checks/ecc_testdata/cvca_illegal_chars2.cv.crt
+++ b/tests/ecc_testdata/cvca_illegal_chars2.cv.crt
diff --git a/checks/ecc_testdata/ec_for_flex_mes.sig b/tests/ecc_testdata/ec_for_flex_mes.sig
index 6d9983b67..6d9983b67 100644
--- a/checks/ecc_testdata/ec_for_flex_mes.sig
+++ b/tests/ecc_testdata/ec_for_flex_mes.sig
diff --git a/checks/ecc_testdata/ec_oid_not_in_reg_private_2.pkcs8.pem b/tests/ecc_testdata/ec_oid_not_in_reg_private_2.pkcs8.pem
index 7a1707971..7a1707971 100644
--- a/checks/ecc_testdata/ec_oid_not_in_reg_private_2.pkcs8.pem
+++ b/tests/ecc_testdata/ec_oid_not_in_reg_private_2.pkcs8.pem
diff --git a/checks/ecc_testdata/ecc_private_with_rfc5915_ext.pem b/tests/ecc_testdata/ecc_private_with_rfc5915_ext.pem
index a8699fce7..a8699fce7 100644
--- a/checks/ecc_testdata/ecc_private_with_rfc5915_ext.pem
+++ b/tests/ecc_testdata/ecc_private_with_rfc5915_ext.pem
diff --git a/checks/ecc_testdata/flex_cert.crt b/tests/ecc_testdata/flex_cert.crt
index 0b9015cb2..0b9015cb2 100644
--- a/checks/ecc_testdata/flex_cert.crt
+++ b/tests/ecc_testdata/flex_cert.crt
diff --git a/checks/ecc_testdata/flex_mes b/tests/ecc_testdata/flex_mes
index 52a91be5e..52a91be5e 100644
--- a/checks/ecc_testdata/flex_mes
+++ b/tests/ecc_testdata/flex_mes
diff --git a/checks/ecc_testdata/flex_mes.sig b/tests/ecc_testdata/flex_mes.sig
index fde33473a..fde33473a 100644
--- a/checks/ecc_testdata/flex_mes.sig
+++ b/tests/ecc_testdata/flex_mes.sig
diff --git a/checks/ecc_testdata/insito_expl_ec.pem b/tests/ecc_testdata/insito_expl_ec.pem
index e8e57848f..e8e57848f 100644
--- a/checks/ecc_testdata/insito_expl_ec.pem
+++ b/tests/ecc_testdata/insito_expl_ec.pem
diff --git a/checks/ecc_testdata/insito_oid_ec.pem b/tests/ecc_testdata/insito_oid_ec.pem
index 2e0517187..2e0517187 100644
--- a/checks/ecc_testdata/insito_oid_ec.pem
+++ b/tests/ecc_testdata/insito_oid_ec.pem
diff --git a/checks/ecc_testdata/link_SHA1.166.crt b/tests/ecc_testdata/link_SHA1.166.crt
index 8f76b3203..8f76b3203 100644
--- a/checks/ecc_testdata/link_SHA1.166.crt
+++ b/tests/ecc_testdata/link_SHA1.166.crt
diff --git a/checks/ecc_testdata/link_SHA256.cer b/tests/ecc_testdata/link_SHA256.cer
index add40f738..add40f738 100644
--- a/checks/ecc_testdata/link_SHA256.cer
+++ b/tests/ecc_testdata/link_SHA256.cer
diff --git a/checks/ecc_testdata/my_cv_cert.ber b/tests/ecc_testdata/my_cv_cert.ber
index 7a14fd3eb..7a14fd3eb 100644
--- a/checks/ecc_testdata/my_cv_cert.ber
+++ b/tests/ecc_testdata/my_cv_cert.ber
diff --git a/checks/ecc_testdata/my_cv_cert2.ber b/tests/ecc_testdata/my_cv_cert2.ber
index 7a14fd3eb..7a14fd3eb 100644
--- a/checks/ecc_testdata/my_cv_cert2.ber
+++ b/tests/ecc_testdata/my_cv_cert2.ber
diff --git a/checks/ecc_testdata/my_cv_req.ber b/tests/ecc_testdata/my_cv_req.ber
index 4e121eee7..4e121eee7 100644
--- a/checks/ecc_testdata/my_cv_req.ber
+++ b/tests/ecc_testdata/my_cv_req.ber
diff --git a/checks/ecc_testdata/nodompar_private.pkcs8.pem b/tests/ecc_testdata/nodompar_private.pkcs8.pem
index a2c64ec53..a2c64ec53 100644
--- a/checks/ecc_testdata/nodompar_private.pkcs8.pem
+++ b/tests/ecc_testdata/nodompar_private.pkcs8.pem
diff --git a/checks/ecc_testdata/private.pem b/tests/ecc_testdata/private.pem
index 4465da669..4465da669 100644
--- a/checks/ecc_testdata/private.pem
+++ b/tests/ecc_testdata/private.pem
diff --git a/checks/ecc_testdata/root1_SHA256.cer b/tests/ecc_testdata/root1_SHA256.cer
index 021afe530..021afe530 100644
--- a/checks/ecc_testdata/root1_SHA256.cer
+++ b/tests/ecc_testdata/root1_SHA256.cer
diff --git a/checks/ecc_testdata/root2_SHA256.cer b/tests/ecc_testdata/root2_SHA256.cer
index a2ecfed22..a2ecfed22 100644
--- a/checks/ecc_testdata/root2_SHA256.cer
+++ b/tests/ecc_testdata/root2_SHA256.cer
diff --git a/checks/ecc_testdata/root_SHA1.163.crt b/tests/ecc_testdata/root_SHA1.163.crt
index e1bf39f9a..e1bf39f9a 100644
--- a/checks/ecc_testdata/root_SHA1.163.crt
+++ b/tests/ecc_testdata/root_SHA1.163.crt
diff --git a/checks/ecc_testdata/withdompar_private.pkcs8.pem b/tests/ecc_testdata/withdompar_private.pkcs8.pem
index 85d7b575e..85d7b575e 100644
--- a/checks/ecc_testdata/withdompar_private.pkcs8.pem
+++ b/tests/ecc_testdata/withdompar_private.pkcs8.pem
diff --git a/checks/ecc_testdata/x509_req_test_expl.pem b/tests/ecc_testdata/x509_req_test_expl.pem
index e4ae1a9b3..e4ae1a9b3 100644
--- a/checks/ecc_testdata/x509_req_test_expl.pem
+++ b/tests/ecc_testdata/x509_req_test_expl.pem
diff --git a/checks/ecc_testdata/x509_req_test_oid.pem b/tests/ecc_testdata/x509_req_test_oid.pem
index 2ae0c2ea5..2ae0c2ea5 100644
--- a/checks/ecc_testdata/x509_req_test_oid.pem
+++ b/tests/ecc_testdata/x509_req_test_oid.pem
diff --git a/checks/ecc_testdata/x509_test_privkey_expl_pw123456.pem b/tests/ecc_testdata/x509_test_privkey_expl_pw123456.pem
index 20f17130c..20f17130c 100644
--- a/checks/ecc_testdata/x509_test_privkey_expl_pw123456.pem
+++ b/tests/ecc_testdata/x509_test_privkey_expl_pw123456.pem
diff --git a/checks/ecc_testdata/x509_test_privkey_oid_pw123456.pem b/tests/ecc_testdata/x509_test_privkey_oid_pw123456.pem
index ecd188a5d..ecd188a5d 100644
--- a/checks/ecc_testdata/x509_test_privkey_oid_pw123456.pem
+++ b/tests/ecc_testdata/x509_test_privkey_oid_pw123456.pem
diff --git a/checks/fail.dat b/tests/fail.dat
index e7be16f86..e7be16f86 100644
--- a/checks/fail.dat
+++ b/tests/fail.dat
diff --git a/checks/getopt.h b/tests/getopt.h
index 67cf979f9..67cf979f9 100644
--- a/checks/getopt.h
+++ b/tests/getopt.h
diff --git a/checks/hash.vec b/tests/hash.vec
index 9125b55e8..9125b55e8 100644
--- a/checks/hash.vec
+++ b/tests/hash.vec
diff --git a/checks/hkdf.vec b/tests/hkdf.vec
index 7d309aea7..7d309aea7 100644
--- a/checks/hkdf.vec
+++ b/tests/hkdf.vec
diff --git a/checks/kdf.vec b/tests/kdf.vec
index 0f5bb3383..0f5bb3383 100644
--- a/checks/kdf.vec
+++ b/tests/kdf.vec
diff --git a/checks/mac.vec b/tests/mac.vec
index 8007a0721..8007a0721 100644
--- a/checks/mac.vec
+++ b/tests/mac.vec
diff --git a/checks/modes.vec b/tests/modes.vec
index 5d771c7fc..5d771c7fc 100644
--- a/checks/modes.vec
+++ b/tests/modes.vec
diff --git a/checks/mp_valid.dat b/tests/mp_valid.dat
index 1b45bf9bb..1b45bf9bb 100644
--- a/checks/mp_valid.dat
+++ b/tests/mp_valid.dat
diff --git a/checks/nist_tests/Makefile b/tests/nist_tests/Makefile
index 19f8a462d..19f8a462d 100644
--- a/checks/nist_tests/Makefile
+++ b/tests/nist_tests/Makefile
diff --git a/checks/nist_tests/failure.txt b/tests/nist_tests/failure.txt
index 0166e0ee6..0166e0ee6 100644
--- a/checks/nist_tests/failure.txt
+++ b/tests/nist_tests/failure.txt
diff --git a/checks/nist_tests/readme.txt b/tests/nist_tests/readme.txt
index b992a5b30..b992a5b30 100644
--- a/checks/nist_tests/readme.txt
+++ b/tests/nist_tests/readme.txt
diff --git a/checks/nist_tests/tests/test01/end.crt b/tests/nist_tests/tests/test01/end.crt
index d7e64d6de..d7e64d6de 100644
--- a/checks/nist_tests/tests/test01/end.crt
+++ b/tests/nist_tests/tests/test01/end.crt
diff --git a/checks/nist_tests/tests/test01/root.crl b/tests/nist_tests/tests/test01/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test01/root.crl
+++ b/tests/nist_tests/tests/test01/root.crl
diff --git a/checks/nist_tests/tests/test01/root.crt b/tests/nist_tests/tests/test01/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test01/root.crt
+++ b/tests/nist_tests/tests/test01/root.crt
diff --git a/checks/nist_tests/tests/test02/end.crt b/tests/nist_tests/tests/test02/end.crt
index f97da0509..f97da0509 100644
--- a/checks/nist_tests/tests/test02/end.crt
+++ b/tests/nist_tests/tests/test02/end.crt
diff --git a/checks/nist_tests/tests/test02/int.crl b/tests/nist_tests/tests/test02/int.crl
index e7dfa96ee..e7dfa96ee 100644
--- a/checks/nist_tests/tests/test02/int.crl
+++ b/tests/nist_tests/tests/test02/int.crl
diff --git a/checks/nist_tests/tests/test02/int.crt b/tests/nist_tests/tests/test02/int.crt
index 0aba75048..0aba75048 100644
--- a/checks/nist_tests/tests/test02/int.crt
+++ b/tests/nist_tests/tests/test02/int.crt
diff --git a/checks/nist_tests/tests/test02/root.crl b/tests/nist_tests/tests/test02/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test02/root.crl
+++ b/tests/nist_tests/tests/test02/root.crl
diff --git a/checks/nist_tests/tests/test02/root.crt b/tests/nist_tests/tests/test02/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test02/root.crt
+++ b/tests/nist_tests/tests/test02/root.crt
diff --git a/checks/nist_tests/tests/test03/end.crt b/tests/nist_tests/tests/test03/end.crt
index 9b0463a67..9b0463a67 100644
--- a/checks/nist_tests/tests/test03/end.crt
+++ b/tests/nist_tests/tests/test03/end.crt
diff --git a/checks/nist_tests/tests/test03/int.crl b/tests/nist_tests/tests/test03/int.crl
index 528f3237c..528f3237c 100644
--- a/checks/nist_tests/tests/test03/int.crl
+++ b/tests/nist_tests/tests/test03/int.crl
diff --git a/checks/nist_tests/tests/test03/int.crt b/tests/nist_tests/tests/test03/int.crt
index c8cfc0550..c8cfc0550 100644
--- a/checks/nist_tests/tests/test03/int.crt
+++ b/tests/nist_tests/tests/test03/int.crt
diff --git a/checks/nist_tests/tests/test03/root.crl b/tests/nist_tests/tests/test03/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test03/root.crl
+++ b/tests/nist_tests/tests/test03/root.crl
diff --git a/checks/nist_tests/tests/test03/root.crt b/tests/nist_tests/tests/test03/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test03/root.crt
+++ b/tests/nist_tests/tests/test03/root.crt
diff --git a/checks/nist_tests/tests/test04/end.crt b/tests/nist_tests/tests/test04/end.crt
index 75d2fd50e..75d2fd50e 100644
--- a/checks/nist_tests/tests/test04/end.crt
+++ b/tests/nist_tests/tests/test04/end.crt
diff --git a/checks/nist_tests/tests/test04/int1.crl b/tests/nist_tests/tests/test04/int1.crl
index 2f30c77b5..2f30c77b5 100644
--- a/checks/nist_tests/tests/test04/int1.crl
+++ b/tests/nist_tests/tests/test04/int1.crl
diff --git a/checks/nist_tests/tests/test04/int1.crt b/tests/nist_tests/tests/test04/int1.crt
index f4e88d58c..f4e88d58c 100644
--- a/checks/nist_tests/tests/test04/int1.crt
+++ b/tests/nist_tests/tests/test04/int1.crt
diff --git a/checks/nist_tests/tests/test04/int2.crl b/tests/nist_tests/tests/test04/int2.crl
index e8596c314..e8596c314 100644
--- a/checks/nist_tests/tests/test04/int2.crl
+++ b/tests/nist_tests/tests/test04/int2.crl
diff --git a/checks/nist_tests/tests/test04/int2.crt b/tests/nist_tests/tests/test04/int2.crt
index 727035b6c..727035b6c 100644
--- a/checks/nist_tests/tests/test04/int2.crt
+++ b/tests/nist_tests/tests/test04/int2.crt
diff --git a/checks/nist_tests/tests/test04/root.crl b/tests/nist_tests/tests/test04/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test04/root.crl
+++ b/tests/nist_tests/tests/test04/root.crl
diff --git a/checks/nist_tests/tests/test04/root.crt b/tests/nist_tests/tests/test04/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test04/root.crt
+++ b/tests/nist_tests/tests/test04/root.crt
diff --git a/checks/nist_tests/tests/test05/end.crt b/tests/nist_tests/tests/test05/end.crt
index a3a658923..a3a658923 100644
--- a/checks/nist_tests/tests/test05/end.crt
+++ b/tests/nist_tests/tests/test05/end.crt
diff --git a/checks/nist_tests/tests/test05/int.crl b/tests/nist_tests/tests/test05/int.crl
index a34ef279b..a34ef279b 100644
--- a/checks/nist_tests/tests/test05/int.crl
+++ b/tests/nist_tests/tests/test05/int.crl
diff --git a/checks/nist_tests/tests/test05/int.crt b/tests/nist_tests/tests/test05/int.crt
index 610df750e..610df750e 100644
--- a/checks/nist_tests/tests/test05/int.crt
+++ b/tests/nist_tests/tests/test05/int.crt
diff --git a/checks/nist_tests/tests/test05/root.crl b/tests/nist_tests/tests/test05/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test05/root.crl
+++ b/tests/nist_tests/tests/test05/root.crl
diff --git a/checks/nist_tests/tests/test05/root.crt b/tests/nist_tests/tests/test05/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test05/root.crt
+++ b/tests/nist_tests/tests/test05/root.crt
diff --git a/checks/nist_tests/tests/test06/end.crt b/tests/nist_tests/tests/test06/end.crt
index 1e68f0de1..1e68f0de1 100644
--- a/checks/nist_tests/tests/test06/end.crt
+++ b/tests/nist_tests/tests/test06/end.crt
diff --git a/checks/nist_tests/tests/test06/int.crl b/tests/nist_tests/tests/test06/int.crl
index d87cd7e26..d87cd7e26 100644
--- a/checks/nist_tests/tests/test06/int.crl
+++ b/tests/nist_tests/tests/test06/int.crl
diff --git a/checks/nist_tests/tests/test06/int.crt b/tests/nist_tests/tests/test06/int.crt
index 5bb74d259..5bb74d259 100644
--- a/checks/nist_tests/tests/test06/int.crt
+++ b/tests/nist_tests/tests/test06/int.crt
diff --git a/checks/nist_tests/tests/test06/root.crl b/tests/nist_tests/tests/test06/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test06/root.crl
+++ b/tests/nist_tests/tests/test06/root.crl
diff --git a/checks/nist_tests/tests/test06/root.crt b/tests/nist_tests/tests/test06/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test06/root.crt
+++ b/tests/nist_tests/tests/test06/root.crt
diff --git a/checks/nist_tests/tests/test07/end.crt b/tests/nist_tests/tests/test07/end.crt
index 0f97e6f5a..0f97e6f5a 100644
--- a/checks/nist_tests/tests/test07/end.crt
+++ b/tests/nist_tests/tests/test07/end.crt
diff --git a/checks/nist_tests/tests/test07/int.crl b/tests/nist_tests/tests/test07/int.crl
index 8064e91bc..8064e91bc 100644
--- a/checks/nist_tests/tests/test07/int.crl
+++ b/tests/nist_tests/tests/test07/int.crl
diff --git a/checks/nist_tests/tests/test07/int.crt b/tests/nist_tests/tests/test07/int.crt
index 5c1ddd3e3..5c1ddd3e3 100644
--- a/checks/nist_tests/tests/test07/int.crt
+++ b/tests/nist_tests/tests/test07/int.crt
diff --git a/checks/nist_tests/tests/test07/root.crl b/tests/nist_tests/tests/test07/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test07/root.crl
+++ b/tests/nist_tests/tests/test07/root.crl
diff --git a/checks/nist_tests/tests/test07/root.crt b/tests/nist_tests/tests/test07/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test07/root.crt
+++ b/tests/nist_tests/tests/test07/root.crt
diff --git a/checks/nist_tests/tests/test08/end.crt b/tests/nist_tests/tests/test08/end.crt
index cb99c2ac5..cb99c2ac5 100644
--- a/checks/nist_tests/tests/test08/end.crt
+++ b/tests/nist_tests/tests/test08/end.crt
diff --git a/checks/nist_tests/tests/test08/int.crl b/tests/nist_tests/tests/test08/int.crl
index d5ee3c3ce..d5ee3c3ce 100644
--- a/checks/nist_tests/tests/test08/int.crl
+++ b/tests/nist_tests/tests/test08/int.crl
diff --git a/checks/nist_tests/tests/test08/int.crt b/tests/nist_tests/tests/test08/int.crt
index d26979cdd..d26979cdd 100644
--- a/checks/nist_tests/tests/test08/int.crt
+++ b/tests/nist_tests/tests/test08/int.crt
diff --git a/checks/nist_tests/tests/test08/root.crl b/tests/nist_tests/tests/test08/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test08/root.crl
+++ b/tests/nist_tests/tests/test08/root.crl
diff --git a/checks/nist_tests/tests/test08/root.crt b/tests/nist_tests/tests/test08/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test08/root.crt
+++ b/tests/nist_tests/tests/test08/root.crt
diff --git a/checks/nist_tests/tests/test09/end.crt b/tests/nist_tests/tests/test09/end.crt
index 4dd2352b4..4dd2352b4 100644
--- a/checks/nist_tests/tests/test09/end.crt
+++ b/tests/nist_tests/tests/test09/end.crt
diff --git a/checks/nist_tests/tests/test09/int.crl b/tests/nist_tests/tests/test09/int.crl
index fbd85145c..fbd85145c 100644
--- a/checks/nist_tests/tests/test09/int.crl
+++ b/tests/nist_tests/tests/test09/int.crl
diff --git a/checks/nist_tests/tests/test09/int.crt b/tests/nist_tests/tests/test09/int.crt
index c107dd756..c107dd756 100644
--- a/checks/nist_tests/tests/test09/int.crt
+++ b/tests/nist_tests/tests/test09/int.crt
diff --git a/checks/nist_tests/tests/test09/root.crl b/tests/nist_tests/tests/test09/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test09/root.crl
+++ b/tests/nist_tests/tests/test09/root.crl
diff --git a/checks/nist_tests/tests/test09/root.crt b/tests/nist_tests/tests/test09/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test09/root.crt
+++ b/tests/nist_tests/tests/test09/root.crt
diff --git a/checks/nist_tests/tests/test10/end.crt b/tests/nist_tests/tests/test10/end.crt
index de3924003..de3924003 100644
--- a/checks/nist_tests/tests/test10/end.crt
+++ b/tests/nist_tests/tests/test10/end.crt
diff --git a/checks/nist_tests/tests/test10/int.crl b/tests/nist_tests/tests/test10/int.crl
index daefd50c8..daefd50c8 100644
--- a/checks/nist_tests/tests/test10/int.crl
+++ b/tests/nist_tests/tests/test10/int.crl
diff --git a/checks/nist_tests/tests/test10/int.crt b/tests/nist_tests/tests/test10/int.crt
index 2d691abce..2d691abce 100644
--- a/checks/nist_tests/tests/test10/int.crt
+++ b/tests/nist_tests/tests/test10/int.crt
diff --git a/checks/nist_tests/tests/test10/root.crl b/tests/nist_tests/tests/test10/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test10/root.crl
+++ b/tests/nist_tests/tests/test10/root.crl
diff --git a/checks/nist_tests/tests/test10/root.crt b/tests/nist_tests/tests/test10/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test10/root.crt
+++ b/tests/nist_tests/tests/test10/root.crt
diff --git a/checks/nist_tests/tests/test11/end.crt b/tests/nist_tests/tests/test11/end.crt
index 6e14527d2..6e14527d2 100644
--- a/checks/nist_tests/tests/test11/end.crt
+++ b/tests/nist_tests/tests/test11/end.crt
diff --git a/checks/nist_tests/tests/test11/int.crl b/tests/nist_tests/tests/test11/int.crl
index cc91ad51d..cc91ad51d 100644
--- a/checks/nist_tests/tests/test11/int.crl
+++ b/tests/nist_tests/tests/test11/int.crl
diff --git a/checks/nist_tests/tests/test11/int.crt b/tests/nist_tests/tests/test11/int.crt
index 87fa07962..87fa07962 100644
--- a/checks/nist_tests/tests/test11/int.crt
+++ b/tests/nist_tests/tests/test11/int.crt
diff --git a/checks/nist_tests/tests/test11/root.crl b/tests/nist_tests/tests/test11/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test11/root.crl
+++ b/tests/nist_tests/tests/test11/root.crl
diff --git a/checks/nist_tests/tests/test11/root.crt b/tests/nist_tests/tests/test11/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test11/root.crt
+++ b/tests/nist_tests/tests/test11/root.crt
diff --git a/checks/nist_tests/tests/test12/end.crt b/tests/nist_tests/tests/test12/end.crt
index 158c6ae01..158c6ae01 100644
--- a/checks/nist_tests/tests/test12/end.crt
+++ b/tests/nist_tests/tests/test12/end.crt
diff --git a/checks/nist_tests/tests/test12/int.crl b/tests/nist_tests/tests/test12/int.crl
index 7ce6928bb..7ce6928bb 100644
--- a/checks/nist_tests/tests/test12/int.crl
+++ b/tests/nist_tests/tests/test12/int.crl
diff --git a/checks/nist_tests/tests/test12/int.crt b/tests/nist_tests/tests/test12/int.crt
index a55333b63..a55333b63 100644
--- a/checks/nist_tests/tests/test12/int.crt
+++ b/tests/nist_tests/tests/test12/int.crt
diff --git a/checks/nist_tests/tests/test12/root.crl b/tests/nist_tests/tests/test12/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test12/root.crl
+++ b/tests/nist_tests/tests/test12/root.crl
diff --git a/checks/nist_tests/tests/test12/root.crt b/tests/nist_tests/tests/test12/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test12/root.crt
+++ b/tests/nist_tests/tests/test12/root.crt
diff --git a/checks/nist_tests/tests/test13/end.crt b/tests/nist_tests/tests/test13/end.crt
index d1ddf4b44..d1ddf4b44 100644
--- a/checks/nist_tests/tests/test13/end.crt
+++ b/tests/nist_tests/tests/test13/end.crt
diff --git a/checks/nist_tests/tests/test13/int.crl b/tests/nist_tests/tests/test13/int.crl
index df86506d8..df86506d8 100644
--- a/checks/nist_tests/tests/test13/int.crl
+++ b/tests/nist_tests/tests/test13/int.crl
diff --git a/checks/nist_tests/tests/test13/int.crt b/tests/nist_tests/tests/test13/int.crt
index abc6fe537..abc6fe537 100644
--- a/checks/nist_tests/tests/test13/int.crt
+++ b/tests/nist_tests/tests/test13/int.crt
diff --git a/checks/nist_tests/tests/test13/root.crl b/tests/nist_tests/tests/test13/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test13/root.crl
+++ b/tests/nist_tests/tests/test13/root.crl
diff --git a/checks/nist_tests/tests/test13/root.crt b/tests/nist_tests/tests/test13/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test13/root.crt
+++ b/tests/nist_tests/tests/test13/root.crt
diff --git a/checks/nist_tests/tests/test14/end.crt b/tests/nist_tests/tests/test14/end.crt
index f43e03826..f43e03826 100644
--- a/checks/nist_tests/tests/test14/end.crt
+++ b/tests/nist_tests/tests/test14/end.crt
diff --git a/checks/nist_tests/tests/test14/int.crl b/tests/nist_tests/tests/test14/int.crl
index ae372f38b..ae372f38b 100644
--- a/checks/nist_tests/tests/test14/int.crl
+++ b/tests/nist_tests/tests/test14/int.crl
diff --git a/checks/nist_tests/tests/test14/int.crt b/tests/nist_tests/tests/test14/int.crt
index 6e97ee2b8..6e97ee2b8 100644
--- a/checks/nist_tests/tests/test14/int.crt
+++ b/tests/nist_tests/tests/test14/int.crt
diff --git a/checks/nist_tests/tests/test14/root.crl b/tests/nist_tests/tests/test14/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test14/root.crl
+++ b/tests/nist_tests/tests/test14/root.crl
diff --git a/checks/nist_tests/tests/test14/root.crt b/tests/nist_tests/tests/test14/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test14/root.crt
+++ b/tests/nist_tests/tests/test14/root.crt
diff --git a/checks/nist_tests/tests/test15/end.crt b/tests/nist_tests/tests/test15/end.crt
index a2408315c..a2408315c 100644
--- a/checks/nist_tests/tests/test15/end.crt
+++ b/tests/nist_tests/tests/test15/end.crt
diff --git a/checks/nist_tests/tests/test15/int.crl b/tests/nist_tests/tests/test15/int.crl
index 626049aaf..626049aaf 100644
--- a/checks/nist_tests/tests/test15/int.crl
+++ b/tests/nist_tests/tests/test15/int.crl
diff --git a/checks/nist_tests/tests/test15/int.crt b/tests/nist_tests/tests/test15/int.crt
index 23fb78c0f..23fb78c0f 100644
--- a/checks/nist_tests/tests/test15/int.crt
+++ b/tests/nist_tests/tests/test15/int.crt
diff --git a/checks/nist_tests/tests/test15/root.crl b/tests/nist_tests/tests/test15/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test15/root.crl
+++ b/tests/nist_tests/tests/test15/root.crl
diff --git a/checks/nist_tests/tests/test15/root.crt b/tests/nist_tests/tests/test15/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test15/root.crt
+++ b/tests/nist_tests/tests/test15/root.crt
diff --git a/checks/nist_tests/tests/test16/end.crt b/tests/nist_tests/tests/test16/end.crt
index 108a75d73..108a75d73 100644
--- a/checks/nist_tests/tests/test16/end.crt
+++ b/tests/nist_tests/tests/test16/end.crt
diff --git a/checks/nist_tests/tests/test16/int.crl b/tests/nist_tests/tests/test16/int.crl
index d345a338e..d345a338e 100644
--- a/checks/nist_tests/tests/test16/int.crl
+++ b/tests/nist_tests/tests/test16/int.crl
diff --git a/checks/nist_tests/tests/test16/int.crt b/tests/nist_tests/tests/test16/int.crt
index 6f2a332ad..6f2a332ad 100644
--- a/checks/nist_tests/tests/test16/int.crt
+++ b/tests/nist_tests/tests/test16/int.crt
diff --git a/checks/nist_tests/tests/test16/root.crl b/tests/nist_tests/tests/test16/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test16/root.crl
+++ b/tests/nist_tests/tests/test16/root.crl
diff --git a/checks/nist_tests/tests/test16/root.crt b/tests/nist_tests/tests/test16/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test16/root.crt
+++ b/tests/nist_tests/tests/test16/root.crt
diff --git a/checks/nist_tests/tests/test17/end.crt b/tests/nist_tests/tests/test17/end.crt
index b90340872..b90340872 100644
--- a/checks/nist_tests/tests/test17/end.crt
+++ b/tests/nist_tests/tests/test17/end.crt
diff --git a/checks/nist_tests/tests/test17/int.crl b/tests/nist_tests/tests/test17/int.crl
index 0b1ba6fda..0b1ba6fda 100644
--- a/checks/nist_tests/tests/test17/int.crl
+++ b/tests/nist_tests/tests/test17/int.crl
diff --git a/checks/nist_tests/tests/test17/int.crt b/tests/nist_tests/tests/test17/int.crt
index 25e7b48e5..25e7b48e5 100644
--- a/checks/nist_tests/tests/test17/int.crt
+++ b/tests/nist_tests/tests/test17/int.crt
diff --git a/checks/nist_tests/tests/test17/root.crl b/tests/nist_tests/tests/test17/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test17/root.crl
+++ b/tests/nist_tests/tests/test17/root.crl
diff --git a/checks/nist_tests/tests/test17/root.crt b/tests/nist_tests/tests/test17/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test17/root.crt
+++ b/tests/nist_tests/tests/test17/root.crt
diff --git a/checks/nist_tests/tests/test18/end.crt b/tests/nist_tests/tests/test18/end.crt
index 2edb51394..2edb51394 100644
--- a/checks/nist_tests/tests/test18/end.crt
+++ b/tests/nist_tests/tests/test18/end.crt
diff --git a/checks/nist_tests/tests/test18/int.crl b/tests/nist_tests/tests/test18/int.crl
index 2948246d7..2948246d7 100644
--- a/checks/nist_tests/tests/test18/int.crl
+++ b/tests/nist_tests/tests/test18/int.crl
diff --git a/checks/nist_tests/tests/test18/int.crt b/tests/nist_tests/tests/test18/int.crt
index eac3e8693..eac3e8693 100644
--- a/checks/nist_tests/tests/test18/int.crt
+++ b/tests/nist_tests/tests/test18/int.crt
diff --git a/checks/nist_tests/tests/test18/root.crl b/tests/nist_tests/tests/test18/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test18/root.crl
+++ b/tests/nist_tests/tests/test18/root.crl
diff --git a/checks/nist_tests/tests/test18/root.crt b/tests/nist_tests/tests/test18/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test18/root.crt
+++ b/tests/nist_tests/tests/test18/root.crt
diff --git a/checks/nist_tests/tests/test19/end.crt b/tests/nist_tests/tests/test19/end.crt
index a9c7a1fc6..a9c7a1fc6 100644
--- a/checks/nist_tests/tests/test19/end.crt
+++ b/tests/nist_tests/tests/test19/end.crt
diff --git a/checks/nist_tests/tests/test19/int.crt b/tests/nist_tests/tests/test19/int.crt
index eff60dd15..eff60dd15 100644
--- a/checks/nist_tests/tests/test19/int.crt
+++ b/tests/nist_tests/tests/test19/int.crt
diff --git a/checks/nist_tests/tests/test19/root.crl b/tests/nist_tests/tests/test19/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test19/root.crl
+++ b/tests/nist_tests/tests/test19/root.crl
diff --git a/checks/nist_tests/tests/test19/root.crt b/tests/nist_tests/tests/test19/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test19/root.crt
+++ b/tests/nist_tests/tests/test19/root.crt
diff --git a/checks/nist_tests/tests/test20/end.crt b/tests/nist_tests/tests/test20/end.crt
index b26e77c19..b26e77c19 100644
--- a/checks/nist_tests/tests/test20/end.crt
+++ b/tests/nist_tests/tests/test20/end.crt
diff --git a/checks/nist_tests/tests/test20/int.crl b/tests/nist_tests/tests/test20/int.crl
index 5755a2eae..5755a2eae 100644
--- a/checks/nist_tests/tests/test20/int.crl
+++ b/tests/nist_tests/tests/test20/int.crl
diff --git a/checks/nist_tests/tests/test20/int.crt b/tests/nist_tests/tests/test20/int.crt
index d7daa69ef..d7daa69ef 100644
--- a/checks/nist_tests/tests/test20/int.crt
+++ b/tests/nist_tests/tests/test20/int.crt
diff --git a/checks/nist_tests/tests/test20/root.crl b/tests/nist_tests/tests/test20/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test20/root.crl
+++ b/tests/nist_tests/tests/test20/root.crl
diff --git a/checks/nist_tests/tests/test20/root.crt b/tests/nist_tests/tests/test20/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test20/root.crt
+++ b/tests/nist_tests/tests/test20/root.crt
diff --git a/checks/nist_tests/tests/test21/end.crt b/tests/nist_tests/tests/test21/end.crt
index 798e5cf17..798e5cf17 100644
--- a/checks/nist_tests/tests/test21/end.crt
+++ b/tests/nist_tests/tests/test21/end.crt
diff --git a/checks/nist_tests/tests/test21/int.crl b/tests/nist_tests/tests/test21/int.crl
index ea3cbb9d8..ea3cbb9d8 100644
--- a/checks/nist_tests/tests/test21/int.crl
+++ b/tests/nist_tests/tests/test21/int.crl
diff --git a/checks/nist_tests/tests/test21/int.crt b/tests/nist_tests/tests/test21/int.crt
index 9082c4d77..9082c4d77 100644
--- a/checks/nist_tests/tests/test21/int.crt
+++ b/tests/nist_tests/tests/test21/int.crt
diff --git a/checks/nist_tests/tests/test21/root.crl b/tests/nist_tests/tests/test21/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test21/root.crl
+++ b/tests/nist_tests/tests/test21/root.crl
diff --git a/checks/nist_tests/tests/test21/root.crt b/tests/nist_tests/tests/test21/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test21/root.crt
+++ b/tests/nist_tests/tests/test21/root.crt
diff --git a/checks/nist_tests/tests/test22/end.crt b/tests/nist_tests/tests/test22/end.crt
index d130c7506..d130c7506 100644
--- a/checks/nist_tests/tests/test22/end.crt
+++ b/tests/nist_tests/tests/test22/end.crt
diff --git a/checks/nist_tests/tests/test22/int.crl b/tests/nist_tests/tests/test22/int.crl
index 07e18398d..07e18398d 100644
--- a/checks/nist_tests/tests/test22/int.crl
+++ b/tests/nist_tests/tests/test22/int.crl
diff --git a/checks/nist_tests/tests/test22/int.crt b/tests/nist_tests/tests/test22/int.crt
index d0f401bae..d0f401bae 100644
--- a/checks/nist_tests/tests/test22/int.crt
+++ b/tests/nist_tests/tests/test22/int.crt
diff --git a/checks/nist_tests/tests/test22/root.crl b/tests/nist_tests/tests/test22/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test22/root.crl
+++ b/tests/nist_tests/tests/test22/root.crl
diff --git a/checks/nist_tests/tests/test22/root.crt b/tests/nist_tests/tests/test22/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test22/root.crt
+++ b/tests/nist_tests/tests/test22/root.crt
diff --git a/checks/nist_tests/tests/test23/end.crt b/tests/nist_tests/tests/test23/end.crt
index 787941b16..787941b16 100644
--- a/checks/nist_tests/tests/test23/end.crt
+++ b/tests/nist_tests/tests/test23/end.crt
diff --git a/checks/nist_tests/tests/test23/int.crl b/tests/nist_tests/tests/test23/int.crl
index 2841be769..2841be769 100644
--- a/checks/nist_tests/tests/test23/int.crl
+++ b/tests/nist_tests/tests/test23/int.crl
diff --git a/checks/nist_tests/tests/test23/int.crt b/tests/nist_tests/tests/test23/int.crt
index 2890b3967..2890b3967 100644
--- a/checks/nist_tests/tests/test23/int.crt
+++ b/tests/nist_tests/tests/test23/int.crt
diff --git a/checks/nist_tests/tests/test23/root.crl b/tests/nist_tests/tests/test23/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test23/root.crl
+++ b/tests/nist_tests/tests/test23/root.crl
diff --git a/checks/nist_tests/tests/test23/root.crt b/tests/nist_tests/tests/test23/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test23/root.crt
+++ b/tests/nist_tests/tests/test23/root.crt
diff --git a/checks/nist_tests/tests/test24/end.crt b/tests/nist_tests/tests/test24/end.crt
index 0d145b2fa..0d145b2fa 100644
--- a/checks/nist_tests/tests/test24/end.crt
+++ b/tests/nist_tests/tests/test24/end.crt
diff --git a/checks/nist_tests/tests/test24/int.crl b/tests/nist_tests/tests/test24/int.crl
index f608de6bb..f608de6bb 100644
--- a/checks/nist_tests/tests/test24/int.crl
+++ b/tests/nist_tests/tests/test24/int.crl
diff --git a/checks/nist_tests/tests/test24/int.crt b/tests/nist_tests/tests/test24/int.crt
index a4633ee9a..a4633ee9a 100644
--- a/checks/nist_tests/tests/test24/int.crt
+++ b/tests/nist_tests/tests/test24/int.crt
diff --git a/checks/nist_tests/tests/test24/root.crl b/tests/nist_tests/tests/test24/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test24/root.crl
+++ b/tests/nist_tests/tests/test24/root.crl
diff --git a/checks/nist_tests/tests/test24/root.crt b/tests/nist_tests/tests/test24/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test24/root.crt
+++ b/tests/nist_tests/tests/test24/root.crt
diff --git a/checks/nist_tests/tests/test25/end.crt b/tests/nist_tests/tests/test25/end.crt
index d12670188..d12670188 100644
--- a/checks/nist_tests/tests/test25/end.crt
+++ b/tests/nist_tests/tests/test25/end.crt
diff --git a/checks/nist_tests/tests/test25/int.crl b/tests/nist_tests/tests/test25/int.crl
index 553e1bbd1..553e1bbd1 100644
--- a/checks/nist_tests/tests/test25/int.crl
+++ b/tests/nist_tests/tests/test25/int.crl
diff --git a/checks/nist_tests/tests/test25/int.crt b/tests/nist_tests/tests/test25/int.crt
index 5d06aac4a..5d06aac4a 100644
--- a/checks/nist_tests/tests/test25/int.crt
+++ b/tests/nist_tests/tests/test25/int.crt
diff --git a/checks/nist_tests/tests/test25/root.crl b/tests/nist_tests/tests/test25/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test25/root.crl
+++ b/tests/nist_tests/tests/test25/root.crl
diff --git a/checks/nist_tests/tests/test25/root.crt b/tests/nist_tests/tests/test25/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test25/root.crt
+++ b/tests/nist_tests/tests/test25/root.crt
diff --git a/checks/nist_tests/tests/test26/end.crt b/tests/nist_tests/tests/test26/end.crt
index 5abc96600..5abc96600 100644
--- a/checks/nist_tests/tests/test26/end.crt
+++ b/tests/nist_tests/tests/test26/end.crt
diff --git a/checks/nist_tests/tests/test26/int.crl b/tests/nist_tests/tests/test26/int.crl
index 9f2f1b0a8..9f2f1b0a8 100644
--- a/checks/nist_tests/tests/test26/int.crl
+++ b/tests/nist_tests/tests/test26/int.crl
diff --git a/checks/nist_tests/tests/test26/int.crt b/tests/nist_tests/tests/test26/int.crt
index e9c273a05..e9c273a05 100644
--- a/checks/nist_tests/tests/test26/int.crt
+++ b/tests/nist_tests/tests/test26/int.crt
diff --git a/checks/nist_tests/tests/test26/root.crl b/tests/nist_tests/tests/test26/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test26/root.crl
+++ b/tests/nist_tests/tests/test26/root.crl
diff --git a/checks/nist_tests/tests/test26/root.crt b/tests/nist_tests/tests/test26/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test26/root.crt
+++ b/tests/nist_tests/tests/test26/root.crt
diff --git a/checks/nist_tests/tests/test27/end.crt b/tests/nist_tests/tests/test27/end.crt
index 2147dbd3a..2147dbd3a 100644
--- a/checks/nist_tests/tests/test27/end.crt
+++ b/tests/nist_tests/tests/test27/end.crt
diff --git a/checks/nist_tests/tests/test27/int.crl b/tests/nist_tests/tests/test27/int.crl
index fd769e5f3..fd769e5f3 100644
--- a/checks/nist_tests/tests/test27/int.crl
+++ b/tests/nist_tests/tests/test27/int.crl
diff --git a/checks/nist_tests/tests/test27/int.crt b/tests/nist_tests/tests/test27/int.crt
index 4de4a9f51..4de4a9f51 100644
--- a/checks/nist_tests/tests/test27/int.crt
+++ b/tests/nist_tests/tests/test27/int.crt
diff --git a/checks/nist_tests/tests/test27/root.crl b/tests/nist_tests/tests/test27/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test27/root.crl
+++ b/tests/nist_tests/tests/test27/root.crl
diff --git a/checks/nist_tests/tests/test27/root.crt b/tests/nist_tests/tests/test27/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test27/root.crt
+++ b/tests/nist_tests/tests/test27/root.crt
diff --git a/checks/nist_tests/tests/test28/end.crt b/tests/nist_tests/tests/test28/end.crt
index c72c97b81..c72c97b81 100644
--- a/checks/nist_tests/tests/test28/end.crt
+++ b/tests/nist_tests/tests/test28/end.crt
diff --git a/checks/nist_tests/tests/test28/int.crl b/tests/nist_tests/tests/test28/int.crl
index 35e87eb0b..35e87eb0b 100644
--- a/checks/nist_tests/tests/test28/int.crl
+++ b/tests/nist_tests/tests/test28/int.crl
diff --git a/checks/nist_tests/tests/test28/int.crt b/tests/nist_tests/tests/test28/int.crt
index fee01f21e..fee01f21e 100644
--- a/checks/nist_tests/tests/test28/int.crt
+++ b/tests/nist_tests/tests/test28/int.crt
diff --git a/checks/nist_tests/tests/test28/root.crl b/tests/nist_tests/tests/test28/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test28/root.crl
+++ b/tests/nist_tests/tests/test28/root.crl
diff --git a/checks/nist_tests/tests/test28/root.crt b/tests/nist_tests/tests/test28/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test28/root.crt
+++ b/tests/nist_tests/tests/test28/root.crt
diff --git a/checks/nist_tests/tests/test29/end.crt b/tests/nist_tests/tests/test29/end.crt
index e4e2dd072..e4e2dd072 100644
--- a/checks/nist_tests/tests/test29/end.crt
+++ b/tests/nist_tests/tests/test29/end.crt
diff --git a/checks/nist_tests/tests/test29/int.crl b/tests/nist_tests/tests/test29/int.crl
index 2739bd933..2739bd933 100644
--- a/checks/nist_tests/tests/test29/int.crl
+++ b/tests/nist_tests/tests/test29/int.crl
diff --git a/checks/nist_tests/tests/test29/int.crt b/tests/nist_tests/tests/test29/int.crt
index e830043fd..e830043fd 100644
--- a/checks/nist_tests/tests/test29/int.crt
+++ b/tests/nist_tests/tests/test29/int.crt
diff --git a/checks/nist_tests/tests/test29/root.crl b/tests/nist_tests/tests/test29/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test29/root.crl
+++ b/tests/nist_tests/tests/test29/root.crl
diff --git a/checks/nist_tests/tests/test29/root.crt b/tests/nist_tests/tests/test29/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test29/root.crt
+++ b/tests/nist_tests/tests/test29/root.crt
diff --git a/checks/nist_tests/tests/test30/end.crt b/tests/nist_tests/tests/test30/end.crt
index abdc0381f..abdc0381f 100644
--- a/checks/nist_tests/tests/test30/end.crt
+++ b/tests/nist_tests/tests/test30/end.crt
diff --git a/checks/nist_tests/tests/test30/int.crl b/tests/nist_tests/tests/test30/int.crl
index fed695a3b..fed695a3b 100644
--- a/checks/nist_tests/tests/test30/int.crl
+++ b/tests/nist_tests/tests/test30/int.crl
diff --git a/checks/nist_tests/tests/test30/int.crt b/tests/nist_tests/tests/test30/int.crt
index 26fd2cb6a..26fd2cb6a 100644
--- a/checks/nist_tests/tests/test30/int.crt
+++ b/tests/nist_tests/tests/test30/int.crt
diff --git a/checks/nist_tests/tests/test30/root.crl b/tests/nist_tests/tests/test30/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test30/root.crl
+++ b/tests/nist_tests/tests/test30/root.crl
diff --git a/checks/nist_tests/tests/test30/root.crt b/tests/nist_tests/tests/test30/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test30/root.crt
+++ b/tests/nist_tests/tests/test30/root.crt
diff --git a/checks/nist_tests/tests/test31/end.crt b/tests/nist_tests/tests/test31/end.crt
index cd766ef7f..cd766ef7f 100644
--- a/checks/nist_tests/tests/test31/end.crt
+++ b/tests/nist_tests/tests/test31/end.crt
diff --git a/checks/nist_tests/tests/test31/int.crl b/tests/nist_tests/tests/test31/int.crl
index 9014141f9..9014141f9 100644
--- a/checks/nist_tests/tests/test31/int.crl
+++ b/tests/nist_tests/tests/test31/int.crl
diff --git a/checks/nist_tests/tests/test31/int.crt b/tests/nist_tests/tests/test31/int.crt
index 396947b15..396947b15 100644
--- a/checks/nist_tests/tests/test31/int.crt
+++ b/tests/nist_tests/tests/test31/int.crt
diff --git a/checks/nist_tests/tests/test31/root.crl b/tests/nist_tests/tests/test31/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test31/root.crl
+++ b/tests/nist_tests/tests/test31/root.crl
diff --git a/checks/nist_tests/tests/test31/root.crt b/tests/nist_tests/tests/test31/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test31/root.crt
+++ b/tests/nist_tests/tests/test31/root.crt
diff --git a/checks/nist_tests/tests/test32/end.crt b/tests/nist_tests/tests/test32/end.crt
index 3804a27b4..3804a27b4 100644
--- a/checks/nist_tests/tests/test32/end.crt
+++ b/tests/nist_tests/tests/test32/end.crt
diff --git a/checks/nist_tests/tests/test32/int.crl b/tests/nist_tests/tests/test32/int.crl
index 2e2e505a0..2e2e505a0 100644
--- a/checks/nist_tests/tests/test32/int.crl
+++ b/tests/nist_tests/tests/test32/int.crl
diff --git a/checks/nist_tests/tests/test32/int.crt b/tests/nist_tests/tests/test32/int.crt
index 6df3396b7..6df3396b7 100644
--- a/checks/nist_tests/tests/test32/int.crt
+++ b/tests/nist_tests/tests/test32/int.crt
diff --git a/checks/nist_tests/tests/test32/root.crl b/tests/nist_tests/tests/test32/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test32/root.crl
+++ b/tests/nist_tests/tests/test32/root.crl
diff --git a/checks/nist_tests/tests/test32/root.crt b/tests/nist_tests/tests/test32/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test32/root.crt
+++ b/tests/nist_tests/tests/test32/root.crt
diff --git a/checks/nist_tests/tests/test33/end.crt b/tests/nist_tests/tests/test33/end.crt
index 6ef1d03a8..6ef1d03a8 100644
--- a/checks/nist_tests/tests/test33/end.crt
+++ b/tests/nist_tests/tests/test33/end.crt
diff --git a/checks/nist_tests/tests/test33/int.crl b/tests/nist_tests/tests/test33/int.crl
index 4008e3d46..4008e3d46 100644
--- a/checks/nist_tests/tests/test33/int.crl
+++ b/tests/nist_tests/tests/test33/int.crl
diff --git a/checks/nist_tests/tests/test33/int.crt b/tests/nist_tests/tests/test33/int.crt
index ba183696e..ba183696e 100644
--- a/checks/nist_tests/tests/test33/int.crt
+++ b/tests/nist_tests/tests/test33/int.crt
diff --git a/checks/nist_tests/tests/test33/root.crl b/tests/nist_tests/tests/test33/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test33/root.crl
+++ b/tests/nist_tests/tests/test33/root.crl
diff --git a/checks/nist_tests/tests/test33/root.crt b/tests/nist_tests/tests/test33/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test33/root.crt
+++ b/tests/nist_tests/tests/test33/root.crt
diff --git a/checks/nist_tests/tests/test34/end.crt b/tests/nist_tests/tests/test34/end.crt
index 695de1cb4..695de1cb4 100644
--- a/checks/nist_tests/tests/test34/end.crt
+++ b/tests/nist_tests/tests/test34/end.crt
diff --git a/checks/nist_tests/tests/test34/int.crl b/tests/nist_tests/tests/test34/int.crl
index a8d11e788..a8d11e788 100644
--- a/checks/nist_tests/tests/test34/int.crl
+++ b/tests/nist_tests/tests/test34/int.crl
diff --git a/checks/nist_tests/tests/test34/int.crt b/tests/nist_tests/tests/test34/int.crt
index 5657ddaf6..5657ddaf6 100644
--- a/checks/nist_tests/tests/test34/int.crt
+++ b/tests/nist_tests/tests/test34/int.crt
diff --git a/checks/nist_tests/tests/test34/root.crl b/tests/nist_tests/tests/test34/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test34/root.crl
+++ b/tests/nist_tests/tests/test34/root.crl
diff --git a/checks/nist_tests/tests/test34/root.crt b/tests/nist_tests/tests/test34/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test34/root.crt
+++ b/tests/nist_tests/tests/test34/root.crt
diff --git a/checks/nist_tests/tests/test35/end.crt b/tests/nist_tests/tests/test35/end.crt
index 26846be18..26846be18 100644
--- a/checks/nist_tests/tests/test35/end.crt
+++ b/tests/nist_tests/tests/test35/end.crt
diff --git a/checks/nist_tests/tests/test35/int.crl b/tests/nist_tests/tests/test35/int.crl
index f7021d32c..f7021d32c 100644
--- a/checks/nist_tests/tests/test35/int.crl
+++ b/tests/nist_tests/tests/test35/int.crl
diff --git a/checks/nist_tests/tests/test35/int.crt b/tests/nist_tests/tests/test35/int.crt
index 6a6641823..6a6641823 100644
--- a/checks/nist_tests/tests/test35/int.crt
+++ b/tests/nist_tests/tests/test35/int.crt
diff --git a/checks/nist_tests/tests/test35/root.crl b/tests/nist_tests/tests/test35/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test35/root.crl
+++ b/tests/nist_tests/tests/test35/root.crl
diff --git a/checks/nist_tests/tests/test35/root.crt b/tests/nist_tests/tests/test35/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test35/root.crt
+++ b/tests/nist_tests/tests/test35/root.crt
diff --git a/checks/nist_tests/tests/test36/end.crt b/tests/nist_tests/tests/test36/end.crt
index ee6ec5f4b..ee6ec5f4b 100644
--- a/checks/nist_tests/tests/test36/end.crt
+++ b/tests/nist_tests/tests/test36/end.crt
diff --git a/checks/nist_tests/tests/test36/int1.crl b/tests/nist_tests/tests/test36/int1.crl
index d4ad1013d..d4ad1013d 100644
--- a/checks/nist_tests/tests/test36/int1.crl
+++ b/tests/nist_tests/tests/test36/int1.crl
diff --git a/checks/nist_tests/tests/test36/int1.crt b/tests/nist_tests/tests/test36/int1.crt
index a300e8d67..a300e8d67 100644
--- a/checks/nist_tests/tests/test36/int1.crt
+++ b/tests/nist_tests/tests/test36/int1.crt
diff --git a/checks/nist_tests/tests/test36/int2.crl b/tests/nist_tests/tests/test36/int2.crl
index d45cedcee..d45cedcee 100644
--- a/checks/nist_tests/tests/test36/int2.crl
+++ b/tests/nist_tests/tests/test36/int2.crl
diff --git a/checks/nist_tests/tests/test36/int2.crt b/tests/nist_tests/tests/test36/int2.crt
index 87c8253c3..87c8253c3 100644
--- a/checks/nist_tests/tests/test36/int2.crt
+++ b/tests/nist_tests/tests/test36/int2.crt
diff --git a/checks/nist_tests/tests/test36/root.crl b/tests/nist_tests/tests/test36/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test36/root.crl
+++ b/tests/nist_tests/tests/test36/root.crl
diff --git a/checks/nist_tests/tests/test36/root.crt b/tests/nist_tests/tests/test36/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test36/root.crt
+++ b/tests/nist_tests/tests/test36/root.crt
diff --git a/checks/nist_tests/tests/test37/end.crt b/tests/nist_tests/tests/test37/end.crt
index e5c5ae8c7..e5c5ae8c7 100644
--- a/checks/nist_tests/tests/test37/end.crt
+++ b/tests/nist_tests/tests/test37/end.crt
diff --git a/checks/nist_tests/tests/test37/int1.crl b/tests/nist_tests/tests/test37/int1.crl
index 6b488fdb8..6b488fdb8 100644
--- a/checks/nist_tests/tests/test37/int1.crl
+++ b/tests/nist_tests/tests/test37/int1.crl
diff --git a/checks/nist_tests/tests/test37/int1.crt b/tests/nist_tests/tests/test37/int1.crt
index 26b6b9605..26b6b9605 100644
--- a/checks/nist_tests/tests/test37/int1.crt
+++ b/tests/nist_tests/tests/test37/int1.crt
diff --git a/checks/nist_tests/tests/test37/int2.crl b/tests/nist_tests/tests/test37/int2.crl
index 724051124..724051124 100644
--- a/checks/nist_tests/tests/test37/int2.crl
+++ b/tests/nist_tests/tests/test37/int2.crl
diff --git a/checks/nist_tests/tests/test37/int2.crt b/tests/nist_tests/tests/test37/int2.crt
index c0e986a08..c0e986a08 100644
--- a/checks/nist_tests/tests/test37/int2.crt
+++ b/tests/nist_tests/tests/test37/int2.crt
diff --git a/checks/nist_tests/tests/test37/root.crl b/tests/nist_tests/tests/test37/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test37/root.crl
+++ b/tests/nist_tests/tests/test37/root.crl
diff --git a/checks/nist_tests/tests/test37/root.crt b/tests/nist_tests/tests/test37/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test37/root.crt
+++ b/tests/nist_tests/tests/test37/root.crt
diff --git a/checks/nist_tests/tests/test38/end.crt b/tests/nist_tests/tests/test38/end.crt
index 9331b90a2..9331b90a2 100644
--- a/checks/nist_tests/tests/test38/end.crt
+++ b/tests/nist_tests/tests/test38/end.crt
diff --git a/checks/nist_tests/tests/test38/int1.crl b/tests/nist_tests/tests/test38/int1.crl
index 81f75d4e5..81f75d4e5 100644
--- a/checks/nist_tests/tests/test38/int1.crl
+++ b/tests/nist_tests/tests/test38/int1.crl
diff --git a/checks/nist_tests/tests/test38/int1.crt b/tests/nist_tests/tests/test38/int1.crt
index c8ee614f4..c8ee614f4 100644
--- a/checks/nist_tests/tests/test38/int1.crt
+++ b/tests/nist_tests/tests/test38/int1.crt
diff --git a/checks/nist_tests/tests/test38/int2.crl b/tests/nist_tests/tests/test38/int2.crl
index ae1d7d5e8..ae1d7d5e8 100644
--- a/checks/nist_tests/tests/test38/int2.crl
+++ b/tests/nist_tests/tests/test38/int2.crl
diff --git a/checks/nist_tests/tests/test38/int2.crt b/tests/nist_tests/tests/test38/int2.crt
index 8d2834294..8d2834294 100644
--- a/checks/nist_tests/tests/test38/int2.crt
+++ b/tests/nist_tests/tests/test38/int2.crt
diff --git a/checks/nist_tests/tests/test38/root.crl b/tests/nist_tests/tests/test38/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test38/root.crl
+++ b/tests/nist_tests/tests/test38/root.crl
diff --git a/checks/nist_tests/tests/test38/root.crt b/tests/nist_tests/tests/test38/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test38/root.crt
+++ b/tests/nist_tests/tests/test38/root.crt
diff --git a/checks/nist_tests/tests/test39/end.crt b/tests/nist_tests/tests/test39/end.crt
index 57263d4cb..57263d4cb 100644
--- a/checks/nist_tests/tests/test39/end.crt
+++ b/tests/nist_tests/tests/test39/end.crt
diff --git a/checks/nist_tests/tests/test39/int1.crl b/tests/nist_tests/tests/test39/int1.crl
index f2a01385e..f2a01385e 100644
--- a/checks/nist_tests/tests/test39/int1.crl
+++ b/tests/nist_tests/tests/test39/int1.crl
diff --git a/checks/nist_tests/tests/test39/int1.crt b/tests/nist_tests/tests/test39/int1.crt
index b7003f7eb..b7003f7eb 100644
--- a/checks/nist_tests/tests/test39/int1.crt
+++ b/tests/nist_tests/tests/test39/int1.crt
diff --git a/checks/nist_tests/tests/test39/int2.crl b/tests/nist_tests/tests/test39/int2.crl
index b6672d85a..b6672d85a 100644
--- a/checks/nist_tests/tests/test39/int2.crl
+++ b/tests/nist_tests/tests/test39/int2.crl
diff --git a/checks/nist_tests/tests/test39/int2.crt b/tests/nist_tests/tests/test39/int2.crt
index c56ce57f0..c56ce57f0 100644
--- a/checks/nist_tests/tests/test39/int2.crt
+++ b/tests/nist_tests/tests/test39/int2.crt
diff --git a/checks/nist_tests/tests/test39/int3.crl b/tests/nist_tests/tests/test39/int3.crl
index 453420be8..453420be8 100644
--- a/checks/nist_tests/tests/test39/int3.crl
+++ b/tests/nist_tests/tests/test39/int3.crl
diff --git a/checks/nist_tests/tests/test39/int3.crt b/tests/nist_tests/tests/test39/int3.crt
index ce1224ada..ce1224ada 100644
--- a/checks/nist_tests/tests/test39/int3.crt
+++ b/tests/nist_tests/tests/test39/int3.crt
diff --git a/checks/nist_tests/tests/test39/root.crl b/tests/nist_tests/tests/test39/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test39/root.crl
+++ b/tests/nist_tests/tests/test39/root.crl
diff --git a/checks/nist_tests/tests/test39/root.crt b/tests/nist_tests/tests/test39/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test39/root.crt
+++ b/tests/nist_tests/tests/test39/root.crt
diff --git a/checks/nist_tests/tests/test40/end.crt b/tests/nist_tests/tests/test40/end.crt
index 24ce9e4d8..24ce9e4d8 100644
--- a/checks/nist_tests/tests/test40/end.crt
+++ b/tests/nist_tests/tests/test40/end.crt
diff --git a/checks/nist_tests/tests/test40/int1.crl b/tests/nist_tests/tests/test40/int1.crl
index 5bd6a9f83..5bd6a9f83 100644
--- a/checks/nist_tests/tests/test40/int1.crl
+++ b/tests/nist_tests/tests/test40/int1.crl
diff --git a/checks/nist_tests/tests/test40/int1.crt b/tests/nist_tests/tests/test40/int1.crt
index 5a8ac5006..5a8ac5006 100644
--- a/checks/nist_tests/tests/test40/int1.crt
+++ b/tests/nist_tests/tests/test40/int1.crt
diff --git a/checks/nist_tests/tests/test40/int2.crl b/tests/nist_tests/tests/test40/int2.crl
index dde5a124c..dde5a124c 100644
--- a/checks/nist_tests/tests/test40/int2.crl
+++ b/tests/nist_tests/tests/test40/int2.crl
diff --git a/checks/nist_tests/tests/test40/int2.crt b/tests/nist_tests/tests/test40/int2.crt
index 70e4d9092..70e4d9092 100644
--- a/checks/nist_tests/tests/test40/int2.crt
+++ b/tests/nist_tests/tests/test40/int2.crt
diff --git a/checks/nist_tests/tests/test40/int3.crl b/tests/nist_tests/tests/test40/int3.crl
index 713fa4bbf..713fa4bbf 100644
--- a/checks/nist_tests/tests/test40/int3.crl
+++ b/tests/nist_tests/tests/test40/int3.crl
diff --git a/checks/nist_tests/tests/test40/int3.crt b/tests/nist_tests/tests/test40/int3.crt
index a0c673453..a0c673453 100644
--- a/checks/nist_tests/tests/test40/int3.crt
+++ b/tests/nist_tests/tests/test40/int3.crt
diff --git a/checks/nist_tests/tests/test40/root.crl b/tests/nist_tests/tests/test40/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test40/root.crl
+++ b/tests/nist_tests/tests/test40/root.crl
diff --git a/checks/nist_tests/tests/test40/root.crt b/tests/nist_tests/tests/test40/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test40/root.crt
+++ b/tests/nist_tests/tests/test40/root.crt
diff --git a/checks/nist_tests/tests/test41/end.crt b/tests/nist_tests/tests/test41/end.crt
index b88e38eb9..b88e38eb9 100644
--- a/checks/nist_tests/tests/test41/end.crt
+++ b/tests/nist_tests/tests/test41/end.crt
diff --git a/checks/nist_tests/tests/test41/int1.crl b/tests/nist_tests/tests/test41/int1.crl
index 2d4c41521..2d4c41521 100644
--- a/checks/nist_tests/tests/test41/int1.crl
+++ b/tests/nist_tests/tests/test41/int1.crl
diff --git a/checks/nist_tests/tests/test41/int1.crt b/tests/nist_tests/tests/test41/int1.crt
index 4b96b2afb..4b96b2afb 100644
--- a/checks/nist_tests/tests/test41/int1.crt
+++ b/tests/nist_tests/tests/test41/int1.crt
diff --git a/checks/nist_tests/tests/test41/int2.crl b/tests/nist_tests/tests/test41/int2.crl
index e389a7fd9..e389a7fd9 100644
--- a/checks/nist_tests/tests/test41/int2.crl
+++ b/tests/nist_tests/tests/test41/int2.crl
diff --git a/checks/nist_tests/tests/test41/int2.crt b/tests/nist_tests/tests/test41/int2.crt
index 4b1edc710..4b1edc710 100644
--- a/checks/nist_tests/tests/test41/int2.crt
+++ b/tests/nist_tests/tests/test41/int2.crt
diff --git a/checks/nist_tests/tests/test41/int3.crl b/tests/nist_tests/tests/test41/int3.crl
index d26dc1b75..d26dc1b75 100644
--- a/checks/nist_tests/tests/test41/int3.crl
+++ b/tests/nist_tests/tests/test41/int3.crl
diff --git a/checks/nist_tests/tests/test41/int3.crt b/tests/nist_tests/tests/test41/int3.crt
index 6012a3a5b..6012a3a5b 100644
--- a/checks/nist_tests/tests/test41/int3.crt
+++ b/tests/nist_tests/tests/test41/int3.crt
diff --git a/checks/nist_tests/tests/test41/root.crl b/tests/nist_tests/tests/test41/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test41/root.crl
+++ b/tests/nist_tests/tests/test41/root.crl
diff --git a/checks/nist_tests/tests/test41/root.crt b/tests/nist_tests/tests/test41/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test41/root.crt
+++ b/tests/nist_tests/tests/test41/root.crt
diff --git a/checks/nist_tests/tests/test42/end.crt b/tests/nist_tests/tests/test42/end.crt
index 9815c5d5c..9815c5d5c 100644
--- a/checks/nist_tests/tests/test42/end.crt
+++ b/tests/nist_tests/tests/test42/end.crt
diff --git a/checks/nist_tests/tests/test42/int1.crl b/tests/nist_tests/tests/test42/int1.crl
index d4f21dbe3..d4f21dbe3 100644
--- a/checks/nist_tests/tests/test42/int1.crl
+++ b/tests/nist_tests/tests/test42/int1.crl
diff --git a/checks/nist_tests/tests/test42/int1.crt b/tests/nist_tests/tests/test42/int1.crt
index f344a9f27..f344a9f27 100644
--- a/checks/nist_tests/tests/test42/int1.crt
+++ b/tests/nist_tests/tests/test42/int1.crt
diff --git a/checks/nist_tests/tests/test42/int2.crl b/tests/nist_tests/tests/test42/int2.crl
index 32906057a..32906057a 100644
--- a/checks/nist_tests/tests/test42/int2.crl
+++ b/tests/nist_tests/tests/test42/int2.crl
diff --git a/checks/nist_tests/tests/test42/int2.crt b/tests/nist_tests/tests/test42/int2.crt
index a2fd05ccb..a2fd05ccb 100644
--- a/checks/nist_tests/tests/test42/int2.crt
+++ b/tests/nist_tests/tests/test42/int2.crt
diff --git a/checks/nist_tests/tests/test42/int3.crl b/tests/nist_tests/tests/test42/int3.crl
index ee2b2b18c..ee2b2b18c 100644
--- a/checks/nist_tests/tests/test42/int3.crl
+++ b/tests/nist_tests/tests/test42/int3.crl
diff --git a/checks/nist_tests/tests/test42/int3.crt b/tests/nist_tests/tests/test42/int3.crt
index 8104a65f8..8104a65f8 100644
--- a/checks/nist_tests/tests/test42/int3.crt
+++ b/tests/nist_tests/tests/test42/int3.crt
diff --git a/checks/nist_tests/tests/test42/int4.crl b/tests/nist_tests/tests/test42/int4.crl
index 7602160fa..7602160fa 100644
--- a/checks/nist_tests/tests/test42/int4.crl
+++ b/tests/nist_tests/tests/test42/int4.crl
diff --git a/checks/nist_tests/tests/test42/int4.crt b/tests/nist_tests/tests/test42/int4.crt
index 5b6ffbd4e..5b6ffbd4e 100644
--- a/checks/nist_tests/tests/test42/int4.crt
+++ b/tests/nist_tests/tests/test42/int4.crt
diff --git a/checks/nist_tests/tests/test42/root.crl b/tests/nist_tests/tests/test42/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test42/root.crl
+++ b/tests/nist_tests/tests/test42/root.crl
diff --git a/checks/nist_tests/tests/test42/root.crt b/tests/nist_tests/tests/test42/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test42/root.crt
+++ b/tests/nist_tests/tests/test42/root.crt
diff --git a/checks/nist_tests/tests/test43/end.crt b/tests/nist_tests/tests/test43/end.crt
index 9465ea5bf..9465ea5bf 100644
--- a/checks/nist_tests/tests/test43/end.crt
+++ b/tests/nist_tests/tests/test43/end.crt
diff --git a/checks/nist_tests/tests/test43/int1.crl b/tests/nist_tests/tests/test43/int1.crl
index 4ce26fdb9..4ce26fdb9 100644
--- a/checks/nist_tests/tests/test43/int1.crl
+++ b/tests/nist_tests/tests/test43/int1.crl
diff --git a/checks/nist_tests/tests/test43/int1.crt b/tests/nist_tests/tests/test43/int1.crt
index e18a4e168..e18a4e168 100644
--- a/checks/nist_tests/tests/test43/int1.crt
+++ b/tests/nist_tests/tests/test43/int1.crt
diff --git a/checks/nist_tests/tests/test43/int2.crl b/tests/nist_tests/tests/test43/int2.crl
index 9820bc6f6..9820bc6f6 100644
--- a/checks/nist_tests/tests/test43/int2.crl
+++ b/tests/nist_tests/tests/test43/int2.crl
diff --git a/checks/nist_tests/tests/test43/int2.crt b/tests/nist_tests/tests/test43/int2.crt
index 1521fce98..1521fce98 100644
--- a/checks/nist_tests/tests/test43/int2.crt
+++ b/tests/nist_tests/tests/test43/int2.crt
diff --git a/checks/nist_tests/tests/test43/int3.crl b/tests/nist_tests/tests/test43/int3.crl
index b8dfd8dfd..b8dfd8dfd 100644
--- a/checks/nist_tests/tests/test43/int3.crl
+++ b/tests/nist_tests/tests/test43/int3.crl
diff --git a/checks/nist_tests/tests/test43/int3.crt b/tests/nist_tests/tests/test43/int3.crt
index 30b9706d8..30b9706d8 100644
--- a/checks/nist_tests/tests/test43/int3.crt
+++ b/tests/nist_tests/tests/test43/int3.crt
diff --git a/checks/nist_tests/tests/test43/int4.crl b/tests/nist_tests/tests/test43/int4.crl
index 4b4136209..4b4136209 100644
--- a/checks/nist_tests/tests/test43/int4.crl
+++ b/tests/nist_tests/tests/test43/int4.crl
diff --git a/checks/nist_tests/tests/test43/int4.crt b/tests/nist_tests/tests/test43/int4.crt
index 949562273..949562273 100644
--- a/checks/nist_tests/tests/test43/int4.crt
+++ b/tests/nist_tests/tests/test43/int4.crt
diff --git a/checks/nist_tests/tests/test43/root.crl b/tests/nist_tests/tests/test43/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test43/root.crl
+++ b/tests/nist_tests/tests/test43/root.crl
diff --git a/checks/nist_tests/tests/test43/root.crt b/tests/nist_tests/tests/test43/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test43/root.crt
+++ b/tests/nist_tests/tests/test43/root.crt
diff --git a/checks/nist_tests/tests/test44/end.crt b/tests/nist_tests/tests/test44/end.crt
index 5fc9bec78..5fc9bec78 100644
--- a/checks/nist_tests/tests/test44/end.crt
+++ b/tests/nist_tests/tests/test44/end.crt
diff --git a/checks/nist_tests/tests/test44/int1.crl b/tests/nist_tests/tests/test44/int1.crl
index 2d4478cfc..2d4478cfc 100644
--- a/checks/nist_tests/tests/test44/int1.crl
+++ b/tests/nist_tests/tests/test44/int1.crl
diff --git a/checks/nist_tests/tests/test44/int1.crt b/tests/nist_tests/tests/test44/int1.crt
index fbfd2a4d0..fbfd2a4d0 100644
--- a/checks/nist_tests/tests/test44/int1.crt
+++ b/tests/nist_tests/tests/test44/int1.crt
diff --git a/checks/nist_tests/tests/test44/int2.crl b/tests/nist_tests/tests/test44/int2.crl
index 780ef7c0f..780ef7c0f 100644
--- a/checks/nist_tests/tests/test44/int2.crl
+++ b/tests/nist_tests/tests/test44/int2.crl
diff --git a/checks/nist_tests/tests/test44/int2.crt b/tests/nist_tests/tests/test44/int2.crt
index 26f319399..26f319399 100644
--- a/checks/nist_tests/tests/test44/int2.crt
+++ b/tests/nist_tests/tests/test44/int2.crt
diff --git a/checks/nist_tests/tests/test44/int3.crl b/tests/nist_tests/tests/test44/int3.crl
index 5e5267ed9..5e5267ed9 100644
--- a/checks/nist_tests/tests/test44/int3.crl
+++ b/tests/nist_tests/tests/test44/int3.crl
diff --git a/checks/nist_tests/tests/test44/int3.crt b/tests/nist_tests/tests/test44/int3.crt
index 7f62ef6ef..7f62ef6ef 100644
--- a/checks/nist_tests/tests/test44/int3.crt
+++ b/tests/nist_tests/tests/test44/int3.crt
diff --git a/checks/nist_tests/tests/test44/int4.crl b/tests/nist_tests/tests/test44/int4.crl
index 5d775f551..5d775f551 100644
--- a/checks/nist_tests/tests/test44/int4.crl
+++ b/tests/nist_tests/tests/test44/int4.crl
diff --git a/checks/nist_tests/tests/test44/int4.crt b/tests/nist_tests/tests/test44/int4.crt
index 76d6111ec..76d6111ec 100644
--- a/checks/nist_tests/tests/test44/int4.crt
+++ b/tests/nist_tests/tests/test44/int4.crt
diff --git a/checks/nist_tests/tests/test44/root.crl b/tests/nist_tests/tests/test44/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test44/root.crl
+++ b/tests/nist_tests/tests/test44/root.crl
diff --git a/checks/nist_tests/tests/test44/root.crt b/tests/nist_tests/tests/test44/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test44/root.crt
+++ b/tests/nist_tests/tests/test44/root.crt
diff --git a/checks/nist_tests/tests/test45/end.crt b/tests/nist_tests/tests/test45/end.crt
index a2ddb0430..a2ddb0430 100644
--- a/checks/nist_tests/tests/test45/end.crt
+++ b/tests/nist_tests/tests/test45/end.crt
diff --git a/checks/nist_tests/tests/test45/int1.crl b/tests/nist_tests/tests/test45/int1.crl
index 079062c14..079062c14 100644
--- a/checks/nist_tests/tests/test45/int1.crl
+++ b/tests/nist_tests/tests/test45/int1.crl
diff --git a/checks/nist_tests/tests/test45/int1.crt b/tests/nist_tests/tests/test45/int1.crt
index 90ee8e3fe..90ee8e3fe 100644
--- a/checks/nist_tests/tests/test45/int1.crt
+++ b/tests/nist_tests/tests/test45/int1.crt
diff --git a/checks/nist_tests/tests/test45/int2.crl b/tests/nist_tests/tests/test45/int2.crl
index 7c12bd0c3..7c12bd0c3 100644
--- a/checks/nist_tests/tests/test45/int2.crl
+++ b/tests/nist_tests/tests/test45/int2.crl
diff --git a/checks/nist_tests/tests/test45/int2.crt b/tests/nist_tests/tests/test45/int2.crt
index 7fc0467ca..7fc0467ca 100644
--- a/checks/nist_tests/tests/test45/int2.crt
+++ b/tests/nist_tests/tests/test45/int2.crt
diff --git a/checks/nist_tests/tests/test45/int3.crl b/tests/nist_tests/tests/test45/int3.crl
index f81b5042f..f81b5042f 100644
--- a/checks/nist_tests/tests/test45/int3.crl
+++ b/tests/nist_tests/tests/test45/int3.crl
diff --git a/checks/nist_tests/tests/test45/int3.crt b/tests/nist_tests/tests/test45/int3.crt
index fb9500f12..fb9500f12 100644
--- a/checks/nist_tests/tests/test45/int3.crt
+++ b/tests/nist_tests/tests/test45/int3.crt
diff --git a/checks/nist_tests/tests/test45/int4.crl b/tests/nist_tests/tests/test45/int4.crl
index 9e67a4a91..9e67a4a91 100644
--- a/checks/nist_tests/tests/test45/int4.crl
+++ b/tests/nist_tests/tests/test45/int4.crl
diff --git a/checks/nist_tests/tests/test45/int4.crt b/tests/nist_tests/tests/test45/int4.crt
index 60b6c9133..60b6c9133 100644
--- a/checks/nist_tests/tests/test45/int4.crt
+++ b/tests/nist_tests/tests/test45/int4.crt
diff --git a/checks/nist_tests/tests/test45/root.crl b/tests/nist_tests/tests/test45/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test45/root.crl
+++ b/tests/nist_tests/tests/test45/root.crl
diff --git a/checks/nist_tests/tests/test45/root.crt b/tests/nist_tests/tests/test45/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test45/root.crt
+++ b/tests/nist_tests/tests/test45/root.crt
diff --git a/checks/nist_tests/tests/test46/end.crt b/tests/nist_tests/tests/test46/end.crt
index 39ebf20a3..39ebf20a3 100644
--- a/checks/nist_tests/tests/test46/end.crt
+++ b/tests/nist_tests/tests/test46/end.crt
diff --git a/checks/nist_tests/tests/test46/int1.crl b/tests/nist_tests/tests/test46/int1.crl
index f9a2236bc..f9a2236bc 100644
--- a/checks/nist_tests/tests/test46/int1.crl
+++ b/tests/nist_tests/tests/test46/int1.crl
diff --git a/checks/nist_tests/tests/test46/int1.crt b/tests/nist_tests/tests/test46/int1.crt
index 985a5d575..985a5d575 100644
--- a/checks/nist_tests/tests/test46/int1.crt
+++ b/tests/nist_tests/tests/test46/int1.crt
diff --git a/checks/nist_tests/tests/test46/int2.crl b/tests/nist_tests/tests/test46/int2.crl
index 02e82c48a..02e82c48a 100644
--- a/checks/nist_tests/tests/test46/int2.crl
+++ b/tests/nist_tests/tests/test46/int2.crl
diff --git a/checks/nist_tests/tests/test46/int2.crt b/tests/nist_tests/tests/test46/int2.crt
index ade64339c..ade64339c 100644
--- a/checks/nist_tests/tests/test46/int2.crt
+++ b/tests/nist_tests/tests/test46/int2.crt
diff --git a/checks/nist_tests/tests/test46/int3.crl b/tests/nist_tests/tests/test46/int3.crl
index ddd59a80c..ddd59a80c 100644
--- a/checks/nist_tests/tests/test46/int3.crl
+++ b/tests/nist_tests/tests/test46/int3.crl
diff --git a/checks/nist_tests/tests/test46/int3.crt b/tests/nist_tests/tests/test46/int3.crt
index 6e33faaaa..6e33faaaa 100644
--- a/checks/nist_tests/tests/test46/int3.crt
+++ b/tests/nist_tests/tests/test46/int3.crt
diff --git a/checks/nist_tests/tests/test46/int4.crl b/tests/nist_tests/tests/test46/int4.crl
index 3dedfb11e..3dedfb11e 100644
--- a/checks/nist_tests/tests/test46/int4.crl
+++ b/tests/nist_tests/tests/test46/int4.crl
diff --git a/checks/nist_tests/tests/test46/int4.crt b/tests/nist_tests/tests/test46/int4.crt
index 1b3fc5726..1b3fc5726 100644
--- a/checks/nist_tests/tests/test46/int4.crt
+++ b/tests/nist_tests/tests/test46/int4.crt
diff --git a/checks/nist_tests/tests/test46/root.crl b/tests/nist_tests/tests/test46/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test46/root.crl
+++ b/tests/nist_tests/tests/test46/root.crl
diff --git a/checks/nist_tests/tests/test46/root.crt b/tests/nist_tests/tests/test46/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test46/root.crt
+++ b/tests/nist_tests/tests/test46/root.crt
diff --git a/checks/nist_tests/tests/test47/end.crt b/tests/nist_tests/tests/test47/end.crt
index 7337bc5b5..7337bc5b5 100644
--- a/checks/nist_tests/tests/test47/end.crt
+++ b/tests/nist_tests/tests/test47/end.crt
diff --git a/checks/nist_tests/tests/test47/int1.crl b/tests/nist_tests/tests/test47/int1.crl
index 938e3f412..938e3f412 100644
--- a/checks/nist_tests/tests/test47/int1.crl
+++ b/tests/nist_tests/tests/test47/int1.crl
diff --git a/checks/nist_tests/tests/test47/int1.crt b/tests/nist_tests/tests/test47/int1.crt
index bf3e22239..bf3e22239 100644
--- a/checks/nist_tests/tests/test47/int1.crt
+++ b/tests/nist_tests/tests/test47/int1.crt
diff --git a/checks/nist_tests/tests/test47/int2.crl b/tests/nist_tests/tests/test47/int2.crl
index f715c112d..f715c112d 100644
--- a/checks/nist_tests/tests/test47/int2.crl
+++ b/tests/nist_tests/tests/test47/int2.crl
diff --git a/checks/nist_tests/tests/test47/int2.crt b/tests/nist_tests/tests/test47/int2.crt
index 1b7854e33..1b7854e33 100644
--- a/checks/nist_tests/tests/test47/int2.crt
+++ b/tests/nist_tests/tests/test47/int2.crt
diff --git a/checks/nist_tests/tests/test47/int3.crl b/tests/nist_tests/tests/test47/int3.crl
index 786aa5032..786aa5032 100644
--- a/checks/nist_tests/tests/test47/int3.crl
+++ b/tests/nist_tests/tests/test47/int3.crl
diff --git a/checks/nist_tests/tests/test47/int3.crt b/tests/nist_tests/tests/test47/int3.crt
index 62eb3b220..62eb3b220 100644
--- a/checks/nist_tests/tests/test47/int3.crt
+++ b/tests/nist_tests/tests/test47/int3.crt
diff --git a/checks/nist_tests/tests/test47/int4.crl b/tests/nist_tests/tests/test47/int4.crl
index 925b78324..925b78324 100644
--- a/checks/nist_tests/tests/test47/int4.crl
+++ b/tests/nist_tests/tests/test47/int4.crl
diff --git a/checks/nist_tests/tests/test47/int4.crt b/tests/nist_tests/tests/test47/int4.crt
index 1c9a14344..1c9a14344 100644
--- a/checks/nist_tests/tests/test47/int4.crt
+++ b/tests/nist_tests/tests/test47/int4.crt
diff --git a/checks/nist_tests/tests/test47/root.crl b/tests/nist_tests/tests/test47/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test47/root.crl
+++ b/tests/nist_tests/tests/test47/root.crl
diff --git a/checks/nist_tests/tests/test47/root.crt b/tests/nist_tests/tests/test47/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test47/root.crt
+++ b/tests/nist_tests/tests/test47/root.crt
diff --git a/checks/nist_tests/tests/test48/end.crt b/tests/nist_tests/tests/test48/end.crt
index 933f27912..933f27912 100644
--- a/checks/nist_tests/tests/test48/end.crt
+++ b/tests/nist_tests/tests/test48/end.crt
diff --git a/checks/nist_tests/tests/test48/int.crl b/tests/nist_tests/tests/test48/int.crl
index 89ad99cd1..89ad99cd1 100644
--- a/checks/nist_tests/tests/test48/int.crl
+++ b/tests/nist_tests/tests/test48/int.crl
diff --git a/checks/nist_tests/tests/test48/int.crt b/tests/nist_tests/tests/test48/int.crt
index b2eefc4ae..b2eefc4ae 100644
--- a/checks/nist_tests/tests/test48/int.crt
+++ b/tests/nist_tests/tests/test48/int.crt
diff --git a/checks/nist_tests/tests/test48/root.crl b/tests/nist_tests/tests/test48/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test48/root.crl
+++ b/tests/nist_tests/tests/test48/root.crl
diff --git a/checks/nist_tests/tests/test48/root.crt b/tests/nist_tests/tests/test48/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test48/root.crt
+++ b/tests/nist_tests/tests/test48/root.crt
diff --git a/checks/nist_tests/tests/test49/end.crt b/tests/nist_tests/tests/test49/end.crt
index d0e4a26e6..d0e4a26e6 100644
--- a/checks/nist_tests/tests/test49/end.crt
+++ b/tests/nist_tests/tests/test49/end.crt
diff --git a/checks/nist_tests/tests/test49/int.crl b/tests/nist_tests/tests/test49/int.crl
index 1defb1ef5..1defb1ef5 100644
--- a/checks/nist_tests/tests/test49/int.crl
+++ b/tests/nist_tests/tests/test49/int.crl
diff --git a/checks/nist_tests/tests/test49/int.crt b/tests/nist_tests/tests/test49/int.crt
index 037f68d8b..037f68d8b 100644
--- a/checks/nist_tests/tests/test49/int.crt
+++ b/tests/nist_tests/tests/test49/int.crt
diff --git a/checks/nist_tests/tests/test49/root.crl b/tests/nist_tests/tests/test49/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test49/root.crl
+++ b/tests/nist_tests/tests/test49/root.crl
diff --git a/checks/nist_tests/tests/test49/root.crt b/tests/nist_tests/tests/test49/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test49/root.crt
+++ b/tests/nist_tests/tests/test49/root.crt
diff --git a/checks/nist_tests/tests/test50/end.crt b/tests/nist_tests/tests/test50/end.crt
index ed9b0a3ce..ed9b0a3ce 100644
--- a/checks/nist_tests/tests/test50/end.crt
+++ b/tests/nist_tests/tests/test50/end.crt
diff --git a/checks/nist_tests/tests/test50/int.crl b/tests/nist_tests/tests/test50/int.crl
index 0c7cdfee5..0c7cdfee5 100644
--- a/checks/nist_tests/tests/test50/int.crl
+++ b/tests/nist_tests/tests/test50/int.crl
diff --git a/checks/nist_tests/tests/test50/int.crt b/tests/nist_tests/tests/test50/int.crt
index 74c41f021..74c41f021 100644
--- a/checks/nist_tests/tests/test50/int.crt
+++ b/tests/nist_tests/tests/test50/int.crt
diff --git a/checks/nist_tests/tests/test50/root.crl b/tests/nist_tests/tests/test50/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test50/root.crl
+++ b/tests/nist_tests/tests/test50/root.crl
diff --git a/checks/nist_tests/tests/test50/root.crt b/tests/nist_tests/tests/test50/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test50/root.crt
+++ b/tests/nist_tests/tests/test50/root.crt
diff --git a/checks/nist_tests/tests/test51/end.crt b/tests/nist_tests/tests/test51/end.crt
index 12ebc74c7..12ebc74c7 100644
--- a/checks/nist_tests/tests/test51/end.crt
+++ b/tests/nist_tests/tests/test51/end.crt
diff --git a/checks/nist_tests/tests/test51/int.crl b/tests/nist_tests/tests/test51/int.crl
index c887c9a2c..c887c9a2c 100644
--- a/checks/nist_tests/tests/test51/int.crl
+++ b/tests/nist_tests/tests/test51/int.crl
diff --git a/checks/nist_tests/tests/test51/int.crt b/tests/nist_tests/tests/test51/int.crt
index def7e90d1..def7e90d1 100644
--- a/checks/nist_tests/tests/test51/int.crt
+++ b/tests/nist_tests/tests/test51/int.crt
diff --git a/checks/nist_tests/tests/test51/root.crl b/tests/nist_tests/tests/test51/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test51/root.crl
+++ b/tests/nist_tests/tests/test51/root.crl
diff --git a/checks/nist_tests/tests/test51/root.crt b/tests/nist_tests/tests/test51/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test51/root.crt
+++ b/tests/nist_tests/tests/test51/root.crt
diff --git a/checks/nist_tests/tests/test52/end.crt b/tests/nist_tests/tests/test52/end.crt
index 0bd19185f..0bd19185f 100644
--- a/checks/nist_tests/tests/test52/end.crt
+++ b/tests/nist_tests/tests/test52/end.crt
diff --git a/checks/nist_tests/tests/test52/int.crl b/tests/nist_tests/tests/test52/int.crl
index ec220874c..ec220874c 100644
--- a/checks/nist_tests/tests/test52/int.crl
+++ b/tests/nist_tests/tests/test52/int.crl
diff --git a/checks/nist_tests/tests/test52/int.crt b/tests/nist_tests/tests/test52/int.crt
index 3429d7cf7..3429d7cf7 100644
--- a/checks/nist_tests/tests/test52/int.crt
+++ b/tests/nist_tests/tests/test52/int.crt
diff --git a/checks/nist_tests/tests/test52/root.crl b/tests/nist_tests/tests/test52/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test52/root.crl
+++ b/tests/nist_tests/tests/test52/root.crl
diff --git a/checks/nist_tests/tests/test52/root.crt b/tests/nist_tests/tests/test52/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test52/root.crt
+++ b/tests/nist_tests/tests/test52/root.crt
diff --git a/checks/nist_tests/tests/test53/end.crt b/tests/nist_tests/tests/test53/end.crt
index 9b99dc562..9b99dc562 100644
--- a/checks/nist_tests/tests/test53/end.crt
+++ b/tests/nist_tests/tests/test53/end.crt
diff --git a/checks/nist_tests/tests/test53/int.crl b/tests/nist_tests/tests/test53/int.crl
index 79fed242a..79fed242a 100644
--- a/checks/nist_tests/tests/test53/int.crl
+++ b/tests/nist_tests/tests/test53/int.crl
diff --git a/checks/nist_tests/tests/test53/int.crt b/tests/nist_tests/tests/test53/int.crt
index 72eac943f..72eac943f 100644
--- a/checks/nist_tests/tests/test53/int.crt
+++ b/tests/nist_tests/tests/test53/int.crt
diff --git a/checks/nist_tests/tests/test53/root.crl b/tests/nist_tests/tests/test53/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test53/root.crl
+++ b/tests/nist_tests/tests/test53/root.crl
diff --git a/checks/nist_tests/tests/test53/root.crt b/tests/nist_tests/tests/test53/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test53/root.crt
+++ b/tests/nist_tests/tests/test53/root.crt
diff --git a/checks/nist_tests/tests/test54/end.crt b/tests/nist_tests/tests/test54/end.crt
index 185f019cf..185f019cf 100644
--- a/checks/nist_tests/tests/test54/end.crt
+++ b/tests/nist_tests/tests/test54/end.crt
diff --git a/checks/nist_tests/tests/test54/int1.crl b/tests/nist_tests/tests/test54/int1.crl
index 5b1c4439c..5b1c4439c 100644
--- a/checks/nist_tests/tests/test54/int1.crl
+++ b/tests/nist_tests/tests/test54/int1.crl
diff --git a/checks/nist_tests/tests/test54/int1.crt b/tests/nist_tests/tests/test54/int1.crt
index 140ef0669..140ef0669 100644
--- a/checks/nist_tests/tests/test54/int1.crt
+++ b/tests/nist_tests/tests/test54/int1.crt
diff --git a/checks/nist_tests/tests/test54/int2.crl b/tests/nist_tests/tests/test54/int2.crl
index c531566a9..c531566a9 100644
--- a/checks/nist_tests/tests/test54/int2.crl
+++ b/tests/nist_tests/tests/test54/int2.crl
diff --git a/checks/nist_tests/tests/test54/int2.crt b/tests/nist_tests/tests/test54/int2.crt
index 506761d71..506761d71 100644
--- a/checks/nist_tests/tests/test54/int2.crt
+++ b/tests/nist_tests/tests/test54/int2.crt
diff --git a/checks/nist_tests/tests/test54/root.crl b/tests/nist_tests/tests/test54/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test54/root.crl
+++ b/tests/nist_tests/tests/test54/root.crl
diff --git a/checks/nist_tests/tests/test54/root.crt b/tests/nist_tests/tests/test54/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test54/root.crt
+++ b/tests/nist_tests/tests/test54/root.crt
diff --git a/checks/nist_tests/tests/test55/end.crt b/tests/nist_tests/tests/test55/end.crt
index 923d4c5a8..923d4c5a8 100644
--- a/checks/nist_tests/tests/test55/end.crt
+++ b/tests/nist_tests/tests/test55/end.crt
diff --git a/checks/nist_tests/tests/test55/int1.crl b/tests/nist_tests/tests/test55/int1.crl
index 371821e5e..371821e5e 100644
--- a/checks/nist_tests/tests/test55/int1.crl
+++ b/tests/nist_tests/tests/test55/int1.crl
diff --git a/checks/nist_tests/tests/test55/int1.crt b/tests/nist_tests/tests/test55/int1.crt
index 7597faf7f..7597faf7f 100644
--- a/checks/nist_tests/tests/test55/int1.crt
+++ b/tests/nist_tests/tests/test55/int1.crt
diff --git a/checks/nist_tests/tests/test55/int2.crl b/tests/nist_tests/tests/test55/int2.crl
index 9a242916e..9a242916e 100644
--- a/checks/nist_tests/tests/test55/int2.crl
+++ b/tests/nist_tests/tests/test55/int2.crl
diff --git a/checks/nist_tests/tests/test55/int2.crt b/tests/nist_tests/tests/test55/int2.crt
index 982235a21..982235a21 100644
--- a/checks/nist_tests/tests/test55/int2.crt
+++ b/tests/nist_tests/tests/test55/int2.crt
diff --git a/checks/nist_tests/tests/test55/root.crl b/tests/nist_tests/tests/test55/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test55/root.crl
+++ b/tests/nist_tests/tests/test55/root.crl
diff --git a/checks/nist_tests/tests/test55/root.crt b/tests/nist_tests/tests/test55/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test55/root.crt
+++ b/tests/nist_tests/tests/test55/root.crt
diff --git a/checks/nist_tests/tests/test56/end.crt b/tests/nist_tests/tests/test56/end.crt
index d1dc82186..d1dc82186 100644
--- a/checks/nist_tests/tests/test56/end.crt
+++ b/tests/nist_tests/tests/test56/end.crt
diff --git a/checks/nist_tests/tests/test56/int.crl b/tests/nist_tests/tests/test56/int.crl
index 840b209e0..840b209e0 100644
--- a/checks/nist_tests/tests/test56/int.crl
+++ b/tests/nist_tests/tests/test56/int.crl
diff --git a/checks/nist_tests/tests/test56/int.crt b/tests/nist_tests/tests/test56/int.crt
index 9b622cabd..9b622cabd 100644
--- a/checks/nist_tests/tests/test56/int.crt
+++ b/tests/nist_tests/tests/test56/int.crt
diff --git a/checks/nist_tests/tests/test56/root.crl b/tests/nist_tests/tests/test56/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test56/root.crl
+++ b/tests/nist_tests/tests/test56/root.crl
diff --git a/checks/nist_tests/tests/test56/root.crt b/tests/nist_tests/tests/test56/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test56/root.crt
+++ b/tests/nist_tests/tests/test56/root.crt
diff --git a/checks/nist_tests/tests/test57/end.crt b/tests/nist_tests/tests/test57/end.crt
index 2f939384a..2f939384a 100644
--- a/checks/nist_tests/tests/test57/end.crt
+++ b/tests/nist_tests/tests/test57/end.crt
diff --git a/checks/nist_tests/tests/test57/int.crl b/tests/nist_tests/tests/test57/int.crl
index a0be908ae..a0be908ae 100644
--- a/checks/nist_tests/tests/test57/int.crl
+++ b/tests/nist_tests/tests/test57/int.crl
diff --git a/checks/nist_tests/tests/test57/int.crt b/tests/nist_tests/tests/test57/int.crt
index 79f6d6b8a..79f6d6b8a 100644
--- a/checks/nist_tests/tests/test57/int.crt
+++ b/tests/nist_tests/tests/test57/int.crt
diff --git a/checks/nist_tests/tests/test57/root.crl b/tests/nist_tests/tests/test57/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test57/root.crl
+++ b/tests/nist_tests/tests/test57/root.crl
diff --git a/checks/nist_tests/tests/test57/root.crt b/tests/nist_tests/tests/test57/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test57/root.crt
+++ b/tests/nist_tests/tests/test57/root.crt
diff --git a/checks/nist_tests/tests/test58/end.crt b/tests/nist_tests/tests/test58/end.crt
index 674009c83..674009c83 100644
--- a/checks/nist_tests/tests/test58/end.crt
+++ b/tests/nist_tests/tests/test58/end.crt
diff --git a/checks/nist_tests/tests/test58/int1.crl b/tests/nist_tests/tests/test58/int1.crl
index aa9dc9d7f..aa9dc9d7f 100644
--- a/checks/nist_tests/tests/test58/int1.crl
+++ b/tests/nist_tests/tests/test58/int1.crl
diff --git a/checks/nist_tests/tests/test58/int1.crt b/tests/nist_tests/tests/test58/int1.crt
index 42e983122..42e983122 100644
--- a/checks/nist_tests/tests/test58/int1.crt
+++ b/tests/nist_tests/tests/test58/int1.crt
diff --git a/checks/nist_tests/tests/test58/int2.crl b/tests/nist_tests/tests/test58/int2.crl
index 7dec9c1eb..7dec9c1eb 100644
--- a/checks/nist_tests/tests/test58/int2.crl
+++ b/tests/nist_tests/tests/test58/int2.crl
diff --git a/checks/nist_tests/tests/test58/int2.crt b/tests/nist_tests/tests/test58/int2.crt
index 08eb808c4..08eb808c4 100644
--- a/checks/nist_tests/tests/test58/int2.crt
+++ b/tests/nist_tests/tests/test58/int2.crt
diff --git a/checks/nist_tests/tests/test58/int3.crl b/tests/nist_tests/tests/test58/int3.crl
index bec634480..bec634480 100644
--- a/checks/nist_tests/tests/test58/int3.crl
+++ b/tests/nist_tests/tests/test58/int3.crl
diff --git a/checks/nist_tests/tests/test58/int3.crt b/tests/nist_tests/tests/test58/int3.crt
index 6c5e6efae..6c5e6efae 100644
--- a/checks/nist_tests/tests/test58/int3.crt
+++ b/tests/nist_tests/tests/test58/int3.crt
diff --git a/checks/nist_tests/tests/test58/root.crl b/tests/nist_tests/tests/test58/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test58/root.crl
+++ b/tests/nist_tests/tests/test58/root.crl
diff --git a/checks/nist_tests/tests/test58/root.crt b/tests/nist_tests/tests/test58/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test58/root.crt
+++ b/tests/nist_tests/tests/test58/root.crt
diff --git a/checks/nist_tests/tests/test59/end.crt b/tests/nist_tests/tests/test59/end.crt
index da5ee9e69..da5ee9e69 100644
--- a/checks/nist_tests/tests/test59/end.crt
+++ b/tests/nist_tests/tests/test59/end.crt
diff --git a/checks/nist_tests/tests/test59/int1.crl b/tests/nist_tests/tests/test59/int1.crl
index eb7f0e883..eb7f0e883 100644
--- a/checks/nist_tests/tests/test59/int1.crl
+++ b/tests/nist_tests/tests/test59/int1.crl
diff --git a/checks/nist_tests/tests/test59/int1.crt b/tests/nist_tests/tests/test59/int1.crt
index be0ee21f2..be0ee21f2 100644
--- a/checks/nist_tests/tests/test59/int1.crt
+++ b/tests/nist_tests/tests/test59/int1.crt
diff --git a/checks/nist_tests/tests/test59/int2.crl b/tests/nist_tests/tests/test59/int2.crl
index 2b2fe9ced..2b2fe9ced 100644
--- a/checks/nist_tests/tests/test59/int2.crl
+++ b/tests/nist_tests/tests/test59/int2.crl
diff --git a/checks/nist_tests/tests/test59/int2.crt b/tests/nist_tests/tests/test59/int2.crt
index a84a7ba5e..a84a7ba5e 100644
--- a/checks/nist_tests/tests/test59/int2.crt
+++ b/tests/nist_tests/tests/test59/int2.crt
diff --git a/checks/nist_tests/tests/test59/int3.crl b/tests/nist_tests/tests/test59/int3.crl
index cb7885c17..cb7885c17 100644
--- a/checks/nist_tests/tests/test59/int3.crl
+++ b/tests/nist_tests/tests/test59/int3.crl
diff --git a/checks/nist_tests/tests/test59/int3.crt b/tests/nist_tests/tests/test59/int3.crt
index 0b13f9f9b..0b13f9f9b 100644
--- a/checks/nist_tests/tests/test59/int3.crt
+++ b/tests/nist_tests/tests/test59/int3.crt
diff --git a/checks/nist_tests/tests/test59/root.crl b/tests/nist_tests/tests/test59/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test59/root.crl
+++ b/tests/nist_tests/tests/test59/root.crl
diff --git a/checks/nist_tests/tests/test59/root.crt b/tests/nist_tests/tests/test59/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test59/root.crt
+++ b/tests/nist_tests/tests/test59/root.crt
diff --git a/checks/nist_tests/tests/test60/end.crt b/tests/nist_tests/tests/test60/end.crt
index 8741105ea..8741105ea 100644
--- a/checks/nist_tests/tests/test60/end.crt
+++ b/tests/nist_tests/tests/test60/end.crt
diff --git a/checks/nist_tests/tests/test60/int1.crl b/tests/nist_tests/tests/test60/int1.crl
index e778e911d..e778e911d 100644
--- a/checks/nist_tests/tests/test60/int1.crl
+++ b/tests/nist_tests/tests/test60/int1.crl
diff --git a/checks/nist_tests/tests/test60/int1.crt b/tests/nist_tests/tests/test60/int1.crt
index 01d844201..01d844201 100644
--- a/checks/nist_tests/tests/test60/int1.crt
+++ b/tests/nist_tests/tests/test60/int1.crt
diff --git a/checks/nist_tests/tests/test60/int2.crl b/tests/nist_tests/tests/test60/int2.crl
index 4f4ac6bc0..4f4ac6bc0 100644
--- a/checks/nist_tests/tests/test60/int2.crl
+++ b/tests/nist_tests/tests/test60/int2.crl
diff --git a/checks/nist_tests/tests/test60/int2.crt b/tests/nist_tests/tests/test60/int2.crt
index 0054dc622..0054dc622 100644
--- a/checks/nist_tests/tests/test60/int2.crt
+++ b/tests/nist_tests/tests/test60/int2.crt
diff --git a/checks/nist_tests/tests/test60/int3.crl b/tests/nist_tests/tests/test60/int3.crl
index 0b568e7cc..0b568e7cc 100644
--- a/checks/nist_tests/tests/test60/int3.crl
+++ b/tests/nist_tests/tests/test60/int3.crl
diff --git a/checks/nist_tests/tests/test60/int3.crt b/tests/nist_tests/tests/test60/int3.crt
index 6fff65cc7..6fff65cc7 100644
--- a/checks/nist_tests/tests/test60/int3.crt
+++ b/tests/nist_tests/tests/test60/int3.crt
diff --git a/checks/nist_tests/tests/test60/int4.crl b/tests/nist_tests/tests/test60/int4.crl
index 4cf694a98..4cf694a98 100644
--- a/checks/nist_tests/tests/test60/int4.crl
+++ b/tests/nist_tests/tests/test60/int4.crl
diff --git a/checks/nist_tests/tests/test60/int4.crt b/tests/nist_tests/tests/test60/int4.crt
index c5eebca96..c5eebca96 100644
--- a/checks/nist_tests/tests/test60/int4.crt
+++ b/tests/nist_tests/tests/test60/int4.crt
diff --git a/checks/nist_tests/tests/test60/root.crl b/tests/nist_tests/tests/test60/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test60/root.crl
+++ b/tests/nist_tests/tests/test60/root.crl
diff --git a/checks/nist_tests/tests/test60/root.crt b/tests/nist_tests/tests/test60/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test60/root.crt
+++ b/tests/nist_tests/tests/test60/root.crt
diff --git a/checks/nist_tests/tests/test61/end.crt b/tests/nist_tests/tests/test61/end.crt
index 7be023caf..7be023caf 100644
--- a/checks/nist_tests/tests/test61/end.crt
+++ b/tests/nist_tests/tests/test61/end.crt
diff --git a/checks/nist_tests/tests/test61/int1.crl b/tests/nist_tests/tests/test61/int1.crl
index 05c2809aa..05c2809aa 100644
--- a/checks/nist_tests/tests/test61/int1.crl
+++ b/tests/nist_tests/tests/test61/int1.crl
diff --git a/checks/nist_tests/tests/test61/int1.crt b/tests/nist_tests/tests/test61/int1.crt
index ba03f6c24..ba03f6c24 100644
--- a/checks/nist_tests/tests/test61/int1.crt
+++ b/tests/nist_tests/tests/test61/int1.crt
diff --git a/checks/nist_tests/tests/test61/int2.crl b/tests/nist_tests/tests/test61/int2.crl
index d74b9168c..d74b9168c 100644
--- a/checks/nist_tests/tests/test61/int2.crl
+++ b/tests/nist_tests/tests/test61/int2.crl
diff --git a/checks/nist_tests/tests/test61/int2.crt b/tests/nist_tests/tests/test61/int2.crt
index bd4e40ea3..bd4e40ea3 100644
--- a/checks/nist_tests/tests/test61/int2.crt
+++ b/tests/nist_tests/tests/test61/int2.crt
diff --git a/checks/nist_tests/tests/test61/int3.crl b/tests/nist_tests/tests/test61/int3.crl
index 7e6e83fb2..7e6e83fb2 100644
--- a/checks/nist_tests/tests/test61/int3.crl
+++ b/tests/nist_tests/tests/test61/int3.crl
diff --git a/checks/nist_tests/tests/test61/int3.crt b/tests/nist_tests/tests/test61/int3.crt
index 4f9342b20..4f9342b20 100644
--- a/checks/nist_tests/tests/test61/int3.crt
+++ b/tests/nist_tests/tests/test61/int3.crt
diff --git a/checks/nist_tests/tests/test61/int4.crl b/tests/nist_tests/tests/test61/int4.crl
index 7161f4192..7161f4192 100644
--- a/checks/nist_tests/tests/test61/int4.crl
+++ b/tests/nist_tests/tests/test61/int4.crl
diff --git a/checks/nist_tests/tests/test61/int4.crt b/tests/nist_tests/tests/test61/int4.crt
index 5962eedfa..5962eedfa 100644
--- a/checks/nist_tests/tests/test61/int4.crt
+++ b/tests/nist_tests/tests/test61/int4.crt
diff --git a/checks/nist_tests/tests/test61/root.crl b/tests/nist_tests/tests/test61/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test61/root.crl
+++ b/tests/nist_tests/tests/test61/root.crl
diff --git a/checks/nist_tests/tests/test61/root.crt b/tests/nist_tests/tests/test61/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test61/root.crt
+++ b/tests/nist_tests/tests/test61/root.crt
diff --git a/checks/nist_tests/tests/test62/end.crt b/tests/nist_tests/tests/test62/end.crt
index bff8ea4cb..bff8ea4cb 100644
--- a/checks/nist_tests/tests/test62/end.crt
+++ b/tests/nist_tests/tests/test62/end.crt
diff --git a/checks/nist_tests/tests/test62/int1.crl b/tests/nist_tests/tests/test62/int1.crl
index aa26a419a..aa26a419a 100644
--- a/checks/nist_tests/tests/test62/int1.crl
+++ b/tests/nist_tests/tests/test62/int1.crl
diff --git a/checks/nist_tests/tests/test62/int1.crt b/tests/nist_tests/tests/test62/int1.crt
index aee257d7e..aee257d7e 100644
--- a/checks/nist_tests/tests/test62/int1.crt
+++ b/tests/nist_tests/tests/test62/int1.crt
diff --git a/checks/nist_tests/tests/test62/int2.crl b/tests/nist_tests/tests/test62/int2.crl
index 61e712f0d..61e712f0d 100644
--- a/checks/nist_tests/tests/test62/int2.crl
+++ b/tests/nist_tests/tests/test62/int2.crl
diff --git a/checks/nist_tests/tests/test62/int2.crt b/tests/nist_tests/tests/test62/int2.crt
index a62d9a026..a62d9a026 100644
--- a/checks/nist_tests/tests/test62/int2.crt
+++ b/tests/nist_tests/tests/test62/int2.crt
diff --git a/checks/nist_tests/tests/test62/int3.crl b/tests/nist_tests/tests/test62/int3.crl
index 09707fd7b..09707fd7b 100644
--- a/checks/nist_tests/tests/test62/int3.crl
+++ b/tests/nist_tests/tests/test62/int3.crl
diff --git a/checks/nist_tests/tests/test62/int3.crt b/tests/nist_tests/tests/test62/int3.crt
index aa91f3427..aa91f3427 100644
--- a/checks/nist_tests/tests/test62/int3.crt
+++ b/tests/nist_tests/tests/test62/int3.crt
diff --git a/checks/nist_tests/tests/test62/int4.crl b/tests/nist_tests/tests/test62/int4.crl
index 997a057f2..997a057f2 100644
--- a/checks/nist_tests/tests/test62/int4.crl
+++ b/tests/nist_tests/tests/test62/int4.crl
diff --git a/checks/nist_tests/tests/test62/int4.crt b/tests/nist_tests/tests/test62/int4.crt
index 744603003..744603003 100644
--- a/checks/nist_tests/tests/test62/int4.crt
+++ b/tests/nist_tests/tests/test62/int4.crt
diff --git a/checks/nist_tests/tests/test62/root.crl b/tests/nist_tests/tests/test62/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test62/root.crl
+++ b/tests/nist_tests/tests/test62/root.crl
diff --git a/checks/nist_tests/tests/test62/root.crt b/tests/nist_tests/tests/test62/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test62/root.crt
+++ b/tests/nist_tests/tests/test62/root.crt
diff --git a/checks/nist_tests/tests/test63/end.crt b/tests/nist_tests/tests/test63/end.crt
index 16c1c687d..16c1c687d 100644
--- a/checks/nist_tests/tests/test63/end.crt
+++ b/tests/nist_tests/tests/test63/end.crt
diff --git a/checks/nist_tests/tests/test63/int1.crl b/tests/nist_tests/tests/test63/int1.crl
index 40c4afc45..40c4afc45 100644
--- a/checks/nist_tests/tests/test63/int1.crl
+++ b/tests/nist_tests/tests/test63/int1.crl
diff --git a/checks/nist_tests/tests/test63/int1.crt b/tests/nist_tests/tests/test63/int1.crt
index 6b3f6eb4b..6b3f6eb4b 100644
--- a/checks/nist_tests/tests/test63/int1.crt
+++ b/tests/nist_tests/tests/test63/int1.crt
diff --git a/checks/nist_tests/tests/test63/int2.crl b/tests/nist_tests/tests/test63/int2.crl
index 7bffd4661..7bffd4661 100644
--- a/checks/nist_tests/tests/test63/int2.crl
+++ b/tests/nist_tests/tests/test63/int2.crl
diff --git a/checks/nist_tests/tests/test63/int2.crt b/tests/nist_tests/tests/test63/int2.crt
index f2e88f9fe..f2e88f9fe 100644
--- a/checks/nist_tests/tests/test63/int2.crt
+++ b/tests/nist_tests/tests/test63/int2.crt
diff --git a/checks/nist_tests/tests/test63/int3.crl b/tests/nist_tests/tests/test63/int3.crl
index 20f503c6b..20f503c6b 100644
--- a/checks/nist_tests/tests/test63/int3.crl
+++ b/tests/nist_tests/tests/test63/int3.crl
diff --git a/checks/nist_tests/tests/test63/int3.crt b/tests/nist_tests/tests/test63/int3.crt
index 2d636dd43..2d636dd43 100644
--- a/checks/nist_tests/tests/test63/int3.crt
+++ b/tests/nist_tests/tests/test63/int3.crt
diff --git a/checks/nist_tests/tests/test63/int4.crl b/tests/nist_tests/tests/test63/int4.crl
index 71e622907..71e622907 100644
--- a/checks/nist_tests/tests/test63/int4.crl
+++ b/tests/nist_tests/tests/test63/int4.crl
diff --git a/checks/nist_tests/tests/test63/int4.crt b/tests/nist_tests/tests/test63/int4.crt
index a0ed3a167..a0ed3a167 100644
--- a/checks/nist_tests/tests/test63/int4.crt
+++ b/tests/nist_tests/tests/test63/int4.crt
diff --git a/checks/nist_tests/tests/test63/root.crl b/tests/nist_tests/tests/test63/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test63/root.crl
+++ b/tests/nist_tests/tests/test63/root.crl
diff --git a/checks/nist_tests/tests/test63/root.crt b/tests/nist_tests/tests/test63/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test63/root.crt
+++ b/tests/nist_tests/tests/test63/root.crt
diff --git a/checks/nist_tests/tests/test64/end.crt b/tests/nist_tests/tests/test64/end.crt
index 771423eca..771423eca 100644
--- a/checks/nist_tests/tests/test64/end.crt
+++ b/tests/nist_tests/tests/test64/end.crt
diff --git a/checks/nist_tests/tests/test64/int.crl b/tests/nist_tests/tests/test64/int.crl
index 0e3e2bd95..0e3e2bd95 100644
--- a/checks/nist_tests/tests/test64/int.crl
+++ b/tests/nist_tests/tests/test64/int.crl
diff --git a/checks/nist_tests/tests/test64/int.crt b/tests/nist_tests/tests/test64/int.crt
index 1ae82584e..1ae82584e 100644
--- a/checks/nist_tests/tests/test64/int.crt
+++ b/tests/nist_tests/tests/test64/int.crt
diff --git a/checks/nist_tests/tests/test64/root.crl b/tests/nist_tests/tests/test64/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test64/root.crl
+++ b/tests/nist_tests/tests/test64/root.crl
diff --git a/checks/nist_tests/tests/test64/root.crt b/tests/nist_tests/tests/test64/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test64/root.crt
+++ b/tests/nist_tests/tests/test64/root.crt
diff --git a/checks/nist_tests/tests/test65/end.crt b/tests/nist_tests/tests/test65/end.crt
index 29d51a7f9..29d51a7f9 100644
--- a/checks/nist_tests/tests/test65/end.crt
+++ b/tests/nist_tests/tests/test65/end.crt
diff --git a/checks/nist_tests/tests/test65/int.crl b/tests/nist_tests/tests/test65/int.crl
index bd2d906ff..bd2d906ff 100644
--- a/checks/nist_tests/tests/test65/int.crl
+++ b/tests/nist_tests/tests/test65/int.crl
diff --git a/checks/nist_tests/tests/test65/int1.crt b/tests/nist_tests/tests/test65/int1.crt
index 214c839fe..214c839fe 100644
--- a/checks/nist_tests/tests/test65/int1.crt
+++ b/tests/nist_tests/tests/test65/int1.crt
diff --git a/checks/nist_tests/tests/test65/int2.crt b/tests/nist_tests/tests/test65/int2.crt
index 57c2e5914..57c2e5914 100644
--- a/checks/nist_tests/tests/test65/int2.crt
+++ b/tests/nist_tests/tests/test65/int2.crt
diff --git a/checks/nist_tests/tests/test65/root.crl b/tests/nist_tests/tests/test65/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test65/root.crl
+++ b/tests/nist_tests/tests/test65/root.crl
diff --git a/checks/nist_tests/tests/test65/root.crt b/tests/nist_tests/tests/test65/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test65/root.crt
+++ b/tests/nist_tests/tests/test65/root.crt
diff --git a/checks/nist_tests/tests/test66/end.crt b/tests/nist_tests/tests/test66/end.crt
index ccdb0e086..ccdb0e086 100644
--- a/checks/nist_tests/tests/test66/end.crt
+++ b/tests/nist_tests/tests/test66/end.crt
diff --git a/checks/nist_tests/tests/test66/int.crl b/tests/nist_tests/tests/test66/int.crl
index f80b444e2..f80b444e2 100644
--- a/checks/nist_tests/tests/test66/int.crl
+++ b/tests/nist_tests/tests/test66/int.crl
diff --git a/checks/nist_tests/tests/test66/int.crt b/tests/nist_tests/tests/test66/int.crt
index 23f8b17c2..23f8b17c2 100644
--- a/checks/nist_tests/tests/test66/int.crt
+++ b/tests/nist_tests/tests/test66/int.crt
diff --git a/checks/nist_tests/tests/test66/root.crl b/tests/nist_tests/tests/test66/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test66/root.crl
+++ b/tests/nist_tests/tests/test66/root.crl
diff --git a/checks/nist_tests/tests/test66/root.crt b/tests/nist_tests/tests/test66/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test66/root.crt
+++ b/tests/nist_tests/tests/test66/root.crt
diff --git a/checks/nist_tests/tests/test67/end.crt b/tests/nist_tests/tests/test67/end.crt
index 85d5508db..85d5508db 100644
--- a/checks/nist_tests/tests/test67/end.crt
+++ b/tests/nist_tests/tests/test67/end.crt
diff --git a/checks/nist_tests/tests/test67/int.crt b/tests/nist_tests/tests/test67/int.crt
index 92a4b3a95..92a4b3a95 100644
--- a/checks/nist_tests/tests/test67/int.crt
+++ b/tests/nist_tests/tests/test67/int.crt
diff --git a/checks/nist_tests/tests/test67/int1.crl b/tests/nist_tests/tests/test67/int1.crl
index 3fe834938..3fe834938 100644
--- a/checks/nist_tests/tests/test67/int1.crl
+++ b/tests/nist_tests/tests/test67/int1.crl
diff --git a/checks/nist_tests/tests/test67/int2.crl b/tests/nist_tests/tests/test67/int2.crl
index 15593fa84..15593fa84 100644
--- a/checks/nist_tests/tests/test67/int2.crl
+++ b/tests/nist_tests/tests/test67/int2.crl
diff --git a/checks/nist_tests/tests/test67/root.crl b/tests/nist_tests/tests/test67/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test67/root.crl
+++ b/tests/nist_tests/tests/test67/root.crl
diff --git a/checks/nist_tests/tests/test67/root.crt b/tests/nist_tests/tests/test67/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test67/root.crt
+++ b/tests/nist_tests/tests/test67/root.crt
diff --git a/checks/nist_tests/tests/test68/end.crt b/tests/nist_tests/tests/test68/end.crt
index bddd72da6..bddd72da6 100644
--- a/checks/nist_tests/tests/test68/end.crt
+++ b/tests/nist_tests/tests/test68/end.crt
diff --git a/checks/nist_tests/tests/test68/int1.crl b/tests/nist_tests/tests/test68/int1.crl
index fdbf8ea0c..fdbf8ea0c 100644
--- a/checks/nist_tests/tests/test68/int1.crl
+++ b/tests/nist_tests/tests/test68/int1.crl
diff --git a/checks/nist_tests/tests/test68/int1.crt b/tests/nist_tests/tests/test68/int1.crt
index 4bc8127b3..4bc8127b3 100644
--- a/checks/nist_tests/tests/test68/int1.crt
+++ b/tests/nist_tests/tests/test68/int1.crt
diff --git a/checks/nist_tests/tests/test68/int2.crl b/tests/nist_tests/tests/test68/int2.crl
index 33b764094..33b764094 100644
--- a/checks/nist_tests/tests/test68/int2.crl
+++ b/tests/nist_tests/tests/test68/int2.crl
diff --git a/checks/nist_tests/tests/test68/int2.crt b/tests/nist_tests/tests/test68/int2.crt
index 1ca8d5c32..1ca8d5c32 100644
--- a/checks/nist_tests/tests/test68/int2.crt
+++ b/tests/nist_tests/tests/test68/int2.crt
diff --git a/checks/nist_tests/tests/test68/root.crl b/tests/nist_tests/tests/test68/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test68/root.crl
+++ b/tests/nist_tests/tests/test68/root.crl
diff --git a/checks/nist_tests/tests/test68/root.crt b/tests/nist_tests/tests/test68/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test68/root.crt
+++ b/tests/nist_tests/tests/test68/root.crt
diff --git a/checks/nist_tests/tests/test69/end.crt b/tests/nist_tests/tests/test69/end.crt
index 00fc716dc..00fc716dc 100644
--- a/checks/nist_tests/tests/test69/end.crt
+++ b/tests/nist_tests/tests/test69/end.crt
diff --git a/checks/nist_tests/tests/test69/int.crl b/tests/nist_tests/tests/test69/int.crl
index fc09d351a..fc09d351a 100644
--- a/checks/nist_tests/tests/test69/int.crl
+++ b/tests/nist_tests/tests/test69/int.crl
diff --git a/checks/nist_tests/tests/test69/int.crt b/tests/nist_tests/tests/test69/int.crt
index 6c19ee09e..6c19ee09e 100644
--- a/checks/nist_tests/tests/test69/int.crt
+++ b/tests/nist_tests/tests/test69/int.crt
diff --git a/checks/nist_tests/tests/test69/root.crl b/tests/nist_tests/tests/test69/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test69/root.crl
+++ b/tests/nist_tests/tests/test69/root.crl
diff --git a/checks/nist_tests/tests/test69/root.crt b/tests/nist_tests/tests/test69/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test69/root.crt
+++ b/tests/nist_tests/tests/test69/root.crt
diff --git a/checks/nist_tests/tests/test70/end.crt b/tests/nist_tests/tests/test70/end.crt
index c576960be..c576960be 100644
--- a/checks/nist_tests/tests/test70/end.crt
+++ b/tests/nist_tests/tests/test70/end.crt
diff --git a/checks/nist_tests/tests/test70/int1.crl b/tests/nist_tests/tests/test70/int1.crl
index 77dafb909..77dafb909 100644
--- a/checks/nist_tests/tests/test70/int1.crl
+++ b/tests/nist_tests/tests/test70/int1.crl
diff --git a/checks/nist_tests/tests/test70/int1.crt b/tests/nist_tests/tests/test70/int1.crt
index 5509c5438..5509c5438 100644
--- a/checks/nist_tests/tests/test70/int1.crt
+++ b/tests/nist_tests/tests/test70/int1.crt
diff --git a/checks/nist_tests/tests/test70/int2.crl b/tests/nist_tests/tests/test70/int2.crl
index 4e22f3966..4e22f3966 100644
--- a/checks/nist_tests/tests/test70/int2.crl
+++ b/tests/nist_tests/tests/test70/int2.crl
diff --git a/checks/nist_tests/tests/test70/int2.crt b/tests/nist_tests/tests/test70/int2.crt
index 9af80b8e4..9af80b8e4 100644
--- a/checks/nist_tests/tests/test70/int2.crt
+++ b/tests/nist_tests/tests/test70/int2.crt
diff --git a/checks/nist_tests/tests/test70/root.crl b/tests/nist_tests/tests/test70/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test70/root.crl
+++ b/tests/nist_tests/tests/test70/root.crl
diff --git a/checks/nist_tests/tests/test70/root.crt b/tests/nist_tests/tests/test70/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test70/root.crt
+++ b/tests/nist_tests/tests/test70/root.crt
diff --git a/checks/nist_tests/tests/test71/end.crt b/tests/nist_tests/tests/test71/end.crt
index 0cc1718ee..0cc1718ee 100644
--- a/checks/nist_tests/tests/test71/end.crt
+++ b/tests/nist_tests/tests/test71/end.crt
diff --git a/checks/nist_tests/tests/test71/int.crl b/tests/nist_tests/tests/test71/int.crl
index c34a95df1..c34a95df1 100644
--- a/checks/nist_tests/tests/test71/int.crl
+++ b/tests/nist_tests/tests/test71/int.crl
diff --git a/checks/nist_tests/tests/test71/int.crt b/tests/nist_tests/tests/test71/int.crt
index 07076019c..07076019c 100644
--- a/checks/nist_tests/tests/test71/int.crt
+++ b/tests/nist_tests/tests/test71/int.crt
diff --git a/checks/nist_tests/tests/test71/root.crl b/tests/nist_tests/tests/test71/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test71/root.crl
+++ b/tests/nist_tests/tests/test71/root.crl
diff --git a/checks/nist_tests/tests/test71/root.crt b/tests/nist_tests/tests/test71/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test71/root.crt
+++ b/tests/nist_tests/tests/test71/root.crt
diff --git a/checks/nist_tests/tests/test72/end.crt b/tests/nist_tests/tests/test72/end.crt
index 6c61375d8..6c61375d8 100644
--- a/checks/nist_tests/tests/test72/end.crt
+++ b/tests/nist_tests/tests/test72/end.crt
diff --git a/checks/nist_tests/tests/test72/int.crl b/tests/nist_tests/tests/test72/int.crl
index 643141b37..643141b37 100644
--- a/checks/nist_tests/tests/test72/int.crl
+++ b/tests/nist_tests/tests/test72/int.crl
diff --git a/checks/nist_tests/tests/test72/int.crt b/tests/nist_tests/tests/test72/int.crt
index 36b1f2052..36b1f2052 100644
--- a/checks/nist_tests/tests/test72/int.crt
+++ b/tests/nist_tests/tests/test72/int.crt
diff --git a/checks/nist_tests/tests/test72/root.crl b/tests/nist_tests/tests/test72/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test72/root.crl
+++ b/tests/nist_tests/tests/test72/root.crl
diff --git a/checks/nist_tests/tests/test72/root.crt b/tests/nist_tests/tests/test72/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test72/root.crt
+++ b/tests/nist_tests/tests/test72/root.crt
diff --git a/checks/nist_tests/tests/test73/end.crt b/tests/nist_tests/tests/test73/end.crt
index 9bae5325f..9bae5325f 100644
--- a/checks/nist_tests/tests/test73/end.crt
+++ b/tests/nist_tests/tests/test73/end.crt
diff --git a/checks/nist_tests/tests/test73/int.crl b/tests/nist_tests/tests/test73/int.crl
index 6b76dc0b8..6b76dc0b8 100644
--- a/checks/nist_tests/tests/test73/int.crl
+++ b/tests/nist_tests/tests/test73/int.crl
diff --git a/checks/nist_tests/tests/test73/int.crt b/tests/nist_tests/tests/test73/int.crt
index ff6df2598..ff6df2598 100644
--- a/checks/nist_tests/tests/test73/int.crt
+++ b/tests/nist_tests/tests/test73/int.crt
diff --git a/checks/nist_tests/tests/test73/root.crl b/tests/nist_tests/tests/test73/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test73/root.crl
+++ b/tests/nist_tests/tests/test73/root.crl
diff --git a/checks/nist_tests/tests/test73/root.crt b/tests/nist_tests/tests/test73/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test73/root.crt
+++ b/tests/nist_tests/tests/test73/root.crt
diff --git a/checks/nist_tests/tests/test74/end.crt b/tests/nist_tests/tests/test74/end.crt
index 93e05bd1e..93e05bd1e 100644
--- a/checks/nist_tests/tests/test74/end.crt
+++ b/tests/nist_tests/tests/test74/end.crt
diff --git a/checks/nist_tests/tests/test74/int.crl b/tests/nist_tests/tests/test74/int.crl
index 8733b183c..8733b183c 100644
--- a/checks/nist_tests/tests/test74/int.crl
+++ b/tests/nist_tests/tests/test74/int.crl
diff --git a/checks/nist_tests/tests/test74/int.crt b/tests/nist_tests/tests/test74/int.crt
index c9258148d..c9258148d 100644
--- a/checks/nist_tests/tests/test74/int.crt
+++ b/tests/nist_tests/tests/test74/int.crt
diff --git a/checks/nist_tests/tests/test74/root.crl b/tests/nist_tests/tests/test74/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test74/root.crl
+++ b/tests/nist_tests/tests/test74/root.crl
diff --git a/checks/nist_tests/tests/test74/root.crt b/tests/nist_tests/tests/test74/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test74/root.crt
+++ b/tests/nist_tests/tests/test74/root.crt
diff --git a/checks/nist_tests/tests/test75/end.crt b/tests/nist_tests/tests/test75/end.crt
index 7d8179be0..7d8179be0 100644
--- a/checks/nist_tests/tests/test75/end.crt
+++ b/tests/nist_tests/tests/test75/end.crt
diff --git a/checks/nist_tests/tests/test75/int.crl b/tests/nist_tests/tests/test75/int.crl
index 19f472c7f..19f472c7f 100644
--- a/checks/nist_tests/tests/test75/int.crl
+++ b/tests/nist_tests/tests/test75/int.crl
diff --git a/checks/nist_tests/tests/test75/int.crt b/tests/nist_tests/tests/test75/int.crt
index 4a4c27e8c..4a4c27e8c 100644
--- a/checks/nist_tests/tests/test75/int.crt
+++ b/tests/nist_tests/tests/test75/int.crt
diff --git a/checks/nist_tests/tests/test75/root.crl b/tests/nist_tests/tests/test75/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test75/root.crl
+++ b/tests/nist_tests/tests/test75/root.crl
diff --git a/checks/nist_tests/tests/test75/root.crt b/tests/nist_tests/tests/test75/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test75/root.crt
+++ b/tests/nist_tests/tests/test75/root.crt
diff --git a/checks/nist_tests/tests/test76/end.crt b/tests/nist_tests/tests/test76/end.crt
index bde477d89..bde477d89 100644
--- a/checks/nist_tests/tests/test76/end.crt
+++ b/tests/nist_tests/tests/test76/end.crt
diff --git a/checks/nist_tests/tests/test76/int.crl b/tests/nist_tests/tests/test76/int.crl
index dbbbd43be..dbbbd43be 100644
--- a/checks/nist_tests/tests/test76/int.crl
+++ b/tests/nist_tests/tests/test76/int.crl
diff --git a/checks/nist_tests/tests/test76/int.crt b/tests/nist_tests/tests/test76/int.crt
index ab1c64390..ab1c64390 100644
--- a/checks/nist_tests/tests/test76/int.crt
+++ b/tests/nist_tests/tests/test76/int.crt
diff --git a/checks/nist_tests/tests/test76/root.crl b/tests/nist_tests/tests/test76/root.crl
index de65024ad..de65024ad 100644
--- a/checks/nist_tests/tests/test76/root.crl
+++ b/tests/nist_tests/tests/test76/root.crl
diff --git a/checks/nist_tests/tests/test76/root.crt b/tests/nist_tests/tests/test76/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/checks/nist_tests/tests/test76/root.crt
+++ b/tests/nist_tests/tests/test76/root.crt
diff --git a/checks/nist_tests/x509test.cpp b/tests/nist_tests/x509test.cpp
index 18ed26534..18ed26534 100644
--- a/checks/nist_tests/x509test.cpp
+++ b/tests/nist_tests/x509test.cpp
diff --git a/checks/pbkdf.vec b/tests/pbkdf.vec
index f73cd2b60..f73cd2b60 100644
--- a/checks/pbkdf.vec
+++ b/tests/pbkdf.vec
diff --git a/checks/pk_bench.cpp b/tests/pk_bench.cpp
index da2221b90..da2221b90 100644
--- a/checks/pk_bench.cpp
+++ b/tests/pk_bench.cpp
diff --git a/checks/pk_valid.dat b/tests/pk_valid.dat
index 7298b3730..7298b3730 100644
--- a/checks/pk_valid.dat
+++ b/tests/pk_valid.dat
diff --git a/checks/stream.vec b/tests/stream.vec
index 01869d408..01869d408 100644
--- a/checks/stream.vec
+++ b/tests/stream.vec
diff --git a/checks/test_aead.cpp b/tests/test_aead.cpp
index 771434e7e..e8643334f 100644
--- a/checks/test_aead.cpp
+++ b/tests/test_aead.cpp
@@ -77,7 +77,7 @@ bool aead_test(const std::string& algo,
 
 size_t test_aead()
    {
-   std::ifstream vec("checks/aead.vec");
+   std::ifstream vec(CHECKS_DIR "/aead.vec");
 
    return run_tests_bb(vec, "AEAD", "Out", true,
              [](std::map<std::string, std::string> m)
diff --git a/checks/test_bigint.cpp b/tests/test_bigint.cpp
index 10f46900f..27002b8cf 100644
--- a/checks/test_bigint.cpp
+++ b/tests/test_bigint.cpp
@@ -35,7 +35,7 @@ size_t check_primetest(const std::vector<std::string>&,
 
 size_t test_bigint()
    {
-   const std::string filename = "checks/mp_valid.dat";
+   const std::string filename = CHECKS_DIR "/mp_valid.dat";
    std::ifstream test_data(filename.c_str());
 
    if(!test_data)
diff --git a/checks/test_block.cpp b/tests/test_block.cpp
index 63f2ce105..51241d69b 100644
--- a/checks/test_block.cpp
+++ b/tests/test_block.cpp
@@ -65,7 +65,7 @@ bool block_test(const std::string& algo,
 
 size_t test_block()
    {
-   std::ifstream vec("checks/block.vec");
+   std::ifstream vec(CHECKS_DIR "/block.vec");
 
    return run_tests_bb(vec, "BlockCipher", "Out", true,
              [](std::map<std::string, std::string> m) -> bool
diff --git a/checks/test_cryptobox.cpp b/tests/test_cryptobox.cpp
index 9a53da74c..9a53da74c 100644
--- a/checks/test_cryptobox.cpp
+++ b/tests/test_cryptobox.cpp
diff --git a/checks/test_cvc.cpp b/tests/test_cvc.cpp
index b4d9ea033..205b74ec8 100644
--- a/checks/test_cvc.cpp
+++ b/tests/test_cvc.cpp
@@ -28,7 +28,7 @@
 #include <botan/cvc_cert.h>
 #include <botan/cvc_ado.h>
 
-#define TEST_DATA_DIR "checks/ecc_testdata"
+#define TEST_DATA_DIR CHECKS_DIR "/ecc_testdata"
 
 using namespace Botan;
 
diff --git a/checks/test_eax.cpp b/tests/test_eax.cpp
index e44adaa6a..45b583139 100644
--- a/checks/test_eax.cpp
+++ b/tests/test_eax.cpp
@@ -224,6 +224,6 @@ size_t eax_tests(std::istream& in)
 size_t test_eax()
    {
    // Uses a set of tests created for libtomcrypt
-   std::ifstream in("checks/eax.vec");
+   std::ifstream in(CHECKS_DIR "/eax.vec");
    return eax_tests(in);
    }
diff --git a/checks/test_ecc.cpp b/tests/test_ecc.cpp
index d61c685c9..d61c685c9 100644
--- a/checks/test_ecc.cpp
+++ b/tests/test_ecc.cpp
diff --git a/checks/test_ecdh.cpp b/tests/test_ecdh.cpp
index 30139b27e..30139b27e 100644
--- a/checks/test_ecdh.cpp
+++ b/tests/test_ecdh.cpp
diff --git a/checks/test_ecdsa.cpp b/tests/test_ecdsa.cpp
index aa998a3f5..b114caf0d 100644
--- a/checks/test_ecdsa.cpp
+++ b/tests/test_ecdsa.cpp
@@ -24,7 +24,7 @@
 
 using namespace Botan;
 
-#define TEST_DATA_DIR "checks/ecc_testdata"
+#define TEST_DATA_DIR CHECKS_DIR "/ecc_testdata"
 
 #define CHECK_MESSAGE(expr, print) try { if(!(expr)) { ++fails; std::cout << print << "\n"; } } catch(std::exception& e) { std::cout << __FUNCTION__ << ": " << e.what() << "\n"; }
 #define CHECK(expr) try { if(!(expr)) { ++fails; std::cout << #expr << "\n"; } } catch(std::exception& e) { std::cout << __FUNCTION__ << ": " << e.what() << "\n"; }
diff --git a/checks/test_hash.cpp b/tests/test_hash.cpp
index 29cd4d42c..bb5788565 100644
--- a/checks/test_hash.cpp
+++ b/tests/test_hash.cpp
@@ -50,7 +50,7 @@ bool hash_test(const std::string& algo,
 
 size_t test_hash()
    {
-   std::ifstream vec("checks/hash.vec");
+   std::ifstream vec(CHECKS_DIR "/hash.vec");
 
    return run_tests_bb(vec, "Hash", "Out", true,
              [](std::map<std::string, std::string> m) -> bool
diff --git a/checks/test_hkdf.cpp b/tests/test_hkdf.cpp
index 6e1c33d60..1c8532c33 100644
--- a/checks/test_hkdf.cpp
+++ b/tests/test_hkdf.cpp
@@ -59,7 +59,7 @@ bool hkdf_test(const std::string& algo,
 size_t test_hkdf()
    {
    // From RFC 5869
-   std::ifstream vec("checks/hkdf.vec");
+   std::ifstream vec(CHECKS_DIR "/hkdf.vec");
 
    return run_tests_bb(vec, "HKDF", "OKM", true,
              [](std::map<std::string, std::string> m) -> bool
diff --git a/checks/test_kdf.cpp b/tests/test_kdf.cpp
index 60c4eb25f..9debe7966 100644
--- a/checks/test_kdf.cpp
+++ b/tests/test_kdf.cpp
@@ -32,7 +32,7 @@ std::string kdf_test(const std::string& algo,
 
 size_t test_kdf()
    {
-   std::ifstream vec("checks/kdf.vec");
+   std::ifstream vec(CHECKS_DIR "/kdf.vec");
 
    return run_tests(vec, "KDF", "Output", true,
              [](std::map<std::string, std::string> m)
diff --git a/checks/test_keywrap.cpp b/tests/test_keywrap.cpp
index a7dcbfe75..a7dcbfe75 100644
--- a/checks/test_keywrap.cpp
+++ b/tests/test_keywrap.cpp
diff --git a/checks/test_mac.cpp b/tests/test_mac.cpp
index b4488f0c5..31f159663 100644
--- a/checks/test_mac.cpp
+++ b/tests/test_mac.cpp
@@ -52,7 +52,7 @@ bool mac_test(const std::string& algo,
 
 size_t test_mac()
    {
-   std::ifstream vec("checks/mac.vec");
+   std::ifstream vec(CHECKS_DIR "/mac.vec");
 
    return run_tests_bb(vec, "Mac", "Out", true,
              [](std::map<std::string, std::string> m) -> bool
diff --git a/checks/test_modes.cpp b/tests/test_modes.cpp
index 5d63ed63c..1b546cea3 100644
--- a/checks/test_modes.cpp
+++ b/tests/test_modes.cpp
@@ -69,7 +69,7 @@ bool mode_test(const std::string& algo,
 
 size_t test_modes()
    {
-   std::ifstream vec("checks/modes.vec");
+   std::ifstream vec(CHECKS_DIR "/modes.vec");
 
    return run_tests_bb(vec, "Mode", "Out", true,
              [](std::map<std::string, std::string> m)
diff --git a/checks/test_ocb.cpp b/tests/test_ocb.cpp
index b2bd296e0..b2bd296e0 100644
--- a/checks/test_ocb.cpp
+++ b/tests/test_ocb.cpp
diff --git a/checks/test_passhash.cpp b/tests/test_passhash.cpp
index 6f66743c5..6f66743c5 100644
--- a/checks/test_passhash.cpp
+++ b/tests/test_passhash.cpp
diff --git a/checks/test_pbkdf.cpp b/tests/test_pbkdf.cpp
index 43a77d7f4..140190b13 100644
--- a/checks/test_pbkdf.cpp
+++ b/tests/test_pbkdf.cpp
@@ -37,7 +37,7 @@ std::string pbkdf_test(const std::string& algo,
 
 size_t test_pbkdf()
    {
-   std::ifstream vec("checks/pbkdf.vec");
+   std::ifstream vec(CHECKS_DIR "/pbkdf.vec");
 
    return run_tests(vec, "PBKDF", "Output", true,
              [](std::map<std::string, std::string> m)
diff --git a/checks/test_pubkey.cpp b/tests/test_pubkey.cpp
index d374703f1..0dccdf060 100644
--- a/checks/test_pubkey.cpp
+++ b/tests/test_pubkey.cpp
@@ -804,7 +804,7 @@ size_t test_pk_keygen()
 size_t test_pubkey()
    {
    AutoSeeded_RNG rng;
-   const std::string filename = "checks/pk_valid.dat";
+   const std::string filename = CHECKS_DIR "/pk_valid.dat";
    std::ifstream test_data(filename.c_str());
 
    if(!test_data)
diff --git a/checks/test_rng.cpp b/tests/test_rng.cpp
index 8edfb3900..99b2fbf8f 100644
--- a/checks/test_rng.cpp
+++ b/tests/test_rng.cpp
@@ -53,7 +53,7 @@ bool x931_test(const std::string& algo,
 
 size_t test_rngs()
    {
-   std::ifstream vec("checks/x931.vec");
+   std::ifstream vec(CHECKS_DIR "/x931.vec");
 
    return run_tests_bb(vec, "RNG", "Out", true,
              [](std::map<std::string, std::string> m) -> bool
diff --git a/checks/test_rng.h b/tests/test_rng.h
index b3da5f08a..b3da5f08a 100644
--- a/checks/test_rng.h
+++ b/tests/test_rng.h
diff --git a/checks/test_stream.cpp b/tests/test_stream.cpp
index d5533a0dc..9846fb521 100644
--- a/checks/test_stream.cpp
+++ b/tests/test_stream.cpp
@@ -61,7 +61,7 @@ bool stream_test(const std::string& algo,
 
 size_t test_stream()
    {
-   std::ifstream vec("checks/stream.vec");
+   std::ifstream vec(CHECKS_DIR "/stream.vec");
 
    return run_tests_bb(vec, "StreamCipher", "Out", true,
              [](std::map<std::string, std::string> m) -> bool
diff --git a/checks/test_tls.cpp b/tests/test_tls.cpp
index 9958ed3b7..9958ed3b7 100644
--- a/checks/test_tls.cpp
+++ b/tests/test_tls.cpp
diff --git a/checks/test_transform.cpp b/tests/test_transform.cpp
index 2c491bd89..dc54d1761 100644
--- a/checks/test_transform.cpp
+++ b/tests/test_transform.cpp
@@ -37,7 +37,7 @@ secure_vector<byte> transform_test(const std::string& algo,
 
 size_t test_transform()
    {
-   std::ifstream vec("checks/transform.vec");
+   std::ifstream vec(CHECKS_DIR "/transform.vec");
 
    return run_tests(vec, "Transform", "Output", true,
              [](std::map<std::string, std::string> m)
diff --git a/checks/test_x509.cpp b/tests/test_x509.cpp
index d5f8dfc7b..d5f8dfc7b 100644
--- a/checks/test_x509.cpp
+++ b/tests/test_x509.cpp
diff --git a/checks/tests.cpp b/tests/tests.cpp
index c25e73443..c25e73443 100644
--- a/checks/tests.cpp
+++ b/tests/tests.cpp
diff --git a/checks/tests.h b/tests/tests.h
index ae842f8a0..0eb6e3aab 100644
--- a/checks/tests.h
+++ b/tests/tests.h
@@ -28,6 +28,8 @@ void test_report(const std::string& name, size_t ran, size_t failed);
 
 #define TEST(expr, msg) do { if(!(expr)) { ++fails; std::cout << msg; } while(0)
 
+#define CHECKS_DIR "tests/"
+
 size_t run_all_tests();
 
 // Tests using reader framework above
diff --git a/checks/timer.cpp b/tests/timer.cpp
index 9f3d34607..9f3d34607 100644
--- a/checks/timer.cpp
+++ b/tests/timer.cpp
diff --git a/checks/timer.h b/tests/timer.h
index 48d6b6805..48d6b6805 100644
--- a/checks/timer.h
+++ b/tests/timer.h
diff --git a/checks/transform.vec b/tests/transform.vec
index e69de29bb..e69de29bb 100644
--- a/checks/transform.vec
+++ b/tests/transform.vec
diff --git a/checks/x931.vec b/tests/x931.vec
index abdbc0708..abdbc0708 100644
--- a/checks/x931.vec
+++ b/tests/x931.vec