diff --git a/README.md b/README.md index 5ffd2ae561..75639e930a 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ There are currently four active build systems used within mbed TLS releases: - yotta - GNU Make - CMake -- Microsoft Visual Studio (Visual Studio 6 and Visual Studio 2010) +- Microsoft Visual Studio (Microsoft Visual Studio 2010 or later) The main systems used for development are CMake and GNU Make. Those systems are always complete and up-to-date. The others should reflect all changes present in the CMake and Make build system, although features may not be ported there automatically. diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 10fff954c9..8467b13021 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -6187,7 +6187,6 @@ int mbedtls_ssl_set_hostname( mbedtls_ssl_context *ssl, const char *hostname ) /* Check if new hostname is valid before * making any change to current one */ - if( hostname != NULL ) { hostname_len = strlen( hostname ); @@ -6214,7 +6213,6 @@ int mbedtls_ssl_set_hostname( mbedtls_ssl_context *ssl, const char *hostname ) else { ssl->hostname = mbedtls_calloc( 1, hostname_len + 1 ); - if( ssl->hostname == NULL ) return( MBEDTLS_ERR_SSL_ALLOC_FAILED );