From 89f77623b8539a84fb18dc92f739b5bb791d7cb0 Mon Sep 17 00:00:00 2001 From: Simon Butcher Date: Sun, 27 Sep 2015 22:50:49 +0100 Subject: [PATCH] Added max length checking of hostname --- include/mbedtls/ssl.h | 3 +++ library/ssl_tls.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h index 2d7beb359..780aa62a9 100644 --- a/include/mbedtls/ssl.h +++ b/include/mbedtls/ssl.h @@ -139,6 +139,9 @@ #define MBEDTLS_SSL_TRANSPORT_STREAM 0 /*!< TLS */ #define MBEDTLS_SSL_TRANSPORT_DATAGRAM 1 /*!< DTLS */ +#define MBEDTLS_SSL_MAX_HOST_NAME 255 /*!< Maximum host name +defined in RFC 1035 */ + /* RFC 6066 section 4, see also mfl_code_to_length in ssl_tls.c * NONE must be zero so that memset()ing structure to zero works */ #define MBEDTLS_SSL_MAX_FRAG_LEN_NONE 0 /*!< don't use this extension */ diff --git a/library/ssl_tls.c b/library/ssl_tls.c index d9b05fd1f..23165a43d 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -5833,6 +5833,9 @@ int mbedtls_ssl_set_hostname( mbedtls_ssl_context *ssl, const char *hostname ) if( hostname_len + 1 == 0 ) return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); + if( hostname_len > MBEDTLS_SSL_MAX_HOST_NAME ) + return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); + ssl->hostname = mbedtls_calloc( 1, hostname_len + 1 ); if( ssl->hostname == NULL )