OvmfPkg/Csm/LegacyBiosDxe: Update to make it build for OVMF

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

diff --git a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
index 7a2ec7f221e5fd04d01552a81f2223c21a560853..adf03bb226766bd8730c12b50be4c27294d6add0 100644 (file)
--- a/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
+++ b/SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.c
@@ -1,14 +1,8 @@
 /** @file\r
   This library is used by other modules to measure data to TPM.\r
 \r
-Copyright (c) 2012 - 2015, 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
-\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
@@ -171,7 +165,7 @@ Tpm20MeasureAndLogData (
   @retval EFI_DEVICE_ERROR      The operation was unsuccessful.\r
 **/\r
 EFI_STATUS\r
-EFIAPI \r
+EFIAPI\r
 TpmMeasureAndLogData (\r
   IN UINT32             PcrIndex,\r
   IN UINT32             EventType,\r
@@ -184,21 +178,22 @@ TpmMeasureAndLogData (
   EFI_STATUS  Status;\r
 \r
   //\r
-  // Try to measure using Tpm1.2 protocol\r
+  // Try to measure using Tpm20 protocol\r
   //\r
-  Status = Tpm12MeasureAndLogData(\r
-               PcrIndex,\r
-               EventType,\r
-               EventLog,\r
-               LogLen,\r
-               HashData,\r
-               HashDataLen\r
-               );\r
+  Status = Tpm20MeasureAndLogData(\r
+             PcrIndex,\r
+             EventType,\r
+             EventLog,\r
+             LogLen,\r
+             HashData,\r
+             HashDataLen\r
+             );\r
+\r
   if (EFI_ERROR (Status)) {\r
     //\r
-    // Try to measure using Tpm20 protocol\r
+    // Try to measure using Tpm1.2 protocol\r
     //\r
-    Status = Tpm20MeasureAndLogData(\r
+    Status = Tpm12MeasureAndLogData(\r
                PcrIndex,\r
                EventType,\r
                EventLog,\r