espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-10-21 07:02:24 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/fix_dynamic_mbedtls_return_0_when_handshake_fail_v3.3' into 'release/v3.3'

Browse Source 
fix(mbedtls): Fix dynamic buffer mbedtls handshake steps process return 0 when handshake fail (backport v3.3)

See merge request sdk/ESP8266_RTOS_SDK!1475
This commit is contained in:
Dong Heng
2020-11-18 11:02:06 +08:00
parent 3a7964baf2 7d6976ef10
commit f54641d7f3
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/mbedtls/port/dynamic/esp_mbedtls_dynamic_impl.h
View File

@@ -33,9 +33,6 @@
\ \
if ((_ret = _fn) != 0) { \ if ((_ret = _fn) != 0) { \
ESP_LOGV(TAG, "\"%s\" result is -0x%x", # _fn, -_ret); \ ESP_LOGV(TAG, "\"%s\" result is -0x%x", # _fn, -_ret); \
if (_ret == MBEDTLS_ERR_SSL_CONN_EOF) {\
return 0; \
} \
TRACE_CHECK(_fn, "fail"); \ TRACE_CHECK(_fn, "fail"); \
return _ret; \ return _ret; \
} \ } \

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

@@ -85,7 +85,16 @@ int __wrap_mbedtls_ssl_read(mbedtls_ssl_context *ssl, unsigned char *buf, size_t
{ {
int ret; int ret;
CHECK_OK(esp_mbedtls_add_rx_buffer(ssl)); ESP_LOGD(TAG, "add mbedtls RX buffer");
ret = esp_mbedtls_add_rx_buffer(ssl);
if (ret == MBEDTLS_ERR_SSL_CONN_EOF) {
ESP_LOGD(TAG, "fail, the connection indicated an EOF");
return 0;
} else if (ret < 0) {
ESP_LOGD(TAG, "fail, error=-0x%x", -ret);
return ret;
}
ESP_LOGD(TAG, "end");
ret = __real_mbedtls_ssl_read(ssl, buf, len); ret = __real_mbedtls_ssl_read(ssl, buf, len);