SecurityPkg/Tcg2: handle PRE HASH and LOG ONLY

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

diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
index 246968bb7f8d08b28462b3c1821b9f80d0f9efee..0e770f4485b5ebb6b101559719b556efddef06bc 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
+++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
@@ -453,13 +453,15 @@ HashLogExtendEvent (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  if(Flags & EDKII_TCG_PRE_HASH) {\r
+  if ((Flags & EDKII_TCG_PRE_HASH) != 0 || (Flags & EDKII_TCG_PRE_HASH_LOG_ONLY) != 0) {\r
     ZeroMem (&DigestList, sizeof(DigestList));\r
     CopyMem (&DigestList, HashData, sizeof(DigestList));\r
-    Status = Tpm2PcrExtend (\r
-             0,\r
-             &DigestList\r
-             );\r
+    if ((Flags & EDKII_TCG_PRE_HASH) !=0 ) {\r
+      Status = Tpm2PcrExtend (\r
+               NewEventHdr->PCRIndex,\r
+               &DigestList\r
+               );\r
+    }\r
   } else {\r
     Status = HashAndExtend (\r
                NewEventHdr->PCRIndex,\r