Skip to content

eventlog: TCG PC Client FPF renumbered its sections #3498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndreasFuchsTPM merged 1 commit into from
Jun 25, 2025
+6 −6
Merged

eventlog: TCG PC Client FPF renumbered its sections #3498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/tpm2_eventlog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ bool foreach_digest2(tpm2_eventlog_context *ctx, UINT32 eventType, unsigned pcr_
bool parse_event2body(TCG_EVENT2 const *event, UINT32 type) {

switch (type) {
/* TCG PC Client FPF section 9.2.6 */
/* TCG PC Client FPF section 10.2.6 */
case EV_EFI_VARIABLE_DRIVER_CONFIG:
case EV_EFI_VARIABLE_BOOT:
case EV_EFI_VARIABLE_AUTHORITY:
Expand All @@ -135,11 +135,11 @@ bool parse_event2body(TCG_EVENT2 const *event, UINT32 type) {
}
}
break;
/* TCG PC Client FPF section 2.3.4.1 and 9.4.1 */
/* TCG PC Client FPF section 3.3.4.1 and 10.4.1 */
case EV_POST_CODE:
// the event is a string, so there are no length requirements.
break;
/* TCG PC Client FPF section 9.2.5 */
/* TCG PC Client FPF section 10.2.5 */
case EV_S_CRTM_CONTENTS:
case EV_EFI_PLATFORM_FIRMWARE_BLOB:
{
Expand Down
6 changes: 3 additions & 3 deletions lib/tpm2_eventlog_yaml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ static bool yaml_uefi_var_data(UEFI_VARIABLE_DATA *data) {
return true;
}
/*
* TCG PC Client FPF section 2.3.4.1 and 9.4.1:
* TCG PC Client FPF section 3.3.4.1 and 10.4.1:
* Usage of the event type EV_POST_CODE:
* - If a combined event is measured, the event field SHOULD
* be the string "POST CODE" in all caps. ...
Expand Down Expand Up @@ -473,7 +473,7 @@ static bool yaml_split_print_string(const char *indent,
}

/*
* TCG PC Client FPF section 9.2.6
* TCG PC Client FPF section 10.2.6
* The tpm2_eventlog module validates the event structure but nothing within
* the event data buffer so we must do that here.
*/
Expand Down Expand Up @@ -761,7 +761,7 @@ static bool yaml_uefi_var(UEFI_VARIABLE_DATA *data, size_t size, UINT32 type,
free(ret);
return yaml_uefi_var_data(data);
}
/* TCG PC Client FPF section 9.2.5 */
/* TCG PC Client FPF section 10.2.5 */
bool yaml_uefi_platfwblob(UEFI_PLATFORM_FIRMWARE_BLOB *data) {

tpm2_tool_output(" Event:\n"
Expand Down
Loading