From 1de3b7fdb19a265dcde97070fcd14e0407cb01bd Mon Sep 17 00:00:00 2001 From: "Zhang, Chao B" Date: Tue, 24 Jan 2017 15:29:54 +0800 Subject: [PATCH] MdeModulePkg: VariableDxe: Use UEFI_VARIABLE_DATA Use UEFI_VARIABLE_DATA data structure according to TCG PC-Client PFP Spec 00.21. http://www.trustedcomputinggroup.org/wp-content/uploads/PC-ClientSpecific_Platform_Profile_for_TPM_2p0_Systems_v21.pdf Cc: Star Zeng Cc: Yao Jiewen Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Chao Zhang Reviewed-by: Star Zeng Reviewed-by: Yao Jiewen --- MdeModulePkg/Universal/Variable/RuntimeDxe/Measurement.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Measurement.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Measurement.c index 309521f923..0f1cb18bac 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Measurement.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Measurement.c @@ -1,5 +1,5 @@ /** @file - Measure TrEE required variable. + Measure TCG required variable. Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials @@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include #include #include @@ -96,7 +95,7 @@ MeasureVariable ( { EFI_STATUS Status; UINTN VarNameLength; - EFI_VARIABLE_DATA_TREE *VarLog; + UEFI_VARIABLE_DATA *VarLog; UINT32 VarLogSize; ASSERT ((VarSize == 0 && VarData == NULL) || (VarSize != 0 && VarData != NULL)); @@ -105,7 +104,7 @@ MeasureVariable ( VarLogSize = (UINT32)(sizeof (*VarLog) + VarNameLength * sizeof (*VarName) + VarSize - sizeof (VarLog->UnicodeName) - sizeof (VarLog->VariableData)); - VarLog = (EFI_VARIABLE_DATA_TREE *) AllocateZeroPool (VarLogSize); + VarLog = (UEFI_VARIABLE_DATA *) AllocateZeroPool (VarLogSize); if (VarLog == NULL) { return EFI_OUT_OF_RESOURCES; } -- 2.39.2