From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 C472D81D88 for ; Sun, 15 Jan 2017 21:44:52 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP; 15 Jan 2017 21:44:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,237,1477983600"; d="scan'208";a="1113234149" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2017 21:44:52 -0800 Received: from fmsmsx115.amr.corp.intel.com (10.18.116.19) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 15 Jan 2017 21:44:52 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx115.amr.corp.intel.com (10.18.116.19) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 15 Jan 2017 21:44:51 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.20]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.132]) with mapi id 14.03.0248.002; Mon, 16 Jan 2017 13:44:49 +0800 From: "Wu, Jiaxin" To: Gary Lin , "edk2-devel@lists.01.org" CC: "Justen, Jordan L" , Laszlo Ersek , "Long, Qin" Thread-Topic: [edk2] [PATCH] OvmfPkg: Enable HTTPS for Ovmf Thread-Index: AQHSb66fEusTISOjy0C6eN1ivRZeEKE6kAFA Date: Mon, 16 Jan 2017 05:44:49 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B727416293E11@SHSMSX103.ccr.corp.intel.com> References: <20170116041013.31545-1-glin@suse.com> In-Reply-To: <20170116041013.31545-1-glin@suse.com> Accept-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYTNmNTlmZDktZjk0Yi00YzQ2LWE5MDEtMzI5MGQ5YjkyNmUwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX1BVQkxJQyJ9XX1dfSwiU3ViamVjdExhYmVscyI6W10sIlRNQ1ZlcnNpb24iOiIxNS45LjYuNiIsIlRydXN0ZWRMYWJlbEhhc2giOiI1UFcwcmxtdFdaOHYyUEZidHIzbXU1YnNXdWxEQkVrZVVrTEtNUEk5QnRRPSJ9 x-ctpclassification: CTP_PUBLIC x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] OvmfPkg: Enable HTTPS for Ovmf 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 05:44:52 -0000 X-Groupsio-MsgNum: 6637 Content-Language: en-US Content-Type: multipart/mixed; boundary="_002_895558F6EA4E3B41AC93A00D163B727416293E11SHSMSX103ccrcor_" --_002_895558F6EA4E3B41AC93A00D163B727416293E11SHSMSX103ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Gary, Before we enable the HTTPS/TLS for OVMF, We need remove the 'SECURE_BOOT_EN= ABLE' flag control for the CryptoPkg librarie. Not only the secure boot fea= ture requires the CryptoPkg libraries (e.g, OpensslLib, BaseCryptLib), but = also ISCSI, IpSec and HTTPS/TLS features. If we not remove that dependency,= we must set both SECURE_BOOT_ENABLE and TLS_ENABLE to support TLS feature.= That's unreasonable. Attached patch is to remove the flag control for the CryptoPkg libraries. I= suggest to wait that patch commit, then go ahead to enable the HTTPS for O= VMF. Thanks, Jiaxin > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ga= ry > Lin > Sent: Monday, January 16, 2017 12:10 PM > To: edk2-devel@lists.01.org > Cc: Justen, Jordan L ; Wu, Jiaxin > ; Laszlo Ersek > Subject: [edk2] [PATCH] OvmfPkg: Enable HTTPS for Ovmf >=20 > This commit introduces a new build option to OvmfPkg: TLS_ENABLE. > When setting the option, the TLS drivers will be included to support > HTTPS. >=20 > NOTE: HTTP_BOOT_ENABLE is needed to enable HTTPS support since it's > pointless to enable TLS alone. >=20 > Cc: Laszlo Ersek > Cc: Jordan Justen > Cc: Jiaxin Wu > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Gary Lin > --- > OvmfPkg/OvmfPkgIa32.dsc | 8 ++++++++ > OvmfPkg/OvmfPkgIa32.fdf | 4 ++++ > OvmfPkg/OvmfPkgIa32X64.dsc | 8 ++++++++ > OvmfPkg/OvmfPkgIa32X64.fdf | 4 ++++ > OvmfPkg/OvmfPkgX64.dsc | 8 ++++++++ > OvmfPkg/OvmfPkgX64.fdf | 4 ++++ > 6 files changed, 36 insertions(+) >=20 > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index e97f7f0262..363f143c68 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -38,6 +38,7 @@ [Defines] > DEFINE NETWORK_IP6_ENABLE =3D FALSE > DEFINE HTTP_BOOT_ENABLE =3D FALSE > DEFINE SMM_REQUIRE =3D FALSE > + DEFINE TLS_ENABLE =3D FALSE >=20 > [BuildOptions] > GCC:*_UNIXGCC_*_CC_FLAGS =3D -DMDEPKG_NDEBUG > @@ -158,6 +159,9 @@ [LibraryClasses] >=20 > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > +!if $(TLS_ENABLE) =3D=3D TRUE > + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > +!endif > !endif >=20 >=20 > S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScrip > tLib.inf > @@ -715,6 +719,10 @@ [Components] > NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > NetworkPkg/HttpDxe/HttpDxe.inf > NetworkPkg/HttpBootDxe/HttpBootDxe.inf > +!if $(TLS_ENABLE) =3D=3D TRUE > + NetworkPkg/TlsDxe/TlsDxe.inf > + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > !endif > OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index 34d57a6079..30c8800932 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -329,6 +329,10 @@ [FV.DXEFV] > INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > INF NetworkPkg/HttpDxe/HttpDxe.inf > INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf > +!if $(TLS_ENABLE) =3D=3D TRUE > + INF NetworkPkg/TlsDxe/TlsDxe.inf > + INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > !endif > INF OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 8e3e04c135..f22bad309a 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -38,6 +38,7 @@ [Defines] > DEFINE NETWORK_IP6_ENABLE =3D FALSE > DEFINE HTTP_BOOT_ENABLE =3D FALSE > DEFINE SMM_REQUIRE =3D FALSE > + DEFINE TLS_ENABLE =3D FALSE >=20 > [BuildOptions] > GCC:*_UNIXGCC_*_CC_FLAGS =3D -DMDEPKG_NDEBUG > @@ -163,6 +164,9 @@ [LibraryClasses] >=20 > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > +!if $(TLS_ENABLE) =3D=3D TRUE > + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > +!endif > !endif >=20 >=20 > S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScrip > tLib.inf > @@ -724,6 +728,10 @@ [Components.X64] > NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > NetworkPkg/HttpDxe/HttpDxe.inf > NetworkPkg/HttpBootDxe/HttpBootDxe.inf > +!if $(TLS_ENABLE) =3D=3D TRUE > + NetworkPkg/TlsDxe/TlsDxe.inf > + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > !endif > OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index df55c2b210..7bc31d42ba 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -329,6 +329,10 @@ [FV.DXEFV] > INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > INF NetworkPkg/HttpDxe/HttpDxe.inf > INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf > +!if $(TLS_ENABLE) =3D=3D TRUE > + INF NetworkPkg/TlsDxe/TlsDxe.inf > + INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > !endif > INF OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index 6ec3fe050d..8eca6fd557 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -38,6 +38,7 @@ [Defines] > DEFINE NETWORK_IP6_ENABLE =3D FALSE > DEFINE HTTP_BOOT_ENABLE =3D FALSE > DEFINE SMM_REQUIRE =3D FALSE > + DEFINE TLS_ENABLE =3D FALSE >=20 > [BuildOptions] > GCC:*_UNIXGCC_*_CC_FLAGS =3D -DMDEPKG_NDEBUG > @@ -163,6 +164,9 @@ [LibraryClasses] >=20 > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > +!if $(TLS_ENABLE) =3D=3D TRUE > + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > +!endif > !endif >=20 >=20 > S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScrip > tLib.inf > @@ -722,6 +726,10 @@ [Components] > NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > NetworkPkg/HttpDxe/HttpDxe.inf > NetworkPkg/HttpBootDxe/HttpBootDxe.inf > +!if $(TLS_ENABLE) =3D=3D TRUE > + NetworkPkg/TlsDxe/TlsDxe.inf > + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > !endif > OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index 5e2e1dfaf5..cb7ca131e8 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -329,6 +329,10 @@ [FV.DXEFV] > INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > INF NetworkPkg/HttpDxe/HttpDxe.inf > INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf > +!if $(TLS_ENABLE) =3D=3D TRUE > + INF NetworkPkg/TlsDxe/TlsDxe.inf > + INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > !endif > INF OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > -- > 2.11.0 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel --_002_895558F6EA4E3B41AC93A00D163B727416293E11SHSMSX103ccrcor_ Content-Type: message/rfc822 Content-Disposition: attachment; creation-date="Mon, 16 Jan 2017 05:44:48 GMT"; modification-date="Mon, 16 Jan 2017 05:44:48 GMT" Received: from fmsmsx107.amr.corp.intel.com (10.18.124.205) by shsmsx102.ccr.corp.intel.com (10.239.4.154) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 16 Jan 2017 13:43:49 +0800 Received: from orsmga005.jf.intel.com (10.7.209.41) by FMSMSX107-1.cps.intel.com (10.18.124.205) with Microsoft SMTP Server id 14.3.248.2; Sun, 15 Jan 2017 21:43:47 -0800 Received: from fmsmga102.fm.intel.com ([10.1.193.69]) by orsmga005-1.jf.intel.com with ESMTP; 15 Jan 2017 21:43:45 -0800 Received: from ml01.01.org ([198.145.21.10]) by mga11.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Jan 2017 21:43:44 -0800 Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D14CF81D89; Sun, 15 Jan 2017 21:43:42 -0800 (PST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 6EEFB81D86 for ; Sun, 15 Jan 2017 21:43:41 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 15 Jan 2017 21:43:41 -0800 Received: from jiaxinwu-mobl2.ccr.corp.intel.com ([10.239.196.147]) by fmsmga001.fm.intel.com with ESMTP; 15 Jan 2017 21:43:37 -0800 From: "Wu, Jiaxin" To: "edk2-devel@lists.01.org" CC: "Justen, Jordan L" , "Long, Qin" , Laszlo Ersek , "Wu, Jiaxin" , Gary Lin Subject: [edk2] [Patch] OvmfPkg: Remove the flag control for the CryptoPkg libraries Thread-Topic: [edk2] [Patch] OvmfPkg: Remove the flag control for the CryptoPkg libraries Thread-Index: AQHSb7uDbglcqsleV0CCGDknJzAPOg== Sender: edk2-devel Date: Mon, 16 Jan 2017 05:43:35 +0000 Message-ID: <1484545415-216816-1-git-send-email-jiaxin.wu@intel.com> List-Help: List-Subscribe: , List-Unsubscribe: , Content-Language: en-US X-MS-Exchange-Organization-AuthSource: fmsmsx107.amr.corp.intel.com X-MS-Has-Attach: X-Auto-Response-Suppress: All X-MS-TNEF-Correlator: Content-Type: text/plain; charset="us-ascii" Content-ID: <4B16D3EB6D9DE246A6860EE0371EBE2D@intel.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 performance impacts if they are not consumed. 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.
+# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
# (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 the B= SD License # which accompanies this distribution. The full text of the license may b= e found at @@ -139,14 +139,15 @@ ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.in= f DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.in= f IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE + PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.in= f TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.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.in= f !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.
+# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
# (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 the B= SD License # which accompanies this distribution. The full text of the license may b= e found at @@ -144,14 +144,15 @@ ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.in= f DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.in= f IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE + PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.in= f TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.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.in= f !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.
+# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
# (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 the B= SD License # which accompanies this distribution. The full text of the license may b= e found at @@ -144,14 +144,15 @@ ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.in= f DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.in= f IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE + PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.in= f TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.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.in= f !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 --_002_895558F6EA4E3B41AC93A00D163B727416293E11SHSMSX103ccrcor_--