Update for SecurityPkg.

[mirror_edk2.git] / SecurityPkg / Tcg / TcgConfigDxe / TcgConfigImpl.c

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
index 535f5e852af7544b427c7fff8ed668fbab995f5b..f884226d97ceca9fa036b0b47ba18464e3612335 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "TcgConfigImpl.h"\r
 \r
 \r
 #include "TcgConfigImpl.h"\r
 \r

-EFI_GUID                        mTcgFormSetGuid = TCG_CONFIG_PRIVATE_GUID;\r

 CHAR16                          mTcgStorageName[] = L"TCG_CONFIGURATION";\r
 \r
 TCG_CONFIG_PRIVATE_DATA         mTcgConfigPrivateDateTemplate = {\r
 CHAR16                          mTcgStorageName[] = L"TCG_CONFIGURATION";\r
 \r
 TCG_CONFIG_PRIVATE_DATA         mTcgConfigPrivateDateTemplate = {\r


@@ -36,7 +35,7 @@ HII_VENDOR_DEVICE_PATH          mTcgHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r

-    TCG_CONFIG_PRIVATE_GUID\r
+    TCG_CONFIG_FORM_SET_GUID\r

   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r


@@ -80,13 +79,13 @@ GetTpmState (
   //\r
   if ((TpmEnable != NULL) || (TpmActivate != NULL)) {\r
     TpmSendSize           = sizeof (TPM_RQU_COMMAND_HDR) + sizeof (UINT32) * 3;\r
   //\r
   if ((TpmEnable != NULL) || (TpmActivate != NULL)) {\r
     TpmSendSize           = sizeof (TPM_RQU_COMMAND_HDR) + sizeof (UINT32) * 3;\r

-    *(UINT16*)&CmdBuf[0]  = H2NS (TPM_TAG_RQU_COMMAND);\r
-    *(UINT32*)&CmdBuf[2]  = H2NL (TpmSendSize);\r
-    *(UINT32*)&CmdBuf[6]  = H2NL (TPM_ORD_GetCapability);\r
+    *(UINT16*)&CmdBuf[0]  = SwapBytes16 (TPM_TAG_RQU_COMMAND);\r
+    *(UINT32*)&CmdBuf[2]  = SwapBytes32 (TpmSendSize);\r
+    *(UINT32*)&CmdBuf[6]  = SwapBytes32 (TPM_ORD_GetCapability);\r

   \r
   \r

-    *(UINT32*)&CmdBuf[10] = H2NL (TPM_CAP_FLAG);\r
-    *(UINT32*)&CmdBuf[14] = H2NL (sizeof (TPM_CAP_FLAG_PERMANENT));\r
-    *(UINT32*)&CmdBuf[18] = H2NL (TPM_CAP_FLAG_PERMANENT);\r
+    *(UINT32*)&CmdBuf[10] = SwapBytes32 (TPM_CAP_FLAG);\r
+    *(UINT32*)&CmdBuf[14] = SwapBytes32 (sizeof (TPM_CAP_FLAG_PERMANENT));\r
+    *(UINT32*)&CmdBuf[18] = SwapBytes32 (TPM_CAP_FLAG_PERMANENT);\r

 \r
     Status = TcgProtocol->PassThroughToTpm (\r
                             TcgProtocol,\r
 \r
     Status = TcgProtocol->PassThroughToTpm (\r
                             TcgProtocol,\r


@@ -96,7 +95,7 @@ GetTpmState (
                             CmdBuf\r
                             ); \r
     TpmRsp = (TPM_RSP_COMMAND_HDR *) &CmdBuf[0];\r
                             CmdBuf\r
                             ); \r
     TpmRsp = (TPM_RSP_COMMAND_HDR *) &CmdBuf[0];\r

-    if (EFI_ERROR (Status) || (TpmRsp->tag != H2NS (TPM_TAG_RSP_COMMAND)) || (TpmRsp->returnCode != 0)) {\r
+    if (EFI_ERROR (Status) || (TpmRsp->tag != SwapBytes16 (TPM_TAG_RSP_COMMAND)) || (TpmRsp->returnCode != 0)) {\r

       return EFI_DEVICE_ERROR;\r
     }\r
   \r
       return EFI_DEVICE_ERROR;\r
     }\r
   \r


@@ -166,7 +165,7 @@ TcgExtractConfig (
   }\r
 \r
   *Progress = Request;\r
   }\r
 \r
   *Progress = Request;\r

-  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mTcgFormSetGuid, mTcgStorageName)) {\r
+  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gTcgConfigFormSetGuid, mTcgStorageName)) {\r

     return EFI_NOT_FOUND;\r
   }\r
 \r
     return EFI_NOT_FOUND;\r
   }\r
 \r


@@ -183,8 +182,8 @@ TcgExtractConfig (
   ZeroMem (&Configuration, sizeof (TCG_CONFIGURATION));\r
 \r
   Configuration.MorState        = PcdGetBool (PcdMorEnable);\r
   ZeroMem (&Configuration, sizeof (TCG_CONFIGURATION));\r
 \r
   Configuration.MorState        = PcdGetBool (PcdMorEnable);\r

-  Configuration.TpmOperation    = ENABLE;\r
-  Configuration.HideTpm         = PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm);\r
+  Configuration.TpmOperation    = PHYSICAL_PRESENCE_ENABLE;\r
+  Configuration.HideTpm         = (BOOLEAN) (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm));\r

   //\r
   // Read the original value of HideTpm from PrivateData which won't be changed by Setup in this boot.\r
   //\r
   //\r
   // Read the original value of HideTpm from PrivateData which won't be changed by Setup in this boot.\r
   //\r


@@ -220,7 +219,7 @@ TcgExtractConfig (
     // Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
     // Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r

-    ConfigRequestHdr = HiiConstructConfigHdr (&mTcgFormSetGuid, mTcgStorageName, PrivateData->DriverHandle);\r
+    ConfigRequestHdr = HiiConstructConfigHdr (&gTcgConfigFormSetGuid, mTcgStorageName, PrivateData->DriverHandle);\r

     Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
     Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r


@@ -290,7 +289,7 @@ TcgRouteConfig (
   }\r
 \r
   *Progress = Configuration;\r
   }\r
 \r
   *Progress = Configuration;\r

-  if (!HiiIsConfigHdrMatch (Configuration, &mTcgFormSetGuid, mTcgStorageName)) {\r
+  if (!HiiIsConfigHdrMatch (Configuration, &gTcgConfigFormSetGuid, mTcgStorageName)) {\r

     return EFI_NOT_FOUND;\r
   }\r
 \r
     return EFI_NOT_FOUND;\r
   }\r
 \r


@@ -405,7 +404,7 @@ TcgCallback (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

-  if ((Action != EFI_BROWSER_ACTION_CHANGING) || (QuestionId != KEY_TPM_ACTION)) {\r
+  if ((Action != EFI_BROWSER_ACTION_CHANGED) || (QuestionId != KEY_TPM_ACTION)) {\r

     return EFI_UNSUPPORTED;\r
   }\r
 \r
     return EFI_UNSUPPORTED;\r
   }\r
 \r


@@ -460,7 +459,7 @@ InstallTcgConfigForm (
   // Publish the HII package list\r
   //\r
   HiiHandle = HiiAddPackages (\r
   // Publish the HII package list\r
   //\r
   HiiHandle = HiiAddPackages (\r

-                &mTcgFormSetGuid,\r
+                &gTcgConfigFormSetGuid,\r

                 DriverHandle,\r
                 TcgConfigDxeStrings,\r
                 TcgConfigBin,\r
                 DriverHandle,\r
                 TcgConfigDxeStrings,\r
                 TcgConfigBin,\r