Skip to content

Measure DXE FV into PCR0#54

Merged
mebersol merged 1 commit intomicrosoft:mainfrom
jaykrell:mu_327_jay2-noclang
Mar 31, 2026
Merged

Measure DXE FV into PCR0#54
mebersol merged 1 commit intomicrosoft:mainfrom
jaykrell:mu_327_jay2-noclang

Conversation

@jaykrell
Copy link
Copy Markdown
Member

@jaykrell jaykrell commented Mar 28, 2026

Measure DXE FV into PCR0

Based on closed source. i.e. without newline churn

commit 44a556c1a16cd6fec118e7c64bd624e47fca21b9
Author: Maheer Aeron maheeraeron@microsoft.com
Date: Fri Mar 20 18:23:11 2026 +0000

Merged PR 15013511: Measure DXE FV into PCR0

This PR fixes what was missed in this PR:
https://dev.azure.com/microsoft/OS/_git/hyperv.uefi/pullrequest/10689820?path=/MsvmPkg/MsvmPkgX64.fdf&version=GBofficial/main&line=33&lineEnd=34&lineStartColumn=1&lineEndColumn=1&type=2&lineStyle=plain&_a=files&iteration=11&base=0

That is, while we split the DXE FV apart from Main FV, we forgot to skip measuring it. This results in 38 new measurements going to PCR2.

This PR adds three things:

  • Ensure that ExcludeFvsFromMeasurementLib includes DXE FV. But again, by default we don't want to exclude measuring this. We want to make sure MainFV and DxeFV are in PCR0, so that we don't get any drivers from our platform into PCR2
  • Issue a PeiServicesInstallFvInfoPpi to make Tcg2Pei aware of the DXE FV. This was the key thing missing
  • Add the SHA384 library to ARM64 + remove SHA1
  • Rename the Exclude PCD

@jaykrell jaykrell marked this pull request as ready for review March 28, 2026 02:00
@jaykrell jaykrell force-pushed the mu_327_jay2-noclang branch 5 times, most recently from 785a489 to a5279a5 Compare March 31, 2026 18:26
Based on closed source. i.e. without newline churn

commit 44a556c1a16cd6fec118e7c64bd624e47fca21b9
Author: Maheer Aeron <maheeraeron@microsoft.com>
Date:   Fri Mar 20 18:23:11 2026 +0000

Merged PR 15013511: Measure DXE FV into PCR0

This PR fixes what was missed in this PR:
https://dev.azure.com/microsoft/OS/_git/hyperv.uefi/pullrequest/10689820?path=/MsvmPkg/MsvmPkgX64.fdf&version=GBofficial/main&line=33&lineEnd=34&lineStartColumn=1&lineEndColumn=1&type=2&lineStyle=plain&_a=files&iteration=11&base=0

That is, while we split the DXE FV apart from Main FV, we forgot to skip measuring it. This results in 38 new measurements going to PCR2.

This PR adds three things:
- Ensure that ExcludeFvsFromMeasurementLib includes DXE FV. But again, by default we don't want to exclude measuring this. We want to make sure MainFV and DxeFV are in PCR0, so that we don't get any drivers from _our_ platform into PCR2
- Issue a `PeiServicesInstallFvInfoPpi` to make `Tcg2Pei` aware of the DXE FV. This was the key thing missing
- Add the SHA384 library to ARM64 + remove SHA1
- Rename the Exclude PCD
@jaykrell jaykrell force-pushed the mu_327_jay2-noclang branch from a5279a5 to eb9ca80 Compare March 31, 2026 18:28
@jaykrell jaykrell changed the title closed source updates (no clang/gcc porting) Measure DXE FV into PCR0 Mar 31, 2026
@mebersol mebersol merged commit 5e4dd96 into microsoft:main Mar 31, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants