From 4436081e9d2fbc9cde7045472a22689b1c9dbb74 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 19 Aug 2022 16:09:51 +0200 Subject: tpm2-util: split out helpers which format a PCR mask as a JSON array This makes the code easier to read, and is something we can reuse later on. --- src/shared/tpm2-util.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/shared/tpm2-util.h') diff --git a/src/shared/tpm2-util.h b/src/shared/tpm2-util.h index ef19bed4f6..440d92e379 100644 --- a/src/shared/tpm2-util.h +++ b/src/shared/tpm2-util.h @@ -54,6 +54,7 @@ int tpm2_find_device_auto(int log_level, char **ret); int tpm2_parse_pcrs(const char *s, uint32_t *ret); +int tpm2_make_pcr_json_array(uint32_t pcr_mask, JsonVariant **ret); int tpm2_make_luks2_json(int keyslot, uint32_t pcr_mask, uint16_t pcr_bank, uint16_t primary_alg, const void *blob, size_t blob_size, const void *policy_hash, size_t policy_hash_size, TPM2Flags flags, JsonVariant **ret); #define TPM2_PCRS_MAX 24 -- cgit v1.2.1 From 8de8ec88da2a0008752a08bc6886fa1c1d885776 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 19 Aug 2022 16:16:03 +0200 Subject: tpm2-util: also add helper for parsing PCR arrays --- src/shared/tpm2-util.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/shared/tpm2-util.h') diff --git a/src/shared/tpm2-util.h b/src/shared/tpm2-util.h index 440d92e379..3e9464ea67 100644 --- a/src/shared/tpm2-util.h +++ b/src/shared/tpm2-util.h @@ -55,6 +55,8 @@ int tpm2_find_device_auto(int log_level, char **ret); int tpm2_parse_pcrs(const char *s, uint32_t *ret); int tpm2_make_pcr_json_array(uint32_t pcr_mask, JsonVariant **ret); +int tpm2_parse_pcr_json_array(JsonVariant *v, uint32_t *ret); + int tpm2_make_luks2_json(int keyslot, uint32_t pcr_mask, uint16_t pcr_bank, uint16_t primary_alg, const void *blob, size_t blob_size, const void *policy_hash, size_t policy_hash_size, TPM2Flags flags, JsonVariant **ret); #define TPM2_PCRS_MAX 24 -- cgit v1.2.1