From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 7B59381D95 for ; Mon, 16 Jan 2017 01:18:38 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP; 16 Jan 2017 01:18:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,238,1477983600"; d="scan'208";a="923013695" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga003.jf.intel.com with ESMTP; 16 Jan 2017 01:18:38 -0800 Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 16 Jan 2017 01:18:37 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx120.amr.corp.intel.com (10.18.124.208) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 16 Jan 2017 01:18:37 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.20]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.204]) with mapi id 14.03.0248.002; Mon, 16 Jan 2017 17:18:33 +0800 From: "Wu, Jiaxin" To: Gary Lin CC: "edk2-devel@lists.01.org" , "Justen, Jordan L" , "Long, Qin" , Laszlo Ersek Thread-Topic: [edk2] [Patch] OvmfPkg: Remove the flag control for the CryptoPkg libraries Thread-Index: AQHSb7uDbglcqsleV0CCGDknJzAPOqE6OZkAgACZmyA= Date: Mon, 16 Jan 2017 09:18:32 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B727416293FFE@SHSMSX103.ccr.corp.intel.com> References: <1484545415-216816-1-git-send-email-jiaxin.wu@intel.com> <20170116080732.ff6cik66niw7mm75@GaryWorkstation> In-Reply-To: <20170116080732.ff6cik66niw7mm75@GaryWorkstation> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiODFlZTQ0ZTctYWIzOC00MWM5LWFmYTYtOWUyNWVjZjk1MDExIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6Ik9qY01rYmdlM1gxdUVKbGdJYXBLOHViMml5bVBhREkrcWpFSnBEZGZRVEE9In0= x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] OvmfPkg: Remove the flag control for the CryptoPkg libraries X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jan 2017 09:18:38 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable YES, you are right, I will remove it also. Thanks, Jiaxin > -----Original Message----- > From: Gary Lin [mailto:glin@suse.com] > Sent: Monday, January 16, 2017 4:08 PM > To: Wu, Jiaxin > Cc: edk2-devel@lists.01.org; Justen, Jordan L = ; Long, > Qin ; Laszlo Ersek > Subject: Re: [edk2] [Patch] OvmfPkg: Remove the flag control for the Cryp= toPkg > libraries >=20 > On Mon, Jan 16, 2017 at 01:43:35PM +0800, Jiaxin Wu wrote: > > This patch is to remove the 'SECURE_BOOT_ENABLE' flag control for > > the CryptoPkg librarie. > > > > Not only the secure boot feature requires the CryptoPkg libraries > > (e.g, OpensslLib, BaseCryptLib), but also ISCSI, IpSec and HTTPS/TLS > > features. Those modules can be always included since no build performan= ce > > impacts if they are not consumed. > > > We can also remove "SECURE_BOOT_ENABLE" flag from the "Network > support" > section. >=20 > Currently, when enabling NETWORK_IP6_ENABLE, there is a conditional > check to determine which ISCSI driver to be included: >=20 > !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > NetworkPkg/IScsiDxe/IScsiDxe.inf > !else > MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > !endif >=20 > In this case, "SECURE_BOOT_ENABLE" is used to detect if BaseCryptLib is > included or not. Since this patch makes BaseCryptLib always available, > we can directly use the NetworkPkg ISCSI driver now. >=20 > Thanks, >=20 > Gary Lin >=20 > > Cc: Laszlo Ersek > > Cc: Justen Jordan L > > Cc: Gary Lin > > Cc: Long Qin > > Contributed-under: TianoCore Contribution Agreement 1.0 > > Signed-off-by: Wu Jiaxin > > --- > > OvmfPkg/OvmfPkgIa32.dsc | 13 ++++++------- > > OvmfPkg/OvmfPkgIa32X64.dsc | 13 ++++++------- > > OvmfPkg/OvmfPkgX64.dsc | 13 ++++++------- > > 3 files changed, 18 insertions(+), 21 deletions(-) > > > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > > index e97f7f0..65eef22 100644 > > --- a/OvmfPkg/OvmfPkgIa32.dsc > > +++ b/OvmfPkg/OvmfPkgIa32.dsc > > @@ -1,9 +1,9 @@ > > ## @file > > # EFI/Framework Open Virtual Machine Firmware (OVMF) platform > > # > > -# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<= BR> > > +# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<= BR> > > # (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> > # > > # This program and the accompanying materials > > # are licensed and made available under the terms and conditions of t= he > BSD License > > # which accompanies this distribution. The full text of the license m= ay be > found at > > @@ -139,14 +139,15 @@ > > > > ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf > > > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf > > > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD > ebugPrintErrorLevelLib.inf > > > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > - > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > > + > > +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > + > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmM > easurementLib.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.= inf > > !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > !endif > > @@ -164,13 +165,11 @@ > > SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf > > > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib > /BaseOrderedCollectionRedBlackTreeLib.inf > > XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf > > > > [LibraryClasses.common] > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > -!endif > > > > [LibraryClasses.common.SEC] > > TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf > > QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf > > !ifdef $(DEBUG_ON_SERIAL_PORT) > > @@ -256,13 +255,13 @@ > > > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > > !else > > > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i > nf > > !endif > > UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > + > > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf > > -!endif > > + > > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > > > > [LibraryClasses.common.UEFI_DRIVER] > > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > > TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > > index 8e3e04c..00d3e1d 100644 > > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > > @@ -1,9 +1,9 @@ > > ## @file > > # EFI/Framework Open Virtual Machine Firmware (OVMF) platform > > # > > -# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<= BR> > > +# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<= BR> > > # (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> > # > > # This program and the accompanying materials > > # are licensed and made available under the terms and conditions of t= he > BSD License > > # which accompanies this distribution. The full text of the license m= ay be > found at > > @@ -144,14 +144,15 @@ > > > > ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf > > > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf > > > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD > ebugPrintErrorLevelLib.inf > > > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > - > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > > + > > +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > + > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmM > easurementLib.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.= inf > > !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > !endif > > @@ -169,13 +170,11 @@ > > SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf > > > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib > /BaseOrderedCollectionRedBlackTreeLib.inf > > XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf > > > > [LibraryClasses.common] > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > -!endif > > > > [LibraryClasses.common.SEC] > > TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf > > QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf > > !ifdef $(DEBUG_ON_SERIAL_PORT) > > @@ -261,13 +260,13 @@ > > > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > > !else > > > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i > nf > > !endif > > UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > + > > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf > > -!endif > > + > > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > > > > [LibraryClasses.common.UEFI_DRIVER] > > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > > TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > > index 6ec3fe0..472ca30 100644 > > --- a/OvmfPkg/OvmfPkgX64.dsc > > +++ b/OvmfPkg/OvmfPkgX64.dsc > > @@ -1,9 +1,9 @@ > > ## @file > > # EFI/Framework Open Virtual Machine Firmware (OVMF) platform > > # > > -# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<= BR> > > +# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<= BR> > > # (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> > # > > # This program and the accompanying materials > > # are licensed and made available under the terms and conditions of t= he > BSD License > > # which accompanies this distribution. The full text of the license m= ay be > found at > > @@ -144,14 +144,15 @@ > > > > ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf > > > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf > > > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD > ebugPrintErrorLevelLib.inf > > > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > - > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > > + > > +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > + > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmM > easurementLib.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.= inf > > !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > !endif > > @@ -169,13 +170,11 @@ > > SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf > > > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib > /BaseOrderedCollectionRedBlackTreeLib.inf > > XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf > > > > [LibraryClasses.common] > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > -!endif > > > > [LibraryClasses.common.SEC] > > TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf > > QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf > > !ifdef $(DEBUG_ON_SERIAL_PORT) > > @@ -261,13 +260,13 @@ > > > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > > !else > > > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i > nf > > !endif > > UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > + > > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf > > -!endif > > + > > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > > > > [LibraryClasses.common.UEFI_DRIVER] > > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > > TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > > -- > > 1.9.5.msysgit.1 > > > > _______________________________________________ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel > >