From nobody Mon Dec 23 05:46:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1521099349911277.3382144137904; Thu, 15 Mar 2018 00:35:49 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D511F2257C2B1; Thu, 15 Mar 2018 00:29:23 -0700 (PDT) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (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 2E162220C2A5B for ; Thu, 15 Mar 2018 00:29:21 -0700 (PDT) Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Mar 2018 00:35:44 -0700 Received: from czhan46-mobl1.ccr.corp.intel.com ([10.239.192.117]) by orsmga007.jf.intel.com with ESMTP; 15 Mar 2018 00:35:43 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.126; helo=mga18.intel.com; envelope-from=chao.b.zhang@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,308,1517904000"; d="scan'208";a="24860114" From: "Zhang, Chao B" To: edk2-devel@lists.01.org Date: Thu, 15 Mar 2018 15:35:25 +0800 Message-Id: <20180315073537.16692-4-chao.b.zhang@intel.com> X-Mailer: git-send-email 2.11.0.windows.1 In-Reply-To: <20180315073537.16692-1-chao.b.zhang@intel.com> References: <20180315073537.16692-1-chao.b.zhang@intel.com> Subject: [edk2] [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: , Cc: Jiewen Yao , Chao B Zhang , David Wei MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Guo Mang --- 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/DxeTcg2Physi= calPresenceLibNull.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.
This program and the accompanying materials=20 @@ -20,7 +20,7 @@ WITHOUT WARRANTIES 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 @@ TrEEExecutePhysicalPresence ( @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=20 @@ -167,7 +167,7 @@ TrEEUserConfirm ( =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 -TrEEPhysicalPresenceLibProcessRequest ( +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/DxeTcg2Physi= calPresenceLibNull.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 --=20 2.16.2.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel