TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-03-28 15:11:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Introduce getter function for disable_renego

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard
2019-07-26 16:37:45 +02:00
parent 14e2a8ac06
commit b3bb31bd90
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/mbedtls/ssl_internal.h
View File

@@ -1243,6 +1243,16 @@ static inline int mbedtls_ssl_get_renego_status(
#endif
}
static inline int mbedtls_ssl_conf_get_disable_renego(
const mbedtls_ssl_config *conf )
{
#if defined(MBEDTLS_SSL_RENEGOTIATION)
return( conf->disable_renegotiation );
#else
(void) conf;
return( MBEDTLS_SSL_RENEGOTIATION_DISABLED );
#endif
}
/*
* Getter functions for fields in mbedtls_ssl_config which may

12
library/ssl_tls.c
View File

@@ -10855,10 +10855,8 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
/* ... with an AEAD ciphersuite. */
mbedtls_ssl_transform_uses_aead( ssl->transform ) != 1 ||
/* Renegotation is disabled. */
#if defined(MBEDTLS_SSL_RENEGOTIATION)
ssl->conf->disable_renegotiation != MBEDTLS_SSL_RENEGOTIATION_DISABLED ||
#endif
0 )
mbedtls_ssl_conf_get_disable_renego( ssl->conf )
!= MBEDTLS_SSL_RENEGOTIATION_DISABLED )
{
return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
}
@@ -11081,10 +11079,8 @@ static int ssl_context_load( mbedtls_ssl_context *ssl,
MBEDTLS_SSL_MINOR_VERSION_3 ||
mbedtls_ssl_conf_get_min_minor_ver( ssl->conf ) >
MBEDTLS_SSL_MINOR_VERSION_3 ||
#if defined(MBEDTLS_SSL_RENEGOTIATION)
ssl->conf->disable_renegotiation != MBEDTLS_SSL_RENEGOTIATION_DISABLED ||
#endif
0 )
mbedtls_ssl_conf_get_disable_renego( ssl->conf )
!= MBEDTLS_SSL_RENEGOTIATION_DISABLED )
{
return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
}