From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 50C6A81787 for ; Tue, 17 Jan 2017 00:04:26 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 17 Jan 2017 00:04:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,243,1477983600"; d="scan'208";a="1083887377" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga001.jf.intel.com with ESMTP; 17 Jan 2017 00:04:26 -0800 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 17 Jan 2017 00:04:26 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 17 Jan 2017 00:04:25 -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; Tue, 17 Jan 2017 16:04:23 +0800 From: "Wu, Jiaxin" To: Gary Lin , "edk2-devel@lists.01.org" CC: Laszlo Ersek , "Justen, Jordan L" , "Long, Qin" Thread-Topic: [PATCH 3/3] OvmfPkg: pull in TLS modules with -D TLS_ENABLE (also enabling HTTPS) Thread-Index: AQHScH2VKvpW2sm060Snyrg7pdyPYqE8T50w Date: Tue, 17 Jan 2017 08:04:23 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B7274162946AE@SHSMSX103.ccr.corp.intel.com> References: <20170117045232.4765-1-glin@suse.com> <20170117045232.4765-4-glin@suse.com> In-Reply-To: <20170117045232.4765-4-glin@suse.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTUwNDA5MTItYjc5ZC00OGFlLWE0OWEtNzU1YzNmOWEyMGE0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IjNndWlyZ2hmWjYyQ1JueUR4Mm9HUncrWEtoVVVmZnpkU3c1TE5XU2xhVm89In0= x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 3/3] OvmfPkg: pull in TLS modules with -D TLS_ENABLE (also enabling HTTPS) 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: Tue, 17 Jan 2017 08:04:26 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Wu Jiaxin > -----Original Message----- > From: Gary Lin [mailto:glin@suse.com] > Sent: Tuesday, January 17, 2017 12:53 PM > To: edk2-devel@lists.01.org > Cc: Laszlo Ersek ; Justen, Jordan L > ; Wu, Jiaxin ; Long, Qin > > Subject: [PATCH 3/3] OvmfPkg: pull in TLS modules with -D TLS_ENABLE (als= o > enabling HTTPS) >=20 > This commit introduces a new build option, TLS_ENABLE, to pull in the > TLS-related modules. If HTTP_BOOT_ENABLE and TLS_ENABLE are enabled at > the same time, the HTTP driver locates the TLS protocols automatically > and thus HTTPS is enabled. >=20 > To build OVMF with HTTP Boot: >=20 > $ ./build.sh -D HTTP_BOOT_ENABLE >=20 > To build OVMF with HTTPS Boot: >=20 > $ ./build.sh -D HTTP_BOOT_ENABLE -D TLS_ENABLE >=20 > Cc: Laszlo Ersek > Cc: Justen Jordan L > Cc: Wu Jiaxin > Cc: Long Qin > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Gary Lin > --- > OvmfPkg/OvmfPkgIa32.dsc | 9 +++++++++ > OvmfPkg/OvmfPkgIa32.fdf | 4 ++++ > OvmfPkg/OvmfPkgIa32X64.dsc | 9 +++++++++ > OvmfPkg/OvmfPkgIa32X64.fdf | 4 ++++ > OvmfPkg/OvmfPkgX64.dsc | 9 +++++++++ > OvmfPkg/OvmfPkgX64.fdf | 4 ++++ > 6 files changed, 39 insertions(+) >=20 > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 77287920e2..e060602587 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 > @@ -162,6 +163,10 @@ [LibraryClasses] > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > !endif >=20 > +!if $(TLS_ENABLE) =3D=3D TRUE > + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > +!endif > + >=20 > S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScrip > tLib.inf > SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf >=20 > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib > /BaseOrderedCollectionRedBlackTreeLib.inf > @@ -710,6 +715,10 @@ [Components] > NetworkPkg/HttpDxe/HttpDxe.inf > NetworkPkg/HttpBootDxe/HttpBootDxe.inf > !endif > +!if $(TLS_ENABLE) =3D=3D TRUE > + NetworkPkg/TlsDxe/TlsDxe.inf > + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > # > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index 069e21b7d0..09c165882c 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -326,6 +326,10 @@ [FV.DXEFV] > INF NetworkPkg/HttpDxe/HttpDxe.inf > INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf > !endif > +!if $(TLS_ENABLE) =3D=3D TRUE > + INF NetworkPkg/TlsDxe/TlsDxe.inf > + INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > INF OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > # > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 64a7c16d2f..0e24e7a5bc 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 > @@ -167,6 +168,10 @@ [LibraryClasses] > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > !endif >=20 > +!if $(TLS_ENABLE) =3D=3D TRUE > + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > +!endif > + >=20 > S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScrip > tLib.inf > SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf >=20 > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib > /BaseOrderedCollectionRedBlackTreeLib.inf > @@ -719,6 +724,10 @@ [Components.X64] > NetworkPkg/HttpDxe/HttpDxe.inf > NetworkPkg/HttpBootDxe/HttpBootDxe.inf > !endif > +!if $(TLS_ENABLE) =3D=3D TRUE > + NetworkPkg/TlsDxe/TlsDxe.inf > + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > # > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index f29feb27b4..5233314139 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -326,6 +326,10 @@ [FV.DXEFV] > INF NetworkPkg/HttpDxe/HttpDxe.inf > INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf > !endif > +!if $(TLS_ENABLE) =3D=3D TRUE > + INF NetworkPkg/TlsDxe/TlsDxe.inf > + INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > INF OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > # > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index ac4bf4f63e..108f7d59bf 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 > @@ -167,6 +168,10 @@ [LibraryClasses] > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > !endif >=20 > +!if $(TLS_ENABLE) =3D=3D TRUE > + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > +!endif > + >=20 > S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScrip > tLib.inf > SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf >=20 > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib > /BaseOrderedCollectionRedBlackTreeLib.inf > @@ -717,6 +722,10 @@ [Components] > NetworkPkg/HttpDxe/HttpDxe.inf > NetworkPkg/HttpBootDxe/HttpBootDxe.inf > !endif > +!if $(TLS_ENABLE) =3D=3D TRUE > + NetworkPkg/TlsDxe/TlsDxe.inf > + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > # > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index 8d66da099f..36150101e7 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -326,6 +326,10 @@ [FV.DXEFV] > INF NetworkPkg/HttpDxe/HttpDxe.inf > INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf > !endif > +!if $(TLS_ENABLE) =3D=3D TRUE > + INF NetworkPkg/TlsDxe/TlsDxe.inf > + INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +!endif > INF OvmfPkg/VirtioNetDxe/VirtioNet.inf >=20 > # > -- > 2.11.0