tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-26 07:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

SecurityPkg: Add Tpm2 prefix to lib to avoid conflict.

Browse Source 
Tpm2Ptp.c is library, but it miss Tpm2 prefix for
IsPtpPresence() and GetPtpInterface(). There might
be risk as name symbol conflict. This patch adds Tpm2
prefix for them.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <Jiewen.Yao@intel.com>
Reviewed-by: "Zhang, Chao B" <chao.b.zhang@intel.com>
Tested-by: "Wu, Hao A" <hao.a.wu@intel.com>
This commit is contained in:
Jiewen Yao 2016-03-08 20:47:15 -08:00 committed by Hao Wu
parent 6d7c4a25b7
commit 0e47ac1535
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
PTP (Platform TPM Profile) CRB (Command Response Buffer) interface used by dTPM2.0 library. PTP (Platform TPM Profile) CRB (Command Response Buffer) interface used by dTPM2.0 library.
Copyright (c) 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -52,7 +52,7 @@ typedef enum {
@retval FALSE TPM PTP is not found. @retval FALSE TPM PTP is not found.
**/ **/
BOOLEAN BOOLEAN
IsPtpPresence ( Tpm2IsPtpPresence (
IN VOID *Reg IN VOID *Reg
) )
{ {
@ -117,7 +117,7 @@ PtpCrbRequestUseTpm (
{ {
EFI_STATUS Status; EFI_STATUS Status;
if (!IsPtpPresence (CrbReg)) { if (!Tpm2IsPtpPresence (CrbReg)) {
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
@ -353,14 +353,14 @@ TisPcRequestUseTpm (
@return PTP interface type. @return PTP interface type.
**/ **/
PTP_INTERFACE_TYPE PTP_INTERFACE_TYPE
GetPtpInterface ( Tpm2GetPtpInterface (
IN VOID *Register IN VOID *Register
) )
{ {
PTP_CRB_INTERFACE_IDENTIFIER InterfaceId; PTP_CRB_INTERFACE_IDENTIFIER InterfaceId;
PTP_FIFO_INTERFACE_CAPABILITY InterfaceCapability; PTP_FIFO_INTERFACE_CAPABILITY InterfaceCapability;
if (!IsPtpPresence (Register)) { if (!Tpm2IsPtpPresence (Register)) {
return PtpInterfaceMax; return PtpInterfaceMax;
} }
// //
@ -401,7 +401,7 @@ DumpPtpInfo (
UINT8 Rid; UINT8 Rid;
PTP_INTERFACE_TYPE PtpInterface; PTP_INTERFACE_TYPE PtpInterface;
if (!IsPtpPresence (Register)) { if (!Tpm2IsPtpPresence (Register)) {
return ; return ;
} }
@ -440,7 +440,7 @@ DumpPtpInfo (
Vid = 0xFFFF; Vid = 0xFFFF;
Did = 0xFFFF; Did = 0xFFFF;
Rid = 0xFF; Rid = 0xFF;
PtpInterface = GetPtpInterface (Register); PtpInterface = Tpm2GetPtpInterface (Register);
DEBUG ((EFI_D_INFO, "PtpInterface - %x\n", PtpInterface)); DEBUG ((EFI_D_INFO, "PtpInterface - %x\n", PtpInterface));
switch (PtpInterface) { switch (PtpInterface) {
case PtpInterfaceCrb: case PtpInterfaceCrb:
@ -485,7 +485,7 @@ DTpm2SubmitCommand (
{ {
PTP_INTERFACE_TYPE PtpInterface; PTP_INTERFACE_TYPE PtpInterface;
PtpInterface = GetPtpInterface ((VOID *) (UINTN) PcdGet64 (PcdTpmBaseAddress)); PtpInterface = Tpm2GetPtpInterface ((VOID *) (UINTN) PcdGet64 (PcdTpmBaseAddress));
switch (PtpInterface) { switch (PtpInterface) {
case PtpInterfaceCrb: case PtpInterfaceCrb:
return PtpCrbTpmCommand ( return PtpCrbTpmCommand (
@ -524,7 +524,7 @@ DTpm2RequestUseTpm (
{ {
PTP_INTERFACE_TYPE PtpInterface; PTP_INTERFACE_TYPE PtpInterface;
PtpInterface = GetPtpInterface ((VOID *) (UINTN) PcdGet64 (PcdTpmBaseAddress)); PtpInterface = Tpm2GetPtpInterface ((VOID *) (UINTN) PcdGet64 (PcdTpmBaseAddress));
switch (PtpInterface) { switch (PtpInterface) {
case PtpInterfaceCrb: case PtpInterfaceCrb:
return PtpCrbRequestUseTpm ((PTP_CRB_REGISTERS_PTR) (UINTN) PcdGet64 (PcdTpmBaseAddress)); return PtpCrbRequestUseTpm ((PTP_CRB_REGISTERS_PTR) (UINTN) PcdGet64 (PcdTpmBaseAddress));