diff options
| author | Peter Cai <peter@typeblog.net> | 2022-12-17 15:46:36 -0500 |
|---|---|---|
| committer | Peter Cai <peter@typeblog.net> | 2022-12-22 08:43:50 -0500 |
| commit | 0a8e026e825dda142a8f1552a4b45815cbfd0b48 (patch) | |
| tree | d6330919451a9119411aecb3bb1407e8514b0b1a /src | |
| parent | 27ce258c54a6ea1b999375e5c7e09b5970607dac (diff) | |
| download | systemd-0a8e026e825dda142a8f1552a4b45815cbfd0b48.tar.gz | |
cryptsetup-fido2: Relocate to libsystemd-shared
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptsetup/meson.build | 5 | ||||
| -rw-r--r-- | src/shared/cryptsetup-fido2.c (renamed from src/cryptsetup/cryptsetup-fido2.c) | 0 | ||||
| -rw-r--r-- | src/shared/cryptsetup-fido2.h (renamed from src/cryptsetup/cryptsetup-fido2.h) | 0 | ||||
| -rw-r--r-- | src/shared/meson.build | 5 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/cryptsetup/meson.build b/src/cryptsetup/meson.build index 26267fba51..ba8e01a198 100644 --- a/src/cryptsetup/meson.build +++ b/src/cryptsetup/meson.build @@ -1,7 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later systemd_cryptsetup_sources = files( - 'cryptsetup-fido2.h', 'cryptsetup-keyfile.c', 'cryptsetup-keyfile.h', 'cryptsetup-pkcs11.h', @@ -12,10 +11,6 @@ if conf.get('HAVE_P11KIT') == 1 systemd_cryptsetup_sources += files('cryptsetup-pkcs11.c') endif -if conf.get('HAVE_LIBFIDO2') == 1 - systemd_cryptsetup_sources += files('cryptsetup-fido2.c') -endif - if conf.get('HAVE_TPM2') == 1 systemd_cryptsetup_sources += files('cryptsetup-tpm2.c') endif diff --git a/src/cryptsetup/cryptsetup-fido2.c b/src/shared/cryptsetup-fido2.c index a3bdedba1d..a3bdedba1d 100644 --- a/src/cryptsetup/cryptsetup-fido2.c +++ b/src/shared/cryptsetup-fido2.c diff --git a/src/cryptsetup/cryptsetup-fido2.h b/src/shared/cryptsetup-fido2.h index 371bf21f0e..371bf21f0e 100644 --- a/src/cryptsetup/cryptsetup-fido2.h +++ b/src/shared/cryptsetup-fido2.h diff --git a/src/shared/meson.build b/src/shared/meson.build index 6f8d7f9f49..0d5e9f2dbb 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -85,6 +85,7 @@ shared_sources = files( 'cpu-set-util.h', 'creds-util.c', 'creds-util.h', + 'cryptsetup-fido2.h', 'cryptsetup-util.c', 'cryptsetup-util.h', 'daemon-util.c', @@ -405,6 +406,10 @@ if conf.get('ENABLE_NSCD') == 1 shared_sources += files('nscd-flush.c') endif +if conf.get('HAVE_LIBFIDO2') == 1 + shared_sources += files('cryptsetup-fido2.c') +endif + generate_ip_protocol_list = find_program('generate-ip-protocol-list.sh') ip_protocol_list_txt = custom_target( 'ip-protocol-list.txt', |