Rename Trusted Hob to Measured FV hob and add Guided Hob layout structure

[mirror_edk2.git] / SecurityPkg / Tcg / TcgPei / TcgPei.c

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c
index e8fd1f12d0544115f0ea72f85b886b0c41d8250a..60d91921032885bbc01396031e0bcd83ebdd3257 100644 (file)
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.c
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.c
@@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Ppi/EndOfPeiPhase.h>\r
 \r
 #include <Guid/TcgEventHob.h>\r
-#include <Guid/TrustedFvHob.h>\r
+#include <Guid/MeasuredFvHob.h>\r
 \r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
@@ -148,35 +148,33 @@ EndofPeiSignalNotifyCallBack (
   IN VOID                          *Ppi\r
   )\r
 {  \r
-  UINT8 *HobData;\r
+  MEASURED_HOB_DATA *MeasuredHobData;\r
 \r
-  HobData = NULL;\r
+  MeasuredHobData = NULL;\r
 \r
   //\r
-  // Create a Guid hob to save all trusted Fv \r
+  // Create a Guid hob to save all measured Fv \r
   //\r
-  HobData = BuildGuidHob(\r
-              &gTrustedFvHobGuid,\r
-              sizeof(UINTN) + sizeof(EFI_PLATFORM_FIRMWARE_BLOB) * (mMeasuredBaseFvIndex + mMeasuredChildFvIndex)\r
-              );\r
+  MeasuredHobData = BuildGuidHob(\r
+                      &gMeasuredFvHobGuid,\r
+                      sizeof(UINTN) + sizeof(EFI_PLATFORM_FIRMWARE_BLOB) * (mMeasuredBaseFvIndex + mMeasuredChildFvIndex)\r
+                      );\r
 \r
-  if (HobData != NULL){\r
+  if (MeasuredHobData != NULL){\r
     //\r
     // Save measured FV info enty number\r
     //\r
-    *(UINT32 *)HobData = mMeasuredBaseFvIndex + mMeasuredChildFvIndex;\r
+    MeasuredHobData->Num = mMeasuredBaseFvIndex + mMeasuredChildFvIndex;\r
 \r
-    HobData += sizeof(UINT32);\r
     //\r
     // Save measured base Fv info\r
     //\r
-    CopyMem (HobData, mMeasuredBaseFvInfo, sizeof(EFI_PLATFORM_FIRMWARE_BLOB) * (mMeasuredBaseFvIndex));\r
+    CopyMem (MeasuredHobData->MeasuredFvBuf, mMeasuredBaseFvInfo, sizeof(EFI_PLATFORM_FIRMWARE_BLOB) * (mMeasuredBaseFvIndex));\r
 \r
-    HobData += sizeof(EFI_PLATFORM_FIRMWARE_BLOB) * (mMeasuredBaseFvIndex);\r
     //\r
     // Save measured child Fv info\r
     //\r
-    CopyMem (HobData, mMeasuredChildFvInfo, sizeof(EFI_PLATFORM_FIRMWARE_BLOB) * (mMeasuredChildFvIndex));\r
+    CopyMem (&MeasuredHobData->MeasuredFvBuf[mMeasuredBaseFvIndex] , mMeasuredChildFvInfo, sizeof(EFI_PLATFORM_FIRMWARE_BLOB) * (mMeasuredChildFvIndex));\r
   }\r
 \r
   return EFI_SUCCESS;\r