commit 9f81231fb84736c11fdae47b2f707c6e3127ddbb
author Simon Butcher <simon.butcher@arm.com> Mon Sep 28 19:22:33 2015 +0100
committer Simon Butcher <simon.butcher@arm.com> Mon Sep 28 19:22:33 2015 +0100
tree 8967bb5d42ac15884050c04eeb143e77bd3bbd91
parent ed9976634fef41e34b6f7ffe59d9703cc2c04dc2

Revised hostname length check from review

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 780aa62..767b066 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -139,8 +139,7 @@
 #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 */
+#define MBEDTLS_SSL_MAX_HOST_NAME_LEN           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 */

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 23165a4..9702971 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5833,7 +5833,7 @@
     if( hostname_len + 1 == 0 )
         return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
 
-    if( hostname_len > MBEDTLS_SSL_MAX_HOST_NAME )
+    if( hostname_len > MBEDTLS_SSL_MAX_HOST_NAME_LEN )
         return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
 
     ssl->hostname = mbedtls_calloc( 1, hostname_len + 1 );