From: William Roberts Date: Mon, 19 Sep 2022 18:50:03 +0000 (-0500) Subject: cryptsetup: use TPM flags over bool X-Git-Tag: v252-rc1~139 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fab44b2ff6dc2daf785cf43e2a998e9b43c89ce;p=thirdparty%2Fsystemd.git cryptsetup: use TPM flags over bool This works becuase TPM2_FLAGS_USE_PIN is 1 and bool is a 1 so the bits line up as expected, however if for some reason flags change values and for clarity check if the boolean indicates this flag and pass the flag value. Signed-off-by: William Roberts --- diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index d6e5833b240..03b85359a51 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -1461,7 +1461,7 @@ static int attach_luks_or_plain_or_bitlk_by_tpm2( key_file, arg_keyfile_size, arg_keyfile_offset, key_data, key_data_size, /* policy_hash= */ NULL, /* policy_hash_size= */ 0, /* we don't know the policy hash */ - arg_tpm2_pin, + arg_tpm2_pin ? TPM2_FLAGS_USE_PIN : 0, until, arg_headless, arg_ask_password_flags,