SecurityPkg: Change use of EFI_D_* to DEBUG_*

[mirror_edk2.git] / SecurityPkg / Library / Tpm2CommandLib / Tpm2Integrity.c

diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Integrity.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Integrity.c
index ddb15178fb6a5e434c71d5623b4f2978b2372c47..8c87de0b0cb9b9e9655015f0b3c928528e791e6e 100644 (file)
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Integrity.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Integrity.c
@@ -130,7 +130,7 @@ Tpm2PcrExtend (
     Buffer += sizeof(UINT16);\r
     DigestSize = GetHashSizeFromAlgo (Digests->digests[Index].hashAlg);\r
     if (DigestSize == 0) {\r
-      DEBUG ((EFI_D_ERROR, "Unknown hash algorithm %d\r\n", Digests->digests[Index].hashAlg));\r
+      DEBUG ((DEBUG_ERROR, "Unknown hash algorithm %d\r\n", Digests->digests[Index].hashAlg));\r
       return EFI_DEVICE_ERROR;\r
     }\r
     CopyMem(\r
@@ -151,7 +151,7 @@ Tpm2PcrExtend (
   }\r
 \r
   if (ResultBufSize > sizeof(Res)) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrExtend: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrExtend: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
@@ -160,7 +160,7 @@ Tpm2PcrExtend (
   //\r
   RespSize = SwapBytes32(Res.Header.paramSize);\r
   if (RespSize > sizeof(Res)) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrExtend: Response size too large! %d\r\n", RespSize));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrExtend: Response size too large! %d\r\n", RespSize));\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
@@ -168,7 +168,7 @@ Tpm2PcrExtend (
   // Fail if command failed\r
   //\r
   if (SwapBytes32(Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrExtend: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrExtend: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -246,7 +246,7 @@ Tpm2PcrEvent (
   }\r
 \r
   if (ResultBufSize > sizeof(Res)) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrEvent: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrEvent: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
@@ -255,7 +255,7 @@ Tpm2PcrEvent (
   //\r
   RespSize = SwapBytes32(Res.Header.paramSize);\r
   if (RespSize > sizeof(Res)) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrEvent: Response size too large! %d\r\n", RespSize));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrEvent: Response size too large! %d\r\n", RespSize));\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
@@ -263,7 +263,7 @@ Tpm2PcrEvent (
   // Fail if command failed\r
   //\r
   if (SwapBytes32(Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrEvent: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrEvent: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -284,7 +284,7 @@ Tpm2PcrEvent (
     Buffer += sizeof(UINT16);\r
     DigestSize = GetHashSizeFromAlgo (Digests->digests[Index].hashAlg);\r
     if (DigestSize == 0) {\r
-      DEBUG ((EFI_D_ERROR, "Unknown hash algorithm %d\r\n", Digests->digests[Index].hashAlg));\r
+      DEBUG ((DEBUG_ERROR, "Unknown hash algorithm %d\r\n", Digests->digests[Index].hashAlg));\r
       return EFI_DEVICE_ERROR;\r
     }\r
     CopyMem(\r
@@ -353,11 +353,11 @@ Tpm2PcrRead (
   }\r
 \r
   if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrRead - RecvBufferSize Error - %x\n", RecvBufferSize));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrRead - RecvBufferSize Error - %x\n", RecvBufferSize));\r
     return EFI_DEVICE_ERROR;\r
   }\r
   if (SwapBytes32(RecvBuffer.Header.responseCode) != TPM_RC_SUCCESS) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrRead - responseCode - %x\n", SwapBytes32(RecvBuffer.Header.responseCode)));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrRead - responseCode - %x\n", SwapBytes32(RecvBuffer.Header.responseCode)));\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -369,7 +369,7 @@ Tpm2PcrRead (
   // PcrUpdateCounter\r
   //\r
   if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER) + sizeof(RecvBuffer.PcrUpdateCounter)) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrRead - RecvBufferSize Error - %x\n", RecvBufferSize));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrRead - RecvBufferSize Error - %x\n", RecvBufferSize));\r
     return EFI_DEVICE_ERROR;\r
   }\r
   *PcrUpdateCounter = SwapBytes32(RecvBuffer.PcrUpdateCounter);\r
@@ -378,7 +378,7 @@ Tpm2PcrRead (
   // PcrSelectionOut\r
   //\r
   if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER) + sizeof(RecvBuffer.PcrUpdateCounter) + sizeof(RecvBuffer.PcrSelectionOut.count)) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrRead - RecvBufferSize Error - %x\n", RecvBufferSize));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrRead - RecvBufferSize Error - %x\n", RecvBufferSize));\r
     return EFI_DEVICE_ERROR;\r
   }\r
   PcrSelectionOut->count = SwapBytes32(RecvBuffer.PcrSelectionOut.count);\r
@@ -388,7 +388,7 @@ Tpm2PcrRead (
   }\r
 \r
   if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER) + sizeof(RecvBuffer.PcrUpdateCounter) + sizeof(RecvBuffer.PcrSelectionOut.count) + sizeof(RecvBuffer.PcrSelectionOut.pcrSelections[0]) * PcrSelectionOut->count) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrRead - RecvBufferSize Error - %x\n", RecvBufferSize));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrRead - RecvBufferSize Error - %x\n", RecvBufferSize));\r
     return EFI_DEVICE_ERROR;\r
   }\r
   for (Index = 0; Index < PcrSelectionOut->count; Index++) {\r
@@ -513,7 +513,7 @@ Tpm2PcrAllocate (
   }\r
 \r
   if (ResultBufSize > sizeof(Res)) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrAllocate: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrAllocate: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
   }\r
@@ -523,7 +523,7 @@ Tpm2PcrAllocate (
   //\r
   RespSize = SwapBytes32(Res.Header.paramSize);\r
   if (RespSize > sizeof(Res)) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2PcrAllocate: Response size too large! %d\r\n", RespSize));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2PcrAllocate: Response size too large! %d\r\n", RespSize));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
   }\r
@@ -532,7 +532,7 @@ Tpm2PcrAllocate (
   // Fail if command failed\r
   //\r
   if (SwapBytes32(Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
-    DEBUG((EFI_D_ERROR,"Tpm2PcrAllocate: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
+    DEBUG((DEBUG_ERROR,"Tpm2PcrAllocate: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
@@ -673,15 +673,15 @@ Tpm2PcrAllocateBanks (
              &SizeNeeded,\r
              &SizeAvailable\r
              );\r
-  DEBUG ((EFI_D_INFO, "Tpm2PcrAllocateBanks call Tpm2PcrAllocate - %r\n", Status));\r
+  DEBUG ((DEBUG_INFO, "Tpm2PcrAllocateBanks call Tpm2PcrAllocate - %r\n", Status));\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "AllocationSuccess - %02x\n", AllocationSuccess));\r
-  DEBUG ((EFI_D_INFO, "MaxPCR            - %08x\n", MaxPCR));\r
-  DEBUG ((EFI_D_INFO, "SizeNeeded        - %08x\n", SizeNeeded));\r
-  DEBUG ((EFI_D_INFO, "SizeAvailable     - %08x\n", SizeAvailable));\r
+  DEBUG ((DEBUG_INFO, "AllocationSuccess - %02x\n", AllocationSuccess));\r
+  DEBUG ((DEBUG_INFO, "MaxPCR            - %08x\n", MaxPCR));\r
+  DEBUG ((DEBUG_INFO, "SizeNeeded        - %08x\n", SizeNeeded));\r
+  DEBUG ((DEBUG_INFO, "SizeAvailable     - %08x\n", SizeAvailable));\r
 \r
 Done:\r
   ZeroMem(&LocalAuthSession.hmac, sizeof(LocalAuthSession.hmac));\r