[edk2-devel] [PATCH v2 2/8] CryptoPkg/TlsLib: Add the new API "TlsSetVerifyHost" (CVE-2019-14553)
Philippe Mathieu-Daudé
philmd at redhat.com
Sat Oct 26 11:51:50 UTC 2019
On 10/26/19 7:37 AM, Laszlo Ersek wrote:
> From: "Wu, Jiaxin" <jiaxin.wu at intel.com>
>
> 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 at intel.com>
> Reviewed-by: Ye Ting <ting.ye at intel.com>
> Reviewed-by: Long Qin <qin.long at intel.com>
> Reviewed-by: Fu Siyuan <siyuan.fu at intel.com>
> Acked-by: Laszlo Ersek <lersek at redhat.com>
> Message-Id: <20190927034441.3096-3-Jiaxin.wu at intel.com>
> Cc: David Woodhouse <dwmw2 at infradead.org>
> Cc: Jian J Wang <jian.j.wang at intel.com>
> Cc: Jiaxin Wu <jiaxin.wu at intel.com>
> Cc: Sivaraman Nainar <sivaramann at amiindia.co.in>
> Cc: Xiaoyu Lu <xiaoyux.lu at intel.com>
> Signed-off-by: Laszlo Ersek <lersek at redhat.com>
> ---
>
> Notes:
> v2:
> - fix whitespace in subject line
> - drop Contributed-under line per BZ#1373
>
> CryptoPkg/Include/Library/TlsLib.h | 20 +++++++++++
> CryptoPkg/Library/TlsLib/TlsConfig.c | 38 +++++++++++++++++++-
> 2 files changed, 57 insertions(+), 1 deletion(-)
>
> diff --git a/CryptoPkg/Include/Library/TlsLib.h b/CryptoPkg/Include/Library/TlsLib.h
> index 9875cb6e746b..3af7d4bc095e 100644
> --- a/CryptoPkg/Include/Library/TlsLib.h
> +++ b/CryptoPkg/Include/Library/TlsLib.h
> @@ -395,8 +395,28 @@ TlsSetVerify (
> IN VOID *Tls,
> 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.
>
> This function sets a session ID to be used when the TLS/SSL connection is
> diff --git a/CryptoPkg/Library/TlsLib/TlsConfig.c b/CryptoPkg/Library/TlsLib/TlsConfig.c
> index 74b577d60ee3..2bf5aee7c093 100644
> --- a/CryptoPkg/Library/TlsLib/TlsConfig.c
> +++ b/CryptoPkg/Library/TlsLib/TlsConfig.c
> @@ -1,8 +1,8 @@
> /** @file
> 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>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> @@ -496,8 +496,44 @@ TlsSetVerify (
> //
> 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) {
Nitpicking, I'd check HostName first.
Reviewed-by: Philippe Mathieu-Daude <philmd at redhat.com>
> + 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.
>
> This function sets a session ID to be used when the TLS/SSL connection is
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#49472): https://edk2.groups.io/g/devel/message/49472
Mute This Topic: https://groups.io/mt/37952586/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list