[TPM] Tpm2HelpLib Updates (#735)

Raymond-MS · apop5 · commit ec779d385ef4 · 2025-09-18T16:22:38.000-07:00
## Description Changes related to the new Tpm2HelpLib which replaces the need for Tpm2CommandLib which houses Tpm2Help.c. Reliant on microsoft/mu_tiano_plus#437 For details on how to complete these options and their meaning refer to [CONTRIBUTING.md](https://github.com/microsoft/mu/blob/HEAD/CONTRIBUTING.md). - [x] Impacts functionality? - [ ] Impacts security? - [x] Breaking change? - [ ] Includes tests? - [ ] Includes documentation? - [ ] Backport to release branch? ## How This Was Tested Verified by building and running on physical platform. ## Integration Instructions Need to update platform .dsc to include the new Tpm2HelpLib.
diff --git a/MfciPkg/MfciPkg.dsc b/MfciPkg/MfciPkg.dsc
@@ -52,6 +52,7 @@
   TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
   Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
+  Tpm2HelpLib|SecurityPkg/Library/Tpm2HelpLib/Tpm2HelpLib.inf
   SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf
   PlatformPKProtectionLib|SecurityPkg/Library/PlatformPKProtectionLibVarPolicy/PlatformPKProtectionLibVarPolicy.inf
   MfciRetrievePolicyLib|MfciPkg/Library/MfciRetrievePolicyLibNull/MfciRetrievePolicyLibNull.inf
diff --git a/TpmTestingPkg/Overrides/Tcg2Dxe/Tcg2Dxe.c b/TpmTestingPkg/Overrides/Tcg2Dxe/Tcg2Dxe.c
@@ -39,6 +39,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PrintLib.h>
 #include <Library/Tpm2CommandLib.h>
+#include <Library/Tpm2HelpLib.h> // MU_CHANGE
 #include <Library/PcdLib.h>
 #include <Library/UefiLib.h>
 #include <Library/Tpm2DeviceLib.h>
diff --git a/TpmTestingPkg/Overrides/Tcg2Dxe/Tcg2Dxe.inf b/TpmTestingPkg/Overrides/Tcg2Dxe/Tcg2Dxe.inf
@@ -76,6 +76,7 @@
   DeviceStateLib
   PanicLib
   ## MU_CHANGE [END]
+  Tpm2HelpLib # MU_CHANGE
 
 [Guids]
   ## SOMETIMES_CONSUMES     ## Variable:L"SecureBoot"
diff --git a/TpmTestingPkg/TpmReplayPei/Pei/TpmReplayPei.inf b/TpmTestingPkg/TpmReplayPei/Pei/TpmReplayPei.inf
@@ -58,6 +58,7 @@
   PeiServicesLib
   ReportStatusCodeLib
   Tpm2CommandLib
+  Tpm2HelpLib
 
 [Guids]
   gTcgEvent2EntryHobGuid                                        ## PRODUCES ## HOB
diff --git a/TpmTestingPkg/TpmReplayPei/Pei/TpmReplayPeiTpmInitialized.c b/TpmTestingPkg/TpmReplayPei/Pei/TpmReplayPeiTpmInitialized.c
@@ -28,6 +28,7 @@
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/Tpm2CommandLib.h>
 #include <Library/Tpm2DeviceLib.h>
+#include <Library/Tpm2HelpLib.h>
 #include <Ppi/TpmInitialized.h>
 #include <Protocol/Tcg2Protocol.h>              // For macro definitions in the header file
 
diff --git a/TpmTestingPkg/TpmReplayPei/TpmReplayTcg.c b/TpmTestingPkg/TpmReplayPei/TpmReplayTcg.c
@@ -18,7 +18,7 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/Tpm2CommandLib.h>
+#include <Library/Tpm2HelpLib.h>
 
 /**
   Unpacks TPM digest values.
diff --git a/TpmTestingPkg/TpmTestingPkg.dsc b/TpmTestingPkg/TpmTestingPkg.dsc
@@ -39,6 +39,7 @@
   ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
+  Tpm2HelpLib|SecurityPkg/Library/Tpm2HelpLib/Tpm2HelpLib.inf
   Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
 
diff --git a/UefiTestingPkg/AuditTests/TpmEventLogAudit/TpmEventLogAudit.c b/UefiTestingPkg/AuditTests/TpmEventLogAudit/TpmEventLogAudit.c
@@ -13,7 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/UefiApplicationEntryPoint.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/BaseMemoryLib.h>
-#include <Library/Tpm2CommandLib.h>
+#include <Library/Tpm2HelpLib.h>
 #include <Protocol/Tcg2Protocol.h>
 #include <IndustryStandard/UefiTcgPlatform.h>
 #include "TpmEventLogXml.h"
diff --git a/UefiTestingPkg/AuditTests/TpmEventLogAudit/TpmEventLogAuditTestApp.inf b/UefiTestingPkg/AuditTests/TpmEventLogAudit/TpmEventLogAuditTestApp.inf
@@ -29,7 +29,7 @@
   ShellLib
   UefiBootServicesTableLib
   BaseMemoryLib
-  Tpm2CommandLib
+  Tpm2HelpLib
   XmlTreeLib
   XmlTreeQueryLib
 
diff --git a/UefiTestingPkg/AuditTests/TpmEventLogAudit/TpmEventLogXml.h b/UefiTestingPkg/AuditTests/TpmEventLogAudit/TpmEventLogXml.h
@@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/XmlTreeLib.h>
 #include <Library/XmlTreeQueryLib.h>
 #include <Library/ShellLib.h>
-#include <Library/Tpm2CommandLib.h>
+#include <Library/Tpm2HelpLib.h>
 #include <IndustryStandard/UefiTcgPlatform.h>
 
 /**
diff --git a/UefiTestingPkg/UefiTestingPkg.dsc b/UefiTestingPkg/UefiTestingPkg.dsc
@@ -55,6 +55,7 @@
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
 
+  Tpm2HelpLib|SecurityPkg/Library/Tpm2HelpLib/Tpm2HelpLib.inf
   Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
   XmlTreeLib|XmlSupportPkg/Library/XmlTreeLib/XmlTreeLib.inf
   XmlTreeQueryLib|XmlSupportPkg/Library/XmlTreeQueryLib/XmlTreeQueryLib.inf
