From: Gabríel Arthúr Pétursson <gabriel.petursson@marel.com>
Date: Wed, 3 Jan 2024 15:55:18 +0000 (+0000)
Subject: shared: Move cryptsetup-tpm2.[ch] from systemd-cryptsetup
X-Git-Tag: v256-rc1~936^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47b425de0c1788266e105bf88190c4cb3c8a6d1e;p=thirdparty%2Fsystemd.git

shared: Move cryptsetup-tpm2.[ch] from systemd-cryptsetup
---

diff --git a/src/cryptsetup/meson.build b/src/cryptsetup/meson.build
index 90e2be7a911..9ccc0982b59 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
similarity index 100%
rename from src/cryptsetup/cryptsetup-tpm2.c
rename to src/shared/cryptsetup-tpm2.c
diff --git a/src/cryptsetup/cryptsetup-tpm2.h b/src/shared/cryptsetup-tpm2.h
similarity index 100%
rename from src/cryptsetup/cryptsetup-tpm2.h
rename to src/shared/cryptsetup-tpm2.h
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 2a39bb04df4..dc9adeddc14 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',