#include <Protocol/DevicePathToText.h>\r
#include <Protocol/FirmwareVolumeBlock.h>\r
\r
-#include <Guid/TrustedFvHob.h>\r
+#include <Guid/MeasuredFvHob.h>\r
\r
#include <Library/BaseLib.h>\r
#include <Library/DebugLib.h>\r
// Measured FV handle cache\r
//\r
EFI_HANDLE mCacheMeasuredHandle = NULL;\r
-UINT32 *mGuidHobData = NULL;\r
+MEASURED_HOB_DATA *mMeasuredHobData = NULL;\r
\r
/**\r
Reads contents of a PE/COFF image in memory buffer.\r
PE_COFF_LOADER_IMAGE_CONTEXT ImageContext;\r
EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *FvbProtocol;\r
EFI_PHYSICAL_ADDRESS FvAddress;\r
- EFI_PLATFORM_FIRMWARE_BLOB *TrustedFvBuf;\r
UINT32 Index;\r
\r
Status = gBS->LocateProtocol (&gEfiTcgProtocolGuid, NULL, (VOID **) &TcgProtocol);\r
return EFI_SUCCESS;\r
}\r
//\r
- // The PE image from untrusted Firmware volume need be measured\r
- // The PE image from trusted Firmware volume will be mearsured according to policy below.\r
- // if it is driver, do not measure\r
+ // The PE image from unmeasured Firmware volume need be measured\r
+ // The PE image from measured Firmware volume will be mearsured according to policy below.\r
+ // If it is driver, do not measure\r
// If it is application, still measure.\r
//\r
ApplicationRequired = TRUE;\r
\r
- if (mCacheMeasuredHandle != Handle && mGuidHobData != NULL) {\r
+ if (mCacheMeasuredHandle != Handle && mMeasuredHobData != NULL) {\r
//\r
// Search for Root FV of this PE image\r
//\r
Status = gBS->HandleProtocol(\r
TempHandle, \r
&gEfiFirmwareVolumeBlockProtocolGuid,\r
- &FvbProtocol\r
+ (VOID**)&FvbProtocol\r
);\r
TempHandle = FvbProtocol->ParentHandle;\r
} while (!EFI_ERROR(Status) && FvbProtocol->ParentHandle != NULL);\r
return Status;\r
}\r
\r
- TrustedFvBuf = (EFI_PLATFORM_FIRMWARE_BLOB *)(mGuidHobData + 1);\r
ApplicationRequired = FALSE;\r
\r
- for (Index = 0; Index < *mGuidHobData; Index++) {\r
- if(TrustedFvBuf[Index].BlobBase == FvAddress) {\r
+ for (Index = 0; Index < mMeasuredHobData->Num; Index++) {\r
+ if(mMeasuredHobData->MeasuredFvBuf[Index].BlobBase == FvAddress) {\r
//\r
// Cache measured FV for next measurement\r
//\r
\r
GuidHob = NULL;\r
\r
- GuidHob = GetFirstGuidHob (&gTrustedFvHobGuid);\r
+ GuidHob = GetFirstGuidHob (&gMeasuredFvHobGuid);\r
\r
if (GuidHob != NULL) {\r
- mGuidHobData = GET_GUID_HOB_DATA (GuidHob);\r
+ mMeasuredHobData = GET_GUID_HOB_DATA (GuidHob);\r
}\r
\r
return RegisterSecurity2Handler (\r