SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28884 from poettering/tpm2-pcr6-name

Browse Source 
tpm2: give PCR 6 a name
This commit is contained in:
Mike Yuan
2023-08-18 20:19:51 +08:00
committed by GitHub
parent c068650fcf f51ed26b38
commit d7686126ea
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/tpm2-util.c
+1
View File
@@ -5008,6 +5008,7 @@ static const char* const pcr_index_table[_PCR_INDEX_MAX_DEFINED] = {
[PCR_EXTERNAL_CONFIG] = "external-config",
[PCR_BOOT_LOADER_CODE] = "boot-loader-code",
[PCR_BOOT_LOADER_CONFIG] = "boot-loader-config",
[PCR_HOST_PLATFORM] = "host-platform",
[PCR_SECURE_BOOT_POLICY] = "secure-boot-policy",
[PCR_KERNEL_INITRD] = "kernel-initrd",
[PCR_IMA] = "ima",
src/shared/tpm2-util.h
+5 -4
View File
@@ -272,11 +272,11 @@ int tpm2_parse_luks2_json(JsonVariant *v, int *ret_keyslot, uint32_t *ret_hash_p
int tpm2_hash_alg_to_size(uint16_t alg);
const char *tpm2_hash_alg_to_string(uint16_t alg);
int tpm2_hash_alg_from_string(const char *alg);
const char *tpm2_hash_alg_to_string(uint16_t alg) _const_;
int tpm2_hash_alg_from_string(const char *alg) _pure_;
const char *tpm2_asym_alg_to_string(uint16_t alg);
int tpm2_asym_alg_from_string(const char *alg);
const char *tpm2_asym_alg_to_string(uint16_t alg) _const_;
int tpm2_asym_alg_from_string(const char *alg) _pure_;
char *tpm2_pcr_mask_to_string(uint32_t mask);
@@ -308,6 +308,7 @@ enum {
PCR_EXTERNAL_CONFIG = 3,
PCR_BOOT_LOADER_CODE = 4,
PCR_BOOT_LOADER_CONFIG = 5,
PCR_HOST_PLATFORM = 6,
PCR_SECURE_BOOT_POLICY = 7,
/* The following names for PCRs 9…15 are based on the "Linux TPM PCR Registry"
(https://uapi-group.org/specifications/specs/linux_tpm_pcr_registry/) */