REF: https://bugzilla.tianocore.org/show_bug.cgi?id=960
CVE: CVE-2019-14553
Set the HostName by consuming TLS protocol 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-5-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>
EFI_TLS_VERSION Version;\r
EFI_TLS_CONNECTION_END ConnectionEnd;\r
EFI_TLS_VERIFY VerifyMethod;\r
EFI_TLS_VERSION Version;\r
EFI_TLS_CONNECTION_END ConnectionEnd;\r
EFI_TLS_VERIFY VerifyMethod;\r
+ EFI_TLS_VERIFY_HOST VerifyHost;\r
EFI_TLS_SESSION_STATE SessionState;\r
} TLS_CONFIG_DATA;\r
\r
EFI_TLS_SESSION_STATE SessionState;\r
} TLS_CONFIG_DATA;\r
\r
//\r
// TlsConfigData initialization\r
//\r
//\r
// TlsConfigData initialization\r
//\r
- HttpInstance->TlsConfigData.ConnectionEnd = EfiTlsClient;\r
- HttpInstance->TlsConfigData.VerifyMethod = EFI_TLS_VERIFY_PEER;\r
- HttpInstance->TlsConfigData.SessionState = EfiTlsSessionNotStarted;\r
+ HttpInstance->TlsConfigData.ConnectionEnd = EfiTlsClient;\r
+ HttpInstance->TlsConfigData.VerifyMethod = EFI_TLS_VERIFY_PEER;\r
+ HttpInstance->TlsConfigData.VerifyHost.Flags = EFI_TLS_VERIFY_FLAG_NO_WILDCARDS;\r
+ HttpInstance->TlsConfigData.VerifyHost.HostName = HttpInstance->RemoteHost;\r
+ HttpInstance->TlsConfigData.SessionState = EfiTlsSessionNotStarted;\r
\r
//\r
// EfiTlsConnectionEnd,\r
\r
//\r
// EfiTlsConnectionEnd,\r
- // EfiTlsVerifyMethod\r
+ // EfiTlsVerifyMethod,\r
+ // EfiTlsVerifyHost,\r
// EfiTlsSessionState\r
//\r
Status = HttpInstance->Tls->SetSessionData (\r
// EfiTlsSessionState\r
//\r
Status = HttpInstance->Tls->SetSessionData (\r
+ Status = HttpInstance->Tls->SetSessionData (\r
+ HttpInstance->Tls,\r
+ EfiTlsVerifyHost,\r
+ &HttpInstance->TlsConfigData.VerifyHost,\r
+ sizeof (EFI_TLS_VERIFY_HOST)\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+\r
Status = HttpInstance->Tls->SetSessionData (\r
HttpInstance->Tls,\r
EfiTlsSessionState,\r
Status = HttpInstance->Tls->SetSessionData (\r
HttpInstance->Tls,\r
EfiTlsSessionState,\r