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

1464 files changed, 401 insertions, 539 deletions

diff --git a/configure.py b/configure.py
index 59f4b98f1..e879b526b 100755
--- a/configure.py
+++ b/configure.py
@@ -114,18 +114,11 @@ class BuildConfigurationInformation(object):
             self.version_vc_rev = get_vc_revision()
 
         self.build_dir = os.path.join(options.with_build_dir, 'build')
-
         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')
-
-        self.boost_python = options.boost_python
-
         self.doc_output_dir = os.path.join(self.build_dir, 'docs')
 
-        self.pyobject_dir = os.path.join(self.build_dir, 'python')
-
         self.include_dir = os.path.join(self.build_dir, 'include')
         self.botan_include_dir = os.path.join(self.include_dir, 'botan')
         self.internal_include_dir = os.path.join(self.botan_include_dir, 'internal')
@@ -142,11 +135,18 @@ class BuildConfigurationInformation(object):
 
         self.public_headers = sorted(flatten([m.public_headers() for m in modules]))
 
-        tests_dir = os.path.join(options.base_dir, 'tests')
+        self.tests_dir = os.path.join(options.base_dir, 'src/')
+        def find_sources_in(srcdir):
+            for (dirpath, dirnames, filenames) in os.walk(srcdir):
+                for filename in filenames:
+                    if filename.endswith('.cpp'):
+                        yield os.path.join(dirpath, filename)
 
-        self.test_sources = sorted(
-            [os.path.join(tests_dir, file) for file in os.listdir(tests_dir)
-             if file.endswith('.cpp')])
+        self.test_sources = list(find_sources_in(self.tests_dir))
+
+        self.boost_python = options.boost_python
+        self.python_dir = os.path.join(options.lib_dir, 'wrap', 'python')
+        self.pyobject_dir = os.path.join(self.build_dir, 'python')
 
         self.python_sources = sorted(
             [os.path.join(self.python_dir, file)
@@ -1020,7 +1020,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
         for src in sources:
             (dir,file) = os.path.split(os.path.normpath(src))
 
-            if dir.startswith('src'):
+            if dir.startswith('lib/'):
                 parts = dir.split(os.sep)[1:]
 
                 # Handle src/X/X.cpp -> X.o
@@ -1371,7 +1371,7 @@ def load_info_files(options):
 
     modules = dict([(mod.basename, mod) for mod in
                     [ModuleInfo(info) for info in
-                     find_files_named('info.txt', options.src_dir)]])
+                     find_files_named('info.txt', options.lib_dir)]])
 
     def list_files_in_build_data(subdir):
         for (dirpath, dirnames, filenames) in \
@@ -1740,6 +1740,7 @@ def main(argv = None):
 
     options.base_dir = os.path.dirname(argv[0])
     options.src_dir = os.path.join(options.base_dir, 'src')
+    options.lib_dir = os.path.join(options.base_dir, 'lib')
 
     options.build_data = os.path.join(options.src_dir, 'build-data')
     options.makefile_dir = os.path.join(options.build_data, 'makefile')
diff --git a/src/algo_base/algo_base.h b/lib/algo_base/algo_base.h
index f757a9a83..f757a9a83 100644
--- a/src/algo_base/algo_base.h
+++ b/lib/algo_base/algo_base.h
diff --git a/src/algo_base/buf_comp.h b/lib/algo_base/buf_comp.h
index f25af3b92..f25af3b92 100644
--- a/src/algo_base/buf_comp.h
+++ b/lib/algo_base/buf_comp.h
diff --git a/src/algo_base/info.txt b/lib/algo_base/info.txt
index a2c509f2c..a2c509f2c 100644
--- a/src/algo_base/info.txt
+++ b/lib/algo_base/info.txt
diff --git a/src/algo_base/key_spec.h b/lib/algo_base/key_spec.h
index 15881c1a6..15881c1a6 100644
--- a/src/algo_base/key_spec.h
+++ b/lib/algo_base/key_spec.h
diff --git a/src/algo_base/scan_name.cpp b/lib/algo_base/scan_name.cpp
index 84a5e24b4..84a5e24b4 100644
--- a/src/algo_base/scan_name.cpp
+++ b/lib/algo_base/scan_name.cpp
diff --git a/src/algo_base/scan_name.h b/lib/algo_base/scan_name.h
index f4c4b46e7..f4c4b46e7 100644
--- a/src/algo_base/scan_name.h
+++ b/lib/algo_base/scan_name.h
diff --git a/src/algo_base/sym_algo.h b/lib/algo_base/sym_algo.h
index c937d08ff..c937d08ff 100644
--- a/src/algo_base/sym_algo.h
+++ b/lib/algo_base/sym_algo.h
diff --git a/src/algo_base/symkey.cpp b/lib/algo_base/symkey.cpp
index 52b216361..52b216361 100644
--- a/src/algo_base/symkey.cpp
+++ b/lib/algo_base/symkey.cpp
diff --git a/src/algo_base/symkey.h b/lib/algo_base/symkey.h
index b47da8a69..b47da8a69 100644
--- a/src/algo_base/symkey.h
+++ b/lib/algo_base/symkey.h
diff --git a/src/algo_base/transform.h b/lib/algo_base/transform.h
index 2eec9d85b..2eec9d85b 100644
--- a/src/algo_base/transform.h
+++ b/lib/algo_base/transform.h
diff --git a/src/algo_factory/algo_cache.h b/lib/algo_factory/algo_cache.h
index 3bd9f0031..3bd9f0031 100644
--- a/src/algo_factory/algo_cache.h
+++ b/lib/algo_factory/algo_cache.h
diff --git a/src/algo_factory/algo_factory.cpp b/lib/algo_factory/algo_factory.cpp
index 1683648bd..1683648bd 100644
--- a/src/algo_factory/algo_factory.cpp
+++ b/lib/algo_factory/algo_factory.cpp
diff --git a/src/algo_factory/algo_factory.h b/lib/algo_factory/algo_factory.h
index 201982766..201982766 100644
--- a/src/algo_factory/algo_factory.h
+++ b/lib/algo_factory/algo_factory.h
diff --git a/src/algo_factory/info.txt b/lib/algo_factory/info.txt
index 837ced1d0..837ced1d0 100644
--- a/src/algo_factory/info.txt
+++ b/lib/algo_factory/info.txt
diff --git a/src/algo_factory/prov_weight.cpp b/lib/algo_factory/prov_weight.cpp
index fca791333..fca791333 100644
--- a/src/algo_factory/prov_weight.cpp
+++ b/lib/algo_factory/prov_weight.cpp
diff --git a/src/alloc/info.txt b/lib/alloc/info.txt
index 0ab7fa768..0ab7fa768 100644
--- a/src/alloc/info.txt
+++ b/lib/alloc/info.txt
diff --git a/src/alloc/locking_allocator/info.txt b/lib/alloc/locking_allocator/info.txt
index 09b59406c..09b59406c 100644
--- a/src/alloc/locking_allocator/info.txt
+++ b/lib/alloc/locking_allocator/info.txt
diff --git a/src/alloc/locking_allocator/locking_allocator.cpp b/lib/alloc/locking_allocator/locking_allocator.cpp
index 13effbb09..13effbb09 100644
--- a/src/alloc/locking_allocator/locking_allocator.cpp
+++ b/lib/alloc/locking_allocator/locking_allocator.cpp
diff --git a/src/alloc/locking_allocator/locking_allocator.h b/lib/alloc/locking_allocator/locking_allocator.h
index 3bebea5f2..3bebea5f2 100644
--- a/src/alloc/locking_allocator/locking_allocator.h
+++ b/lib/alloc/locking_allocator/locking_allocator.h
diff --git a/src/alloc/secmem.h b/lib/alloc/secmem.h
index 2f4d65f33..2f4d65f33 100644
--- a/src/alloc/secmem.h
+++ b/lib/alloc/secmem.h
diff --git a/src/asn1/alg_id.cpp b/lib/asn1/alg_id.cpp
index bb8dac80a..bb8dac80a 100644
--- a/src/asn1/alg_id.cpp
+++ b/lib/asn1/alg_id.cpp
diff --git a/src/asn1/alg_id.h b/lib/asn1/alg_id.h
index d8b40e700..d8b40e700 100644
--- a/src/asn1/alg_id.h
+++ b/lib/asn1/alg_id.h
diff --git a/src/asn1/asn1_alt_name.cpp b/lib/asn1/asn1_alt_name.cpp
index 2e7116bac..2e7116bac 100644
--- a/src/asn1/asn1_alt_name.cpp
+++ b/lib/asn1/asn1_alt_name.cpp
diff --git a/src/asn1/asn1_alt_name.h b/lib/asn1/asn1_alt_name.h
index f2c83ed2c..f2c83ed2c 100644
--- a/src/asn1/asn1_alt_name.h
+++ b/lib/asn1/asn1_alt_name.h
diff --git a/src/asn1/asn1_attribute.cpp b/lib/asn1/asn1_attribute.cpp
index dff52bef9..dff52bef9 100644
--- a/src/asn1/asn1_attribute.cpp
+++ b/lib/asn1/asn1_attribute.cpp
diff --git a/src/asn1/asn1_attribute.h b/lib/asn1/asn1_attribute.h
index 877135803..877135803 100644
--- a/src/asn1/asn1_attribute.h
+++ b/lib/asn1/asn1_attribute.h
diff --git a/src/asn1/asn1_obj.cpp b/lib/asn1/asn1_obj.cpp
index 898e91614..898e91614 100644
--- a/src/asn1/asn1_obj.cpp
+++ b/lib/asn1/asn1_obj.cpp
diff --git a/src/asn1/asn1_obj.h b/lib/asn1/asn1_obj.h
index 564f4ecdb..564f4ecdb 100644
--- a/src/asn1/asn1_obj.h
+++ b/lib/asn1/asn1_obj.h
diff --git a/src/asn1/asn1_oid.cpp b/lib/asn1/asn1_oid.cpp
index 964315080..964315080 100644
--- a/src/asn1/asn1_oid.cpp
+++ b/lib/asn1/asn1_oid.cpp
diff --git a/src/asn1/asn1_oid.h b/lib/asn1/asn1_oid.h
index a0b1edeba..a0b1edeba 100644
--- a/src/asn1/asn1_oid.h
+++ b/lib/asn1/asn1_oid.h
diff --git a/src/asn1/asn1_str.cpp b/lib/asn1/asn1_str.cpp
index 44db189f9..44db189f9 100644
--- a/src/asn1/asn1_str.cpp
+++ b/lib/asn1/asn1_str.cpp
diff --git a/src/asn1/asn1_str.h b/lib/asn1/asn1_str.h
index 42f1ef5ae..42f1ef5ae 100644
--- a/src/asn1/asn1_str.h
+++ b/lib/asn1/asn1_str.h
diff --git a/src/asn1/asn1_time.cpp b/lib/asn1/asn1_time.cpp
index 32f214e53..32f214e53 100644
--- a/src/asn1/asn1_time.cpp
+++ b/lib/asn1/asn1_time.cpp
diff --git a/src/asn1/asn1_time.h b/lib/asn1/asn1_time.h
index 95baacd86..95baacd86 100644
--- a/src/asn1/asn1_time.h
+++ b/lib/asn1/asn1_time.h
diff --git a/src/asn1/ber_dec.cpp b/lib/asn1/ber_dec.cpp
index 81b2e34f6..81b2e34f6 100644
--- a/src/asn1/ber_dec.cpp
+++ b/lib/asn1/ber_dec.cpp
diff --git a/src/asn1/ber_dec.h b/lib/asn1/ber_dec.h
index ebfa91c85..ebfa91c85 100644
--- a/src/asn1/ber_dec.h
+++ b/lib/asn1/ber_dec.h
diff --git a/src/asn1/der_enc.cpp b/lib/asn1/der_enc.cpp
index c1e5fd45c..c1e5fd45c 100644
--- a/src/asn1/der_enc.cpp
+++ b/lib/asn1/der_enc.cpp
diff --git a/src/asn1/der_enc.h b/lib/asn1/der_enc.h
index 61efb27b1..61efb27b1 100644
--- a/src/asn1/der_enc.h
+++ b/lib/asn1/der_enc.h
diff --git a/src/asn1/info.txt b/lib/asn1/info.txt
index 19b75bc4b..19b75bc4b 100644
--- a/src/asn1/info.txt
+++ b/lib/asn1/info.txt
diff --git a/src/asn1/oid_lookup/default.cpp b/lib/asn1/oid_lookup/default.cpp
index 6904ec0ff..6904ec0ff 100644
--- a/src/asn1/oid_lookup/default.cpp
+++ b/lib/asn1/oid_lookup/default.cpp
diff --git a/src/asn1/oid_lookup/info.txt b/lib/asn1/oid_lookup/info.txt
index 57b51e7d8..57b51e7d8 100644
--- a/src/asn1/oid_lookup/info.txt
+++ b/lib/asn1/oid_lookup/info.txt
diff --git a/src/asn1/oid_lookup/oids.cpp b/lib/asn1/oid_lookup/oids.cpp
index 54944d1a2..54944d1a2 100644
--- a/src/asn1/oid_lookup/oids.cpp
+++ b/lib/asn1/oid_lookup/oids.cpp
diff --git a/src/asn1/oid_lookup/oids.h b/lib/asn1/oid_lookup/oids.h
index 27533202f..27533202f 100644
--- a/src/asn1/oid_lookup/oids.h
+++ b/lib/asn1/oid_lookup/oids.h
diff --git a/src/asn1/x509_dn.cpp b/lib/asn1/x509_dn.cpp
index 672e18f18..672e18f18 100644
--- a/src/asn1/x509_dn.cpp
+++ b/lib/asn1/x509_dn.cpp
diff --git a/src/asn1/x509_dn.h b/lib/asn1/x509_dn.h
index e37fe6627..e37fe6627 100644
--- a/src/asn1/x509_dn.h
+++ b/lib/asn1/x509_dn.h
diff --git a/src/benchmark/benchmark.cpp b/lib/benchmark/benchmark.cpp
index 396670168..396670168 100644
--- a/src/benchmark/benchmark.cpp
+++ b/lib/benchmark/benchmark.cpp
diff --git a/src/benchmark/benchmark.h b/lib/benchmark/benchmark.h
index 40784a767..40784a767 100644
--- a/src/benchmark/benchmark.h
+++ b/lib/benchmark/benchmark.h
diff --git a/src/benchmark/info.txt b/lib/benchmark/info.txt
index 264811d99..264811d99 100644
--- a/src/benchmark/info.txt
+++ b/lib/benchmark/info.txt
diff --git a/src/block/aes/aes.cpp b/lib/block/aes/aes.cpp
index f8d632c44..f8d632c44 100644
--- a/src/block/aes/aes.cpp
+++ b/lib/block/aes/aes.cpp
diff --git a/src/block/aes/aes.h b/lib/block/aes/aes.h
index 5ddd39b08..5ddd39b08 100644
--- a/src/block/aes/aes.h
+++ b/lib/block/aes/aes.h
diff --git a/src/block/aes/info.txt b/lib/block/aes/info.txt
index 09bd9a0ca..09bd9a0ca 100644
--- a/src/block/aes/info.txt
+++ b/lib/block/aes/info.txt
diff --git a/src/block/aes_ni/aes_ni.cpp b/lib/block/aes_ni/aes_ni.cpp
index c752d359c..c752d359c 100644
--- a/src/block/aes_ni/aes_ni.cpp
+++ b/lib/block/aes_ni/aes_ni.cpp
diff --git a/src/block/aes_ni/aes_ni.h b/lib/block/aes_ni/aes_ni.h
index aac6b0808..aac6b0808 100644
--- a/src/block/aes_ni/aes_ni.h
+++ b/lib/block/aes_ni/aes_ni.h
diff --git a/src/block/aes_ni/info.txt b/lib/block/aes_ni/info.txt
index 270b00d9d..270b00d9d 100644
--- a/src/block/aes_ni/info.txt
+++ b/lib/block/aes_ni/info.txt
diff --git a/src/block/aes_ssse3/aes_ssse3.cpp b/lib/block/aes_ssse3/aes_ssse3.cpp
index 476b004bb..476b004bb 100644
--- a/src/block/aes_ssse3/aes_ssse3.cpp
+++ b/lib/block/aes_ssse3/aes_ssse3.cpp
diff --git a/src/block/aes_ssse3/aes_ssse3.h b/lib/block/aes_ssse3/aes_ssse3.h
index 938abeae3..938abeae3 100644
--- a/src/block/aes_ssse3/aes_ssse3.h
+++ b/lib/block/aes_ssse3/aes_ssse3.h
diff --git a/src/block/aes_ssse3/info.txt b/lib/block/aes_ssse3/info.txt
index 4b1aec535..4b1aec535 100644
--- a/src/block/aes_ssse3/info.txt
+++ b/lib/block/aes_ssse3/info.txt
diff --git a/src/block/block_cipher.h b/lib/block/block_cipher.h
index 5cbd6bdae..5cbd6bdae 100644
--- a/src/block/block_cipher.h
+++ b/lib/block/block_cipher.h
diff --git a/src/block/blowfish/blfs_tab.cpp b/lib/block/blowfish/blfs_tab.cpp
index 070fa6c69..070fa6c69 100644
--- a/src/block/blowfish/blfs_tab.cpp
+++ b/lib/block/blowfish/blfs_tab.cpp
diff --git a/src/block/blowfish/blowfish.cpp b/lib/block/blowfish/blowfish.cpp
index e93359141..e93359141 100644
--- a/src/block/blowfish/blowfish.cpp
+++ b/lib/block/blowfish/blowfish.cpp
diff --git a/src/block/blowfish/blowfish.h b/lib/block/blowfish/blowfish.h
index cdf65f285..cdf65f285 100644
--- a/src/block/blowfish/blowfish.h
+++ b/lib/block/blowfish/blowfish.h
diff --git a/src/block/blowfish/info.txt b/lib/block/blowfish/info.txt
index 1a33140d3..1a33140d3 100644
--- a/src/block/blowfish/info.txt
+++ b/lib/block/blowfish/info.txt
diff --git a/src/block/camellia/camellia.cpp b/lib/block/camellia/camellia.cpp
index a5d70d736..a5d70d736 100644
--- a/src/block/camellia/camellia.cpp
+++ b/lib/block/camellia/camellia.cpp
diff --git a/src/block/camellia/camellia.h b/lib/block/camellia/camellia.h
index 09f420765..09f420765 100644
--- a/src/block/camellia/camellia.h
+++ b/lib/block/camellia/camellia.h
diff --git a/src/block/camellia/camellia_sbox.h b/lib/block/camellia/camellia_sbox.h
index 24c849a16..24c849a16 100644
--- a/src/block/camellia/camellia_sbox.h
+++ b/lib/block/camellia/camellia_sbox.h
diff --git a/src/block/camellia/info.txt b/lib/block/camellia/info.txt
index 2bcfe80d0..2bcfe80d0 100644
--- a/src/block/camellia/info.txt
+++ b/lib/block/camellia/info.txt
diff --git a/src/block/cascade/cascade.cpp b/lib/block/cascade/cascade.cpp
index f1b1a8f2c..f1b1a8f2c 100644
--- a/src/block/cascade/cascade.cpp
+++ b/lib/block/cascade/cascade.cpp
diff --git a/src/block/cascade/cascade.h b/lib/block/cascade/cascade.h
index 9b7d44fdf..9b7d44fdf 100644
--- a/src/block/cascade/cascade.h
+++ b/lib/block/cascade/cascade.h
diff --git a/src/block/cascade/info.txt b/lib/block/cascade/info.txt
index 445e49086..445e49086 100644
--- a/src/block/cascade/info.txt
+++ b/lib/block/cascade/info.txt
diff --git a/src/block/cast/cast128.cpp b/lib/block/cast/cast128.cpp
index 169b18f01..169b18f01 100644
--- a/src/block/cast/cast128.cpp
+++ b/lib/block/cast/cast128.cpp
diff --git a/src/block/cast/cast128.h b/lib/block/cast/cast128.h
index 233c1e478..233c1e478 100644
--- a/src/block/cast/cast128.h
+++ b/lib/block/cast/cast128.h
diff --git a/src/block/cast/cast256.cpp b/lib/block/cast/cast256.cpp
index 0c4dbb941..0c4dbb941 100644
--- a/src/block/cast/cast256.cpp
+++ b/lib/block/cast/cast256.cpp
diff --git a/src/block/cast/cast256.h b/lib/block/cast/cast256.h
index cd4572c4d..cd4572c4d 100644
--- a/src/block/cast/cast256.h
+++ b/lib/block/cast/cast256.h
diff --git a/src/block/cast/cast_sboxes.h b/lib/block/cast/cast_sboxes.h
index 95578c4a0..95578c4a0 100644
--- a/src/block/cast/cast_sboxes.h
+++ b/lib/block/cast/cast_sboxes.h
diff --git a/src/block/cast/info.txt b/lib/block/cast/info.txt
index be4cb7510..be4cb7510 100644
--- a/src/block/cast/info.txt
+++ b/lib/block/cast/info.txt
diff --git a/src/block/des/des.cpp b/lib/block/des/des.cpp
index a87b4d6bc..a87b4d6bc 100644
--- a/src/block/des/des.cpp
+++ b/lib/block/des/des.cpp
diff --git a/src/block/des/des.h b/lib/block/des/des.h
index 4f3811bcf..4f3811bcf 100644
--- a/src/block/des/des.h
+++ b/lib/block/des/des.h
diff --git a/src/block/des/des_tab.cpp b/lib/block/des/des_tab.cpp
index b46ca3063..b46ca3063 100644
--- a/src/block/des/des_tab.cpp
+++ b/lib/block/des/des_tab.cpp
diff --git a/src/block/des/desx.cpp b/lib/block/des/desx.cpp
index 879e73ee9..879e73ee9 100644
--- a/src/block/des/desx.cpp
+++ b/lib/block/des/desx.cpp
diff --git a/src/block/des/desx.h b/lib/block/des/desx.h
index aeda3f3c4..aeda3f3c4 100644
--- a/src/block/des/desx.h
+++ b/lib/block/des/desx.h
diff --git a/src/block/des/info.txt b/lib/block/des/info.txt
index a5d50d56e..a5d50d56e 100644
--- a/src/block/des/info.txt
+++ b/lib/block/des/info.txt
diff --git a/src/block/gost_28147/gost_28147.cpp b/lib/block/gost_28147/gost_28147.cpp
index 09ca9a57e..09ca9a57e 100644
--- a/src/block/gost_28147/gost_28147.cpp
+++ b/lib/block/gost_28147/gost_28147.cpp
diff --git a/src/block/gost_28147/gost_28147.h b/lib/block/gost_28147/gost_28147.h
index 34b99197e..34b99197e 100644
--- a/src/block/gost_28147/gost_28147.h
+++ b/lib/block/gost_28147/gost_28147.h
diff --git a/src/block/gost_28147/info.txt b/lib/block/gost_28147/info.txt
index 396557248..396557248 100644
--- a/src/block/gost_28147/info.txt
+++ b/lib/block/gost_28147/info.txt
diff --git a/src/block/idea/idea.cpp b/lib/block/idea/idea.cpp
index 61a938c57..61a938c57 100644
--- a/src/block/idea/idea.cpp
+++ b/lib/block/idea/idea.cpp
diff --git a/src/block/idea/idea.h b/lib/block/idea/idea.h
index da5dc4cb6..da5dc4cb6 100644
--- a/src/block/idea/idea.h
+++ b/lib/block/idea/idea.h
diff --git a/src/block/idea/info.txt b/lib/block/idea/info.txt
index dbca72c8d..dbca72c8d 100644
--- a/src/block/idea/info.txt
+++ b/lib/block/idea/info.txt
diff --git a/src/block/idea_sse2/idea_sse2.cpp b/lib/block/idea_sse2/idea_sse2.cpp
index 70698560d..70698560d 100644
--- a/src/block/idea_sse2/idea_sse2.cpp
+++ b/lib/block/idea_sse2/idea_sse2.cpp
diff --git a/src/block/idea_sse2/idea_sse2.h b/lib/block/idea_sse2/idea_sse2.h
index 8e475568e..8e475568e 100644
--- a/src/block/idea_sse2/idea_sse2.h
+++ b/lib/block/idea_sse2/idea_sse2.h
diff --git a/src/block/idea_sse2/info.txt b/lib/block/idea_sse2/info.txt
index cfaaa374a..cfaaa374a 100644
--- a/src/block/idea_sse2/info.txt
+++ b/lib/block/idea_sse2/info.txt
diff --git a/src/block/info.txt b/lib/block/info.txt
index 70e2b2ca2..70e2b2ca2 100644
--- a/src/block/info.txt
+++ b/lib/block/info.txt
diff --git a/src/block/kasumi/info.txt b/lib/block/kasumi/info.txt
index 3dd2a3ac0..3dd2a3ac0 100644
--- a/src/block/kasumi/info.txt
+++ b/lib/block/kasumi/info.txt
diff --git a/src/block/kasumi/kasumi.cpp b/lib/block/kasumi/kasumi.cpp
index 69f146ebb..69f146ebb 100644
--- a/src/block/kasumi/kasumi.cpp
+++ b/lib/block/kasumi/kasumi.cpp
diff --git a/src/block/kasumi/kasumi.h b/lib/block/kasumi/kasumi.h
index b91a2eb77..b91a2eb77 100644
--- a/src/block/kasumi/kasumi.h
+++ b/lib/block/kasumi/kasumi.h
diff --git a/src/block/lion/info.txt b/lib/block/lion/info.txt
index c775ff428..c775ff428 100644
--- a/src/block/lion/info.txt
+++ b/lib/block/lion/info.txt
diff --git a/src/block/lion/lion.cpp b/lib/block/lion/lion.cpp
index bba48c89f..bba48c89f 100644
--- a/src/block/lion/lion.cpp
+++ b/lib/block/lion/lion.cpp
diff --git a/src/block/lion/lion.h b/lib/block/lion/lion.h
index 37aad19f2..37aad19f2 100644
--- a/src/block/lion/lion.h
+++ b/lib/block/lion/lion.h
diff --git a/src/block/lubyrack/info.txt b/lib/block/lubyrack/info.txt
index 1d83a0bac..1d83a0bac 100644
--- a/src/block/lubyrack/info.txt
+++ b/lib/block/lubyrack/info.txt
diff --git a/src/block/lubyrack/lubyrack.cpp b/lib/block/lubyrack/lubyrack.cpp
index 9be079003..9be079003 100644
--- a/src/block/lubyrack/lubyrack.cpp
+++ b/lib/block/lubyrack/lubyrack.cpp
diff --git a/src/block/lubyrack/lubyrack.h b/lib/block/lubyrack/lubyrack.h
index e28c60be7..e28c60be7 100644
--- a/src/block/lubyrack/lubyrack.h
+++ b/lib/block/lubyrack/lubyrack.h
diff --git a/src/block/mars/info.txt b/lib/block/mars/info.txt
index 0af3d7955..0af3d7955 100644
--- a/src/block/mars/info.txt
+++ b/lib/block/mars/info.txt
diff --git a/src/block/mars/mars.cpp b/lib/block/mars/mars.cpp
index ca4e6f5c7..ca4e6f5c7 100644
--- a/src/block/mars/mars.cpp
+++ b/lib/block/mars/mars.cpp
diff --git a/src/block/mars/mars.h b/lib/block/mars/mars.h
index 90f6480e6..90f6480e6 100644
--- a/src/block/mars/mars.h
+++ b/lib/block/mars/mars.h
diff --git a/src/block/misty1/info.txt b/lib/block/misty1/info.txt
index 568f13574..568f13574 100644
--- a/src/block/misty1/info.txt
+++ b/lib/block/misty1/info.txt
diff --git a/src/block/misty1/misty1.cpp b/lib/block/misty1/misty1.cpp
index 98f20eee8..98f20eee8 100644
--- a/src/block/misty1/misty1.cpp
+++ b/lib/block/misty1/misty1.cpp
diff --git a/src/block/misty1/misty1.h b/lib/block/misty1/misty1.h
index 40917b08b..40917b08b 100644
--- a/src/block/misty1/misty1.h
+++ b/lib/block/misty1/misty1.h
diff --git a/src/block/noekeon/info.txt b/lib/block/noekeon/info.txt
index 769d7150e..769d7150e 100644
--- a/src/block/noekeon/info.txt
+++ b/lib/block/noekeon/info.txt
diff --git a/src/block/noekeon/noekeon.cpp b/lib/block/noekeon/noekeon.cpp
index 53e67e5e6..53e67e5e6 100644
--- a/src/block/noekeon/noekeon.cpp
+++ b/lib/block/noekeon/noekeon.cpp
diff --git a/src/block/noekeon/noekeon.h b/lib/block/noekeon/noekeon.h
index 108b34cd6..108b34cd6 100644
--- a/src/block/noekeon/noekeon.h
+++ b/lib/block/noekeon/noekeon.h
diff --git a/src/block/noekeon_simd/info.txt b/lib/block/noekeon_simd/info.txt
index 78b9d5f12..78b9d5f12 100644
--- a/src/block/noekeon_simd/info.txt
+++ b/lib/block/noekeon_simd/info.txt
diff --git a/src/block/noekeon_simd/noekeon_simd.cpp b/lib/block/noekeon_simd/noekeon_simd.cpp
index 2a4c1fd74..2a4c1fd74 100644
--- a/src/block/noekeon_simd/noekeon_simd.cpp
+++ b/lib/block/noekeon_simd/noekeon_simd.cpp
diff --git a/src/block/noekeon_simd/noekeon_simd.h b/lib/block/noekeon_simd/noekeon_simd.h
index 5cc2d8b09..5cc2d8b09 100644
--- a/src/block/noekeon_simd/noekeon_simd.h
+++ b/lib/block/noekeon_simd/noekeon_simd.h
diff --git a/src/block/rc2/info.txt b/lib/block/rc2/info.txt
index fae09cf23..fae09cf23 100644
--- a/src/block/rc2/info.txt
+++ b/lib/block/rc2/info.txt
diff --git a/src/block/rc2/rc2.cpp b/lib/block/rc2/rc2.cpp
index d7c76a7a6..d7c76a7a6 100644
--- a/src/block/rc2/rc2.cpp
+++ b/lib/block/rc2/rc2.cpp
diff --git a/src/block/rc2/rc2.h b/lib/block/rc2/rc2.h
index ae41c9ce2..ae41c9ce2 100644
--- a/src/block/rc2/rc2.h
+++ b/lib/block/rc2/rc2.h
diff --git a/src/block/rc5/info.txt b/lib/block/rc5/info.txt
index 2c2c613ba..2c2c613ba 100644
--- a/src/block/rc5/info.txt
+++ b/lib/block/rc5/info.txt
diff --git a/src/block/rc5/rc5.cpp b/lib/block/rc5/rc5.cpp
index f370e6cfb..f370e6cfb 100644
--- a/src/block/rc5/rc5.cpp
+++ b/lib/block/rc5/rc5.cpp
diff --git a/src/block/rc5/rc5.h b/lib/block/rc5/rc5.h
index 9055974e5..9055974e5 100644
--- a/src/block/rc5/rc5.h
+++ b/lib/block/rc5/rc5.h
diff --git a/src/block/rc6/info.txt b/lib/block/rc6/info.txt
index e54379f65..e54379f65 100644
--- a/src/block/rc6/info.txt
+++ b/lib/block/rc6/info.txt
diff --git a/src/block/rc6/rc6.cpp b/lib/block/rc6/rc6.cpp
index 01255954d..01255954d 100644
--- a/src/block/rc6/rc6.cpp
+++ b/lib/block/rc6/rc6.cpp
diff --git a/src/block/rc6/rc6.h b/lib/block/rc6/rc6.h
index 4331c3e0f..4331c3e0f 100644
--- a/src/block/rc6/rc6.h
+++ b/lib/block/rc6/rc6.h
diff --git a/src/block/safer/info.txt b/lib/block/safer/info.txt
index ad7841dab..ad7841dab 100644
--- a/src/block/safer/info.txt
+++ b/lib/block/safer/info.txt
diff --git a/src/block/safer/safer_sk.cpp b/lib/block/safer/safer_sk.cpp
index 3e93ab8cf..3e93ab8cf 100644
--- a/src/block/safer/safer_sk.cpp
+++ b/lib/block/safer/safer_sk.cpp
diff --git a/src/block/safer/safer_sk.h b/lib/block/safer/safer_sk.h
index 043ecb456..043ecb456 100644
--- a/src/block/safer/safer_sk.h
+++ b/lib/block/safer/safer_sk.h
diff --git a/src/block/seed/info.txt b/lib/block/seed/info.txt
index 1c6b28792..1c6b28792 100644
--- a/src/block/seed/info.txt
+++ b/lib/block/seed/info.txt
diff --git a/src/block/seed/seed.cpp b/lib/block/seed/seed.cpp
index d133e4153..d133e4153 100644
--- a/src/block/seed/seed.cpp
+++ b/lib/block/seed/seed.cpp
diff --git a/src/block/seed/seed.h b/lib/block/seed/seed.h
index 25138a700..25138a700 100644
--- a/src/block/seed/seed.h
+++ b/lib/block/seed/seed.h
diff --git a/src/block/seed/seed_tab.cpp b/lib/block/seed/seed_tab.cpp
index 6ada36e52..6ada36e52 100644
--- a/src/block/seed/seed_tab.cpp
+++ b/lib/block/seed/seed_tab.cpp
diff --git a/src/block/serpent/info.txt b/lib/block/serpent/info.txt
index aa29c567f..aa29c567f 100644
--- a/src/block/serpent/info.txt
+++ b/lib/block/serpent/info.txt
diff --git a/src/block/serpent/serpent.cpp b/lib/block/serpent/serpent.cpp
index 7b75d6b84..7b75d6b84 100644
--- a/src/block/serpent/serpent.cpp
+++ b/lib/block/serpent/serpent.cpp
diff --git a/src/block/serpent/serpent.h b/lib/block/serpent/serpent.h
index dc539c9f3..dc539c9f3 100644
--- a/src/block/serpent/serpent.h
+++ b/lib/block/serpent/serpent.h
diff --git a/src/block/serpent/serpent_sbox.h b/lib/block/serpent/serpent_sbox.h
index fb396120e..fb396120e 100644
--- a/src/block/serpent/serpent_sbox.h
+++ b/lib/block/serpent/serpent_sbox.h
diff --git a/src/block/serpent_simd/info.txt b/lib/block/serpent_simd/info.txt
index f33548823..f33548823 100644
--- a/src/block/serpent_simd/info.txt
+++ b/lib/block/serpent_simd/info.txt
diff --git a/src/block/serpent_simd/serp_simd.cpp b/lib/block/serpent_simd/serp_simd.cpp
index bedf20122..bedf20122 100644
--- a/src/block/serpent_simd/serp_simd.cpp
+++ b/lib/block/serpent_simd/serp_simd.cpp
diff --git a/src/block/serpent_simd/serp_simd.h b/lib/block/serpent_simd/serp_simd.h
index b3c0b06c8..b3c0b06c8 100644
--- a/src/block/serpent_simd/serp_simd.h
+++ b/lib/block/serpent_simd/serp_simd.h
diff --git a/src/block/serpent_x86_32/info.txt b/lib/block/serpent_x86_32/info.txt
index 370213e87..370213e87 100644
--- a/src/block/serpent_x86_32/info.txt
+++ b/lib/block/serpent_x86_32/info.txt
diff --git a/src/block/serpent_x86_32/serp_x86_32.cpp b/lib/block/serpent_x86_32/serp_x86_32.cpp
index afff5835c..afff5835c 100644
--- a/src/block/serpent_x86_32/serp_x86_32.cpp
+++ b/lib/block/serpent_x86_32/serp_x86_32.cpp
diff --git a/src/block/serpent_x86_32/serp_x86_32.h b/lib/block/serpent_x86_32/serp_x86_32.h
index f6c4d564a..f6c4d564a 100644
--- a/src/block/serpent_x86_32/serp_x86_32.h
+++ b/lib/block/serpent_x86_32/serp_x86_32.h
diff --git a/src/block/serpent_x86_32/serp_x86_32_imp.S b/lib/block/serpent_x86_32/serp_x86_32_imp.S
index e2549a099..e2549a099 100644
--- a/src/block/serpent_x86_32/serp_x86_32_imp.S
+++ b/lib/block/serpent_x86_32/serp_x86_32_imp.S
diff --git a/src/block/skipjack/info.txt b/lib/block/skipjack/info.txt
index fb2bf70a5..fb2bf70a5 100644
--- a/src/block/skipjack/info.txt
+++ b/lib/block/skipjack/info.txt
diff --git a/src/block/skipjack/skipjack.cpp b/lib/block/skipjack/skipjack.cpp
index be4024ad4..be4024ad4 100644
--- a/src/block/skipjack/skipjack.cpp
+++ b/lib/block/skipjack/skipjack.cpp
diff --git a/src/block/skipjack/skipjack.h b/lib/block/skipjack/skipjack.h
index 60a55c8a5..60a55c8a5 100644
--- a/src/block/skipjack/skipjack.h
+++ b/lib/block/skipjack/skipjack.h
diff --git a/src/block/square/info.txt b/lib/block/square/info.txt
index 1335b35b2..1335b35b2 100644
--- a/src/block/square/info.txt
+++ b/lib/block/square/info.txt
diff --git a/src/block/square/sqr_tab.cpp b/lib/block/square/sqr_tab.cpp
index 331bf3ea1..331bf3ea1 100644
--- a/src/block/square/sqr_tab.cpp
+++ b/lib/block/square/sqr_tab.cpp
diff --git a/src/block/square/square.cpp b/lib/block/square/square.cpp
index 544f809fc..544f809fc 100644
--- a/src/block/square/square.cpp
+++ b/lib/block/square/square.cpp
diff --git a/src/block/square/square.h b/lib/block/square/square.h
index 618dbf6d9..618dbf6d9 100644
--- a/src/block/square/square.h
+++ b/lib/block/square/square.h
diff --git a/src/block/tea/info.txt b/lib/block/tea/info.txt
index 14edfdb03..14edfdb03 100644
--- a/src/block/tea/info.txt
+++ b/lib/block/tea/info.txt
diff --git a/src/block/tea/tea.cpp b/lib/block/tea/tea.cpp
index 2accab700..2accab700 100644
--- a/src/block/tea/tea.cpp
+++ b/lib/block/tea/tea.cpp
diff --git a/src/block/tea/tea.h b/lib/block/tea/tea.h
index 0d203975e..0d203975e 100644
--- a/src/block/tea/tea.h
+++ b/lib/block/tea/tea.h
diff --git a/src/block/threefish/info.txt b/lib/block/threefish/info.txt
index 15843cdd3..15843cdd3 100644
--- a/src/block/threefish/info.txt
+++ b/lib/block/threefish/info.txt
diff --git a/src/block/threefish/threefish.cpp b/lib/block/threefish/threefish.cpp
index 587a76a12..587a76a12 100644
--- a/src/block/threefish/threefish.cpp
+++ b/lib/block/threefish/threefish.cpp
diff --git a/src/block/threefish/threefish.h b/lib/block/threefish/threefish.h
index 327e54843..327e54843 100644
--- a/src/block/threefish/threefish.h
+++ b/lib/block/threefish/threefish.h
diff --git a/src/block/threefish_avx2/info.txt b/lib/block/threefish_avx2/info.txt
index 3f62629b9..3f62629b9 100644
--- a/src/block/threefish_avx2/info.txt
+++ b/lib/block/threefish_avx2/info.txt
diff --git a/src/block/threefish_avx2/threefish_avx2.cpp b/lib/block/threefish_avx2/threefish_avx2.cpp
index 9fad9bdcc..9fad9bdcc 100644
--- a/src/block/threefish_avx2/threefish_avx2.cpp
+++ b/lib/block/threefish_avx2/threefish_avx2.cpp
diff --git a/src/block/threefish_avx2/threefish_avx2.h b/lib/block/threefish_avx2/threefish_avx2.h
index ed0da00d6..ed0da00d6 100644
--- a/src/block/threefish_avx2/threefish_avx2.h
+++ b/lib/block/threefish_avx2/threefish_avx2.h
diff --git a/src/block/twofish/info.txt b/lib/block/twofish/info.txt
index c4351db59..c4351db59 100644
--- a/src/block/twofish/info.txt
+++ b/lib/block/twofish/info.txt
diff --git a/src/block/twofish/two_tab.cpp b/lib/block/twofish/two_tab.cpp
index 19ba58de6..19ba58de6 100644
--- a/src/block/twofish/two_tab.cpp
+++ b/lib/block/twofish/two_tab.cpp
diff --git a/src/block/twofish/twofish.cpp b/lib/block/twofish/twofish.cpp
index 4ea8a799e..4ea8a799e 100644
--- a/src/block/twofish/twofish.cpp
+++ b/lib/block/twofish/twofish.cpp
diff --git a/src/block/twofish/twofish.h b/lib/block/twofish/twofish.h
index 3d8e47498..3d8e47498 100644
--- a/src/block/twofish/twofish.h
+++ b/lib/block/twofish/twofish.h
diff --git a/src/block/xtea/info.txt b/lib/block/xtea/info.txt
index e2cc8ac34..e2cc8ac34 100644
--- a/src/block/xtea/info.txt
+++ b/lib/block/xtea/info.txt
diff --git a/src/block/xtea/xtea.cpp b/lib/block/xtea/xtea.cpp
index 165a6ea6a..165a6ea6a 100644
--- a/src/block/xtea/xtea.cpp
+++ b/lib/block/xtea/xtea.cpp
diff --git a/src/block/xtea/xtea.h b/lib/block/xtea/xtea.h
index 42acc35a5..42acc35a5 100644
--- a/src/block/xtea/xtea.h
+++ b/lib/block/xtea/xtea.h
diff --git a/src/block/xtea_simd/info.txt b/lib/block/xtea_simd/info.txt
index 7e7d001ac..7e7d001ac 100644
--- a/src/block/xtea_simd/info.txt
+++ b/lib/block/xtea_simd/info.txt
diff --git a/src/block/xtea_simd/xtea_simd.cpp b/lib/block/xtea_simd/xtea_simd.cpp
index d684eca5a..d684eca5a 100644
--- a/src/block/xtea_simd/xtea_simd.cpp
+++ b/lib/block/xtea_simd/xtea_simd.cpp
diff --git a/src/block/xtea_simd/xtea_simd.h b/lib/block/xtea_simd/xtea_simd.h
index ecfdf90a5..ecfdf90a5 100644
--- a/src/block/xtea_simd/xtea_simd.h
+++ b/lib/block/xtea_simd/xtea_simd.h
diff --git a/src/cert/cvc/asn1_eac_str.cpp b/lib/cert/cvc/asn1_eac_str.cpp
index 2084a9c03..2084a9c03 100644
--- a/src/cert/cvc/asn1_eac_str.cpp
+++ b/lib/cert/cvc/asn1_eac_str.cpp
diff --git a/src/cert/cvc/asn1_eac_tm.cpp b/lib/cert/cvc/asn1_eac_tm.cpp
index e40f555b3..e40f555b3 100644
--- a/src/cert/cvc/asn1_eac_tm.cpp
+++ b/lib/cert/cvc/asn1_eac_tm.cpp
diff --git a/src/cert/cvc/cvc_ado.cpp b/lib/cert/cvc/cvc_ado.cpp
index 54bc9facd..54bc9facd 100644
--- a/src/cert/cvc/cvc_ado.cpp
+++ b/lib/cert/cvc/cvc_ado.cpp
diff --git a/src/cert/cvc/cvc_ado.h b/lib/cert/cvc/cvc_ado.h
index 6f5b1d527..6f5b1d527 100644
--- a/src/cert/cvc/cvc_ado.h
+++ b/lib/cert/cvc/cvc_ado.h
diff --git a/src/cert/cvc/cvc_cert.cpp b/lib/cert/cvc/cvc_cert.cpp
index 3ab78b7d4..3ab78b7d4 100644
--- a/src/cert/cvc/cvc_cert.cpp
+++ b/lib/cert/cvc/cvc_cert.cpp
diff --git a/src/cert/cvc/cvc_cert.h b/lib/cert/cvc/cvc_cert.h
index 7c084379f..7c084379f 100644
--- a/src/cert/cvc/cvc_cert.h
+++ b/lib/cert/cvc/cvc_cert.h
diff --git a/src/cert/cvc/cvc_gen_cert.h b/lib/cert/cvc/cvc_gen_cert.h
index 7fa4eba29..7fa4eba29 100644
--- a/src/cert/cvc/cvc_gen_cert.h
+++ b/lib/cert/cvc/cvc_gen_cert.h
diff --git a/src/cert/cvc/cvc_req.cpp b/lib/cert/cvc/cvc_req.cpp
index 6c013f755..6c013f755 100644
--- a/src/cert/cvc/cvc_req.cpp
+++ b/lib/cert/cvc/cvc_req.cpp
diff --git a/src/cert/cvc/cvc_req.h b/lib/cert/cvc/cvc_req.h
index ac4e22453..ac4e22453 100644
--- a/src/cert/cvc/cvc_req.h
+++ b/lib/cert/cvc/cvc_req.h
diff --git a/src/cert/cvc/cvc_self.cpp b/lib/cert/cvc/cvc_self.cpp
index 46e4960e1..46e4960e1 100644
--- a/src/cert/cvc/cvc_self.cpp
+++ b/lib/cert/cvc/cvc_self.cpp
diff --git a/src/cert/cvc/cvc_self.h b/lib/cert/cvc/cvc_self.h
index 1e6bbe49a..1e6bbe49a 100644
--- a/src/cert/cvc/cvc_self.h
+++ b/lib/cert/cvc/cvc_self.h
diff --git a/src/cert/cvc/eac_asn_obj.h b/lib/cert/cvc/eac_asn_obj.h
index ab8536e45..ab8536e45 100644
--- a/src/cert/cvc/eac_asn_obj.h
+++ b/lib/cert/cvc/eac_asn_obj.h
diff --git a/src/cert/cvc/eac_obj.h b/lib/cert/cvc/eac_obj.h
index 42274446c..42274446c 100644
--- a/src/cert/cvc/eac_obj.h
+++ b/lib/cert/cvc/eac_obj.h
diff --git a/src/cert/cvc/ecdsa_sig.cpp b/lib/cert/cvc/ecdsa_sig.cpp
index 690244d50..690244d50 100644
--- a/src/cert/cvc/ecdsa_sig.cpp
+++ b/lib/cert/cvc/ecdsa_sig.cpp
diff --git a/src/cert/cvc/ecdsa_sig.h b/lib/cert/cvc/ecdsa_sig.h
index 1c3b506cb..1c3b506cb 100644
--- a/src/cert/cvc/ecdsa_sig.h
+++ b/lib/cert/cvc/ecdsa_sig.h
diff --git a/src/cert/cvc/info.txt b/lib/cert/cvc/info.txt
index 1d8e54dc4..1d8e54dc4 100644
--- a/src/cert/cvc/info.txt
+++ b/lib/cert/cvc/info.txt
diff --git a/src/cert/cvc/signed_obj.cpp b/lib/cert/cvc/signed_obj.cpp
index 20226fbe7..20226fbe7 100644
--- a/src/cert/cvc/signed_obj.cpp
+++ b/lib/cert/cvc/signed_obj.cpp
diff --git a/src/cert/cvc/signed_obj.h b/lib/cert/cvc/signed_obj.h
index ce2bd4dd7..ce2bd4dd7 100644
--- a/src/cert/cvc/signed_obj.h
+++ b/lib/cert/cvc/signed_obj.h
diff --git a/src/cert/x509/cert_status.h b/lib/cert/x509/cert_status.h
index b688cbcd7..0ff5ad5f0 100644
--- a/src/cert/x509/cert_status.h
+++ b/lib/cert/x509/cert_status.h
@@ -37,6 +37,7 @@ enum Certificate_Status_Code {
    CRL_FORMAT_ERROR,
    CRL_NOT_YET_VALID,
    CRL_HAS_EXPIRED,
+   CRL_NOT_FOUND,
 
    OCSP_CERT_NOT_LISTED,
    OCSP_NOT_YET_VALID,
diff --git a/src/cert/x509/certstor.cpp b/lib/cert/x509/certstor.cpp
index e8b3a0718..e8b3a0718 100644
--- a/src/cert/x509/certstor.cpp
+++ b/lib/cert/x509/certstor.cpp
diff --git a/src/cert/x509/certstor.h b/lib/cert/x509/certstor.h
index fc37d8327..fc37d8327 100644
--- a/src/cert/x509/certstor.h
+++ b/lib/cert/x509/certstor.h
diff --git a/src/cert/x509/crl_ent.cpp b/lib/cert/x509/crl_ent.cpp
index a5663e6bb..a5663e6bb 100644
--- a/src/cert/x509/crl_ent.cpp
+++ b/lib/cert/x509/crl_ent.cpp
diff --git a/src/cert/x509/crl_ent.h b/lib/cert/x509/crl_ent.h
index e68008b70..e68008b70 100644
--- a/src/cert/x509/crl_ent.h
+++ b/lib/cert/x509/crl_ent.h
diff --git a/src/cert/x509/info.txt b/lib/cert/x509/info.txt
index 83512857f..83512857f 100644
--- a/src/cert/x509/info.txt
+++ b/lib/cert/x509/info.txt
diff --git a/src/cert/x509/key_constraint.cpp b/lib/cert/x509/key_constraint.cpp
index 8a4b3deb3..8a4b3deb3 100644
--- a/src/cert/x509/key_constraint.cpp
+++ b/lib/cert/x509/key_constraint.cpp
diff --git a/src/cert/x509/key_constraint.h b/lib/cert/x509/key_constraint.h
index 2c9b3778b..2c9b3778b 100644
--- a/src/cert/x509/key_constraint.h
+++ b/lib/cert/x509/key_constraint.h
diff --git a/src/cert/x509/ocsp.cpp b/lib/cert/x509/ocsp.cpp
index a118a9c4e..a118a9c4e 100644
--- a/src/cert/x509/ocsp.cpp
+++ b/lib/cert/x509/ocsp.cpp
diff --git a/src/cert/x509/ocsp.h b/lib/cert/x509/ocsp.h
index b2a06b9a4..b2a06b9a4 100644
--- a/src/cert/x509/ocsp.h
+++ b/lib/cert/x509/ocsp.h
diff --git a/src/cert/x509/ocsp_types.cpp b/lib/cert/x509/ocsp_types.cpp
index be41499ee..be41499ee 100644
--- a/src/cert/x509/ocsp_types.cpp
+++ b/lib/cert/x509/ocsp_types.cpp
diff --git a/src/cert/x509/ocsp_types.h b/lib/cert/x509/ocsp_types.h
index a2983f10b..a2983f10b 100644
--- a/src/cert/x509/ocsp_types.h
+++ b/lib/cert/x509/ocsp_types.h
diff --git a/src/cert/x509/pkcs10.cpp b/lib/cert/x509/pkcs10.cpp
index c67f74142..c67f74142 100644
--- a/src/cert/x509/pkcs10.cpp
+++ b/lib/cert/x509/pkcs10.cpp
diff --git a/src/cert/x509/pkcs10.h b/lib/cert/x509/pkcs10.h
index b54425133..b54425133 100644
--- a/src/cert/x509/pkcs10.h
+++ b/lib/cert/x509/pkcs10.h
diff --git a/src/cert/x509/x509_ca.cpp b/lib/cert/x509/x509_ca.cpp
index 486d769ef..486d769ef 100644
--- a/src/cert/x509/x509_ca.cpp
+++ b/lib/cert/x509/x509_ca.cpp
diff --git a/src/cert/x509/x509_ca.h b/lib/cert/x509/x509_ca.h
index d37b02eaf..d37b02eaf 100644
--- a/src/cert/x509/x509_ca.h
+++ b/lib/cert/x509/x509_ca.h
diff --git a/src/cert/x509/x509_crl.cpp b/lib/cert/x509/x509_crl.cpp
index 29495a627..29495a627 100644
--- a/src/cert/x509/x509_crl.cpp
+++ b/lib/cert/x509/x509_crl.cpp
diff --git a/src/cert/x509/x509_crl.h b/lib/cert/x509/x509_crl.h
index 3e45df121..3e45df121 100644
--- a/src/cert/x509/x509_crl.h
+++ b/lib/cert/x509/x509_crl.h
diff --git a/src/cert/x509/x509_ext.cpp b/lib/cert/x509/x509_ext.cpp
index 7cef2969b..7cef2969b 100644
--- a/src/cert/x509/x509_ext.cpp
+++ b/lib/cert/x509/x509_ext.cpp
diff --git a/src/cert/x509/x509_ext.h b/lib/cert/x509/x509_ext.h
index 20be18a71..20be18a71 100644
--- a/src/cert/x509/x509_ext.h
+++ b/lib/cert/x509/x509_ext.h
diff --git a/src/cert/x509/x509_obj.cpp b/lib/cert/x509/x509_obj.cpp
index 37d814ce6..37d814ce6 100644
--- a/src/cert/x509/x509_obj.cpp
+++ b/lib/cert/x509/x509_obj.cpp
diff --git a/src/cert/x509/x509_obj.h b/lib/cert/x509/x509_obj.h
index 5905e1b37..5905e1b37 100644
--- a/src/cert/x509/x509_obj.h
+++ b/lib/cert/x509/x509_obj.h
diff --git a/src/cert/x509/x509cert.cpp b/lib/cert/x509/x509cert.cpp
index 2362cd0cf..2362cd0cf 100644
--- a/src/cert/x509/x509cert.cpp
+++ b/lib/cert/x509/x509cert.cpp
diff --git a/src/cert/x509/x509cert.h b/lib/cert/x509/x509cert.h
index bd341b6e0..bd341b6e0 100644
--- a/src/cert/x509/x509cert.h
+++ b/lib/cert/x509/x509cert.h
diff --git a/src/cert/x509/x509opt.cpp b/lib/cert/x509/x509opt.cpp
index 8a27fdbde..8a27fdbde 100644
--- a/src/cert/x509/x509opt.cpp
+++ b/lib/cert/x509/x509opt.cpp
diff --git a/src/cert/x509/x509path.cpp b/lib/cert/x509/x509path.cpp
index 28b4a6d99..8c32d8f94 100644
--- a/src/cert/x509/x509path.cpp
+++ b/lib/cert/x509/x509path.cpp
@@ -332,6 +332,8 @@ std::string Path_Validation_Result::status_string(Certificate_Status_Code code)
          return "CRL is not yet valid";
       case CRL_HAS_EXPIRED:
          return "CRL has expired";
+      case CRL_NOT_FOUND:
+         return "CRL not found";
       case CA_CERT_CANNOT_SIGN:
          return "CA certificate cannot sign";
       case CA_CERT_NOT_FOR_CERT_ISSUER:
diff --git a/src/cert/x509/x509path.h b/lib/cert/x509/x509path.h
index 2c3268529..d6a41a8f8 100644
--- a/src/cert/x509/x509path.h
+++ b/lib/cert/x509/x509path.h
@@ -75,6 +75,8 @@ class BOTAN_DLL Path_Validation_Restrictions
 class BOTAN_DLL Path_Validation_Result
    {
    public:
+      typedef Certificate_Status_Code Code;
+
       /**
       * @return the set of hash functions you are implicitly
       * trusting by trusting this result.
diff --git a/src/cert/x509/x509self.cpp b/lib/cert/x509/x509self.cpp
index c13772382..c13772382 100644
--- a/src/cert/x509/x509self.cpp
+++ b/lib/cert/x509/x509self.cpp
diff --git a/src/cert/x509/x509self.h b/lib/cert/x509/x509self.h
index eee4d10c6..eee4d10c6 100644
--- a/src/cert/x509/x509self.h
+++ b/lib/cert/x509/x509self.h
diff --git a/src/checksum/adler32/adler32.cpp b/lib/checksum/adler32/adler32.cpp
index 62589733f..62589733f 100644
--- a/src/checksum/adler32/adler32.cpp
+++ b/lib/checksum/adler32/adler32.cpp
diff --git a/src/checksum/adler32/adler32.h b/lib/checksum/adler32/adler32.h
index dc2872ca1..dc2872ca1 100644
--- a/src/checksum/adler32/adler32.h
+++ b/lib/checksum/adler32/adler32.h
diff --git a/src/checksum/adler32/info.txt b/lib/checksum/adler32/info.txt
index 6744fbee4..6744fbee4 100644
--- a/src/checksum/adler32/info.txt
+++ b/lib/checksum/adler32/info.txt
diff --git a/src/checksum/crc24/crc24.cpp b/lib/checksum/crc24/crc24.cpp
index d641047a2..d641047a2 100644
--- a/src/checksum/crc24/crc24.cpp
+++ b/lib/checksum/crc24/crc24.cpp
diff --git a/src/checksum/crc24/crc24.h b/lib/checksum/crc24/crc24.h
index b5faebcee..b5faebcee 100644
--- a/src/checksum/crc24/crc24.h
+++ b/lib/checksum/crc24/crc24.h
diff --git a/src/checksum/crc24/info.txt b/lib/checksum/crc24/info.txt
index f3762c66f..f3762c66f 100644
--- a/src/checksum/crc24/info.txt
+++ b/lib/checksum/crc24/info.txt
diff --git a/src/checksum/crc32/crc32.cpp b/lib/checksum/crc32/crc32.cpp
index 574e13bae..574e13bae 100644
--- a/src/checksum/crc32/crc32.cpp
+++ b/lib/checksum/crc32/crc32.cpp
diff --git a/src/checksum/crc32/crc32.h b/lib/checksum/crc32/crc32.h
index dec3d0449..dec3d0449 100644
--- a/src/checksum/crc32/crc32.h
+++ b/lib/checksum/crc32/crc32.h
diff --git a/src/checksum/crc32/info.txt b/lib/checksum/crc32/info.txt
index c7275ab43..c7275ab43 100644
--- a/src/checksum/crc32/info.txt
+++ b/lib/checksum/crc32/info.txt
diff --git a/src/codec/base64/base64.cpp b/lib/codec/base64/base64.cpp
index b66478d2b..b66478d2b 100644
--- a/src/codec/base64/base64.cpp
+++ b/lib/codec/base64/base64.cpp
diff --git a/src/codec/base64/base64.h b/lib/codec/base64/base64.h
index 9ea4143b7..9ea4143b7 100644
--- a/src/codec/base64/base64.h
+++ b/lib/codec/base64/base64.h
diff --git a/src/codec/base64/info.txt b/lib/codec/base64/info.txt
index cacae6b0c..cacae6b0c 100644
--- a/src/codec/base64/info.txt
+++ b/lib/codec/base64/info.txt
diff --git a/src/codec/hex/hex.cpp b/lib/codec/hex/hex.cpp
index 104125894..104125894 100644
--- a/src/codec/hex/hex.cpp
+++ b/lib/codec/hex/hex.cpp
diff --git a/src/codec/hex/hex.h b/lib/codec/hex/hex.h
index a64a6c8df..a64a6c8df 100644
--- a/src/codec/hex/hex.h
+++ b/lib/codec/hex/hex.h
diff --git a/src/codec/hex/info.txt b/lib/codec/hex/info.txt
index ead5beffd..ead5beffd 100644
--- a/src/codec/hex/info.txt
+++ b/lib/codec/hex/info.txt
diff --git a/src/codec/openpgp/info.txt b/lib/codec/openpgp/info.txt
index 72467ee72..72467ee72 100644
--- a/src/codec/openpgp/info.txt
+++ b/lib/codec/openpgp/info.txt
diff --git a/src/codec/openpgp/openpgp.cpp b/lib/codec/openpgp/openpgp.cpp
index 7bd811a2f..7bd811a2f 100644
--- a/src/codec/openpgp/openpgp.cpp
+++ b/lib/codec/openpgp/openpgp.cpp
diff --git a/src/codec/openpgp/openpgp.h b/lib/codec/openpgp/openpgp.h
index de56155f2..de56155f2 100644
--- a/src/codec/openpgp/openpgp.h
+++ b/lib/codec/openpgp/openpgp.h
diff --git a/src/codec/pem/info.txt b/lib/codec/pem/info.txt
index 74b90eef4..74b90eef4 100644
--- a/src/codec/pem/info.txt
+++ b/lib/codec/pem/info.txt
diff --git a/src/codec/pem/pem.cpp b/lib/codec/pem/pem.cpp
index 03ec33440..03ec33440 100644
--- a/src/codec/pem/pem.cpp
+++ b/lib/codec/pem/pem.cpp
diff --git a/src/codec/pem/pem.h b/lib/codec/pem/pem.h
index a0c6f74aa..a0c6f74aa 100644
--- a/src/codec/pem/pem.h
+++ b/lib/codec/pem/pem.h
diff --git a/src/constructs/aont/info.txt b/lib/constructs/aont/info.txt
index fb66d4129..fb66d4129 100644
--- a/src/constructs/aont/info.txt
+++ b/lib/constructs/aont/info.txt
diff --git a/src/constructs/aont/package.cpp b/lib/constructs/aont/package.cpp
index 1adee90e8..1adee90e8 100644
--- a/src/constructs/aont/package.cpp
+++ b/lib/constructs/aont/package.cpp
diff --git a/src/constructs/aont/package.h b/lib/constructs/aont/package.h
index 52d1c2190..52d1c2190 100644
--- a/src/constructs/aont/package.h
+++ b/lib/constructs/aont/package.h
diff --git a/src/constructs/cryptobox/cryptobox.cpp b/lib/constructs/cryptobox/cryptobox.cpp
index aa2369c6c..aa2369c6c 100644
--- a/src/constructs/cryptobox/cryptobox.cpp
+++ b/lib/constructs/cryptobox/cryptobox.cpp
diff --git a/src/constructs/cryptobox/cryptobox.h b/lib/constructs/cryptobox/cryptobox.h
index 7a363f72d..7a363f72d 100644
--- a/src/constructs/cryptobox/cryptobox.h
+++ b/lib/constructs/cryptobox/cryptobox.h
diff --git a/src/constructs/cryptobox/info.txt b/lib/constructs/cryptobox/info.txt
index b7bf6e4e8..b7bf6e4e8 100644
--- a/src/constructs/cryptobox/info.txt
+++ b/lib/constructs/cryptobox/info.txt
diff --git a/src/constructs/cryptobox_psk/cryptobox_psk.cpp b/lib/constructs/cryptobox_psk/cryptobox_psk.cpp
index f22e43b43..f22e43b43 100644
--- a/src/constructs/cryptobox_psk/cryptobox_psk.cpp
+++ b/lib/constructs/cryptobox_psk/cryptobox_psk.cpp
diff --git a/src/constructs/cryptobox_psk/cryptobox_psk.h b/lib/constructs/cryptobox_psk/cryptobox_psk.h
index 2f16ee461..2f16ee461 100644
--- a/src/constructs/cryptobox_psk/cryptobox_psk.h
+++ b/lib/constructs/cryptobox_psk/cryptobox_psk.h
diff --git a/src/constructs/cryptobox_psk/info.txt b/lib/constructs/cryptobox_psk/info.txt
index 03f7525f5..03f7525f5 100644
--- a/src/constructs/cryptobox_psk/info.txt
+++ b/lib/constructs/cryptobox_psk/info.txt
diff --git a/src/constructs/fpe_fe1/fpe_fe1.cpp b/lib/constructs/fpe_fe1/fpe_fe1.cpp
index b22d3a8df..b22d3a8df 100644
--- a/src/constructs/fpe_fe1/fpe_fe1.cpp
+++ b/lib/constructs/fpe_fe1/fpe_fe1.cpp
diff --git a/src/constructs/fpe_fe1/fpe_fe1.h b/lib/constructs/fpe_fe1/fpe_fe1.h
index 66e7f1cfa..66e7f1cfa 100644
--- a/src/constructs/fpe_fe1/fpe_fe1.h
+++ b/lib/constructs/fpe_fe1/fpe_fe1.h
diff --git a/src/constructs/fpe_fe1/info.txt b/lib/constructs/fpe_fe1/info.txt
index 42264e54e..42264e54e 100644
--- a/src/constructs/fpe_fe1/info.txt
+++ b/lib/constructs/fpe_fe1/info.txt
diff --git a/src/constructs/rfc3394/info.txt b/lib/constructs/rfc3394/info.txt
index 4b62b16e3..4b62b16e3 100644
--- a/src/constructs/rfc3394/info.txt
+++ b/lib/constructs/rfc3394/info.txt
diff --git a/src/constructs/rfc3394/rfc3394.cpp b/lib/constructs/rfc3394/rfc3394.cpp
index cfe95f40b..cfe95f40b 100644
--- a/src/constructs/rfc3394/rfc3394.cpp
+++ b/lib/constructs/rfc3394/rfc3394.cpp
diff --git a/src/constructs/rfc3394/rfc3394.h b/lib/constructs/rfc3394/rfc3394.h
index febd5207e..febd5207e 100644
--- a/src/constructs/rfc3394/rfc3394.h
+++ b/lib/constructs/rfc3394/rfc3394.h
diff --git a/src/constructs/srp6/info.txt b/lib/constructs/srp6/info.txt
index 1d1c4ba96..1d1c4ba96 100644
--- a/src/constructs/srp6/info.txt
+++ b/lib/constructs/srp6/info.txt
diff --git a/src/constructs/srp6/srp6.cpp b/lib/constructs/srp6/srp6.cpp
index 7bc879350..7bc879350 100644
--- a/src/constructs/srp6/srp6.cpp
+++ b/lib/constructs/srp6/srp6.cpp
diff --git a/src/constructs/srp6/srp6.h b/lib/constructs/srp6/srp6.h
index 6f3960be1..6f3960be1 100644
--- a/src/constructs/srp6/srp6.h
+++ b/lib/constructs/srp6/srp6.h
diff --git a/src/constructs/srp6/srp6_files.cpp b/lib/constructs/srp6/srp6_files.cpp
index 4df2986f3..4df2986f3 100644
--- a/src/constructs/srp6/srp6_files.cpp
+++ b/lib/constructs/srp6/srp6_files.cpp
diff --git a/src/constructs/srp6/srp6_files.h b/lib/constructs/srp6/srp6_files.h
index 4e0d3ff02..4e0d3ff02 100644
--- a/src/constructs/srp6/srp6_files.h
+++ b/lib/constructs/srp6/srp6_files.h
diff --git a/src/constructs/tss/info.txt b/lib/constructs/tss/info.txt
index 0c86bebbe..0c86bebbe 100644
--- a/src/constructs/tss/info.txt
+++ b/lib/constructs/tss/info.txt
diff --git a/src/constructs/tss/tss.cpp b/lib/constructs/tss/tss.cpp
index 2024b39ec..2024b39ec 100644
--- a/src/constructs/tss/tss.cpp
+++ b/lib/constructs/tss/tss.cpp
diff --git a/src/constructs/tss/tss.h b/lib/constructs/tss/tss.h
index 4664af317..4664af317 100644
--- a/src/constructs/tss/tss.h
+++ b/lib/constructs/tss/tss.h
diff --git a/src/credentials/credentials_manager.cpp b/lib/credentials/credentials_manager.cpp
index 1077edf61..1077edf61 100644
--- a/src/credentials/credentials_manager.cpp
+++ b/lib/credentials/credentials_manager.cpp
diff --git a/src/credentials/credentials_manager.h b/lib/credentials/credentials_manager.h
index 85db078e3..85db078e3 100644
--- a/src/credentials/credentials_manager.h
+++ b/lib/credentials/credentials_manager.h
diff --git a/src/credentials/info.txt b/lib/credentials/info.txt
index 303139c4c..303139c4c 100644
--- a/src/credentials/info.txt
+++ b/lib/credentials/info.txt
diff --git a/src/engine/aes_isa_eng/aes_isa_engine.cpp b/lib/engine/aes_isa_eng/aes_isa_engine.cpp
index 956a1ce38..956a1ce38 100644
--- a/src/engine/aes_isa_eng/aes_isa_engine.cpp
+++ b/lib/engine/aes_isa_eng/aes_isa_engine.cpp
diff --git a/src/engine/aes_isa_eng/aes_isa_engine.h b/lib/engine/aes_isa_eng/aes_isa_engine.h
index 3c4d3e936..3c4d3e936 100644
--- a/src/engine/aes_isa_eng/aes_isa_engine.h
+++ b/lib/engine/aes_isa_eng/aes_isa_engine.h
diff --git a/src/engine/aes_isa_eng/info.txt b/lib/engine/aes_isa_eng/info.txt
index 4284e75bd..4284e75bd 100644
--- a/src/engine/aes_isa_eng/info.txt
+++ b/lib/engine/aes_isa_eng/info.txt
diff --git a/src/engine/asm_engine/asm_engine.cpp b/lib/engine/asm_engine/asm_engine.cpp
index a43a3302d..a43a3302d 100644
--- a/src/engine/asm_engine/asm_engine.cpp
+++ b/lib/engine/asm_engine/asm_engine.cpp
diff --git a/src/engine/asm_engine/asm_engine.h b/lib/engine/asm_engine/asm_engine.h
index 40fe5342f..40fe5342f 100644
--- a/src/engine/asm_engine/asm_engine.h
+++ b/lib/engine/asm_engine/asm_engine.h
diff --git a/src/engine/asm_engine/info.txt b/lib/engine/asm_engine/info.txt
index 185656e3d..185656e3d 100644
--- a/src/engine/asm_engine/info.txt
+++ b/lib/engine/asm_engine/info.txt
diff --git a/src/engine/core_engine/core_engine.h b/lib/engine/core_engine/core_engine.h
index ca660d21b..ca660d21b 100644
--- a/src/engine/core_engine/core_engine.h
+++ b/lib/engine/core_engine/core_engine.h
diff --git a/src/engine/core_engine/core_modes.cpp b/lib/engine/core_engine/core_modes.cpp
index 6524d9c16..6524d9c16 100644
--- a/src/engine/core_engine/core_modes.cpp
+++ b/lib/engine/core_engine/core_modes.cpp
diff --git a/src/engine/core_engine/def_pk_ops.cpp b/lib/engine/core_engine/def_pk_ops.cpp
index e99945633..e99945633 100644
--- a/src/engine/core_engine/def_pk_ops.cpp
+++ b/lib/engine/core_engine/def_pk_ops.cpp
diff --git a/src/engine/core_engine/def_powm.cpp b/lib/engine/core_engine/def_powm.cpp
index 56a4b6844..56a4b6844 100644
--- a/src/engine/core_engine/def_powm.cpp
+++ b/lib/engine/core_engine/def_powm.cpp
diff --git a/src/engine/core_engine/info.txt b/lib/engine/core_engine/info.txt
index 44843e26a..44843e26a 100644
--- a/src/engine/core_engine/info.txt
+++ b/lib/engine/core_engine/info.txt
diff --git a/src/engine/core_engine/lookup_block.cpp b/lib/engine/core_engine/lookup_block.cpp
index 0a9c02311..0a9c02311 100644
--- a/src/engine/core_engine/lookup_block.cpp
+++ b/lib/engine/core_engine/lookup_block.cpp
diff --git a/src/engine/core_engine/lookup_hash.cpp b/lib/engine/core_engine/lookup_hash.cpp
index 7a9a0148d..7a9a0148d 100644
--- a/src/engine/core_engine/lookup_hash.cpp
+++ b/lib/engine/core_engine/lookup_hash.cpp
diff --git a/src/engine/core_engine/lookup_mac.cpp b/lib/engine/core_engine/lookup_mac.cpp
index 32275b559..32275b559 100644
--- a/src/engine/core_engine/lookup_mac.cpp
+++ b/lib/engine/core_engine/lookup_mac.cpp
diff --git a/src/engine/core_engine/lookup_pbkdf.cpp b/lib/engine/core_engine/lookup_pbkdf.cpp
index bfd2c8bc2..bfd2c8bc2 100644
--- a/src/engine/core_engine/lookup_pbkdf.cpp
+++ b/lib/engine/core_engine/lookup_pbkdf.cpp
diff --git a/src/engine/core_engine/lookup_stream.cpp b/lib/engine/core_engine/lookup_stream.cpp
index b26bbedcd..b26bbedcd 100644
--- a/src/engine/core_engine/lookup_stream.cpp
+++ b/lib/engine/core_engine/lookup_stream.cpp
diff --git a/src/engine/dyn_engine/dyn_engine.cpp b/lib/engine/dyn_engine/dyn_engine.cpp
index 078ec4b83..078ec4b83 100644
--- a/src/engine/dyn_engine/dyn_engine.cpp
+++ b/lib/engine/dyn_engine/dyn_engine.cpp
diff --git a/src/engine/dyn_engine/dyn_engine.h b/lib/engine/dyn_engine/dyn_engine.h
index 39e13ab36..39e13ab36 100644
--- a/src/engine/dyn_engine/dyn_engine.h
+++ b/lib/engine/dyn_engine/dyn_engine.h
diff --git a/src/engine/dyn_engine/info.txt b/lib/engine/dyn_engine/info.txt
index 54379f501..54379f501 100644
--- a/src/engine/dyn_engine/info.txt
+++ b/lib/engine/dyn_engine/info.txt
diff --git a/src/engine/engine.cpp b/lib/engine/engine.cpp
index a50f1e7b2..a50f1e7b2 100644
--- a/src/engine/engine.cpp
+++ b/lib/engine/engine.cpp
diff --git a/src/engine/engine.h b/lib/engine/engine.h
index a03a6e1ec..a03a6e1ec 100644
--- a/src/engine/engine.h
+++ b/lib/engine/engine.h
diff --git a/src/engine/gnump/gmp_mem.cpp b/lib/engine/gnump/gmp_mem.cpp
index b5a5a303e..b5a5a303e 100644
--- a/src/engine/gnump/gmp_mem.cpp
+++ b/lib/engine/gnump/gmp_mem.cpp
diff --git a/src/engine/gnump/gmp_powm.cpp b/lib/engine/gnump/gmp_powm.cpp
index 70c2b2f5e..70c2b2f5e 100644
--- a/src/engine/gnump/gmp_powm.cpp
+++ b/lib/engine/gnump/gmp_powm.cpp
diff --git a/src/engine/gnump/gmp_wrap.cpp b/lib/engine/gnump/gmp_wrap.cpp
index 974593d02..974593d02 100644
--- a/src/engine/gnump/gmp_wrap.cpp
+++ b/lib/engine/gnump/gmp_wrap.cpp
diff --git a/src/engine/gnump/gmp_wrap.h b/lib/engine/gnump/gmp_wrap.h
index 291d65a01..291d65a01 100644
--- a/src/engine/gnump/gmp_wrap.h
+++ b/lib/engine/gnump/gmp_wrap.h
diff --git a/src/engine/gnump/gnump_engine.h b/lib/engine/gnump/gnump_engine.h
index ccc723514..ccc723514 100644
--- a/src/engine/gnump/gnump_engine.h
+++ b/lib/engine/gnump/gnump_engine.h
diff --git a/src/engine/gnump/gnump_pk.cpp b/lib/engine/gnump/gnump_pk.cpp
index 29e172d47..29e172d47 100644
--- a/src/engine/gnump/gnump_pk.cpp
+++ b/lib/engine/gnump/gnump_pk.cpp
diff --git a/src/engine/gnump/info.txt b/lib/engine/gnump/info.txt
index ad03339e4..ad03339e4 100644
--- a/src/engine/gnump/info.txt
+++ b/lib/engine/gnump/info.txt
diff --git a/src/engine/info.txt b/lib/engine/info.txt
index 800a007a1..800a007a1 100644
--- a/src/engine/info.txt
+++ b/lib/engine/info.txt
diff --git a/src/engine/openssl/bn_powm.cpp b/lib/engine/openssl/bn_powm.cpp
index ac06fbe77..ac06fbe77 100644
--- a/src/engine/openssl/bn_powm.cpp
+++ b/lib/engine/openssl/bn_powm.cpp
diff --git a/src/engine/openssl/bn_wrap.cpp b/lib/engine/openssl/bn_wrap.cpp
index 0a7e42368..0a7e42368 100644
--- a/src/engine/openssl/bn_wrap.cpp
+++ b/lib/engine/openssl/bn_wrap.cpp
diff --git a/src/engine/openssl/bn_wrap.h b/lib/engine/openssl/bn_wrap.h
index 12bcec152..12bcec152 100644
--- a/src/engine/openssl/bn_wrap.h
+++ b/lib/engine/openssl/bn_wrap.h
diff --git a/src/engine/openssl/info.txt b/lib/engine/openssl/info.txt
index d500816d5..d500816d5 100644
--- a/src/engine/openssl/info.txt
+++ b/lib/engine/openssl/info.txt
diff --git a/src/engine/openssl/openssl_engine.h b/lib/engine/openssl/openssl_engine.h
index 90f315c00..90f315c00 100644
--- a/src/engine/openssl/openssl_engine.h
+++ b/lib/engine/openssl/openssl_engine.h
diff --git a/src/engine/openssl/ossl_arc4.cpp b/lib/engine/openssl/ossl_arc4.cpp
index 0eb404af1..0eb404af1 100644
--- a/src/engine/openssl/ossl_arc4.cpp
+++ b/lib/engine/openssl/ossl_arc4.cpp
diff --git a/src/engine/openssl/ossl_bc.cpp b/lib/engine/openssl/ossl_bc.cpp
index b3b509c36..b3b509c36 100644
--- a/src/engine/openssl/ossl_bc.cpp
+++ b/lib/engine/openssl/ossl_bc.cpp
diff --git a/src/engine/openssl/ossl_md.cpp b/lib/engine/openssl/ossl_md.cpp
index e09a68a8e..e09a68a8e 100644
--- a/src/engine/openssl/ossl_md.cpp
+++ b/lib/engine/openssl/ossl_md.cpp
diff --git a/src/engine/openssl/ossl_pk.cpp b/lib/engine/openssl/ossl_pk.cpp
index cbe03d7b3..cbe03d7b3 100644
--- a/src/engine/openssl/ossl_pk.cpp
+++ b/lib/engine/openssl/ossl_pk.cpp
diff --git a/src/engine/simd_engine/info.txt b/lib/engine/simd_engine/info.txt
index 2063c9dfe..2063c9dfe 100644
--- a/src/engine/simd_engine/info.txt
+++ b/lib/engine/simd_engine/info.txt
diff --git a/src/engine/simd_engine/simd_engine.cpp b/lib/engine/simd_engine/simd_engine.cpp
index 75463a4b1..75463a4b1 100644
--- a/src/engine/simd_engine/simd_engine.cpp
+++ b/lib/engine/simd_engine/simd_engine.cpp
diff --git a/src/engine/simd_engine/simd_engine.h b/lib/engine/simd_engine/simd_engine.h
index 66c8886f1..66c8886f1 100644
--- a/src/engine/simd_engine/simd_engine.h
+++ b/lib/engine/simd_engine/simd_engine.h
diff --git a/src/entropy/beos_stats/es_beos.cpp b/lib/entropy/beos_stats/es_beos.cpp
index e514eb121..e514eb121 100644
--- a/src/entropy/beos_stats/es_beos.cpp
+++ b/lib/entropy/beos_stats/es_beos.cpp
diff --git a/src/entropy/beos_stats/es_beos.h b/lib/entropy/beos_stats/es_beos.h
index 5ccb430a5..5ccb430a5 100644
--- a/src/entropy/beos_stats/es_beos.h
+++ b/lib/entropy/beos_stats/es_beos.h
diff --git a/src/entropy/beos_stats/info.txt b/lib/entropy/beos_stats/info.txt
index 9ae527f49..9ae527f49 100644
--- a/src/entropy/beos_stats/info.txt
+++ b/lib/entropy/beos_stats/info.txt
diff --git a/src/entropy/cryptoapi_rng/es_capi.cpp b/lib/entropy/cryptoapi_rng/es_capi.cpp
index a706b4d5c..a706b4d5c 100644
--- a/src/entropy/cryptoapi_rng/es_capi.cpp
+++ b/lib/entropy/cryptoapi_rng/es_capi.cpp
diff --git a/src/entropy/cryptoapi_rng/es_capi.h b/lib/entropy/cryptoapi_rng/es_capi.h
index d75101923..d75101923 100644
--- a/src/entropy/cryptoapi_rng/es_capi.h
+++ b/lib/entropy/cryptoapi_rng/es_capi.h
diff --git a/src/entropy/cryptoapi_rng/info.txt b/lib/entropy/cryptoapi_rng/info.txt
index d4ee13aea..d4ee13aea 100644
--- a/src/entropy/cryptoapi_rng/info.txt
+++ b/lib/entropy/cryptoapi_rng/info.txt
diff --git a/src/entropy/dev_random/dev_random.cpp b/lib/entropy/dev_random/dev_random.cpp
index 3f8df8749..3f8df8749 100644
--- a/src/entropy/dev_random/dev_random.cpp
+++ b/lib/entropy/dev_random/dev_random.cpp
diff --git a/src/entropy/dev_random/dev_random.h b/lib/entropy/dev_random/dev_random.h
index d74412b27..d74412b27 100644
--- a/src/entropy/dev_random/dev_random.h
+++ b/lib/entropy/dev_random/dev_random.h
diff --git a/src/entropy/dev_random/info.txt b/lib/entropy/dev_random/info.txt
index 98a6a7e61..98a6a7e61 100644
--- a/src/entropy/dev_random/info.txt
+++ b/lib/entropy/dev_random/info.txt
diff --git a/src/entropy/egd/es_egd.cpp b/lib/entropy/egd/es_egd.cpp
index d8dbecd44..d8dbecd44 100644
--- a/src/entropy/egd/es_egd.cpp
+++ b/lib/entropy/egd/es_egd.cpp
diff --git a/src/entropy/egd/es_egd.h b/lib/entropy/egd/es_egd.h
index 02c52b9a3..02c52b9a3 100644
--- a/src/entropy/egd/es_egd.h
+++ b/lib/entropy/egd/es_egd.h
diff --git a/src/entropy/egd/info.txt b/lib/entropy/egd/info.txt
index b93c4526d..b93c4526d 100644
--- a/src/entropy/egd/info.txt
+++ b/lib/entropy/egd/info.txt
diff --git a/src/entropy/entropy_src.h b/lib/entropy/entropy_src.h
index 552eca9de..552eca9de 100644
--- a/src/entropy/entropy_src.h
+++ b/lib/entropy/entropy_src.h
diff --git a/src/entropy/hres_timer/hres_timer.cpp b/lib/entropy/hres_timer/hres_timer.cpp
index 7295a119b..7295a119b 100644
--- a/src/entropy/hres_timer/hres_timer.cpp
+++ b/lib/entropy/hres_timer/hres_timer.cpp
diff --git a/src/entropy/hres_timer/hres_timer.h b/lib/entropy/hres_timer/hres_timer.h
index 8b95c8308..8b95c8308 100644
--- a/src/entropy/hres_timer/hres_timer.h
+++ b/lib/entropy/hres_timer/hres_timer.h
diff --git a/src/entropy/hres_timer/info.txt b/lib/entropy/hres_timer/info.txt
index dfe8fab0b..dfe8fab0b 100644
--- a/src/entropy/hres_timer/info.txt
+++ b/lib/entropy/hres_timer/info.txt
diff --git a/src/entropy/info.txt b/lib/entropy/info.txt
index d991577f7..d991577f7 100644
--- a/src/entropy/info.txt
+++ b/lib/entropy/info.txt
diff --git a/src/entropy/proc_walk/info.txt b/lib/entropy/proc_walk/info.txt
index 2a53a7ed8..2a53a7ed8 100644
--- a/src/entropy/proc_walk/info.txt
+++ b/lib/entropy/proc_walk/info.txt
diff --git a/src/entropy/proc_walk/proc_walk.cpp b/lib/entropy/proc_walk/proc_walk.cpp
index 050d9dcf7..050d9dcf7 100644
--- a/src/entropy/proc_walk/proc_walk.cpp
+++ b/lib/entropy/proc_walk/proc_walk.cpp
diff --git a/src/entropy/proc_walk/proc_walk.h b/lib/entropy/proc_walk/proc_walk.h
index 04c3b1bba..04c3b1bba 100644
--- a/src/entropy/proc_walk/proc_walk.h
+++ b/lib/entropy/proc_walk/proc_walk.h
diff --git a/src/entropy/rdrand/info.txt b/lib/entropy/rdrand/info.txt
index 546ab699a..546ab699a 100644
--- a/src/entropy/rdrand/info.txt
+++ b/lib/entropy/rdrand/info.txt
diff --git a/src/entropy/rdrand/rdrand.cpp b/lib/entropy/rdrand/rdrand.cpp
index 0dae697c8..0dae697c8 100644
--- a/src/entropy/rdrand/rdrand.cpp
+++ b/lib/entropy/rdrand/rdrand.cpp
diff --git a/src/entropy/rdrand/rdrand.h b/lib/entropy/rdrand/rdrand.h
index d7629d37f..d7629d37f 100644
--- a/src/entropy/rdrand/rdrand.h
+++ b/lib/entropy/rdrand/rdrand.h
diff --git a/src/entropy/unix_procs/info.txt b/lib/entropy/unix_procs/info.txt
index 755d2565d..755d2565d 100644
--- a/src/entropy/unix_procs/info.txt
+++ b/lib/entropy/unix_procs/info.txt
diff --git a/src/entropy/unix_procs/unix_proc_sources.cpp b/lib/entropy/unix_procs/unix_proc_sources.cpp
index 6cf185064..6cf185064 100644
--- a/src/entropy/unix_procs/unix_proc_sources.cpp
+++ b/lib/entropy/unix_procs/unix_proc_sources.cpp
diff --git a/src/entropy/unix_procs/unix_procs.cpp b/lib/entropy/unix_procs/unix_procs.cpp
index c36941f43..c36941f43 100644
--- a/src/entropy/unix_procs/unix_procs.cpp
+++ b/lib/entropy/unix_procs/unix_procs.cpp
diff --git a/src/entropy/unix_procs/unix_procs.h b/lib/entropy/unix_procs/unix_procs.h
index 7c1ae8c65..7c1ae8c65 100644
--- a/src/entropy/unix_procs/unix_procs.h
+++ b/lib/entropy/unix_procs/unix_procs.h
diff --git a/src/entropy/win32_stats/es_win32.cpp b/lib/entropy/win32_stats/es_win32.cpp
index fff11592d..fff11592d 100644
--- a/src/entropy/win32_stats/es_win32.cpp
+++ b/lib/entropy/win32_stats/es_win32.cpp
diff --git a/src/entropy/win32_stats/es_win32.h b/lib/entropy/win32_stats/es_win32.h
index 6c7c9ee09..6c7c9ee09 100644
--- a/src/entropy/win32_stats/es_win32.h
+++ b/lib/entropy/win32_stats/es_win32.h
diff --git a/src/entropy/win32_stats/info.txt b/lib/entropy/win32_stats/info.txt
index 48eb91faa..48eb91faa 100644
--- a/src/entropy/win32_stats/info.txt
+++ b/lib/entropy/win32_stats/info.txt
diff --git a/src/filters/aead_filt/aead_filt.h b/lib/filters/aead_filt/aead_filt.h
index 65f73d7d3..65f73d7d3 100644
--- a/src/filters/aead_filt/aead_filt.h
+++ b/lib/filters/aead_filt/aead_filt.h
diff --git a/src/filters/aead_filt/info.txt b/lib/filters/aead_filt/info.txt
index 891f2c167..891f2c167 100644
--- a/src/filters/aead_filt/info.txt
+++ b/lib/filters/aead_filt/info.txt
diff --git a/src/filters/algo_filt.cpp b/lib/filters/algo_filt.cpp
index dbc46c7e6..dbc46c7e6 100644
--- a/src/filters/algo_filt.cpp
+++ b/lib/filters/algo_filt.cpp
diff --git a/src/filters/basefilt.cpp b/lib/filters/basefilt.cpp
index eace9cfd5..eace9cfd5 100644
--- a/src/filters/basefilt.cpp
+++ b/lib/filters/basefilt.cpp
diff --git a/src/filters/basefilt.h b/lib/filters/basefilt.h
index be5cb7a26..be5cb7a26 100644
--- a/src/filters/basefilt.h
+++ b/lib/filters/basefilt.h
diff --git a/src/filters/buf_filt.cpp b/lib/filters/buf_filt.cpp
index ca3fa9a3c..ca3fa9a3c 100644
--- a/src/filters/buf_filt.cpp
+++ b/lib/filters/buf_filt.cpp
diff --git a/src/filters/buf_filt.h b/lib/filters/buf_filt.h
index 9a3fc9a2b..9a3fc9a2b 100644
--- a/src/filters/buf_filt.h
+++ b/lib/filters/buf_filt.h
diff --git a/src/filters/codec_filt/b64_filt.cpp b/lib/filters/codec_filt/b64_filt.cpp
index b804b33c7..b804b33c7 100644
--- a/src/filters/codec_filt/b64_filt.cpp
+++ b/lib/filters/codec_filt/b64_filt.cpp
diff --git a/src/filters/codec_filt/b64_filt.h b/lib/filters/codec_filt/b64_filt.h
index dcb3cdbd5..dcb3cdbd5 100644
--- a/src/filters/codec_filt/b64_filt.h
+++ b/lib/filters/codec_filt/b64_filt.h
diff --git a/src/filters/codec_filt/hex_filt.cpp b/lib/filters/codec_filt/hex_filt.cpp
index e85bdb17e..e85bdb17e 100644
--- a/src/filters/codec_filt/hex_filt.cpp
+++ b/lib/filters/codec_filt/hex_filt.cpp
diff --git a/src/filters/codec_filt/hex_filt.h b/lib/filters/codec_filt/hex_filt.h
index dbe6b9bae..dbe6b9bae 100644
--- a/src/filters/codec_filt/hex_filt.h
+++ b/lib/filters/codec_filt/hex_filt.h
diff --git a/src/filters/codec_filt/info.txt b/lib/filters/codec_filt/info.txt
index 58fcfbb4b..58fcfbb4b 100644
--- a/src/filters/codec_filt/info.txt
+++ b/lib/filters/codec_filt/info.txt
diff --git a/src/filters/compression/bzip2/bzip2.cpp b/lib/filters/compression/bzip2/bzip2.cpp
index a7990d2c2..a7990d2c2 100644
--- a/src/filters/compression/bzip2/bzip2.cpp
+++ b/lib/filters/compression/bzip2/bzip2.cpp
diff --git a/src/filters/compression/bzip2/bzip2.h b/lib/filters/compression/bzip2/bzip2.h
index 2505cf54e..2505cf54e 100644
--- a/src/filters/compression/bzip2/bzip2.h
+++ b/lib/filters/compression/bzip2/bzip2.h
diff --git a/src/filters/compression/bzip2/info.txt b/lib/filters/compression/bzip2/info.txt
index 7c0f2aafc..7c0f2aafc 100644
--- a/src/filters/compression/bzip2/info.txt
+++ b/lib/filters/compression/bzip2/info.txt
diff --git a/src/filters/compression/lzma/info.txt b/lib/filters/compression/lzma/info.txt
index ccd7a7600..ccd7a7600 100644
--- a/src/filters/compression/lzma/info.txt
+++ b/lib/filters/compression/lzma/info.txt
diff --git a/src/filters/compression/lzma/lzma.cpp b/lib/filters/compression/lzma/lzma.cpp
index eaf18b4bf..eaf18b4bf 100644
--- a/src/filters/compression/lzma/lzma.cpp
+++ b/lib/filters/compression/lzma/lzma.cpp
diff --git a/src/filters/compression/lzma/lzma.h b/lib/filters/compression/lzma/lzma.h
index 33e12d580..33e12d580 100644
--- a/src/filters/compression/lzma/lzma.h
+++ b/lib/filters/compression/lzma/lzma.h
diff --git a/src/filters/compression/zlib/info.txt b/lib/filters/compression/zlib/info.txt
index d05e407d2..d05e407d2 100644
--- a/src/filters/compression/zlib/info.txt
+++ b/lib/filters/compression/zlib/info.txt
diff --git a/src/filters/compression/zlib/zlib.cpp b/lib/filters/compression/zlib/zlib.cpp
index 4a0b2c8b4..4a0b2c8b4 100644
--- a/src/filters/compression/zlib/zlib.cpp
+++ b/lib/filters/compression/zlib/zlib.cpp
diff --git a/src/filters/compression/zlib/zlib.h b/lib/filters/compression/zlib/zlib.h
index c4d21a250..c4d21a250 100644
--- a/src/filters/compression/zlib/zlib.h
+++ b/lib/filters/compression/zlib/zlib.h
diff --git a/src/filters/data_snk.cpp b/lib/filters/data_snk.cpp
index 2903e5e1f..2903e5e1f 100644
--- a/src/filters/data_snk.cpp
+++ b/lib/filters/data_snk.cpp
diff --git a/src/filters/data_snk.h b/lib/filters/data_snk.h
index 6b9da0b4d..6b9da0b4d 100644
--- a/src/filters/data_snk.h
+++ b/lib/filters/data_snk.h
diff --git a/src/filters/data_src.cpp b/lib/filters/data_src.cpp
index cc100ab13..cc100ab13 100644
--- a/src/filters/data_src.cpp
+++ b/lib/filters/data_src.cpp
diff --git a/src/filters/data_src.h b/lib/filters/data_src.h
index e28ef7be1..e28ef7be1 100644
--- a/src/filters/data_src.h
+++ b/lib/filters/data_src.h
diff --git a/src/filters/fd_unix/fd_unix.cpp b/lib/filters/fd_unix/fd_unix.cpp
index dc6fbe696..dc6fbe696 100644
--- a/src/filters/fd_unix/fd_unix.cpp
+++ b/lib/filters/fd_unix/fd_unix.cpp
diff --git a/src/filters/fd_unix/fd_unix.h b/lib/filters/fd_unix/fd_unix.h
index 8335aed9e..8335aed9e 100644
--- a/src/filters/fd_unix/fd_unix.h
+++ b/lib/filters/fd_unix/fd_unix.h
diff --git a/src/filters/fd_unix/info.txt b/lib/filters/fd_unix/info.txt
index 271b7919e..271b7919e 100644
--- a/src/filters/fd_unix/info.txt
+++ b/lib/filters/fd_unix/info.txt
diff --git a/src/filters/filter.cpp b/lib/filters/filter.cpp
index 3eb924172..3eb924172 100644
--- a/src/filters/filter.cpp
+++ b/lib/filters/filter.cpp
diff --git a/src/filters/filter.h b/lib/filters/filter.h
index bdf4d11a4..bdf4d11a4 100644
--- a/src/filters/filter.h
+++ b/lib/filters/filter.h
diff --git a/src/filters/filters.h b/lib/filters/filters.h
index 5973cbf50..5973cbf50 100644
--- a/src/filters/filters.h
+++ b/lib/filters/filters.h
diff --git a/src/filters/info.txt b/lib/filters/info.txt
index 4145af34a..4145af34a 100644
--- a/src/filters/info.txt
+++ b/lib/filters/info.txt
diff --git a/src/filters/key_filt.h b/lib/filters/key_filt.h
index 6d69d6b83..6d69d6b83 100644
--- a/src/filters/key_filt.h
+++ b/lib/filters/key_filt.h
diff --git a/src/filters/out_buf.cpp b/lib/filters/out_buf.cpp
index 323b20e1d..323b20e1d 100644
--- a/src/filters/out_buf.cpp
+++ b/lib/filters/out_buf.cpp
diff --git a/src/filters/out_buf.h b/lib/filters/out_buf.h
index 2d17ac8d3..2d17ac8d3 100644
--- a/src/filters/out_buf.h
+++ b/lib/filters/out_buf.h
diff --git a/src/filters/pipe.cpp b/lib/filters/pipe.cpp
index e3c2f53b6..e3c2f53b6 100644
--- a/src/filters/pipe.cpp
+++ b/lib/filters/pipe.cpp
diff --git a/src/filters/pipe.h b/lib/filters/pipe.h
index ec56d4503..ec56d4503 100644
--- a/src/filters/pipe.h
+++ b/lib/filters/pipe.h
diff --git a/src/filters/pipe_io.cpp b/lib/filters/pipe_io.cpp
index a549eaee8..a549eaee8 100644
--- a/src/filters/pipe_io.cpp
+++ b/lib/filters/pipe_io.cpp
diff --git a/src/filters/pipe_rw.cpp b/lib/filters/pipe_rw.cpp
index 06b87406e..06b87406e 100644
--- a/src/filters/pipe_rw.cpp
+++ b/lib/filters/pipe_rw.cpp
diff --git a/src/filters/pk_filts/info.txt b/lib/filters/pk_filts/info.txt
index 688075145..688075145 100644
--- a/src/filters/pk_filts/info.txt
+++ b/lib/filters/pk_filts/info.txt
diff --git a/src/filters/pk_filts/pk_filts.cpp b/lib/filters/pk_filts/pk_filts.cpp
index 45fcc18b8..45fcc18b8 100644
--- a/src/filters/pk_filts/pk_filts.cpp
+++ b/lib/filters/pk_filts/pk_filts.cpp
diff --git a/src/filters/pk_filts/pk_filts.h b/lib/filters/pk_filts/pk_filts.h
index cc1c2220d..cc1c2220d 100644
--- a/src/filters/pk_filts/pk_filts.h
+++ b/lib/filters/pk_filts/pk_filts.h
diff --git a/src/filters/secqueue.cpp b/lib/filters/secqueue.cpp
index 9908a2a8c..9908a2a8c 100644
--- a/src/filters/secqueue.cpp
+++ b/lib/filters/secqueue.cpp
diff --git a/src/filters/secqueue.h b/lib/filters/secqueue.h
index 05c2e3db1..05c2e3db1 100644
--- a/src/filters/secqueue.h
+++ b/lib/filters/secqueue.h
diff --git a/src/filters/threaded_fork.cpp b/lib/filters/threaded_fork.cpp
index 05166d697..05166d697 100644
--- a/src/filters/threaded_fork.cpp
+++ b/lib/filters/threaded_fork.cpp
diff --git a/src/filters/transform_filter.cpp b/lib/filters/transform_filter.cpp
index 2f25aa2c5..2f25aa2c5 100644
--- a/src/filters/transform_filter.cpp
+++ b/lib/filters/transform_filter.cpp
diff --git a/src/filters/transform_filter.h b/lib/filters/transform_filter.h
index c7033a060..c7033a060 100644
--- a/src/filters/transform_filter.h
+++ b/lib/filters/transform_filter.h
diff --git a/src/hash/bmw_512/bmw_512.cpp b/lib/hash/bmw_512/bmw_512.cpp
index 9dfa62214..9dfa62214 100644
--- a/src/hash/bmw_512/bmw_512.cpp
+++ b/lib/hash/bmw_512/bmw_512.cpp
diff --git a/src/hash/bmw_512/bmw_512.h b/lib/hash/bmw_512/bmw_512.h
index b9ea63578..b9ea63578 100644
--- a/src/hash/bmw_512/bmw_512.h
+++ b/lib/hash/bmw_512/bmw_512.h
diff --git a/src/hash/bmw_512/info.txt b/lib/hash/bmw_512/info.txt
index 94dcbdd85..94dcbdd85 100644
--- a/src/hash/bmw_512/info.txt
+++ b/lib/hash/bmw_512/info.txt
diff --git a/src/hash/comb4p/comb4p.cpp b/lib/hash/comb4p/comb4p.cpp
index 7aec5972e..7aec5972e 100644
--- a/src/hash/comb4p/comb4p.cpp
+++ b/lib/hash/comb4p/comb4p.cpp
diff --git a/src/hash/comb4p/comb4p.h b/lib/hash/comb4p/comb4p.h
index e0cffc22b..e0cffc22b 100644
--- a/src/hash/comb4p/comb4p.h
+++ b/lib/hash/comb4p/comb4p.h
diff --git a/src/hash/comb4p/info.txt b/lib/hash/comb4p/info.txt
index 375895610..375895610 100644
--- a/src/hash/comb4p/info.txt
+++ b/lib/hash/comb4p/info.txt
diff --git a/src/hash/gost_3411/gost_3411.cpp b/lib/hash/gost_3411/gost_3411.cpp
index eb889c0a5..eb889c0a5 100644
--- a/src/hash/gost_3411/gost_3411.cpp
+++ b/lib/hash/gost_3411/gost_3411.cpp
diff --git a/src/hash/gost_3411/gost_3411.h b/lib/hash/gost_3411/gost_3411.h
index 5437ca4d8..5437ca4d8 100644
--- a/src/hash/gost_3411/gost_3411.h
+++ b/lib/hash/gost_3411/gost_3411.h
diff --git a/src/hash/gost_3411/info.txt b/lib/hash/gost_3411/info.txt
index af8eddac6..af8eddac6 100644
--- a/src/hash/gost_3411/info.txt
+++ b/lib/hash/gost_3411/info.txt
diff --git a/src/hash/has160/has160.cpp b/lib/hash/has160/has160.cpp
index 6890ccb85..6890ccb85 100644
--- a/src/hash/has160/has160.cpp
+++ b/lib/hash/has160/has160.cpp
diff --git a/src/hash/has160/has160.h b/lib/hash/has160/has160.h
index 9947d9580..9947d9580 100644
--- a/src/hash/has160/has160.h
+++ b/lib/hash/has160/has160.h
diff --git a/src/hash/has160/info.txt b/lib/hash/has160/info.txt
index cf403dad5..cf403dad5 100644
--- a/src/hash/has160/info.txt
+++ b/lib/hash/has160/info.txt
diff --git a/src/hash/hash.h b/lib/hash/hash.h
index 1e4b045e2..1e4b045e2 100644
--- a/src/hash/hash.h
+++ b/lib/hash/hash.h
diff --git a/src/hash/info.txt b/lib/hash/info.txt
index d991577f7..d991577f7 100644
--- a/src/hash/info.txt
+++ b/lib/hash/info.txt
diff --git a/src/hash/keccak/info.txt b/lib/hash/keccak/info.txt
index ecdfba19c..ecdfba19c 100644
--- a/src/hash/keccak/info.txt
+++ b/lib/hash/keccak/info.txt
diff --git a/src/hash/keccak/keccak.cpp b/lib/hash/keccak/keccak.cpp
index e34c0fd43..e34c0fd43 100644
--- a/src/hash/keccak/keccak.cpp
+++ b/lib/hash/keccak/keccak.cpp
diff --git a/src/hash/keccak/keccak.h b/lib/hash/keccak/keccak.h
index e91a04d32..e91a04d32 100644
--- a/src/hash/keccak/keccak.h
+++ b/lib/hash/keccak/keccak.h
diff --git a/src/hash/md2/info.txt b/lib/hash/md2/info.txt
index 8ea7dc393..8ea7dc393 100644
--- a/src/hash/md2/info.txt
+++ b/lib/hash/md2/info.txt
diff --git a/src/hash/md2/md2.cpp b/lib/hash/md2/md2.cpp
index 8f6a90208..8f6a90208 100644
--- a/src/hash/md2/md2.cpp
+++ b/lib/hash/md2/md2.cpp
diff --git a/src/hash/md2/md2.h b/lib/hash/md2/md2.h
index 032d8a8e0..032d8a8e0 100644
--- a/src/hash/md2/md2.h
+++ b/lib/hash/md2/md2.h
diff --git a/src/hash/md4/info.txt b/lib/hash/md4/info.txt
index 8894d4af3..8894d4af3 100644
--- a/src/hash/md4/info.txt
+++ b/lib/hash/md4/info.txt
diff --git a/src/hash/md4/md4.cpp b/lib/hash/md4/md4.cpp
index 9b9ebab36..9b9ebab36 100644
--- a/src/hash/md4/md4.cpp
+++ b/lib/hash/md4/md4.cpp
diff --git a/src/hash/md4/md4.h b/lib/hash/md4/md4.h
index 750be0fe7..750be0fe7 100644
--- a/src/hash/md4/md4.h
+++ b/lib/hash/md4/md4.h
diff --git a/src/hash/md4_x86_32/info.txt b/lib/hash/md4_x86_32/info.txt
index fa7eef6cb..fa7eef6cb 100644
--- a/src/hash/md4_x86_32/info.txt
+++ b/lib/hash/md4_x86_32/info.txt
diff --git a/src/hash/md4_x86_32/md4_x86_32.cpp b/lib/hash/md4_x86_32/md4_x86_32.cpp
index ed3f72fc9..ed3f72fc9 100644
--- a/src/hash/md4_x86_32/md4_x86_32.cpp
+++ b/lib/hash/md4_x86_32/md4_x86_32.cpp
diff --git a/src/hash/md4_x86_32/md4_x86_32.h b/lib/hash/md4_x86_32/md4_x86_32.h
index a9f23e94f..a9f23e94f 100644
--- a/src/hash/md4_x86_32/md4_x86_32.h
+++ b/lib/hash/md4_x86_32/md4_x86_32.h
diff --git a/src/hash/md4_x86_32/md4_x86_32_imp.S b/lib/hash/md4_x86_32/md4_x86_32_imp.S
index 192751166..192751166 100644
--- a/src/hash/md4_x86_32/md4_x86_32_imp.S
+++ b/lib/hash/md4_x86_32/md4_x86_32_imp.S
diff --git a/src/hash/md5/info.txt b/lib/hash/md5/info.txt
index 8bbf1c3e7..8bbf1c3e7 100644
--- a/src/hash/md5/info.txt
+++ b/lib/hash/md5/info.txt
diff --git a/src/hash/md5/md5.cpp b/lib/hash/md5/md5.cpp
index 948f4e73b..948f4e73b 100644
--- a/src/hash/md5/md5.cpp
+++ b/lib/hash/md5/md5.cpp
diff --git a/src/hash/md5/md5.h b/lib/hash/md5/md5.h
index bc90df0af..bc90df0af 100644
--- a/src/hash/md5/md5.h
+++ b/lib/hash/md5/md5.h
diff --git a/src/hash/md5_x86_32/info.txt b/lib/hash/md5_x86_32/info.txt
index 769ee8389..769ee8389 100644
--- a/src/hash/md5_x86_32/info.txt
+++ b/lib/hash/md5_x86_32/info.txt
diff --git a/src/hash/md5_x86_32/md5_x86_32.cpp b/lib/hash/md5_x86_32/md5_x86_32.cpp
index 73071ac18..73071ac18 100644
--- a/src/hash/md5_x86_32/md5_x86_32.cpp
+++ b/lib/hash/md5_x86_32/md5_x86_32.cpp
diff --git a/src/hash/md5_x86_32/md5_x86_32.h b/lib/hash/md5_x86_32/md5_x86_32.h
index 0150249ae..0150249ae 100644
--- a/src/hash/md5_x86_32/md5_x86_32.h
+++ b/lib/hash/md5_x86_32/md5_x86_32.h
diff --git a/src/hash/md5_x86_32/md5_x86_32_imp.S b/lib/hash/md5_x86_32/md5_x86_32_imp.S
index f41aaccbf..f41aaccbf 100644
--- a/src/hash/md5_x86_32/md5_x86_32_imp.S
+++ b/lib/hash/md5_x86_32/md5_x86_32_imp.S
diff --git a/src/hash/mdx_hash/info.txt b/lib/hash/mdx_hash/info.txt
index d9a24c621..d9a24c621 100644
--- a/src/hash/mdx_hash/info.txt
+++ b/lib/hash/mdx_hash/info.txt
diff --git a/src/hash/mdx_hash/mdx_hash.cpp b/lib/hash/mdx_hash/mdx_hash.cpp
index 81042c1fa..81042c1fa 100644
--- a/src/hash/mdx_hash/mdx_hash.cpp
+++ b/lib/hash/mdx_hash/mdx_hash.cpp
diff --git a/src/hash/mdx_hash/mdx_hash.h b/lib/hash/mdx_hash/mdx_hash.h
index 14d3c27a0..14d3c27a0 100644
--- a/src/hash/mdx_hash/mdx_hash.h
+++ b/lib/hash/mdx_hash/mdx_hash.h
diff --git a/src/hash/par_hash/info.txt b/lib/hash/par_hash/info.txt
index 4f559b545..4f559b545 100644
--- a/src/hash/par_hash/info.txt
+++ b/lib/hash/par_hash/info.txt
diff --git a/src/hash/par_hash/par_hash.cpp b/lib/hash/par_hash/par_hash.cpp
index df47780ef..df47780ef 100644
--- a/src/hash/par_hash/par_hash.cpp
+++ b/lib/hash/par_hash/par_hash.cpp
diff --git a/src/hash/par_hash/par_hash.h b/lib/hash/par_hash/par_hash.h
index 4f5395c23..4f5395c23 100644
--- a/src/hash/par_hash/par_hash.h
+++ b/lib/hash/par_hash/par_hash.h
diff --git a/src/hash/rmd128/info.txt b/lib/hash/rmd128/info.txt
index 7d2a4eacd..7d2a4eacd 100644
--- a/src/hash/rmd128/info.txt
+++ b/lib/hash/rmd128/info.txt
diff --git a/src/hash/rmd128/rmd128.cpp b/lib/hash/rmd128/rmd128.cpp
index cab4adf8b..cab4adf8b 100644
--- a/src/hash/rmd128/rmd128.cpp
+++ b/lib/hash/rmd128/rmd128.cpp
diff --git a/src/hash/rmd128/rmd128.h b/lib/hash/rmd128/rmd128.h
index e37666a27..e37666a27 100644
--- a/src/hash/rmd128/rmd128.h
+++ b/lib/hash/rmd128/rmd128.h
diff --git a/src/hash/rmd160/info.txt b/lib/hash/rmd160/info.txt
index 4e1451bb6..4e1451bb6 100644
--- a/src/hash/rmd160/info.txt
+++ b/lib/hash/rmd160/info.txt
diff --git a/src/hash/rmd160/rmd160.cpp b/lib/hash/rmd160/rmd160.cpp
index ff1c1c4ec..ff1c1c4ec 100644
--- a/src/hash/rmd160/rmd160.cpp
+++ b/lib/hash/rmd160/rmd160.cpp
diff --git a/src/hash/rmd160/rmd160.h b/lib/hash/rmd160/rmd160.h
index 0e43fed9a..0e43fed9a 100644
--- a/src/hash/rmd160/rmd160.h
+++ b/lib/hash/rmd160/rmd160.h
diff --git a/src/hash/sha1/info.txt b/lib/hash/sha1/info.txt
index fffb51275..fffb51275 100644
--- a/src/hash/sha1/info.txt
+++ b/lib/hash/sha1/info.txt
diff --git a/src/hash/sha1/sha160.cpp b/lib/hash/sha1/sha160.cpp
index f5daaadb2..f5daaadb2 100644
--- a/src/hash/sha1/sha160.cpp
+++ b/lib/hash/sha1/sha160.cpp
diff --git a/src/hash/sha1/sha160.h b/lib/hash/sha1/sha160.h
index e2a81808d..e2a81808d 100644
--- a/src/hash/sha1/sha160.h
+++ b/lib/hash/sha1/sha160.h
diff --git a/src/hash/sha1_sse2/info.txt b/lib/hash/sha1_sse2/info.txt
index 8d4926e63..8d4926e63 100644
--- a/src/hash/sha1_sse2/info.txt
+++ b/lib/hash/sha1_sse2/info.txt
diff --git a/src/hash/sha1_sse2/sha1_sse2.cpp b/lib/hash/sha1_sse2/sha1_sse2.cpp
index f96afd9ce..f96afd9ce 100644
--- a/src/hash/sha1_sse2/sha1_sse2.cpp
+++ b/lib/hash/sha1_sse2/sha1_sse2.cpp
diff --git a/src/hash/sha1_sse2/sha1_sse2.h b/lib/hash/sha1_sse2/sha1_sse2.h
index 9b7b327f0..9b7b327f0 100644
--- a/src/hash/sha1_sse2/sha1_sse2.h
+++ b/lib/hash/sha1_sse2/sha1_sse2.h
diff --git a/src/hash/sha1_x86_32/info.txt b/lib/hash/sha1_x86_32/info.txt
index 51e3f6587..51e3f6587 100644
--- a/src/hash/sha1_x86_32/info.txt
+++ b/lib/hash/sha1_x86_32/info.txt
diff --git a/src/hash/sha1_x86_32/sha1_x86_32.cpp b/lib/hash/sha1_x86_32/sha1_x86_32.cpp
index 6a4dc2a1d..6a4dc2a1d 100644
--- a/src/hash/sha1_x86_32/sha1_x86_32.cpp
+++ b/lib/hash/sha1_x86_32/sha1_x86_32.cpp
diff --git a/src/hash/sha1_x86_32/sha1_x86_32.h b/lib/hash/sha1_x86_32/sha1_x86_32.h
index b344d4ae2..b344d4ae2 100644
--- a/src/hash/sha1_x86_32/sha1_x86_32.h
+++ b/lib/hash/sha1_x86_32/sha1_x86_32.h
diff --git a/src/hash/sha1_x86_32/sha1_x86_32_imp.S b/lib/hash/sha1_x86_32/sha1_x86_32_imp.S
index 775ef6854..775ef6854 100644
--- a/src/hash/sha1_x86_32/sha1_x86_32_imp.S
+++ b/lib/hash/sha1_x86_32/sha1_x86_32_imp.S
diff --git a/src/hash/sha1_x86_64/info.txt b/lib/hash/sha1_x86_64/info.txt
index 54d5eefff..54d5eefff 100644
--- a/src/hash/sha1_x86_64/info.txt
+++ b/lib/hash/sha1_x86_64/info.txt
diff --git a/src/hash/sha1_x86_64/sha1_x86_64.cpp b/lib/hash/sha1_x86_64/sha1_x86_64.cpp
index a3e92e313..a3e92e313 100644
--- a/src/hash/sha1_x86_64/sha1_x86_64.cpp
+++ b/lib/hash/sha1_x86_64/sha1_x86_64.cpp
diff --git a/src/hash/sha1_x86_64/sha1_x86_64.h b/lib/hash/sha1_x86_64/sha1_x86_64.h
index 068a94595..068a94595 100644
--- a/src/hash/sha1_x86_64/sha1_x86_64.h
+++ b/lib/hash/sha1_x86_64/sha1_x86_64.h
diff --git a/src/hash/sha1_x86_64/sha1_x86_64_imp.S b/lib/hash/sha1_x86_64/sha1_x86_64_imp.S
index ee35f0d85..ee35f0d85 100644
--- a/src/hash/sha1_x86_64/sha1_x86_64_imp.S
+++ b/lib/hash/sha1_x86_64/sha1_x86_64_imp.S
diff --git a/src/hash/sha2_32/info.txt b/lib/hash/sha2_32/info.txt
index b15db2ede..b15db2ede 100644
--- a/src/hash/sha2_32/info.txt
+++ b/lib/hash/sha2_32/info.txt
diff --git a/src/hash/sha2_32/sha2_32.cpp b/lib/hash/sha2_32/sha2_32.cpp
index cffc8bd2a..cffc8bd2a 100644
--- a/src/hash/sha2_32/sha2_32.cpp
+++ b/lib/hash/sha2_32/sha2_32.cpp
diff --git a/src/hash/sha2_32/sha2_32.h b/lib/hash/sha2_32/sha2_32.h
index ccb8e07f2..ccb8e07f2 100644
--- a/src/hash/sha2_32/sha2_32.h
+++ b/lib/hash/sha2_32/sha2_32.h
diff --git a/src/hash/sha2_64/info.txt b/lib/hash/sha2_64/info.txt
index a457dffec..a457dffec 100644
--- a/src/hash/sha2_64/info.txt
+++ b/lib/hash/sha2_64/info.txt
diff --git a/src/hash/sha2_64/sha2_64.cpp b/lib/hash/sha2_64/sha2_64.cpp
index 8dcb4684e..8dcb4684e 100644
--- a/src/hash/sha2_64/sha2_64.cpp
+++ b/lib/hash/sha2_64/sha2_64.cpp
diff --git a/src/hash/sha2_64/sha2_64.h b/lib/hash/sha2_64/sha2_64.h
index 58b154170..58b154170 100644
--- a/src/hash/sha2_64/sha2_64.h
+++ b/lib/hash/sha2_64/sha2_64.h
diff --git a/src/hash/skein/info.txt b/lib/hash/skein/info.txt
index 89443132b..89443132b 100644
--- a/src/hash/skein/info.txt
+++ b/lib/hash/skein/info.txt
diff --git a/src/hash/skein/skein_512.cpp b/lib/hash/skein/skein_512.cpp
index 9aafb1616..9aafb1616 100644
--- a/src/hash/skein/skein_512.cpp
+++ b/lib/hash/skein/skein_512.cpp
diff --git a/src/hash/skein/skein_512.h b/lib/hash/skein/skein_512.h
index e0abc06ae..e0abc06ae 100644
--- a/src/hash/skein/skein_512.h
+++ b/lib/hash/skein/skein_512.h
diff --git a/src/hash/tiger/info.txt b/lib/hash/tiger/info.txt
index 773f2b037..773f2b037 100644
--- a/src/hash/tiger/info.txt
+++ b/lib/hash/tiger/info.txt
diff --git a/src/hash/tiger/tig_tab.cpp b/lib/hash/tiger/tig_tab.cpp
index b76501d74..b76501d74 100644
--- a/src/hash/tiger/tig_tab.cpp
+++ b/lib/hash/tiger/tig_tab.cpp
diff --git a/src/hash/tiger/tiger.cpp b/lib/hash/tiger/tiger.cpp
index 57250d6f5..57250d6f5 100644
--- a/src/hash/tiger/tiger.cpp
+++ b/lib/hash/tiger/tiger.cpp
diff --git a/src/hash/tiger/tiger.h b/lib/hash/tiger/tiger.h
index 70c70958b..70c70958b 100644
--- a/src/hash/tiger/tiger.h
+++ b/lib/hash/tiger/tiger.h
diff --git a/src/hash/whirlpool/info.txt b/lib/hash/whirlpool/info.txt
index 8b0abc25a..8b0abc25a 100644
--- a/src/hash/whirlpool/info.txt
+++ b/lib/hash/whirlpool/info.txt
diff --git a/src/hash/whirlpool/whrl_tab.cpp b/lib/hash/whirlpool/whrl_tab.cpp
index cf670f308..cf670f308 100644
--- a/src/hash/whirlpool/whrl_tab.cpp
+++ b/lib/hash/whirlpool/whrl_tab.cpp
diff --git a/src/hash/whirlpool/whrlpool.cpp b/lib/hash/whirlpool/whrlpool.cpp
index 5356252b2..5356252b2 100644
--- a/src/hash/whirlpool/whrlpool.cpp
+++ b/lib/hash/whirlpool/whrlpool.cpp
diff --git a/src/hash/whirlpool/whrlpool.h b/lib/hash/whirlpool/whrlpool.h
index d4ad805e1..d4ad805e1 100644
--- a/src/hash/whirlpool/whrlpool.h
+++ b/lib/hash/whirlpool/whrlpool.h
diff --git a/src/kdf/info.txt b/lib/kdf/info.txt
index e9cbdeb1a..e9cbdeb1a 100644
--- a/src/kdf/info.txt
+++ b/lib/kdf/info.txt
diff --git a/src/kdf/kdf.cpp b/lib/kdf/kdf.cpp
index 84a0cdd15..84a0cdd15 100644
--- a/src/kdf/kdf.cpp
+++ b/lib/kdf/kdf.cpp
diff --git a/src/kdf/kdf.h b/lib/kdf/kdf.h
index b0f6e1dc3..b0f6e1dc3 100644
--- a/src/kdf/kdf.h
+++ b/lib/kdf/kdf.h
diff --git a/src/kdf/kdf1/info.txt b/lib/kdf/kdf1/info.txt
index 08192fa95..08192fa95 100644
--- a/src/kdf/kdf1/info.txt
+++ b/lib/kdf/kdf1/info.txt
diff --git a/src/kdf/kdf1/kdf1.cpp b/lib/kdf/kdf1/kdf1.cpp
index f00f71010..f00f71010 100644
--- a/src/kdf/kdf1/kdf1.cpp
+++ b/lib/kdf/kdf1/kdf1.cpp
diff --git a/src/kdf/kdf1/kdf1.h b/lib/kdf/kdf1/kdf1.h
index 6a14d2995..6a14d2995 100644
--- a/src/kdf/kdf1/kdf1.h
+++ b/lib/kdf/kdf1/kdf1.h
diff --git a/src/kdf/kdf2/info.txt b/lib/kdf/kdf2/info.txt
index 3481ff04f..3481ff04f 100644
--- a/src/kdf/kdf2/info.txt
+++ b/lib/kdf/kdf2/info.txt
diff --git a/src/kdf/kdf2/kdf2.cpp b/lib/kdf/kdf2/kdf2.cpp
index 39a929b58..39a929b58 100644
--- a/src/kdf/kdf2/kdf2.cpp
+++ b/lib/kdf/kdf2/kdf2.cpp
diff --git a/src/kdf/kdf2/kdf2.h b/lib/kdf/kdf2/kdf2.h
index e33939df9..e33939df9 100644
--- a/src/kdf/kdf2/kdf2.h
+++ b/lib/kdf/kdf2/kdf2.h
diff --git a/src/kdf/mgf1/info.txt b/lib/kdf/mgf1/info.txt
index c6254b8a0..c6254b8a0 100644
--- a/src/kdf/mgf1/info.txt
+++ b/lib/kdf/mgf1/info.txt
diff --git a/src/kdf/mgf1/mgf1.cpp b/lib/kdf/mgf1/mgf1.cpp
index e0433a02f..e0433a02f 100644
--- a/src/kdf/mgf1/mgf1.cpp
+++ b/lib/kdf/mgf1/mgf1.cpp
diff --git a/src/kdf/mgf1/mgf1.h b/lib/kdf/mgf1/mgf1.h
index 95a2a2bc5..95a2a2bc5 100644
--- a/src/kdf/mgf1/mgf1.h
+++ b/lib/kdf/mgf1/mgf1.h
diff --git a/src/kdf/prf_ssl3/info.txt b/lib/kdf/prf_ssl3/info.txt
index c4e830bac..c4e830bac 100644
--- a/src/kdf/prf_ssl3/info.txt
+++ b/lib/kdf/prf_ssl3/info.txt
diff --git a/src/kdf/prf_ssl3/prf_ssl3.cpp b/lib/kdf/prf_ssl3/prf_ssl3.cpp
index 93901416f..93901416f 100644
--- a/src/kdf/prf_ssl3/prf_ssl3.cpp
+++ b/lib/kdf/prf_ssl3/prf_ssl3.cpp
diff --git a/src/kdf/prf_ssl3/prf_ssl3.h b/lib/kdf/prf_ssl3/prf_ssl3.h
index bae8badb8..bae8badb8 100644
--- a/src/kdf/prf_ssl3/prf_ssl3.h
+++ b/lib/kdf/prf_ssl3/prf_ssl3.h
diff --git a/src/kdf/prf_tls/info.txt b/lib/kdf/prf_tls/info.txt
index 505e1ff1e..505e1ff1e 100644
--- a/src/kdf/prf_tls/info.txt
+++ b/lib/kdf/prf_tls/info.txt
diff --git a/src/kdf/prf_tls/prf_tls.cpp b/lib/kdf/prf_tls/prf_tls.cpp
index 006b418c9..006b418c9 100644
--- a/src/kdf/prf_tls/prf_tls.cpp
+++ b/lib/kdf/prf_tls/prf_tls.cpp
diff --git a/src/kdf/prf_tls/prf_tls.h b/lib/kdf/prf_tls/prf_tls.h
index fce11eae0..fce11eae0 100644
--- a/src/kdf/prf_tls/prf_tls.h
+++ b/lib/kdf/prf_tls/prf_tls.h
diff --git a/src/kdf/prf_x942/info.txt b/lib/kdf/prf_x942/info.txt
index ff4a6f160..ff4a6f160 100644
--- a/src/kdf/prf_x942/info.txt
+++ b/lib/kdf/prf_x942/info.txt
diff --git a/src/kdf/prf_x942/prf_x942.cpp b/lib/kdf/prf_x942/prf_x942.cpp
index 149be163f..149be163f 100644
--- a/src/kdf/prf_x942/prf_x942.cpp
+++ b/lib/kdf/prf_x942/prf_x942.cpp
diff --git a/src/kdf/prf_x942/prf_x942.h b/lib/kdf/prf_x942/prf_x942.h
index f86b1bdd5..f86b1bdd5 100644
--- a/src/kdf/prf_x942/prf_x942.h
+++ b/lib/kdf/prf_x942/prf_x942.h
diff --git a/src/libstate/botan.h b/lib/libstate/botan.h
index 42d3dc392..42d3dc392 100644
--- a/src/libstate/botan.h
+++ b/lib/libstate/botan.h
diff --git a/src/libstate/global_rng.cpp b/lib/libstate/global_rng.cpp
index b6dc6b559..b6dc6b559 100644
--- a/src/libstate/global_rng.cpp
+++ b/lib/libstate/global_rng.cpp
diff --git a/src/libstate/global_state.cpp b/lib/libstate/global_state.cpp
index 6a846d9b0..6a846d9b0 100644
--- a/src/libstate/global_state.cpp
+++ b/lib/libstate/global_state.cpp
diff --git a/src/libstate/global_state.h b/lib/libstate/global_state.h
index 486aed17e..486aed17e 100644
--- a/src/libstate/global_state.h
+++ b/lib/libstate/global_state.h
diff --git a/src/libstate/info.txt b/lib/libstate/info.txt
index 49a6d38ee..49a6d38ee 100644
--- a/src/libstate/info.txt
+++ b/lib/libstate/info.txt
diff --git a/src/libstate/init.cpp b/lib/libstate/init.cpp
index 2d724f366..2d724f366 100644
--- a/src/libstate/init.cpp
+++ b/lib/libstate/init.cpp
diff --git a/src/libstate/init.h b/lib/libstate/init.h
index 2d70e4370..2d70e4370 100644
--- a/src/libstate/init.h
+++ b/lib/libstate/init.h
diff --git a/src/libstate/libstate.cpp b/lib/libstate/libstate.cpp
index 649dcc9b4..649dcc9b4 100644
--- a/src/libstate/libstate.cpp
+++ b/lib/libstate/libstate.cpp
diff --git a/src/libstate/libstate.h b/lib/libstate/libstate.h
index d8734966a..d8734966a 100644
--- a/src/libstate/libstate.h
+++ b/lib/libstate/libstate.h
diff --git a/src/libstate/lookup.cpp b/lib/libstate/lookup.cpp
index 85f93bb95..85f93bb95 100644
--- a/src/libstate/lookup.cpp
+++ b/lib/libstate/lookup.cpp
diff --git a/src/libstate/lookup.h b/lib/libstate/lookup.h
index e0024c224..e0024c224 100644
--- a/src/libstate/lookup.h
+++ b/lib/libstate/lookup.h
diff --git a/src/mac/cbc_mac/cbc_mac.cpp b/lib/mac/cbc_mac/cbc_mac.cpp
index 118570e72..118570e72 100644
--- a/src/mac/cbc_mac/cbc_mac.cpp
+++ b/lib/mac/cbc_mac/cbc_mac.cpp
diff --git a/src/mac/cbc_mac/cbc_mac.h b/lib/mac/cbc_mac/cbc_mac.h
index be25718d9..be25718d9 100644
--- a/src/mac/cbc_mac/cbc_mac.h
+++ b/lib/mac/cbc_mac/cbc_mac.h
diff --git a/src/mac/cbc_mac/info.txt b/lib/mac/cbc_mac/info.txt
index cb017e2a1..cb017e2a1 100644
--- a/src/mac/cbc_mac/info.txt
+++ b/lib/mac/cbc_mac/info.txt
diff --git a/src/mac/cmac/cmac.cpp b/lib/mac/cmac/cmac.cpp
index 00120cf14..00120cf14 100644
--- a/src/mac/cmac/cmac.cpp
+++ b/lib/mac/cmac/cmac.cpp
diff --git a/src/mac/cmac/cmac.h b/lib/mac/cmac/cmac.h
index c1b75cfa5..c1b75cfa5 100644
--- a/src/mac/cmac/cmac.h
+++ b/lib/mac/cmac/cmac.h
diff --git a/src/mac/cmac/info.txt b/lib/mac/cmac/info.txt
index d2dc6f68d..d2dc6f68d 100644
--- a/src/mac/cmac/info.txt
+++ b/lib/mac/cmac/info.txt
diff --git a/src/mac/hmac/hmac.cpp b/lib/mac/hmac/hmac.cpp
index 9e9a643db..9e9a643db 100644
--- a/src/mac/hmac/hmac.cpp
+++ b/lib/mac/hmac/hmac.cpp
diff --git a/src/mac/hmac/hmac.h b/lib/mac/hmac/hmac.h
index 39a084874..39a084874 100644
--- a/src/mac/hmac/hmac.h
+++ b/lib/mac/hmac/hmac.h
diff --git a/src/mac/hmac/info.txt b/lib/mac/hmac/info.txt
index 7bc8b27f8..7bc8b27f8 100644
--- a/src/mac/hmac/info.txt
+++ b/lib/mac/hmac/info.txt
diff --git a/src/mac/info.txt b/lib/mac/info.txt
index d991577f7..d991577f7 100644
--- a/src/mac/info.txt
+++ b/lib/mac/info.txt
diff --git a/src/mac/mac.cpp b/lib/mac/mac.cpp
index 094aa1b4a..094aa1b4a 100644
--- a/src/mac/mac.cpp
+++ b/lib/mac/mac.cpp
diff --git a/src/mac/mac.h b/lib/mac/mac.h
index d42092908..d42092908 100644
--- a/src/mac/mac.h
+++ b/lib/mac/mac.h
diff --git a/src/mac/ssl3mac/info.txt b/lib/mac/ssl3mac/info.txt
index 5e69b0ae8..5e69b0ae8 100644
--- a/src/mac/ssl3mac/info.txt
+++ b/lib/mac/ssl3mac/info.txt
diff --git a/src/mac/ssl3mac/ssl3_mac.cpp b/lib/mac/ssl3mac/ssl3_mac.cpp
index 64f3103ef..64f3103ef 100644
--- a/src/mac/ssl3mac/ssl3_mac.cpp
+++ b/lib/mac/ssl3mac/ssl3_mac.cpp
diff --git a/src/mac/ssl3mac/ssl3_mac.h b/lib/mac/ssl3mac/ssl3_mac.h
index d23ac023c..d23ac023c 100644
--- a/src/mac/ssl3mac/ssl3_mac.h
+++ b/lib/mac/ssl3mac/ssl3_mac.h
diff --git a/src/mac/x919_mac/info.txt b/lib/mac/x919_mac/info.txt
index 63bf40790..63bf40790 100644
--- a/src/mac/x919_mac/info.txt
+++ b/lib/mac/x919_mac/info.txt
diff --git a/src/mac/x919_mac/x919_mac.cpp b/lib/mac/x919_mac/x919_mac.cpp
index faf6138ef..faf6138ef 100644
--- a/src/mac/x919_mac/x919_mac.cpp
+++ b/lib/mac/x919_mac/x919_mac.cpp
diff --git a/src/mac/x919_mac/x919_mac.h b/lib/mac/x919_mac/x919_mac.h
index b7b7d685e..b7b7d685e 100644
--- a/src/mac/x919_mac/x919_mac.h
+++ b/lib/mac/x919_mac/x919_mac.h
diff --git a/src/math/bigint/big_code.cpp b/lib/math/bigint/big_code.cpp
index 972312cdb..972312cdb 100644
--- a/src/math/bigint/big_code.cpp
+++ b/lib/math/bigint/big_code.cpp
diff --git a/src/math/bigint/big_io.cpp b/lib/math/bigint/big_io.cpp
index b561c218f..b561c218f 100644
--- a/src/math/bigint/big_io.cpp
+++ b/lib/math/bigint/big_io.cpp
diff --git a/src/math/bigint/big_ops2.cpp b/lib/math/bigint/big_ops2.cpp
index 37b6a5df1..37b6a5df1 100644
--- a/src/math/bigint/big_ops2.cpp
+++ b/lib/math/bigint/big_ops2.cpp
diff --git a/src/math/bigint/big_ops3.cpp b/lib/math/bigint/big_ops3.cpp
index cad730197..cad730197 100644
--- a/src/math/bigint/big_ops3.cpp
+++ b/lib/math/bigint/big_ops3.cpp
diff --git a/src/math/bigint/big_rand.cpp b/lib/math/bigint/big_rand.cpp
index 78b9ee244..78b9ee244 100644
--- a/src/math/bigint/big_rand.cpp
+++ b/lib/math/bigint/big_rand.cpp
diff --git a/src/math/bigint/bigint.cpp b/lib/math/bigint/bigint.cpp
index 45c351256..45c351256 100644
--- a/src/math/bigint/bigint.cpp
+++ b/lib/math/bigint/bigint.cpp
diff --git a/src/math/bigint/bigint.h b/lib/math/bigint/bigint.h
index 08b7d53fc..08b7d53fc 100644
--- a/src/math/bigint/bigint.h
+++ b/lib/math/bigint/bigint.h
diff --git a/src/math/bigint/divide.cpp b/lib/math/bigint/divide.cpp
index 8b21bce13..8b21bce13 100644
--- a/src/math/bigint/divide.cpp
+++ b/lib/math/bigint/divide.cpp
diff --git a/src/math/bigint/divide.h b/lib/math/bigint/divide.h
index 36aed7854..36aed7854 100644
--- a/src/math/bigint/divide.h
+++ b/lib/math/bigint/divide.h
diff --git a/src/math/bigint/info.txt b/lib/math/bigint/info.txt
index b5dabb7bc..b5dabb7bc 100644
--- a/src/math/bigint/info.txt
+++ b/lib/math/bigint/info.txt
diff --git a/src/math/ec_gfp/curve_gfp.h b/lib/math/ec_gfp/curve_gfp.h
index 267d5f152..267d5f152 100644
--- a/src/math/ec_gfp/curve_gfp.h
+++ b/lib/math/ec_gfp/curve_gfp.h
diff --git a/src/math/ec_gfp/info.txt b/lib/math/ec_gfp/info.txt
index 1772302a8..1772302a8 100644
--- a/src/math/ec_gfp/info.txt
+++ b/lib/math/ec_gfp/info.txt
diff --git a/src/math/ec_gfp/point_gfp.cpp b/lib/math/ec_gfp/point_gfp.cpp
index 9cd5a2aaf..9cd5a2aaf 100644
--- a/src/math/ec_gfp/point_gfp.cpp
+++ b/lib/math/ec_gfp/point_gfp.cpp
diff --git a/src/math/ec_gfp/point_gfp.h b/lib/math/ec_gfp/point_gfp.h
index 017f66e1c..017f66e1c 100644
--- a/src/math/ec_gfp/point_gfp.h
+++ b/lib/math/ec_gfp/point_gfp.h
diff --git a/src/math/mp/info.txt b/lib/math/mp/info.txt
index a47475f7b..a47475f7b 100644
--- a/src/math/mp/info.txt
+++ b/lib/math/mp/info.txt
diff --git a/src/math/mp/mp_asm.cpp b/lib/math/mp/mp_asm.cpp
index a3caba620..a3caba620 100644
--- a/src/math/mp/mp_asm.cpp
+++ b/lib/math/mp/mp_asm.cpp
diff --git a/src/math/mp/mp_comba.cpp b/lib/math/mp/mp_comba.cpp
index 99dcda176..99dcda176 100644
--- a/src/math/mp/mp_comba.cpp
+++ b/lib/math/mp/mp_comba.cpp
diff --git a/src/math/mp/mp_core.h b/lib/math/mp/mp_core.h
index c25cb994f..c25cb994f 100644
--- a/src/math/mp/mp_core.h
+++ b/lib/math/mp/mp_core.h
diff --git a/src/math/mp/mp_generic/info.txt b/lib/math/mp/mp_generic/info.txt
index c87dd00ca..c87dd00ca 100644
--- a/src/math/mp/mp_generic/info.txt
+++ b/lib/math/mp/mp_generic/info.txt
diff --git a/src/math/mp/mp_generic/mp_asmi.h b/lib/math/mp/mp_generic/mp_asmi.h
index 018055696..018055696 100644
--- a/src/math/mp/mp_generic/mp_asmi.h
+++ b/lib/math/mp/mp_generic/mp_asmi.h
diff --git a/src/math/mp/mp_generic/mp_madd.h b/lib/math/mp/mp_generic/mp_madd.h
index 17713f55f..17713f55f 100644
--- a/src/math/mp/mp_generic/mp_madd.h
+++ b/lib/math/mp/mp_generic/mp_madd.h
diff --git a/src/math/mp/mp_karat.cpp b/lib/math/mp/mp_karat.cpp
index b549a05c8..b549a05c8 100644
--- a/src/math/mp/mp_karat.cpp
+++ b/lib/math/mp/mp_karat.cpp
diff --git a/src/math/mp/mp_misc.cpp b/lib/math/mp/mp_misc.cpp
index 0efd5fd19..0efd5fd19 100644
--- a/src/math/mp/mp_misc.cpp
+++ b/lib/math/mp/mp_misc.cpp
diff --git a/src/math/mp/mp_monty.cpp b/lib/math/mp/mp_monty.cpp
index 095457dbe..095457dbe 100644
--- a/src/math/mp/mp_monty.cpp
+++ b/lib/math/mp/mp_monty.cpp
diff --git a/src/math/mp/mp_mulop.cpp b/lib/math/mp/mp_mulop.cpp
index 0c79cc2ef..0c79cc2ef 100644
--- a/src/math/mp/mp_mulop.cpp
+++ b/lib/math/mp/mp_mulop.cpp
diff --git a/src/math/mp/mp_shift.cpp b/lib/math/mp/mp_shift.cpp
index 0531658ec..0531658ec 100644
--- a/src/math/mp/mp_shift.cpp
+++ b/lib/math/mp/mp_shift.cpp
diff --git a/src/math/mp/mp_types.h b/lib/math/mp/mp_types.h
index 60282fb83..60282fb83 100644
--- a/src/math/mp/mp_types.h
+++ b/lib/math/mp/mp_types.h
diff --git a/src/math/mp/mp_x86_32/info.txt b/lib/math/mp/mp_x86_32/info.txt
index f36abaf62..f36abaf62 100644
--- a/src/math/mp/mp_x86_32/info.txt
+++ b/lib/math/mp/mp_x86_32/info.txt
diff --git a/src/math/mp/mp_x86_32/mp_asmi.h b/lib/math/mp/mp_x86_32/mp_asmi.h
index 9b858c8d5..9b858c8d5 100644
--- a/src/math/mp/mp_x86_32/mp_asmi.h
+++ b/lib/math/mp/mp_x86_32/mp_asmi.h
diff --git a/src/math/mp/mp_x86_32/mp_madd.h b/lib/math/mp/mp_x86_32/mp_madd.h
index 9d60c721d..9d60c721d 100644
--- a/src/math/mp/mp_x86_32/mp_madd.h
+++ b/lib/math/mp/mp_x86_32/mp_madd.h
diff --git a/src/math/mp/mp_x86_32_msvc/info.txt b/lib/math/mp/mp_x86_32_msvc/info.txt
index 3029d6a61..3029d6a61 100644
--- a/src/math/mp/mp_x86_32_msvc/info.txt
+++ b/lib/math/mp/mp_x86_32_msvc/info.txt
diff --git a/src/math/mp/mp_x86_32_msvc/mp_asmi.h b/lib/math/mp/mp_x86_32_msvc/mp_asmi.h
index ef149c920..ef149c920 100644
--- a/src/math/mp/mp_x86_32_msvc/mp_asmi.h
+++ b/lib/math/mp/mp_x86_32_msvc/mp_asmi.h
diff --git a/src/math/mp/mp_x86_64/info.txt b/lib/math/mp/mp_x86_64/info.txt
index 75c42ddc1..75c42ddc1 100644
--- a/src/math/mp/mp_x86_64/info.txt
+++ b/lib/math/mp/mp_x86_64/info.txt
diff --git a/src/math/mp/mp_x86_64/mp_asmi.h b/lib/math/mp/mp_x86_64/mp_asmi.h
index b2f1202e3..b2f1202e3 100644
--- a/src/math/mp/mp_x86_64/mp_asmi.h
+++ b/lib/math/mp/mp_x86_64/mp_asmi.h
diff --git a/src/math/mp/mp_x86_64/mp_madd.h b/lib/math/mp/mp_x86_64/mp_madd.h
index 4c0d79931..4c0d79931 100644
--- a/src/math/mp/mp_x86_64/mp_madd.h
+++ b/lib/math/mp/mp_x86_64/mp_madd.h
diff --git a/src/math/numbertheory/def_powm.h b/lib/math/numbertheory/def_powm.h
index 6ceee7bb6..6ceee7bb6 100644
--- a/src/math/numbertheory/def_powm.h
+++ b/lib/math/numbertheory/def_powm.h
diff --git a/src/math/numbertheory/dsa_gen.cpp b/lib/math/numbertheory/dsa_gen.cpp
index d30a08f1a..d30a08f1a 100644
--- a/src/math/numbertheory/dsa_gen.cpp
+++ b/lib/math/numbertheory/dsa_gen.cpp
diff --git a/src/math/numbertheory/info.txt b/lib/math/numbertheory/info.txt
index 62386c3bc..62386c3bc 100644
--- a/src/math/numbertheory/info.txt
+++ b/lib/math/numbertheory/info.txt
diff --git a/src/math/numbertheory/jacobi.cpp b/lib/math/numbertheory/jacobi.cpp
index fcccc80e5..fcccc80e5 100644
--- a/src/math/numbertheory/jacobi.cpp
+++ b/lib/math/numbertheory/jacobi.cpp
diff --git a/src/math/numbertheory/make_prm.cpp b/lib/math/numbertheory/make_prm.cpp
index dc94420ab..dc94420ab 100644
--- a/src/math/numbertheory/make_prm.cpp
+++ b/lib/math/numbertheory/make_prm.cpp
diff --git a/src/math/numbertheory/mp_numth.cpp b/lib/math/numbertheory/mp_numth.cpp
index e6826b9dd..e6826b9dd 100644
--- a/src/math/numbertheory/mp_numth.cpp
+++ b/lib/math/numbertheory/mp_numth.cpp
diff --git a/src/math/numbertheory/numthry.cpp b/lib/math/numbertheory/numthry.cpp
index e3c673ea5..e3c673ea5 100644
--- a/src/math/numbertheory/numthry.cpp
+++ b/lib/math/numbertheory/numthry.cpp
diff --git a/src/math/numbertheory/numthry.h b/lib/math/numbertheory/numthry.h
index a34d855b2..a34d855b2 100644
--- a/src/math/numbertheory/numthry.h
+++ b/lib/math/numbertheory/numthry.h
diff --git a/src/math/numbertheory/pow_mod.cpp b/lib/math/numbertheory/pow_mod.cpp
index c7d7fe70e..c7d7fe70e 100644
--- a/src/math/numbertheory/pow_mod.cpp
+++ b/lib/math/numbertheory/pow_mod.cpp
diff --git a/src/math/numbertheory/pow_mod.h b/lib/math/numbertheory/pow_mod.h
index b78510793..b78510793 100644
--- a/src/math/numbertheory/pow_mod.h
+++ b/lib/math/numbertheory/pow_mod.h
diff --git a/src/math/numbertheory/powm_fw.cpp b/lib/math/numbertheory/powm_fw.cpp
index 16a48a5b0..16a48a5b0 100644
--- a/src/math/numbertheory/powm_fw.cpp
+++ b/lib/math/numbertheory/powm_fw.cpp
diff --git a/src/math/numbertheory/powm_mnt.cpp b/lib/math/numbertheory/powm_mnt.cpp
index a3eac1f83..a3eac1f83 100644
--- a/src/math/numbertheory/powm_mnt.cpp
+++ b/lib/math/numbertheory/powm_mnt.cpp
diff --git a/src/math/numbertheory/primes.cpp b/lib/math/numbertheory/primes.cpp
index a0c0f0093..a0c0f0093 100644
--- a/src/math/numbertheory/primes.cpp
+++ b/lib/math/numbertheory/primes.cpp
diff --git a/src/math/numbertheory/reducer.cpp b/lib/math/numbertheory/reducer.cpp
index 8e8951c46..8e8951c46 100644
--- a/src/math/numbertheory/reducer.cpp
+++ b/lib/math/numbertheory/reducer.cpp
diff --git a/src/math/numbertheory/reducer.h b/lib/math/numbertheory/reducer.h
index 76712074c..76712074c 100644
--- a/src/math/numbertheory/reducer.h
+++ b/lib/math/numbertheory/reducer.h
diff --git a/src/math/numbertheory/ressol.cpp b/lib/math/numbertheory/ressol.cpp
index 9c48187f4..9c48187f4 100644
--- a/src/math/numbertheory/ressol.cpp
+++ b/lib/math/numbertheory/ressol.cpp
diff --git a/src/modes/aead/aead.cpp b/lib/modes/aead/aead.cpp
index 26a7091fd..26a7091fd 100644
--- a/src/modes/aead/aead.cpp
+++ b/lib/modes/aead/aead.cpp
diff --git a/src/modes/aead/aead.h b/lib/modes/aead/aead.h
index 8df98fcad..8df98fcad 100644
--- a/src/modes/aead/aead.h
+++ b/lib/modes/aead/aead.h
diff --git a/src/modes/aead/ccm/ccm.cpp b/lib/modes/aead/ccm/ccm.cpp
index 50fc38738..50fc38738 100644
--- a/src/modes/aead/ccm/ccm.cpp
+++ b/lib/modes/aead/ccm/ccm.cpp
diff --git a/src/modes/aead/ccm/ccm.h b/lib/modes/aead/ccm/ccm.h
index 87dd5805c..87dd5805c 100644
--- a/src/modes/aead/ccm/ccm.h
+++ b/lib/modes/aead/ccm/ccm.h
diff --git a/src/modes/aead/ccm/info.txt b/lib/modes/aead/ccm/info.txt
index ee8373caf..ee8373caf 100644
--- a/src/modes/aead/ccm/info.txt
+++ b/lib/modes/aead/ccm/info.txt
diff --git a/src/modes/aead/eax/eax.cpp b/lib/modes/aead/eax/eax.cpp
index 249bf5f7e..249bf5f7e 100644
--- a/src/modes/aead/eax/eax.cpp
+++ b/lib/modes/aead/eax/eax.cpp
diff --git a/src/modes/aead/eax/eax.h b/lib/modes/aead/eax/eax.h
index 224fb5298..224fb5298 100644
--- a/src/modes/aead/eax/eax.h
+++ b/lib/modes/aead/eax/eax.h
diff --git a/src/modes/aead/eax/info.txt b/lib/modes/aead/eax/info.txt
index 75775fa16..75775fa16 100644
--- a/src/modes/aead/eax/info.txt
+++ b/lib/modes/aead/eax/info.txt
diff --git a/src/modes/aead/gcm/clmul/clmul.cpp b/lib/modes/aead/gcm/clmul/clmul.cpp
index cc6d581e3..cc6d581e3 100644
--- a/src/modes/aead/gcm/clmul/clmul.cpp
+++ b/lib/modes/aead/gcm/clmul/clmul.cpp
diff --git a/src/modes/aead/gcm/clmul/clmul.h b/lib/modes/aead/gcm/clmul/clmul.h
index ba197f2f7..ba197f2f7 100644
--- a/src/modes/aead/gcm/clmul/clmul.h
+++ b/lib/modes/aead/gcm/clmul/clmul.h
diff --git a/src/modes/aead/gcm/clmul/info.txt b/lib/modes/aead/gcm/clmul/info.txt
index 8a21b6ac2..8a21b6ac2 100644
--- a/src/modes/aead/gcm/clmul/info.txt
+++ b/lib/modes/aead/gcm/clmul/info.txt
diff --git a/src/modes/aead/gcm/gcm.cpp b/lib/modes/aead/gcm/gcm.cpp
index b39e6ac92..b39e6ac92 100644
--- a/src/modes/aead/gcm/gcm.cpp
+++ b/lib/modes/aead/gcm/gcm.cpp
diff --git a/src/modes/aead/gcm/gcm.h b/lib/modes/aead/gcm/gcm.h
index 12d66a3d1..12d66a3d1 100644
--- a/src/modes/aead/gcm/gcm.h
+++ b/lib/modes/aead/gcm/gcm.h
diff --git a/src/modes/aead/gcm/info.txt b/lib/modes/aead/gcm/info.txt
index cf5f68bb5..cf5f68bb5 100644
--- a/src/modes/aead/gcm/info.txt
+++ b/lib/modes/aead/gcm/info.txt
diff --git a/src/modes/aead/info.txt b/lib/modes/aead/info.txt
index 102f05b7b..102f05b7b 100644
--- a/src/modes/aead/info.txt
+++ b/lib/modes/aead/info.txt
diff --git a/src/modes/aead/ocb/info.txt b/lib/modes/aead/ocb/info.txt
index be4cefdd0..be4cefdd0 100644
--- a/src/modes/aead/ocb/info.txt
+++ b/lib/modes/aead/ocb/info.txt
diff --git a/src/modes/aead/ocb/ocb.cpp b/lib/modes/aead/ocb/ocb.cpp
index fd66bb2e9..fd66bb2e9 100644
--- a/src/modes/aead/ocb/ocb.cpp
+++ b/lib/modes/aead/ocb/ocb.cpp
diff --git a/src/modes/aead/ocb/ocb.h b/lib/modes/aead/ocb/ocb.h
index e7d042de3..e7d042de3 100644
--- a/src/modes/aead/ocb/ocb.h
+++ b/lib/modes/aead/ocb/ocb.h
diff --git a/src/modes/aead/siv/info.txt b/lib/modes/aead/siv/info.txt
index b1e38568e..b1e38568e 100644
--- a/src/modes/aead/siv/info.txt
+++ b/lib/modes/aead/siv/info.txt
diff --git a/src/modes/aead/siv/siv.cpp b/lib/modes/aead/siv/siv.cpp
index a89c3dd08..a89c3dd08 100644
--- a/src/modes/aead/siv/siv.cpp
+++ b/lib/modes/aead/siv/siv.cpp
diff --git a/src/modes/aead/siv/siv.h b/lib/modes/aead/siv/siv.h
index 31df4d049..31df4d049 100644
--- a/src/modes/aead/siv/siv.h
+++ b/lib/modes/aead/siv/siv.h
diff --git a/src/modes/cbc/cbc.cpp b/lib/modes/cbc/cbc.cpp
index 31834bade..31834bade 100644
--- a/src/modes/cbc/cbc.cpp
+++ b/lib/modes/cbc/cbc.cpp
diff --git a/src/modes/cbc/cbc.h b/lib/modes/cbc/cbc.h
index 0a10f3661..0a10f3661 100644
--- a/src/modes/cbc/cbc.h
+++ b/lib/modes/cbc/cbc.h
diff --git a/src/modes/cbc/info.txt b/lib/modes/cbc/info.txt
index ce59deba0..ce59deba0 100644
--- a/src/modes/cbc/info.txt
+++ b/lib/modes/cbc/info.txt
diff --git a/src/modes/cfb/cfb.cpp b/lib/modes/cfb/cfb.cpp
index 7721e1487..7721e1487 100644
--- a/src/modes/cfb/cfb.cpp
+++ b/lib/modes/cfb/cfb.cpp
diff --git a/src/modes/cfb/cfb.h b/lib/modes/cfb/cfb.h
index 48be0a2d9..48be0a2d9 100644
--- a/src/modes/cfb/cfb.h
+++ b/lib/modes/cfb/cfb.h
diff --git a/src/modes/cfb/info.txt b/lib/modes/cfb/info.txt
index 8d0e20a84..8d0e20a84 100644
--- a/src/modes/cfb/info.txt
+++ b/lib/modes/cfb/info.txt
diff --git a/src/modes/cipher_mode.h b/lib/modes/cipher_mode.h
index 91e2af5a9..91e2af5a9 100644
--- a/src/modes/cipher_mode.h
+++ b/lib/modes/cipher_mode.h
diff --git a/src/modes/ecb/ecb.cpp b/lib/modes/ecb/ecb.cpp
index f026eb035..f026eb035 100644
--- a/src/modes/ecb/ecb.cpp
+++ b/lib/modes/ecb/ecb.cpp
diff --git a/src/modes/ecb/ecb.h b/lib/modes/ecb/ecb.h
index 441eafbc1..441eafbc1 100644
--- a/src/modes/ecb/ecb.h
+++ b/lib/modes/ecb/ecb.h
diff --git a/src/modes/ecb/info.txt b/lib/modes/ecb/info.txt
index 5e7737717..5e7737717 100644
--- a/src/modes/ecb/info.txt
+++ b/lib/modes/ecb/info.txt
diff --git a/src/modes/info.txt b/lib/modes/info.txt
index 0dcb0cd59..0dcb0cd59 100644
--- a/src/modes/info.txt
+++ b/lib/modes/info.txt
diff --git a/src/modes/mode_pad/info.txt b/lib/modes/mode_pad/info.txt
index e9df6334b..e9df6334b 100644
--- a/src/modes/mode_pad/info.txt
+++ b/lib/modes/mode_pad/info.txt
diff --git a/src/modes/mode_pad/mode_pad.cpp b/lib/modes/mode_pad/mode_pad.cpp
index 918964c74..918964c74 100644
--- a/src/modes/mode_pad/mode_pad.cpp
+++ b/lib/modes/mode_pad/mode_pad.cpp
diff --git a/src/modes/mode_pad/mode_pad.h b/lib/modes/mode_pad/mode_pad.h
index e7c38a196..e7c38a196 100644
--- a/src/modes/mode_pad/mode_pad.h
+++ b/lib/modes/mode_pad/mode_pad.h
diff --git a/src/modes/xts/info.txt b/lib/modes/xts/info.txt
index 5f5dc7834..5f5dc7834 100644
--- a/src/modes/xts/info.txt
+++ b/lib/modes/xts/info.txt
diff --git a/src/modes/xts/xts.cpp b/lib/modes/xts/xts.cpp
index 02da5fa5d..02da5fa5d 100644
--- a/src/modes/xts/xts.cpp
+++ b/lib/modes/xts/xts.cpp
diff --git a/src/modes/xts/xts.h b/lib/modes/xts/xts.h
index 21bc495e1..21bc495e1 100644
--- a/src/modes/xts/xts.h
+++ b/lib/modes/xts/xts.h
diff --git a/src/passhash/bcrypt/bcrypt.cpp b/lib/passhash/bcrypt/bcrypt.cpp
index 5ee75f4ed..5ee75f4ed 100644
--- a/src/passhash/bcrypt/bcrypt.cpp
+++ b/lib/passhash/bcrypt/bcrypt.cpp
diff --git a/src/passhash/bcrypt/bcrypt.h b/lib/passhash/bcrypt/bcrypt.h
index 8a6ab58ea..8a6ab58ea 100644
--- a/src/passhash/bcrypt/bcrypt.h
+++ b/lib/passhash/bcrypt/bcrypt.h
diff --git a/src/passhash/bcrypt/info.txt b/lib/passhash/bcrypt/info.txt
index 5cc246cab..5cc246cab 100644
--- a/src/passhash/bcrypt/info.txt
+++ b/lib/passhash/bcrypt/info.txt
diff --git a/src/passhash/passhash9/info.txt b/lib/passhash/passhash9/info.txt
index f4af7fe0b..f4af7fe0b 100644
--- a/src/passhash/passhash9/info.txt
+++ b/lib/passhash/passhash9/info.txt
diff --git a/src/passhash/passhash9/passhash9.cpp b/lib/passhash/passhash9/passhash9.cpp
index 027ceeb76..027ceeb76 100644
--- a/src/passhash/passhash9/passhash9.cpp
+++ b/lib/passhash/passhash9/passhash9.cpp
diff --git a/src/passhash/passhash9/passhash9.h b/lib/passhash/passhash9/passhash9.h
index 5fd0a1bf8..5fd0a1bf8 100644
--- a/src/passhash/passhash9/passhash9.h
+++ b/lib/passhash/passhash9/passhash9.h
diff --git a/src/pbe/get_pbe.cpp b/lib/pbe/get_pbe.cpp
index 4ec518776..4ec518776 100644
--- a/src/pbe/get_pbe.cpp
+++ b/lib/pbe/get_pbe.cpp
diff --git a/src/pbe/get_pbe.h b/lib/pbe/get_pbe.h
index df87c0547..df87c0547 100644
--- a/src/pbe/get_pbe.h
+++ b/lib/pbe/get_pbe.h
diff --git a/src/pbe/info.txt b/lib/pbe/info.txt
index 0436c4efd..0436c4efd 100644
--- a/src/pbe/info.txt
+++ b/lib/pbe/info.txt
diff --git a/src/pbe/pbe.h b/lib/pbe/pbe.h
index 45c98e2c8..45c98e2c8 100644
--- a/src/pbe/pbe.h
+++ b/lib/pbe/pbe.h
diff --git a/src/pbe/pbes1/info.txt b/lib/pbe/pbes1/info.txt
index 36d26ecc9..36d26ecc9 100644
--- a/src/pbe/pbes1/info.txt
+++ b/lib/pbe/pbes1/info.txt
diff --git a/src/pbe/pbes1/pbes1.cpp b/lib/pbe/pbes1/pbes1.cpp
index a30f10a6c..a30f10a6c 100644
--- a/src/pbe/pbes1/pbes1.cpp
+++ b/lib/pbe/pbes1/pbes1.cpp
diff --git a/src/pbe/pbes1/pbes1.h b/lib/pbe/pbes1/pbes1.h
index 8d1a6f877..8d1a6f877 100644
--- a/src/pbe/pbes1/pbes1.h
+++ b/lib/pbe/pbes1/pbes1.h
diff --git a/src/pbe/pbes2/info.txt b/lib/pbe/pbes2/info.txt
index ba7d77774..ba7d77774 100644
--- a/src/pbe/pbes2/info.txt
+++ b/lib/pbe/pbes2/info.txt
diff --git a/src/pbe/pbes2/pbes2.cpp b/lib/pbe/pbes2/pbes2.cpp
index d4df1277c..d4df1277c 100644
--- a/src/pbe/pbes2/pbes2.cpp
+++ b/lib/pbe/pbes2/pbes2.cpp
diff --git a/src/pbe/pbes2/pbes2.h b/lib/pbe/pbes2/pbes2.h
index b7160f575..b7160f575 100644
--- a/src/pbe/pbes2/pbes2.h
+++ b/lib/pbe/pbes2/pbes2.h
diff --git a/src/pbkdf/info.txt b/lib/pbkdf/info.txt
index d991577f7..d991577f7 100644
--- a/src/pbkdf/info.txt
+++ b/lib/pbkdf/info.txt
diff --git a/src/pbkdf/pbkdf.cpp b/lib/pbkdf/pbkdf.cpp
index ccd203dbd..ccd203dbd 100644
--- a/src/pbkdf/pbkdf.cpp
+++ b/lib/pbkdf/pbkdf.cpp
diff --git a/src/pbkdf/pbkdf.h b/lib/pbkdf/pbkdf.h
index 65ad8e83a..65ad8e83a 100644
--- a/src/pbkdf/pbkdf.h
+++ b/lib/pbkdf/pbkdf.h
diff --git a/src/pbkdf/pbkdf1/info.txt b/lib/pbkdf/pbkdf1/info.txt
index 1ec626cac..1ec626cac 100644
--- a/src/pbkdf/pbkdf1/info.txt
+++ b/lib/pbkdf/pbkdf1/info.txt
diff --git a/src/pbkdf/pbkdf1/pbkdf1.cpp b/lib/pbkdf/pbkdf1/pbkdf1.cpp
index 9d1672529..9d1672529 100644
--- a/src/pbkdf/pbkdf1/pbkdf1.cpp
+++ b/lib/pbkdf/pbkdf1/pbkdf1.cpp
diff --git a/src/pbkdf/pbkdf1/pbkdf1.h b/lib/pbkdf/pbkdf1/pbkdf1.h
index 783b70ed9..783b70ed9 100644
--- a/src/pbkdf/pbkdf1/pbkdf1.h
+++ b/lib/pbkdf/pbkdf1/pbkdf1.h
diff --git a/src/pbkdf/pbkdf2/info.txt b/lib/pbkdf/pbkdf2/info.txt
index b13168c53..b13168c53 100644
--- a/src/pbkdf/pbkdf2/info.txt
+++ b/lib/pbkdf/pbkdf2/info.txt
diff --git a/src/pbkdf/pbkdf2/pbkdf2.cpp b/lib/pbkdf/pbkdf2/pbkdf2.cpp
index c24bcaff8..c24bcaff8 100644
--- a/src/pbkdf/pbkdf2/pbkdf2.cpp
+++ b/lib/pbkdf/pbkdf2/pbkdf2.cpp
diff --git a/src/pbkdf/pbkdf2/pbkdf2.h b/lib/pbkdf/pbkdf2/pbkdf2.h
index 8bc271fcf..8bc271fcf 100644
--- a/src/pbkdf/pbkdf2/pbkdf2.h
+++ b/lib/pbkdf/pbkdf2/pbkdf2.h
diff --git a/src/pk_pad/eme.cpp b/lib/pk_pad/eme.cpp
index f90239d8c..f90239d8c 100644
--- a/src/pk_pad/eme.cpp
+++ b/lib/pk_pad/eme.cpp
diff --git a/src/pk_pad/eme.h b/lib/pk_pad/eme.h
index 358b4f144..358b4f144 100644
--- a/src/pk_pad/eme.h
+++ b/lib/pk_pad/eme.h
diff --git a/src/pk_pad/eme1/eme1.cpp b/lib/pk_pad/eme1/eme1.cpp
index dadb44d0a..dadb44d0a 100644
--- a/src/pk_pad/eme1/eme1.cpp
+++ b/lib/pk_pad/eme1/eme1.cpp
diff --git a/src/pk_pad/eme1/eme1.h b/lib/pk_pad/eme1/eme1.h
index eb6fc6bf5..eb6fc6bf5 100644
--- a/src/pk_pad/eme1/eme1.h
+++ b/lib/pk_pad/eme1/eme1.h
diff --git a/src/pk_pad/eme1/info.txt b/lib/pk_pad/eme1/info.txt
index 7e911f495..7e911f495 100644
--- a/src/pk_pad/eme1/info.txt
+++ b/lib/pk_pad/eme1/info.txt
diff --git a/src/pk_pad/eme_pkcs/eme_pkcs.cpp b/lib/pk_pad/eme_pkcs/eme_pkcs.cpp
index 0e7d1fc30..0e7d1fc30 100644
--- a/src/pk_pad/eme_pkcs/eme_pkcs.cpp
+++ b/lib/pk_pad/eme_pkcs/eme_pkcs.cpp
diff --git a/src/pk_pad/eme_pkcs/eme_pkcs.h b/lib/pk_pad/eme_pkcs/eme_pkcs.h
index 2808e18d6..2808e18d6 100644
--- a/src/pk_pad/eme_pkcs/eme_pkcs.h
+++ b/lib/pk_pad/eme_pkcs/eme_pkcs.h
diff --git a/src/pk_pad/eme_pkcs/info.txt b/lib/pk_pad/eme_pkcs/info.txt
index 432aaf8eb..432aaf8eb 100644
--- a/src/pk_pad/eme_pkcs/info.txt
+++ b/lib/pk_pad/eme_pkcs/info.txt
diff --git a/src/pk_pad/emsa.h b/lib/pk_pad/emsa.h
index 5db01ec12..5db01ec12 100644
--- a/src/pk_pad/emsa.h
+++ b/lib/pk_pad/emsa.h
diff --git a/src/pk_pad/emsa1/emsa1.cpp b/lib/pk_pad/emsa1/emsa1.cpp
index 2358023f8..2358023f8 100644
--- a/src/pk_pad/emsa1/emsa1.cpp
+++ b/lib/pk_pad/emsa1/emsa1.cpp
diff --git a/src/pk_pad/emsa1/emsa1.h b/lib/pk_pad/emsa1/emsa1.h
index f84ca5ae7..f84ca5ae7 100644
--- a/src/pk_pad/emsa1/emsa1.h
+++ b/lib/pk_pad/emsa1/emsa1.h
diff --git a/src/pk_pad/emsa1/info.txt b/lib/pk_pad/emsa1/info.txt
index 83d9744e6..83d9744e6 100644
--- a/src/pk_pad/emsa1/info.txt
+++ b/lib/pk_pad/emsa1/info.txt
diff --git a/src/pk_pad/emsa1_bsi/emsa1_bsi.cpp b/lib/pk_pad/emsa1_bsi/emsa1_bsi.cpp
index 9096edfbf..9096edfbf 100644
--- a/src/pk_pad/emsa1_bsi/emsa1_bsi.cpp
+++ b/lib/pk_pad/emsa1_bsi/emsa1_bsi.cpp
diff --git a/src/pk_pad/emsa1_bsi/emsa1_bsi.h b/lib/pk_pad/emsa1_bsi/emsa1_bsi.h
index 1b90f48df..1b90f48df 100644
--- a/src/pk_pad/emsa1_bsi/emsa1_bsi.h
+++ b/lib/pk_pad/emsa1_bsi/emsa1_bsi.h
diff --git a/src/pk_pad/emsa1_bsi/info.txt b/lib/pk_pad/emsa1_bsi/info.txt
index 021c99720..021c99720 100644
--- a/src/pk_pad/emsa1_bsi/info.txt
+++ b/lib/pk_pad/emsa1_bsi/info.txt
diff --git a/src/pk_pad/emsa2/emsa2.cpp b/lib/pk_pad/emsa2/emsa2.cpp
index 02a3dbe72..02a3dbe72 100644
--- a/src/pk_pad/emsa2/emsa2.cpp
+++ b/lib/pk_pad/emsa2/emsa2.cpp
diff --git a/src/pk_pad/emsa2/emsa2.h b/lib/pk_pad/emsa2/emsa2.h
index fb0cecb21..fb0cecb21 100644
--- a/src/pk_pad/emsa2/emsa2.h
+++ b/lib/pk_pad/emsa2/emsa2.h
diff --git a/src/pk_pad/emsa2/info.txt b/lib/pk_pad/emsa2/info.txt
index 0c9bd2289..0c9bd2289 100644
--- a/src/pk_pad/emsa2/info.txt
+++ b/lib/pk_pad/emsa2/info.txt
diff --git a/src/pk_pad/emsa3/emsa3.cpp b/lib/pk_pad/emsa3/emsa3.cpp
index 0d603c508..0d603c508 100644
--- a/src/pk_pad/emsa3/emsa3.cpp
+++ b/lib/pk_pad/emsa3/emsa3.cpp
diff --git a/src/pk_pad/emsa3/emsa3.h b/lib/pk_pad/emsa3/emsa3.h
index 9fbda67ee..9fbda67ee 100644
--- a/src/pk_pad/emsa3/emsa3.h
+++ b/lib/pk_pad/emsa3/emsa3.h
diff --git a/src/pk_pad/emsa3/info.txt b/lib/pk_pad/emsa3/info.txt
index aea998f13..aea998f13 100644
--- a/src/pk_pad/emsa3/info.txt
+++ b/lib/pk_pad/emsa3/info.txt
diff --git a/src/pk_pad/emsa4/emsa4.cpp b/lib/pk_pad/emsa4/emsa4.cpp
index c8b8cbc6a..c8b8cbc6a 100644
--- a/src/pk_pad/emsa4/emsa4.cpp
+++ b/lib/pk_pad/emsa4/emsa4.cpp
diff --git a/src/pk_pad/emsa4/emsa4.h b/lib/pk_pad/emsa4/emsa4.h
index 44bf5a429..44bf5a429 100644
--- a/src/pk_pad/emsa4/emsa4.h
+++ b/lib/pk_pad/emsa4/emsa4.h
diff --git a/src/pk_pad/emsa4/info.txt b/lib/pk_pad/emsa4/info.txt
index b7ea466ce..b7ea466ce 100644
--- a/src/pk_pad/emsa4/info.txt
+++ b/lib/pk_pad/emsa4/info.txt
diff --git a/src/pk_pad/emsa_raw/emsa_raw.cpp b/lib/pk_pad/emsa_raw/emsa_raw.cpp
index cb0f99e9c..cb0f99e9c 100644
--- a/src/pk_pad/emsa_raw/emsa_raw.cpp
+++ b/lib/pk_pad/emsa_raw/emsa_raw.cpp
diff --git a/src/pk_pad/emsa_raw/emsa_raw.h b/lib/pk_pad/emsa_raw/emsa_raw.h
index 8ab763575..8ab763575 100644
--- a/src/pk_pad/emsa_raw/emsa_raw.h
+++ b/lib/pk_pad/emsa_raw/emsa_raw.h
diff --git a/src/pk_pad/emsa_raw/info.txt b/lib/pk_pad/emsa_raw/info.txt
index f01d1bfa2..f01d1bfa2 100644
--- a/src/pk_pad/emsa_raw/info.txt
+++ b/lib/pk_pad/emsa_raw/info.txt
diff --git a/src/pk_pad/get_pk_pad.cpp b/lib/pk_pad/get_pk_pad.cpp
index 8c27b1fa1..8c27b1fa1 100644
--- a/src/pk_pad/get_pk_pad.cpp
+++ b/lib/pk_pad/get_pk_pad.cpp
diff --git a/src/pk_pad/hash_id/hash_id.cpp b/lib/pk_pad/hash_id/hash_id.cpp
index a60e53352..a60e53352 100644
--- a/src/pk_pad/hash_id/hash_id.cpp
+++ b/lib/pk_pad/hash_id/hash_id.cpp
diff --git a/src/pk_pad/hash_id/hash_id.h b/lib/pk_pad/hash_id/hash_id.h
index 070e7ddb9..070e7ddb9 100644
--- a/src/pk_pad/hash_id/hash_id.h
+++ b/lib/pk_pad/hash_id/hash_id.h
diff --git a/src/pk_pad/hash_id/info.txt b/lib/pk_pad/hash_id/info.txt
index e6df99b6f..e6df99b6f 100644
--- a/src/pk_pad/hash_id/info.txt
+++ b/lib/pk_pad/hash_id/info.txt
diff --git a/src/pk_pad/info.txt b/lib/pk_pad/info.txt
index 5c6a9e4a7..5c6a9e4a7 100644
--- a/src/pk_pad/info.txt
+++ b/lib/pk_pad/info.txt
diff --git a/src/prf/hkdf/hkdf.cpp b/lib/prf/hkdf/hkdf.cpp
index 0a1f7cb31..0a1f7cb31 100644
--- a/src/prf/hkdf/hkdf.cpp
+++ b/lib/prf/hkdf/hkdf.cpp
diff --git a/src/prf/hkdf/hkdf.h b/lib/prf/hkdf/hkdf.h
index e0b5a7376..e0b5a7376 100644
--- a/src/prf/hkdf/hkdf.h
+++ b/lib/prf/hkdf/hkdf.h
diff --git a/src/prf/hkdf/info.txt b/lib/prf/hkdf/info.txt
index 7389e5bb1..7389e5bb1 100644
--- a/src/prf/hkdf/info.txt
+++ b/lib/prf/hkdf/info.txt
diff --git a/src/pubkey/blinding.cpp b/lib/pubkey/blinding.cpp
index c4c0e3b6e..c4c0e3b6e 100644
--- a/src/pubkey/blinding.cpp
+++ b/lib/pubkey/blinding.cpp
diff --git a/src/pubkey/blinding.h b/lib/pubkey/blinding.h
index 712030e4d..712030e4d 100644
--- a/src/pubkey/blinding.h
+++ b/lib/pubkey/blinding.h
diff --git a/src/pubkey/dh/dh.cpp b/lib/pubkey/dh/dh.cpp
index 55d53518a..55d53518a 100644
--- a/src/pubkey/dh/dh.cpp
+++ b/lib/pubkey/dh/dh.cpp
diff --git a/src/pubkey/dh/dh.h b/lib/pubkey/dh/dh.h
index c670399d8..c670399d8 100644
--- a/src/pubkey/dh/dh.h
+++ b/lib/pubkey/dh/dh.h
diff --git a/src/pubkey/dh/info.txt b/lib/pubkey/dh/info.txt
index bb2707951..bb2707951 100644
--- a/src/pubkey/dh/info.txt
+++ b/lib/pubkey/dh/info.txt
diff --git a/src/pubkey/dl_algo/dl_algo.cpp b/lib/pubkey/dl_algo/dl_algo.cpp
index 92c78ac79..92c78ac79 100644
--- a/src/pubkey/dl_algo/dl_algo.cpp
+++ b/lib/pubkey/dl_algo/dl_algo.cpp
diff --git a/src/pubkey/dl_algo/dl_algo.h b/lib/pubkey/dl_algo/dl_algo.h
index abd2acba4..abd2acba4 100644
--- a/src/pubkey/dl_algo/dl_algo.h
+++ b/lib/pubkey/dl_algo/dl_algo.h
diff --git a/src/pubkey/dl_algo/info.txt b/lib/pubkey/dl_algo/info.txt
index 6f3b3195d..6f3b3195d 100644
--- a/src/pubkey/dl_algo/info.txt
+++ b/lib/pubkey/dl_algo/info.txt
diff --git a/src/pubkey/dl_group/dl_group.cpp b/lib/pubkey/dl_group/dl_group.cpp
index 6fd1beeaa..6fd1beeaa 100644
--- a/src/pubkey/dl_group/dl_group.cpp
+++ b/lib/pubkey/dl_group/dl_group.cpp
diff --git a/src/pubkey/dl_group/dl_group.h b/lib/pubkey/dl_group/dl_group.h
index e219bdcbd..e219bdcbd 100644
--- a/src/pubkey/dl_group/dl_group.h
+++ b/lib/pubkey/dl_group/dl_group.h
diff --git a/src/pubkey/dl_group/info.txt b/lib/pubkey/dl_group/info.txt
index 26c6f12ca..26c6f12ca 100644
--- a/src/pubkey/dl_group/info.txt
+++ b/lib/pubkey/dl_group/info.txt
diff --git a/src/pubkey/dl_group/named.cpp b/lib/pubkey/dl_group/named.cpp
index df44f026b..df44f026b 100644
--- a/src/pubkey/dl_group/named.cpp
+++ b/lib/pubkey/dl_group/named.cpp
diff --git a/src/pubkey/dlies/dlies.cpp b/lib/pubkey/dlies/dlies.cpp
index 715b55a36..715b55a36 100644
--- a/src/pubkey/dlies/dlies.cpp
+++ b/lib/pubkey/dlies/dlies.cpp
diff --git a/src/pubkey/dlies/dlies.h b/lib/pubkey/dlies/dlies.h
index 9739afeb2..9739afeb2 100644
--- a/src/pubkey/dlies/dlies.h
+++ b/lib/pubkey/dlies/dlies.h
diff --git a/src/pubkey/dlies/info.txt b/lib/pubkey/dlies/info.txt
index b159cc546..b159cc546 100644
--- a/src/pubkey/dlies/info.txt
+++ b/lib/pubkey/dlies/info.txt
diff --git a/src/pubkey/dsa/dsa.cpp b/lib/pubkey/dsa/dsa.cpp
index 5d56d6b89..5d56d6b89 100644
--- a/src/pubkey/dsa/dsa.cpp
+++ b/lib/pubkey/dsa/dsa.cpp
diff --git a/src/pubkey/dsa/dsa.h b/lib/pubkey/dsa/dsa.h
index 7d51cfdd0..7d51cfdd0 100644
--- a/src/pubkey/dsa/dsa.h
+++ b/lib/pubkey/dsa/dsa.h
diff --git a/src/pubkey/dsa/info.txt b/lib/pubkey/dsa/info.txt
index a3f2a1ee4..a3f2a1ee4 100644
--- a/src/pubkey/dsa/info.txt
+++ b/lib/pubkey/dsa/info.txt
diff --git a/src/pubkey/ec_group/ec_group.cpp b/lib/pubkey/ec_group/ec_group.cpp
index 9143543e4..9143543e4 100644
--- a/src/pubkey/ec_group/ec_group.cpp
+++ b/lib/pubkey/ec_group/ec_group.cpp
diff --git a/src/pubkey/ec_group/ec_group.h b/lib/pubkey/ec_group/ec_group.h
index 80859bd71..80859bd71 100644
--- a/src/pubkey/ec_group/ec_group.h
+++ b/lib/pubkey/ec_group/ec_group.h
diff --git a/src/pubkey/ec_group/info.txt b/lib/pubkey/ec_group/info.txt
index 661f24473..661f24473 100644
--- a/src/pubkey/ec_group/info.txt
+++ b/lib/pubkey/ec_group/info.txt
diff --git a/src/pubkey/ec_group/named.cpp b/lib/pubkey/ec_group/named.cpp
index 86e99db6d..86e99db6d 100644
--- a/src/pubkey/ec_group/named.cpp
+++ b/lib/pubkey/ec_group/named.cpp
diff --git a/src/pubkey/ecc_key/ecc_key.cpp b/lib/pubkey/ecc_key/ecc_key.cpp
index c9d4d62fe..c9d4d62fe 100644
--- a/src/pubkey/ecc_key/ecc_key.cpp
+++ b/lib/pubkey/ecc_key/ecc_key.cpp
diff --git a/src/pubkey/ecc_key/ecc_key.h b/lib/pubkey/ecc_key/ecc_key.h
index de980608a..de980608a 100644
--- a/src/pubkey/ecc_key/ecc_key.h
+++ b/lib/pubkey/ecc_key/ecc_key.h
diff --git a/src/pubkey/ecc_key/info.txt b/lib/pubkey/ecc_key/info.txt
index 6d6d5f0e9..6d6d5f0e9 100644
--- a/src/pubkey/ecc_key/info.txt
+++ b/lib/pubkey/ecc_key/info.txt
diff --git a/src/pubkey/ecdh/ecdh.cpp b/lib/pubkey/ecdh/ecdh.cpp
index 0f93a0f97..0f93a0f97 100644
--- a/src/pubkey/ecdh/ecdh.cpp
+++ b/lib/pubkey/ecdh/ecdh.cpp
diff --git a/src/pubkey/ecdh/ecdh.h b/lib/pubkey/ecdh/ecdh.h
index 0c5d4e010..0c5d4e010 100644
--- a/src/pubkey/ecdh/ecdh.h
+++ b/lib/pubkey/ecdh/ecdh.h
diff --git a/src/pubkey/ecdh/info.txt b/lib/pubkey/ecdh/info.txt
index 9277aca9b..9277aca9b 100644
--- a/src/pubkey/ecdh/info.txt
+++ b/lib/pubkey/ecdh/info.txt
diff --git a/src/pubkey/ecdsa/ecdsa.cpp b/lib/pubkey/ecdsa/ecdsa.cpp
index 6ff082649..6ff082649 100644
--- a/src/pubkey/ecdsa/ecdsa.cpp
+++ b/lib/pubkey/ecdsa/ecdsa.cpp
diff --git a/src/pubkey/ecdsa/ecdsa.h b/lib/pubkey/ecdsa/ecdsa.h
index e37fa1562..e37fa1562 100644
--- a/src/pubkey/ecdsa/ecdsa.h
+++ b/lib/pubkey/ecdsa/ecdsa.h
diff --git a/src/pubkey/ecdsa/info.txt b/lib/pubkey/ecdsa/info.txt
index fcf688402..fcf688402 100644
--- a/src/pubkey/ecdsa/info.txt
+++ b/lib/pubkey/ecdsa/info.txt
diff --git a/src/pubkey/elgamal/elgamal.cpp b/lib/pubkey/elgamal/elgamal.cpp
index c8a9ba9d0..c8a9ba9d0 100644
--- a/src/pubkey/elgamal/elgamal.cpp
+++ b/lib/pubkey/elgamal/elgamal.cpp
diff --git a/src/pubkey/elgamal/elgamal.h b/lib/pubkey/elgamal/elgamal.h
index 9566bcca6..9566bcca6 100644
--- a/src/pubkey/elgamal/elgamal.h
+++ b/lib/pubkey/elgamal/elgamal.h
diff --git a/src/pubkey/elgamal/info.txt b/lib/pubkey/elgamal/info.txt
index 4fe20e828..4fe20e828 100644
--- a/src/pubkey/elgamal/info.txt
+++ b/lib/pubkey/elgamal/info.txt
diff --git a/src/pubkey/gost_3410/gost_3410.cpp b/lib/pubkey/gost_3410/gost_3410.cpp
index 9a1e6d85b..9a1e6d85b 100644
--- a/src/pubkey/gost_3410/gost_3410.cpp
+++ b/lib/pubkey/gost_3410/gost_3410.cpp
diff --git a/src/pubkey/gost_3410/gost_3410.h b/lib/pubkey/gost_3410/gost_3410.h
index 6b1506b10..6b1506b10 100644
--- a/src/pubkey/gost_3410/gost_3410.h
+++ b/lib/pubkey/gost_3410/gost_3410.h
diff --git a/src/pubkey/gost_3410/info.txt b/lib/pubkey/gost_3410/info.txt
index 63521d3dd..63521d3dd 100644
--- a/src/pubkey/gost_3410/info.txt
+++ b/lib/pubkey/gost_3410/info.txt
diff --git a/src/pubkey/if_algo/if_algo.cpp b/lib/pubkey/if_algo/if_algo.cpp
index f6aeb69db..f6aeb69db 100644
--- a/src/pubkey/if_algo/if_algo.cpp
+++ b/lib/pubkey/if_algo/if_algo.cpp
diff --git a/src/pubkey/if_algo/if_algo.h b/lib/pubkey/if_algo/if_algo.h
index 7dd6d19f0..7dd6d19f0 100644
--- a/src/pubkey/if_algo/if_algo.h
+++ b/lib/pubkey/if_algo/if_algo.h
diff --git a/src/pubkey/if_algo/info.txt b/lib/pubkey/if_algo/info.txt
index e4d2dbb5e..e4d2dbb5e 100644
--- a/src/pubkey/if_algo/info.txt
+++ b/lib/pubkey/if_algo/info.txt
diff --git a/src/pubkey/info.txt b/lib/pubkey/info.txt
index 27a332b5c..27a332b5c 100644
--- a/src/pubkey/info.txt
+++ b/lib/pubkey/info.txt
diff --git a/src/pubkey/keypair/info.txt b/lib/pubkey/keypair/info.txt
index 10fb2013b..10fb2013b 100644
--- a/src/pubkey/keypair/info.txt
+++ b/lib/pubkey/keypair/info.txt
diff --git a/src/pubkey/keypair/keypair.cpp b/lib/pubkey/keypair/keypair.cpp
index a8631062d..a8631062d 100644
--- a/src/pubkey/keypair/keypair.cpp
+++ b/lib/pubkey/keypair/keypair.cpp
diff --git a/src/pubkey/keypair/keypair.h b/lib/pubkey/keypair/keypair.h
index c7b128e53..c7b128e53 100644
--- a/src/pubkey/keypair/keypair.h
+++ b/lib/pubkey/keypair/keypair.h
diff --git a/src/pubkey/nr/info.txt b/lib/pubkey/nr/info.txt
index 8c2816fe7..8c2816fe7 100644
--- a/src/pubkey/nr/info.txt
+++ b/lib/pubkey/nr/info.txt
diff --git a/src/pubkey/nr/nr.cpp b/lib/pubkey/nr/nr.cpp
index 87cf3d038..87cf3d038 100644
--- a/src/pubkey/nr/nr.cpp
+++ b/lib/pubkey/nr/nr.cpp
diff --git a/src/pubkey/nr/nr.h b/lib/pubkey/nr/nr.h
index 5be336a21..5be336a21 100644
--- a/src/pubkey/nr/nr.h
+++ b/lib/pubkey/nr/nr.h
diff --git a/src/pubkey/pk_algs.cpp b/lib/pubkey/pk_algs.cpp
index 9673199e0..9673199e0 100644
--- a/src/pubkey/pk_algs.cpp
+++ b/lib/pubkey/pk_algs.cpp
diff --git a/src/pubkey/pk_algs.h b/lib/pubkey/pk_algs.h
index d8f24a1b8..d8f24a1b8 100644
--- a/src/pubkey/pk_algs.h
+++ b/lib/pubkey/pk_algs.h
diff --git a/src/pubkey/pk_keys.cpp b/lib/pubkey/pk_keys.cpp
index c19c676ab..c19c676ab 100644
--- a/src/pubkey/pk_keys.cpp
+++ b/lib/pubkey/pk_keys.cpp
diff --git a/src/pubkey/pk_keys.h b/lib/pubkey/pk_keys.h
index a8585c154..a8585c154 100644
--- a/src/pubkey/pk_keys.h
+++ b/lib/pubkey/pk_keys.h
diff --git a/src/pubkey/pk_ops.h b/lib/pubkey/pk_ops.h
index 8a08ef430..8a08ef430 100644
--- a/src/pubkey/pk_ops.h
+++ b/lib/pubkey/pk_ops.h
diff --git a/src/pubkey/pkcs8.cpp b/lib/pubkey/pkcs8.cpp
index 0dd97a866..0dd97a866 100644
--- a/src/pubkey/pkcs8.cpp
+++ b/lib/pubkey/pkcs8.cpp
diff --git a/src/pubkey/pkcs8.h b/lib/pubkey/pkcs8.h
index 302003ad4..302003ad4 100644
--- a/src/pubkey/pkcs8.h
+++ b/lib/pubkey/pkcs8.h
diff --git a/src/pubkey/pubkey.cpp b/lib/pubkey/pubkey.cpp
index 313d54c16..313d54c16 100644
--- a/src/pubkey/pubkey.cpp
+++ b/lib/pubkey/pubkey.cpp
diff --git a/src/pubkey/pubkey.h b/lib/pubkey/pubkey.h
index cfa46109c..cfa46109c 100644
--- a/src/pubkey/pubkey.h
+++ b/lib/pubkey/pubkey.h
diff --git a/src/pubkey/rsa/info.txt b/lib/pubkey/rsa/info.txt
index 6171642bc..6171642bc 100644
--- a/src/pubkey/rsa/info.txt
+++ b/lib/pubkey/rsa/info.txt
diff --git a/src/pubkey/rsa/rsa.cpp b/lib/pubkey/rsa/rsa.cpp
index 199ce6ad8..199ce6ad8 100644
--- a/src/pubkey/rsa/rsa.cpp
+++ b/lib/pubkey/rsa/rsa.cpp
diff --git a/src/pubkey/rsa/rsa.h b/lib/pubkey/rsa/rsa.h
index 4d9189d20..4d9189d20 100644
--- a/src/pubkey/rsa/rsa.h
+++ b/lib/pubkey/rsa/rsa.h
diff --git a/src/pubkey/rw/info.txt b/lib/pubkey/rw/info.txt
index 486ede47f..486ede47f 100644
--- a/src/pubkey/rw/info.txt
+++ b/lib/pubkey/rw/info.txt
diff --git a/src/pubkey/rw/rw.cpp b/lib/pubkey/rw/rw.cpp
index 63e7977d8..63e7977d8 100644
--- a/src/pubkey/rw/rw.cpp
+++ b/lib/pubkey/rw/rw.cpp
diff --git a/src/pubkey/rw/rw.h b/lib/pubkey/rw/rw.h
index 1e918e70c..1e918e70c 100644
--- a/src/pubkey/rw/rw.h
+++ b/lib/pubkey/rw/rw.h
diff --git a/src/pubkey/workfactor.cpp b/lib/pubkey/workfactor.cpp
index b917ce52d..b917ce52d 100644
--- a/src/pubkey/workfactor.cpp
+++ b/lib/pubkey/workfactor.cpp
diff --git a/src/pubkey/workfactor.h b/lib/pubkey/workfactor.h
index 179b580e7..179b580e7 100644
--- a/src/pubkey/workfactor.h
+++ b/lib/pubkey/workfactor.h
diff --git a/src/pubkey/x509_key.cpp b/lib/pubkey/x509_key.cpp
index 10395837c..10395837c 100644
--- a/src/pubkey/x509_key.cpp
+++ b/lib/pubkey/x509_key.cpp
diff --git a/src/pubkey/x509_key.h b/lib/pubkey/x509_key.h
index 14e5c9699..14e5c9699 100644
--- a/src/pubkey/x509_key.h
+++ b/lib/pubkey/x509_key.h
diff --git a/src/rng/auto_rng/auto_rng.h b/lib/rng/auto_rng/auto_rng.h
index 13201f251..13201f251 100644
--- a/src/rng/auto_rng/auto_rng.h
+++ b/lib/rng/auto_rng/auto_rng.h
diff --git a/src/rng/auto_rng/info.txt b/lib/rng/auto_rng/info.txt
index 848c06ac3..848c06ac3 100644
--- a/src/rng/auto_rng/info.txt
+++ b/lib/rng/auto_rng/info.txt
diff --git a/src/rng/hmac_rng/hmac_rng.cpp b/lib/rng/hmac_rng/hmac_rng.cpp
index 98ae6439e..98ae6439e 100644
--- a/src/rng/hmac_rng/hmac_rng.cpp
+++ b/lib/rng/hmac_rng/hmac_rng.cpp
diff --git a/src/rng/hmac_rng/hmac_rng.h b/lib/rng/hmac_rng/hmac_rng.h
index 8fee5be5a..8fee5be5a 100644
--- a/src/rng/hmac_rng/hmac_rng.h
+++ b/lib/rng/hmac_rng/hmac_rng.h
diff --git a/src/rng/hmac_rng/info.txt b/lib/rng/hmac_rng/info.txt
index 36a8a7a34..36a8a7a34 100644
--- a/src/rng/hmac_rng/info.txt
+++ b/lib/rng/hmac_rng/info.txt
diff --git a/src/rng/info.txt b/lib/rng/info.txt
index 4c88ba382..4c88ba382 100644
--- a/src/rng/info.txt
+++ b/lib/rng/info.txt
diff --git a/src/rng/rng.cpp b/lib/rng/rng.cpp
index 12a6c163e..12a6c163e 100644
--- a/src/rng/rng.cpp
+++ b/lib/rng/rng.cpp
diff --git a/src/rng/rng.h b/lib/rng/rng.h
index 8664ccbf7..8664ccbf7 100644
--- a/src/rng/rng.h
+++ b/lib/rng/rng.h
diff --git a/src/rng/x931_rng/info.txt b/lib/rng/x931_rng/info.txt
index beab0dbfd..beab0dbfd 100644
--- a/src/rng/x931_rng/info.txt
+++ b/lib/rng/x931_rng/info.txt
diff --git a/src/rng/x931_rng/x931_rng.cpp b/lib/rng/x931_rng/x931_rng.cpp
index b36f87106..b36f87106 100644
--- a/src/rng/x931_rng/x931_rng.cpp
+++ b/lib/rng/x931_rng/x931_rng.cpp
diff --git a/src/rng/x931_rng/x931_rng.h b/lib/rng/x931_rng/x931_rng.h
index 8052cedc3..8052cedc3 100644
--- a/src/rng/x931_rng/x931_rng.h
+++ b/lib/rng/x931_rng/x931_rng.h
diff --git a/src/selftest/info.txt b/lib/selftest/info.txt
index 265cc0bac..265cc0bac 100644
--- a/src/selftest/info.txt
+++ b/lib/selftest/info.txt
diff --git a/src/selftest/selftest.cpp b/lib/selftest/selftest.cpp
index 87111b292..87111b292 100644
--- a/src/selftest/selftest.cpp
+++ b/lib/selftest/selftest.cpp
diff --git a/src/selftest/selftest.h b/lib/selftest/selftest.h
index 2ceadd0d4..2ceadd0d4 100644
--- a/src/selftest/selftest.h
+++ b/lib/selftest/selftest.h
diff --git a/src/simd/info.txt b/lib/simd/info.txt
index 35620c940..35620c940 100644
--- a/src/simd/info.txt
+++ b/lib/simd/info.txt
diff --git a/src/simd/simd_32.h b/lib/simd/simd_32.h
index 15f882fea..15f882fea 100644
--- a/src/simd/simd_32.h
+++ b/lib/simd/simd_32.h
diff --git a/src/simd/simd_altivec/info.txt b/lib/simd/simd_altivec/info.txt
index 19168a928..19168a928 100644
--- a/src/simd/simd_altivec/info.txt
+++ b/lib/simd/simd_altivec/info.txt
diff --git a/src/simd/simd_altivec/simd_altivec.h b/lib/simd/simd_altivec/simd_altivec.h
index f675587bc..f675587bc 100644
--- a/src/simd/simd_altivec/simd_altivec.h
+++ b/lib/simd/simd_altivec/simd_altivec.h
diff --git a/src/simd/simd_scalar/info.txt b/lib/simd/simd_scalar/info.txt
index 26a9fbfee..26a9fbfee 100644
--- a/src/simd/simd_scalar/info.txt
+++ b/lib/simd/simd_scalar/info.txt
diff --git a/src/simd/simd_scalar/simd_scalar.h b/lib/simd/simd_scalar/simd_scalar.h
index 55dd26d6f..55dd26d6f 100644
--- a/src/simd/simd_scalar/simd_scalar.h
+++ b/lib/simd/simd_scalar/simd_scalar.h
diff --git a/src/simd/simd_sse2/info.txt b/lib/simd/simd_sse2/info.txt
index bd9e430cb..bd9e430cb 100644
--- a/src/simd/simd_sse2/info.txt
+++ b/lib/simd/simd_sse2/info.txt
diff --git a/src/simd/simd_sse2/simd_sse2.h b/lib/simd/simd_sse2/simd_sse2.h
index 6cbed1df8..6cbed1df8 100644
--- a/src/simd/simd_sse2/simd_sse2.h
+++ b/lib/simd/simd_sse2/simd_sse2.h
diff --git a/src/stream/ctr/ctr.cpp b/lib/stream/ctr/ctr.cpp
index 87ec86c65..87ec86c65 100644
--- a/src/stream/ctr/ctr.cpp
+++ b/lib/stream/ctr/ctr.cpp
diff --git a/src/stream/ctr/ctr.h b/lib/stream/ctr/ctr.h
index 84cf9ed5d..84cf9ed5d 100644
--- a/src/stream/ctr/ctr.h
+++ b/lib/stream/ctr/ctr.h
diff --git a/src/stream/ctr/info.txt b/lib/stream/ctr/info.txt
index 84d90a76f..84d90a76f 100644
--- a/src/stream/ctr/info.txt
+++ b/lib/stream/ctr/info.txt
diff --git a/src/stream/info.txt b/lib/stream/info.txt
index faa2db215..faa2db215 100644
--- a/src/stream/info.txt
+++ b/lib/stream/info.txt
diff --git a/src/stream/ofb/info.txt b/lib/stream/ofb/info.txt
index 11b6bfb27..11b6bfb27 100644
--- a/src/stream/ofb/info.txt
+++ b/lib/stream/ofb/info.txt
diff --git a/src/stream/ofb/ofb.cpp b/lib/stream/ofb/ofb.cpp
index 1137a58af..1137a58af 100644
--- a/src/stream/ofb/ofb.cpp
+++ b/lib/stream/ofb/ofb.cpp
diff --git a/src/stream/ofb/ofb.h b/lib/stream/ofb/ofb.h
index 9d4fd882f..9d4fd882f 100644
--- a/src/stream/ofb/ofb.h
+++ b/lib/stream/ofb/ofb.h
diff --git a/src/stream/rc4/info.txt b/lib/stream/rc4/info.txt
index f61b8a4cc..f61b8a4cc 100644
--- a/src/stream/rc4/info.txt
+++ b/lib/stream/rc4/info.txt
diff --git a/src/stream/rc4/rc4.cpp b/lib/stream/rc4/rc4.cpp
index df6976235..df6976235 100644
--- a/src/stream/rc4/rc4.cpp
+++ b/lib/stream/rc4/rc4.cpp
diff --git a/src/stream/rc4/rc4.h b/lib/stream/rc4/rc4.h
index c23f8c853..c23f8c853 100644
--- a/src/stream/rc4/rc4.h
+++ b/lib/stream/rc4/rc4.h
diff --git a/src/stream/salsa20/info.txt b/lib/stream/salsa20/info.txt
index 10f9a8cb2..10f9a8cb2 100644
--- a/src/stream/salsa20/info.txt
+++ b/lib/stream/salsa20/info.txt
diff --git a/src/stream/salsa20/salsa20.cpp b/lib/stream/salsa20/salsa20.cpp
index d8db69ae6..d8db69ae6 100644
--- a/src/stream/salsa20/salsa20.cpp
+++ b/lib/stream/salsa20/salsa20.cpp
diff --git a/src/stream/salsa20/salsa20.h b/lib/stream/salsa20/salsa20.h
index b68bb979e..b68bb979e 100644
--- a/src/stream/salsa20/salsa20.h
+++ b/lib/stream/salsa20/salsa20.h
diff --git a/src/stream/stream_cipher.cpp b/lib/stream/stream_cipher.cpp
index 7dbd3e2e3..7dbd3e2e3 100644
--- a/src/stream/stream_cipher.cpp
+++ b/lib/stream/stream_cipher.cpp
diff --git a/src/stream/stream_cipher.h b/lib/stream/stream_cipher.h
index f3d3999f0..f3d3999f0 100644
--- a/src/stream/stream_cipher.h
+++ b/lib/stream/stream_cipher.h
diff --git a/src/tls/info.txt b/lib/tls/info.txt
index adae12cb2..adae12cb2 100644
--- a/src/tls/info.txt
+++ b/lib/tls/info.txt
diff --git a/src/tls/msg_cert_req.cpp b/lib/tls/msg_cert_req.cpp
index 23d59c6d4..23d59c6d4 100644
--- a/src/tls/msg_cert_req.cpp
+++ b/lib/tls/msg_cert_req.cpp
diff --git a/src/tls/msg_cert_verify.cpp b/lib/tls/msg_cert_verify.cpp
index 436b84c24..436b84c24 100644
--- a/src/tls/msg_cert_verify.cpp
+++ b/lib/tls/msg_cert_verify.cpp
diff --git a/src/tls/msg_certificate.cpp b/lib/tls/msg_certificate.cpp
index 417ad34ce..417ad34ce 100644
--- a/src/tls/msg_certificate.cpp
+++ b/lib/tls/msg_certificate.cpp
diff --git a/src/tls/msg_client_hello.cpp b/lib/tls/msg_client_hello.cpp
index 0d91af472..0d91af472 100644
--- a/src/tls/msg_client_hello.cpp
+++ b/lib/tls/msg_client_hello.cpp
diff --git a/src/tls/msg_client_kex.cpp b/lib/tls/msg_client_kex.cpp
index ae8b82fd4..ae8b82fd4 100644
--- a/src/tls/msg_client_kex.cpp
+++ b/lib/tls/msg_client_kex.cpp
diff --git a/src/tls/msg_finished.cpp b/lib/tls/msg_finished.cpp
index c018497c8..c018497c8 100644
--- a/src/tls/msg_finished.cpp
+++ b/lib/tls/msg_finished.cpp
diff --git a/src/tls/msg_hello_verify.cpp b/lib/tls/msg_hello_verify.cpp
index f8a117c03..f8a117c03 100644
--- a/src/tls/msg_hello_verify.cpp
+++ b/lib/tls/msg_hello_verify.cpp
diff --git a/src/tls/msg_next_protocol.cpp b/lib/tls/msg_next_protocol.cpp
index a09fd02d1..a09fd02d1 100644
--- a/src/tls/msg_next_protocol.cpp
+++ b/lib/tls/msg_next_protocol.cpp
diff --git a/src/tls/msg_server_hello.cpp b/lib/tls/msg_server_hello.cpp
index a775e0b4b..a775e0b4b 100644
--- a/src/tls/msg_server_hello.cpp
+++ b/lib/tls/msg_server_hello.cpp
diff --git a/src/tls/msg_server_kex.cpp b/lib/tls/msg_server_kex.cpp
index b8293d3e8..b8293d3e8 100644
--- a/src/tls/msg_server_kex.cpp
+++ b/lib/tls/msg_server_kex.cpp
diff --git a/src/tls/msg_session_ticket.cpp b/lib/tls/msg_session_ticket.cpp
index 2bb9987a9..2bb9987a9 100644
--- a/src/tls/msg_session_ticket.cpp
+++ b/lib/tls/msg_session_ticket.cpp
diff --git a/src/tls/sessions_sqlite/info.txt b/lib/tls/sessions_sqlite/info.txt
index 76d53f995..76d53f995 100644
--- a/src/tls/sessions_sqlite/info.txt
+++ b/lib/tls/sessions_sqlite/info.txt
diff --git a/src/tls/sessions_sqlite/tls_session_manager_sqlite.cpp b/lib/tls/sessions_sqlite/tls_session_manager_sqlite.cpp
index d4f286a8d..d4f286a8d 100644
--- a/src/tls/sessions_sqlite/tls_session_manager_sqlite.cpp
+++ b/lib/tls/sessions_sqlite/tls_session_manager_sqlite.cpp
diff --git a/src/tls/sessions_sqlite/tls_session_manager_sqlite.h b/lib/tls/sessions_sqlite/tls_session_manager_sqlite.h
index 7892ccd6a..7892ccd6a 100644
--- a/src/tls/sessions_sqlite/tls_session_manager_sqlite.h
+++ b/lib/tls/sessions_sqlite/tls_session_manager_sqlite.h
diff --git a/src/tls/tls_alert.cpp b/lib/tls/tls_alert.cpp
index 15bb2a2dc..15bb2a2dc 100644
--- a/src/tls/tls_alert.cpp
+++ b/lib/tls/tls_alert.cpp
diff --git a/src/tls/tls_alert.h b/lib/tls/tls_alert.h
index bf32178ee..bf32178ee 100644
--- a/src/tls/tls_alert.h
+++ b/lib/tls/tls_alert.h
diff --git a/src/tls/tls_blocking.cpp b/lib/tls/tls_blocking.cpp
index 4b33ba926..4b33ba926 100644
--- a/src/tls/tls_blocking.cpp
+++ b/lib/tls/tls_blocking.cpp
diff --git a/src/tls/tls_blocking.h b/lib/tls/tls_blocking.h
index cfa96ce8d..cfa96ce8d 100644
--- a/src/tls/tls_blocking.h
+++ b/lib/tls/tls_blocking.h
diff --git a/src/tls/tls_channel.cpp b/lib/tls/tls_channel.cpp
index 8ed876b3f..8ed876b3f 100644
--- a/src/tls/tls_channel.cpp
+++ b/lib/tls/tls_channel.cpp
diff --git a/src/tls/tls_channel.h b/lib/tls/tls_channel.h
index e7b53f563..e7b53f563 100644
--- a/src/tls/tls_channel.h
+++ b/lib/tls/tls_channel.h
diff --git a/src/tls/tls_ciphersuite.cpp b/lib/tls/tls_ciphersuite.cpp
index e8c551b01..e8c551b01 100644
--- a/src/tls/tls_ciphersuite.cpp
+++ b/lib/tls/tls_ciphersuite.cpp
diff --git a/src/tls/tls_ciphersuite.h b/lib/tls/tls_ciphersuite.h
index 865e66abb..865e66abb 100644
--- a/src/tls/tls_ciphersuite.h
+++ b/lib/tls/tls_ciphersuite.h
diff --git a/src/tls/tls_client.cpp b/lib/tls/tls_client.cpp
index f17247c16..f17247c16 100644
--- a/src/tls/tls_client.cpp
+++ b/lib/tls/tls_client.cpp
diff --git a/src/tls/tls_client.h b/lib/tls/tls_client.h
index c4440c7ac..c4440c7ac 100644
--- a/src/tls/tls_client.h
+++ b/lib/tls/tls_client.h
diff --git a/src/tls/tls_exceptn.h b/lib/tls/tls_exceptn.h
index 529d1f315..529d1f315 100644
--- a/src/tls/tls_exceptn.h
+++ b/lib/tls/tls_exceptn.h
diff --git a/src/tls/tls_extensions.cpp b/lib/tls/tls_extensions.cpp
index 1ae9f1749..1ae9f1749 100644
--- a/src/tls/tls_extensions.cpp
+++ b/lib/tls/tls_extensions.cpp
diff --git a/src/tls/tls_extensions.h b/lib/tls/tls_extensions.h
index de3654fd3..de3654fd3 100644
--- a/src/tls/tls_extensions.h
+++ b/lib/tls/tls_extensions.h
diff --git a/src/tls/tls_handshake_hash.cpp b/lib/tls/tls_handshake_hash.cpp
index 4e7a0b9b7..4e7a0b9b7 100644
--- a/src/tls/tls_handshake_hash.cpp
+++ b/lib/tls/tls_handshake_hash.cpp
diff --git a/src/tls/tls_handshake_hash.h b/lib/tls/tls_handshake_hash.h
index 840895963..840895963 100644
--- a/src/tls/tls_handshake_hash.h
+++ b/lib/tls/tls_handshake_hash.h
diff --git a/src/tls/tls_handshake_io.cpp b/lib/tls/tls_handshake_io.cpp
index 38def13a2..38def13a2 100644
--- a/src/tls/tls_handshake_io.cpp
+++ b/lib/tls/tls_handshake_io.cpp
diff --git a/src/tls/tls_handshake_io.h b/lib/tls/tls_handshake_io.h
index 36c605c30..36c605c30 100644
--- a/src/tls/tls_handshake_io.h
+++ b/lib/tls/tls_handshake_io.h
diff --git a/src/tls/tls_handshake_msg.h b/lib/tls/tls_handshake_msg.h
index 1c44554d3..1c44554d3 100644
--- a/src/tls/tls_handshake_msg.h
+++ b/lib/tls/tls_handshake_msg.h
diff --git a/src/tls/tls_handshake_state.cpp b/lib/tls/tls_handshake_state.cpp
index 84b22cc09..84b22cc09 100644
--- a/src/tls/tls_handshake_state.cpp
+++ b/lib/tls/tls_handshake_state.cpp
diff --git a/src/tls/tls_handshake_state.h b/lib/tls/tls_handshake_state.h
index 9afcd0374..9afcd0374 100644
--- a/src/tls/tls_handshake_state.h
+++ b/lib/tls/tls_handshake_state.h
diff --git a/src/tls/tls_heartbeats.cpp b/lib/tls/tls_heartbeats.cpp
index 8c129858e..8c129858e 100644
--- a/src/tls/tls_heartbeats.cpp
+++ b/lib/tls/tls_heartbeats.cpp
diff --git a/src/tls/tls_heartbeats.h b/lib/tls/tls_heartbeats.h
index 00b197089..00b197089 100644
--- a/src/tls/tls_heartbeats.h
+++ b/lib/tls/tls_heartbeats.h
diff --git a/src/tls/tls_magic.h b/lib/tls/tls_magic.h
index 51f1fce47..51f1fce47 100644
--- a/src/tls/tls_magic.h
+++ b/lib/tls/tls_magic.h
diff --git a/src/tls/tls_messages.h b/lib/tls/tls_messages.h
index 155d2427b..155d2427b 100644
--- a/src/tls/tls_messages.h
+++ b/lib/tls/tls_messages.h
diff --git a/src/tls/tls_policy.cpp b/lib/tls/tls_policy.cpp
index 05251e186..05251e186 100644
--- a/src/tls/tls_policy.cpp
+++ b/lib/tls/tls_policy.cpp
diff --git a/src/tls/tls_policy.h b/lib/tls/tls_policy.h
index 5b205dfeb..5b205dfeb 100644
--- a/src/tls/tls_policy.h
+++ b/lib/tls/tls_policy.h
diff --git a/src/tls/tls_reader.h b/lib/tls/tls_reader.h
index 7440e16b7..7440e16b7 100644
--- a/src/tls/tls_reader.h
+++ b/lib/tls/tls_reader.h
diff --git a/src/tls/tls_record.cpp b/lib/tls/tls_record.cpp
index fc4908dc5..fc4908dc5 100644
--- a/src/tls/tls_record.cpp
+++ b/lib/tls/tls_record.cpp
diff --git a/src/tls/tls_record.h b/lib/tls/tls_record.h
index ef27a0a02..ef27a0a02 100644
--- a/src/tls/tls_record.h
+++ b/lib/tls/tls_record.h
diff --git a/src/tls/tls_seq_numbers.h b/lib/tls/tls_seq_numbers.h
index 87edf3130..87edf3130 100644
--- a/src/tls/tls_seq_numbers.h
+++ b/lib/tls/tls_seq_numbers.h
diff --git a/src/tls/tls_server.cpp b/lib/tls/tls_server.cpp
index bc518571b..bc518571b 100644
--- a/src/tls/tls_server.cpp
+++ b/lib/tls/tls_server.cpp
diff --git a/src/tls/tls_server.h b/lib/tls/tls_server.h
index a514607ba..a514607ba 100644
--- a/src/tls/tls_server.h
+++ b/lib/tls/tls_server.h
diff --git a/src/tls/tls_server_info.h b/lib/tls/tls_server_info.h
index 773296eaf..773296eaf 100644
--- a/src/tls/tls_server_info.h
+++ b/lib/tls/tls_server_info.h
diff --git a/src/tls/tls_session.cpp b/lib/tls/tls_session.cpp
index 6596804b5..6596804b5 100644
--- a/src/tls/tls_session.cpp
+++ b/lib/tls/tls_session.cpp
diff --git a/src/tls/tls_session.h b/lib/tls/tls_session.h
index 65154dfce..65154dfce 100644
--- a/src/tls/tls_session.h
+++ b/lib/tls/tls_session.h
diff --git a/src/tls/tls_session_key.cpp b/lib/tls/tls_session_key.cpp
index 06cd1d0a1..06cd1d0a1 100644
--- a/src/tls/tls_session_key.cpp
+++ b/lib/tls/tls_session_key.cpp
diff --git a/src/tls/tls_session_key.h b/lib/tls/tls_session_key.h
index d62e3400d..d62e3400d 100644
--- a/src/tls/tls_session_key.h
+++ b/lib/tls/tls_session_key.h
diff --git a/src/tls/tls_session_manager.h b/lib/tls/tls_session_manager.h
index e6eacc88c..e6eacc88c 100644
--- a/src/tls/tls_session_manager.h
+++ b/lib/tls/tls_session_manager.h
diff --git a/src/tls/tls_session_manager_memory.cpp b/lib/tls/tls_session_manager_memory.cpp
index 24ede276c..24ede276c 100644
--- a/src/tls/tls_session_manager_memory.cpp
+++ b/lib/tls/tls_session_manager_memory.cpp
diff --git a/src/tls/tls_suite_info.cpp b/lib/tls/tls_suite_info.cpp
index 2984fd535..2984fd535 100644
--- a/src/tls/tls_suite_info.cpp
+++ b/lib/tls/tls_suite_info.cpp
diff --git a/src/tls/tls_version.cpp b/lib/tls/tls_version.cpp
index 7b880d98c..7b880d98c 100644
--- a/src/tls/tls_version.cpp
+++ b/lib/tls/tls_version.cpp
diff --git a/src/tls/tls_version.h b/lib/tls/tls_version.h
index 9fd71b629..9fd71b629 100644
--- a/src/tls/tls_version.h
+++ b/lib/tls/tls_version.h
diff --git a/src/utils/asm_x86_32/asm_x86_32.h b/lib/utils/asm_x86_32/asm_x86_32.h
index d5482c419..d5482c419 100644
--- a/src/utils/asm_x86_32/asm_x86_32.h
+++ b/lib/utils/asm_x86_32/asm_x86_32.h
diff --git a/src/utils/asm_x86_32/info.txt b/lib/utils/asm_x86_32/info.txt
index d29b25fa3..d29b25fa3 100644
--- a/src/utils/asm_x86_32/info.txt
+++ b/lib/utils/asm_x86_32/info.txt
diff --git a/src/utils/asm_x86_64/asm_x86_64.h b/lib/utils/asm_x86_64/asm_x86_64.h
index 7abc1f392..7abc1f392 100644
--- a/src/utils/asm_x86_64/asm_x86_64.h
+++ b/lib/utils/asm_x86_64/asm_x86_64.h
diff --git a/src/utils/asm_x86_64/info.txt b/lib/utils/asm_x86_64/info.txt
index 3173f3b14..3173f3b14 100644
--- a/src/utils/asm_x86_64/info.txt
+++ b/lib/utils/asm_x86_64/info.txt
diff --git a/src/utils/assert.cpp b/lib/utils/assert.cpp
index b6d4f4240..b6d4f4240 100644
--- a/src/utils/assert.cpp
+++ b/lib/utils/assert.cpp
diff --git a/src/utils/assert.h b/lib/utils/assert.h
index f62fae63e..f62fae63e 100644
--- a/src/utils/assert.h
+++ b/lib/utils/assert.h
diff --git a/src/utils/bit_ops.h b/lib/utils/bit_ops.h
index 0072fde71..0072fde71 100644
--- a/src/utils/bit_ops.h
+++ b/lib/utils/bit_ops.h
diff --git a/src/utils/boost/info.txt b/lib/utils/boost/info.txt
index e87fd5b88..e87fd5b88 100644
--- a/src/utils/boost/info.txt
+++ b/lib/utils/boost/info.txt
diff --git a/src/utils/bswap.h b/lib/utils/bswap.h
index 9d2c9bc28..9d2c9bc28 100644
--- a/src/utils/bswap.h
+++ b/lib/utils/bswap.h
diff --git a/src/utils/calendar.cpp b/lib/utils/calendar.cpp
index 14f0113f2..14f0113f2 100644
--- a/src/utils/calendar.cpp
+++ b/lib/utils/calendar.cpp
diff --git a/src/utils/calendar.h b/lib/utils/calendar.h
index d617cc9a0..d617cc9a0 100644
--- a/src/utils/calendar.h
+++ b/lib/utils/calendar.h
diff --git a/src/utils/charset.cpp b/lib/utils/charset.cpp
index 7ee637f80..7ee637f80 100644
--- a/src/utils/charset.cpp
+++ b/lib/utils/charset.cpp
diff --git a/src/utils/charset.h b/lib/utils/charset.h
index afb11733b..afb11733b 100644
--- a/src/utils/charset.h
+++ b/lib/utils/charset.h
diff --git a/src/utils/cpuid.cpp b/lib/utils/cpuid.cpp
index 6da5673c1..6da5673c1 100644
--- a/src/utils/cpuid.cpp
+++ b/lib/utils/cpuid.cpp
diff --git a/src/utils/cpuid.h b/lib/utils/cpuid.h
index 1c4c1df0b..1c4c1df0b 100644
--- a/src/utils/cpuid.h
+++ b/lib/utils/cpuid.h
diff --git a/src/utils/datastor/datastor.cpp b/lib/utils/datastor/datastor.cpp
index 7563e9309..7563e9309 100644
--- a/src/utils/datastor/datastor.cpp
+++ b/lib/utils/datastor/datastor.cpp
diff --git a/src/utils/datastor/datastor.h b/lib/utils/datastor/datastor.h
index 1c0504fc9..1c0504fc9 100644
--- a/src/utils/datastor/datastor.h
+++ b/lib/utils/datastor/datastor.h
diff --git a/src/utils/datastor/info.txt b/lib/utils/datastor/info.txt
index b91fe5082..b91fe5082 100644
--- a/src/utils/datastor/info.txt
+++ b/lib/utils/datastor/info.txt
diff --git a/src/utils/dyn_load/dyn_load.cpp b/lib/utils/dyn_load/dyn_load.cpp
index 51afb1afe..51afb1afe 100644
--- a/src/utils/dyn_load/dyn_load.cpp
+++ b/lib/utils/dyn_load/dyn_load.cpp
diff --git a/src/utils/dyn_load/dyn_load.h b/lib/utils/dyn_load/dyn_load.h
index 9edaed202..9edaed202 100644
--- a/src/utils/dyn_load/dyn_load.h
+++ b/lib/utils/dyn_load/dyn_load.h
diff --git a/src/utils/dyn_load/info.txt b/lib/utils/dyn_load/info.txt
index c8d91dd75..c8d91dd75 100644
--- a/src/utils/dyn_load/info.txt
+++ b/lib/utils/dyn_load/info.txt
diff --git a/src/utils/exceptn.h b/lib/utils/exceptn.h
index c480ffd48..c480ffd48 100644
--- a/src/utils/exceptn.h
+++ b/lib/utils/exceptn.h
diff --git a/src/utils/get_byte.h b/lib/utils/get_byte.h
index 6f8ef2632..6f8ef2632 100644
--- a/src/utils/get_byte.h
+++ b/lib/utils/get_byte.h
diff --git a/src/utils/http_util/http_util.cpp b/lib/utils/http_util/http_util.cpp
index a233c1c60..a233c1c60 100644
--- a/src/utils/http_util/http_util.cpp
+++ b/lib/utils/http_util/http_util.cpp
diff --git a/src/utils/http_util/http_util.h b/lib/utils/http_util/http_util.h
index d024add4d..d024add4d 100644
--- a/src/utils/http_util/http_util.h
+++ b/lib/utils/http_util/http_util.h
diff --git a/src/utils/http_util/info.txt b/lib/utils/http_util/info.txt
index a23a43a3d..a23a43a3d 100644
--- a/src/utils/http_util/info.txt
+++ b/lib/utils/http_util/info.txt
diff --git a/src/utils/info.txt b/lib/utils/info.txt
index 0e8edeb00..0e8edeb00 100644
--- a/src/utils/info.txt
+++ b/lib/utils/info.txt
diff --git a/src/utils/loadstor.h b/lib/utils/loadstor.h
index 29e00592a..29e00592a 100644
--- a/src/utils/loadstor.h
+++ b/lib/utils/loadstor.h
diff --git a/src/utils/mem_ops.h b/lib/utils/mem_ops.h
index be617ff19..be617ff19 100644
--- a/src/utils/mem_ops.h
+++ b/lib/utils/mem_ops.h
diff --git a/src/utils/mul128.h b/lib/utils/mul128.h
index 6725021ba..6725021ba 100644
--- a/src/utils/mul128.h
+++ b/lib/utils/mul128.h
diff --git a/src/utils/parsing.cpp b/lib/utils/parsing.cpp
index cf47e24f8..cf47e24f8 100644
--- a/src/utils/parsing.cpp
+++ b/lib/utils/parsing.cpp
diff --git a/src/utils/parsing.h b/lib/utils/parsing.h
index b37e3cb62..b37e3cb62 100644
--- a/src/utils/parsing.h
+++ b/lib/utils/parsing.h
diff --git a/src/utils/prefetch.h b/lib/utils/prefetch.h
index 66024e5ce..66024e5ce 100644
--- a/src/utils/prefetch.h
+++ b/lib/utils/prefetch.h
diff --git a/src/utils/read_cfg.cpp b/lib/utils/read_cfg.cpp
index ad57a8b3e..ad57a8b3e 100644
--- a/src/utils/read_cfg.cpp
+++ b/lib/utils/read_cfg.cpp
diff --git a/src/utils/rotate.h b/lib/utils/rotate.h
index 2593010b4..2593010b4 100644
--- a/src/utils/rotate.h
+++ b/lib/utils/rotate.h
diff --git a/src/utils/rounding.h b/lib/utils/rounding.h
index 4ddd7a432..4ddd7a432 100644
--- a/src/utils/rounding.h
+++ b/lib/utils/rounding.h
diff --git a/src/utils/semaphore.cpp b/lib/utils/semaphore.cpp
index f4f5b2b53..f4f5b2b53 100644
--- a/src/utils/semaphore.cpp
+++ b/lib/utils/semaphore.cpp
diff --git a/src/utils/semaphore.h b/lib/utils/semaphore.h
index c3ce73680..c3ce73680 100644
--- a/src/utils/semaphore.h
+++ b/lib/utils/semaphore.h
diff --git a/src/utils/sqlite3/info.txt b/lib/utils/sqlite3/info.txt
index 97d59d697..97d59d697 100644
--- a/src/utils/sqlite3/info.txt
+++ b/lib/utils/sqlite3/info.txt
diff --git a/src/utils/sqlite3/sqlite3.cpp b/lib/utils/sqlite3/sqlite3.cpp
index 7f6626759..7f6626759 100644
--- a/src/utils/sqlite3/sqlite3.cpp
+++ b/lib/utils/sqlite3/sqlite3.cpp
diff --git a/src/utils/sqlite3/sqlite3.h b/lib/utils/sqlite3/sqlite3.h
index aef04ab4d..aef04ab4d 100644
--- a/src/utils/sqlite3/sqlite3.h
+++ b/lib/utils/sqlite3/sqlite3.h
diff --git a/src/utils/stl_util.h b/lib/utils/stl_util.h
index 0710d61a5..0710d61a5 100644
--- a/src/utils/stl_util.h
+++ b/lib/utils/stl_util.h
diff --git a/src/utils/types.h b/lib/utils/types.h
index f4a2eeacd..f4a2eeacd 100644
--- a/src/utils/types.h
+++ b/lib/utils/types.h
diff --git a/src/utils/version.cpp b/lib/utils/version.cpp
index 32679cf63..32679cf63 100644
--- a/src/utils/version.cpp
+++ b/lib/utils/version.cpp
diff --git a/src/utils/version.h b/lib/utils/version.h
index 219c261a5..219c261a5 100644
--- a/src/utils/version.h
+++ b/lib/utils/version.h
diff --git a/src/utils/xor_buf.h b/lib/utils/xor_buf.h
index 5773a619c..5773a619c 100644
--- a/src/utils/xor_buf.h
+++ b/lib/utils/xor_buf.h
diff --git a/src/utils/zero_mem.cpp b/lib/utils/zero_mem.cpp
index e812ced0c..e812ced0c 100644
--- a/src/utils/zero_mem.cpp
+++ b/lib/utils/zero_mem.cpp
diff --git a/src/wrap/perl-xs/Botan.pm b/lib/wrap/perl-xs/Botan.pm
index ac4ad91fb..ac4ad91fb 100644
--- a/src/wrap/perl-xs/Botan.pm
+++ b/lib/wrap/perl-xs/Botan.pm
diff --git a/src/wrap/perl-xs/Botan.xs b/lib/wrap/perl-xs/Botan.xs
index 135da0d5d..135da0d5d 100644
--- a/src/wrap/perl-xs/Botan.xs
+++ b/lib/wrap/perl-xs/Botan.xs
diff --git a/src/wrap/perl-xs/Changes b/lib/wrap/perl-xs/Changes
index 5f32b0c63..5f32b0c63 100644
--- a/src/wrap/perl-xs/Changes
+++ b/lib/wrap/perl-xs/Changes
diff --git a/src/wrap/perl-xs/MANIFEST b/lib/wrap/perl-xs/MANIFEST
index b9d8454d6..b9d8454d6 100644
--- a/src/wrap/perl-xs/MANIFEST
+++ b/lib/wrap/perl-xs/MANIFEST
diff --git a/src/wrap/perl-xs/Makefile.PL b/lib/wrap/perl-xs/Makefile.PL
index 5a3276aec..5a3276aec 100644
--- a/src/wrap/perl-xs/Makefile.PL
+++ b/lib/wrap/perl-xs/Makefile.PL
diff --git a/src/wrap/perl-xs/data/ca.cert.der b/lib/wrap/perl-xs/data/ca.cert.der
index d6ed8aeaf..d6ed8aeaf 100644
--- a/src/wrap/perl-xs/data/ca.cert.der
+++ b/lib/wrap/perl-xs/data/ca.cert.der
diff --git a/src/wrap/perl-xs/data/ca.cert.pem b/lib/wrap/perl-xs/data/ca.cert.pem
index 012913b26..012913b26 100644
--- a/src/wrap/perl-xs/data/ca.cert.pem
+++ b/lib/wrap/perl-xs/data/ca.cert.pem
diff --git a/src/wrap/perl-xs/t/base64.t b/lib/wrap/perl-xs/t/base64.t
index f0973e13e..f0973e13e 100644
--- a/src/wrap/perl-xs/t/base64.t
+++ b/lib/wrap/perl-xs/t/base64.t
diff --git a/src/wrap/perl-xs/t/filt.t b/lib/wrap/perl-xs/t/filt.t
index 2a7b4c8ba..2a7b4c8ba 100644
--- a/src/wrap/perl-xs/t/filt.t
+++ b/lib/wrap/perl-xs/t/filt.t
diff --git a/src/wrap/perl-xs/t/hex.t b/lib/wrap/perl-xs/t/hex.t
index 6f447b25c..6f447b25c 100644
--- a/src/wrap/perl-xs/t/hex.t
+++ b/lib/wrap/perl-xs/t/hex.t
diff --git a/src/wrap/perl-xs/t/oid.t b/lib/wrap/perl-xs/t/oid.t
index 66204541f..66204541f 100644
--- a/src/wrap/perl-xs/t/oid.t
+++ b/lib/wrap/perl-xs/t/oid.t
diff --git a/src/wrap/perl-xs/t/pipe.t b/lib/wrap/perl-xs/t/pipe.t
index f850d8519..f850d8519 100644
--- a/src/wrap/perl-xs/t/pipe.t
+++ b/lib/wrap/perl-xs/t/pipe.t
diff --git a/src/wrap/perl-xs/t/testutl.pl b/lib/wrap/perl-xs/t/testutl.pl
index add6f6a45..add6f6a45 100644
--- a/src/wrap/perl-xs/t/testutl.pl
+++ b/lib/wrap/perl-xs/t/testutl.pl
diff --git a/src/wrap/perl-xs/t/x509cert.t b/lib/wrap/perl-xs/t/x509cert.t
index 2a943aeac..2a943aeac 100644
--- a/src/wrap/perl-xs/t/x509cert.t
+++ b/lib/wrap/perl-xs/t/x509cert.t
diff --git a/src/wrap/perl-xs/typemap b/lib/wrap/perl-xs/typemap
index d7403d40d..d7403d40d 100644
--- a/src/wrap/perl-xs/typemap
+++ b/lib/wrap/perl-xs/typemap
diff --git a/src/wrap/python/__init__.py b/lib/wrap/python/__init__.py
index 2df9a456f..2df9a456f 100644
--- a/src/wrap/python/__init__.py
+++ b/lib/wrap/python/__init__.py
diff --git a/src/wrap/python/core.cpp b/lib/wrap/python/core.cpp
index 6dcceee74..6dcceee74 100644
--- a/src/wrap/python/core.cpp
+++ b/lib/wrap/python/core.cpp
diff --git a/src/wrap/python/filter.cpp b/lib/wrap/python/filter.cpp
index e329ed708..e329ed708 100644
--- a/src/wrap/python/filter.cpp
+++ b/lib/wrap/python/filter.cpp
diff --git a/src/wrap/python/python_botan.h b/lib/wrap/python/python_botan.h
index 501f4b9eb..501f4b9eb 100644
--- a/src/wrap/python/python_botan.h
+++ b/lib/wrap/python/python_botan.h
diff --git a/src/wrap/python/rsa.cpp b/lib/wrap/python/rsa.cpp
index 770082945..770082945 100644
--- a/src/wrap/python/rsa.cpp
+++ b/lib/wrap/python/rsa.cpp
diff --git a/src/wrap/python/x509.cpp b/lib/wrap/python/x509.cpp
index 57beb7e4a..57beb7e4a 100644
--- a/src/wrap/python/x509.cpp
+++ b/lib/wrap/python/x509.cpp
diff --git a/src/wrap/sqlite/codec.cpp b/lib/wrap/sqlite/codec.cpp
index 70519ccfa..70519ccfa 100644
--- a/src/wrap/sqlite/codec.cpp
+++ b/lib/wrap/sqlite/codec.cpp
diff --git a/src/wrap/sqlite/codec.h b/lib/wrap/sqlite/codec.h
index 2f94bcc59..2f94bcc59 100644
--- a/src/wrap/sqlite/codec.h
+++ b/lib/wrap/sqlite/codec.h
diff --git a/src/wrap/sqlite/codec_c_interface.h b/lib/wrap/sqlite/codec_c_interface.h
index 1d8c8706f..1d8c8706f 100644
--- a/src/wrap/sqlite/codec_c_interface.h
+++ b/lib/wrap/sqlite/codec_c_interface.h
diff --git a/src/wrap/sqlite/codecext.c b/lib/wrap/sqlite/codecext.c
index e32d60dc2..e32d60dc2 100644
--- a/src/wrap/sqlite/codecext.c
+++ b/lib/wrap/sqlite/codecext.c
diff --git a/src/wrap/sqlite/readme.txt b/lib/wrap/sqlite/readme.txt
index 4971fd44b..4971fd44b 100644
--- a/src/wrap/sqlite/readme.txt
+++ b/lib/wrap/sqlite/readme.txt
diff --git a/src/wrap/sqlite/sqlite3-amalgamation.patch b/lib/wrap/sqlite/sqlite3-amalgamation.patch
index 1c2a5c69d..1c2a5c69d 100644
--- a/src/wrap/sqlite/sqlite3-amalgamation.patch
+++ b/lib/wrap/sqlite/sqlite3-amalgamation.patch
diff --git a/src/wrap/sqlite/test_sqlite.cpp b/lib/wrap/sqlite/test_sqlite.cpp
index a516fd82b..a516fd82b 100644
--- a/src/wrap/sqlite/test_sqlite.cpp
+++ b/lib/wrap/sqlite/test_sqlite.cpp
diff --git a/tests/common.h b/src/common.h
index 1ddf4d2e9..1ddf4d2e9 100644
--- a/tests/common.h
+++ b/src/common.h
diff --git a/tests/getopt.h b/src/getopt.h
index 67cf979f9..67cf979f9 100644
--- a/tests/getopt.h
+++ b/src/getopt.h
diff --git a/tests/main.cpp b/src/main.cpp
index 5171f644f..05b0eed85 100644
--- a/tests/main.cpp
+++ b/src/main.cpp
@@ -18,107 +18,61 @@
 #include <limits>
 #include <memory>
 
-#include <botan/botan.h>
-#include <botan/libstate.h>
-
-#if defined(BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE)
-  #include <botan/dyn_engine.h>
-#endif
+#include <botan/init.h>
+#include <botan/version.h>
+#include <botan/auto_rng.h>
 
 using namespace Botan;
 
-#include "getopt.h"
-#include "bench.h"
 #include "common.h"
-#include "tests.h"
-
-namespace {
+#include "speed/speed.h"
+#include "tests/tests.h"
 
-template<typename T>
-bool test(const char* type, int digits, bool is_signed)
+// from common.h
+void strip_comments(std::string& line)
    {
-   if(std::numeric_limits<T>::is_specialized == false)
-      {
-      std::cout << "Warning: Could not check parameters of " << type
-                << " in std::numeric_limits" << std::endl;
-
-      // assume it's OK (full tests will catch it later)
-      return true;
-      }
-
-   // continue checking after failures
-   bool passed = true;
-
-   if(std::numeric_limits<T>::is_integer == false)
-      {
-      std::cout << "Warning: std::numeric_limits<> says " << type
-                << " is not an integer" << std::endl;
-      passed = false;
-      }
-
-   if(std::numeric_limits<T>::is_signed != is_signed)
-      {
-      std::cout << "Warning: numeric_limits<" << type << ">::is_signed == "
-                << std::boolalpha << std::numeric_limits<T>::is_signed
-                << std::endl;
-      passed = false;
-      }
-
-   if(std::numeric_limits<T>::digits != digits && digits != 0)
-      {
-      std::cout << "Warning: numeric_limits<" << type << ">::digits == "
-                << std::numeric_limits<T>::digits
-                << " expected " << digits << std::endl;
-      passed = false;
-      }
+   if(line.find('#') != std::string::npos)
+      line = line.erase(line.find('#'), std::string::npos);
+   }
 
-   return passed;
+void strip_newlines(std::string& line)
+   {
+   while(line.find('\n') != std::string::npos)
+      line = line.erase(line.find('\n'), 1);
    }
 
-void test_types()
+/* Strip comments, whitespace, etc */
+void strip(std::string& line)
    {
-   bool passed = true;
+   strip_comments(line);
 
-   passed = passed && test<Botan::byte  >("byte",    8, false);
-   passed = passed && test<Botan::u16bit>("u16bit", 16, false);
-   passed = passed && test<Botan::u32bit>("u32bit", 32, false);
-   passed = passed && test<Botan::u64bit>("u64bit", 64, false);
-   passed = passed && test<Botan::s32bit>("s32bit", 31,  true);
+#if 0
+   while(line.find(' ') != std::string::npos)
+      line = line.erase(line.find(' '), 1);
+#endif
 
-   if(!passed)
-      std::cout << "Typedefs in include/types.h may be incorrect!\n";
+   while(line.find('\t') != std::string::npos)
+      line = line.erase(line.find('\t'), 1);
    }
 
-int run_tests()
+std::vector<std::string> parse(const std::string& line)
    {
-   size_t errors = 0;
-
-   try
-      {
-      errors += run_all_tests();
-      }
-   catch(std::exception& e)
-      {
-      std::cout << "Exception in test suite " << e.what() << std::endl;
-      ++errors;
-      }
-   catch(...)
+   const char DELIMITER = ':';
+   std::vector<std::string> substr;
+   std::string::size_type start = 0, end = line.find(DELIMITER);
+   while(end != std::string::npos)
       {
-      std::cout << "Unknown exception caught\n";
-      ++errors;
+      substr.push_back(line.substr(start, end-start));
+      start = end+1;
+      end = line.find(DELIMITER, start);
       }
-
-   if(errors)
-      {
-      std::cout << errors << " test failures\n";
-      return 1;
-      }
-
-   return 0;
+   if(line.size() > start)
+      substr.push_back(line.substr(start));
+   while(substr.size() <= 4) // at least 5 substr, some possibly empty
+      substr.push_back("");
+   return substr;
    }
 
-}
-
 int main(int argc, char* argv[])
    {
    if(BOTAN_VERSION_MAJOR != version_major() ||
@@ -141,8 +95,6 @@ int main(int argc, char* argv[])
                         "algo=|seconds=|buf-size=");
       opts.parse(argv);
 
-      test_types(); // do this always
-
       Botan::LibraryInitializer init;
 
       if(opts.is_set("help") || argc < 2)
@@ -161,7 +113,8 @@ int main(int argc, char* argv[])
 
       if(cmd == "test")
          {
-         return run_tests();
+         const size_t failures = run_all_tests();
+         return failures ? 1 : 0;
          }
 
       if(cmd == "speed")
diff --git a/src/build-data/scripts/dist.py b/src/scripts/dist.py
index 56aabd45f..56aabd45f 100755
--- a/src/build-data/scripts/dist.py
+++ b/src/scripts/dist.py
diff --git a/src/build-data/scripts/tls_suite_info.py b/src/scripts/tls_suite_info.py
index dd507bc28..dd507bc28 100755
--- a/src/build-data/scripts/tls_suite_info.py
+++ b/src/scripts/tls_suite_info.py
diff --git a/tests/pk_bench.cpp b/src/speed/pk_bench.cpp
index da2221b90..6ebb366c5 100644
--- a/tests/pk_bench.cpp
+++ b/src/speed/pk_bench.cpp
@@ -4,6 +4,9 @@
 * Distributed under the terms of the Botan license
 */
 
+#include "speed.h"
+#include "timer.h"
+
 #include <botan/pkcs8.h>
 #include <botan/mem_ops.h>
 #include <botan/parsing.h>
@@ -61,10 +64,6 @@
 
 using namespace Botan;
 
-#include "common.h"
-#include "timer.h"
-#include "bench.h"
-
 #include <iostream>
 #include <fstream>
 #include <string>
diff --git a/tests/bench.cpp b/src/speed/speed.cpp
index 1c2c00bff..b8c14ee59 100644
--- a/tests/bench.cpp
+++ b/src/speed/speed.cpp
@@ -4,6 +4,7 @@
 * Distributed under the terms of the Botan license
 */
 
+#include "speed.h"
 #include <iostream>
 #include <iomanip>
 
@@ -22,8 +23,6 @@
 
 typedef std::chrono::high_resolution_clock benchmark_clock;
 
-#include "common.h"
-#include "bench.h"
 
 using namespace Botan;
 
diff --git a/tests/bench.h b/src/speed/speed.h
index 36edbdb2c..d115960fb 100644
--- a/tests/bench.h
+++ b/src/speed/speed.h
@@ -2,6 +2,7 @@
 #ifndef BOTAN_CHECK_BENCHMARK_H__
 #define BOTAN_CHECK_BENCHMARK_H__
 
+#include "../common.h"
 #include <botan/rng.h>
 #include <botan/transform.h>
 #include <string>
diff --git a/tests/timer.cpp b/src/speed/timer.cpp
index 9f3d34607..9f3d34607 100644
--- a/tests/timer.cpp
+++ b/src/speed/timer.cpp
diff --git a/tests/timer.h b/src/speed/timer.h
index 48d6b6805..48d6b6805 100644
--- a/tests/timer.h
+++ b/src/speed/timer.h
diff --git a/tests/aead.vec b/src/test-data/aead.vec
index 052ac0699..052ac0699 100644
--- a/tests/aead.vec
+++ b/src/test-data/aead.vec
diff --git a/tests/block.vec b/src/test-data/block.vec
index 78eacbe7f..78eacbe7f 100644
--- a/tests/block.vec
+++ b/src/test-data/block.vec
diff --git a/tests/eax.vec b/src/test-data/eax.vec
index 95cd7c1ab..95cd7c1ab 100644
--- a/tests/eax.vec
+++ b/src/test-data/eax.vec
diff --git a/tests/ecc_testdata/CSCA.CSCA.csca-germany.1.crt b/src/test-data/ecc_testdata/CSCA.CSCA.csca-germany.1.crt
index 8653f961a..8653f961a 100644
--- a/tests/ecc_testdata/CSCA.CSCA.csca-germany.1.crt
+++ b/src/test-data/ecc_testdata/CSCA.CSCA.csca-germany.1.crt
diff --git a/tests/ecc_testdata/CSCA.CSCA.csca-germany.1.pem b/src/test-data/ecc_testdata/CSCA.CSCA.csca-germany.1.pem
index 725e1634e..725e1634e 100644
--- a/tests/ecc_testdata/CSCA.CSCA.csca-germany.1.pem
+++ b/src/test-data/ecc_testdata/CSCA.CSCA.csca-germany.1.pem
diff --git a/tests/ecc_testdata/DE1_flen_chars_cvcRequest_ECDSA.der b/src/test-data/ecc_testdata/DE1_flen_chars_cvcRequest_ECDSA.der
index 358ca8f34..358ca8f34 100644
--- a/tests/ecc_testdata/DE1_flen_chars_cvcRequest_ECDSA.der
+++ b/src/test-data/ecc_testdata/DE1_flen_chars_cvcRequest_ECDSA.der
diff --git a/tests/ecc_testdata/Lidia.cer b/src/test-data/ecc_testdata/Lidia.cer
index 58c55689b..58c55689b 100644
--- a/tests/ecc_testdata/Lidia.cer
+++ b/src/test-data/ecc_testdata/Lidia.cer
diff --git a/tests/ecc_testdata/Lidia.pem b/src/test-data/ecc_testdata/Lidia.pem
index c0612d9ca..c0612d9ca 100644
--- a/tests/ecc_testdata/Lidia.pem
+++ b/src/test-data/ecc_testdata/Lidia.pem
diff --git a/tests/ecc_testdata/ado b/src/test-data/ecc_testdata/ado
index baa79177c..baa79177c 100644
--- a/tests/ecc_testdata/ado
+++ b/src/test-data/ecc_testdata/ado
diff --git a/tests/ecc_testdata/ado.cvcreq b/src/test-data/ecc_testdata/ado.cvcreq
index 09a14bbb4..09a14bbb4 100644
--- a/tests/ecc_testdata/ado.cvcreq
+++ b/src/test-data/ecc_testdata/ado.cvcreq
diff --git a/tests/ecc_testdata/cvc_chain_cvca.cer b/src/test-data/ecc_testdata/cvc_chain_cvca.cer
index 4a7281aa6..4a7281aa6 100644
--- a/tests/ecc_testdata/cvc_chain_cvca.cer
+++ b/src/test-data/ecc_testdata/cvc_chain_cvca.cer
diff --git a/tests/ecc_testdata/cvc_chain_dvca_ado2.cer b/src/test-data/ecc_testdata/cvc_chain_dvca_ado2.cer
index 1d6f7c173..1d6f7c173 100644
--- a/tests/ecc_testdata/cvc_chain_dvca_ado2.cer
+++ b/src/test-data/ecc_testdata/cvc_chain_dvca_ado2.cer
diff --git a/tests/ecc_testdata/cvc_chain_dvca_cert1.cer b/src/test-data/ecc_testdata/cvc_chain_dvca_cert1.cer
index c16c2d279..c16c2d279 100644
--- a/tests/ecc_testdata/cvc_chain_dvca_cert1.cer
+++ b/src/test-data/ecc_testdata/cvc_chain_dvca_cert1.cer
diff --git a/tests/ecc_testdata/cvc_chain_dvca_req.cer b/src/test-data/ecc_testdata/cvc_chain_dvca_req.cer
index 382351d6a..382351d6a 100644
--- a/tests/ecc_testdata/cvc_chain_dvca_req.cer
+++ b/src/test-data/ecc_testdata/cvc_chain_dvca_req.cer
diff --git a/tests/ecc_testdata/cvc_chain_dvca_req2.cer b/src/test-data/ecc_testdata/cvc_chain_dvca_req2.cer
index 1b39cee00..1b39cee00 100644
--- a/tests/ecc_testdata/cvc_chain_dvca_req2.cer
+++ b/src/test-data/ecc_testdata/cvc_chain_dvca_req2.cer
diff --git a/tests/ecc_testdata/cvc_chain_dvca_req2b.cer b/src/test-data/ecc_testdata/cvc_chain_dvca_req2b.cer
index 1b39cee00..1b39cee00 100644
--- a/tests/ecc_testdata/cvc_chain_dvca_req2b.cer
+++ b/src/test-data/ecc_testdata/cvc_chain_dvca_req2b.cer
diff --git a/tests/ecc_testdata/cvc_chain_is_cert.cer b/src/test-data/ecc_testdata/cvc_chain_is_cert.cer
index f9ee2d20f..f9ee2d20f 100644
--- a/tests/ecc_testdata/cvc_chain_is_cert.cer
+++ b/src/test-data/ecc_testdata/cvc_chain_is_cert.cer
diff --git a/tests/ecc_testdata/cvc_chain_is_req.cer b/src/test-data/ecc_testdata/cvc_chain_is_req.cer
index 144495f8b..144495f8b 100644
--- a/tests/ecc_testdata/cvc_chain_is_req.cer
+++ b/src/test-data/ecc_testdata/cvc_chain_is_req.cer
diff --git a/tests/ecc_testdata/cvc_chain_link12.cer b/src/test-data/ecc_testdata/cvc_chain_link12.cer
index 27df92d9d..27df92d9d 100644
--- a/tests/ecc_testdata/cvc_chain_link12.cer
+++ b/src/test-data/ecc_testdata/cvc_chain_link12.cer
diff --git a/tests/ecc_testdata/cvca01.cv.crt b/src/test-data/ecc_testdata/cvca01.cv.crt
index 8f278167c..8f278167c 100644
--- a/tests/ecc_testdata/cvca01.cv.crt
+++ b/src/test-data/ecc_testdata/cvca01.cv.crt
diff --git a/tests/ecc_testdata/cvca_illegal_chars.cv.crt b/src/test-data/ecc_testdata/cvca_illegal_chars.cv.crt
index b1a3d266c..b1a3d266c 100644
--- a/tests/ecc_testdata/cvca_illegal_chars.cv.crt
+++ b/src/test-data/ecc_testdata/cvca_illegal_chars.cv.crt
diff --git a/tests/ecc_testdata/cvca_illegal_chars2.cv.crt b/src/test-data/ecc_testdata/cvca_illegal_chars2.cv.crt
index 00f09b618..00f09b618 100644
--- a/tests/ecc_testdata/cvca_illegal_chars2.cv.crt
+++ b/src/test-data/ecc_testdata/cvca_illegal_chars2.cv.crt
diff --git a/tests/ecc_testdata/ec_for_flex_mes.sig b/src/test-data/ecc_testdata/ec_for_flex_mes.sig
index 6d9983b67..6d9983b67 100644
--- a/tests/ecc_testdata/ec_for_flex_mes.sig
+++ b/src/test-data/ecc_testdata/ec_for_flex_mes.sig
diff --git a/tests/ecc_testdata/ec_oid_not_in_reg_private_2.pkcs8.pem b/src/test-data/ecc_testdata/ec_oid_not_in_reg_private_2.pkcs8.pem
index 7a1707971..7a1707971 100644
--- a/tests/ecc_testdata/ec_oid_not_in_reg_private_2.pkcs8.pem
+++ b/src/test-data/ecc_testdata/ec_oid_not_in_reg_private_2.pkcs8.pem
diff --git a/tests/ecc_testdata/ecc_private_with_rfc5915_ext.pem b/src/test-data/ecc_testdata/ecc_private_with_rfc5915_ext.pem
index a8699fce7..a8699fce7 100644
--- a/tests/ecc_testdata/ecc_private_with_rfc5915_ext.pem
+++ b/src/test-data/ecc_testdata/ecc_private_with_rfc5915_ext.pem
diff --git a/tests/ecc_testdata/flex_cert.crt b/src/test-data/ecc_testdata/flex_cert.crt
index 0b9015cb2..0b9015cb2 100644
--- a/tests/ecc_testdata/flex_cert.crt
+++ b/src/test-data/ecc_testdata/flex_cert.crt
diff --git a/tests/ecc_testdata/flex_mes b/src/test-data/ecc_testdata/flex_mes
index 52a91be5e..52a91be5e 100644
--- a/tests/ecc_testdata/flex_mes
+++ b/src/test-data/ecc_testdata/flex_mes
diff --git a/tests/ecc_testdata/flex_mes.sig b/src/test-data/ecc_testdata/flex_mes.sig
index fde33473a..fde33473a 100644
--- a/tests/ecc_testdata/flex_mes.sig
+++ b/src/test-data/ecc_testdata/flex_mes.sig
diff --git a/tests/ecc_testdata/insito_expl_ec.pem b/src/test-data/ecc_testdata/insito_expl_ec.pem
index e8e57848f..e8e57848f 100644
--- a/tests/ecc_testdata/insito_expl_ec.pem
+++ b/src/test-data/ecc_testdata/insito_expl_ec.pem
diff --git a/tests/ecc_testdata/insito_oid_ec.pem b/src/test-data/ecc_testdata/insito_oid_ec.pem
index 2e0517187..2e0517187 100644
--- a/tests/ecc_testdata/insito_oid_ec.pem
+++ b/src/test-data/ecc_testdata/insito_oid_ec.pem
diff --git a/tests/ecc_testdata/link_SHA1.166.crt b/src/test-data/ecc_testdata/link_SHA1.166.crt
index 8f76b3203..8f76b3203 100644
--- a/tests/ecc_testdata/link_SHA1.166.crt
+++ b/src/test-data/ecc_testdata/link_SHA1.166.crt
diff --git a/tests/ecc_testdata/link_SHA256.cer b/src/test-data/ecc_testdata/link_SHA256.cer
index add40f738..add40f738 100644
--- a/tests/ecc_testdata/link_SHA256.cer
+++ b/src/test-data/ecc_testdata/link_SHA256.cer
diff --git a/tests/ecc_testdata/my_cv_cert.ber b/src/test-data/ecc_testdata/my_cv_cert.ber
index 7a14fd3eb..7a14fd3eb 100644
--- a/tests/ecc_testdata/my_cv_cert.ber
+++ b/src/test-data/ecc_testdata/my_cv_cert.ber
diff --git a/tests/ecc_testdata/my_cv_cert2.ber b/src/test-data/ecc_testdata/my_cv_cert2.ber
index 7a14fd3eb..7a14fd3eb 100644
--- a/tests/ecc_testdata/my_cv_cert2.ber
+++ b/src/test-data/ecc_testdata/my_cv_cert2.ber
diff --git a/tests/ecc_testdata/my_cv_req.ber b/src/test-data/ecc_testdata/my_cv_req.ber
index 4e121eee7..4e121eee7 100644
--- a/tests/ecc_testdata/my_cv_req.ber
+++ b/src/test-data/ecc_testdata/my_cv_req.ber
diff --git a/tests/ecc_testdata/nodompar_private.pkcs8.pem b/src/test-data/ecc_testdata/nodompar_private.pkcs8.pem
index a2c64ec53..a2c64ec53 100644
--- a/tests/ecc_testdata/nodompar_private.pkcs8.pem
+++ b/src/test-data/ecc_testdata/nodompar_private.pkcs8.pem
diff --git a/tests/ecc_testdata/private.pem b/src/test-data/ecc_testdata/private.pem
index 4465da669..4465da669 100644
--- a/tests/ecc_testdata/private.pem
+++ b/src/test-data/ecc_testdata/private.pem
diff --git a/tests/ecc_testdata/root1_SHA256.cer b/src/test-data/ecc_testdata/root1_SHA256.cer
index 021afe530..021afe530 100644
--- a/tests/ecc_testdata/root1_SHA256.cer
+++ b/src/test-data/ecc_testdata/root1_SHA256.cer
diff --git a/tests/ecc_testdata/root2_SHA256.cer b/src/test-data/ecc_testdata/root2_SHA256.cer
index a2ecfed22..a2ecfed22 100644
--- a/tests/ecc_testdata/root2_SHA256.cer
+++ b/src/test-data/ecc_testdata/root2_SHA256.cer
diff --git a/tests/ecc_testdata/root_SHA1.163.crt b/src/test-data/ecc_testdata/root_SHA1.163.crt
index e1bf39f9a..e1bf39f9a 100644
--- a/tests/ecc_testdata/root_SHA1.163.crt
+++ b/src/test-data/ecc_testdata/root_SHA1.163.crt
diff --git a/tests/ecc_testdata/withdompar_private.pkcs8.pem b/src/test-data/ecc_testdata/withdompar_private.pkcs8.pem
index 85d7b575e..85d7b575e 100644
--- a/tests/ecc_testdata/withdompar_private.pkcs8.pem
+++ b/src/test-data/ecc_testdata/withdompar_private.pkcs8.pem
diff --git a/tests/ecc_testdata/x509_req_test_expl.pem b/src/test-data/ecc_testdata/x509_req_test_expl.pem
index e4ae1a9b3..e4ae1a9b3 100644
--- a/tests/ecc_testdata/x509_req_test_expl.pem
+++ b/src/test-data/ecc_testdata/x509_req_test_expl.pem
diff --git a/tests/ecc_testdata/x509_req_test_oid.pem b/src/test-data/ecc_testdata/x509_req_test_oid.pem
index 2ae0c2ea5..2ae0c2ea5 100644
--- a/tests/ecc_testdata/x509_req_test_oid.pem
+++ b/src/test-data/ecc_testdata/x509_req_test_oid.pem
diff --git a/tests/ecc_testdata/x509_test_privkey_expl_pw123456.pem b/src/test-data/ecc_testdata/x509_test_privkey_expl_pw123456.pem
index 20f17130c..20f17130c 100644
--- a/tests/ecc_testdata/x509_test_privkey_expl_pw123456.pem
+++ b/src/test-data/ecc_testdata/x509_test_privkey_expl_pw123456.pem
diff --git a/tests/ecc_testdata/x509_test_privkey_oid_pw123456.pem b/src/test-data/ecc_testdata/x509_test_privkey_oid_pw123456.pem
index ecd188a5d..ecd188a5d 100644
--- a/tests/ecc_testdata/x509_test_privkey_oid_pw123456.pem
+++ b/src/test-data/ecc_testdata/x509_test_privkey_oid_pw123456.pem
diff --git a/tests/fail.dat b/src/test-data/fail.dat
index e7be16f86..e7be16f86 100644
--- a/tests/fail.dat
+++ b/src/test-data/fail.dat
diff --git a/tests/hash.vec b/src/test-data/hash.vec
index 9125b55e8..9125b55e8 100644
--- a/tests/hash.vec
+++ b/src/test-data/hash.vec
diff --git a/tests/hkdf.vec b/src/test-data/hkdf.vec
index 7d309aea7..7d309aea7 100644
--- a/tests/hkdf.vec
+++ b/src/test-data/hkdf.vec
diff --git a/tests/kdf.vec b/src/test-data/kdf.vec
index 0f5bb3383..0f5bb3383 100644
--- a/tests/kdf.vec
+++ b/src/test-data/kdf.vec
diff --git a/tests/mac.vec b/src/test-data/mac.vec
index 8007a0721..8007a0721 100644
--- a/tests/mac.vec
+++ b/src/test-data/mac.vec
diff --git a/tests/modes.vec b/src/test-data/modes.vec
index 5d771c7fc..5d771c7fc 100644
--- a/tests/modes.vec
+++ b/src/test-data/modes.vec
diff --git a/tests/mp_valid.dat b/src/test-data/mp_valid.dat
index 1b45bf9bb..1b45bf9bb 100644
--- a/tests/mp_valid.dat
+++ b/src/test-data/mp_valid.dat
diff --git a/tests/nist_tests/tests/test01/end.crt b/src/test-data/nist_x509/test01/end.crt
index d7e64d6de..d7e64d6de 100644
--- a/tests/nist_tests/tests/test01/end.crt
+++ b/src/test-data/nist_x509/test01/end.crt
diff --git a/tests/nist_tests/tests/test01/root.crl b/src/test-data/nist_x509/test01/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test01/root.crl
+++ b/src/test-data/nist_x509/test01/root.crl
diff --git a/tests/nist_tests/tests/test01/root.crt b/src/test-data/nist_x509/test01/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test01/root.crt
+++ b/src/test-data/nist_x509/test01/root.crt
diff --git a/tests/nist_tests/tests/test02/end.crt b/src/test-data/nist_x509/test02/end.crt
index f97da0509..f97da0509 100644
--- a/tests/nist_tests/tests/test02/end.crt
+++ b/src/test-data/nist_x509/test02/end.crt
diff --git a/tests/nist_tests/tests/test02/int.crl b/src/test-data/nist_x509/test02/int.crl
index e7dfa96ee..e7dfa96ee 100644
--- a/tests/nist_tests/tests/test02/int.crl
+++ b/src/test-data/nist_x509/test02/int.crl
diff --git a/tests/nist_tests/tests/test02/int.crt b/src/test-data/nist_x509/test02/int.crt
index 0aba75048..0aba75048 100644
--- a/tests/nist_tests/tests/test02/int.crt
+++ b/src/test-data/nist_x509/test02/int.crt
diff --git a/tests/nist_tests/tests/test02/root.crl b/src/test-data/nist_x509/test02/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test02/root.crl
+++ b/src/test-data/nist_x509/test02/root.crl
diff --git a/tests/nist_tests/tests/test02/root.crt b/src/test-data/nist_x509/test02/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test02/root.crt
+++ b/src/test-data/nist_x509/test02/root.crt
diff --git a/tests/nist_tests/tests/test03/end.crt b/src/test-data/nist_x509/test03/end.crt
index 9b0463a67..9b0463a67 100644
--- a/tests/nist_tests/tests/test03/end.crt
+++ b/src/test-data/nist_x509/test03/end.crt
diff --git a/tests/nist_tests/tests/test03/int.crl b/src/test-data/nist_x509/test03/int.crl
index 528f3237c..528f3237c 100644
--- a/tests/nist_tests/tests/test03/int.crl
+++ b/src/test-data/nist_x509/test03/int.crl
diff --git a/tests/nist_tests/tests/test03/int.crt b/src/test-data/nist_x509/test03/int.crt
index c8cfc0550..c8cfc0550 100644
--- a/tests/nist_tests/tests/test03/int.crt
+++ b/src/test-data/nist_x509/test03/int.crt
diff --git a/tests/nist_tests/tests/test03/root.crl b/src/test-data/nist_x509/test03/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test03/root.crl
+++ b/src/test-data/nist_x509/test03/root.crl
diff --git a/tests/nist_tests/tests/test03/root.crt b/src/test-data/nist_x509/test03/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test03/root.crt
+++ b/src/test-data/nist_x509/test03/root.crt
diff --git a/tests/nist_tests/tests/test04/end.crt b/src/test-data/nist_x509/test04/end.crt
index 75d2fd50e..75d2fd50e 100644
--- a/tests/nist_tests/tests/test04/end.crt
+++ b/src/test-data/nist_x509/test04/end.crt
diff --git a/tests/nist_tests/tests/test04/int1.crl b/src/test-data/nist_x509/test04/int1.crl
index 2f30c77b5..2f30c77b5 100644
--- a/tests/nist_tests/tests/test04/int1.crl
+++ b/src/test-data/nist_x509/test04/int1.crl
diff --git a/tests/nist_tests/tests/test04/int1.crt b/src/test-data/nist_x509/test04/int1.crt
index f4e88d58c..f4e88d58c 100644
--- a/tests/nist_tests/tests/test04/int1.crt
+++ b/src/test-data/nist_x509/test04/int1.crt
diff --git a/tests/nist_tests/tests/test04/int2.crl b/src/test-data/nist_x509/test04/int2.crl
index e8596c314..e8596c314 100644
--- a/tests/nist_tests/tests/test04/int2.crl
+++ b/src/test-data/nist_x509/test04/int2.crl
diff --git a/tests/nist_tests/tests/test04/int2.crt b/src/test-data/nist_x509/test04/int2.crt
index 727035b6c..727035b6c 100644
--- a/tests/nist_tests/tests/test04/int2.crt
+++ b/src/test-data/nist_x509/test04/int2.crt
diff --git a/tests/nist_tests/tests/test04/root.crl b/src/test-data/nist_x509/test04/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test04/root.crl
+++ b/src/test-data/nist_x509/test04/root.crl
diff --git a/tests/nist_tests/tests/test04/root.crt b/src/test-data/nist_x509/test04/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test04/root.crt
+++ b/src/test-data/nist_x509/test04/root.crt
diff --git a/tests/nist_tests/tests/test05/end.crt b/src/test-data/nist_x509/test05/end.crt
index a3a658923..a3a658923 100644
--- a/tests/nist_tests/tests/test05/end.crt
+++ b/src/test-data/nist_x509/test05/end.crt
diff --git a/tests/nist_tests/tests/test05/int.crl b/src/test-data/nist_x509/test05/int.crl
index a34ef279b..a34ef279b 100644
--- a/tests/nist_tests/tests/test05/int.crl
+++ b/src/test-data/nist_x509/test05/int.crl
diff --git a/tests/nist_tests/tests/test05/int.crt b/src/test-data/nist_x509/test05/int.crt
index 610df750e..610df750e 100644
--- a/tests/nist_tests/tests/test05/int.crt
+++ b/src/test-data/nist_x509/test05/int.crt
diff --git a/tests/nist_tests/tests/test05/root.crl b/src/test-data/nist_x509/test05/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test05/root.crl
+++ b/src/test-data/nist_x509/test05/root.crl
diff --git a/tests/nist_tests/tests/test05/root.crt b/src/test-data/nist_x509/test05/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test05/root.crt
+++ b/src/test-data/nist_x509/test05/root.crt
diff --git a/tests/nist_tests/tests/test06/end.crt b/src/test-data/nist_x509/test06/end.crt
index 1e68f0de1..1e68f0de1 100644
--- a/tests/nist_tests/tests/test06/end.crt
+++ b/src/test-data/nist_x509/test06/end.crt
diff --git a/tests/nist_tests/tests/test06/int.crl b/src/test-data/nist_x509/test06/int.crl
index d87cd7e26..d87cd7e26 100644
--- a/tests/nist_tests/tests/test06/int.crl
+++ b/src/test-data/nist_x509/test06/int.crl
diff --git a/tests/nist_tests/tests/test06/int.crt b/src/test-data/nist_x509/test06/int.crt
index 5bb74d259..5bb74d259 100644
--- a/tests/nist_tests/tests/test06/int.crt
+++ b/src/test-data/nist_x509/test06/int.crt
diff --git a/tests/nist_tests/tests/test06/root.crl b/src/test-data/nist_x509/test06/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test06/root.crl
+++ b/src/test-data/nist_x509/test06/root.crl
diff --git a/tests/nist_tests/tests/test06/root.crt b/src/test-data/nist_x509/test06/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test06/root.crt
+++ b/src/test-data/nist_x509/test06/root.crt
diff --git a/tests/nist_tests/tests/test07/end.crt b/src/test-data/nist_x509/test07/end.crt
index 0f97e6f5a..0f97e6f5a 100644
--- a/tests/nist_tests/tests/test07/end.crt
+++ b/src/test-data/nist_x509/test07/end.crt
diff --git a/tests/nist_tests/tests/test07/int.crl b/src/test-data/nist_x509/test07/int.crl
index 8064e91bc..8064e91bc 100644
--- a/tests/nist_tests/tests/test07/int.crl
+++ b/src/test-data/nist_x509/test07/int.crl
diff --git a/tests/nist_tests/tests/test07/int.crt b/src/test-data/nist_x509/test07/int.crt
index 5c1ddd3e3..5c1ddd3e3 100644
--- a/tests/nist_tests/tests/test07/int.crt
+++ b/src/test-data/nist_x509/test07/int.crt
diff --git a/tests/nist_tests/tests/test07/root.crl b/src/test-data/nist_x509/test07/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test07/root.crl
+++ b/src/test-data/nist_x509/test07/root.crl
diff --git a/tests/nist_tests/tests/test07/root.crt b/src/test-data/nist_x509/test07/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test07/root.crt
+++ b/src/test-data/nist_x509/test07/root.crt
diff --git a/tests/nist_tests/tests/test08/end.crt b/src/test-data/nist_x509/test08/end.crt
index cb99c2ac5..cb99c2ac5 100644
--- a/tests/nist_tests/tests/test08/end.crt
+++ b/src/test-data/nist_x509/test08/end.crt
diff --git a/tests/nist_tests/tests/test08/int.crl b/src/test-data/nist_x509/test08/int.crl
index d5ee3c3ce..d5ee3c3ce 100644
--- a/tests/nist_tests/tests/test08/int.crl
+++ b/src/test-data/nist_x509/test08/int.crl
diff --git a/tests/nist_tests/tests/test08/int.crt b/src/test-data/nist_x509/test08/int.crt
index d26979cdd..d26979cdd 100644
--- a/tests/nist_tests/tests/test08/int.crt
+++ b/src/test-data/nist_x509/test08/int.crt
diff --git a/tests/nist_tests/tests/test08/root.crl b/src/test-data/nist_x509/test08/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test08/root.crl
+++ b/src/test-data/nist_x509/test08/root.crl
diff --git a/tests/nist_tests/tests/test08/root.crt b/src/test-data/nist_x509/test08/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test08/root.crt
+++ b/src/test-data/nist_x509/test08/root.crt
diff --git a/tests/nist_tests/tests/test09/end.crt b/src/test-data/nist_x509/test09/end.crt
index 4dd2352b4..4dd2352b4 100644
--- a/tests/nist_tests/tests/test09/end.crt
+++ b/src/test-data/nist_x509/test09/end.crt
diff --git a/tests/nist_tests/tests/test09/int.crl b/src/test-data/nist_x509/test09/int.crl
index fbd85145c..fbd85145c 100644
--- a/tests/nist_tests/tests/test09/int.crl
+++ b/src/test-data/nist_x509/test09/int.crl
diff --git a/tests/nist_tests/tests/test09/int.crt b/src/test-data/nist_x509/test09/int.crt
index c107dd756..c107dd756 100644
--- a/tests/nist_tests/tests/test09/int.crt
+++ b/src/test-data/nist_x509/test09/int.crt
diff --git a/tests/nist_tests/tests/test09/root.crl b/src/test-data/nist_x509/test09/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test09/root.crl
+++ b/src/test-data/nist_x509/test09/root.crl
diff --git a/tests/nist_tests/tests/test09/root.crt b/src/test-data/nist_x509/test09/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test09/root.crt
+++ b/src/test-data/nist_x509/test09/root.crt
diff --git a/tests/nist_tests/tests/test10/end.crt b/src/test-data/nist_x509/test10/end.crt
index de3924003..de3924003 100644
--- a/tests/nist_tests/tests/test10/end.crt
+++ b/src/test-data/nist_x509/test10/end.crt
diff --git a/tests/nist_tests/tests/test10/int.crl b/src/test-data/nist_x509/test10/int.crl
index daefd50c8..daefd50c8 100644
--- a/tests/nist_tests/tests/test10/int.crl
+++ b/src/test-data/nist_x509/test10/int.crl
diff --git a/tests/nist_tests/tests/test10/int.crt b/src/test-data/nist_x509/test10/int.crt
index 2d691abce..2d691abce 100644
--- a/tests/nist_tests/tests/test10/int.crt
+++ b/src/test-data/nist_x509/test10/int.crt
diff --git a/tests/nist_tests/tests/test10/root.crl b/src/test-data/nist_x509/test10/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test10/root.crl
+++ b/src/test-data/nist_x509/test10/root.crl
diff --git a/tests/nist_tests/tests/test10/root.crt b/src/test-data/nist_x509/test10/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test10/root.crt
+++ b/src/test-data/nist_x509/test10/root.crt
diff --git a/tests/nist_tests/tests/test11/end.crt b/src/test-data/nist_x509/test11/end.crt
index 6e14527d2..6e14527d2 100644
--- a/tests/nist_tests/tests/test11/end.crt
+++ b/src/test-data/nist_x509/test11/end.crt
diff --git a/tests/nist_tests/tests/test11/int.crl b/src/test-data/nist_x509/test11/int.crl
index cc91ad51d..cc91ad51d 100644
--- a/tests/nist_tests/tests/test11/int.crl
+++ b/src/test-data/nist_x509/test11/int.crl
diff --git a/tests/nist_tests/tests/test11/int.crt b/src/test-data/nist_x509/test11/int.crt
index 87fa07962..87fa07962 100644
--- a/tests/nist_tests/tests/test11/int.crt
+++ b/src/test-data/nist_x509/test11/int.crt
diff --git a/tests/nist_tests/tests/test11/root.crl b/src/test-data/nist_x509/test11/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test11/root.crl
+++ b/src/test-data/nist_x509/test11/root.crl
diff --git a/tests/nist_tests/tests/test11/root.crt b/src/test-data/nist_x509/test11/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test11/root.crt
+++ b/src/test-data/nist_x509/test11/root.crt
diff --git a/tests/nist_tests/tests/test12/end.crt b/src/test-data/nist_x509/test12/end.crt
index 158c6ae01..158c6ae01 100644
--- a/tests/nist_tests/tests/test12/end.crt
+++ b/src/test-data/nist_x509/test12/end.crt
diff --git a/tests/nist_tests/tests/test12/int.crl b/src/test-data/nist_x509/test12/int.crl
index 7ce6928bb..7ce6928bb 100644
--- a/tests/nist_tests/tests/test12/int.crl
+++ b/src/test-data/nist_x509/test12/int.crl
diff --git a/tests/nist_tests/tests/test12/int.crt b/src/test-data/nist_x509/test12/int.crt
index a55333b63..a55333b63 100644
--- a/tests/nist_tests/tests/test12/int.crt
+++ b/src/test-data/nist_x509/test12/int.crt
diff --git a/tests/nist_tests/tests/test12/root.crl b/src/test-data/nist_x509/test12/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test12/root.crl
+++ b/src/test-data/nist_x509/test12/root.crl
diff --git a/tests/nist_tests/tests/test12/root.crt b/src/test-data/nist_x509/test12/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test12/root.crt
+++ b/src/test-data/nist_x509/test12/root.crt
diff --git a/tests/nist_tests/tests/test13/end.crt b/src/test-data/nist_x509/test13/end.crt
index d1ddf4b44..d1ddf4b44 100644
--- a/tests/nist_tests/tests/test13/end.crt
+++ b/src/test-data/nist_x509/test13/end.crt
diff --git a/tests/nist_tests/tests/test13/int.crl b/src/test-data/nist_x509/test13/int.crl
index df86506d8..df86506d8 100644
--- a/tests/nist_tests/tests/test13/int.crl
+++ b/src/test-data/nist_x509/test13/int.crl
diff --git a/tests/nist_tests/tests/test13/int.crt b/src/test-data/nist_x509/test13/int.crt
index abc6fe537..abc6fe537 100644
--- a/tests/nist_tests/tests/test13/int.crt
+++ b/src/test-data/nist_x509/test13/int.crt
diff --git a/tests/nist_tests/tests/test13/root.crl b/src/test-data/nist_x509/test13/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test13/root.crl
+++ b/src/test-data/nist_x509/test13/root.crl
diff --git a/tests/nist_tests/tests/test13/root.crt b/src/test-data/nist_x509/test13/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test13/root.crt
+++ b/src/test-data/nist_x509/test13/root.crt
diff --git a/tests/nist_tests/tests/test14/end.crt b/src/test-data/nist_x509/test14/end.crt
index f43e03826..f43e03826 100644
--- a/tests/nist_tests/tests/test14/end.crt
+++ b/src/test-data/nist_x509/test14/end.crt
diff --git a/tests/nist_tests/tests/test14/int.crl b/src/test-data/nist_x509/test14/int.crl
index ae372f38b..ae372f38b 100644
--- a/tests/nist_tests/tests/test14/int.crl
+++ b/src/test-data/nist_x509/test14/int.crl
diff --git a/tests/nist_tests/tests/test14/int.crt b/src/test-data/nist_x509/test14/int.crt
index 6e97ee2b8..6e97ee2b8 100644
--- a/tests/nist_tests/tests/test14/int.crt
+++ b/src/test-data/nist_x509/test14/int.crt
diff --git a/tests/nist_tests/tests/test14/root.crl b/src/test-data/nist_x509/test14/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test14/root.crl
+++ b/src/test-data/nist_x509/test14/root.crl
diff --git a/tests/nist_tests/tests/test14/root.crt b/src/test-data/nist_x509/test14/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test14/root.crt
+++ b/src/test-data/nist_x509/test14/root.crt
diff --git a/tests/nist_tests/tests/test15/end.crt b/src/test-data/nist_x509/test15/end.crt
index a2408315c..a2408315c 100644
--- a/tests/nist_tests/tests/test15/end.crt
+++ b/src/test-data/nist_x509/test15/end.crt
diff --git a/tests/nist_tests/tests/test15/int.crl b/src/test-data/nist_x509/test15/int.crl
index 626049aaf..626049aaf 100644
--- a/tests/nist_tests/tests/test15/int.crl
+++ b/src/test-data/nist_x509/test15/int.crl
diff --git a/tests/nist_tests/tests/test15/int.crt b/src/test-data/nist_x509/test15/int.crt
index 23fb78c0f..23fb78c0f 100644
--- a/tests/nist_tests/tests/test15/int.crt
+++ b/src/test-data/nist_x509/test15/int.crt
diff --git a/tests/nist_tests/tests/test15/root.crl b/src/test-data/nist_x509/test15/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test15/root.crl
+++ b/src/test-data/nist_x509/test15/root.crl
diff --git a/tests/nist_tests/tests/test15/root.crt b/src/test-data/nist_x509/test15/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test15/root.crt
+++ b/src/test-data/nist_x509/test15/root.crt
diff --git a/tests/nist_tests/tests/test16/end.crt b/src/test-data/nist_x509/test16/end.crt
index 108a75d73..108a75d73 100644
--- a/tests/nist_tests/tests/test16/end.crt
+++ b/src/test-data/nist_x509/test16/end.crt
diff --git a/tests/nist_tests/tests/test16/int.crl b/src/test-data/nist_x509/test16/int.crl
index d345a338e..d345a338e 100644
--- a/tests/nist_tests/tests/test16/int.crl
+++ b/src/test-data/nist_x509/test16/int.crl
diff --git a/tests/nist_tests/tests/test16/int.crt b/src/test-data/nist_x509/test16/int.crt
index 6f2a332ad..6f2a332ad 100644
--- a/tests/nist_tests/tests/test16/int.crt
+++ b/src/test-data/nist_x509/test16/int.crt
diff --git a/tests/nist_tests/tests/test16/root.crl b/src/test-data/nist_x509/test16/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test16/root.crl
+++ b/src/test-data/nist_x509/test16/root.crl
diff --git a/tests/nist_tests/tests/test16/root.crt b/src/test-data/nist_x509/test16/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test16/root.crt
+++ b/src/test-data/nist_x509/test16/root.crt
diff --git a/tests/nist_tests/tests/test17/end.crt b/src/test-data/nist_x509/test17/end.crt
index b90340872..b90340872 100644
--- a/tests/nist_tests/tests/test17/end.crt
+++ b/src/test-data/nist_x509/test17/end.crt
diff --git a/tests/nist_tests/tests/test17/int.crl b/src/test-data/nist_x509/test17/int.crl
index 0b1ba6fda..0b1ba6fda 100644
--- a/tests/nist_tests/tests/test17/int.crl
+++ b/src/test-data/nist_x509/test17/int.crl
diff --git a/tests/nist_tests/tests/test17/int.crt b/src/test-data/nist_x509/test17/int.crt
index 25e7b48e5..25e7b48e5 100644
--- a/tests/nist_tests/tests/test17/int.crt
+++ b/src/test-data/nist_x509/test17/int.crt
diff --git a/tests/nist_tests/tests/test17/root.crl b/src/test-data/nist_x509/test17/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test17/root.crl
+++ b/src/test-data/nist_x509/test17/root.crl
diff --git a/tests/nist_tests/tests/test17/root.crt b/src/test-data/nist_x509/test17/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test17/root.crt
+++ b/src/test-data/nist_x509/test17/root.crt
diff --git a/tests/nist_tests/tests/test18/end.crt b/src/test-data/nist_x509/test18/end.crt
index 2edb51394..2edb51394 100644
--- a/tests/nist_tests/tests/test18/end.crt
+++ b/src/test-data/nist_x509/test18/end.crt
diff --git a/tests/nist_tests/tests/test18/int.crl b/src/test-data/nist_x509/test18/int.crl
index 2948246d7..2948246d7 100644
--- a/tests/nist_tests/tests/test18/int.crl
+++ b/src/test-data/nist_x509/test18/int.crl
diff --git a/tests/nist_tests/tests/test18/int.crt b/src/test-data/nist_x509/test18/int.crt
index eac3e8693..eac3e8693 100644
--- a/tests/nist_tests/tests/test18/int.crt
+++ b/src/test-data/nist_x509/test18/int.crt
diff --git a/tests/nist_tests/tests/test18/root.crl b/src/test-data/nist_x509/test18/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test18/root.crl
+++ b/src/test-data/nist_x509/test18/root.crl
diff --git a/tests/nist_tests/tests/test18/root.crt b/src/test-data/nist_x509/test18/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test18/root.crt
+++ b/src/test-data/nist_x509/test18/root.crt
diff --git a/tests/nist_tests/tests/test19/end.crt b/src/test-data/nist_x509/test19/end.crt
index a9c7a1fc6..a9c7a1fc6 100644
--- a/tests/nist_tests/tests/test19/end.crt
+++ b/src/test-data/nist_x509/test19/end.crt
diff --git a/tests/nist_tests/tests/test19/int.crt b/src/test-data/nist_x509/test19/int.crt
index eff60dd15..eff60dd15 100644
--- a/tests/nist_tests/tests/test19/int.crt
+++ b/src/test-data/nist_x509/test19/int.crt
diff --git a/tests/nist_tests/tests/test19/root.crl b/src/test-data/nist_x509/test19/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test19/root.crl
+++ b/src/test-data/nist_x509/test19/root.crl
diff --git a/tests/nist_tests/tests/test19/root.crt b/src/test-data/nist_x509/test19/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test19/root.crt
+++ b/src/test-data/nist_x509/test19/root.crt
diff --git a/tests/nist_tests/tests/test20/end.crt b/src/test-data/nist_x509/test20/end.crt
index b26e77c19..b26e77c19 100644
--- a/tests/nist_tests/tests/test20/end.crt
+++ b/src/test-data/nist_x509/test20/end.crt
diff --git a/tests/nist_tests/tests/test20/int.crl b/src/test-data/nist_x509/test20/int.crl
index 5755a2eae..5755a2eae 100644
--- a/tests/nist_tests/tests/test20/int.crl
+++ b/src/test-data/nist_x509/test20/int.crl
diff --git a/tests/nist_tests/tests/test20/int.crt b/src/test-data/nist_x509/test20/int.crt
index d7daa69ef..d7daa69ef 100644
--- a/tests/nist_tests/tests/test20/int.crt
+++ b/src/test-data/nist_x509/test20/int.crt
diff --git a/tests/nist_tests/tests/test20/root.crl b/src/test-data/nist_x509/test20/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test20/root.crl
+++ b/src/test-data/nist_x509/test20/root.crl
diff --git a/tests/nist_tests/tests/test20/root.crt b/src/test-data/nist_x509/test20/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test20/root.crt
+++ b/src/test-data/nist_x509/test20/root.crt
diff --git a/tests/nist_tests/tests/test21/end.crt b/src/test-data/nist_x509/test21/end.crt
index 798e5cf17..798e5cf17 100644
--- a/tests/nist_tests/tests/test21/end.crt
+++ b/src/test-data/nist_x509/test21/end.crt
diff --git a/tests/nist_tests/tests/test21/int.crl b/src/test-data/nist_x509/test21/int.crl
index ea3cbb9d8..ea3cbb9d8 100644
--- a/tests/nist_tests/tests/test21/int.crl
+++ b/src/test-data/nist_x509/test21/int.crl
diff --git a/tests/nist_tests/tests/test21/int.crt b/src/test-data/nist_x509/test21/int.crt
index 9082c4d77..9082c4d77 100644
--- a/tests/nist_tests/tests/test21/int.crt
+++ b/src/test-data/nist_x509/test21/int.crt
diff --git a/tests/nist_tests/tests/test21/root.crl b/src/test-data/nist_x509/test21/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test21/root.crl
+++ b/src/test-data/nist_x509/test21/root.crl
diff --git a/tests/nist_tests/tests/test21/root.crt b/src/test-data/nist_x509/test21/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test21/root.crt
+++ b/src/test-data/nist_x509/test21/root.crt
diff --git a/tests/nist_tests/tests/test22/end.crt b/src/test-data/nist_x509/test22/end.crt
index d130c7506..d130c7506 100644
--- a/tests/nist_tests/tests/test22/end.crt
+++ b/src/test-data/nist_x509/test22/end.crt
diff --git a/tests/nist_tests/tests/test22/int.crl b/src/test-data/nist_x509/test22/int.crl
index 07e18398d..07e18398d 100644
--- a/tests/nist_tests/tests/test22/int.crl
+++ b/src/test-data/nist_x509/test22/int.crl
diff --git a/tests/nist_tests/tests/test22/int.crt b/src/test-data/nist_x509/test22/int.crt
index d0f401bae..d0f401bae 100644
--- a/tests/nist_tests/tests/test22/int.crt
+++ b/src/test-data/nist_x509/test22/int.crt
diff --git a/tests/nist_tests/tests/test22/root.crl b/src/test-data/nist_x509/test22/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test22/root.crl
+++ b/src/test-data/nist_x509/test22/root.crl
diff --git a/tests/nist_tests/tests/test22/root.crt b/src/test-data/nist_x509/test22/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test22/root.crt
+++ b/src/test-data/nist_x509/test22/root.crt
diff --git a/tests/nist_tests/tests/test23/end.crt b/src/test-data/nist_x509/test23/end.crt
index 787941b16..787941b16 100644
--- a/tests/nist_tests/tests/test23/end.crt
+++ b/src/test-data/nist_x509/test23/end.crt
diff --git a/tests/nist_tests/tests/test23/int.crl b/src/test-data/nist_x509/test23/int.crl
index 2841be769..2841be769 100644
--- a/tests/nist_tests/tests/test23/int.crl
+++ b/src/test-data/nist_x509/test23/int.crl
diff --git a/tests/nist_tests/tests/test23/int.crt b/src/test-data/nist_x509/test23/int.crt
index 2890b3967..2890b3967 100644
--- a/tests/nist_tests/tests/test23/int.crt
+++ b/src/test-data/nist_x509/test23/int.crt
diff --git a/tests/nist_tests/tests/test23/root.crl b/src/test-data/nist_x509/test23/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test23/root.crl
+++ b/src/test-data/nist_x509/test23/root.crl
diff --git a/tests/nist_tests/tests/test23/root.crt b/src/test-data/nist_x509/test23/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test23/root.crt
+++ b/src/test-data/nist_x509/test23/root.crt
diff --git a/tests/nist_tests/tests/test24/end.crt b/src/test-data/nist_x509/test24/end.crt
index 0d145b2fa..0d145b2fa 100644
--- a/tests/nist_tests/tests/test24/end.crt
+++ b/src/test-data/nist_x509/test24/end.crt
diff --git a/tests/nist_tests/tests/test24/int.crl b/src/test-data/nist_x509/test24/int.crl
index f608de6bb..f608de6bb 100644
--- a/tests/nist_tests/tests/test24/int.crl
+++ b/src/test-data/nist_x509/test24/int.crl
diff --git a/tests/nist_tests/tests/test24/int.crt b/src/test-data/nist_x509/test24/int.crt
index a4633ee9a..a4633ee9a 100644
--- a/tests/nist_tests/tests/test24/int.crt
+++ b/src/test-data/nist_x509/test24/int.crt
diff --git a/tests/nist_tests/tests/test24/root.crl b/src/test-data/nist_x509/test24/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test24/root.crl
+++ b/src/test-data/nist_x509/test24/root.crl
diff --git a/tests/nist_tests/tests/test24/root.crt b/src/test-data/nist_x509/test24/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test24/root.crt
+++ b/src/test-data/nist_x509/test24/root.crt
diff --git a/tests/nist_tests/tests/test25/end.crt b/src/test-data/nist_x509/test25/end.crt
index d12670188..d12670188 100644
--- a/tests/nist_tests/tests/test25/end.crt
+++ b/src/test-data/nist_x509/test25/end.crt
diff --git a/tests/nist_tests/tests/test25/int.crl b/src/test-data/nist_x509/test25/int.crl
index 553e1bbd1..553e1bbd1 100644
--- a/tests/nist_tests/tests/test25/int.crl
+++ b/src/test-data/nist_x509/test25/int.crl
diff --git a/tests/nist_tests/tests/test25/int.crt b/src/test-data/nist_x509/test25/int.crt
index 5d06aac4a..5d06aac4a 100644
--- a/tests/nist_tests/tests/test25/int.crt
+++ b/src/test-data/nist_x509/test25/int.crt
diff --git a/tests/nist_tests/tests/test25/root.crl b/src/test-data/nist_x509/test25/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test25/root.crl
+++ b/src/test-data/nist_x509/test25/root.crl
diff --git a/tests/nist_tests/tests/test25/root.crt b/src/test-data/nist_x509/test25/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test25/root.crt
+++ b/src/test-data/nist_x509/test25/root.crt
diff --git a/tests/nist_tests/tests/test26/end.crt b/src/test-data/nist_x509/test26/end.crt
index 5abc96600..5abc96600 100644
--- a/tests/nist_tests/tests/test26/end.crt
+++ b/src/test-data/nist_x509/test26/end.crt
diff --git a/tests/nist_tests/tests/test26/int.crl b/src/test-data/nist_x509/test26/int.crl
index 9f2f1b0a8..9f2f1b0a8 100644
--- a/tests/nist_tests/tests/test26/int.crl
+++ b/src/test-data/nist_x509/test26/int.crl
diff --git a/tests/nist_tests/tests/test26/int.crt b/src/test-data/nist_x509/test26/int.crt
index e9c273a05..e9c273a05 100644
--- a/tests/nist_tests/tests/test26/int.crt
+++ b/src/test-data/nist_x509/test26/int.crt
diff --git a/tests/nist_tests/tests/test26/root.crl b/src/test-data/nist_x509/test26/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test26/root.crl
+++ b/src/test-data/nist_x509/test26/root.crl
diff --git a/tests/nist_tests/tests/test26/root.crt b/src/test-data/nist_x509/test26/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test26/root.crt
+++ b/src/test-data/nist_x509/test26/root.crt
diff --git a/tests/nist_tests/tests/test27/end.crt b/src/test-data/nist_x509/test27/end.crt
index 2147dbd3a..2147dbd3a 100644
--- a/tests/nist_tests/tests/test27/end.crt
+++ b/src/test-data/nist_x509/test27/end.crt
diff --git a/tests/nist_tests/tests/test27/int.crl b/src/test-data/nist_x509/test27/int.crl
index fd769e5f3..fd769e5f3 100644
--- a/tests/nist_tests/tests/test27/int.crl
+++ b/src/test-data/nist_x509/test27/int.crl
diff --git a/tests/nist_tests/tests/test27/int.crt b/src/test-data/nist_x509/test27/int.crt
index 4de4a9f51..4de4a9f51 100644
--- a/tests/nist_tests/tests/test27/int.crt
+++ b/src/test-data/nist_x509/test27/int.crt
diff --git a/tests/nist_tests/tests/test27/root.crl b/src/test-data/nist_x509/test27/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test27/root.crl
+++ b/src/test-data/nist_x509/test27/root.crl
diff --git a/tests/nist_tests/tests/test27/root.crt b/src/test-data/nist_x509/test27/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test27/root.crt
+++ b/src/test-data/nist_x509/test27/root.crt
diff --git a/tests/nist_tests/tests/test28/end.crt b/src/test-data/nist_x509/test28/end.crt
index c72c97b81..c72c97b81 100644
--- a/tests/nist_tests/tests/test28/end.crt
+++ b/src/test-data/nist_x509/test28/end.crt
diff --git a/tests/nist_tests/tests/test28/int.crl b/src/test-data/nist_x509/test28/int.crl
index 35e87eb0b..35e87eb0b 100644
--- a/tests/nist_tests/tests/test28/int.crl
+++ b/src/test-data/nist_x509/test28/int.crl
diff --git a/tests/nist_tests/tests/test28/int.crt b/src/test-data/nist_x509/test28/int.crt
index fee01f21e..fee01f21e 100644
--- a/tests/nist_tests/tests/test28/int.crt
+++ b/src/test-data/nist_x509/test28/int.crt
diff --git a/tests/nist_tests/tests/test28/root.crl b/src/test-data/nist_x509/test28/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test28/root.crl
+++ b/src/test-data/nist_x509/test28/root.crl
diff --git a/tests/nist_tests/tests/test28/root.crt b/src/test-data/nist_x509/test28/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test28/root.crt
+++ b/src/test-data/nist_x509/test28/root.crt
diff --git a/tests/nist_tests/tests/test29/end.crt b/src/test-data/nist_x509/test29/end.crt
index e4e2dd072..e4e2dd072 100644
--- a/tests/nist_tests/tests/test29/end.crt
+++ b/src/test-data/nist_x509/test29/end.crt
diff --git a/tests/nist_tests/tests/test29/int.crl b/src/test-data/nist_x509/test29/int.crl
index 2739bd933..2739bd933 100644
--- a/tests/nist_tests/tests/test29/int.crl
+++ b/src/test-data/nist_x509/test29/int.crl
diff --git a/tests/nist_tests/tests/test29/int.crt b/src/test-data/nist_x509/test29/int.crt
index e830043fd..e830043fd 100644
--- a/tests/nist_tests/tests/test29/int.crt
+++ b/src/test-data/nist_x509/test29/int.crt
diff --git a/tests/nist_tests/tests/test29/root.crl b/src/test-data/nist_x509/test29/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test29/root.crl
+++ b/src/test-data/nist_x509/test29/root.crl
diff --git a/tests/nist_tests/tests/test29/root.crt b/src/test-data/nist_x509/test29/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test29/root.crt
+++ b/src/test-data/nist_x509/test29/root.crt
diff --git a/tests/nist_tests/tests/test30/end.crt b/src/test-data/nist_x509/test30/end.crt
index abdc0381f..abdc0381f 100644
--- a/tests/nist_tests/tests/test30/end.crt
+++ b/src/test-data/nist_x509/test30/end.crt
diff --git a/tests/nist_tests/tests/test30/int.crl b/src/test-data/nist_x509/test30/int.crl
index fed695a3b..fed695a3b 100644
--- a/tests/nist_tests/tests/test30/int.crl
+++ b/src/test-data/nist_x509/test30/int.crl
diff --git a/tests/nist_tests/tests/test30/int.crt b/src/test-data/nist_x509/test30/int.crt
index 26fd2cb6a..26fd2cb6a 100644
--- a/tests/nist_tests/tests/test30/int.crt
+++ b/src/test-data/nist_x509/test30/int.crt
diff --git a/tests/nist_tests/tests/test30/root.crl b/src/test-data/nist_x509/test30/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test30/root.crl
+++ b/src/test-data/nist_x509/test30/root.crl
diff --git a/tests/nist_tests/tests/test30/root.crt b/src/test-data/nist_x509/test30/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test30/root.crt
+++ b/src/test-data/nist_x509/test30/root.crt
diff --git a/tests/nist_tests/tests/test31/end.crt b/src/test-data/nist_x509/test31/end.crt
index cd766ef7f..cd766ef7f 100644
--- a/tests/nist_tests/tests/test31/end.crt
+++ b/src/test-data/nist_x509/test31/end.crt
diff --git a/tests/nist_tests/tests/test31/int.crl b/src/test-data/nist_x509/test31/int.crl
index 9014141f9..9014141f9 100644
--- a/tests/nist_tests/tests/test31/int.crl
+++ b/src/test-data/nist_x509/test31/int.crl
diff --git a/tests/nist_tests/tests/test31/int.crt b/src/test-data/nist_x509/test31/int.crt
index 396947b15..396947b15 100644
--- a/tests/nist_tests/tests/test31/int.crt
+++ b/src/test-data/nist_x509/test31/int.crt
diff --git a/tests/nist_tests/tests/test31/root.crl b/src/test-data/nist_x509/test31/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test31/root.crl
+++ b/src/test-data/nist_x509/test31/root.crl
diff --git a/tests/nist_tests/tests/test31/root.crt b/src/test-data/nist_x509/test31/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test31/root.crt
+++ b/src/test-data/nist_x509/test31/root.crt
diff --git a/tests/nist_tests/tests/test32/end.crt b/src/test-data/nist_x509/test32/end.crt
index 3804a27b4..3804a27b4 100644
--- a/tests/nist_tests/tests/test32/end.crt
+++ b/src/test-data/nist_x509/test32/end.crt
diff --git a/tests/nist_tests/tests/test32/int.crl b/src/test-data/nist_x509/test32/int.crl
index 2e2e505a0..2e2e505a0 100644
--- a/tests/nist_tests/tests/test32/int.crl
+++ b/src/test-data/nist_x509/test32/int.crl
diff --git a/tests/nist_tests/tests/test32/int.crt b/src/test-data/nist_x509/test32/int.crt
index 6df3396b7..6df3396b7 100644
--- a/tests/nist_tests/tests/test32/int.crt
+++ b/src/test-data/nist_x509/test32/int.crt
diff --git a/tests/nist_tests/tests/test32/root.crl b/src/test-data/nist_x509/test32/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test32/root.crl
+++ b/src/test-data/nist_x509/test32/root.crl
diff --git a/tests/nist_tests/tests/test32/root.crt b/src/test-data/nist_x509/test32/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test32/root.crt
+++ b/src/test-data/nist_x509/test32/root.crt
diff --git a/tests/nist_tests/tests/test33/end.crt b/src/test-data/nist_x509/test33/end.crt
index 6ef1d03a8..6ef1d03a8 100644
--- a/tests/nist_tests/tests/test33/end.crt
+++ b/src/test-data/nist_x509/test33/end.crt
diff --git a/tests/nist_tests/tests/test33/int.crl b/src/test-data/nist_x509/test33/int.crl
index 4008e3d46..4008e3d46 100644
--- a/tests/nist_tests/tests/test33/int.crl
+++ b/src/test-data/nist_x509/test33/int.crl
diff --git a/tests/nist_tests/tests/test33/int.crt b/src/test-data/nist_x509/test33/int.crt
index ba183696e..ba183696e 100644
--- a/tests/nist_tests/tests/test33/int.crt
+++ b/src/test-data/nist_x509/test33/int.crt
diff --git a/tests/nist_tests/tests/test33/root.crl b/src/test-data/nist_x509/test33/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test33/root.crl
+++ b/src/test-data/nist_x509/test33/root.crl
diff --git a/tests/nist_tests/tests/test33/root.crt b/src/test-data/nist_x509/test33/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test33/root.crt
+++ b/src/test-data/nist_x509/test33/root.crt
diff --git a/tests/nist_tests/tests/test34/end.crt b/src/test-data/nist_x509/test34/end.crt
index 695de1cb4..695de1cb4 100644
--- a/tests/nist_tests/tests/test34/end.crt
+++ b/src/test-data/nist_x509/test34/end.crt
diff --git a/tests/nist_tests/tests/test34/int.crl b/src/test-data/nist_x509/test34/int.crl
index a8d11e788..a8d11e788 100644
--- a/tests/nist_tests/tests/test34/int.crl
+++ b/src/test-data/nist_x509/test34/int.crl
diff --git a/tests/nist_tests/tests/test34/int.crt b/src/test-data/nist_x509/test34/int.crt
index 5657ddaf6..5657ddaf6 100644
--- a/tests/nist_tests/tests/test34/int.crt
+++ b/src/test-data/nist_x509/test34/int.crt
diff --git a/tests/nist_tests/tests/test34/root.crl b/src/test-data/nist_x509/test34/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test34/root.crl
+++ b/src/test-data/nist_x509/test34/root.crl
diff --git a/tests/nist_tests/tests/test34/root.crt b/src/test-data/nist_x509/test34/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test34/root.crt
+++ b/src/test-data/nist_x509/test34/root.crt
diff --git a/tests/nist_tests/tests/test35/end.crt b/src/test-data/nist_x509/test35/end.crt
index 26846be18..26846be18 100644
--- a/tests/nist_tests/tests/test35/end.crt
+++ b/src/test-data/nist_x509/test35/end.crt
diff --git a/tests/nist_tests/tests/test35/int.crl b/src/test-data/nist_x509/test35/int.crl
index f7021d32c..f7021d32c 100644
--- a/tests/nist_tests/tests/test35/int.crl
+++ b/src/test-data/nist_x509/test35/int.crl
diff --git a/tests/nist_tests/tests/test35/int.crt b/src/test-data/nist_x509/test35/int.crt
index 6a6641823..6a6641823 100644
--- a/tests/nist_tests/tests/test35/int.crt
+++ b/src/test-data/nist_x509/test35/int.crt
diff --git a/tests/nist_tests/tests/test35/root.crl b/src/test-data/nist_x509/test35/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test35/root.crl
+++ b/src/test-data/nist_x509/test35/root.crl
diff --git a/tests/nist_tests/tests/test35/root.crt b/src/test-data/nist_x509/test35/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test35/root.crt
+++ b/src/test-data/nist_x509/test35/root.crt
diff --git a/tests/nist_tests/tests/test36/end.crt b/src/test-data/nist_x509/test36/end.crt
index ee6ec5f4b..ee6ec5f4b 100644
--- a/tests/nist_tests/tests/test36/end.crt
+++ b/src/test-data/nist_x509/test36/end.crt
diff --git a/tests/nist_tests/tests/test36/int1.crl b/src/test-data/nist_x509/test36/int1.crl
index d4ad1013d..d4ad1013d 100644
--- a/tests/nist_tests/tests/test36/int1.crl
+++ b/src/test-data/nist_x509/test36/int1.crl
diff --git a/tests/nist_tests/tests/test36/int1.crt b/src/test-data/nist_x509/test36/int1.crt
index a300e8d67..a300e8d67 100644
--- a/tests/nist_tests/tests/test36/int1.crt
+++ b/src/test-data/nist_x509/test36/int1.crt
diff --git a/tests/nist_tests/tests/test36/int2.crl b/src/test-data/nist_x509/test36/int2.crl
index d45cedcee..d45cedcee 100644
--- a/tests/nist_tests/tests/test36/int2.crl
+++ b/src/test-data/nist_x509/test36/int2.crl
diff --git a/tests/nist_tests/tests/test36/int2.crt b/src/test-data/nist_x509/test36/int2.crt
index 87c8253c3..87c8253c3 100644
--- a/tests/nist_tests/tests/test36/int2.crt
+++ b/src/test-data/nist_x509/test36/int2.crt
diff --git a/tests/nist_tests/tests/test36/root.crl b/src/test-data/nist_x509/test36/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test36/root.crl
+++ b/src/test-data/nist_x509/test36/root.crl
diff --git a/tests/nist_tests/tests/test36/root.crt b/src/test-data/nist_x509/test36/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test36/root.crt
+++ b/src/test-data/nist_x509/test36/root.crt
diff --git a/tests/nist_tests/tests/test37/end.crt b/src/test-data/nist_x509/test37/end.crt
index e5c5ae8c7..e5c5ae8c7 100644
--- a/tests/nist_tests/tests/test37/end.crt
+++ b/src/test-data/nist_x509/test37/end.crt
diff --git a/tests/nist_tests/tests/test37/int1.crl b/src/test-data/nist_x509/test37/int1.crl
index 6b488fdb8..6b488fdb8 100644
--- a/tests/nist_tests/tests/test37/int1.crl
+++ b/src/test-data/nist_x509/test37/int1.crl
diff --git a/tests/nist_tests/tests/test37/int1.crt b/src/test-data/nist_x509/test37/int1.crt
index 26b6b9605..26b6b9605 100644
--- a/tests/nist_tests/tests/test37/int1.crt
+++ b/src/test-data/nist_x509/test37/int1.crt
diff --git a/tests/nist_tests/tests/test37/int2.crl b/src/test-data/nist_x509/test37/int2.crl
index 724051124..724051124 100644
--- a/tests/nist_tests/tests/test37/int2.crl
+++ b/src/test-data/nist_x509/test37/int2.crl
diff --git a/tests/nist_tests/tests/test37/int2.crt b/src/test-data/nist_x509/test37/int2.crt
index c0e986a08..c0e986a08 100644
--- a/tests/nist_tests/tests/test37/int2.crt
+++ b/src/test-data/nist_x509/test37/int2.crt
diff --git a/tests/nist_tests/tests/test37/root.crl b/src/test-data/nist_x509/test37/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test37/root.crl
+++ b/src/test-data/nist_x509/test37/root.crl
diff --git a/tests/nist_tests/tests/test37/root.crt b/src/test-data/nist_x509/test37/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test37/root.crt
+++ b/src/test-data/nist_x509/test37/root.crt
diff --git a/tests/nist_tests/tests/test38/end.crt b/src/test-data/nist_x509/test38/end.crt
index 9331b90a2..9331b90a2 100644
--- a/tests/nist_tests/tests/test38/end.crt
+++ b/src/test-data/nist_x509/test38/end.crt
diff --git a/tests/nist_tests/tests/test38/int1.crl b/src/test-data/nist_x509/test38/int1.crl
index 81f75d4e5..81f75d4e5 100644
--- a/tests/nist_tests/tests/test38/int1.crl
+++ b/src/test-data/nist_x509/test38/int1.crl
diff --git a/tests/nist_tests/tests/test38/int1.crt b/src/test-data/nist_x509/test38/int1.crt
index c8ee614f4..c8ee614f4 100644
--- a/tests/nist_tests/tests/test38/int1.crt
+++ b/src/test-data/nist_x509/test38/int1.crt
diff --git a/tests/nist_tests/tests/test38/int2.crl b/src/test-data/nist_x509/test38/int2.crl
index ae1d7d5e8..ae1d7d5e8 100644
--- a/tests/nist_tests/tests/test38/int2.crl
+++ b/src/test-data/nist_x509/test38/int2.crl
diff --git a/tests/nist_tests/tests/test38/int2.crt b/src/test-data/nist_x509/test38/int2.crt
index 8d2834294..8d2834294 100644
--- a/tests/nist_tests/tests/test38/int2.crt
+++ b/src/test-data/nist_x509/test38/int2.crt
diff --git a/tests/nist_tests/tests/test38/root.crl b/src/test-data/nist_x509/test38/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test38/root.crl
+++ b/src/test-data/nist_x509/test38/root.crl
diff --git a/tests/nist_tests/tests/test38/root.crt b/src/test-data/nist_x509/test38/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test38/root.crt
+++ b/src/test-data/nist_x509/test38/root.crt
diff --git a/tests/nist_tests/tests/test39/end.crt b/src/test-data/nist_x509/test39/end.crt
index 57263d4cb..57263d4cb 100644
--- a/tests/nist_tests/tests/test39/end.crt
+++ b/src/test-data/nist_x509/test39/end.crt
diff --git a/tests/nist_tests/tests/test39/int1.crl b/src/test-data/nist_x509/test39/int1.crl
index f2a01385e..f2a01385e 100644
--- a/tests/nist_tests/tests/test39/int1.crl
+++ b/src/test-data/nist_x509/test39/int1.crl
diff --git a/tests/nist_tests/tests/test39/int1.crt b/src/test-data/nist_x509/test39/int1.crt
index b7003f7eb..b7003f7eb 100644
--- a/tests/nist_tests/tests/test39/int1.crt
+++ b/src/test-data/nist_x509/test39/int1.crt
diff --git a/tests/nist_tests/tests/test39/int2.crl b/src/test-data/nist_x509/test39/int2.crl
index b6672d85a..b6672d85a 100644
--- a/tests/nist_tests/tests/test39/int2.crl
+++ b/src/test-data/nist_x509/test39/int2.crl
diff --git a/tests/nist_tests/tests/test39/int2.crt b/src/test-data/nist_x509/test39/int2.crt
index c56ce57f0..c56ce57f0 100644
--- a/tests/nist_tests/tests/test39/int2.crt
+++ b/src/test-data/nist_x509/test39/int2.crt
diff --git a/tests/nist_tests/tests/test39/int3.crl b/src/test-data/nist_x509/test39/int3.crl
index 453420be8..453420be8 100644
--- a/tests/nist_tests/tests/test39/int3.crl
+++ b/src/test-data/nist_x509/test39/int3.crl
diff --git a/tests/nist_tests/tests/test39/int3.crt b/src/test-data/nist_x509/test39/int3.crt
index ce1224ada..ce1224ada 100644
--- a/tests/nist_tests/tests/test39/int3.crt
+++ b/src/test-data/nist_x509/test39/int3.crt
diff --git a/tests/nist_tests/tests/test39/root.crl b/src/test-data/nist_x509/test39/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test39/root.crl
+++ b/src/test-data/nist_x509/test39/root.crl
diff --git a/tests/nist_tests/tests/test39/root.crt b/src/test-data/nist_x509/test39/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test39/root.crt
+++ b/src/test-data/nist_x509/test39/root.crt
diff --git a/tests/nist_tests/tests/test40/end.crt b/src/test-data/nist_x509/test40/end.crt
index 24ce9e4d8..24ce9e4d8 100644
--- a/tests/nist_tests/tests/test40/end.crt
+++ b/src/test-data/nist_x509/test40/end.crt
diff --git a/tests/nist_tests/tests/test40/int1.crl b/src/test-data/nist_x509/test40/int1.crl
index 5bd6a9f83..5bd6a9f83 100644
--- a/tests/nist_tests/tests/test40/int1.crl
+++ b/src/test-data/nist_x509/test40/int1.crl
diff --git a/tests/nist_tests/tests/test40/int1.crt b/src/test-data/nist_x509/test40/int1.crt
index 5a8ac5006..5a8ac5006 100644
--- a/tests/nist_tests/tests/test40/int1.crt
+++ b/src/test-data/nist_x509/test40/int1.crt
diff --git a/tests/nist_tests/tests/test40/int2.crl b/src/test-data/nist_x509/test40/int2.crl
index dde5a124c..dde5a124c 100644
--- a/tests/nist_tests/tests/test40/int2.crl
+++ b/src/test-data/nist_x509/test40/int2.crl
diff --git a/tests/nist_tests/tests/test40/int2.crt b/src/test-data/nist_x509/test40/int2.crt
index 70e4d9092..70e4d9092 100644
--- a/tests/nist_tests/tests/test40/int2.crt
+++ b/src/test-data/nist_x509/test40/int2.crt
diff --git a/tests/nist_tests/tests/test40/int3.crl b/src/test-data/nist_x509/test40/int3.crl
index 713fa4bbf..713fa4bbf 100644
--- a/tests/nist_tests/tests/test40/int3.crl
+++ b/src/test-data/nist_x509/test40/int3.crl
diff --git a/tests/nist_tests/tests/test40/int3.crt b/src/test-data/nist_x509/test40/int3.crt
index a0c673453..a0c673453 100644
--- a/tests/nist_tests/tests/test40/int3.crt
+++ b/src/test-data/nist_x509/test40/int3.crt
diff --git a/tests/nist_tests/tests/test40/root.crl b/src/test-data/nist_x509/test40/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test40/root.crl
+++ b/src/test-data/nist_x509/test40/root.crl
diff --git a/tests/nist_tests/tests/test40/root.crt b/src/test-data/nist_x509/test40/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test40/root.crt
+++ b/src/test-data/nist_x509/test40/root.crt
diff --git a/tests/nist_tests/tests/test41/end.crt b/src/test-data/nist_x509/test41/end.crt
index b88e38eb9..b88e38eb9 100644
--- a/tests/nist_tests/tests/test41/end.crt
+++ b/src/test-data/nist_x509/test41/end.crt
diff --git a/tests/nist_tests/tests/test41/int1.crl b/src/test-data/nist_x509/test41/int1.crl
index 2d4c41521..2d4c41521 100644
--- a/tests/nist_tests/tests/test41/int1.crl
+++ b/src/test-data/nist_x509/test41/int1.crl
diff --git a/tests/nist_tests/tests/test41/int1.crt b/src/test-data/nist_x509/test41/int1.crt
index 4b96b2afb..4b96b2afb 100644
--- a/tests/nist_tests/tests/test41/int1.crt
+++ b/src/test-data/nist_x509/test41/int1.crt
diff --git a/tests/nist_tests/tests/test41/int2.crl b/src/test-data/nist_x509/test41/int2.crl
index e389a7fd9..e389a7fd9 100644
--- a/tests/nist_tests/tests/test41/int2.crl
+++ b/src/test-data/nist_x509/test41/int2.crl
diff --git a/tests/nist_tests/tests/test41/int2.crt b/src/test-data/nist_x509/test41/int2.crt
index 4b1edc710..4b1edc710 100644
--- a/tests/nist_tests/tests/test41/int2.crt
+++ b/src/test-data/nist_x509/test41/int2.crt
diff --git a/tests/nist_tests/tests/test41/int3.crl b/src/test-data/nist_x509/test41/int3.crl
index d26dc1b75..d26dc1b75 100644
--- a/tests/nist_tests/tests/test41/int3.crl
+++ b/src/test-data/nist_x509/test41/int3.crl
diff --git a/tests/nist_tests/tests/test41/int3.crt b/src/test-data/nist_x509/test41/int3.crt
index 6012a3a5b..6012a3a5b 100644
--- a/tests/nist_tests/tests/test41/int3.crt
+++ b/src/test-data/nist_x509/test41/int3.crt
diff --git a/tests/nist_tests/tests/test41/root.crl b/src/test-data/nist_x509/test41/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test41/root.crl
+++ b/src/test-data/nist_x509/test41/root.crl
diff --git a/tests/nist_tests/tests/test41/root.crt b/src/test-data/nist_x509/test41/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test41/root.crt
+++ b/src/test-data/nist_x509/test41/root.crt
diff --git a/tests/nist_tests/tests/test42/end.crt b/src/test-data/nist_x509/test42/end.crt
index 9815c5d5c..9815c5d5c 100644
--- a/tests/nist_tests/tests/test42/end.crt
+++ b/src/test-data/nist_x509/test42/end.crt
diff --git a/tests/nist_tests/tests/test42/int1.crl b/src/test-data/nist_x509/test42/int1.crl
index d4f21dbe3..d4f21dbe3 100644
--- a/tests/nist_tests/tests/test42/int1.crl
+++ b/src/test-data/nist_x509/test42/int1.crl
diff --git a/tests/nist_tests/tests/test42/int1.crt b/src/test-data/nist_x509/test42/int1.crt
index f344a9f27..f344a9f27 100644
--- a/tests/nist_tests/tests/test42/int1.crt
+++ b/src/test-data/nist_x509/test42/int1.crt
diff --git a/tests/nist_tests/tests/test42/int2.crl b/src/test-data/nist_x509/test42/int2.crl
index 32906057a..32906057a 100644
--- a/tests/nist_tests/tests/test42/int2.crl
+++ b/src/test-data/nist_x509/test42/int2.crl
diff --git a/tests/nist_tests/tests/test42/int2.crt b/src/test-data/nist_x509/test42/int2.crt
index a2fd05ccb..a2fd05ccb 100644
--- a/tests/nist_tests/tests/test42/int2.crt
+++ b/src/test-data/nist_x509/test42/int2.crt
diff --git a/tests/nist_tests/tests/test42/int3.crl b/src/test-data/nist_x509/test42/int3.crl
index ee2b2b18c..ee2b2b18c 100644
--- a/tests/nist_tests/tests/test42/int3.crl
+++ b/src/test-data/nist_x509/test42/int3.crl
diff --git a/tests/nist_tests/tests/test42/int3.crt b/src/test-data/nist_x509/test42/int3.crt
index 8104a65f8..8104a65f8 100644
--- a/tests/nist_tests/tests/test42/int3.crt
+++ b/src/test-data/nist_x509/test42/int3.crt
diff --git a/tests/nist_tests/tests/test42/int4.crl b/src/test-data/nist_x509/test42/int4.crl
index 7602160fa..7602160fa 100644
--- a/tests/nist_tests/tests/test42/int4.crl
+++ b/src/test-data/nist_x509/test42/int4.crl
diff --git a/tests/nist_tests/tests/test42/int4.crt b/src/test-data/nist_x509/test42/int4.crt
index 5b6ffbd4e..5b6ffbd4e 100644
--- a/tests/nist_tests/tests/test42/int4.crt
+++ b/src/test-data/nist_x509/test42/int4.crt
diff --git a/tests/nist_tests/tests/test42/root.crl b/src/test-data/nist_x509/test42/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test42/root.crl
+++ b/src/test-data/nist_x509/test42/root.crl
diff --git a/tests/nist_tests/tests/test42/root.crt b/src/test-data/nist_x509/test42/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test42/root.crt
+++ b/src/test-data/nist_x509/test42/root.crt
diff --git a/tests/nist_tests/tests/test43/end.crt b/src/test-data/nist_x509/test43/end.crt
index 9465ea5bf..9465ea5bf 100644
--- a/tests/nist_tests/tests/test43/end.crt
+++ b/src/test-data/nist_x509/test43/end.crt
diff --git a/tests/nist_tests/tests/test43/int1.crl b/src/test-data/nist_x509/test43/int1.crl
index 4ce26fdb9..4ce26fdb9 100644
--- a/tests/nist_tests/tests/test43/int1.crl
+++ b/src/test-data/nist_x509/test43/int1.crl
diff --git a/tests/nist_tests/tests/test43/int1.crt b/src/test-data/nist_x509/test43/int1.crt
index e18a4e168..e18a4e168 100644
--- a/tests/nist_tests/tests/test43/int1.crt
+++ b/src/test-data/nist_x509/test43/int1.crt
diff --git a/tests/nist_tests/tests/test43/int2.crl b/src/test-data/nist_x509/test43/int2.crl
index 9820bc6f6..9820bc6f6 100644
--- a/tests/nist_tests/tests/test43/int2.crl
+++ b/src/test-data/nist_x509/test43/int2.crl
diff --git a/tests/nist_tests/tests/test43/int2.crt b/src/test-data/nist_x509/test43/int2.crt
index 1521fce98..1521fce98 100644
--- a/tests/nist_tests/tests/test43/int2.crt
+++ b/src/test-data/nist_x509/test43/int2.crt
diff --git a/tests/nist_tests/tests/test43/int3.crl b/src/test-data/nist_x509/test43/int3.crl
index b8dfd8dfd..b8dfd8dfd 100644
--- a/tests/nist_tests/tests/test43/int3.crl
+++ b/src/test-data/nist_x509/test43/int3.crl
diff --git a/tests/nist_tests/tests/test43/int3.crt b/src/test-data/nist_x509/test43/int3.crt
index 30b9706d8..30b9706d8 100644
--- a/tests/nist_tests/tests/test43/int3.crt
+++ b/src/test-data/nist_x509/test43/int3.crt
diff --git a/tests/nist_tests/tests/test43/int4.crl b/src/test-data/nist_x509/test43/int4.crl
index 4b4136209..4b4136209 100644
--- a/tests/nist_tests/tests/test43/int4.crl
+++ b/src/test-data/nist_x509/test43/int4.crl
diff --git a/tests/nist_tests/tests/test43/int4.crt b/src/test-data/nist_x509/test43/int4.crt
index 949562273..949562273 100644
--- a/tests/nist_tests/tests/test43/int4.crt
+++ b/src/test-data/nist_x509/test43/int4.crt
diff --git a/tests/nist_tests/tests/test43/root.crl b/src/test-data/nist_x509/test43/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test43/root.crl
+++ b/src/test-data/nist_x509/test43/root.crl
diff --git a/tests/nist_tests/tests/test43/root.crt b/src/test-data/nist_x509/test43/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test43/root.crt
+++ b/src/test-data/nist_x509/test43/root.crt
diff --git a/tests/nist_tests/tests/test44/end.crt b/src/test-data/nist_x509/test44/end.crt
index 5fc9bec78..5fc9bec78 100644
--- a/tests/nist_tests/tests/test44/end.crt
+++ b/src/test-data/nist_x509/test44/end.crt
diff --git a/tests/nist_tests/tests/test44/int1.crl b/src/test-data/nist_x509/test44/int1.crl
index 2d4478cfc..2d4478cfc 100644
--- a/tests/nist_tests/tests/test44/int1.crl
+++ b/src/test-data/nist_x509/test44/int1.crl
diff --git a/tests/nist_tests/tests/test44/int1.crt b/src/test-data/nist_x509/test44/int1.crt
index fbfd2a4d0..fbfd2a4d0 100644
--- a/tests/nist_tests/tests/test44/int1.crt
+++ b/src/test-data/nist_x509/test44/int1.crt
diff --git a/tests/nist_tests/tests/test44/int2.crl b/src/test-data/nist_x509/test44/int2.crl
index 780ef7c0f..780ef7c0f 100644
--- a/tests/nist_tests/tests/test44/int2.crl
+++ b/src/test-data/nist_x509/test44/int2.crl
diff --git a/tests/nist_tests/tests/test44/int2.crt b/src/test-data/nist_x509/test44/int2.crt
index 26f319399..26f319399 100644
--- a/tests/nist_tests/tests/test44/int2.crt
+++ b/src/test-data/nist_x509/test44/int2.crt
diff --git a/tests/nist_tests/tests/test44/int3.crl b/src/test-data/nist_x509/test44/int3.crl
index 5e5267ed9..5e5267ed9 100644
--- a/tests/nist_tests/tests/test44/int3.crl
+++ b/src/test-data/nist_x509/test44/int3.crl
diff --git a/tests/nist_tests/tests/test44/int3.crt b/src/test-data/nist_x509/test44/int3.crt
index 7f62ef6ef..7f62ef6ef 100644
--- a/tests/nist_tests/tests/test44/int3.crt
+++ b/src/test-data/nist_x509/test44/int3.crt
diff --git a/tests/nist_tests/tests/test44/int4.crl b/src/test-data/nist_x509/test44/int4.crl
index 5d775f551..5d775f551 100644
--- a/tests/nist_tests/tests/test44/int4.crl
+++ b/src/test-data/nist_x509/test44/int4.crl
diff --git a/tests/nist_tests/tests/test44/int4.crt b/src/test-data/nist_x509/test44/int4.crt
index 76d6111ec..76d6111ec 100644
--- a/tests/nist_tests/tests/test44/int4.crt
+++ b/src/test-data/nist_x509/test44/int4.crt
diff --git a/tests/nist_tests/tests/test44/root.crl b/src/test-data/nist_x509/test44/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test44/root.crl
+++ b/src/test-data/nist_x509/test44/root.crl
diff --git a/tests/nist_tests/tests/test44/root.crt b/src/test-data/nist_x509/test44/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test44/root.crt
+++ b/src/test-data/nist_x509/test44/root.crt
diff --git a/tests/nist_tests/tests/test45/end.crt b/src/test-data/nist_x509/test45/end.crt
index a2ddb0430..a2ddb0430 100644
--- a/tests/nist_tests/tests/test45/end.crt
+++ b/src/test-data/nist_x509/test45/end.crt
diff --git a/tests/nist_tests/tests/test45/int1.crl b/src/test-data/nist_x509/test45/int1.crl
index 079062c14..079062c14 100644
--- a/tests/nist_tests/tests/test45/int1.crl
+++ b/src/test-data/nist_x509/test45/int1.crl
diff --git a/tests/nist_tests/tests/test45/int1.crt b/src/test-data/nist_x509/test45/int1.crt
index 90ee8e3fe..90ee8e3fe 100644
--- a/tests/nist_tests/tests/test45/int1.crt
+++ b/src/test-data/nist_x509/test45/int1.crt
diff --git a/tests/nist_tests/tests/test45/int2.crl b/src/test-data/nist_x509/test45/int2.crl
index 7c12bd0c3..7c12bd0c3 100644
--- a/tests/nist_tests/tests/test45/int2.crl
+++ b/src/test-data/nist_x509/test45/int2.crl
diff --git a/tests/nist_tests/tests/test45/int2.crt b/src/test-data/nist_x509/test45/int2.crt
index 7fc0467ca..7fc0467ca 100644
--- a/tests/nist_tests/tests/test45/int2.crt
+++ b/src/test-data/nist_x509/test45/int2.crt
diff --git a/tests/nist_tests/tests/test45/int3.crl b/src/test-data/nist_x509/test45/int3.crl
index f81b5042f..f81b5042f 100644
--- a/tests/nist_tests/tests/test45/int3.crl
+++ b/src/test-data/nist_x509/test45/int3.crl
diff --git a/tests/nist_tests/tests/test45/int3.crt b/src/test-data/nist_x509/test45/int3.crt
index fb9500f12..fb9500f12 100644
--- a/tests/nist_tests/tests/test45/int3.crt
+++ b/src/test-data/nist_x509/test45/int3.crt
diff --git a/tests/nist_tests/tests/test45/int4.crl b/src/test-data/nist_x509/test45/int4.crl
index 9e67a4a91..9e67a4a91 100644
--- a/tests/nist_tests/tests/test45/int4.crl
+++ b/src/test-data/nist_x509/test45/int4.crl
diff --git a/tests/nist_tests/tests/test45/int4.crt b/src/test-data/nist_x509/test45/int4.crt
index 60b6c9133..60b6c9133 100644
--- a/tests/nist_tests/tests/test45/int4.crt
+++ b/src/test-data/nist_x509/test45/int4.crt
diff --git a/tests/nist_tests/tests/test45/root.crl b/src/test-data/nist_x509/test45/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test45/root.crl
+++ b/src/test-data/nist_x509/test45/root.crl
diff --git a/tests/nist_tests/tests/test45/root.crt b/src/test-data/nist_x509/test45/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test45/root.crt
+++ b/src/test-data/nist_x509/test45/root.crt
diff --git a/tests/nist_tests/tests/test46/end.crt b/src/test-data/nist_x509/test46/end.crt
index 39ebf20a3..39ebf20a3 100644
--- a/tests/nist_tests/tests/test46/end.crt
+++ b/src/test-data/nist_x509/test46/end.crt
diff --git a/tests/nist_tests/tests/test46/int1.crl b/src/test-data/nist_x509/test46/int1.crl
index f9a2236bc..f9a2236bc 100644
--- a/tests/nist_tests/tests/test46/int1.crl
+++ b/src/test-data/nist_x509/test46/int1.crl
diff --git a/tests/nist_tests/tests/test46/int1.crt b/src/test-data/nist_x509/test46/int1.crt
index 985a5d575..985a5d575 100644
--- a/tests/nist_tests/tests/test46/int1.crt
+++ b/src/test-data/nist_x509/test46/int1.crt
diff --git a/tests/nist_tests/tests/test46/int2.crl b/src/test-data/nist_x509/test46/int2.crl
index 02e82c48a..02e82c48a 100644
--- a/tests/nist_tests/tests/test46/int2.crl
+++ b/src/test-data/nist_x509/test46/int2.crl
diff --git a/tests/nist_tests/tests/test46/int2.crt b/src/test-data/nist_x509/test46/int2.crt
index ade64339c..ade64339c 100644
--- a/tests/nist_tests/tests/test46/int2.crt
+++ b/src/test-data/nist_x509/test46/int2.crt
diff --git a/tests/nist_tests/tests/test46/int3.crl b/src/test-data/nist_x509/test46/int3.crl
index ddd59a80c..ddd59a80c 100644
--- a/tests/nist_tests/tests/test46/int3.crl
+++ b/src/test-data/nist_x509/test46/int3.crl
diff --git a/tests/nist_tests/tests/test46/int3.crt b/src/test-data/nist_x509/test46/int3.crt
index 6e33faaaa..6e33faaaa 100644
--- a/tests/nist_tests/tests/test46/int3.crt
+++ b/src/test-data/nist_x509/test46/int3.crt
diff --git a/tests/nist_tests/tests/test46/int4.crl b/src/test-data/nist_x509/test46/int4.crl
index 3dedfb11e..3dedfb11e 100644
--- a/tests/nist_tests/tests/test46/int4.crl
+++ b/src/test-data/nist_x509/test46/int4.crl
diff --git a/tests/nist_tests/tests/test46/int4.crt b/src/test-data/nist_x509/test46/int4.crt
index 1b3fc5726..1b3fc5726 100644
--- a/tests/nist_tests/tests/test46/int4.crt
+++ b/src/test-data/nist_x509/test46/int4.crt
diff --git a/tests/nist_tests/tests/test46/root.crl b/src/test-data/nist_x509/test46/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test46/root.crl
+++ b/src/test-data/nist_x509/test46/root.crl
diff --git a/tests/nist_tests/tests/test46/root.crt b/src/test-data/nist_x509/test46/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test46/root.crt
+++ b/src/test-data/nist_x509/test46/root.crt
diff --git a/tests/nist_tests/tests/test47/end.crt b/src/test-data/nist_x509/test47/end.crt
index 7337bc5b5..7337bc5b5 100644
--- a/tests/nist_tests/tests/test47/end.crt
+++ b/src/test-data/nist_x509/test47/end.crt
diff --git a/tests/nist_tests/tests/test47/int1.crl b/src/test-data/nist_x509/test47/int1.crl
index 938e3f412..938e3f412 100644
--- a/tests/nist_tests/tests/test47/int1.crl
+++ b/src/test-data/nist_x509/test47/int1.crl
diff --git a/tests/nist_tests/tests/test47/int1.crt b/src/test-data/nist_x509/test47/int1.crt
index bf3e22239..bf3e22239 100644
--- a/tests/nist_tests/tests/test47/int1.crt
+++ b/src/test-data/nist_x509/test47/int1.crt
diff --git a/tests/nist_tests/tests/test47/int2.crl b/src/test-data/nist_x509/test47/int2.crl
index f715c112d..f715c112d 100644
--- a/tests/nist_tests/tests/test47/int2.crl
+++ b/src/test-data/nist_x509/test47/int2.crl
diff --git a/tests/nist_tests/tests/test47/int2.crt b/src/test-data/nist_x509/test47/int2.crt
index 1b7854e33..1b7854e33 100644
--- a/tests/nist_tests/tests/test47/int2.crt
+++ b/src/test-data/nist_x509/test47/int2.crt
diff --git a/tests/nist_tests/tests/test47/int3.crl b/src/test-data/nist_x509/test47/int3.crl
index 786aa5032..786aa5032 100644
--- a/tests/nist_tests/tests/test47/int3.crl
+++ b/src/test-data/nist_x509/test47/int3.crl
diff --git a/tests/nist_tests/tests/test47/int3.crt b/src/test-data/nist_x509/test47/int3.crt
index 62eb3b220..62eb3b220 100644
--- a/tests/nist_tests/tests/test47/int3.crt
+++ b/src/test-data/nist_x509/test47/int3.crt
diff --git a/tests/nist_tests/tests/test47/int4.crl b/src/test-data/nist_x509/test47/int4.crl
index 925b78324..925b78324 100644
--- a/tests/nist_tests/tests/test47/int4.crl
+++ b/src/test-data/nist_x509/test47/int4.crl
diff --git a/tests/nist_tests/tests/test47/int4.crt b/src/test-data/nist_x509/test47/int4.crt
index 1c9a14344..1c9a14344 100644
--- a/tests/nist_tests/tests/test47/int4.crt
+++ b/src/test-data/nist_x509/test47/int4.crt
diff --git a/tests/nist_tests/tests/test47/root.crl b/src/test-data/nist_x509/test47/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test47/root.crl
+++ b/src/test-data/nist_x509/test47/root.crl
diff --git a/tests/nist_tests/tests/test47/root.crt b/src/test-data/nist_x509/test47/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test47/root.crt
+++ b/src/test-data/nist_x509/test47/root.crt
diff --git a/tests/nist_tests/tests/test48/end.crt b/src/test-data/nist_x509/test48/end.crt
index 933f27912..933f27912 100644
--- a/tests/nist_tests/tests/test48/end.crt
+++ b/src/test-data/nist_x509/test48/end.crt
diff --git a/tests/nist_tests/tests/test48/int.crl b/src/test-data/nist_x509/test48/int.crl
index 89ad99cd1..89ad99cd1 100644
--- a/tests/nist_tests/tests/test48/int.crl
+++ b/src/test-data/nist_x509/test48/int.crl
diff --git a/tests/nist_tests/tests/test48/int.crt b/src/test-data/nist_x509/test48/int.crt
index b2eefc4ae..b2eefc4ae 100644
--- a/tests/nist_tests/tests/test48/int.crt
+++ b/src/test-data/nist_x509/test48/int.crt
diff --git a/tests/nist_tests/tests/test48/root.crl b/src/test-data/nist_x509/test48/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test48/root.crl
+++ b/src/test-data/nist_x509/test48/root.crl
diff --git a/tests/nist_tests/tests/test48/root.crt b/src/test-data/nist_x509/test48/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test48/root.crt
+++ b/src/test-data/nist_x509/test48/root.crt
diff --git a/tests/nist_tests/tests/test49/end.crt b/src/test-data/nist_x509/test49/end.crt
index d0e4a26e6..d0e4a26e6 100644
--- a/tests/nist_tests/tests/test49/end.crt
+++ b/src/test-data/nist_x509/test49/end.crt
diff --git a/tests/nist_tests/tests/test49/int.crl b/src/test-data/nist_x509/test49/int.crl
index 1defb1ef5..1defb1ef5 100644
--- a/tests/nist_tests/tests/test49/int.crl
+++ b/src/test-data/nist_x509/test49/int.crl
diff --git a/tests/nist_tests/tests/test49/int.crt b/src/test-data/nist_x509/test49/int.crt
index 037f68d8b..037f68d8b 100644
--- a/tests/nist_tests/tests/test49/int.crt
+++ b/src/test-data/nist_x509/test49/int.crt
diff --git a/tests/nist_tests/tests/test49/root.crl b/src/test-data/nist_x509/test49/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test49/root.crl
+++ b/src/test-data/nist_x509/test49/root.crl
diff --git a/tests/nist_tests/tests/test49/root.crt b/src/test-data/nist_x509/test49/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test49/root.crt
+++ b/src/test-data/nist_x509/test49/root.crt
diff --git a/tests/nist_tests/tests/test50/end.crt b/src/test-data/nist_x509/test50/end.crt
index ed9b0a3ce..ed9b0a3ce 100644
--- a/tests/nist_tests/tests/test50/end.crt
+++ b/src/test-data/nist_x509/test50/end.crt
diff --git a/tests/nist_tests/tests/test50/int.crl b/src/test-data/nist_x509/test50/int.crl
index 0c7cdfee5..0c7cdfee5 100644
--- a/tests/nist_tests/tests/test50/int.crl
+++ b/src/test-data/nist_x509/test50/int.crl
diff --git a/tests/nist_tests/tests/test50/int.crt b/src/test-data/nist_x509/test50/int.crt
index 74c41f021..74c41f021 100644
--- a/tests/nist_tests/tests/test50/int.crt
+++ b/src/test-data/nist_x509/test50/int.crt
diff --git a/tests/nist_tests/tests/test50/root.crl b/src/test-data/nist_x509/test50/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test50/root.crl
+++ b/src/test-data/nist_x509/test50/root.crl
diff --git a/tests/nist_tests/tests/test50/root.crt b/src/test-data/nist_x509/test50/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test50/root.crt
+++ b/src/test-data/nist_x509/test50/root.crt
diff --git a/tests/nist_tests/tests/test51/end.crt b/src/test-data/nist_x509/test51/end.crt
index 12ebc74c7..12ebc74c7 100644
--- a/tests/nist_tests/tests/test51/end.crt
+++ b/src/test-data/nist_x509/test51/end.crt
diff --git a/tests/nist_tests/tests/test51/int.crl b/src/test-data/nist_x509/test51/int.crl
index c887c9a2c..c887c9a2c 100644
--- a/tests/nist_tests/tests/test51/int.crl
+++ b/src/test-data/nist_x509/test51/int.crl
diff --git a/tests/nist_tests/tests/test51/int.crt b/src/test-data/nist_x509/test51/int.crt
index def7e90d1..def7e90d1 100644
--- a/tests/nist_tests/tests/test51/int.crt
+++ b/src/test-data/nist_x509/test51/int.crt
diff --git a/tests/nist_tests/tests/test51/root.crl b/src/test-data/nist_x509/test51/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test51/root.crl
+++ b/src/test-data/nist_x509/test51/root.crl
diff --git a/tests/nist_tests/tests/test51/root.crt b/src/test-data/nist_x509/test51/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test51/root.crt
+++ b/src/test-data/nist_x509/test51/root.crt
diff --git a/tests/nist_tests/tests/test52/end.crt b/src/test-data/nist_x509/test52/end.crt
index 0bd19185f..0bd19185f 100644
--- a/tests/nist_tests/tests/test52/end.crt
+++ b/src/test-data/nist_x509/test52/end.crt
diff --git a/tests/nist_tests/tests/test52/int.crl b/src/test-data/nist_x509/test52/int.crl
index ec220874c..ec220874c 100644
--- a/tests/nist_tests/tests/test52/int.crl
+++ b/src/test-data/nist_x509/test52/int.crl
diff --git a/tests/nist_tests/tests/test52/int.crt b/src/test-data/nist_x509/test52/int.crt
index 3429d7cf7..3429d7cf7 100644
--- a/tests/nist_tests/tests/test52/int.crt
+++ b/src/test-data/nist_x509/test52/int.crt
diff --git a/tests/nist_tests/tests/test52/root.crl b/src/test-data/nist_x509/test52/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test52/root.crl
+++ b/src/test-data/nist_x509/test52/root.crl
diff --git a/tests/nist_tests/tests/test52/root.crt b/src/test-data/nist_x509/test52/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test52/root.crt
+++ b/src/test-data/nist_x509/test52/root.crt
diff --git a/tests/nist_tests/tests/test53/end.crt b/src/test-data/nist_x509/test53/end.crt
index 9b99dc562..9b99dc562 100644
--- a/tests/nist_tests/tests/test53/end.crt
+++ b/src/test-data/nist_x509/test53/end.crt
diff --git a/tests/nist_tests/tests/test53/int.crl b/src/test-data/nist_x509/test53/int.crl
index 79fed242a..79fed242a 100644
--- a/tests/nist_tests/tests/test53/int.crl
+++ b/src/test-data/nist_x509/test53/int.crl
diff --git a/tests/nist_tests/tests/test53/int.crt b/src/test-data/nist_x509/test53/int.crt
index 72eac943f..72eac943f 100644
--- a/tests/nist_tests/tests/test53/int.crt
+++ b/src/test-data/nist_x509/test53/int.crt
diff --git a/tests/nist_tests/tests/test53/root.crl b/src/test-data/nist_x509/test53/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test53/root.crl
+++ b/src/test-data/nist_x509/test53/root.crl
diff --git a/tests/nist_tests/tests/test53/root.crt b/src/test-data/nist_x509/test53/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test53/root.crt
+++ b/src/test-data/nist_x509/test53/root.crt
diff --git a/tests/nist_tests/tests/test54/end.crt b/src/test-data/nist_x509/test54/end.crt
index 185f019cf..185f019cf 100644
--- a/tests/nist_tests/tests/test54/end.crt
+++ b/src/test-data/nist_x509/test54/end.crt
diff --git a/tests/nist_tests/tests/test54/int1.crl b/src/test-data/nist_x509/test54/int1.crl
index 5b1c4439c..5b1c4439c 100644
--- a/tests/nist_tests/tests/test54/int1.crl
+++ b/src/test-data/nist_x509/test54/int1.crl
diff --git a/tests/nist_tests/tests/test54/int1.crt b/src/test-data/nist_x509/test54/int1.crt
index 140ef0669..140ef0669 100644
--- a/tests/nist_tests/tests/test54/int1.crt
+++ b/src/test-data/nist_x509/test54/int1.crt
diff --git a/tests/nist_tests/tests/test54/int2.crl b/src/test-data/nist_x509/test54/int2.crl
index c531566a9..c531566a9 100644
--- a/tests/nist_tests/tests/test54/int2.crl
+++ b/src/test-data/nist_x509/test54/int2.crl
diff --git a/tests/nist_tests/tests/test54/int2.crt b/src/test-data/nist_x509/test54/int2.crt
index 506761d71..506761d71 100644
--- a/tests/nist_tests/tests/test54/int2.crt
+++ b/src/test-data/nist_x509/test54/int2.crt
diff --git a/tests/nist_tests/tests/test54/root.crl b/src/test-data/nist_x509/test54/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test54/root.crl
+++ b/src/test-data/nist_x509/test54/root.crl
diff --git a/tests/nist_tests/tests/test54/root.crt b/src/test-data/nist_x509/test54/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test54/root.crt
+++ b/src/test-data/nist_x509/test54/root.crt
diff --git a/tests/nist_tests/tests/test55/end.crt b/src/test-data/nist_x509/test55/end.crt
index 923d4c5a8..923d4c5a8 100644
--- a/tests/nist_tests/tests/test55/end.crt
+++ b/src/test-data/nist_x509/test55/end.crt
diff --git a/tests/nist_tests/tests/test55/int1.crl b/src/test-data/nist_x509/test55/int1.crl
index 371821e5e..371821e5e 100644
--- a/tests/nist_tests/tests/test55/int1.crl
+++ b/src/test-data/nist_x509/test55/int1.crl
diff --git a/tests/nist_tests/tests/test55/int1.crt b/src/test-data/nist_x509/test55/int1.crt
index 7597faf7f..7597faf7f 100644
--- a/tests/nist_tests/tests/test55/int1.crt
+++ b/src/test-data/nist_x509/test55/int1.crt
diff --git a/tests/nist_tests/tests/test55/int2.crl b/src/test-data/nist_x509/test55/int2.crl
index 9a242916e..9a242916e 100644
--- a/tests/nist_tests/tests/test55/int2.crl
+++ b/src/test-data/nist_x509/test55/int2.crl
diff --git a/tests/nist_tests/tests/test55/int2.crt b/src/test-data/nist_x509/test55/int2.crt
index 982235a21..982235a21 100644
--- a/tests/nist_tests/tests/test55/int2.crt
+++ b/src/test-data/nist_x509/test55/int2.crt
diff --git a/tests/nist_tests/tests/test55/root.crl b/src/test-data/nist_x509/test55/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test55/root.crl
+++ b/src/test-data/nist_x509/test55/root.crl
diff --git a/tests/nist_tests/tests/test55/root.crt b/src/test-data/nist_x509/test55/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test55/root.crt
+++ b/src/test-data/nist_x509/test55/root.crt
diff --git a/tests/nist_tests/tests/test56/end.crt b/src/test-data/nist_x509/test56/end.crt
index d1dc82186..d1dc82186 100644
--- a/tests/nist_tests/tests/test56/end.crt
+++ b/src/test-data/nist_x509/test56/end.crt
diff --git a/tests/nist_tests/tests/test56/int.crl b/src/test-data/nist_x509/test56/int.crl
index 840b209e0..840b209e0 100644
--- a/tests/nist_tests/tests/test56/int.crl
+++ b/src/test-data/nist_x509/test56/int.crl
diff --git a/tests/nist_tests/tests/test56/int.crt b/src/test-data/nist_x509/test56/int.crt
index 9b622cabd..9b622cabd 100644
--- a/tests/nist_tests/tests/test56/int.crt
+++ b/src/test-data/nist_x509/test56/int.crt
diff --git a/tests/nist_tests/tests/test56/root.crl b/src/test-data/nist_x509/test56/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test56/root.crl
+++ b/src/test-data/nist_x509/test56/root.crl
diff --git a/tests/nist_tests/tests/test56/root.crt b/src/test-data/nist_x509/test56/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test56/root.crt
+++ b/src/test-data/nist_x509/test56/root.crt
diff --git a/tests/nist_tests/tests/test57/end.crt b/src/test-data/nist_x509/test57/end.crt
index 2f939384a..2f939384a 100644
--- a/tests/nist_tests/tests/test57/end.crt
+++ b/src/test-data/nist_x509/test57/end.crt
diff --git a/tests/nist_tests/tests/test57/int.crl b/src/test-data/nist_x509/test57/int.crl
index a0be908ae..a0be908ae 100644
--- a/tests/nist_tests/tests/test57/int.crl
+++ b/src/test-data/nist_x509/test57/int.crl
diff --git a/tests/nist_tests/tests/test57/int.crt b/src/test-data/nist_x509/test57/int.crt
index 79f6d6b8a..79f6d6b8a 100644
--- a/tests/nist_tests/tests/test57/int.crt
+++ b/src/test-data/nist_x509/test57/int.crt
diff --git a/tests/nist_tests/tests/test57/root.crl b/src/test-data/nist_x509/test57/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test57/root.crl
+++ b/src/test-data/nist_x509/test57/root.crl
diff --git a/tests/nist_tests/tests/test57/root.crt b/src/test-data/nist_x509/test57/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test57/root.crt
+++ b/src/test-data/nist_x509/test57/root.crt
diff --git a/tests/nist_tests/tests/test58/end.crt b/src/test-data/nist_x509/test58/end.crt
index 674009c83..674009c83 100644
--- a/tests/nist_tests/tests/test58/end.crt
+++ b/src/test-data/nist_x509/test58/end.crt
diff --git a/tests/nist_tests/tests/test58/int1.crl b/src/test-data/nist_x509/test58/int1.crl
index aa9dc9d7f..aa9dc9d7f 100644
--- a/tests/nist_tests/tests/test58/int1.crl
+++ b/src/test-data/nist_x509/test58/int1.crl
diff --git a/tests/nist_tests/tests/test58/int1.crt b/src/test-data/nist_x509/test58/int1.crt
index 42e983122..42e983122 100644
--- a/tests/nist_tests/tests/test58/int1.crt
+++ b/src/test-data/nist_x509/test58/int1.crt
diff --git a/tests/nist_tests/tests/test58/int2.crl b/src/test-data/nist_x509/test58/int2.crl
index 7dec9c1eb..7dec9c1eb 100644
--- a/tests/nist_tests/tests/test58/int2.crl
+++ b/src/test-data/nist_x509/test58/int2.crl
diff --git a/tests/nist_tests/tests/test58/int2.crt b/src/test-data/nist_x509/test58/int2.crt
index 08eb808c4..08eb808c4 100644
--- a/tests/nist_tests/tests/test58/int2.crt
+++ b/src/test-data/nist_x509/test58/int2.crt
diff --git a/tests/nist_tests/tests/test58/int3.crl b/src/test-data/nist_x509/test58/int3.crl
index bec634480..bec634480 100644
--- a/tests/nist_tests/tests/test58/int3.crl
+++ b/src/test-data/nist_x509/test58/int3.crl
diff --git a/tests/nist_tests/tests/test58/int3.crt b/src/test-data/nist_x509/test58/int3.crt
index 6c5e6efae..6c5e6efae 100644
--- a/tests/nist_tests/tests/test58/int3.crt
+++ b/src/test-data/nist_x509/test58/int3.crt
diff --git a/tests/nist_tests/tests/test58/root.crl b/src/test-data/nist_x509/test58/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test58/root.crl
+++ b/src/test-data/nist_x509/test58/root.crl
diff --git a/tests/nist_tests/tests/test58/root.crt b/src/test-data/nist_x509/test58/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test58/root.crt
+++ b/src/test-data/nist_x509/test58/root.crt
diff --git a/tests/nist_tests/tests/test59/end.crt b/src/test-data/nist_x509/test59/end.crt
index da5ee9e69..da5ee9e69 100644
--- a/tests/nist_tests/tests/test59/end.crt
+++ b/src/test-data/nist_x509/test59/end.crt
diff --git a/tests/nist_tests/tests/test59/int1.crl b/src/test-data/nist_x509/test59/int1.crl
index eb7f0e883..eb7f0e883 100644
--- a/tests/nist_tests/tests/test59/int1.crl
+++ b/src/test-data/nist_x509/test59/int1.crl
diff --git a/tests/nist_tests/tests/test59/int1.crt b/src/test-data/nist_x509/test59/int1.crt
index be0ee21f2..be0ee21f2 100644
--- a/tests/nist_tests/tests/test59/int1.crt
+++ b/src/test-data/nist_x509/test59/int1.crt
diff --git a/tests/nist_tests/tests/test59/int2.crl b/src/test-data/nist_x509/test59/int2.crl
index 2b2fe9ced..2b2fe9ced 100644
--- a/tests/nist_tests/tests/test59/int2.crl
+++ b/src/test-data/nist_x509/test59/int2.crl
diff --git a/tests/nist_tests/tests/test59/int2.crt b/src/test-data/nist_x509/test59/int2.crt
index a84a7ba5e..a84a7ba5e 100644
--- a/tests/nist_tests/tests/test59/int2.crt
+++ b/src/test-data/nist_x509/test59/int2.crt
diff --git a/tests/nist_tests/tests/test59/int3.crl b/src/test-data/nist_x509/test59/int3.crl
index cb7885c17..cb7885c17 100644
--- a/tests/nist_tests/tests/test59/int3.crl
+++ b/src/test-data/nist_x509/test59/int3.crl
diff --git a/tests/nist_tests/tests/test59/int3.crt b/src/test-data/nist_x509/test59/int3.crt
index 0b13f9f9b..0b13f9f9b 100644
--- a/tests/nist_tests/tests/test59/int3.crt
+++ b/src/test-data/nist_x509/test59/int3.crt
diff --git a/tests/nist_tests/tests/test59/root.crl b/src/test-data/nist_x509/test59/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test59/root.crl
+++ b/src/test-data/nist_x509/test59/root.crl
diff --git a/tests/nist_tests/tests/test59/root.crt b/src/test-data/nist_x509/test59/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test59/root.crt
+++ b/src/test-data/nist_x509/test59/root.crt
diff --git a/tests/nist_tests/tests/test60/end.crt b/src/test-data/nist_x509/test60/end.crt
index 8741105ea..8741105ea 100644
--- a/tests/nist_tests/tests/test60/end.crt
+++ b/src/test-data/nist_x509/test60/end.crt
diff --git a/tests/nist_tests/tests/test60/int1.crl b/src/test-data/nist_x509/test60/int1.crl
index e778e911d..e778e911d 100644
--- a/tests/nist_tests/tests/test60/int1.crl
+++ b/src/test-data/nist_x509/test60/int1.crl
diff --git a/tests/nist_tests/tests/test60/int1.crt b/src/test-data/nist_x509/test60/int1.crt
index 01d844201..01d844201 100644
--- a/tests/nist_tests/tests/test60/int1.crt
+++ b/src/test-data/nist_x509/test60/int1.crt
diff --git a/tests/nist_tests/tests/test60/int2.crl b/src/test-data/nist_x509/test60/int2.crl
index 4f4ac6bc0..4f4ac6bc0 100644
--- a/tests/nist_tests/tests/test60/int2.crl
+++ b/src/test-data/nist_x509/test60/int2.crl
diff --git a/tests/nist_tests/tests/test60/int2.crt b/src/test-data/nist_x509/test60/int2.crt
index 0054dc622..0054dc622 100644
--- a/tests/nist_tests/tests/test60/int2.crt
+++ b/src/test-data/nist_x509/test60/int2.crt
diff --git a/tests/nist_tests/tests/test60/int3.crl b/src/test-data/nist_x509/test60/int3.crl
index 0b568e7cc..0b568e7cc 100644
--- a/tests/nist_tests/tests/test60/int3.crl
+++ b/src/test-data/nist_x509/test60/int3.crl
diff --git a/tests/nist_tests/tests/test60/int3.crt b/src/test-data/nist_x509/test60/int3.crt
index 6fff65cc7..6fff65cc7 100644
--- a/tests/nist_tests/tests/test60/int3.crt
+++ b/src/test-data/nist_x509/test60/int3.crt
diff --git a/tests/nist_tests/tests/test60/int4.crl b/src/test-data/nist_x509/test60/int4.crl
index 4cf694a98..4cf694a98 100644
--- a/tests/nist_tests/tests/test60/int4.crl
+++ b/src/test-data/nist_x509/test60/int4.crl
diff --git a/tests/nist_tests/tests/test60/int4.crt b/src/test-data/nist_x509/test60/int4.crt
index c5eebca96..c5eebca96 100644
--- a/tests/nist_tests/tests/test60/int4.crt
+++ b/src/test-data/nist_x509/test60/int4.crt
diff --git a/tests/nist_tests/tests/test60/root.crl b/src/test-data/nist_x509/test60/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test60/root.crl
+++ b/src/test-data/nist_x509/test60/root.crl
diff --git a/tests/nist_tests/tests/test60/root.crt b/src/test-data/nist_x509/test60/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test60/root.crt
+++ b/src/test-data/nist_x509/test60/root.crt
diff --git a/tests/nist_tests/tests/test61/end.crt b/src/test-data/nist_x509/test61/end.crt
index 7be023caf..7be023caf 100644
--- a/tests/nist_tests/tests/test61/end.crt
+++ b/src/test-data/nist_x509/test61/end.crt
diff --git a/tests/nist_tests/tests/test61/int1.crl b/src/test-data/nist_x509/test61/int1.crl
index 05c2809aa..05c2809aa 100644
--- a/tests/nist_tests/tests/test61/int1.crl
+++ b/src/test-data/nist_x509/test61/int1.crl
diff --git a/tests/nist_tests/tests/test61/int1.crt b/src/test-data/nist_x509/test61/int1.crt
index ba03f6c24..ba03f6c24 100644
--- a/tests/nist_tests/tests/test61/int1.crt
+++ b/src/test-data/nist_x509/test61/int1.crt
diff --git a/tests/nist_tests/tests/test61/int2.crl b/src/test-data/nist_x509/test61/int2.crl
index d74b9168c..d74b9168c 100644
--- a/tests/nist_tests/tests/test61/int2.crl
+++ b/src/test-data/nist_x509/test61/int2.crl
diff --git a/tests/nist_tests/tests/test61/int2.crt b/src/test-data/nist_x509/test61/int2.crt
index bd4e40ea3..bd4e40ea3 100644
--- a/tests/nist_tests/tests/test61/int2.crt
+++ b/src/test-data/nist_x509/test61/int2.crt
diff --git a/tests/nist_tests/tests/test61/int3.crl b/src/test-data/nist_x509/test61/int3.crl
index 7e6e83fb2..7e6e83fb2 100644
--- a/tests/nist_tests/tests/test61/int3.crl
+++ b/src/test-data/nist_x509/test61/int3.crl
diff --git a/tests/nist_tests/tests/test61/int3.crt b/src/test-data/nist_x509/test61/int3.crt
index 4f9342b20..4f9342b20 100644
--- a/tests/nist_tests/tests/test61/int3.crt
+++ b/src/test-data/nist_x509/test61/int3.crt
diff --git a/tests/nist_tests/tests/test61/int4.crl b/src/test-data/nist_x509/test61/int4.crl
index 7161f4192..7161f4192 100644
--- a/tests/nist_tests/tests/test61/int4.crl
+++ b/src/test-data/nist_x509/test61/int4.crl
diff --git a/tests/nist_tests/tests/test61/int4.crt b/src/test-data/nist_x509/test61/int4.crt
index 5962eedfa..5962eedfa 100644
--- a/tests/nist_tests/tests/test61/int4.crt
+++ b/src/test-data/nist_x509/test61/int4.crt
diff --git a/tests/nist_tests/tests/test61/root.crl b/src/test-data/nist_x509/test61/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test61/root.crl
+++ b/src/test-data/nist_x509/test61/root.crl
diff --git a/tests/nist_tests/tests/test61/root.crt b/src/test-data/nist_x509/test61/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test61/root.crt
+++ b/src/test-data/nist_x509/test61/root.crt
diff --git a/tests/nist_tests/tests/test62/end.crt b/src/test-data/nist_x509/test62/end.crt
index bff8ea4cb..bff8ea4cb 100644
--- a/tests/nist_tests/tests/test62/end.crt
+++ b/src/test-data/nist_x509/test62/end.crt
diff --git a/tests/nist_tests/tests/test62/int1.crl b/src/test-data/nist_x509/test62/int1.crl
index aa26a419a..aa26a419a 100644
--- a/tests/nist_tests/tests/test62/int1.crl
+++ b/src/test-data/nist_x509/test62/int1.crl
diff --git a/tests/nist_tests/tests/test62/int1.crt b/src/test-data/nist_x509/test62/int1.crt
index aee257d7e..aee257d7e 100644
--- a/tests/nist_tests/tests/test62/int1.crt
+++ b/src/test-data/nist_x509/test62/int1.crt
diff --git a/tests/nist_tests/tests/test62/int2.crl b/src/test-data/nist_x509/test62/int2.crl
index 61e712f0d..61e712f0d 100644
--- a/tests/nist_tests/tests/test62/int2.crl
+++ b/src/test-data/nist_x509/test62/int2.crl
diff --git a/tests/nist_tests/tests/test62/int2.crt b/src/test-data/nist_x509/test62/int2.crt
index a62d9a026..a62d9a026 100644
--- a/tests/nist_tests/tests/test62/int2.crt
+++ b/src/test-data/nist_x509/test62/int2.crt
diff --git a/tests/nist_tests/tests/test62/int3.crl b/src/test-data/nist_x509/test62/int3.crl
index 09707fd7b..09707fd7b 100644
--- a/tests/nist_tests/tests/test62/int3.crl
+++ b/src/test-data/nist_x509/test62/int3.crl
diff --git a/tests/nist_tests/tests/test62/int3.crt b/src/test-data/nist_x509/test62/int3.crt
index aa91f3427..aa91f3427 100644
--- a/tests/nist_tests/tests/test62/int3.crt
+++ b/src/test-data/nist_x509/test62/int3.crt
diff --git a/tests/nist_tests/tests/test62/int4.crl b/src/test-data/nist_x509/test62/int4.crl
index 997a057f2..997a057f2 100644
--- a/tests/nist_tests/tests/test62/int4.crl
+++ b/src/test-data/nist_x509/test62/int4.crl
diff --git a/tests/nist_tests/tests/test62/int4.crt b/src/test-data/nist_x509/test62/int4.crt
index 744603003..744603003 100644
--- a/tests/nist_tests/tests/test62/int4.crt
+++ b/src/test-data/nist_x509/test62/int4.crt
diff --git a/tests/nist_tests/tests/test62/root.crl b/src/test-data/nist_x509/test62/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test62/root.crl
+++ b/src/test-data/nist_x509/test62/root.crl
diff --git a/tests/nist_tests/tests/test62/root.crt b/src/test-data/nist_x509/test62/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test62/root.crt
+++ b/src/test-data/nist_x509/test62/root.crt
diff --git a/tests/nist_tests/tests/test63/end.crt b/src/test-data/nist_x509/test63/end.crt
index 16c1c687d..16c1c687d 100644
--- a/tests/nist_tests/tests/test63/end.crt
+++ b/src/test-data/nist_x509/test63/end.crt
diff --git a/tests/nist_tests/tests/test63/int1.crl b/src/test-data/nist_x509/test63/int1.crl
index 40c4afc45..40c4afc45 100644
--- a/tests/nist_tests/tests/test63/int1.crl
+++ b/src/test-data/nist_x509/test63/int1.crl
diff --git a/tests/nist_tests/tests/test63/int1.crt b/src/test-data/nist_x509/test63/int1.crt
index 6b3f6eb4b..6b3f6eb4b 100644
--- a/tests/nist_tests/tests/test63/int1.crt
+++ b/src/test-data/nist_x509/test63/int1.crt
diff --git a/tests/nist_tests/tests/test63/int2.crl b/src/test-data/nist_x509/test63/int2.crl
index 7bffd4661..7bffd4661 100644
--- a/tests/nist_tests/tests/test63/int2.crl
+++ b/src/test-data/nist_x509/test63/int2.crl
diff --git a/tests/nist_tests/tests/test63/int2.crt b/src/test-data/nist_x509/test63/int2.crt
index f2e88f9fe..f2e88f9fe 100644
--- a/tests/nist_tests/tests/test63/int2.crt
+++ b/src/test-data/nist_x509/test63/int2.crt
diff --git a/tests/nist_tests/tests/test63/int3.crl b/src/test-data/nist_x509/test63/int3.crl
index 20f503c6b..20f503c6b 100644
--- a/tests/nist_tests/tests/test63/int3.crl
+++ b/src/test-data/nist_x509/test63/int3.crl
diff --git a/tests/nist_tests/tests/test63/int3.crt b/src/test-data/nist_x509/test63/int3.crt
index 2d636dd43..2d636dd43 100644
--- a/tests/nist_tests/tests/test63/int3.crt
+++ b/src/test-data/nist_x509/test63/int3.crt
diff --git a/tests/nist_tests/tests/test63/int4.crl b/src/test-data/nist_x509/test63/int4.crl
index 71e622907..71e622907 100644
--- a/tests/nist_tests/tests/test63/int4.crl
+++ b/src/test-data/nist_x509/test63/int4.crl
diff --git a/tests/nist_tests/tests/test63/int4.crt b/src/test-data/nist_x509/test63/int4.crt
index a0ed3a167..a0ed3a167 100644
--- a/tests/nist_tests/tests/test63/int4.crt
+++ b/src/test-data/nist_x509/test63/int4.crt
diff --git a/tests/nist_tests/tests/test63/root.crl b/src/test-data/nist_x509/test63/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test63/root.crl
+++ b/src/test-data/nist_x509/test63/root.crl
diff --git a/tests/nist_tests/tests/test63/root.crt b/src/test-data/nist_x509/test63/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test63/root.crt
+++ b/src/test-data/nist_x509/test63/root.crt
diff --git a/tests/nist_tests/tests/test64/end.crt b/src/test-data/nist_x509/test64/end.crt
index 771423eca..771423eca 100644
--- a/tests/nist_tests/tests/test64/end.crt
+++ b/src/test-data/nist_x509/test64/end.crt
diff --git a/tests/nist_tests/tests/test64/int.crl b/src/test-data/nist_x509/test64/int.crl
index 0e3e2bd95..0e3e2bd95 100644
--- a/tests/nist_tests/tests/test64/int.crl
+++ b/src/test-data/nist_x509/test64/int.crl
diff --git a/tests/nist_tests/tests/test64/int.crt b/src/test-data/nist_x509/test64/int.crt
index 1ae82584e..1ae82584e 100644
--- a/tests/nist_tests/tests/test64/int.crt
+++ b/src/test-data/nist_x509/test64/int.crt
diff --git a/tests/nist_tests/tests/test64/root.crl b/src/test-data/nist_x509/test64/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test64/root.crl
+++ b/src/test-data/nist_x509/test64/root.crl
diff --git a/tests/nist_tests/tests/test64/root.crt b/src/test-data/nist_x509/test64/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test64/root.crt
+++ b/src/test-data/nist_x509/test64/root.crt
diff --git a/tests/nist_tests/tests/test65/end.crt b/src/test-data/nist_x509/test65/end.crt
index 29d51a7f9..29d51a7f9 100644
--- a/tests/nist_tests/tests/test65/end.crt
+++ b/src/test-data/nist_x509/test65/end.crt
diff --git a/tests/nist_tests/tests/test65/int.crl b/src/test-data/nist_x509/test65/int.crl
index bd2d906ff..bd2d906ff 100644
--- a/tests/nist_tests/tests/test65/int.crl
+++ b/src/test-data/nist_x509/test65/int.crl
diff --git a/tests/nist_tests/tests/test65/int1.crt b/src/test-data/nist_x509/test65/int1.crt
index 214c839fe..214c839fe 100644
--- a/tests/nist_tests/tests/test65/int1.crt
+++ b/src/test-data/nist_x509/test65/int1.crt
diff --git a/tests/nist_tests/tests/test65/int2.crt b/src/test-data/nist_x509/test65/int2.crt
index 57c2e5914..57c2e5914 100644
--- a/tests/nist_tests/tests/test65/int2.crt
+++ b/src/test-data/nist_x509/test65/int2.crt
diff --git a/tests/nist_tests/tests/test65/root.crl b/src/test-data/nist_x509/test65/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test65/root.crl
+++ b/src/test-data/nist_x509/test65/root.crl
diff --git a/tests/nist_tests/tests/test65/root.crt b/src/test-data/nist_x509/test65/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test65/root.crt
+++ b/src/test-data/nist_x509/test65/root.crt
diff --git a/tests/nist_tests/tests/test66/end.crt b/src/test-data/nist_x509/test66/end.crt
index ccdb0e086..ccdb0e086 100644
--- a/tests/nist_tests/tests/test66/end.crt
+++ b/src/test-data/nist_x509/test66/end.crt
diff --git a/tests/nist_tests/tests/test66/int.crl b/src/test-data/nist_x509/test66/int.crl
index f80b444e2..f80b444e2 100644
--- a/tests/nist_tests/tests/test66/int.crl
+++ b/src/test-data/nist_x509/test66/int.crl
diff --git a/tests/nist_tests/tests/test66/int.crt b/src/test-data/nist_x509/test66/int.crt
index 23f8b17c2..23f8b17c2 100644
--- a/tests/nist_tests/tests/test66/int.crt
+++ b/src/test-data/nist_x509/test66/int.crt
diff --git a/tests/nist_tests/tests/test66/root.crl b/src/test-data/nist_x509/test66/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test66/root.crl
+++ b/src/test-data/nist_x509/test66/root.crl
diff --git a/tests/nist_tests/tests/test66/root.crt b/src/test-data/nist_x509/test66/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test66/root.crt
+++ b/src/test-data/nist_x509/test66/root.crt
diff --git a/tests/nist_tests/tests/test67/end.crt b/src/test-data/nist_x509/test67/end.crt
index 85d5508db..85d5508db 100644
--- a/tests/nist_tests/tests/test67/end.crt
+++ b/src/test-data/nist_x509/test67/end.crt
diff --git a/tests/nist_tests/tests/test67/int.crt b/src/test-data/nist_x509/test67/int.crt
index 92a4b3a95..92a4b3a95 100644
--- a/tests/nist_tests/tests/test67/int.crt
+++ b/src/test-data/nist_x509/test67/int.crt
diff --git a/tests/nist_tests/tests/test67/int1.crl b/src/test-data/nist_x509/test67/int1.crl
index 3fe834938..3fe834938 100644
--- a/tests/nist_tests/tests/test67/int1.crl
+++ b/src/test-data/nist_x509/test67/int1.crl
diff --git a/tests/nist_tests/tests/test67/int2.crl b/src/test-data/nist_x509/test67/int2.crl
index 15593fa84..15593fa84 100644
--- a/tests/nist_tests/tests/test67/int2.crl
+++ b/src/test-data/nist_x509/test67/int2.crl
diff --git a/tests/nist_tests/tests/test67/root.crl b/src/test-data/nist_x509/test67/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test67/root.crl
+++ b/src/test-data/nist_x509/test67/root.crl
diff --git a/tests/nist_tests/tests/test67/root.crt b/src/test-data/nist_x509/test67/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test67/root.crt
+++ b/src/test-data/nist_x509/test67/root.crt
diff --git a/tests/nist_tests/tests/test68/end.crt b/src/test-data/nist_x509/test68/end.crt
index bddd72da6..bddd72da6 100644
--- a/tests/nist_tests/tests/test68/end.crt
+++ b/src/test-data/nist_x509/test68/end.crt
diff --git a/tests/nist_tests/tests/test68/int1.crl b/src/test-data/nist_x509/test68/int1.crl
index fdbf8ea0c..fdbf8ea0c 100644
--- a/tests/nist_tests/tests/test68/int1.crl
+++ b/src/test-data/nist_x509/test68/int1.crl
diff --git a/tests/nist_tests/tests/test68/int1.crt b/src/test-data/nist_x509/test68/int1.crt
index 4bc8127b3..4bc8127b3 100644
--- a/tests/nist_tests/tests/test68/int1.crt
+++ b/src/test-data/nist_x509/test68/int1.crt
diff --git a/tests/nist_tests/tests/test68/int2.crl b/src/test-data/nist_x509/test68/int2.crl
index 33b764094..33b764094 100644
--- a/tests/nist_tests/tests/test68/int2.crl
+++ b/src/test-data/nist_x509/test68/int2.crl
diff --git a/tests/nist_tests/tests/test68/int2.crt b/src/test-data/nist_x509/test68/int2.crt
index 1ca8d5c32..1ca8d5c32 100644
--- a/tests/nist_tests/tests/test68/int2.crt
+++ b/src/test-data/nist_x509/test68/int2.crt
diff --git a/tests/nist_tests/tests/test68/root.crl b/src/test-data/nist_x509/test68/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test68/root.crl
+++ b/src/test-data/nist_x509/test68/root.crl
diff --git a/tests/nist_tests/tests/test68/root.crt b/src/test-data/nist_x509/test68/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test68/root.crt
+++ b/src/test-data/nist_x509/test68/root.crt
diff --git a/tests/nist_tests/tests/test69/end.crt b/src/test-data/nist_x509/test69/end.crt
index 00fc716dc..00fc716dc 100644
--- a/tests/nist_tests/tests/test69/end.crt
+++ b/src/test-data/nist_x509/test69/end.crt
diff --git a/tests/nist_tests/tests/test69/int.crl b/src/test-data/nist_x509/test69/int.crl
index fc09d351a..fc09d351a 100644
--- a/tests/nist_tests/tests/test69/int.crl
+++ b/src/test-data/nist_x509/test69/int.crl
diff --git a/tests/nist_tests/tests/test69/int.crt b/src/test-data/nist_x509/test69/int.crt
index 6c19ee09e..6c19ee09e 100644
--- a/tests/nist_tests/tests/test69/int.crt
+++ b/src/test-data/nist_x509/test69/int.crt
diff --git a/tests/nist_tests/tests/test69/root.crl b/src/test-data/nist_x509/test69/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test69/root.crl
+++ b/src/test-data/nist_x509/test69/root.crl
diff --git a/tests/nist_tests/tests/test69/root.crt b/src/test-data/nist_x509/test69/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test69/root.crt
+++ b/src/test-data/nist_x509/test69/root.crt
diff --git a/tests/nist_tests/tests/test70/end.crt b/src/test-data/nist_x509/test70/end.crt
index c576960be..c576960be 100644
--- a/tests/nist_tests/tests/test70/end.crt
+++ b/src/test-data/nist_x509/test70/end.crt
diff --git a/tests/nist_tests/tests/test70/int1.crl b/src/test-data/nist_x509/test70/int1.crl
index 77dafb909..77dafb909 100644
--- a/tests/nist_tests/tests/test70/int1.crl
+++ b/src/test-data/nist_x509/test70/int1.crl
diff --git a/tests/nist_tests/tests/test70/int1.crt b/src/test-data/nist_x509/test70/int1.crt
index 5509c5438..5509c5438 100644
--- a/tests/nist_tests/tests/test70/int1.crt
+++ b/src/test-data/nist_x509/test70/int1.crt
diff --git a/tests/nist_tests/tests/test70/int2.crl b/src/test-data/nist_x509/test70/int2.crl
index 4e22f3966..4e22f3966 100644
--- a/tests/nist_tests/tests/test70/int2.crl
+++ b/src/test-data/nist_x509/test70/int2.crl
diff --git a/tests/nist_tests/tests/test70/int2.crt b/src/test-data/nist_x509/test70/int2.crt
index 9af80b8e4..9af80b8e4 100644
--- a/tests/nist_tests/tests/test70/int2.crt
+++ b/src/test-data/nist_x509/test70/int2.crt
diff --git a/tests/nist_tests/tests/test70/root.crl b/src/test-data/nist_x509/test70/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test70/root.crl
+++ b/src/test-data/nist_x509/test70/root.crl
diff --git a/tests/nist_tests/tests/test70/root.crt b/src/test-data/nist_x509/test70/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test70/root.crt
+++ b/src/test-data/nist_x509/test70/root.crt
diff --git a/tests/nist_tests/tests/test71/end.crt b/src/test-data/nist_x509/test71/end.crt
index 0cc1718ee..0cc1718ee 100644
--- a/tests/nist_tests/tests/test71/end.crt
+++ b/src/test-data/nist_x509/test71/end.crt
diff --git a/tests/nist_tests/tests/test71/int.crl b/src/test-data/nist_x509/test71/int.crl
index c34a95df1..c34a95df1 100644
--- a/tests/nist_tests/tests/test71/int.crl
+++ b/src/test-data/nist_x509/test71/int.crl
diff --git a/tests/nist_tests/tests/test71/int.crt b/src/test-data/nist_x509/test71/int.crt
index 07076019c..07076019c 100644
--- a/tests/nist_tests/tests/test71/int.crt
+++ b/src/test-data/nist_x509/test71/int.crt
diff --git a/tests/nist_tests/tests/test71/root.crl b/src/test-data/nist_x509/test71/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test71/root.crl
+++ b/src/test-data/nist_x509/test71/root.crl
diff --git a/tests/nist_tests/tests/test71/root.crt b/src/test-data/nist_x509/test71/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test71/root.crt
+++ b/src/test-data/nist_x509/test71/root.crt
diff --git a/tests/nist_tests/tests/test72/end.crt b/src/test-data/nist_x509/test72/end.crt
index 6c61375d8..6c61375d8 100644
--- a/tests/nist_tests/tests/test72/end.crt
+++ b/src/test-data/nist_x509/test72/end.crt
diff --git a/tests/nist_tests/tests/test72/int.crl b/src/test-data/nist_x509/test72/int.crl
index 643141b37..643141b37 100644
--- a/tests/nist_tests/tests/test72/int.crl
+++ b/src/test-data/nist_x509/test72/int.crl
diff --git a/tests/nist_tests/tests/test72/int.crt b/src/test-data/nist_x509/test72/int.crt
index 36b1f2052..36b1f2052 100644
--- a/tests/nist_tests/tests/test72/int.crt
+++ b/src/test-data/nist_x509/test72/int.crt
diff --git a/tests/nist_tests/tests/test72/root.crl b/src/test-data/nist_x509/test72/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test72/root.crl
+++ b/src/test-data/nist_x509/test72/root.crl
diff --git a/tests/nist_tests/tests/test72/root.crt b/src/test-data/nist_x509/test72/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test72/root.crt
+++ b/src/test-data/nist_x509/test72/root.crt
diff --git a/tests/nist_tests/tests/test73/end.crt b/src/test-data/nist_x509/test73/end.crt
index 9bae5325f..9bae5325f 100644
--- a/tests/nist_tests/tests/test73/end.crt
+++ b/src/test-data/nist_x509/test73/end.crt
diff --git a/tests/nist_tests/tests/test73/int.crl b/src/test-data/nist_x509/test73/int.crl
index 6b76dc0b8..6b76dc0b8 100644
--- a/tests/nist_tests/tests/test73/int.crl
+++ b/src/test-data/nist_x509/test73/int.crl
diff --git a/tests/nist_tests/tests/test73/int.crt b/src/test-data/nist_x509/test73/int.crt
index ff6df2598..ff6df2598 100644
--- a/tests/nist_tests/tests/test73/int.crt
+++ b/src/test-data/nist_x509/test73/int.crt
diff --git a/tests/nist_tests/tests/test73/root.crl b/src/test-data/nist_x509/test73/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test73/root.crl
+++ b/src/test-data/nist_x509/test73/root.crl
diff --git a/tests/nist_tests/tests/test73/root.crt b/src/test-data/nist_x509/test73/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test73/root.crt
+++ b/src/test-data/nist_x509/test73/root.crt
diff --git a/tests/nist_tests/tests/test74/end.crt b/src/test-data/nist_x509/test74/end.crt
index 93e05bd1e..93e05bd1e 100644
--- a/tests/nist_tests/tests/test74/end.crt
+++ b/src/test-data/nist_x509/test74/end.crt
diff --git a/tests/nist_tests/tests/test74/int.crl b/src/test-data/nist_x509/test74/int.crl
index 8733b183c..8733b183c 100644
--- a/tests/nist_tests/tests/test74/int.crl
+++ b/src/test-data/nist_x509/test74/int.crl
diff --git a/tests/nist_tests/tests/test74/int.crt b/src/test-data/nist_x509/test74/int.crt
index c9258148d..c9258148d 100644
--- a/tests/nist_tests/tests/test74/int.crt
+++ b/src/test-data/nist_x509/test74/int.crt
diff --git a/tests/nist_tests/tests/test74/root.crl b/src/test-data/nist_x509/test74/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test74/root.crl
+++ b/src/test-data/nist_x509/test74/root.crl
diff --git a/tests/nist_tests/tests/test74/root.crt b/src/test-data/nist_x509/test74/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test74/root.crt
+++ b/src/test-data/nist_x509/test74/root.crt
diff --git a/tests/nist_tests/tests/test75/end.crt b/src/test-data/nist_x509/test75/end.crt
index 7d8179be0..7d8179be0 100644
--- a/tests/nist_tests/tests/test75/end.crt
+++ b/src/test-data/nist_x509/test75/end.crt
diff --git a/tests/nist_tests/tests/test75/int.crl b/src/test-data/nist_x509/test75/int.crl
index 19f472c7f..19f472c7f 100644
--- a/tests/nist_tests/tests/test75/int.crl
+++ b/src/test-data/nist_x509/test75/int.crl
diff --git a/tests/nist_tests/tests/test75/int.crt b/src/test-data/nist_x509/test75/int.crt
index 4a4c27e8c..4a4c27e8c 100644
--- a/tests/nist_tests/tests/test75/int.crt
+++ b/src/test-data/nist_x509/test75/int.crt
diff --git a/tests/nist_tests/tests/test75/root.crl b/src/test-data/nist_x509/test75/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test75/root.crl
+++ b/src/test-data/nist_x509/test75/root.crl
diff --git a/tests/nist_tests/tests/test75/root.crt b/src/test-data/nist_x509/test75/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test75/root.crt
+++ b/src/test-data/nist_x509/test75/root.crt
diff --git a/tests/nist_tests/tests/test76/end.crt b/src/test-data/nist_x509/test76/end.crt
index bde477d89..bde477d89 100644
--- a/tests/nist_tests/tests/test76/end.crt
+++ b/src/test-data/nist_x509/test76/end.crt
diff --git a/tests/nist_tests/tests/test76/int.crl b/src/test-data/nist_x509/test76/int.crl
index dbbbd43be..dbbbd43be 100644
--- a/tests/nist_tests/tests/test76/int.crl
+++ b/src/test-data/nist_x509/test76/int.crl
diff --git a/tests/nist_tests/tests/test76/int.crt b/src/test-data/nist_x509/test76/int.crt
index ab1c64390..ab1c64390 100644
--- a/tests/nist_tests/tests/test76/int.crt
+++ b/src/test-data/nist_x509/test76/int.crt
diff --git a/tests/nist_tests/tests/test76/root.crl b/src/test-data/nist_x509/test76/root.crl
index de65024ad..de65024ad 100644
--- a/tests/nist_tests/tests/test76/root.crl
+++ b/src/test-data/nist_x509/test76/root.crl
diff --git a/tests/nist_tests/tests/test76/root.crt b/src/test-data/nist_x509/test76/root.crt
index d7dfd9d48..d7dfd9d48 100644
--- a/tests/nist_tests/tests/test76/root.crt
+++ b/src/test-data/nist_x509/test76/root.crt
diff --git a/tests/pbkdf.vec b/src/test-data/pbkdf.vec
index f73cd2b60..f73cd2b60 100644
--- a/tests/pbkdf.vec
+++ b/src/test-data/pbkdf.vec
diff --git a/tests/pk_valid.dat b/src/test-data/pk_valid.dat
index 7298b3730..7298b3730 100644
--- a/tests/pk_valid.dat
+++ b/src/test-data/pk_valid.dat
diff --git a/tests/stream.vec b/src/test-data/stream.vec
index 01869d408..01869d408 100644
--- a/tests/stream.vec
+++ b/src/test-data/stream.vec
diff --git a/tests/transform.vec b/src/test-data/transform.vec
index e69de29bb..e69de29bb 100644
--- a/tests/transform.vec
+++ b/src/test-data/transform.vec
diff --git a/tests/x931.vec b/src/test-data/x931.vec
index abdbc0708..abdbc0708 100644
--- a/tests/x931.vec
+++ b/src/test-data/x931.vec
diff --git a/src/tests/nist_x509.cpp b/src/tests/nist_x509.cpp
new file mode 100644
index 000000000..4f75c9f88
--- /dev/null
+++ b/src/tests/nist_x509.cpp
@@ -0,0 +1,331 @@
+/*
+  Code to run the X.509v3 processing tests described in "Conformance
+  Testing of Relying Party Client Certificate Path Proccessing Logic",
+  which is available on NIST's web site.
+
+Known Failures/Problems
+
+Policy extensions are not implemented, so we skip tests #34-#53.
+
+Tests #75 and #76 are skipped as they make use of relatively obscure CRL
+extensions which are not supported.
+
+In addition, please note that some of the tests have their results altered from
+what the test result should be according to NIST's documentation. The changes
+are clearly marked (see x509test.cpp; search for "CHANGE OF TEST RESULT") and
+there are comments explaining why the results where changed. Currently, tests
+#19, #65, and #67 have had their results changed from the official results.
+*/
+
+#include "tests.h"
+
+#include <botan/x509path.h>
+#include <botan/init.h>
+
+#include <algorithm>
+#include <iostream>
+#include <iomanip>
+#include <string>
+#include <vector>
+#include <map>
+#include <cstdlib>
+
+#include <dirent.h>
+
+using namespace Botan;
+
+std::vector<std::string> dir_listing(const std::string&);
+
+void run_one_test(u32bit, Path_Validation_Result::Code,
+                  std::string, std::string,
+                  std::vector<std::string>,
+                  std::vector<std::string>);
+
+std::map<size_t, Path_Validation_Result::Code> expected_results;
+size_t unexp_failure, unexp_success, wrong_error, skipped;
+
+void populate_expected_results();
+
+size_t test_nist_x509()
+   {
+   unexp_failure = unexp_success = wrong_error = skipped = 0;
+
+   try {
+
+   populate_expected_results();
+
+   const std::string root_test_dir = "src/test-data/nist_x509/";
+   std::vector<std::string> test_dirs = dir_listing(root_test_dir);
+   std::sort(test_dirs.begin(), test_dirs.end());
+
+   for(size_t j = 0; j != test_dirs.size(); j++)
+      {
+      const std::string test_dir = root_test_dir + test_dirs[j] + "/";
+      std::vector<std::string> all_files = dir_listing(test_dir);
+
+      std::vector<std::string> certs, crls;
+      std::string root_cert, to_verify;
+
+      for(size_t k = 0; k != all_files.size(); k++)
+         {
+         const std::string current = all_files[k];
+         if(current.find("int") != std::string::npos &&
+            current.find(".crt") != std::string::npos)
+            certs.push_back(test_dir + current);
+         else if(current.find("root.crt") != std::string::npos)
+            root_cert = test_dir + current;
+         else if(current.find("end.crt") != std::string::npos)
+            to_verify = test_dir + current;
+         else if(current.find(".crl") != std::string::npos)
+            crls.push_back(test_dir + current);
+         }
+
+      if(expected_results.find(j+1) == expected_results.end())
+         {
+#if 0
+         std::cout << "Testing disabled for test #" << j+1
+                   << " <skipped>" << std::endl;
+#endif
+         skipped++;
+         continue;
+         }
+
+      run_one_test(j+1, expected_results[j+1],
+                   root_cert, to_verify, certs, crls);
+      }
+
+   }
+   catch(std::exception& e)
+      {
+      std::cout << e.what() << std::endl;
+      return 1;
+      }
+
+   std::cout << "Total unexpected failures: " << unexp_failure << std::endl;
+   std::cout << "Total unexpected successes: " << unexp_success << std::endl;
+   std::cout << "Total incorrect failures: " << wrong_error << std::endl;
+   std::cout << "Tests skipped: " << skipped << std::endl;
+
+   return unexp_failure + unexp_success + wrong_error;
+   }
+
+void run_one_test(u32bit test_no, Path_Validation_Result::Code expected,
+                  std::string root_cert, std::string to_verify,
+                  std::vector<std::string> certs,
+                  std::vector<std::string> crls)
+   {
+   std::cout << "NIST X.509 test #" << test_no << "... ";
+
+   Certificate_Store_In_Memory store;
+
+   store.add_certificate(X509_Certificate(root_cert));
+
+   X509_Certificate end_user(to_verify);
+
+   for(size_t j = 0; j != certs.size(); j++)
+      store.add_certificate(X509_Certificate(certs[j]));
+
+   for(size_t j = 0; j != crls.size(); j++)
+      {
+      DataSource_Stream in(crls[j]);
+
+      X509_CRL crl(in);
+      /*
+      std::vector<CRL_Entry> crl_entries = crl.get_revoked();
+      for(u32bit k = 0; k != crl_entries.size(); k++)
+         {
+         std::cout << "Revoked: " << std::flush;
+         for(u32bit l = 0; l != crl_entries[k].serial.size(); l++)
+            printf("%02X", crl_entries[k].serial[l]);
+         std::cout << std::endl;
+         }
+      */
+      store.add_crl(crl);
+      }
+
+   Path_Validation_Restrictions restrictions(true);
+
+   Path_Validation_Result validation_result =
+      x509_path_validate(end_user,
+                         restrictions,
+                         store);
+
+   Path_Validation_Result::Code result = validation_result.result();
+
+   if(result == expected)
+      {
+      std::cout << "passed" << std::endl;
+      return;
+      }
+
+   const std::string result_str = Path_Validation_Result::status_string(result);
+   const std::string exp_str = Path_Validation_Result::status_string(expected);
+
+   if(expected == Certificate_Status_Code::VERIFIED)
+      {
+      std::cout << "unexpected failure: " << result_str << std::endl;
+      unexp_failure++;
+      }
+   else if(result == Certificate_Status_Code::VERIFIED)
+      {
+      std::cout << "unexpected success: " << exp_str << std::endl;
+      unexp_success++;
+      }
+   else
+      {
+      std::cout << "wrong error: " << result_str << "/" << exp_str << std::endl;
+      wrong_error++;
+      }
+   }
+
+std::vector<std::string> dir_listing(const std::string& dir_name)
+   {
+   DIR* dir = opendir(dir_name.c_str());
+   if(!dir)
+      {
+      std::cout << "Error, couldn't open dir " << dir_name << std::endl;
+      std::exit(1);
+      }
+
+   std::vector<std::string> listing;
+
+   while(true)
+      {
+      struct dirent* dir_ent = readdir(dir);
+
+      if(dir_ent == 0)
+         break;
+      const std::string entry = dir_ent->d_name;
+      if(entry == "." || entry == "..")
+         continue;
+
+      listing.push_back(entry);
+      }
+   closedir(dir);
+
+   return listing;
+   }
+
+/*
+  The expected results are essentially the error codes that best coorespond
+  to the problem described in the testing documentation.
+
+  There are a few cases where the tests say there should or should not be an
+  error, and I disagree. A few of the tests have test results different from
+  what they "should" be: these changes are marked as such, and have comments
+  explaining the problem at hand.
+*/
+void populate_expected_results()
+   {
+   /* OK, not a super great way of doing this... */
+   expected_results[1] = Certificate_Status_Code::VERIFIED;
+   expected_results[2] = Certificate_Status_Code::SIGNATURE_ERROR;
+   expected_results[3] = Certificate_Status_Code::SIGNATURE_ERROR;
+   expected_results[4] = Certificate_Status_Code::VERIFIED;
+   expected_results[5] = Certificate_Status_Code::CERT_NOT_YET_VALID;
+   expected_results[6] = Certificate_Status_Code::CERT_NOT_YET_VALID;
+   expected_results[7] = Certificate_Status_Code::VERIFIED;
+   expected_results[8] = Certificate_Status_Code::CERT_NOT_YET_VALID;
+   expected_results[9] = Certificate_Status_Code::CERT_HAS_EXPIRED;
+   expected_results[10] = Certificate_Status_Code::CERT_HAS_EXPIRED;
+   expected_results[11] = Certificate_Status_Code::CERT_HAS_EXPIRED;
+   expected_results[12] = Certificate_Status_Code::VERIFIED;
+   expected_results[13] = Certificate_Status_Code::CERT_ISSUER_NOT_FOUND;
+
+   expected_results[14] = Certificate_Status_Code::CERT_ISSUER_NOT_FOUND;
+   expected_results[15] = Certificate_Status_Code::VERIFIED;
+   expected_results[16] = Certificate_Status_Code::VERIFIED;
+   expected_results[17] = Certificate_Status_Code::VERIFIED;
+   expected_results[18] = Certificate_Status_Code::VERIFIED;
+
+   expected_results[19] = Certificate_Status_Code::CRL_NOT_FOUND;
+   expected_results[20] = Certificate_Status_Code::CERT_IS_REVOKED;
+   expected_results[21] = Certificate_Status_Code::CERT_IS_REVOKED;
+
+   expected_results[22] = Certificate_Status_Code::CA_CERT_NOT_FOR_CERT_ISSUER;
+   expected_results[23] = Certificate_Status_Code::CA_CERT_NOT_FOR_CERT_ISSUER;
+   expected_results[24] = Certificate_Status_Code::VERIFIED;
+   expected_results[25] = Certificate_Status_Code::CA_CERT_NOT_FOR_CERT_ISSUER;
+   expected_results[26] = Certificate_Status_Code::VERIFIED;
+   expected_results[27] = Certificate_Status_Code::VERIFIED;
+   expected_results[28] = Certificate_Status_Code::CA_CERT_NOT_FOR_CERT_ISSUER;
+   expected_results[29] = Certificate_Status_Code::CA_CERT_NOT_FOR_CERT_ISSUER;
+   expected_results[30] = Certificate_Status_Code::VERIFIED;
+
+   expected_results[31] = Certificate_Status_Code::CA_CERT_NOT_FOR_CRL_ISSUER;
+   expected_results[32] = Certificate_Status_Code::CA_CERT_NOT_FOR_CRL_ISSUER;
+   expected_results[33] = Certificate_Status_Code::VERIFIED;
+
+   /*
+    Policy tests: a little trickier because there are other inputs
+    which affect the result.
+
+    In the case of the tests currently in the suite, the default
+    method (with acceptable policy being "any-policy" and with no
+    explict policy required), will almost always result in a verified
+    status. This is not particularly helpful. So, we should do several
+    different tests for each test set:
+
+       1) With the user policy as any-policy and no explicit policy
+       2) With the user policy as any-policy and an explicit policy required
+       3) With the user policy as test-policy-1 (2.16.840.1.101.3.1.48.1) and
+          an explict policy required
+       4) With the user policy as either test-policy-1 or test-policy-2 and an
+          explicit policy required
+
+     This provides reasonably good coverage of the possible outcomes.
+   */
+
+   expected_results[34] = Certificate_Status_Code::VERIFIED;
+   expected_results[35] = Certificate_Status_Code::VERIFIED;
+   expected_results[36] = Certificate_Status_Code::VERIFIED;
+   expected_results[37] = Certificate_Status_Code::VERIFIED;
+   expected_results[38] = Certificate_Status_Code::VERIFIED;
+   expected_results[39] = Certificate_Status_Code::VERIFIED;
+   expected_results[40] = Certificate_Status_Code::VERIFIED;
+   expected_results[41] = Certificate_Status_Code::VERIFIED;
+   expected_results[42] = Certificate_Status_Code::VERIFIED;
+   expected_results[43] = Certificate_Status_Code::VERIFIED;
+   expected_results[44] = Certificate_Status_Code::VERIFIED;
+
+   //expected_results[45] = Certificate_Status_Code::EXPLICT_POLICY_REQUIRED;
+   //expected_results[46] = Certificate_Status_Code::ACCEPT;
+   //expected_results[47] = Certificate_Status_Code::EXPLICT_POLICY_REQUIRED;
+
+   expected_results[48] = Certificate_Status_Code::VERIFIED;
+   expected_results[49] = Certificate_Status_Code::VERIFIED;
+   expected_results[50] = Certificate_Status_Code::VERIFIED;
+   expected_results[51] = Certificate_Status_Code::VERIFIED;
+   expected_results[52] = Certificate_Status_Code::VERIFIED;
+   expected_results[53] = Certificate_Status_Code::VERIFIED;
+
+   expected_results[54] = Certificate_Status_Code::CERT_CHAIN_TOO_LONG;
+   expected_results[55] = Certificate_Status_Code::CERT_CHAIN_TOO_LONG;
+   expected_results[56] = Certificate_Status_Code::VERIFIED;
+   expected_results[57] = Certificate_Status_Code::VERIFIED;
+   expected_results[58] = Certificate_Status_Code::CERT_CHAIN_TOO_LONG;
+   expected_results[59] = Certificate_Status_Code::CERT_CHAIN_TOO_LONG;
+   expected_results[60] = Certificate_Status_Code::CERT_CHAIN_TOO_LONG;
+   expected_results[61] = Certificate_Status_Code::CERT_CHAIN_TOO_LONG;
+   expected_results[62] = Certificate_Status_Code::VERIFIED;
+   expected_results[63] = Certificate_Status_Code::VERIFIED;
+
+   expected_results[64] = Certificate_Status_Code::SIGNATURE_ERROR;
+
+   expected_results[65] = Certificate_Status_Code::CRL_NOT_FOUND;
+   expected_results[66] = Certificate_Status_Code::CRL_NOT_FOUND;
+
+   expected_results[67] = Certificate_Status_Code::VERIFIED;
+
+   expected_results[68] = Certificate_Status_Code::CERT_IS_REVOKED;
+   expected_results[69] = Certificate_Status_Code::CERT_IS_REVOKED;
+   expected_results[70] = Certificate_Status_Code::CERT_IS_REVOKED;
+   expected_results[71] = Certificate_Status_Code::CERT_IS_REVOKED;
+   expected_results[72] = Certificate_Status_Code::CRL_HAS_EXPIRED;
+   expected_results[73] = Certificate_Status_Code::CRL_HAS_EXPIRED;
+   expected_results[74] = Certificate_Status_Code::VERIFIED;
+
+   /* These tests use weird CRL extensions which aren't supported yet */
+   //expected_results[75] = ;
+   //expected_results[76] = ;
+   }
diff --git a/tests/test_aead.cpp b/src/tests/test_aead.cpp
index e8643334f..e8643334f 100644
--- a/tests/test_aead.cpp
+++ b/src/tests/test_aead.cpp
diff --git a/tests/test_bigint.cpp b/src/tests/test_bigint.cpp
index 27002b8cf..45a20cef6 100644
--- a/tests/test_bigint.cpp
+++ b/src/tests/test_bigint.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "tests.h"
-#include "common.h"
 
 #include <vector>
 #include <string>
diff --git a/tests/test_block.cpp b/src/tests/test_block.cpp
index 51241d69b..51241d69b 100644
--- a/tests/test_block.cpp
+++ b/src/tests/test_block.cpp
diff --git a/tests/test_cryptobox.cpp b/src/tests/test_cryptobox.cpp
index 9a53da74c..9a53da74c 100644
--- a/tests/test_cryptobox.cpp
+++ b/src/tests/test_cryptobox.cpp
diff --git a/tests/test_cvc.cpp b/src/tests/test_cvc.cpp
index 205b74ec8..205b74ec8 100644
--- a/tests/test_cvc.cpp
+++ b/src/tests/test_cvc.cpp
diff --git a/tests/test_eax.cpp b/src/tests/test_eax.cpp
index 45b583139..45b583139 100644
--- a/tests/test_eax.cpp
+++ b/src/tests/test_eax.cpp
diff --git a/tests/test_ecc.cpp b/src/tests/test_ecc.cpp
index d61c685c9..929e44528 100644
--- a/tests/test_ecc.cpp
+++ b/src/tests/test_ecc.cpp
@@ -6,9 +6,6 @@
 
 #include "tests.h"
 
-#include "getopt.h"
-#include "common.h"
-
 #include <botan/hex.h>
 #include <botan/auto_rng.h>
 #include <botan/bigint.h>
diff --git a/tests/test_ecdh.cpp b/src/tests/test_ecdh.cpp
index 30139b27e..5eb5da586 100644
--- a/tests/test_ecdh.cpp
+++ b/src/tests/test_ecdh.cpp
@@ -9,8 +9,6 @@
 
 #include "tests.h"
 
-#include "common.h"
-
 #include <iostream>
 #include <fstream>
 
diff --git a/tests/test_ecdsa.cpp b/src/tests/test_ecdsa.cpp
index b114caf0d..b557f0193 100644
--- a/tests/test_ecdsa.cpp
+++ b/src/tests/test_ecdsa.cpp
@@ -20,8 +20,6 @@
 #include <fstream>
 #include <memory>
 
-#include "common.h"
-
 using namespace Botan;
 
 #define TEST_DATA_DIR CHECKS_DIR "/ecc_testdata"
diff --git a/tests/test_hash.cpp b/src/tests/test_hash.cpp
index bb5788565..bb5788565 100644
--- a/tests/test_hash.cpp
+++ b/src/tests/test_hash.cpp
diff --git a/tests/test_hkdf.cpp b/src/tests/test_hkdf.cpp
index 1c8532c33..1c8532c33 100644
--- a/tests/test_hkdf.cpp
+++ b/src/tests/test_hkdf.cpp
diff --git a/tests/test_kdf.cpp b/src/tests/test_kdf.cpp
index 9debe7966..9debe7966 100644
--- a/tests/test_kdf.cpp
+++ b/src/tests/test_kdf.cpp
diff --git a/tests/test_keywrap.cpp b/src/tests/test_keywrap.cpp
index a7dcbfe75..a7dcbfe75 100644
--- a/tests/test_keywrap.cpp
+++ b/src/tests/test_keywrap.cpp
diff --git a/tests/test_mac.cpp b/src/tests/test_mac.cpp
index 31f159663..31f159663 100644
--- a/tests/test_mac.cpp
+++ b/src/tests/test_mac.cpp
diff --git a/tests/test_modes.cpp b/src/tests/test_modes.cpp
index 1b546cea3..1b546cea3 100644
--- a/tests/test_modes.cpp
+++ b/src/tests/test_modes.cpp
diff --git a/tests/test_ocb.cpp b/src/tests/test_ocb.cpp
index b2bd296e0..b2bd296e0 100644
--- a/tests/test_ocb.cpp
+++ b/src/tests/test_ocb.cpp
diff --git a/tests/test_passhash.cpp b/src/tests/test_passhash.cpp
index 6f66743c5..6f66743c5 100644
--- a/tests/test_passhash.cpp
+++ b/src/tests/test_passhash.cpp
diff --git a/tests/test_pbkdf.cpp b/src/tests/test_pbkdf.cpp
index 140190b13..140190b13 100644
--- a/tests/test_pbkdf.cpp
+++ b/src/tests/test_pbkdf.cpp
diff --git a/tests/test_pubkey.cpp b/src/tests/test_pubkey.cpp
index c3550a788..209021f7f 100644
--- a/tests/test_pubkey.cpp
+++ b/src/tests/test_pubkey.cpp
@@ -6,7 +6,6 @@
 
 #include "tests.h"
 #include "test_rng.h"
-#include "common.h"
 
 #include <iostream>
 #include <fstream>
diff --git a/tests/test_rng.cpp b/src/tests/test_rng.cpp
index 99b2fbf8f..99b2fbf8f 100644
--- a/tests/test_rng.cpp
+++ b/src/tests/test_rng.cpp
diff --git a/tests/test_rng.h b/src/tests/test_rng.h
index b3da5f08a..b3da5f08a 100644
--- a/tests/test_rng.h
+++ b/src/tests/test_rng.h
diff --git a/tests/test_stream.cpp b/src/tests/test_stream.cpp
index 9846fb521..9846fb521 100644
--- a/tests/test_stream.cpp
+++ b/src/tests/test_stream.cpp
diff --git a/tests/test_tls.cpp b/src/tests/test_tls.cpp
index 9958ed3b7..af3627217 100644
--- a/tests/test_tls.cpp
+++ b/src/tests/test_tls.cpp
@@ -3,6 +3,7 @@
 
 #if defined(BOTAN_HAS_TLS)
 
+#include <botan/auto_rng.h>
 #include <botan/tls_server.h>
 #include <botan/tls_client.h>
 #include <botan/pkcs10.h>
@@ -260,6 +261,8 @@ size_t test_handshake()
       if(s2c_data.size() && c2s_data.size())
          break;
       }
+
+   return 0;
    }
 
 }
@@ -268,7 +271,7 @@ size_t test_tls()
    {
    size_t errors = 0;
 
-   errors += test_handshake(rng);
+   errors += test_handshake();
 
    return errors;
    }
diff --git a/tests/test_transform.cpp b/src/tests/test_transform.cpp
index dc54d1761..dc54d1761 100644
--- a/tests/test_transform.cpp
+++ b/src/tests/test_transform.cpp
diff --git a/tests/test_x509.cpp b/src/tests/test_x509.cpp
index d5f8dfc7b..cd0beec5b 100644
--- a/tests/test_x509.cpp
+++ b/src/tests/test_x509.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "tests.h"
-#include "common.h"
 
 #include <botan/filters.h>
 #include <botan/auto_rng.h>
diff --git a/tests/tests.cpp b/src/tests/tests.cpp
index 49f55c165..49f55c165 100644
--- a/tests/tests.cpp
+++ b/src/tests/tests.cpp
diff --git a/tests/tests.h b/src/tests/tests.h
index 0eb6e3aab..cb1e0f585 100644
--- a/tests/tests.h
+++ b/src/tests/tests.h
@@ -8,6 +8,8 @@
 #include <string>
 #include <vector>
 
+#include "../common.h"
+
 size_t run_tests_bb(std::istream& src,
                     const std::string& name_key,
                     const std::string& output_key,
@@ -28,7 +30,7 @@ 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/"
+#define CHECKS_DIR "src/test-data/"
 
 size_t run_all_tests();
 
@@ -70,5 +72,6 @@ size_t test_x509();
 size_t test_cvc();
 
 size_t test_tls();
+size_t test_nist_x509();
 
 #endif
diff --git a/tests/common.cpp b/tests/common.cpp
deleted file mode 100644
index 31bc60435..000000000
--- a/tests/common.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* (C) 2009 Jack Lloyd
-*
-* Distributed under the terms of the Botan license
-*/
-
-#include <iostream>
-#include <vector>
-#include <string>
-
-#include "common.h"
-
-void strip_comments(std::string& line)
-   {
-   if(line.find('#') != std::string::npos)
-      line = line.erase(line.find('#'), std::string::npos);
-   }
-
-void strip_newlines(std::string& line)
-   {
-   while(line.find('\n') != std::string::npos)
-      line = line.erase(line.find('\n'), 1);
-   }
-
-/* Strip comments, whitespace, etc */
-void strip(std::string& line)
-   {
-   strip_comments(line);
-
-#if 0
-   while(line.find(' ') != std::string::npos)
-      line = line.erase(line.find(' '), 1);
-#endif
-
-   while(line.find('\t') != std::string::npos)
-      line = line.erase(line.find('\t'), 1);
-   }
-
-std::vector<std::string> parse(const std::string& line)
-   {
-   const char DELIMITER = ':';
-   std::vector<std::string> substr;
-   std::string::size_type start = 0, end = line.find(DELIMITER);
-   while(end != std::string::npos)
-      {
-      substr.push_back(line.substr(start, end-start));
-      start = end+1;
-      end = line.find(DELIMITER, start);
-      }
-   if(line.size() > start)
-      substr.push_back(line.substr(start));
-   while(substr.size() <= 4) // at least 5 substr, some possibly empty
-      substr.push_back("");
-   return substr;
-   }
-
diff --git a/tests/nist_tests/Makefile b/tests/nist_tests/Makefile
deleted file mode 100644
index 19f8a462d..000000000
--- a/tests/nist_tests/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-BOTAN_CONFIG=../../build/botan-config-1.11
-
-CC=g++-4.7.0 -std=c++11
-FLAGS=-g -Os -W -Wall
-LDFLAGS=-L../.. -lbotan-1.11
-CFLAGS=-I../../build/include
-
-x509test: x509test.cpp
-	$(CC) $(FLAGS) $(CFLAGS) x509test.cpp $(LDFLAGS) -o x509test
-
-clean:
-	rm -f x509test
diff --git a/tests/nist_tests/failure.txt b/tests/nist_tests/failure.txt
deleted file mode 100644
index 0166e0ee6..000000000
--- a/tests/nist_tests/failure.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Known Failures/Problems
-
-Policy extensions are not implemented, so we skip tests #34-#53.
-
-Tests #75 and #76 are skipped as they make use of relatively obscure CRL
-extensions which are not supported.
-
-In addition, please note that some of the tests have their results altered from
-what the test result should be according to NIST's documentation. The changes
-are clearly marked (see x509test.cpp; search for "CHANGE OF TEST RESULT") and
-there are comments explaining why the results where changed. Currently, tests
-#19, #65, and #67 have had their results changed from the official results.
diff --git a/tests/nist_tests/readme.txt b/tests/nist_tests/readme.txt
deleted file mode 100644
index b992a5b30..000000000
--- a/tests/nist_tests/readme.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-This package contains a program to exercise Botan's path validation
-algorithm, as contained in the X509_Store object. The data used is
-NIST's X.509v3 certificate path validation testing data, as found on
-NIST's web site (version 1.0.7 of the testing data is currently
-used). The PKCS #7 and PKCS #12 data files have been removed, as they
-are not used in this test.
-
-Currently, some tests fail or are not be run for various reasons (in
-particular, we don't have support policy extensions yet, so that
-excludes running a good number of the tests). Even if all of the tests
-DO pass, that does not imply that Botan's path validation and
-certificate processing code is bug free, as there are many (*very
-many*) possible options in X.509 which this testing data does not make
-use of at all. However, it is helpful for implementation testing and
-assurance (I have found a good number of bugs using these tests).
-
-Currently, we do not make use of the S/MIME or PKCS #12 testing data
-contained in these tests, because Botan does not support either of
-these standards.
-
-To use this, compile x509test.cpp, and run the resulting
-executable. The results are written to standard output. Your system
-must have a POSIX.1 dirent.h, and the code assumes Unix-style paths.
-
-Email me with any questions or comments about these tests.
diff --git a/tests/nist_tests/x509test.cpp b/tests/nist_tests/x509test.cpp
deleted file mode 100644
index 18ed26534..000000000
--- a/tests/nist_tests/x509test.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
-  Code to run the X.509v3 processing tests described in "Conformance
-  Testing of Relying Party Client Certificate Path Proccessing Logic",
-  which is available on NIST's web site.
-*/
-
-#include <botan/x509path.h>
-#include <botan/init.h>
-using namespace Botan;
-
-#include <algorithm>
-#include <iostream>
-#include <iomanip>
-#include <string>
-#include <vector>
-#include <map>
-#include <cstdlib>
-
-#include <dirent.h>
-
-std::vector<std::string> dir_listing(const std::string&);
-
-void run_one_test(u32bit, Path_Validation_Result::Code,
-                  std::string, std::string,
-                  std::vector<std::string>,
-                  std::vector<std::string>);
-
-std::map<u32bit, Path_Validation_Result::Code> expected_results;
-
-u32bit unexp_failure, unexp_success, wrong_error, skipped;
-
-void populate_expected_results();
-
-int main()
-   {
-   const std::string root_test_dir = "tests/";
-   unexp_failure = unexp_success = wrong_error = skipped = 0;
-
-   try {
-
-   LibraryInitializer init;
-
-   populate_expected_results();
-
-   std::vector<std::string> test_dirs = dir_listing(root_test_dir);
-   std::sort(test_dirs.begin(), test_dirs.end());
-
-   for(size_t j = 0; j != test_dirs.size(); j++)
-      {
-      const std::string test_dir = root_test_dir + test_dirs[j] + "/";
-      std::vector<std::string> all_files = dir_listing(test_dir);
-
-      std::vector<std::string> certs, crls;
-      std::string root_cert, to_verify;
-
-      for(size_t k = 0; k != all_files.size(); k++)
-         {
-         const std::string current = all_files[k];
-         if(current.find("int") != std::string::npos &&
-            current.find(".crt") != std::string::npos)
-            certs.push_back(test_dir + current);
-         else if(current.find("root.crt") != std::string::npos)
-            root_cert = test_dir + current;
-         else if(current.find("end.crt") != std::string::npos)
-            to_verify = test_dir + current;
-         else if(current.find(".crl") != std::string::npos)
-            crls.push_back(test_dir + current);
-         }
-
-      if(expected_results.find(j+1) == expected_results.end())
-         {
-#if 0
-         std::cout << "Testing disabled for test #" << j+1
-                   << " <skipped>" << std::endl;
-#endif
-         skipped++;
-         continue;
-         }
-
-      run_one_test(j+1, expected_results[j+1],
-                   root_cert, to_verify, certs, crls);
-      }
-
-   }
-   catch(std::exception& e)
-      {
-      std::cout << e.what() << std::endl;
-      return 1;
-      }
-
-   std::cout << "Total unexpected failures: " << unexp_failure << std::endl;
-   std::cout << "Total unexpected successes: " << unexp_success << std::endl;
-   std::cout << "Total incorrect failures: " << wrong_error << std::endl;
-   std::cout << "Tests skipped: " << skipped << std::endl;
-
-   return 0;
-   }
-
-void run_one_test(u32bit test_no, Path_Validation_Result::Code expected,
-                  std::string root_cert, std::string to_verify,
-                  std::vector<std::string> certs,
-                  std::vector<std::string> crls)
-   {
-   std::cout << "Processing test #" << test_no << "... ";
-   std::cout.flush();
-
-   Certificate_Store_In_Memory store;
-
-   store.add_certificate(X509_Certificate(root_cert));
-
-   X509_Certificate end_user(to_verify);
-
-   for(size_t j = 0; j != certs.size(); j++)
-      store.add_certificate(X509_Certificate(certs[j]));
-
-   for(size_t j = 0; j != crls.size(); j++)
-      {
-      DataSource_Stream in(crls[j]);
-
-      X509_CRL crl(in);
-      /*
-      std::vector<CRL_Entry> crl_entries = crl.get_revoked();
-      for(u32bit k = 0; k != crl_entries.size(); k++)
-         {
-         std::cout << "Revoked: " << std::flush;
-         for(u32bit l = 0; l != crl_entries[k].serial.size(); l++)
-            printf("%02X", crl_entries[k].serial[l]);
-         std::cout << std::endl;
-         }
-      */
-      store.add_crl(crl);
-      }
-
-   Path_Validation_Restrictions restrictions(true);
-
-   Path_Validation_Result validation_result =
-      x509_path_validate(end_user,
-                         restrictions,
-                         store);
-
-   Path_Validation_Result::Code result = validation_result.result();
-
-   if(result == expected)
-      {
-      std::cout << "passed" << std::endl;
-      return;
-      }
-
-   if(expected == Path_Validation_Result::VERIFIED)
-      {
-      std::cout << "unexpected failure: " << result << std::endl;
-      unexp_failure++;
-      }
-   else if(result == Path_Validation_Result::VERIFIED)
-      {
-      std::cout << "unexpected success: " << expected << std::endl;
-      unexp_success++;
-      }
-   else
-      {
-      std::cout << "wrong error: " << result << "/" << expected << std::endl;
-      wrong_error++;
-      }
-   }
-
-std::vector<std::string> dir_listing(const std::string& dir_name)
-   {
-   DIR* dir = opendir(dir_name.c_str());
-   if(!dir)
-      {
-      std::cout << "Error, couldn't open dir " << dir_name << std::endl;
-      std::exit(1);
-      }
-
-   std::vector<std::string> listing;
-
-   while(true)
-      {
-      struct dirent* dir_ent = readdir(dir);
-
-      if(dir_ent == 0)
-         break;
-      const std::string entry = dir_ent->d_name;
-      if(entry == "." || entry == "..")
-         continue;
-
-      listing.push_back(entry);
-      }
-   closedir(dir);
-
-   return listing;
-   }
-
-/*
-  The expected results are essentially the error codes that best coorespond
-  to the problem described in the testing documentation.
-
-  There are a few cases where the tests say there should or should not be an
-  error, and I disagree. A few of the tests have test results different from
-  what they "should" be: these changes are marked as such, and have comments
-  explaining the problem at hand.
-*/
-void populate_expected_results()
-   {
-   /* OK, not a super great way of doing this... */
-   expected_results[1] = Path_Validation_Result::VERIFIED;
-   expected_results[2] = Path_Validation_Result::SIGNATURE_ERROR;
-   expected_results[3] = Path_Validation_Result::SIGNATURE_ERROR;
-   expected_results[4] = Path_Validation_Result::VERIFIED;
-   expected_results[5] = Path_Validation_Result::CERT_NOT_YET_VALID;
-   expected_results[6] = Path_Validation_Result::CERT_NOT_YET_VALID;
-   expected_results[7] = Path_Validation_Result::VERIFIED;
-   expected_results[8] = Path_Validation_Result::CERT_NOT_YET_VALID;
-   expected_results[9] = Path_Validation_Result::CERT_HAS_EXPIRED;
-   expected_results[10] = Path_Validation_Result::CERT_HAS_EXPIRED;
-   expected_results[11] = Path_Validation_Result::CERT_HAS_EXPIRED;
-   expected_results[12] = Path_Validation_Result::VERIFIED;
-   expected_results[13] = Path_Validation_Result::CERT_ISSUER_NOT_FOUND;
-
-   expected_results[14] = Path_Validation_Result::CERT_ISSUER_NOT_FOUND;
-   expected_results[15] = Path_Validation_Result::VERIFIED;
-   expected_results[16] = Path_Validation_Result::VERIFIED;
-   expected_results[17] = Path_Validation_Result::VERIFIED;
-   expected_results[18] = Path_Validation_Result::VERIFIED;
-
-   expected_results[19] = Path_Validation_Result::CRL_NOT_FOUND;
-   expected_results[20] = Path_Validation_Result::CERT_IS_REVOKED;
-   expected_results[21] = Path_Validation_Result::CERT_IS_REVOKED;
-
-   expected_results[22] = Path_Validation_Result::CA_CERT_NOT_FOR_CERT_ISSUER;
-   expected_results[23] = Path_Validation_Result::CA_CERT_NOT_FOR_CERT_ISSUER;
-   expected_results[24] = Path_Validation_Result::VERIFIED;
-   expected_results[25] = Path_Validation_Result::CA_CERT_NOT_FOR_CERT_ISSUER;
-   expected_results[26] = Path_Validation_Result::VERIFIED;
-   expected_results[27] = Path_Validation_Result::VERIFIED;
-   expected_results[28] = Path_Validation_Result::CA_CERT_NOT_FOR_CERT_ISSUER;
-   expected_results[29] = Path_Validation_Result::CA_CERT_NOT_FOR_CERT_ISSUER;
-   expected_results[30] = Path_Validation_Result::VERIFIED;
-
-   expected_results[31] = Path_Validation_Result::CA_CERT_NOT_FOR_CRL_ISSUER;
-   expected_results[32] = Path_Validation_Result::CA_CERT_NOT_FOR_CRL_ISSUER;
-   expected_results[33] = Path_Validation_Result::VERIFIED;
-
-   /*
-    Policy tests: a little trickier because there are other inputs
-    which affect the result.
-
-    In the case of the tests currently in the suite, the default
-    method (with acceptable policy being "any-policy" and with no
-    explict policy required), will almost always result in a verified
-    status. This is not particularly helpful. So, we should do several
-    different tests for each test set:
-
-       1) With the user policy as any-policy and no explicit policy
-       2) With the user policy as any-policy and an explicit policy required
-       3) With the user policy as test-policy-1 (2.16.840.1.101.3.1.48.1) and
-          an explict policy required
-       4) With the user policy as either test-policy-1 or test-policy-2 and an
-          explicit policy required
-
-     This provides reasonably good coverage of the possible outcomes.
-   */
-
-   expected_results[34] = Path_Validation_Result::VERIFIED;
-   expected_results[35] = Path_Validation_Result::VERIFIED;
-   expected_results[36] = Path_Validation_Result::VERIFIED;
-   expected_results[37] = Path_Validation_Result::VERIFIED;
-   expected_results[38] = Path_Validation_Result::VERIFIED;
-   expected_results[39] = Path_Validation_Result::VERIFIED;
-   expected_results[40] = Path_Validation_Result::VERIFIED;
-   expected_results[41] = Path_Validation_Result::VERIFIED;
-   expected_results[42] = Path_Validation_Result::VERIFIED;
-   expected_results[43] = Path_Validation_Result::VERIFIED;
-   expected_results[44] = Path_Validation_Result::VERIFIED;
-
-   //expected_results[45] = Path_Validation_Result::EXPLICT_POLICY_REQUIRED;
-   //expected_results[46] = Path_Validation_Result::ACCEPT;
-   //expected_results[47] = Path_Validation_Result::EXPLICT_POLICY_REQUIRED;
-
-   expected_results[48] = Path_Validation_Result::VERIFIED;
-   expected_results[49] = Path_Validation_Result::VERIFIED;
-   expected_results[50] = Path_Validation_Result::VERIFIED;
-   expected_results[51] = Path_Validation_Result::VERIFIED;
-   expected_results[52] = Path_Validation_Result::VERIFIED;
-   expected_results[53] = Path_Validation_Result::VERIFIED;
-
-   expected_results[54] = Path_Validation_Result::CERT_CHAIN_TOO_LONG;
-   expected_results[55] = Path_Validation_Result::CERT_CHAIN_TOO_LONG;
-   expected_results[56] = Path_Validation_Result::VERIFIED;
-   expected_results[57] = Path_Validation_Result::VERIFIED;
-   expected_results[58] = Path_Validation_Result::CERT_CHAIN_TOO_LONG;
-   expected_results[59] = Path_Validation_Result::CERT_CHAIN_TOO_LONG;
-   expected_results[60] = Path_Validation_Result::CERT_CHAIN_TOO_LONG;
-   expected_results[61] = Path_Validation_Result::CERT_CHAIN_TOO_LONG;
-   expected_results[62] = Path_Validation_Result::VERIFIED;
-   expected_results[63] = Path_Validation_Result::VERIFIED;
-
-   expected_results[64] = Path_Validation_Result::SIGNATURE_ERROR;
-
-   expected_results[65] = Path_Validation_Result::CRL_NOT_FOUND;
-   expected_results[66] = Path_Validation_Result::CRL_NOT_FOUND;
-
-   expected_results[67] = Path_Validation_Result::VERIFIED;
-
-   expected_results[68] = Path_Validation_Result::CERT_IS_REVOKED;
-   expected_results[69] = Path_Validation_Result::CERT_IS_REVOKED;
-   expected_results[70] = Path_Validation_Result::CERT_IS_REVOKED;
-   expected_results[71] = Path_Validation_Result::CERT_IS_REVOKED;
-   expected_results[72] = Path_Validation_Result::CRL_HAS_EXPIRED;
-   expected_results[73] = Path_Validation_Result::CRL_HAS_EXPIRED;
-   expected_results[74] = Path_Validation_Result::VERIFIED;
-
-   /* These tests use weird CRL extensions which aren't supported yet */
-   //expected_results[75] = ;
-   //expected_results[76] = ;
-   }