]> git.proxmox.com Git - mirror_edk2.git/commitdiff
Add TPM2 commands which might be used in field upgrade.
authorYao, Jiewen <jiewen.yao@intel.com>
Fri, 12 Dec 2014 04:34:19 +0000 (04:34 +0000)
committerjyao1 <jyao1@Edk2>
Fri, 12 Dec 2014 04:34:19 +0000 (04:34 +0000)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <jiewen.yao@intel.com>
Reviewed-by: "Dong, Guo" <guo.dong@intel.com>
Reviewed-by: "Long, Qin" <qin.long@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16505 6f19259b-4bc3-4df7-8a09-765794883524

SecurityPkg/Include/Library/Tpm2CommandLib.h
SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
SecurityPkg/Library/Tpm2CommandLib/Tpm2Context.c [new file with mode: 0644]
SecurityPkg/Library/Tpm2CommandLib/Tpm2EnhancedAuthorization.c [new file with mode: 0644]
SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c [new file with mode: 0644]

index 5ec3ead05e564b73237e542db39cc76b4cc4271a..6e406fd698d985d88474728963e7b5a2ce23bdd3 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   This library is used by other modules to send TPM2 command.\r
 \r
-Copyright (c) 2013, Intel Corporation. All rights reserved. <BR>\r
+Copyright (c) 2013 - 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
@@ -140,6 +140,27 @@ Tpm2SelfTest (
   IN TPMI_YES_NO          FullTest\r
   );\r
 \r
+/**\r
+  This command allows setting of the authorization policy for the platform hierarchy (platformPolicy), the\r
+  storage hierarchy (ownerPolicy), and and the endorsement hierarchy (endorsementPolicy).\r
+\r
+  @param[in]  AuthHandle            TPM_RH_ENDORSEMENT, TPM_RH_OWNER or TPM_RH_PLATFORM+{PP} parameters to be validated\r
+  @param[in]  AuthSession           Auth Session context\r
+  @param[in]  AuthPolicy            An authorization policy hash\r
+  @param[in]  HashAlg               The hash algorithm to use for the policy\r
+\r
+  @retval EFI_SUCCESS      Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR Unexpected device behavior.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2SetPrimaryPolicy (\r
+  IN  TPMI_RH_HIERARCHY_AUTH    AuthHandle,\r
+  IN  TPMS_AUTH_COMMAND         *AuthSession,\r
+  IN  TPM2B_DIGEST              *AuthPolicy,\r
+  IN  TPMI_ALG_HASH             HashAlg\r
+  );\r
+\r
 /**\r
   This command removes all TPM context associated with a specific Owner.\r
 \r
@@ -774,6 +795,116 @@ Tpm2SetAlgorithmSet (
   IN  UINT32                    AlgorithmSet\r
   );\r
 \r
+/**\r
+  This command is used to start an authorization session using alternative methods of\r
+  establishing the session key (sessionKey) that is used for authorization and encrypting value.\r
+\r
+  @param[in]  TpmKey             Handle of a loaded decrypt key used to encrypt salt.\r
+  @param[in]  Bind               Entity providing the authValue.\r
+  @param[in]  NonceCaller        Initial nonceCaller, sets nonce size for the session.\r
+  @param[in]  Salt               Value encrypted according to the type of tpmKey.\r
+  @param[in]  SessionType        Indicates the type of the session.\r
+  @param[in]  Symmetric          The algorithm and key size for parameter encryption.\r
+  @param[in]  AuthHash           Hash algorithm to use for the session.\r
+  @param[out] SessionHandle      Handle for the newly created session.\r
+  @param[out] NonceTPM           The initial nonce from the TPM, used in the computation of the sessionKey.\r
+  \r
+  @retval EFI_SUCCESS            Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2StartAuthSession (\r
+  IN      TPMI_DH_OBJECT            TpmKey,\r
+  IN      TPMI_DH_ENTITY            Bind,\r
+  IN      TPM2B_NONCE               *NonceCaller,\r
+  IN      TPM2B_ENCRYPTED_SECRET    *Salt,\r
+  IN      TPM_SE                    SessionType,\r
+  IN      TPMT_SYM_DEF              *Symmetric,\r
+  IN      TPMI_ALG_HASH             AuthHash,\r
+     OUT  TPMI_SH_AUTH_SESSION      *SessionHandle,\r
+     OUT  TPM2B_NONCE               *NonceTPM\r
+  );\r
+\r
+/**\r
+  This command causes all context associated with a loaded object or session to be removed from TPM memory.\r
+\r
+  @param[in]  FlushHandle        The handle of the item to flush.\r
+  \r
+  @retval EFI_SUCCESS            Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2FlushContext (\r
+  IN      TPMI_DH_CONTEXT           FlushHandle\r
+  );\r
+\r
+/**\r
+  This command includes a secret-based authorization to a policy.\r
+  The caller proves knowledge of the secret value using an authorization\r
+  session using the authValue associated with authHandle.\r
+  \r
+  @param[in]  AuthHandle         Handle for an entity providing the authorization\r
+  @param[in]  PolicySession      Handle for the policy session being extended.\r
+  @param[in]  AuthSession        Auth Session context\r
+  @param[in]  NonceTPM           The policy nonce for the session.\r
+  @param[in]  CpHashA            Digest of the command parameters to which this authorization is limited.\r
+  @param[in]  PolicyRef          A reference to a policy relating to the authorization.\r
+  @param[in]  Expiration         Time when authorization will expire, measured in seconds from the time that nonceTPM was generated.\r
+  @param[out] Timeout            Time value used to indicate to the TPM when the ticket expires.\r
+  @param[out] PolicyTicket       A ticket that includes a value indicating when the authorization expires.\r
+  \r
+  @retval EFI_SUCCESS            Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2PolicySecret (\r
+  IN      TPMI_DH_ENTITY            AuthHandle,\r
+  IN      TPMI_SH_POLICY            PolicySession,\r
+  IN      TPMS_AUTH_COMMAND         *AuthSession, OPTIONAL\r
+  IN      TPM2B_NONCE               *NonceTPM,\r
+  IN      TPM2B_DIGEST              *CpHashA,\r
+  IN      TPM2B_NONCE               *PolicyRef,\r
+  IN      INT32                     Expiration,\r
+  OUT     TPM2B_TIMEOUT             *Timeout,\r
+  OUT     TPMT_TK_AUTH              *PolicyTicket\r
+  );\r
+\r
+/**\r
+  This command indicates that the authorization will be limited to a specific command code.\r
+\r
+  @param[in]  PolicySession      Handle for the policy session being extended.\r
+  @param[in]  Code               The allowed commandCode.\r
+  \r
+  @retval EFI_SUCCESS            Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2PolicyCommandCode (\r
+  IN      TPMI_SH_POLICY            PolicySession,\r
+  IN      TPM_CC                    Code\r
+  );\r
+\r
+/**\r
+  This command returns the current policyDigest of the session. This command allows the TPM\r
+  to be used to perform the actions required to precompute the authPolicy for an object.\r
+\r
+  @param[in]  PolicySession      Handle for the policy session.\r
+  @param[out] PolicyHash         the current value of the policyHash of policySession.\r
+  \r
+  @retval EFI_SUCCESS            Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2PolicyGetDigest (\r
+  IN      TPMI_SH_POLICY            PolicySession,\r
+     OUT  TPM2B_DIGEST              *PolicyHash\r
+  );\r
+\r
 //\r
 // Help function\r
 //\r
index bc95ce7fa615454740b5b015fa9348462ba806fa..740af3f72bce0629e00faacfbd0acce3fee9c8b0 100644 (file)
@@ -35,6 +35,9 @@
   Tpm2Hierarchy.c\r
   Tpm2NVStorage.c\r
   Tpm2Startup.c\r
+  Tpm2Session.c\r
+  Tpm2Context.c\r
+  Tpm2EnhancedAuthorization.c\r
   Tpm2Test.c\r
   Tpm2DictionaryAttack.c\r
   Tpm2Miscellaneous.c\r
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Context.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Context.c
new file mode 100644 (file)
index 0000000..02a2501
--- /dev/null
@@ -0,0 +1,86 @@
+/** @file\r
+  Implement TPM2 Context related command.\r
+\r
+Copyright (c) 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
+\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
+\r
+**/\r
+\r
+#include <IndustryStandard/UefiTcgPlatform.h>\r
+#include <Library/Tpm2CommandLib.h>\r
+#include <Library/Tpm2DeviceLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+\r
+#pragma pack(1)\r
+\r
+typedef struct {\r
+  TPM2_COMMAND_HEADER       Header;\r
+  TPMI_DH_CONTEXT           FlushHandle;\r
+} TPM2_FLUSH_CONTEXT_COMMAND;\r
+\r
+typedef struct {\r
+  TPM2_RESPONSE_HEADER      Header;\r
+} TPM2_FLUSH_CONTEXT_RESPONSE;\r
+\r
+#pragma pack()\r
+\r
+/**\r
+  This command causes all context associated with a loaded object or session to be removed from TPM memory.\r
+\r
+  @param[in]  FlushHandle        The handle of the item to flush.\r
+  \r
+  @retval EFI_SUCCESS            Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2FlushContext (\r
+  IN      TPMI_DH_CONTEXT           FlushHandle\r
+  )\r
+{\r
+  EFI_STATUS                        Status;\r
+  TPM2_FLUSH_CONTEXT_COMMAND        SendBuffer;\r
+  TPM2_FLUSH_CONTEXT_RESPONSE       RecvBuffer;\r
+  UINT32                            SendBufferSize;\r
+  UINT32                            RecvBufferSize;\r
+\r
+  //\r
+  // Construct command\r
+  //\r
+  SendBuffer.Header.tag = SwapBytes16(TPM_ST_NO_SESSIONS);\r
+  SendBuffer.Header.commandCode = SwapBytes32(TPM_CC_FlushContext);\r
+\r
+  SendBuffer.FlushHandle = SwapBytes32 (FlushHandle);\r
\r
+  SendBufferSize = (UINT32) sizeof (SendBuffer);\r
+  SendBuffer.Header.paramSize = SwapBytes32 (SendBufferSize);\r
+\r
+  //\r
+  // send Tpm command\r
+  //\r
+  RecvBufferSize = sizeof (RecvBuffer);\r
+  Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
+    DEBUG ((EFI_D_ERROR, "Tpm2FlushContext - 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, "Tpm2FlushContext - responseCode - %x\n", SwapBytes32(RecvBuffer.Header.responseCode)));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2EnhancedAuthorization.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2EnhancedAuthorization.c
new file mode 100644 (file)
index 0000000..e302d53
--- /dev/null
@@ -0,0 +1,299 @@
+/** @file\r
+  Implement TPM2 EnhancedAuthorization related command.\r
+\r
+Copyright (c) 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
+\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
+\r
+**/\r
+\r
+#include <IndustryStandard/UefiTcgPlatform.h>\r
+#include <Library/Tpm2CommandLib.h>\r
+#include <Library/Tpm2DeviceLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+\r
+#pragma pack(1)\r
+\r
+typedef struct {\r
+  TPM2_COMMAND_HEADER       Header;\r
+  TPMI_DH_ENTITY            AuthHandle;\r
+  TPMI_SH_POLICY            PolicySession;\r
+  UINT32                    AuthSessionSize;\r
+  TPMS_AUTH_COMMAND         AuthSession;\r
+  TPM2B_NONCE               NonceTPM;\r
+  TPM2B_DIGEST              CpHashA;\r
+  TPM2B_NONCE               PolicyRef;\r
+  INT32                     Expiration;\r
+} TPM2_POLICY_SECRET_COMMAND;\r
+\r
+typedef struct {\r
+  TPM2_RESPONSE_HEADER      Header;\r
+  UINT32                    AuthSessionSize;\r
+  TPM2B_TIMEOUT             Timeout;\r
+  TPMT_TK_AUTH              PolicyTicket;\r
+  TPMS_AUTH_RESPONSE        AuthSession;\r
+} TPM2_POLICY_SECRET_RESPONSE;\r
+\r
+typedef struct {\r
+  TPM2_COMMAND_HEADER       Header;\r
+  TPMI_SH_POLICY            PolicySession;\r
+  TPM_CC                    Code;\r
+} TPM2_POLICY_COMMAND_CODE_COMMAND;\r
+\r
+typedef struct {\r
+  TPM2_RESPONSE_HEADER      Header;\r
+} TPM2_POLICY_COMMAND_CODE_RESPONSE;\r
+\r
+typedef struct {\r
+  TPM2_COMMAND_HEADER       Header;\r
+  TPMI_SH_POLICY            PolicySession;\r
+} TPM2_POLICY_GET_DIGEST_COMMAND;\r
+\r
+typedef struct {\r
+  TPM2_RESPONSE_HEADER      Header;\r
+  TPM2B_DIGEST              PolicyHash;\r
+} TPM2_POLICY_GET_DIGEST_RESPONSE;\r
+\r
+#pragma pack()\r
+\r
+/**\r
+  This command includes a secret-based authorization to a policy.\r
+  The caller proves knowledge of the secret value using an authorization\r
+  session using the authValue associated with authHandle.\r
+\r
+  @param[in]  AuthHandle         Handle for an entity providing the authorization\r
+  @param[in]  PolicySession      Handle for the policy session being extended.\r
+  @param[in]  AuthSession        Auth Session context\r
+  @param[in]  NonceTPM           The policy nonce for the session.\r
+  @param[in]  CpHashA            Digest of the command parameters to which this authorization is limited.\r
+  @param[in]  PolicyRef          A reference to a policy relating to the authorization.\r
+  @param[in]  Expiration         Time when authorization will expire, measured in seconds from the time that nonceTPM was generated.\r
+  @param[out] Timeout            Time value used to indicate to the TPM when the ticket expires.\r
+  @param[out] PolicyTicket       A ticket that includes a value indicating when the authorization expires.\r
+  \r
+  @retval EFI_SUCCESS            Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2PolicySecret (\r
+  IN      TPMI_DH_ENTITY            AuthHandle,\r
+  IN      TPMI_SH_POLICY            PolicySession,\r
+  IN      TPMS_AUTH_COMMAND         *AuthSession, OPTIONAL\r
+  IN      TPM2B_NONCE               *NonceTPM,\r
+  IN      TPM2B_DIGEST              *CpHashA,\r
+  IN      TPM2B_NONCE               *PolicyRef,\r
+  IN      INT32                     Expiration,\r
+  OUT     TPM2B_TIMEOUT             *Timeout,\r
+  OUT     TPMT_TK_AUTH              *PolicyTicket\r
+  )\r
+{\r
+  EFI_STATUS                        Status;\r
+  TPM2_POLICY_SECRET_COMMAND        SendBuffer;\r
+  TPM2_POLICY_SECRET_RESPONSE       RecvBuffer;\r
+  UINT32                            SendBufferSize;\r
+  UINT32                            RecvBufferSize;\r
+  UINT8                             *Buffer;\r
+  UINT32                            SessionInfoSize;\r
+\r
+  //\r
+  // Construct command\r
+  //\r
+  SendBuffer.Header.tag = SwapBytes16(TPM_ST_SESSIONS);\r
+  SendBuffer.Header.commandCode = SwapBytes32(TPM_CC_PolicySecret);\r
+  SendBuffer.AuthHandle = SwapBytes32 (AuthHandle);\r
+  SendBuffer.PolicySession = SwapBytes32 (PolicySession);\r
+  \r
+  //\r
+  // Add in Auth session\r
+  //\r
+  Buffer = (UINT8 *)&SendBuffer.AuthSession;\r
+\r
+  // sessionInfoSize\r
+  SessionInfoSize = CopyAuthSessionCommand (AuthSession, Buffer);\r
+  Buffer += SessionInfoSize;\r
+  SendBuffer.AuthSessionSize = SwapBytes32(SessionInfoSize);\r
+\r
+  //\r
+  // Real data\r
+  //\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16(NonceTPM->size));\r
+  Buffer += sizeof(UINT16);\r
+  CopyMem (Buffer, NonceTPM->buffer, NonceTPM->size);\r
+  Buffer += NonceTPM->size;\r
+\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16(CpHashA->size));\r
+  Buffer += sizeof(UINT16);\r
+  CopyMem (Buffer, CpHashA->buffer, CpHashA->size);\r
+  Buffer += CpHashA->size;\r
+\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16(PolicyRef->size));\r
+  Buffer += sizeof(UINT16);\r
+  CopyMem (Buffer, PolicyRef->buffer, PolicyRef->size);\r
+  Buffer += PolicyRef->size;\r
+  \r
+  WriteUnaligned32 ((UINT32 *)Buffer, SwapBytes32((UINT32)Expiration));\r
+  Buffer += sizeof(UINT32);\r
+\r
+  SendBufferSize = (UINT32)((UINTN)Buffer - (UINTN)&SendBuffer);\r
+  SendBuffer.Header.paramSize = SwapBytes32 (SendBufferSize);\r
+\r
+  //\r
+  // send Tpm command\r
+  //\r
+  RecvBufferSize = sizeof (RecvBuffer);\r
+  Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
+    DEBUG ((EFI_D_ERROR, "Tpm2PolicySecret - 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, "Tpm2PolicySecret - responseCode - %x\n", SwapBytes32(RecvBuffer.Header.responseCode)));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  //\r
+  // Return the response\r
+  //\r
+  Buffer = (UINT8 *)&RecvBuffer.Timeout;\r
+  Timeout->size = SwapBytes16(ReadUnaligned16 ((UINT16 *)Buffer));\r
+  Buffer += sizeof(UINT16);\r
+  CopyMem (Timeout->buffer, Buffer, Timeout->size);\r
+\r
+  PolicyTicket->tag = SwapBytes16(ReadUnaligned16 ((UINT16 *)Buffer));\r
+  Buffer += sizeof(UINT16);\r
+  PolicyTicket->hierarchy = SwapBytes32(ReadUnaligned32 ((UINT32 *)Buffer));\r
+  Buffer += sizeof(UINT32);\r
+  PolicyTicket->digest.size = SwapBytes16(ReadUnaligned16 ((UINT16 *)Buffer));\r
+  Buffer += sizeof(UINT16);\r
+  CopyMem (PolicyTicket->digest.buffer, Buffer, PolicyTicket->digest.size);\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+/**\r
+  This command indicates that the authorization will be limited to a specific command code.\r
+\r
+  @param[in]  PolicySession      Handle for the policy session being extended.\r
+  @param[in]  Code               The allowed commandCode.\r
+  \r
+  @retval EFI_SUCCESS            Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2PolicyCommandCode (\r
+  IN      TPMI_SH_POLICY            PolicySession,\r
+  IN      TPM_CC                    Code\r
+  )\r
+{\r
+  EFI_STATUS                        Status;\r
+  TPM2_POLICY_COMMAND_CODE_COMMAND  SendBuffer;\r
+  TPM2_POLICY_COMMAND_CODE_RESPONSE RecvBuffer;\r
+  UINT32                            SendBufferSize;\r
+  UINT32                            RecvBufferSize;\r
+\r
+  //\r
+  // Construct command\r
+  //\r
+  SendBuffer.Header.tag = SwapBytes16(TPM_ST_NO_SESSIONS);\r
+  SendBuffer.Header.commandCode = SwapBytes32(TPM_CC_PolicyCommandCode);\r
+\r
+  SendBuffer.PolicySession = SwapBytes32 (PolicySession);\r
+  SendBuffer.Code = SwapBytes32 (Code);\r
+\r
+  SendBufferSize = (UINT32) sizeof (SendBuffer);\r
+  SendBuffer.Header.paramSize = SwapBytes32 (SendBufferSize);\r
+\r
+  //\r
+  // send Tpm command\r
+  //\r
+  RecvBufferSize = sizeof (RecvBuffer);\r
+  Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
+    DEBUG ((EFI_D_ERROR, "Tpm2PolicyCommandCode - 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, "Tpm2PolicyCommandCode - responseCode - %x\n", SwapBytes32(RecvBuffer.Header.responseCode)));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+/**\r
+  This command returns the current policyDigest of the session. This command allows the TPM\r
+  to be used to perform the actions required to precompute the authPolicy for an object.\r
+\r
+  @param[in]  PolicySession      Handle for the policy session.\r
+  @param[out] PolicyHash         the current value of the policyHash of policySession.\r
+  \r
+  @retval EFI_SUCCESS            Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2PolicyGetDigest (\r
+  IN      TPMI_SH_POLICY            PolicySession,\r
+     OUT  TPM2B_DIGEST              *PolicyHash\r
+  )\r
+{\r
+  EFI_STATUS                        Status;\r
+  TPM2_POLICY_GET_DIGEST_COMMAND    SendBuffer;\r
+  TPM2_POLICY_GET_DIGEST_RESPONSE   RecvBuffer;\r
+  UINT32                            SendBufferSize;\r
+  UINT32                            RecvBufferSize;\r
+\r
+  //\r
+  // Construct command\r
+  //\r
+  SendBuffer.Header.tag = SwapBytes16(TPM_ST_NO_SESSIONS);\r
+  SendBuffer.Header.commandCode = SwapBytes32(TPM_CC_PolicyGetDigest);\r
+\r
+  SendBuffer.PolicySession = SwapBytes32 (PolicySession);\r
+\r
+  SendBufferSize = (UINT32) sizeof (SendBuffer);\r
+  SendBuffer.Header.paramSize = SwapBytes32 (SendBufferSize);\r
+\r
+  //\r
+  // send Tpm command\r
+  //\r
+  RecvBufferSize = sizeof (RecvBuffer);\r
+  Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
+    DEBUG ((EFI_D_ERROR, "Tpm2PolicyGetDigest - 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, "Tpm2PolicyGetDigest - responseCode - %x\n", SwapBytes32(RecvBuffer.Header.responseCode)));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  //\r
+  // Return the response\r
+  //\r
+  PolicyHash->size = SwapBytes16 (RecvBuffer.PolicyHash.size);\r
+  CopyMem (PolicyHash->buffer, &RecvBuffer.PolicyHash.buffer, PolicyHash->size);\r
+\r
+  return EFI_SUCCESS;\r
+}\r
index 9eb4c9c3840397c2416976d32f3a5450abcfb6be..1c33c2de2a2079520d36f529381a572d844a928d 100644 (file)
@@ -21,6 +21,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #pragma pack(1)\r
 \r
+typedef struct {\r
+  TPM2_COMMAND_HEADER       Header;\r
+  TPMI_RH_HIERARCHY         AuthHandle;\r
+  UINT32                    AuthSessionSize;\r
+  TPMS_AUTH_COMMAND         AuthSession;\r
+  TPM2B_DIGEST              AuthPolicy;\r
+  TPMI_ALG_HASH             HashAlg;\r
+} TPM2_SET_PRIMARY_POLICY_COMMAND;\r
+\r
+typedef struct {\r
+  TPM2_RESPONSE_HEADER       Header;\r
+  UINT32                     AuthSessionSize;\r
+  TPMS_AUTH_RESPONSE         AuthSession;\r
+} TPM2_SET_PRIMARY_POLICY_RESPONSE;\r
+\r
 typedef struct {\r
   TPM2_COMMAND_HEADER       Header;\r
   TPMI_RH_CLEAR             AuthHandle;\r
@@ -105,6 +120,87 @@ typedef struct {
 \r
 #pragma pack()\r
 \r
+/**\r
+  This command allows setting of the authorization policy for the platform hierarchy (platformPolicy), the\r
+  storage hierarchy (ownerPolicy), and and the endorsement hierarchy (endorsementPolicy).\r
+\r
+  @param[in]  AuthHandle            TPM_RH_ENDORSEMENT, TPM_RH_OWNER or TPM_RH_PLATFORM+{PP} parameters to be validated\r
+  @param[in]  AuthSession           Auth Session context\r
+  @param[in]  AuthPolicy            An authorization policy hash\r
+  @param[in]  HashAlg               The hash algorithm to use for the policy\r
+\r
+  @retval EFI_SUCCESS      Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR Unexpected device behavior.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2SetPrimaryPolicy (\r
+  IN  TPMI_RH_HIERARCHY_AUTH    AuthHandle,\r
+  IN  TPMS_AUTH_COMMAND         *AuthSession,\r
+  IN  TPM2B_DIGEST              *AuthPolicy,\r
+  IN  TPMI_ALG_HASH             HashAlg\r
+  )\r
+{\r
+  EFI_STATUS                                 Status;\r
+  TPM2_SET_PRIMARY_POLICY_COMMAND            SendBuffer;\r
+  TPM2_SET_PRIMARY_POLICY_RESPONSE           RecvBuffer;\r
+  UINT32                                     SendBufferSize;\r
+  UINT32                                     RecvBufferSize;\r
+  UINT8                                      *Buffer;\r
+  UINT32                                     SessionInfoSize;\r
+\r
+  //\r
+  // Construct command\r
+  //\r
+  SendBuffer.Header.tag = SwapBytes16(TPM_ST_SESSIONS);\r
+  SendBuffer.Header.commandCode = SwapBytes32(TPM_CC_SetPrimaryPolicy);\r
+\r
+  SendBuffer.AuthHandle = SwapBytes32 (AuthHandle);\r
+\r
+  //\r
+  // Add in Auth session\r
+  //\r
+  Buffer = (UINT8 *)&SendBuffer.AuthSession;\r
+\r
+  // sessionInfoSize\r
+  SessionInfoSize = CopyAuthSessionCommand (AuthSession, Buffer);\r
+  Buffer += SessionInfoSize;\r
+  SendBuffer.AuthSessionSize = SwapBytes32(SessionInfoSize);\r
+\r
+  //\r
+  // Real data\r
+  //\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16(AuthPolicy->size));\r
+  Buffer += sizeof(UINT16);\r
+  CopyMem (Buffer, AuthPolicy->buffer, AuthPolicy->size);\r
+  Buffer += AuthPolicy->size;\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16(HashAlg));\r
+  Buffer += sizeof(UINT16);\r
+\r
+  SendBufferSize = (UINT32)((UINTN)Buffer - (UINTN)&SendBuffer);\r
+  SendBuffer.Header.paramSize = SwapBytes32 (SendBufferSize);\r
+\r
+  //\r
+  // send Tpm command\r
+  //\r
+  RecvBufferSize = sizeof (RecvBuffer);\r
+  Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
+    DEBUG ((EFI_D_ERROR, "Tpm2SetPrimaryPolicy - 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, "Tpm2SetPrimaryPolicy - responseCode - %x\n", SwapBytes32(RecvBuffer.Header.responseCode)));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
 /**\r
   This command removes all TPM context associated with a specific Owner.\r
 \r
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c
new file mode 100644 (file)
index 0000000..2cbc627
--- /dev/null
@@ -0,0 +1,169 @@
+/** @file\r
+  Implement TPM2 Session related command.\r
+\r
+Copyright (c) 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
+\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
+\r
+**/\r
+\r
+#include <IndustryStandard/UefiTcgPlatform.h>\r
+#include <Library/Tpm2CommandLib.h>\r
+#include <Library/Tpm2DeviceLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+\r
+#pragma pack(1)\r
+\r
+typedef struct {\r
+  TPM2_COMMAND_HEADER       Header;\r
+  TPMI_DH_OBJECT            TpmKey;\r
+  TPMI_DH_ENTITY            Bind;\r
+  TPM2B_NONCE               NonceCaller;\r
+  TPM2B_ENCRYPTED_SECRET    Salt;\r
+  TPM_SE                    SessionType;\r
+  TPMT_SYM_DEF              Symmetric;\r
+  TPMI_ALG_HASH             AuthHash;\r
+} TPM2_START_AUTH_SESSION_COMMAND;\r
+\r
+typedef struct {\r
+  TPM2_RESPONSE_HEADER      Header;\r
+  TPMI_SH_AUTH_SESSION      SessionHandle;\r
+  TPM2B_NONCE               NonceTPM;\r
+} TPM2_START_AUTH_SESSION_RESPONSE;\r
+\r
+#pragma pack()\r
+\r
+/**\r
+  This command is used to start an authorization session using alternative methods of\r
+  establishing the session key (sessionKey) that is used for authorization and encrypting value.\r
+\r
+  @param[in]  TpmKey             Handle of a loaded decrypt key used to encrypt salt.\r
+  @param[in]  Bind               Entity providing the authValue.\r
+  @param[in]  NonceCaller        Initial nonceCaller, sets nonce size for the session.\r
+  @param[in]  Salt               Value encrypted according to the type of tpmKey.\r
+  @param[in]  SessionType        Indicates the type of the session.\r
+  @param[in]  Symmetric          The algorithm and key size for parameter encryption.\r
+  @param[in]  AuthHash           Hash algorithm to use for the session.\r
+  @param[out] SessionHandle      Handle for the newly created session.\r
+  @param[out] NonceTPM           The initial nonce from the TPM, used in the computation of the sessionKey.\r
+  \r
+  @retval EFI_SUCCESS            Operation completed successfully.\r
+  @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+Tpm2StartAuthSession (\r
+  IN      TPMI_DH_OBJECT            TpmKey,\r
+  IN      TPMI_DH_ENTITY            Bind,\r
+  IN      TPM2B_NONCE               *NonceCaller,\r
+  IN      TPM2B_ENCRYPTED_SECRET    *Salt,\r
+  IN      TPM_SE                    SessionType,\r
+  IN      TPMT_SYM_DEF              *Symmetric,\r
+  IN      TPMI_ALG_HASH             AuthHash,\r
+     OUT  TPMI_SH_AUTH_SESSION      *SessionHandle,\r
+     OUT  TPM2B_NONCE               *NonceTPM\r
+  )\r
+{\r
+  EFI_STATUS                        Status;\r
+  TPM2_START_AUTH_SESSION_COMMAND   SendBuffer;\r
+  TPM2_START_AUTH_SESSION_RESPONSE  RecvBuffer;\r
+  UINT32                            SendBufferSize;\r
+  UINT32                            RecvBufferSize;\r
+  UINT8                             *Buffer;\r
+\r
+  //\r
+  // Construct command\r
+  //\r
+  SendBuffer.Header.tag = SwapBytes16(TPM_ST_NO_SESSIONS);\r
+  SendBuffer.Header.commandCode = SwapBytes32(TPM_CC_StartAuthSession);\r
+\r
+  SendBuffer.TpmKey = SwapBytes32 (TpmKey);\r
+  SendBuffer.Bind = SwapBytes32 (Bind);\r
+  Buffer = (UINT8 *)&SendBuffer.NonceCaller;\r
+\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (NonceCaller->size));\r
+  Buffer += sizeof(UINT16);\r
+  CopyMem (Buffer, NonceCaller->buffer, NonceCaller->size);\r
+  Buffer += NonceCaller->size;\r
+\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (Salt->size));\r
+  Buffer += sizeof(UINT16);\r
+  CopyMem (Buffer, Salt->secret, Salt->size);\r
+  Buffer += Salt->size;\r
+\r
+  *(TPM_SE *)Buffer = SessionType;\r
+  Buffer += sizeof(UINT8);\r
+\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (Symmetric->algorithm));\r
+  Buffer += sizeof(UINT16);\r
+  switch (Symmetric->algorithm) {\r
+  case TPM_ALG_NULL:\r
+    break;\r
+  case TPM_ALG_AES:\r
+    WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (Symmetric->keyBits.aes));\r
+    Buffer += sizeof(UINT16);\r
+    WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (Symmetric->mode.aes));\r
+    Buffer += sizeof(UINT16);\r
+    break;\r
+  case TPM_ALG_SM4:\r
+    WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (Symmetric->keyBits.SM4));\r
+    Buffer += sizeof(UINT16);\r
+    WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (Symmetric->mode.SM4));\r
+    Buffer += sizeof(UINT16);\r
+    break;\r
+  case TPM_ALG_SYMCIPHER:\r
+    WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (Symmetric->keyBits.sym));\r
+    Buffer += sizeof(UINT16);\r
+    WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (Symmetric->mode.sym));\r
+    Buffer += sizeof(UINT16);\r
+    break;\r
+  case TPM_ALG_XOR:\r
+    WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (Symmetric->keyBits.xor));\r
+    Buffer += sizeof(UINT16);\r
+    break;\r
+  default:\r
+    ASSERT (FALSE);\r
+    DEBUG ((EFI_D_ERROR, "Tpm2StartAuthSession - Symmetric->algorithm - %x\n", Symmetric->algorithm));\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (AuthHash));\r
+  Buffer += sizeof(UINT16);\r
\r
+  SendBufferSize = (UINT32) ((UINTN)Buffer - (UINTN)&SendBuffer);\r
+  SendBuffer.Header.paramSize = SwapBytes32 (SendBufferSize);\r
+\r
+  //\r
+  // send Tpm command\r
+  //\r
+  RecvBufferSize = sizeof (RecvBuffer);\r
+  Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
+    DEBUG ((EFI_D_ERROR, "Tpm2StartAuthSession - 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, "Tpm2StartAuthSession - responseCode - %x\n", SwapBytes32(RecvBuffer.Header.responseCode)));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  //\r
+  // Return the response\r
+  //\r
+  *SessionHandle = SwapBytes32 (RecvBuffer.SessionHandle);\r
+  NonceTPM->size = SwapBytes16 (RecvBuffer.NonceTPM.size);\r
+  CopyMem (NonceTPM->buffer, &RecvBuffer.NonceTPM.buffer, NonceTPM->size);\r
+\r
+  return EFI_SUCCESS;\r
+}\r