diff options
author | Lennart Poettering <lennart@poettering.net> | 2023-08-24 11:16:14 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2023-08-24 13:40:37 +0200 |
commit | 2099cd6289981f51e9f8b4b9bf028eca36c9ad52 (patch) | |
tree | 9dac6bab7e73777dd844c9f1f53e3b89e286feaf /src/cryptenroll/cryptenroll.c | |
parent | Merge pull request #28946 from poettering/json-variant-append-arrayb (diff) | |
download | systemd-2099cd6289981f51e9f8b4b9bf028eca36c9ad52.tar.xz systemd-2099cd6289981f51e9f8b4b9bf028eca36c9ad52.zip |
tpm2: unify symbolic name infra for PCRs
We so far maintained two places for symboic names for PCRs. One in
tpm2-util.h and one in tpm-pcr.h.
Let's unify this into one, i.e. move the full list from tpm2-util.h into
tpm-pcr.h, replacing the short list placed so far there.
Systematically prefix the definitions with TPM2_ or tpm2_, to follow how
we do this for all other defines in this context.
No change in behaviour, just unification of tables.
Diffstat (limited to 'src/cryptenroll/cryptenroll.c')
-rw-r--r-- | src/cryptenroll/cryptenroll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c index 1ac2c6951e..2bf3333132 100644 --- a/src/cryptenroll/cryptenroll.c +++ b/src/cryptenroll/cryptenroll.c @@ -482,7 +482,7 @@ static int parse_argv(int argc, char *argv[]) { return r; if (arg_tpm2_public_key_pcr_mask_use_default && arg_tpm2_public_key) - arg_tpm2_public_key_pcr_mask = INDEX_TO_MASK(uint32_t, TPM_PCR_INDEX_KERNEL_IMAGE); + 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( arg_tpm2_hash_pcr_values, |