Use firmware version instead of hardcode string for S-CRTM version identifier

Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by  : Fu, Siyuan <siyuan.fu@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13677 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c
index 4732a2a174f54e76fd6f3778422dae4eca2bfab2..08d8293ccb128f46ccee1fcc60308a4abc8b1abb 100644 (file)
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.c
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.c
@@ -29,6 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/HobLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/PeiServicesTablePointerLib.h>\r
+#include <Library/BaseLib.h>\r
 \r
 #include "TpmComm.h"\r
 \r
@@ -90,8 +91,6 @@ EFI_PEI_NOTIFY_DESCRIPTOR           mNotifyList[] = {
   }\r
 };\r
 \r
-CHAR8 mSCrtmVersion[] = "{D20BC7C6-A1A5-415c-AE85-38290AB6BE04}";\r
-\r
 EFI_PLATFORM_FIRMWARE_BLOB mMeasuredFvInfo[FixedPcdGet32 (PcdPeiCoreMaxFvSupported)];\r
 UINT32 mMeasuredFvIndex = 0;\r
 \r
@@ -180,20 +179,21 @@ MeasureCRTMVersion (
   TCG_PCR_EVENT_HDR                 TcgEventHdr;\r
 \r
   //\r
-  // Here, only a static GUID is measured instead of real CRTM version.\r
+  // Use FirmwareVersion string to represent CRTM version.\r
   // OEMs should get real CRTM version string and measure it.\r
   //\r
 \r
   TcgEventHdr.PCRIndex  = 0;\r
   TcgEventHdr.EventType = EV_S_CRTM_VERSION;\r
-  TcgEventHdr.EventSize = sizeof (mSCrtmVersion);\r
+  TcgEventHdr.EventSize = StrSize((CHAR16*)PcdGetPtr (PcdFirmwareVersionString));\r
+\r
   return HashLogExtendEvent (\r
            PeiServices,\r
-           (UINT8*)&mSCrtmVersion,\r
+           (UINT8*)PcdGetPtr (PcdFirmwareVersionString),\r
            TcgEventHdr.EventSize,\r
            TpmHandle,\r
            &TcgEventHdr,\r
-           (UINT8*)&mSCrtmVersion\r
+           (UINT8*)PcdGetPtr (PcdFirmwareVersionString)\r
            );\r
 }\r
 \r

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
index 5d7da7f5e0559a9110123da3c63c026fc1523916..1c4db06ce4e3e4ce90a38d147a901de10ea1eba6 100644 (file)
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
@@ -46,6 +46,8 @@
   TimerLib\r
   IoLib\r
   PeiServicesTablePointerLib\r
+  BaseLib\r
+  PcdLib\r
 \r
 [Guids]\r
   gTcgEventEntryHobGuid\r
@@ -64,6 +66,7 @@
 [FixedPcd]\r
   gEfiSecurityPkgTokenSpaceGuid.PcdHideTpmSupport\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString             ## CONSUMES\r
 \r
 [Depex]\r
   gEfiPeiMasterBootModePpiGuid AND\r