yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-06-25 05:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to hardcoded single version

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2019-07-23 15:16:19 +02:00
parent 2f3fa62a0a
commit 73a4636ca4
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
library/ssl_tls.c
View file

@ -10792,8 +10792,8 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
ssl->out_left != 0 || ssl->out_left != 0 ||
/* We're using DTLS 1.2 ... */ /* We're using DTLS 1.2 ... */
MBEDTLS_SSL_TRANSPORT_IS_TLS( ssl->conf->transport ) || MBEDTLS_SSL_TRANSPORT_IS_TLS( ssl->conf->transport ) ||
ssl->major_ver != MBEDTLS_SSL_MAJOR_VERSION_3 || mbedtls_ssl_get_major_ver( ssl ) != MBEDTLS_SSL_MAJOR_VERSION_3 ||
ssl->minor_ver != MBEDTLS_SSL_MINOR_VERSION_3 || mbedtls_ssl_get_minor_ver( ssl ) != MBEDTLS_SSL_MINOR_VERSION_3 ||
/* ... with an AEAD ciphersuite. */ /* ... with an AEAD ciphersuite. */
mbedtls_ssl_transform_uses_aead( ssl->transform ) != 1 || mbedtls_ssl_transform_uses_aead( ssl->transform ) != 1 ||
/* Renegotation is disabled. */ /* Renegotation is disabled. */
@ -11009,10 +11009,14 @@ static int ssl_context_load( mbedtls_ssl_context *ssl,
* least check it matches the requirements for serializing. * least check it matches the requirements for serializing.
*/ */
if( MBEDTLS_SSL_TRANSPORT_IS_TLS( ssl->conf->transport ) || if( MBEDTLS_SSL_TRANSPORT_IS_TLS( ssl->conf->transport ) ||
ssl->conf->max_major_ver < MBEDTLS_SSL_MAJOR_VERSION_3 || mbedtls_ssl_conf_get_max_major_ver( ssl->conf ) <
ssl->conf->min_major_ver > MBEDTLS_SSL_MAJOR_VERSION_3 || MBEDTLS_SSL_MAJOR_VERSION_3 ||
ssl->conf->max_minor_ver < MBEDTLS_SSL_MINOR_VERSION_3 || mbedtls_ssl_conf_get_min_major_ver( ssl->conf ) >
ssl->conf->min_minor_ver > MBEDTLS_SSL_MINOR_VERSION_3 || MBEDTLS_SSL_MAJOR_VERSION_3 ||
mbedtls_ssl_conf_get_max_minor_ver( ssl->conf ) <
MBEDTLS_SSL_MINOR_VERSION_3 ||
mbedtls_ssl_conf_get_min_minor_ver( ssl->conf ) >
MBEDTLS_SSL_MINOR_VERSION_3 ||
#if defined(MBEDTLS_SSL_RENEGOTIATION) #if defined(MBEDTLS_SSL_RENEGOTIATION)
ssl->conf->disable_renegotiation != MBEDTLS_SSL_RENEGOTIATION_DISABLED ssl->conf->disable_renegotiation != MBEDTLS_SSL_RENEGOTIATION_DISABLED
#endif #endif