From 93de2965d09b24421715200eb9b10f3eb187d8d2 Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Thu, 25 Jul 2019 12:38:18 +0100 Subject: [PATCH] Fix rebase slip --- library/ssl_srv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/library/ssl_srv.c b/library/ssl_srv.c index 573f32769..937ee0b52 100644 --- a/library/ssl_srv.c +++ b/library/ssl_srv.c @@ -1098,10 +1098,15 @@ static int ssl_parse_client_hello_v2( mbedtls_ssl_context *ssl ) return( MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO ); } +#if !defined(MBEDTLS_SSL_CONF_FIXED_MAJOR_VER) ssl->major_ver = MBEDTLS_SSL_MAJOR_VERSION_3; +#endif + +#if !defined(MBEDTLS_SSL_CONF_FIXED_MINOR_VER) ssl->minor_ver = ( buf[4] <= mbedtls_ssl_conf_get_max_minor_ver( ssl->conf ) ) ? buf[4] : mbedtls_ssl_conf_get_max_minor_ver( ssl->conf ); +#endif if( mbedtls_ssl_get_minor_ver( ssl ) < mbedtls_ssl_conf_get_min_minor_ver( ssl->conf ) ) {