From: "Liming Gao" <liming.gao@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"lersek@redhat.com" <lersek@redhat.com>
Cc: David Woodhouse <dwmw2@infradead.org>,
"Wang, Jian J" <jian.j.wang@intel.com>,
"Wu, Jiaxin" <jiaxin.wu@intel.com>,
Sivaraman Nainar <sivaramann@amiindia.co.in>,
"Lu, XiaoyuX" <xiaoyux.lu@intel.com>
Subject: Re: [edk2-devel] [PATCH v2 1/8] MdePkg/Include/Protocol/Tls.h: Add the data type of EfiTlsVerifyHost (CVE-2019-14553)
Date: Mon, 28 Oct 2019 08:12:01 +0000 [thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E5327C6@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <20191026053719.10453-2-lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
>-----Original Message-----
>From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
>Laszlo Ersek
>Sent: Saturday, October 26, 2019 1:37 PM
>To: edk2-devel-groups-io <devel@edk2.groups.io>
>Cc: David Woodhouse <dwmw2@infradead.org>; Wang, Jian J
><jian.j.wang@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>; Sivaraman
>Nainar <sivaramann@amiindia.co.in>; Lu, XiaoyuX <xiaoyux.lu@intel.com>
>Subject: [edk2-devel] [PATCH v2 1/8] MdePkg/Include/Protocol/Tls.h: Add
>the data type of EfiTlsVerifyHost (CVE-2019-14553)
>
>From: "Wu, Jiaxin" <jiaxin.wu@intel.com>
>
>REF: https://bugzilla.tianocore.org/show_bug.cgi?id=960
>CVE: CVE-2019-14553
>In the patch, we add the new data type named "EfiTlsVerifyHost" and
>the EFI_TLS_VERIFY_HOST_FLAG for the TLS protocol consumer (HTTP)
>to enable the host name check so as to avoid the potential
>Man-In-The-Middle attack.
>
>Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
>Reviewed-by: Ye Ting <ting.ye@intel.com>
>Reviewed-by: Long Qin <qin.long@intel.com>
>Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
>Acked-by: Laszlo Ersek <lersek@redhat.com>
>Message-Id: <20190927034441.3096-2-Jiaxin.wu@intel.com>
>Cc: David Woodhouse <dwmw2@infradead.org>
>Cc: Jian J Wang <jian.j.wang@intel.com>
>Cc: Jiaxin Wu <jiaxin.wu@intel.com>
>Cc: Sivaraman Nainar <sivaramann@amiindia.co.in>
>Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
>Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>---
>
>Notes:
> v2:
> - fix whitespace in subject line
> - drop Contributed-under line per BZ#1373
>
> MdePkg/Include/Protocol/Tls.h | 68 ++++++++++++++++----
> 1 file changed, 57 insertions(+), 11 deletions(-)
>
>diff --git a/MdePkg/Include/Protocol/Tls.h b/MdePkg/Include/Protocol/Tls.h
>index bf1b6727a1e9..af524ae2a60e 100644
>--- a/MdePkg/Include/Protocol/Tls.h
>+++ b/MdePkg/Include/Protocol/Tls.h
>@@ -40,12 +40,8 @@ typedef struct _EFI_TLS_PROTOCOL
>EFI_TLS_PROTOCOL;
> ///
> /// EFI_TLS_SESSION_DATA_TYPE
> ///
> typedef enum {
>- ///
>- /// Session Configuration
>- ///
>-
> ///
> /// TLS session Version. The corresponding Data is of type EFI_TLS_VERSION.
> ///
> EfiTlsVersion,
>@@ -85,13 +81,8 @@ typedef enum {
> /// TLS session data session state.
> /// The corresponding Data is of type EFI_TLS_SESSION_STATE.
> ///
> EfiTlsSessionState,
>-
>- ///
>- /// Session information
>- ///
>-
> ///
> /// TLS session data client random.
> /// The corresponding Data is of type EFI_TLS_RANDOM.
> ///
>@@ -105,11 +96,17 @@ typedef enum {
> /// TLS session data key material.
> /// The corresponding Data is of type EFI_TLS_MASTER_SECRET.
> ///
> EfiTlsKeyMaterial,
>+ ///
>+ /// TLS session hostname for validation which is used to verify whether the
>name
>+ /// within the peer certificate matches a given host name.
>+ /// This parameter is invalid when EfiTlsVerifyMethod is
>EFI_TLS_VERIFY_NONE.
>+ /// The corresponding Data is of type EFI_TLS_VERIFY_HOST.
>+ ///
>+ EfiTlsVerifyHost,
>
> EfiTlsSessionDataTypeMaximum
>-
> } EFI_TLS_SESSION_DATA_TYPE;
>
> ///
> /// EFI_TLS_VERSION
>@@ -177,17 +174,66 @@ typedef UINT32 EFI_TLS_VERIFY;
> /// the reason for the certificate verification failure.
> ///
> #define EFI_TLS_VERIFY_PEER 0x1
> ///
>-/// TLS session will fail peer certificate is absent.
>+/// EFI_TLS_VERIFY_FAIL_IF_NO_PEER_CERT is only meaningful in the server
>mode.
>+/// TLS session will fail if client certificate is absent.
> ///
> #define EFI_TLS_VERIFY_FAIL_IF_NO_PEER_CERT 0x2
> ///
> /// TLS session only verify client once, and doesn't request certificate during
> /// re-negotiation.
> ///
> #define EFI_TLS_VERIFY_CLIENT_ONCE 0x4
>
>+///
>+/// EFI_TLS_VERIFY_HOST_FLAG
>+///
>+typedef UINT32 EFI_TLS_VERIFY_HOST_FLAG;
>+///
>+/// There is no additional flags set for hostname validation.
>+/// Wildcards are supported and they match only in the left-most label.
>+///
>+#define EFI_TLS_VERIFY_FLAG_NONE 0x00
>+///
>+/// Always check the Subject Distinguished Name (DN) in the peer certificate
>even if the
>+/// certificate contains Subject Alternative Name (SAN).
>+///
>+#define EFI_TLS_VERIFY_FLAG_ALWAYS_CHECK_SUBJECT 0x01
>+///
>+/// Disable the match of all wildcards.
>+///
>+#define EFI_TLS_VERIFY_FLAG_NO_WILDCARDS 0x02
>+///
>+/// Disable the "*" as wildcard in labels that have a prefix or suffix (e.g.
>"www*" or "*www").
>+///
>+#define EFI_TLS_VERIFY_FLAG_NO_PARTIAL_WILDCARDS 0x04
>+///
>+/// Allow the "*" to match more than one labels. Otherwise, only matches a
>single label.
>+///
>+#define EFI_TLS_VERIFY_FLAG_MULTI_LABEL_WILDCARDS 0x08
>+///
>+/// Restrict to only match direct child sub-domains which start with ".".
>+/// For example, a name of ".example.com" would match
>"www.example.com" with this flag,
>+/// but would not match "www.sub.example.com".
>+///
>+#define EFI_TLS_VERIFY_FLAG_SINGLE_LABEL_SUBDOMAINS 0x10
>+///
>+/// Never check the Subject Distinguished Name (DN) even there is no
>+/// Subject Alternative Name (SAN) in the certificate.
>+///
>+#define EFI_TLS_VERIFY_FLAG_NEVER_CHECK_SUBJECT 0x20
>+
>+///
>+/// EFI_TLS_VERIFY_HOST
>+///
>+#pragma pack (1)
>+typedef struct {
>+ EFI_TLS_VERIFY_HOST_FLAG Flags;
>+ CHAR8 *HostName;
>+} EFI_TLS_VERIFY_HOST;
>+#pragma pack ()
>+
> ///
> /// EFI_TLS_RANDOM
> /// Note: The definition of EFI_TLS_RANDOM is from "RFC 5246 A.4.1.
> /// Hello Messages".
>--
>2.19.1.3.g30247aa5d201
>
>
>
>
next prev parent reply other threads:[~2019-10-28 8:12 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-26 5:37 [PATCH v2 0/8] support server identity validation in HTTPS Boot (CVE-2019-14553) Laszlo Ersek
2019-10-26 5:37 ` [PATCH v2 1/8] MdePkg/Include/Protocol/Tls.h: Add the data type of EfiTlsVerifyHost (CVE-2019-14553) Laszlo Ersek
2019-10-28 8:12 ` Liming Gao [this message]
2019-10-26 5:37 ` [PATCH v2 2/8] CryptoPkg/TlsLib: Add the new API "TlsSetVerifyHost" (CVE-2019-14553) Laszlo Ersek
2019-10-26 11:51 ` [edk2-devel] " Philippe Mathieu-Daudé
2019-11-02 11:01 ` Laszlo Ersek
2019-10-28 5:28 ` Wang, Jian J
2019-10-26 5:37 ` [PATCH v2 3/8] CryptoPkg/Crt: turn strchr() into a function (CVE-2019-14553) Laszlo Ersek
2019-10-26 11:47 ` [edk2-devel] " Philippe Mathieu-Daudé
2019-10-28 5:12 ` Wang, Jian J
2019-10-26 5:37 ` [PATCH v2 4/8] CryptoPkg/Crt: satisfy "inet_pton.c" dependencies (CVE-2019-14553) Laszlo Ersek
2019-10-28 5:34 ` Wang, Jian J
2019-10-28 13:06 ` David Woodhouse
2019-10-29 0:47 ` Laszlo Ersek
2019-10-29 2:44 ` [edk2-devel] " Wu, Jiaxin
2019-10-29 3:19 ` Wang, Jian J
2019-10-26 5:37 ` [PATCH v2 5/8] CryptoPkg/Crt: import "inet_pton.c" (CVE-2019-14553) Laszlo Ersek
2019-10-28 6:16 ` Wang, Jian J
2019-10-26 5:37 ` [PATCH v2 6/8] CryptoPkg/TlsLib: TlsSetVerifyHost: parse IP address literals as such (CVE-2019-14553) Laszlo Ersek
2019-10-28 6:12 ` Wang, Jian J
2019-10-26 5:37 ` [PATCH v2 7/8] NetworkPkg/TlsDxe: Add the support of host validation to TlsDxe driver (CVE-2019-14553) Laszlo Ersek
2019-10-26 5:37 ` [PATCH v2 8/8] NetworkPkg/HttpDxe: Set the HostName for the verification (CVE-2019-14553) Laszlo Ersek
2019-10-29 2:37 ` [edk2-devel] [PATCH v2 0/8] support server identity validation in HTTPS Boot (CVE-2019-14553) Wu, Jiaxin
2019-11-02 11:15 ` Laszlo Ersek
2019-10-31 9:28 ` Laszlo Ersek
2019-11-02 11:23 ` 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=4A89E2EF3DFEDB4C8BFDE51014F606A14E5327C6@SHSMSX104.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