/** @file\r
Initialize TPM device and measure FVs before handing off control to DXE.\r
\r
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2016, 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
#include <Library/BaseMemoryLib.h>\r
#include <Library/PeiServicesLib.h>\r
#include <Library/PeimEntryPoint.h>\r
-#include <Library/TpmCommLib.h>\r
#include <Library/HobLib.h>\r
#include <Library/PcdLib.h>\r
#include <Library/PeiServicesTablePointerLib.h>\r
@param[in] HashData Physical address of the start of the data buffer \r
to be hashed, extended, and logged.\r
@param[in] HashDataLen The length, in bytes, of the buffer referenced by HashData.\r
- @param[in] TpmHandle TPM handle.\r
@param[in] NewEventHdr Pointer to a TCG_PCR_EVENT_HDR data structure. \r
@param[in] NewEventData Pointer to the new event data. \r
\r
IN EFI_PEI_SERVICES **PeiServices,\r
IN UINT8 *HashData,\r
IN UINTN HashDataLen,\r
- IN TIS_TPM_HANDLE TpmHandle,\r
IN TCG_PCR_EVENT_HDR *NewEventHdr,\r
IN UINT8 *NewEventData\r
)\r
\r
Status = TpmCommExtend (\r
PeiServices,\r
- TpmHandle,\r
&NewEventHdr->Digest,\r
NewEventHdr->PCRIndex,\r
NULL\r
Measure CRTM version.\r
\r
@param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TpmHandle TPM handle.\r
\r
@retval EFI_SUCCESS Operation completed successfully.\r
@retval EFI_OUT_OF_RESOURCES No enough memory to log the new event.\r
EFI_STATUS\r
EFIAPI\r
MeasureCRTMVersion (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle\r
+ IN EFI_PEI_SERVICES **PeiServices\r
)\r
{\r
TCG_PCR_EVENT_HDR TcgEventHdr;\r
PeiServices,\r
(UINT8*)PcdGetPtr (PcdFirmwareVersionString),\r
TcgEventHdr.EventSize,\r
- TpmHandle,\r
&TcgEventHdr,\r
(UINT8*)PcdGetPtr (PcdFirmwareVersionString)\r
);\r
EFI_STATUS Status;\r
EFI_PLATFORM_FIRMWARE_BLOB FvBlob;\r
TCG_PCR_EVENT_HDR TcgEventHdr;\r
- TIS_TPM_HANDLE TpmHandle;\r
-\r
- TpmHandle = (TIS_TPM_HANDLE) (UINTN) TPM_BASE_ADDRESS;\r
\r
//\r
// Check if it is in Excluded FV list\r
(EFI_PEI_SERVICES **) GetPeiServicesTablePointer(),\r
(UINT8*) (UINTN) FvBlob.BlobBase,\r
(UINTN) FvBlob.BlobLength,\r
- TpmHandle,\r
&TcgEventHdr,\r
(UINT8*) &FvBlob\r
);\r
Measure main BIOS.\r
\r
@param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TpmHandle TPM handle.\r
\r
@retval EFI_SUCCESS Operation completed successfully.\r
@retval EFI_OUT_OF_RESOURCES No enough memory to log the new event.\r
EFI_STATUS\r
EFIAPI\r
MeasureMainBios (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle\r
+ IN EFI_PEI_SERVICES **PeiServices\r
)\r
{\r
EFI_STATUS Status;\r
PEI_LOCK_PHYSICAL_PRESENCE_PPI *LockPhysicalPresencePpi;\r
BOOLEAN LifetimeLock;\r
BOOLEAN CmdEnable;\r
- TIS_TPM_HANDLE TpmHandle;\r
TPM_PHYSICAL_PRESENCE PhysicalPresenceValue;\r
\r
- TpmHandle = (TIS_TPM_HANDLE) (UINTN) TPM_BASE_ADDRESS;\r
-\r
- Status = TpmCommGetCapability (PeiServices, TpmHandle, NULL, &LifetimeLock, &CmdEnable);\r
+ Status = TpmCommGetCapability (PeiServices, NULL, &LifetimeLock, &CmdEnable);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
Status = TpmCommPhysicalPresence (\r
PeiServices,\r
- TpmHandle,\r
PhysicalPresenceValue\r
);\r
if (EFI_ERROR (Status)) {\r
//\r
Status = TpmCommPhysicalPresence (\r
PeiServices,\r
- TpmHandle,\r
TPM_PHYSICAL_PRESENCE_CMD_ENABLE\r
);\r
if (EFI_ERROR (Status)) {\r
// \r
Status = TpmCommPhysicalPresence (\r
PeiServices,\r
- TpmHandle,\r
TPM_PHYSICAL_PRESENCE_LOCK\r
);\r
return Status;\r
Check if TPM chip is activeated or not.\r
\r
@param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TpmHandle TPM handle.\r
\r
@retval TRUE TPM is activated.\r
@retval FALSE TPM is deactivated.\r
BOOLEAN\r
EFIAPI\r
IsTpmUsable (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle\r
+ IN EFI_PEI_SERVICES **PeiServices\r
)\r
{\r
EFI_STATUS Status;\r
BOOLEAN Deactivated;\r
\r
- Status = TpmCommGetCapability (PeiServices, TpmHandle, &Deactivated, NULL, NULL);\r
+ Status = TpmCommGetCapability (PeiServices, &Deactivated, NULL, NULL);\r
if (EFI_ERROR (Status)) {\r
return FALSE;\r
}\r
)\r
{\r
EFI_STATUS Status;\r
- TIS_TPM_HANDLE TpmHandle;\r
\r
Status = PeiServicesLocatePpi (\r
&gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid, \r
mMeasuredChildFvInfo = (EFI_PLATFORM_FIRMWARE_BLOB *) AllocateZeroPool (sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * PcdGet32 (PcdPeiCoreMaxFvSupported));\r
ASSERT (mMeasuredChildFvInfo != NULL);\r
\r
- TpmHandle = (TIS_TPM_HANDLE)(UINTN)TPM_BASE_ADDRESS;\r
- Status = TisPcRequestUseTpm ((TIS_PC_REGISTERS_PTR)TpmHandle);\r
+ Status = Tpm12RequestUseTpm ();\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
- if (IsTpmUsable (PeiServices, TpmHandle)) {\r
+ if (IsTpmUsable (PeiServices)) {\r
if (PcdGet8 (PcdTpmScrtmPolicy) == 1) {\r
- Status = MeasureCRTMVersion (PeiServices, TpmHandle);\r
+ Status = MeasureCRTMVersion (PeiServices);\r
}\r
\r
- Status = MeasureMainBios (PeiServices, TpmHandle);\r
+ Status = MeasureMainBios (PeiServices);\r
} \r
\r
//\r
EFI_STATUS Status;\r
EFI_STATUS Status2;\r
EFI_BOOT_MODE BootMode;\r
- TIS_TPM_HANDLE TpmHandle;\r
\r
if (!CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm12Guid)){\r
DEBUG ((EFI_D_ERROR, "No TPM12 instance required!\n"));\r
}\r
\r
if (!mImageInMemory) {\r
- TpmHandle = (TIS_TPM_HANDLE)(UINTN)TPM_BASE_ADDRESS;\r
- Status = TisPcRequestUseTpm ((TIS_PC_REGISTERS_PTR)TpmHandle);\r
+ Status = Tpm12RequestUseTpm ();\r
if (EFI_ERROR (Status)) {\r
DEBUG ((DEBUG_ERROR, "TPM not detected!\n"));\r
goto Done;\r
}\r
\r
if (PcdGet8 (PcdTpmInitializationPolicy) == 1) {\r
- Status = TpmCommStartup ((EFI_PEI_SERVICES**)PeiServices, TpmHandle, BootMode);\r
+ Status = TpmCommStartup ((EFI_PEI_SERVICES**)PeiServices, BootMode);\r
if (EFI_ERROR (Status) ) {\r
goto Done;\r
}\r
// TpmSelfTest is optional on S3 path, skip it to save S3 time\r
//\r
if (BootMode != BOOT_ON_S3_RESUME) {\r
- Status = TpmCommContinueSelfTest ((EFI_PEI_SERVICES**)PeiServices, TpmHandle);\r
+ Status = TpmCommContinueSelfTest ((EFI_PEI_SERVICES**)PeiServices);\r
if (EFI_ERROR (Status)) {\r
goto Done;\r
}\r
# This module will initialize TPM device, measure reported FVs and BIOS version.\r
# This module may also lock TPM physical presence and physicalPresenceLifetimeLock.\r
#\r
-# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2016, 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
\r
[Sources]\r
TcgPei.c\r
- TisPei.c\r
TpmComm.c\r
TpmComm.h\r
\r
[Packages]\r
MdePkg/MdePkg.dec\r
MdeModulePkg/MdeModulePkg.dec\r
+ CryptoPkg/CryptoPkg.dec\r
SecurityPkg/SecurityPkg.dec\r
\r
[LibraryClasses]\r
PeiServicesLib\r
BaseMemoryLib\r
DebugLib\r
- TpmCommLib\r
+ BaseCryptLib\r
+ Tpm12DeviceLib\r
TimerLib\r
- IoLib\r
PeiServicesTablePointerLib\r
BaseLib\r
PcdLib\r
+++ /dev/null
-/** @file\r
- TIS (TPM Interface Specification) functions used by TPM PEI driver.\r
- \r
-Copyright (c) 2005 - 2011, 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/Tpm12.h>\r
-#include <IndustryStandard/UefiTcgPlatform.h>\r
-#include <Library/TpmCommLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/IoLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-\r
-/**\r
- Send a command to TPM for execution and return response data.\r
-\r
- @param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TisReg TPM register space base address. \r
- @param[in] BufferIn Buffer for command data. \r
- @param[in] SizeIn Size of command data. \r
- @param[in, out] BufferOut Buffer for response data. \r
- @param[in, out] SizeOut Size of response data. \r
- \r
- @retval EFI_SUCCESS Operation completed successfully.\r
- @retval EFI_TIMEOUT The register can't run into the expected status in time.\r
- @retval EFI_BUFFER_TOO_SMALL Response data buffer is too small.\r
- @retval EFI_DEVICE_ERROR Unexpected device behavior.\r
-\r
-**/\r
-EFI_STATUS\r
-TisTpmCommand (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_PC_REGISTERS_PTR TisReg,\r
- IN UINT8 *BufferIn,\r
- IN UINT32 SizeIn,\r
- IN OUT UINT8 *BufferOut,\r
- IN OUT UINT32 *SizeOut\r
- )\r
-{\r
- EFI_STATUS Status;\r
- UINT16 BurstCount;\r
- UINT32 Index;\r
- UINT32 TpmOutSize;\r
- UINT16 Data16;\r
- UINT32 Data32;\r
-\r
- Status = TisPcPrepareCommand (TisReg);\r
- if (EFI_ERROR (Status)){\r
- DEBUG ((DEBUG_ERROR, "Tpm is not ready for command!\n"));\r
- return Status;\r
- }\r
- //\r
- // Send the command data to Tpm\r
- //\r
- Index = 0;\r
- while (Index < SizeIn) {\r
- Status = TisPcReadBurstCount (TisReg, &BurstCount);\r
- if (EFI_ERROR (Status)) {\r
- Status = EFI_TIMEOUT;\r
- goto Exit;\r
- }\r
- for (; BurstCount > 0 && Index < SizeIn; BurstCount--) {\r
- MmioWrite8((UINTN)&TisReg->DataFifo, *(BufferIn + Index));\r
- Index++;\r
- }\r
- }\r
- //\r
- // Check the Tpm status STS_EXPECT change from 1 to 0\r
- //\r
- Status = TisPcWaitRegisterBits (\r
- &TisReg->Status,\r
- (UINT8) TIS_PC_VALID,\r
- TIS_PC_STS_EXPECT,\r
- TIS_TIMEOUT_C\r
- );\r
- if (EFI_ERROR (Status)) {\r
- DEBUG ((DEBUG_ERROR, "The send buffer too small!\n"));\r
- Status = EFI_BUFFER_TOO_SMALL;\r
- goto Exit;\r
- }\r
- //\r
- // Executed the TPM command and waiting for the response data ready\r
- //\r
- MmioWrite8((UINTN)&TisReg->Status, TIS_PC_STS_GO);\r
- Status = TisPcWaitRegisterBits (\r
- &TisReg->Status,\r
- (UINT8) (TIS_PC_VALID | TIS_PC_STS_DATA),\r
- 0,\r
- TIS_TIMEOUT_B\r
- );\r
- if (EFI_ERROR (Status)) {\r
- DEBUG ((DEBUG_ERROR, "Wait for Tpm response data time out!!\n"));\r
- Status = EFI_TIMEOUT;\r
- goto Exit;\r
- }\r
- //\r
- // Get response data header\r
- //\r
- Index = 0;\r
- BurstCount = 0;\r
- while (Index < sizeof (TPM_RSP_COMMAND_HDR)) {\r
- Status = TisPcReadBurstCount (TisReg, &BurstCount);\r
- if (EFI_ERROR (Status)) {\r
- Status = EFI_TIMEOUT;\r
- goto Exit;\r
- }\r
- for (; BurstCount > 0; BurstCount--) {\r
- *(BufferOut + Index) = MmioRead8 ((UINTN)&TisReg->DataFifo);\r
- Index++;\r
- if (Index == sizeof (TPM_RSP_COMMAND_HDR)) break;\r
- }\r
- }\r
- //\r
- // Check the reponse data header (tag,parasize and returncode )\r
- //\r
- CopyMem (&Data16, BufferOut, sizeof (UINT16));\r
- if (SwapBytes16 (Data16) != TPM_TAG_RSP_COMMAND ) {\r
- Status = EFI_DEVICE_ERROR;\r
- goto Exit;\r
- }\r
- \r
- CopyMem (&Data32, (BufferOut + 2), sizeof (UINT32));\r
- TpmOutSize = SwapBytes32 (Data32);\r
- if (*SizeOut < TpmOutSize) {\r
- Status = EFI_BUFFER_TOO_SMALL;\r
- goto Exit;\r
- }\r
- *SizeOut = TpmOutSize;\r
- //\r
- // Continue reading the remaining data\r
- //\r
- while ( Index < TpmOutSize ) {\r
- for (; BurstCount > 0; BurstCount--) {\r
- *(BufferOut + Index) = MmioRead8 ((UINTN)&TisReg->DataFifo);\r
- Index++;\r
- if (Index == TpmOutSize) {\r
- Status = EFI_SUCCESS;\r
- goto Exit;\r
- }\r
- }\r
- Status = TisPcReadBurstCount (TisReg, &BurstCount);\r
- if (EFI_ERROR (Status)) {\r
- Status = EFI_TIMEOUT;\r
- goto Exit;\r
- }\r
- }\r
-Exit:\r
- MmioWrite8((UINTN)&TisReg->Status, TIS_PC_STS_READY);\r
- return Status;\r
-}\r
-\r
/** @file\r
Utility functions used by TPM PEI driver.\r
\r
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2016, 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
\r
#include "TpmComm.h"\r
\r
-/**\r
- Send a command to TPM for execution and return response data.\r
-\r
- @param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TisReg TPM register space base address. \r
- @param[in] BufferIn Buffer for command data. \r
- @param[in] SizeIn Size of command data. \r
- @param[in, out] BufferOut Buffer for response data. \r
- @param[in, out] SizeOut size of response data. \r
- \r
- @retval EFI_SUCCESS Operation completed successfully.\r
- @retval EFI_TIMEOUT The register can't run into the expected status in time.\r
- @retval EFI_BUFFER_TOO_SMALL Response data buffer is too small.\r
- @retval EFI_DEVICE_ERROR Unexpected device behavior.\r
-\r
-**/\r
-EFI_STATUS\r
-TisTpmCommand (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_PC_REGISTERS_PTR TisReg,\r
- IN UINT8 *BufferIn,\r
- IN UINT32 SizeIn,\r
- IN OUT UINT8 *BufferOut,\r
- IN OUT UINT32 *SizeOut\r
- );\r
-\r
/**\r
Send TPM_Startup command to TPM.\r
\r
@param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TpmHandle TPM handle. \r
- @param[in] BootMode Boot mode. \r
+ @param[in] BootMode Boot mode.\r
\r
@retval EFI_SUCCESS Operation completed successfully.\r
@retval EFI_TIMEOUT The register can't run into the expected status in time.\r
EFI_STATUS\r
TpmCommStartup (\r
IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle,\r
IN EFI_BOOT_MODE BootMode\r
)\r
{\r
SendBuffer.Hdr.paramSize = SwapBytes32 (TpmSendSize);\r
SendBuffer.Hdr.ordinal = SwapBytes32 (TPM_ORD_Startup);\r
SendBuffer.TpmSt = SwapBytes16 (TpmSt);\r
- Status = TisTpmCommand (PeiServices, TpmHandle, (UINT8 *)&SendBuffer, TpmSendSize, RecvBuffer, &TpmRecvSize);\r
+ Status = Tpm12SubmitCommand (TpmSendSize, (UINT8 *)&SendBuffer, &TpmRecvSize, RecvBuffer);\r
return Status;\r
}\r
\r
Send TPM_ContinueSelfTest command to TPM.\r
\r
@param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TpmHandle TPM handle. \r
- \r
+\r
@retval EFI_SUCCESS Operation completed successfully.\r
@retval EFI_TIMEOUT The register can't run into the expected status in time.\r
@retval EFI_BUFFER_TOO_SMALL Response data buffer is too small.\r
**/\r
EFI_STATUS\r
TpmCommContinueSelfTest (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle\r
+ IN EFI_PEI_SERVICES **PeiServices\r
)\r
{\r
EFI_STATUS Status;\r
SendBuffer.Hdr.tag = SwapBytes16 (TPM_TAG_RQU_COMMAND);\r
SendBuffer.Hdr.paramSize = SwapBytes32 (TpmSendSize); \r
SendBuffer.Hdr.ordinal = SwapBytes32 (TPM_ORD_ContinueSelfTest);\r
- Status = TisTpmCommand (PeiServices, TpmHandle, (UINT8 *)&SendBuffer, TpmSendSize, RecvBuffer, &TpmRecvSize);\r
+ Status = Tpm12SubmitCommand (TpmSendSize, (UINT8 *)&SendBuffer, &TpmRecvSize, RecvBuffer);\r
return Status;\r
}\r
\r
Get TPM capability flags.\r
\r
@param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TpmHandle TPM handle. \r
@param[out] Deactivated Returns deactivated flag.\r
@param[out] LifetimeLock Returns physicalPresenceLifetimeLock permanent flag. \r
@param[out] CmdEnable Returns physicalPresenceCMDEnable permanent flag.\r
- \r
+\r
@retval EFI_SUCCESS Operation completed successfully.\r
@retval EFI_TIMEOUT The register can't run into the expected status in time.\r
@retval EFI_BUFFER_TOO_SMALL Response data buffer is too small.\r
EFI_STATUS\r
TpmCommGetCapability (\r
IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle,\r
OUT BOOLEAN *Deactivated, OPTIONAL\r
OUT BOOLEAN *LifetimeLock, OPTIONAL\r
OUT BOOLEAN *CmdEnable OPTIONAL\r
SendBuffer.Capability = SwapBytes32 (TPM_CAP_FLAG);\r
SendBuffer.CapabilityFlagSize = SwapBytes32 (sizeof (TPM_CAP_FLAG_PERMANENT));\r
SendBuffer.CapabilityFlag = SwapBytes32 (TPM_CAP_FLAG_PERMANENT);\r
- Status = TisTpmCommand (PeiServices, TpmHandle, (UINT8 *)&SendBuffer, TpmSendSize, RecvBuffer, &TpmRecvSize);\r
+ Status = Tpm12SubmitCommand (TpmSendSize, (UINT8 *)&SendBuffer, &TpmRecvSize, RecvBuffer);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
Extend a TPM PCR.\r
\r
@param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TpmHandle TPM handle. \r
@param[in] DigestToExtend The 160 bit value representing the event to be recorded. \r
@param[in] PcrIndex The PCR to be updated.\r
@param[out] NewPcrValue New PCR value after extend. \r
- \r
+\r
@retval EFI_SUCCESS Operation completed successfully.\r
@retval EFI_TIMEOUT The register can't run into the expected status in time.\r
@retval EFI_BUFFER_TOO_SMALL Response data buffer is too small.\r
EFI_STATUS\r
TpmCommExtend (\r
IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle,\r
IN TPM_DIGEST *DigestToExtend,\r
IN TPM_PCRINDEX PcrIndex,\r
OUT TPM_DIGEST *NewPcrValue\r
SendBuffer.Hdr.ordinal = SwapBytes32 (TPM_ORD_Extend);\r
SendBuffer.PcrIndex = SwapBytes32 (PcrIndex);\r
CopyMem (&SendBuffer.TpmDigest, (UINT8 *)DigestToExtend, sizeof (TPM_DIGEST));\r
- Status = TisTpmCommand (PeiServices, TpmHandle, (UINT8 *)&SendBuffer, TpmSendSize, RecvBuffer, &TpmRecvSize);\r
+ Status = Tpm12SubmitCommand (TpmSendSize, (UINT8 *)&SendBuffer, &TpmRecvSize, RecvBuffer);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
Send TSC_PhysicalPresence command to TPM.\r
\r
@param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TpmHandle TPM handle. \r
@param[in] PhysicalPresence The state to set the TPMs Physical Presence flags. \r
- \r
+\r
@retval EFI_SUCCESS Operation completed successfully.\r
@retval EFI_TIMEOUT The register can't run into the expected status in time.\r
@retval EFI_BUFFER_TOO_SMALL Response data buffer is too small.\r
EFI_STATUS\r
TpmCommPhysicalPresence (\r
IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle,\r
IN TPM_PHYSICAL_PRESENCE PhysicalPresence\r
)\r
{\r
SendBuffer.Hdr.paramSize = SwapBytes32 (TpmSendSize);\r
SendBuffer.Hdr.ordinal = SwapBytes32 (TSC_ORD_PhysicalPresence);\r
SendBuffer.PhysicalPresence = SwapBytes16 (PhysicalPresence);\r
- Status = TisTpmCommand (PeiServices, TpmHandle, (UINT8 *)&SendBuffer, TpmSendSize, RecvBuffer, &TpmRecvSize);\r
+ Status = Tpm12SubmitCommand (TpmSendSize, (UINT8 *)&SendBuffer, &TpmRecvSize, RecvBuffer);\r
return Status;\r
}\r
+\r
+/**\r
+ Single function calculates SHA1 digest value for all raw data. It\r
+ combines Sha1Init(), Sha1Update() and Sha1Final().\r
+\r
+ @param[in] Data Raw data to be digested.\r
+ @param[in] DataLen Size of the raw data.\r
+ @param[out] Digest Pointer to a buffer that stores the final digest.\r
+\r
+ @retval EFI_SUCCESS Always successfully calculate the final digest.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+TpmCommHashAll (\r
+ IN CONST UINT8 *Data,\r
+ IN UINTN DataLen,\r
+ OUT TPM_DIGEST *Digest\r
+ )\r
+{\r
+ VOID *Sha1Ctx;\r
+ UINTN CtxSize;\r
+\r
+ CtxSize = Sha1GetContextSize ();\r
+ Sha1Ctx = AllocatePool (CtxSize);\r
+ ASSERT (Sha1Ctx != NULL);\r
+\r
+ Sha1Init (Sha1Ctx);\r
+ Sha1Update (Sha1Ctx, Data, DataLen);\r
+ Sha1Final (Sha1Ctx, (UINT8 *)Digest);\r
+\r
+ FreePool (Sha1Ctx);\r
+\r
+ return EFI_SUCCESS;\r
+}\r
/** @file\r
The header file for TPM PEI driver.\r
\r
-Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2016, 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
\r
#include <IndustryStandard/Tpm12.h>\r
#include <IndustryStandard/UefiTcgPlatform.h>\r
-#include <Library/TpmCommLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/BaseCryptLib.h>\r
+#include <Library/Tpm12DeviceLib.h>\r
#include <Library/DebugLib.h>\r
#include <Library/BaseLib.h>\r
#include <Library/BaseMemoryLib.h>\r
Send TPM_Startup command to TPM.\r
\r
@param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TpmHandle TPM handle. \r
@param[in] BootMode Boot mode. \r
- \r
+\r
@retval EFI_SUCCESS Operation completed successfully.\r
@retval EFI_TIMEOUT The register can't run into the expected status in time.\r
@retval EFI_BUFFER_TOO_SMALL Response data buffer is too small.\r
EFI_STATUS\r
TpmCommStartup (\r
IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle,\r
IN EFI_BOOT_MODE BootMode\r
);\r
\r
Send TPM_ContinueSelfTest command to TPM.\r
\r
@param[in] PeiServices Describes the list of possible PEI Services.\r
- @param[in] TpmHandle TPM handle. \r
- \r
+\r
@retval EFI_SUCCESS Operation completed successfully.\r
@retval EFI_TIMEOUT The register can't run into the expected status in time.\r
@retval EFI_BUFFER_TOO_SMALL Response data buffer is too small.\r
**/\r
EFI_STATUS\r
TpmCommContinueSelfTest (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle\r
+ IN EFI_PEI_SERVICES **PeiServices\r
);\r
\r
/**\r
EFI_STATUS\r
TpmCommGetCapability (\r
IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle,\r
OUT BOOLEAN *Deactivated, OPTIONAL\r
OUT BOOLEAN *LifetimeLock, OPTIONAL\r
OUT BOOLEAN *CmdEnable OPTIONAL\r
EFI_STATUS\r
TpmCommExtend (\r
IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle,\r
IN TPM_DIGEST *DigestToExtend,\r
IN TPM_PCRINDEX PcrIndex,\r
OUT TPM_DIGEST *NewPcrValue\r
EFI_STATUS\r
TpmCommPhysicalPresence (\r
IN EFI_PEI_SERVICES **PeiServices,\r
- IN TIS_TPM_HANDLE TpmHandle,\r
IN TPM_PHYSICAL_PRESENCE PhysicalPresence\r
);\r
\r
+/**\r
+ Single function calculates SHA1 digest value for all raw data. It\r
+ combines Sha1Init(), Sha1Update() and Sha1Final().\r
+\r
+ @param[in] Data Raw data to be digested.\r
+ @param[in] DataLen Size of the raw data.\r
+ @param[out] Digest Pointer to a buffer that stores the final digest.\r
+\r
+ @retval EFI_SUCCESS Always successfully calculate the final digest.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+TpmCommHashAll (\r
+ IN CONST UINT8 *Data,\r
+ IN UINTN DataLen,\r
+ OUT TPM_DIGEST *Digest\r
+ );\r
+\r
#endif // _TPM_COMM_H_\r
projects / mirror_edk2.git / commitdiff