commit e1d3f0639958dc7c556bdeca2e6ff1a7fcde94e0
author Ronald Cron <ronald.cron@arm.com> Thu Feb 10 14:50:54 2022 +0100
committer Ronald Cron <ronald.cron@arm.com> Tue Mar 29 18:58:31 2022 +0200
tree 2b0f610047c8c6ecfdc6c167cff170dc71210bc8
parent fbd9f99f107d037297071bba2d2fa208db5e06e3

Allow hybrid TLS 1.3 + TLS 1.2 configuration

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 15784e6..211d23a 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -911,8 +911,13 @@
 #if defined(MBEDTLS_SSL_PROTO_TLS1_2) && defined(MBEDTLS_SSL_PROTO_TLS1_3)
     if( mbedtls_ssl_conf_is_hybrid_tls12_tls13( conf ) )
     {
-        MBEDTLS_SSL_DEBUG_MSG( 1, ( "Hybrid TLS 1.2 + TLS 1.3 configurations are not yet supported" ) );
-        return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
+        if( ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM )
+        {
+             MBEDTLS_SSL_DEBUG_MSG( 1, ( "DTLS not yet supported in Hybrid TLS 1.3 + TLS 1.2" ) );
+             return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
+        }
+        MBEDTLS_SSL_DEBUG_MSG( 4, ( "The SSL configuration is TLS 1.3 or TLS 1.2." ) );
+        return( 0 );
     }
 #endif