eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move set_cbc_record_splitting() to conf

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-05-05 16:34:53 +01:00
parent d36e33fc07
commit 17eab2b65c
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
library/ssl_tls.c
View file

@ -5619,9 +5619,9 @@ int mbedtls_ssl_set_truncated_hmac( mbedtls_ssl_config *conf, int truncate )
#endif /* MBEDTLS_SSL_TRUNCATED_HMAC */
#if defined(MBEDTLS_SSL_CBC_RECORD_SPLITTING)
void mbedtls_ssl_set_cbc_record_splitting( mbedtls_ssl_context *ssl, char split )
void mbedtls_ssl_set_cbc_record_splitting( mbedtls_ssl_config *conf, char split )
{
ssl->split_done = split;
conf->cbc_record_splitting = split;
}
#endif
@ -6320,7 +6320,8 @@ static int ssl_write_split( mbedtls_ssl_context *ssl,
{
int ret;
if( ssl->split_done == MBEDTLS_SSL_CBC_RECORD_SPLITTING_DISABLED ||
if( ssl->conf->cbc_record_splitting ==
MBEDTLS_SSL_CBC_RECORD_SPLITTING_DISABLED ||
len <= 1 ||
ssl->minor_ver > MBEDTLS_SSL_MINOR_VERSION_1 ||
mbedtls_cipher_get_cipher_mode( &ssl->transform_out->cipher_ctx_enc )
@ -6658,6 +6659,10 @@ int mbedtls_ssl_config_defaults( mbedtls_ssl_config *conf,
conf->extended_ms = MBEDTLS_SSL_EXTENDED_MS_ENABLED;
#endif
#if defined(MBEDTLS_SSL_CBC_RECORD_SPLITTING)
conf->cbc_record_splitting = MBEDTLS_SSL_CBC_RECORD_SPLITTING_ENABLED;
#endif
#if defined(MBEDTLS_SSL_SESSION_TICKETS)
conf->ticket_lifetime = MBEDTLS_SSL_DEFAULT_TICKET_LIFETIME;
#endif