yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove hack fix for server hybrid issue

Browse source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-06-24 13:05:28 +08:00
parent a1255e6b8c
commit 430db6b6ff
1 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
library/ssl_tls.c
View file

@ -961,20 +961,6 @@ static int ssl_conf_check(const mbedtls_ssl_context *ssl)
return( 0 ); return( 0 );
} }
#if defined(MBEDTLS_SSL_PROTO_TLS1_2) && \
defined(MBEDTLS_SSL_PROTO_TLS1_3) && \
defined(MBEDTLS_SSL_SRV_C) && \
defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
/* Remove below lines if server side hybrid mode implemented.
* To fix wrong default signature algorithm setting when both
* TLS1.2 and TLS1.3 enabled.
*/
static void ssl_fix_server_side_negotiation_fail( mbedtls_ssl_context *ssl );
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 &&
MBEDTLS_SSL_PROTO_TLS1_3 &&
MBEDTLS_SSL_SRV_C &&
MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */
/* /*
* Setup an SSL context * Setup an SSL context
*/ */
@ -2998,20 +2984,8 @@ int mbedtls_ssl_handshake_step( mbedtls_ssl_context *ssl )
if( ssl->conf->endpoint == MBEDTLS_SSL_IS_SERVER ) if( ssl->conf->endpoint == MBEDTLS_SSL_IS_SERVER )
{ {
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
if( mbedtls_ssl_conf_is_tls13_only( ssl->conf ) ) if( mbedtls_ssl_conf_is_tls13_only( ssl->conf ) )
{
#if defined(MBEDTLS_SSL_PROTO_TLS1_2) && \
defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
/* Remove below lines if server side hybrid mode implemented. */
if( ssl->state == MBEDTLS_SSL_HELLO_REQUEST )
{
ssl_fix_server_side_negotiation_fail( ssl );
}
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 &&
MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */
ret = mbedtls_ssl_tls13_handshake_server_step( ssl ); ret = mbedtls_ssl_tls13_handshake_server_step( ssl );
}
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
#if defined(MBEDTLS_SSL_PROTO_TLS1_2) #if defined(MBEDTLS_SSL_PROTO_TLS1_2)