SecurityPkg: Support CcMeasurementProtocol in DxeTpmMeasurementLib

[mirror_edk2.git] / SecurityPkg / Library / DxeTpmMeasurementLib / DxeTpmMeasurementLib.inf

diff --git a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
index d99e48cea8a417248134dff9bb525cc32852370f..3af3d4e33b25b1e72ccf9440cfb2ff41fea74e36 100644 (file)
--- a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+++ b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
@@ -1,16 +1,13 @@
 ## @file\r
-#  Provides TPM measurement functions for TPM1.2 and TPM 2.0\r
-# \r
-#  This library provides TpmMeasureAndLogData() to to measure and log data, and \r
+#  Provides below measurement functions:\r
+#    1. TPM measurement functions for TPM1.2 and TPM 2.0\r
+#    2. Confidential Computing (CC) measurement functions\r
+#\r
+#  This library provides TpmMeasureAndLogData() to measure and log data, and\r
 #  extend the measurement result into a specific PCR.\r
 #\r
-# Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
 \r
@@ -20,13 +17,13 @@
   FILE_GUID                      = 30930D10-AF5B-4abf-80E6-EB4FFC0AE9D1\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = TpmMeasurementLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = TpmMeasurementLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r
   MODULE_UNI_FILE                = DxeTpmMeasurementLib.uni\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF\r
+#  VALID_ARCHITECTURES           = IA32 X64\r
 #\r
 \r
 [Sources]\r
@@ -34,6 +31,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
   SecurityPkg/SecurityPkg.dec\r
 \r
 [LibraryClasses]\r
@@ -44,5 +42,6 @@
   UefiBootServicesTableLib\r
 \r
 [Protocols]\r
-  gEfiTcgProtocolGuid           ## SOMETIMES_CONSUMES\r
-  gEfiTrEEProtocolGuid          ## SOMETIMES_CONSUMES\r
+  gEfiTcgProtocolGuid               ## SOMETIMES_CONSUMES\r
+  gEfiTcg2ProtocolGuid              ## SOMETIMES_CONSUMES\r
+  gEfiCcMeasurementProtocolGuid     ## SOMETIMES_CONSUMES\r