From 2b1402890de0ec26fb382ca8a19dc4a9f1ff1853 Mon Sep 17 00:00:00 2001 From: Li Jingyi Date: Mon, 20 Dec 2021 17:35:49 +0800 Subject: [PATCH] fix(mbedtls): fix compiling error when open MBEDTLS_SSL_PROTO_DTLS and disable MBEDTLS_SSL_PROTO_DTLS when open MBEDTLS_DYNAMIC_BUFFER --- components/mbedtls/Kconfig | 2 ++ components/mbedtls/port/dynamic/esp_ssl_tls.c | 14 -------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig index f7eadb35f4..c72741e9da 100644 --- a/components/mbedtls/Kconfig +++ b/components/mbedtls/Kconfig @@ -101,6 +101,8 @@ menu "mbedTLS" bool "Using dynamic TX/RX buffer" default n select MBEDTLS_ASYMMETRIC_CONTENT_LEN + # Dynamic buffer feature is not supported with DTLS + depends on !MBEDTLS_SSL_PROTO_DTLS help 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 diff --git a/components/mbedtls/port/dynamic/esp_ssl_tls.c b/components/mbedtls/port/dynamic/esp_ssl_tls.c index 284649b959..94ce4bf160 100644 --- a/components/mbedtls/port/dynamic/esp_ssl_tls.c +++ b/components/mbedtls/port/dynamic/esp_ssl_tls.c @@ -177,20 +177,6 @@ static int ssl_handshake_init( mbedtls_ssl_context *ssl ) ssl_transform_init( ssl->transform_negotiate ); 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 ); }