From 0758c830f7b4a388b15fb825b896f5f366985bbf Mon Sep 17 00:00:00 2001 From: czhang46 Date: Fri, 28 Sep 2012 00:57:02 +0000 Subject: Rename Trusted Hob to Measured FV hob and add Guided Hob layout structure Signed-off-by : Chao Zhang Reviewed-by : Dong Guo git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13762 6f19259b-4bc3-4df7-8a09-765794883524 --- .../DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c | 22 ++++++++++------------ .../DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) (limited to 'SecurityPkg/Library') diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c index f3e486eadc..eae68eab6b 100644 --- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c +++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c @@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include -#include +#include #include #include @@ -59,7 +59,7 @@ UINTN mImageSize; // Measured FV handle cache // EFI_HANDLE mCacheMeasuredHandle = NULL; -UINT32 *mGuidHobData = NULL; +MEASURED_HOB_DATA *mMeasuredHobData = NULL; /** Reads contents of a PE/COFF image in memory buffer. @@ -740,7 +740,6 @@ DxeTpmMeasureBootHandler ( PE_COFF_LOADER_IMAGE_CONTEXT ImageContext; EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *FvbProtocol; EFI_PHYSICAL_ADDRESS FvAddress; - EFI_PLATFORM_FIRMWARE_BLOB *TrustedFvBuf; UINT32 Index; Status = gBS->LocateProtocol (&gEfiTcgProtocolGuid, NULL, (VOID **) &TcgProtocol); @@ -848,14 +847,14 @@ DxeTpmMeasureBootHandler ( return EFI_SUCCESS; } // - // The PE image from untrusted Firmware volume need be measured - // The PE image from trusted Firmware volume will be mearsured according to policy below. - // if it is driver, do not measure + // The PE image from unmeasured Firmware volume need be measured + // The PE image from measured Firmware volume will be mearsured according to policy below. + // If it is driver, do not measure // If it is application, still measure. // ApplicationRequired = TRUE; - if (mCacheMeasuredHandle != Handle && mGuidHobData != NULL) { + if (mCacheMeasuredHandle != Handle && mMeasuredHobData != NULL) { // // Search for Root FV of this PE image // @@ -877,11 +876,10 @@ DxeTpmMeasureBootHandler ( return Status; } - TrustedFvBuf = (EFI_PLATFORM_FIRMWARE_BLOB *)(mGuidHobData + 1); ApplicationRequired = FALSE; - for (Index = 0; Index < *mGuidHobData; Index++) { - if(TrustedFvBuf[Index].BlobBase == FvAddress) { + for (Index = 0; Index < mMeasuredHobData->Num; Index++) { + if(mMeasuredHobData->MeasuredFvBuf[Index].BlobBase == FvAddress) { // // Cache measured FV for next measurement // @@ -996,10 +994,10 @@ DxeTpmMeasureBootLibConstructor ( GuidHob = NULL; - GuidHob = GetFirstGuidHob (&gTrustedFvHobGuid); + GuidHob = GetFirstGuidHob (&gMeasuredFvHobGuid); if (GuidHob != NULL) { - mGuidHobData = GET_GUID_HOB_DATA (GuidHob); + mMeasuredHobData = GET_GUID_HOB_DATA (GuidHob); } return RegisterSecurity2Handler ( diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf index 9b0e3cb79b..53b26b0284 100644 --- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf +++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf @@ -53,7 +53,7 @@ HobLib [Guids] - gTrustedFvHobGuid + gMeasuredFvHobGuid [Protocols] gEfiTcgProtocolGuid ## CONSUMES -- cgit v1.2.3