diff --git a/Knot.files b/Knot.files
index bf894aba780f58c9d7ef688c6c74e8dc7db341d4..9f750b7b966f96e34367215dfdbb46eb0e74e5d9 100644
--- a/Knot.files
+++ b/Knot.files
@@ -26,6 +26,8 @@ libtap/Makefile.am
 libtap/runtests.c
 libtap/tap/basic.c
 libtap/tap/basic.h
+libtap/tap/files.c
+libtap/tap/files.h
 libtap/tap/float.c
 libtap/tap/float.h
 libtap/tap/macros.h
@@ -121,12 +123,16 @@ src/dnssec/lib/kasp/dir/file.c
 src/dnssec/lib/kasp/dir/file.h
 src/dnssec/lib/kasp/dir/json.c
 src/dnssec/lib/kasp/dir/json.h
+src/dnssec/lib/kasp/dir/keystore.c
+src/dnssec/lib/kasp/dir/keystore.h
 src/dnssec/lib/kasp/dir/policy.c
 src/dnssec/lib/kasp/dir/policy.h
 src/dnssec/lib/kasp/dir/zone.c
 src/dnssec/lib/kasp/dir/zone.h
 src/dnssec/lib/kasp/internal.h
 src/dnssec/lib/kasp/kasp.c
+src/dnssec/lib/kasp/keystore.c
+src/dnssec/lib/kasp/keystore_open.c
 src/dnssec/lib/kasp/policy.c
 src/dnssec/lib/kasp/zone.c
 src/dnssec/lib/kasp/zone.h
@@ -168,8 +174,8 @@ src/dnssec/shared/fs.c
 src/dnssec/shared/fs.h
 src/dnssec/shared/hex.c
 src/dnssec/shared/hex.h
-src/dnssec/shared/hex_gnutls.c
-src/dnssec/shared/hex_gnutls.h
+src/dnssec/shared/keyid_gnutls.c
+src/dnssec/shared/keyid_gnutls.h
 src/dnssec/shared/path.c
 src/dnssec/shared/path.h
 src/dnssec/shared/pem.c
@@ -190,6 +196,7 @@ src/dnssec/tests/key.c
 src/dnssec/tests/key_algorithm.c
 src/dnssec/tests/key_ds.c
 src/dnssec/tests/keyid.c
+src/dnssec/tests/keystore_pkcs11.c
 src/dnssec/tests/keystore_pkcs8.c
 src/dnssec/tests/keystore_pkcs8_dir.c
 src/dnssec/tests/keytag.c
diff --git a/src/zscanner/scanner.c.g2 b/src/zscanner/scanner.c.g2
index 9fc769c99346fe9d87202bab049cb26deaa85e7b..fe25d8cae407d7349d016b61af4dbf10e5f74379 100644
--- a/src/zscanner/scanner.c.g2
+++ b/src/zscanner/scanner.c.g2
@@ -161,6 +161,7 @@ static void input_deinit(
 		close(s->file.descriptor);
 		s->file.descriptor = -1;
 		free(s->file.name);
+		s->file.name = NULL;
 	}
 
 	// Unset the input limits.
diff --git a/src/zscanner/scanner.c.t0 b/src/zscanner/scanner.c.t0
index a1b3d7bff56795fea78bb41960d1a6077cb98eef..31dbee1bf76b74971cb4b4f422982f9853040a88 100644
--- a/src/zscanner/scanner.c.t0
+++ b/src/zscanner/scanner.c.t0
@@ -5037,6 +5037,7 @@ static void input_deinit(
 		close(s->file.descriptor);
 		s->file.descriptor = -1;
 		free(s->file.name);
+		s->file.name = NULL;
 	}
 
 	// Unset the input limits.
diff --git a/src/zscanner/scanner.rl b/src/zscanner/scanner.rl
index 1363c1c74a0a893835e7ec26f86e2d52ec7092e8..19c81476479deaabf2440770cd754bfecdaf84e3 100644
--- a/src/zscanner/scanner.rl
+++ b/src/zscanner/scanner.rl
@@ -162,6 +162,7 @@ static void input_deinit(
 		close(s->file.descriptor);
 		s->file.descriptor = -1;
 		free(s->file.name);
+		s->file.name = NULL;
 	}
 
 	// Unset the input limits.