summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/cryptsetup/meson.build4
-rw-r--r--src/shared/cryptsetup-tpm2.c (renamed from src/cryptsetup/cryptsetup-tpm2.c)0
-rw-r--r--src/shared/cryptsetup-tpm2.h (renamed from src/cryptsetup/cryptsetup-tpm2.h)0
-rw-r--r--src/shared/meson.build4
4 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptsetup/meson.build b/src/cryptsetup/meson.build
index 90e2be7a91..9ccc0982b5 100644
--- a/src/cryptsetup/meson.build
+++ b/src/cryptsetup/meson.build
@@ -11,10 +11,6 @@ if conf.get('HAVE_P11KIT') == 1
systemd_cryptsetup_sources += files('cryptsetup-pkcs11.c')
endif
-if conf.get('HAVE_TPM2') == 1
- systemd_cryptsetup_sources += files('cryptsetup-tpm2.c')
-endif
-
executables += [
executable_template + {
'name' : 'systemd-cryptsetup',
diff --git a/src/cryptsetup/cryptsetup-tpm2.c b/src/shared/cryptsetup-tpm2.c
index 297ef6fe4a..297ef6fe4a 100644
--- a/src/cryptsetup/cryptsetup-tpm2.c
+++ b/src/shared/cryptsetup-tpm2.c
diff --git a/src/cryptsetup/cryptsetup-tpm2.h b/src/shared/cryptsetup-tpm2.h
index 0eaf9280ef..0eaf9280ef 100644
--- a/src/cryptsetup/cryptsetup-tpm2.h
+++ b/src/shared/cryptsetup-tpm2.h
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 2a39bb04df..dc9adeddc1 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -250,6 +250,10 @@ if conf.get('HAVE_LIBFIDO2') == 1 and conf.get('HAVE_LIBCRYPTSETUP') == 1
shared_sources += files('cryptsetup-fido2.c')
endif
+if conf.get('HAVE_TPM2') == 1 and conf.get('HAVE_LIBCRYPTSETUP') == 1
+ shared_sources += files('cryptsetup-tpm2.c')
+endif
+
generate_ip_protocol_list = find_program('generate-ip-protocol-list.sh')
ip_protocol_list_txt = custom_target(
'ip-protocol-list.txt',