|
 |
1dc609 |
From d28c0053e94b8e721307ac1698d86e5dfb328e6d Mon Sep 17 00:00:00 2001
|
|
|
1dc609 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
1dc609 |
Date: Mon, 2 Dec 2019 12:32:04 +0100
|
|
|
1dc609 |
Subject: [PATCH 8/9] NetworkPkg/HttpDxe: Set the HostName for the verification
|
|
|
1dc609 |
(CVE-2019-14553)
|
|
|
1dc609 |
MIME-Version: 1.0
|
|
|
1dc609 |
Content-Type: text/plain; charset=UTF-8
|
|
|
1dc609 |
Content-Transfer-Encoding: 8bit
|
|
|
1dc609 |
|
|
|
1dc609 |
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
|
|
1dc609 |
Message-id: <20191117220052.15700-9-lersek@redhat.com>
|
|
|
1dc609 |
Patchwork-id: 92459
|
|
|
1dc609 |
O-Subject: [RHEL-8.2.0 edk2 PATCH 8/9] NetworkPkg/HttpDxe: Set the HostName for the verification (CVE-2019-14553)
|
|
|
1dc609 |
Bugzilla: 1536624
|
|
|
1dc609 |
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
1dc609 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
1dc609 |
|
|
|
1dc609 |
From: "Wu, Jiaxin" <jiaxin.wu@intel.com>
|
|
|
1dc609 |
|
|
|
1dc609 |
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=960
|
|
|
1dc609 |
CVE: CVE-2019-14553
|
|
|
1dc609 |
Set the HostName by consuming TLS protocol to enable the host name
|
|
|
1dc609 |
check so as to avoid the potential Man-In-The-Middle attack.
|
|
|
1dc609 |
|
|
|
1dc609 |
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
|
|
|
1dc609 |
Reviewed-by: Ye Ting <ting.ye@intel.com>
|
|
|
1dc609 |
Reviewed-by: Long Qin <qin.long@intel.com>
|
|
|
1dc609 |
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
|
|
|
1dc609 |
Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
1dc609 |
Message-Id: <20190927034441.3096-5-Jiaxin.wu@intel.com>
|
|
|
1dc609 |
Cc: David Woodhouse <dwmw2@infradead.org>
|
|
|
1dc609 |
Cc: Jian J Wang <jian.j.wang@intel.com>
|
|
|
1dc609 |
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
|
|
|
1dc609 |
Cc: Sivaraman Nainar <sivaramann@amiindia.co.in>
|
|
|
1dc609 |
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
|
|
|
1dc609 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
1dc609 |
(cherry picked from commit e2fc50812895b17e8b23f5a9c43cde29531b200f)
|
|
|
1dc609 |
---
|
|
|
1dc609 |
NetworkPkg/HttpDxe/HttpProto.h | 1 +
|
|
|
1dc609 |
NetworkPkg/HttpDxe/HttpsSupport.c | 21 +++++++++++++++++----
|
|
|
1dc609 |
2 files changed, 18 insertions(+), 4 deletions(-)
|
|
|
1dc609 |
|
|
|
1dc609 |
diff --git a/NetworkPkg/HttpDxe/HttpProto.h b/NetworkPkg/HttpDxe/HttpProto.h
|
|
|
1dc609 |
index 6e1f517..34308e0 100644
|
|
|
1dc609 |
--- a/NetworkPkg/HttpDxe/HttpProto.h
|
|
|
1dc609 |
+++ b/NetworkPkg/HttpDxe/HttpProto.h
|
|
|
1dc609 |
@@ -82,6 +82,7 @@ typedef struct {
|
|
|
1dc609 |
EFI_TLS_VERSION Version;
|
|
|
1dc609 |
EFI_TLS_CONNECTION_END ConnectionEnd;
|
|
|
1dc609 |
EFI_TLS_VERIFY VerifyMethod;
|
|
|
1dc609 |
+ EFI_TLS_VERIFY_HOST VerifyHost;
|
|
|
1dc609 |
EFI_TLS_SESSION_STATE SessionState;
|
|
|
1dc609 |
} TLS_CONFIG_DATA;
|
|
|
1dc609 |
|
|
|
1dc609 |
diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c b/NetworkPkg/HttpDxe/HttpsSupport.c
|
|
|
1dc609 |
index 988bbcb..5dfb13b 100644
|
|
|
1dc609 |
--- a/NetworkPkg/HttpDxe/HttpsSupport.c
|
|
|
1dc609 |
+++ b/NetworkPkg/HttpDxe/HttpsSupport.c
|
|
|
1dc609 |
@@ -623,13 +623,16 @@ TlsConfigureSession (
|
|
|
1dc609 |
//
|
|
|
1dc609 |
// TlsConfigData initialization
|
|
|
1dc609 |
//
|
|
|
1dc609 |
- HttpInstance->TlsConfigData.ConnectionEnd = EfiTlsClient;
|
|
|
1dc609 |
- HttpInstance->TlsConfigData.VerifyMethod = EFI_TLS_VERIFY_PEER;
|
|
|
1dc609 |
- HttpInstance->TlsConfigData.SessionState = EfiTlsSessionNotStarted;
|
|
|
1dc609 |
+ HttpInstance->TlsConfigData.ConnectionEnd = EfiTlsClient;
|
|
|
1dc609 |
+ HttpInstance->TlsConfigData.VerifyMethod = EFI_TLS_VERIFY_PEER;
|
|
|
1dc609 |
+ HttpInstance->TlsConfigData.VerifyHost.Flags = EFI_TLS_VERIFY_FLAG_NO_WILDCARDS;
|
|
|
1dc609 |
+ HttpInstance->TlsConfigData.VerifyHost.HostName = HttpInstance->RemoteHost;
|
|
|
1dc609 |
+ HttpInstance->TlsConfigData.SessionState = EfiTlsSessionNotStarted;
|
|
|
1dc609 |
|
|
|
1dc609 |
//
|
|
|
1dc609 |
// EfiTlsConnectionEnd,
|
|
|
1dc609 |
- // EfiTlsVerifyMethod
|
|
|
1dc609 |
+ // EfiTlsVerifyMethod,
|
|
|
1dc609 |
+ // EfiTlsVerifyHost,
|
|
|
1dc609 |
// EfiTlsSessionState
|
|
|
1dc609 |
//
|
|
|
1dc609 |
Status = HttpInstance->Tls->SetSessionData (
|
|
|
1dc609 |
@@ -654,6 +657,16 @@ TlsConfigureSession (
|
|
|
1dc609 |
|
|
|
1dc609 |
Status = HttpInstance->Tls->SetSessionData (
|
|
|
1dc609 |
HttpInstance->Tls,
|
|
|
1dc609 |
+ EfiTlsVerifyHost,
|
|
|
1dc609 |
+ &HttpInstance->TlsConfigData.VerifyHost,
|
|
|
1dc609 |
+ sizeof (EFI_TLS_VERIFY_HOST)
|
|
|
1dc609 |
+ );
|
|
|
1dc609 |
+ if (EFI_ERROR (Status)) {
|
|
|
1dc609 |
+ return Status;
|
|
|
1dc609 |
+ }
|
|
|
1dc609 |
+
|
|
|
1dc609 |
+ Status = HttpInstance->Tls->SetSessionData (
|
|
|
1dc609 |
+ HttpInstance->Tls,
|
|
|
1dc609 |
EfiTlsSessionState,
|
|
|
1dc609 |
&(HttpInstance->TlsConfigData.SessionState),
|
|
|
1dc609 |
sizeof (EFI_TLS_SESSION_STATE)
|
|
|
1dc609 |
--
|
|
|
1dc609 |
1.8.3.1
|
|
|
1dc609 |
|