From 91a1632a4c9089973ad05ff92c6989032918ba4d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 23 Oct 2023 22:12:46 +0200 Subject: [PATCH] cryptenroll: reduce scope of two global variables No change in behaviour --- src/cryptenroll/cryptenroll.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c index 6c90c7d843f..4086f7f9a77 100644 --- a/src/cryptenroll/cryptenroll.c +++ b/src/cryptenroll/cryptenroll.c @@ -39,11 +39,9 @@ static char *arg_tpm2_device = NULL; static uint32_t arg_tpm2_seal_key_handle = 0; static Tpm2PCRValue *arg_tpm2_hash_pcr_values = NULL; static size_t arg_tpm2_n_hash_pcr_values = 0; -static bool arg_tpm2_hash_pcr_values_use_default = true; static bool arg_tpm2_pin = false; static char *arg_tpm2_public_key = NULL; static uint32_t arg_tpm2_public_key_pcr_mask = 0; -static bool arg_tpm2_public_key_pcr_mask_use_default = true; static char *arg_tpm2_signature = NULL; static char *arg_node = NULL; static int *arg_wipe_slots = NULL; @@ -199,6 +197,7 @@ static int parse_argv(int argc, char *argv[]) { {} }; + bool auto_hash_pcr_values = true, auto_public_key_pcr_mask = true; int c, r; assert(argc >= 0); @@ -370,7 +369,7 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_TPM2_PCRS: - arg_tpm2_hash_pcr_values_use_default = false; + auto_hash_pcr_values = false; r = tpm2_parse_pcr_argument_append(optarg, &arg_tpm2_hash_pcr_values, &arg_tpm2_n_hash_pcr_values); if (r < 0) return r; @@ -392,7 +391,7 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_TPM2_PUBLIC_KEY_PCRS: - arg_tpm2_public_key_pcr_mask_use_default = false; + auto_public_key_pcr_mask = false; r = tpm2_parse_pcr_argument_to_mask(optarg, &arg_tpm2_public_key_pcr_mask); if (r < 0) return r; @@ -492,10 +491,10 @@ static int parse_argv(int argc, char *argv[]) { if (r < 0) return r; - if (arg_tpm2_public_key_pcr_mask_use_default && arg_tpm2_public_key) + if (auto_public_key_pcr_mask && arg_tpm2_public_key) arg_tpm2_public_key_pcr_mask = INDEX_TO_MASK(uint32_t, TPM2_PCR_KERNEL_BOOT); - if (arg_tpm2_hash_pcr_values_use_default && !GREEDY_REALLOC_APPEND( + if (auto_hash_pcr_values && !GREEDY_REALLOC_APPEND( arg_tpm2_hash_pcr_values, arg_tpm2_n_hash_pcr_values, &TPM2_PCR_VALUE_MAKE(TPM2_PCR_INDEX_DEFAULT, /* hash= */ 0, /* value= */ {}), -- 2.47.3