Skip to content

Commit 0abf6cc

Browse files
committed
eventlog: TCG PC Client FPF renumbered its sections
latest revision (Level 00 Version 1.06 Revision 52 -- December 4, 2023) of the `TCG PC Client Platform Firmware Profile Specification` added a leading Scope section which shifted all the sections. Latest spec: <https://trustedcomputinggroup.org/wp-content/uploads/TCG-PC-Client-Platform-Firmware-Profile-Version-1.06-Revision-52_pub-2.pdf> Previous revision: <https://trustedcomputinggroup.org/wp-content/uploads/TCG_PCClient_PFP_r1p05_05_3feb20.pdf>
1 parent b4bf516 commit 0abf6cc

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

lib/tpm2_eventlog.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ bool foreach_digest2(tpm2_eventlog_context *ctx, UINT32 eventType, unsigned pcr_
116116
bool parse_event2body(TCG_EVENT2 const *event, UINT32 type) {
117117

118118
switch (type) {
119-
/* TCG PC Client FPF section 9.2.6 */
119+
/* TCG PC Client FPF section 10.2.6 */
120120
case EV_EFI_VARIABLE_DRIVER_CONFIG:
121121
case EV_EFI_VARIABLE_BOOT:
122122
case EV_EFI_VARIABLE_AUTHORITY:
@@ -135,11 +135,11 @@ bool parse_event2body(TCG_EVENT2 const *event, UINT32 type) {
135135
}
136136
}
137137
break;
138-
/* TCG PC Client FPF section 2.3.4.1 and 9.4.1 */
138+
/* TCG PC Client FPF section 3.3.4.1 and 10.4.1 */
139139
case EV_POST_CODE:
140140
// the event is a string, so there are no length requirements.
141141
break;
142-
/* TCG PC Client FPF section 9.2.5 */
142+
/* TCG PC Client FPF section 10.2.5 */
143143
case EV_S_CRTM_CONTENTS:
144144
case EV_EFI_PLATFORM_FIRMWARE_BLOB:
145145
{

lib/tpm2_eventlog_yaml.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static bool yaml_uefi_var_data(UEFI_VARIABLE_DATA *data) {
219219
return true;
220220
}
221221
/*
222-
* TCG PC Client FPF section 2.3.4.1 and 9.4.1:
222+
* TCG PC Client FPF section 3.3.4.1 and 10.4.1:
223223
* Usage of the event type EV_POST_CODE:
224224
* - If a combined event is measured, the event field SHOULD
225225
* be the string "POST CODE" in all caps. ...
@@ -473,7 +473,7 @@ static bool yaml_split_print_string(const char *indent,
473473
}
474474

475475
/*
476-
* TCG PC Client FPF section 9.2.6
476+
* TCG PC Client FPF section 10.2.6
477477
* The tpm2_eventlog module validates the event structure but nothing within
478478
* the event data buffer so we must do that here.
479479
*/
@@ -761,7 +761,7 @@ static bool yaml_uefi_var(UEFI_VARIABLE_DATA *data, size_t size, UINT32 type,
761761
free(ret);
762762
return yaml_uefi_var_data(data);
763763
}
764-
/* TCG PC Client FPF section 9.2.5 */
764+
/* TCG PC Client FPF section 10.2.5 */
765765
bool yaml_uefi_platfwblob(UEFI_PLATFORM_FIRMWARE_BLOB *data) {
766766

767767
tpm2_tool_output(" Event:\n"

0 commit comments

Comments
 (0)