X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=SecurityPkg%2FLibrary%2FTpm12CommandLib%2FTpm12NvStorage.c;fp=SecurityPkg%2FLibrary%2FTpm12CommandLib%2FTpm12NvStorage.c;h=02feb375e1f3d90093d2e82b3c0102b2ba688121;hp=8295a1d2675872027105aa21b505b24d6db58c46;hb=c411b485b63a671a1e276700cff025c73997233c;hpb=39de741e2dcb8f11e9b4438e37224797643d8451

diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c b/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
index 8295a1d267..02feb375e1 100644
--- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
+++ b/SecurityPkg/Library/Tpm12CommandLib/Tpm12NvStorage.c
@@ -22,30 +22,30 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #pragma pack(1)
 
 typedef struct {
-  TPM_RQU_COMMAND_HDR   Hdr;
-  TPM12_NV_DATA_PUBLIC  PubInfo;
-  TPM_ENCAUTH           EncAuth;
+  TPM_RQU_COMMAND_HDR     Hdr;
+  TPM12_NV_DATA_PUBLIC    PubInfo;
+  TPM_ENCAUTH             EncAuth;
 } TPM_CMD_NV_DEFINE_SPACE;
 
 typedef struct {
-  TPM_RQU_COMMAND_HDR   Hdr;
-  TPM_NV_INDEX          NvIndex;
-  UINT32                Offset;
-  UINT32                DataSize;
+  TPM_RQU_COMMAND_HDR    Hdr;
+  TPM_NV_INDEX           NvIndex;
+  UINT32                 Offset;
+  UINT32                 DataSize;
 } TPM_CMD_NV_READ_VALUE;
 
 typedef struct {
-  TPM_RSP_COMMAND_HDR   Hdr;
-  UINT32                DataSize;
-  UINT8                 Data[TPMNVVALUELENGTH];
+  TPM_RSP_COMMAND_HDR    Hdr;
+  UINT32                 DataSize;
+  UINT8                  Data[TPMNVVALUELENGTH];
 } TPM_RSP_NV_READ_VALUE;
 
 typedef struct {
-  TPM_RQU_COMMAND_HDR   Hdr;
-  TPM_NV_INDEX          NvIndex;
-  UINT32                Offset;
-  UINT32                DataSize;
-  UINT8                 Data[TPMNVVALUELENGTH];
+  TPM_RQU_COMMAND_HDR    Hdr;
+  TPM_NV_INDEX           NvIndex;
+  UINT32                 Offset;
+  UINT32                 DataSize;
+  UINT8                  Data[TPMNVVALUELENGTH];
 } TPM_CMD_NV_WRITE_VALUE;
 
 #pragma pack()
@@ -74,41 +74,42 @@ Tpm12NvDefineSpace (
   //
   // send Tpm command TPM_ORD_NV_DefineSpace
   //
-  Command.Hdr.tag         = SwapBytes16 (TPM_TAG_RQU_COMMAND);
-  Command.Hdr.paramSize   = SwapBytes32 (sizeof (Command));
-  Command.Hdr.ordinal     = SwapBytes32 (TPM_ORD_NV_DefineSpace);
-  Command.PubInfo.tag     = SwapBytes16 (PubInfo->tag);
-  Command.PubInfo.nvIndex = SwapBytes32 (PubInfo->nvIndex);
-  Command.PubInfo.pcrInfoRead.pcrSelection.sizeOfSelect  = SwapBytes16 (PubInfo->pcrInfoRead.pcrSelection.sizeOfSelect);
-  Command.PubInfo.pcrInfoRead.pcrSelection.pcrSelect[0]  = PubInfo->pcrInfoRead.pcrSelection.pcrSelect[0];
-  Command.PubInfo.pcrInfoRead.pcrSelection.pcrSelect[1]  = PubInfo->pcrInfoRead.pcrSelection.pcrSelect[1];
-  Command.PubInfo.pcrInfoRead.pcrSelection.pcrSelect[2]  = PubInfo->pcrInfoRead.pcrSelection.pcrSelect[2];
-  Command.PubInfo.pcrInfoRead.localityAtRelease          = PubInfo->pcrInfoRead.localityAtRelease;
-  CopyMem (&Command.PubInfo.pcrInfoRead.digestAtRelease, &PubInfo->pcrInfoRead.digestAtRelease, sizeof(PubInfo->pcrInfoRead.digestAtRelease));
+  Command.Hdr.tag                                       = SwapBytes16 (TPM_TAG_RQU_COMMAND);
+  Command.Hdr.paramSize                                 = SwapBytes32 (sizeof (Command));
+  Command.Hdr.ordinal                                   = SwapBytes32 (TPM_ORD_NV_DefineSpace);
+  Command.PubInfo.tag                                   = SwapBytes16 (PubInfo->tag);
+  Command.PubInfo.nvIndex                               = SwapBytes32 (PubInfo->nvIndex);
+  Command.PubInfo.pcrInfoRead.pcrSelection.sizeOfSelect = SwapBytes16 (PubInfo->pcrInfoRead.pcrSelection.sizeOfSelect);
+  Command.PubInfo.pcrInfoRead.pcrSelection.pcrSelect[0] = PubInfo->pcrInfoRead.pcrSelection.pcrSelect[0];
+  Command.PubInfo.pcrInfoRead.pcrSelection.pcrSelect[1] = PubInfo->pcrInfoRead.pcrSelection.pcrSelect[1];
+  Command.PubInfo.pcrInfoRead.pcrSelection.pcrSelect[2] = PubInfo->pcrInfoRead.pcrSelection.pcrSelect[2];
+  Command.PubInfo.pcrInfoRead.localityAtRelease         = PubInfo->pcrInfoRead.localityAtRelease;
+  CopyMem (&Command.PubInfo.pcrInfoRead.digestAtRelease, &PubInfo->pcrInfoRead.digestAtRelease, sizeof (PubInfo->pcrInfoRead.digestAtRelease));
   Command.PubInfo.pcrInfoWrite.pcrSelection.sizeOfSelect = SwapBytes16 (PubInfo->pcrInfoWrite.pcrSelection.sizeOfSelect);
   Command.PubInfo.pcrInfoWrite.pcrSelection.pcrSelect[0] = PubInfo->pcrInfoWrite.pcrSelection.pcrSelect[0];
   Command.PubInfo.pcrInfoWrite.pcrSelection.pcrSelect[1] = PubInfo->pcrInfoWrite.pcrSelection.pcrSelect[1];
   Command.PubInfo.pcrInfoWrite.pcrSelection.pcrSelect[2] = PubInfo->pcrInfoWrite.pcrSelection.pcrSelect[2];
   Command.PubInfo.pcrInfoWrite.localityAtRelease         = PubInfo->pcrInfoWrite.localityAtRelease;
-  CopyMem (&Command.PubInfo.pcrInfoWrite.digestAtRelease, &PubInfo->pcrInfoWrite.digestAtRelease, sizeof(PubInfo->pcrInfoWrite.digestAtRelease));
+  CopyMem (&Command.PubInfo.pcrInfoWrite.digestAtRelease, &PubInfo->pcrInfoWrite.digestAtRelease, sizeof (PubInfo->pcrInfoWrite.digestAtRelease));
   Command.PubInfo.permission.tag        = SwapBytes16 (PubInfo->permission.tag);
   Command.PubInfo.permission.attributes = SwapBytes32 (PubInfo->permission.attributes);
   Command.PubInfo.bReadSTClear          = PubInfo->bReadSTClear;
   Command.PubInfo.bWriteSTClear         = PubInfo->bWriteSTClear;
   Command.PubInfo.bWriteDefine          = PubInfo->bWriteDefine;
   Command.PubInfo.dataSize              = SwapBytes32 (PubInfo->dataSize);
-  CopyMem (&Command.EncAuth, EncAuth, sizeof(*EncAuth));
+  CopyMem (&Command.EncAuth, EncAuth, sizeof (*EncAuth));
   Length = sizeof (Response);
   Status = Tpm12SubmitCommand (sizeof (Command), (UINT8 *)&Command, &Length, (UINT8 *)&Response);
   if (EFI_ERROR (Status)) {
     return Status;
   }
+
   DEBUG ((DEBUG_INFO, "Tpm12NvDefineSpace - ReturnCode = %x\n", SwapBytes32 (Response.returnCode)));
   switch (SwapBytes32 (Response.returnCode)) {
-  case TPM_SUCCESS:
-    return EFI_SUCCESS;
-  default:
-    return EFI_DEVICE_ERROR;
+    case TPM_SUCCESS:
+      return EFI_SUCCESS;
+    default:
+      return EFI_DEVICE_ERROR;
   }
 }
 
@@ -146,17 +147,18 @@ Tpm12NvReadValue (
   Command.NvIndex       = SwapBytes32 (NvIndex);
   Command.Offset        = SwapBytes32 (Offset);
   Command.DataSize      = SwapBytes32 (*DataSize);
-  Length = sizeof (Response);
-  Status = Tpm12SubmitCommand (sizeof (Command), (UINT8 *)&Command, &Length, (UINT8 *)&Response);
+  Length                = sizeof (Response);
+  Status                = Tpm12SubmitCommand (sizeof (Command), (UINT8 *)&Command, &Length, (UINT8 *)&Response);
   if (EFI_ERROR (Status)) {
     return Status;
   }
+
   DEBUG ((DEBUG_INFO, "Tpm12NvReadValue - ReturnCode = %x\n", SwapBytes32 (Response.Hdr.returnCode)));
   switch (SwapBytes32 (Response.Hdr.returnCode)) {
-  case TPM_SUCCESS:
-    break;
-  default:
-    return EFI_DEVICE_ERROR;
+    case TPM_SUCCESS:
+      break;
+    default:
+      return EFI_DEVICE_ERROR;
   }
 
   //
@@ -165,6 +167,7 @@ Tpm12NvReadValue (
   if (SwapBytes32 (Response.DataSize) > *DataSize) {
     return EFI_BUFFER_TOO_SMALL;
   }
+
   *DataSize = SwapBytes32 (Response.DataSize);
   ZeroMem (Data, *DataSize);
   CopyMem (Data, &Response.Data, *DataSize);
@@ -206,7 +209,7 @@ Tpm12NvWriteValue (
   // send Tpm command TPM_ORD_NV_WriteValue
   //
   Command.Hdr.tag       = SwapBytes16 (TPM_TAG_RQU_COMMAND);
-  CommandLength = sizeof (Command) - sizeof(Command.Data) + DataSize;
+  CommandLength         = sizeof (Command) - sizeof (Command.Data) + DataSize;
   Command.Hdr.paramSize = SwapBytes32 (CommandLength);
   Command.Hdr.ordinal   = SwapBytes32 (TPM_ORD_NV_WriteValue);
   Command.NvIndex       = SwapBytes32 (NvIndex);
@@ -214,15 +217,16 @@ Tpm12NvWriteValue (
   Command.DataSize      = SwapBytes32 (DataSize);
   CopyMem (Command.Data, Data, DataSize);
   ResponseLength = sizeof (Response);
-  Status = Tpm12SubmitCommand (CommandLength, (UINT8 *)&Command, &ResponseLength, (UINT8 *)&Response);
+  Status         = Tpm12SubmitCommand (CommandLength, (UINT8 *)&Command, &ResponseLength, (UINT8 *)&Response);
   if (EFI_ERROR (Status)) {
     return Status;
   }
+
   DEBUG ((DEBUG_INFO, "Tpm12NvWriteValue - ReturnCode = %x\n", SwapBytes32 (Response.returnCode)));
   switch (SwapBytes32 (Response.returnCode)) {
-  case TPM_SUCCESS:
-    return EFI_SUCCESS;
-  default:
-    return EFI_DEVICE_ERROR;
+    case TPM_SUCCESS:
+      return EFI_SUCCESS;
+    default:
+      return EFI_DEVICE_ERROR;
   }
 }