espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/mbedtls_dynamic_memory_v4.4' into 'release/v4.4'

Browse Source 
fix(mbedtls): fix compiling error when open MBEDTLS_SSL_PROTO_DTLS and disable...(backport v4.4)

See merge request espressif/esp-idf!16472
This commit is contained in:
Jiang Jiang Jian
2021-12-22 12:27:27 +00:00
parent 5f5f8bd64e c91afab332
commit c2a71ce5c6
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/mbedtls/Kconfig
View File

@ -101,6 +101,8 @@ menu "mbedTLS"
bool "Using dynamic TX/RX buffer" bool "Using dynamic TX/RX buffer"
default n default n
select MBEDTLS_ASYMMETRIC_CONTENT_LEN select MBEDTLS_ASYMMETRIC_CONTENT_LEN
# Dynamic buffer feature is not supported with DTLS
depends on !MBEDTLS_SSL_PROTO_DTLS
help help
Using dynamic TX/RX buffer. After enabling this option, mbedTLS will Using dynamic TX/RX buffer. After enabling this option, mbedTLS will
allocate TX buffer when need to send data and then free it if all data allocate TX buffer when need to send data and then free it if all data

14
components/mbedtls/port/dynamic/esp_ssl_tls.c
View File

@ -177,20 +177,6 @@ static int ssl_handshake_init( mbedtls_ssl_context *ssl )
ssl_transform_init( ssl->transform_negotiate ); ssl_transform_init( ssl->transform_negotiate );
ssl_handshake_params_init( ssl->handshake ); ssl_handshake_params_init( ssl->handshake );
#if defined(MBEDTLS_SSL_PROTO_DTLS)
if( ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM )
{
ssl->handshake->alt_transform_out = ssl->transform_out;
if( ssl->conf->endpoint == MBEDTLS_SSL_IS_CLIENT )
ssl->handshake->retransmit_state = MBEDTLS_SSL_RETRANS_PREPARING;
else
ssl->handshake->retransmit_state = MBEDTLS_SSL_RETRANS_WAITING;
ssl_set_timer( ssl, 0 );
}
#endif
return( 0 ); return( 0 );
} }