tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CryptoPkg/TlsLib: Add the new API "TlsSetVerifyHost" (CVE-2019-14553) 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=960
CVE: CVE-2019-14553
In the patch, we add the new API "TlsSetVerifyHost" for the TLS
protocol to set the specified host name that need to be verified.

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-3-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>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
This commit is contained in:
Wu, Jiaxin 2019-09-27 11:44:39 +08:00 committed by Laszlo Ersek
parent 31efec8279
commit 2ca74e1a17
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CryptoPkg/Include/Library/TlsLib.h
View File

@ -396,6 +396,26 @@ TlsSetVerify (
IN UINT32 VerifyMode IN UINT32 VerifyMode
); );
/**
Set the specified host name to be verified.
@param[in] Tls Pointer to the TLS object.
@param[in] Flags The setting flags during the validation.
@param[in] HostName The specified host name to be verified.
@retval EFI_SUCCESS The HostName setting was set successfully.
@retval EFI_INVALID_PARAMETER The parameter is invalid.
@retval EFI_ABORTED Invalid HostName setting.
**/
EFI_STATUS
EFIAPI
TlsSetVerifyHost (
IN VOID *Tls,
IN UINT32 Flags,
IN CHAR8 *HostName
);
/** /**
Sets a TLS/SSL session ID to be used during TLS/SSL connect. Sets a TLS/SSL session ID to be used during TLS/SSL connect.

38
CryptoPkg/Library/TlsLib/TlsConfig.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
SSL/TLS Configuration Library Wrapper Implementation over OpenSSL. SSL/TLS Configuration Library Wrapper Implementation over OpenSSL.
Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR> Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -497,6 +497,42 @@ TlsSetVerify (
SSL_set_verify (TlsConn->Ssl, VerifyMode, NULL); SSL_set_verify (TlsConn->Ssl, VerifyMode, NULL);
} }
/**
Set the specified host name to be verified.
@param[in] Tls Pointer to the TLS object.
@param[in] Flags The setting flags during the validation.
@param[in] HostName The specified host name to be verified.
@retval EFI_SUCCESS The HostName setting was set successfully.
@retval EFI_INVALID_PARAMETER The parameter is invalid.
@retval EFI_ABORTED Invalid HostName setting.
**/
EFI_STATUS
EFIAPI
TlsSetVerifyHost (
IN VOID *Tls,
IN UINT32 Flags,
IN CHAR8 *HostName
)
{
TLS_CONNECTION *TlsConn;
TlsConn = (TLS_CONNECTION *) Tls;
if (TlsConn == NULL || TlsConn->Ssl == NULL || HostName == NULL) {
return EFI_INVALID_PARAMETER;
}
SSL_set_hostflags(TlsConn->Ssl, Flags);
if (SSL_set1_host(TlsConn->Ssl, HostName) == 0) {
return EFI_ABORTED;
}
return EFI_SUCCESS;
}
/** /**
Sets a TLS/SSL session ID to be used during TLS/SSL connect. Sets a TLS/SSL session ID to be used during TLS/SSL connect.