From: "Wu, Jiaxin" <jiaxin.wu@intel.com>
To: Gary Lin <glin@suse.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: Laszlo Ersek <lersek@redhat.com>,
"Justen, Jordan L" <jordan.l.justen@intel.com>,
"Long, Qin" <qin.long@intel.com>
Subject: Re: [PATCH 3/3] OvmfPkg: pull in TLS modules with -D TLS_ENABLE (also enabling HTTPS)
Date: Tue, 17 Jan 2017 08:04:23 +0000 [thread overview]
Message-ID: <895558F6EA4E3B41AC93A00D163B7274162946AE@SHSMSX103.ccr.corp.intel.com> (raw)
In-Reply-To: <20170117045232.4765-4-glin@suse.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
> -----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 <lersek@redhat.com>; Justen, Jordan L
> <jordan.l.justen@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>; Long, Qin
> <qin.long@intel.com>
> Subject: [PATCH 3/3] OvmfPkg: pull in TLS modules with -D TLS_ENABLE (also
> enabling HTTPS)
>
> 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.
>
> To build OVMF with HTTP Boot:
>
> $ ./build.sh -D HTTP_BOOT_ENABLE
>
> To build OVMF with HTTPS Boot:
>
> $ ./build.sh -D HTTP_BOOT_ENABLE -D TLS_ENABLE
>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Justen Jordan L <jordan.l.justen@intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> Cc: Long Qin <qin.long@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> 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(+)
>
> 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 = FALSE
> DEFINE HTTP_BOOT_ENABLE = FALSE
> DEFINE SMM_REQUIRE = FALSE
> + DEFINE TLS_ENABLE = FALSE
>
> [BuildOptions]
> GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG
> @@ -162,6 +163,10 @@ [LibraryClasses]
> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> !endif
>
> +!if $(TLS_ENABLE) == TRUE
> + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> +!endif
> +
>
> S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScrip
> tLib.inf
> SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
>
> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib
> /BaseOrderedCollectionRedBlackTreeLib.inf
> @@ -710,6 +715,10 @@ [Components]
> NetworkPkg/HttpDxe/HttpDxe.inf
> NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> !endif
> +!if $(TLS_ENABLE) == TRUE
> + NetworkPkg/TlsDxe/TlsDxe.inf
> + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
> +!endif
> OvmfPkg/VirtioNetDxe/VirtioNet.inf
>
> #
> 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) == TRUE
> + INF NetworkPkg/TlsDxe/TlsDxe.inf
> + INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
> +!endif
> INF OvmfPkg/VirtioNetDxe/VirtioNet.inf
>
> #
> 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 = FALSE
> DEFINE HTTP_BOOT_ENABLE = FALSE
> DEFINE SMM_REQUIRE = FALSE
> + DEFINE TLS_ENABLE = FALSE
>
> [BuildOptions]
> GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG
> @@ -167,6 +168,10 @@ [LibraryClasses]
> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> !endif
>
> +!if $(TLS_ENABLE) == TRUE
> + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> +!endif
> +
>
> S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScrip
> tLib.inf
> SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
>
> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib
> /BaseOrderedCollectionRedBlackTreeLib.inf
> @@ -719,6 +724,10 @@ [Components.X64]
> NetworkPkg/HttpDxe/HttpDxe.inf
> NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> !endif
> +!if $(TLS_ENABLE) == TRUE
> + NetworkPkg/TlsDxe/TlsDxe.inf
> + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
> +!endif
> OvmfPkg/VirtioNetDxe/VirtioNet.inf
>
> #
> 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) == TRUE
> + INF NetworkPkg/TlsDxe/TlsDxe.inf
> + INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
> +!endif
> INF OvmfPkg/VirtioNetDxe/VirtioNet.inf
>
> #
> 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 = FALSE
> DEFINE HTTP_BOOT_ENABLE = FALSE
> DEFINE SMM_REQUIRE = FALSE
> + DEFINE TLS_ENABLE = FALSE
>
> [BuildOptions]
> GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG
> @@ -167,6 +168,10 @@ [LibraryClasses]
> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> !endif
>
> +!if $(TLS_ENABLE) == TRUE
> + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> +!endif
> +
>
> S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScrip
> tLib.inf
> SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
>
> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib
> /BaseOrderedCollectionRedBlackTreeLib.inf
> @@ -717,6 +722,10 @@ [Components]
> NetworkPkg/HttpDxe/HttpDxe.inf
> NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> !endif
> +!if $(TLS_ENABLE) == TRUE
> + NetworkPkg/TlsDxe/TlsDxe.inf
> + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
> +!endif
> OvmfPkg/VirtioNetDxe/VirtioNet.inf
>
> #
> 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) == TRUE
> + INF NetworkPkg/TlsDxe/TlsDxe.inf
> + INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
> +!endif
> INF OvmfPkg/VirtioNetDxe/VirtioNet.inf
>
> #
> --
> 2.11.0
next prev parent reply other threads:[~2017-01-17 8:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 4:52 [PATCH 0/3] Enable HTTPS Boot in OVMF Gary Lin
2017-01-17 4:52 ` [PATCH 1/3] OvmfPkg: always resolve OpenSslLib, IntrinsicLib and BaseCryptLib Gary Lin
2017-01-17 8:03 ` Wu, Jiaxin
2017-01-17 9:13 ` Laszlo Ersek
2017-01-17 4:52 ` [PATCH 2/3] OvmfPkg: correct the set of modules included for the IPv6 stack Gary Lin
2017-01-17 8:04 ` Wu, Jiaxin
2017-01-17 9:22 ` Laszlo Ersek
2017-01-18 0:47 ` Wu, Jiaxin
2017-01-18 8:17 ` Laszlo Ersek
2017-01-18 9:21 ` Gary Lin
2017-01-19 3:09 ` Wu, Jiaxin
2017-01-19 8:36 ` Laszlo Ersek
2017-01-17 4:52 ` [PATCH 3/3] OvmfPkg: pull in TLS modules with -D TLS_ENABLE (also enabling HTTPS) Gary Lin
2017-01-17 8:04 ` Wu, Jiaxin [this message]
2017-01-17 9:24 ` Laszlo Ersek
2017-01-17 8:13 ` [PATCH 0/3] Enable HTTPS Boot in OVMF Long, Qin
2017-01-17 8:25 ` Jordan Justen
2017-01-17 20:13 ` Laszlo Ersek
2017-01-18 1:59 ` Gary Lin
2017-01-17 9:49 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=895558F6EA4E3B41AC93A00D163B7274162946AE@SHSMSX103.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox