kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'feature/mbedtls_dynamic_memory' into 'master'
fix(mbedtls): fix compiling error when open MBEDTLS_SSL_PROTO_DTLS and disable... Closes IDFGH-6437 See merge request espressif/esp-idf!16471pull/8142/head
commit
1f435b4703
|
@ -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
|
||||||
|
|
|
@ -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 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue