From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=mang.guo@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id F144F2253FB5B for ; Thu, 15 Mar 2018 20:15:32 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Mar 2018 20:21:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,313,1517904000"; d="scan'208";a="34307916" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by FMSMGA003.fm.intel.com with ESMTP; 15 Mar 2018 20:21:57 -0700 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 15 Mar 2018 20:21:57 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 15 Mar 2018 20:21:56 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.235]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.226]) with mapi id 14.03.0319.002; Fri, 16 Mar 2018 11:21:55 +0800 From: "Guo, Mang" To: "Zhang, Chao B" , "edk2-devel@lists.01.org" CC: "Yao, Jiewen" , "Wei, David" , "Guo, Mang" Thread-Topic: [PATCH 03/15] Vlv2TbltDevicePkg/Tcg2PhysicalPresenceLib: use Tcg2 instead of TrEE. Thread-Index: AQHTvDBG8GKwT5Jo6kCVI3x0V5S11aPSMsPw Date: Fri, 16 Mar 2018 03:21:54 +0000 Message-ID: <22D2C85ED001C54AA20BFE3B0E4751D1525CA71F@SHSMSX103.ccr.corp.intel.com> References: <20180315073537.16692-1-chao.b.zhang@intel.com> <20180315073537.16692-4-chao.b.zhang@intel.com> In-Reply-To: <20180315073537.16692-4-chao.b.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 03/15] Vlv2TbltDevicePkg/Tcg2PhysicalPresenceLib: use Tcg2 instead of TrEE. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 03:15:33 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Guo Mang -----Original Message----- From: Zhang, Chao B=20 Sent: Thursday, March 15, 2018 3:35 PM To: edk2-devel@lists.01.org Cc: Yao, Jiewen; Wei, David; Guo, Mang; Zhang, Chao B Subject: [PATCH 03/15] Vlv2TbltDevicePkg/Tcg2PhysicalPresenceLib: use Tcg2 = instead of TrEE. From: Jiewen Yao TrEE is deprecated. We need use Tcg2. Cc: David Wei Cc: Mang Guo Cc: Chao B Zhang Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jiewen Yao --- Vlv2TbltDevicePkg/Library/{DxeTrEEPhysicalPresenceLibNull/DxeTrEEPhysicalP= resenceLibNull.c =3D> DxeTcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenc= eLibNull.c} | 28 ++++++++++---------- Vlv2TbltDevicePkg/Library/{DxeTrEEPhysicalPresenceLibNull/DxeTrEEPhysicalP= resenceLibNull.inf =3D> DxeTcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPrese= nceLibNull.inf} | 8 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Vlv2TbltDevicePkg/Library/DxeTrEEPhysicalPresenceLibNull/DxeTr= EEPhysicalPresenceLibNull.c b/Vlv2TbltDevicePkg/Library/DxeTcg2PhysicalPres= enceLibNull/DxeTcg2PhysicalPresenceLibNull.c similarity index 90% rename from Vlv2TbltDevicePkg/Library/DxeTrEEPhysicalPresenceLibNull/DxeTrE= EPhysicalPresenceLibNull.c rename to Vlv2TbltDevicePkg/Library/DxeTcg2PhysicalPresenceLibNull/DxeTcg2P= hysicalPresenceLibNull.c index 9aebf528fb..96fad05527 100644 --- a/Vlv2TbltDevicePkg/Library/DxeTrEEPhysicalPresenceLibNull/DxeTrEEPhysi= calPresenceLibNull.c +++ b/Vlv2TbltDevicePkg/Library/DxeTcg2PhysicalPresenceLibNull/DxeTcg2Ph +++ ysicalPresenceLibNull.c @@ -5,7 +5,7 @@ This driver will have external input - variable. This external input must be validated carefully to avoid security issue. =20 - TrEEExecutePendingTpmRequest() will receive untrusted input and do valid= ation. + Tcg2ExecutePendingTpmRequest() will receive untrusted input and do valid= ation. =20 Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.
Th= is program and the accompanying materials @@ -20,7 +20,7 @@ WITHOUT WARRANT= IES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. =20 #include =20 -#include +#include #include #include #include @@ -32,9 +32,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. #include #include #include -#include +#include #include -#include +#include =20 =20 /** @@ -47,7 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. =20 **/ CHAR16 * -TrEEPhysicalPresenceGetStringById ( +Tcg2PhysicalPresenceGetStringById ( IN EFI_STRING_ID Id ) { @@ -87,7 +87,7 @@ TpmCommandClear ( @retval Others Return code from the TP= M device after command execution. **/ UINT32 -TrEEExecutePhysicalPresence ( +Tcg2ExecutePhysicalPresence ( IN TPM2B_AUTH *PlatformAuth, OPTIONAL IN UINT32 CommandCode, IN OUT EFI_TREE_PHYSICAL_PRESENCE_FLAGS *PpiFlags @@ -107,7 +107,7 @@ T= rEEExecutePhysicalPresence ( @retval FALSE User discarded the changes. **/ BOOLEAN -TrEEReadUserKey ( +Tcg2ReadUserKey ( IN BOOLEAN CautionKey ) { @@ -127,7 +127,7 @@ TrEEReadUserKey ( **/ EFI_STATUS EFIAPI -TrEEPhysicalPresenceLibConstructor ( +Tcg2PhysicalPresenceLibConstructor ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable ) @@ -144,7 +144,7 @@ TrEEPhysicalPresenceLibConstructor ( @retval FALSE The user doesn't confirm the changes. **/ BOOLEAN -TrEEUserConfirm ( +Tcg2UserConfirm ( IN UINT32 TpmPpCommand ) { @@ -155,7 +155,7 @@ TrEEUserConfirm ( Check if there is a valid physical presence command request. Also update= s parameter value=20 to whether the requested physical presence command already confirmed by = user =20 - @param[in] TcgPpData EFI TrEE Physical Presence reques= t data.=20 + @param[in] TcgPpData EFI Tcg2 Physical Presence reques= t data.=20 @param[in] Flags The physical presence interface f= lags. @param[out] RequestConfirmed If the physical presence operat= ion command required user confirm from UI. True, it indicates the comman= d doesn't require user confirm, or already confirmed @@ -167,7 +167,7 @@ Tr= EEUserConfirm ( =20 **/ BOOLEAN -TrEEHaveValidTpmRequest ( +Tcg2HaveValidTpmRequest ( IN EFI_TREE_PHYSICAL_PRESENCE *TcgPpData, IN EFI_TREE_PHYSICAL_PRESENCE_FLAGS Flags, OUT BOOLEAN *RequestConfirmed @@ -189,7 +189,7 @@ TrEEHaveValidTpmRequest ( @param[in] Flags The physical presence interface flags. **/ VOID -TrEEExecutePendingTpmRequest ( +Tcg2ExecutePendingTpmRequest ( IN TPM2B_AUTH *PlatformAuth, OPTIONAL IN EFI_TREE_PHYSICAL_PRESENCE *TcgPpData, IN EFI_TREE_PHYSICAL_PRESENCE_FLAGS Flags @@ -213,7 +213,7 @@ TrEEExecutePendingTpmRequest ( **/ VOID EFIAPI -TrEE= PhysicalPresenceLibProcessRequest ( +Tcg2PhysicalPresenceLibProcessRequest ( IN TPM2B_AUTH *PlatformAuth OPTIONAL ) { @@ -232,7 +232,7 @@ TrEEPhysicalPresenceLibProcessRequest ( **/ BOOLEAN = EFIAPI -TrEEPhysicalPresenceLibNeedUserConfirm( +Tcg2PhysicalPresenceLibNeedUserConfirm( VOID ) { diff --git a/Vlv2TbltDevicePkg/Library/DxeTrEEPhysicalPresenceLibNull/DxeTr= EEPhysicalPresenceLibNull.inf b/Vlv2TbltDevicePkg/Library/DxeTcg2PhysicalPr= esenceLibNull/DxeTcg2PhysicalPresenceLibNull.inf similarity index 84% rename from Vlv2TbltDevicePkg/Library/DxeTrEEPhysicalPresenceLibNull/DxeTrE= EPhysicalPresenceLibNull.inf rename to Vlv2TbltDevicePkg/Library/DxeTcg2PhysicalPresenceLibNull/DxeTcg2P= hysicalPresenceLibNull.inf index 64c17c63d1..b67fd13893 100644 --- a/Vlv2TbltDevicePkg/Library/DxeTrEEPhysicalPresenceLibNull/DxeTrEEPhysi= calPresenceLibNull.inf +++ b/Vlv2TbltDevicePkg/Library/DxeTcg2PhysicalPresenceLibNull/DxeTcg2Ph +++ ysicalPresenceLibNull.inf @@ -1,5 +1,5 @@ ## @file -# Null instance of DxeTrEEPhysicalPresenceLib +# Null instance of DxeTcg2PhysicalPresenceLib # # Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
# = =20 @@ -16,11 +16,11 @@ =20 [Defines] INF_VERSION =3D 0x00010005 - BASE_NAME =3D DxeTrEEPhysicalPresenceLib + BASE_NAME =3D DxeTcg2PhysicalPresenceLib FILE_GUID =3D B41B3DB3-ACC5-4fcd-9992-891F3F9C0DA5 MODULE_TYPE =3D DXE_DRIVER VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D TrEEPhysicalPresenceLib|DXE_DRIVER DX= E_RUNTIME_DRIVER DXE_SAL_DRIVER UEFI_APPLICATION UEFI_DRIVER=20 + LIBRARY_CLASS =3D Tcg2PhysicalPresenceLib|DXE_DRIVER DX= E_RUNTIME_DRIVER DXE_SAL_DRIVER UEFI_APPLICATION UEFI_DRIVER=20 =20 # # The following information is for reference only and not required by the = build tools. @@ -29,7 +29,7 @@ # =20 [Sources] - DxeTrEEPhysicalPresenceLibNull.c + DxeTcg2PhysicalPresenceLibNull.c =20 [Packages] MdePkg/MdePkg.dec -- 2.16.2.windows.1