shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

cryptenroll: fix bind default TPM2 signed policy to PCR 11

Browse Source 
If `--tpm2-public-key=` is not specified, but `tpm2-pcr-public-key.pem` exists
in /{etc,run,usr/lib}/systemd/, the default PCR 11 is not being set.

Fixes 9e437994
This commit is contained in:
Antonio Alvarez Feijoo 2023-10-26 15:14:52 +02:00
parent 9674c06510
commit cb7aabf180
No known key found for this signature in database
GPG Key ID: B4EFC9173666A622
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptenroll/cryptenroll-tpm2.c
View File

@ -194,7 +194,7 @@ int enroll_tpm2(struct crypt_device *cd,
r = tpm2_load_pcr_public_key(pubkey_path, &pubkey, &pubkey_size);
if (r < 0) {
if (pubkey_path || signature_path || r != -ENOENT)
return log_error_errno(r, "Failed read TPM PCR public key: %m");
return log_error_errno(r, "Failed to read TPM PCR public key: %m");
log_debug_errno(r, "Failed to read TPM2 PCR public key, proceeding without: %m");
pubkey_pcr_mask = 0;

2
src/cryptenroll/cryptenroll.c
View File

@ -500,7 +500,7 @@ static int parse_argv(int argc, char *argv[]) {
}
}
if (auto_public_key_pcr_mask && arg_tpm2_public_key) {
if (auto_public_key_pcr_mask) {
assert(arg_tpm2_public_key_pcr_mask == 0);
arg_tpm2_public_key_pcr_mask = INDEX_TO_MASK(uint32_t, TPM2_PCR_KERNEL_BOOT);
}