summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMin M Xu <min.m.xu@intel.com>2023-01-18 07:53:26 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-01-18 04:29:14 +0000
commite0dcfb31fb5e008f718af3136a31aae48f0a8007 (patch)
tree5f22321ab1c888b0bdd8b9b45919c4723b3846bf
parente05132aaa091701b457ebcd725484ee5751759da (diff)
downloadedk2-e0dcfb31fb5e008f718af3136a31aae48f0a8007.tar.gz
edk2-e0dcfb31fb5e008f718af3136a31aae48f0a8007.tar.bz2
edk2-e0dcfb31fb5e008f718af3136a31aae48f0a8007.zip
SecurityPkg/TdTcg2Dxe: Extend EFI boot variable to PCR[1]
According to TCG PC Client PFP spec 0021 Section 2.4.4.2 EFI boot variable should be measured and extended to PCR[1], not PCR[5]. This patch is proposed to fix this error. Cc: Jiewen Yao <jiewen.yao@intel.com> Cc: Jian J Wang <jian.j.wang@intel.com> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com> Signed-off-by: Min Xu <min.m.xu@intel.com>
-rw-r--r--SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c b/SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c
index d19923b0c6..59341a8c02 100644
--- a/SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c
+++ b/SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c
@@ -1873,12 +1873,8 @@ ReadAndMeasureBootVariable (
OUT VOID **VarData
)
{
- //
- // Boot variables are measured into (PCR[5]) RTMR[1],
- // details in section 8.1 of TDVF design guide.
- //
return ReadAndMeasureVariable (
- MapPcrToMrIndex (5),
+ MapPcrToMrIndex (1),
EV_EFI_VARIABLE_BOOT,
VarName,
VendorGuid,