From fb9f9cc3bbb9d80e7365bb8f755c37a18c0f1bdf Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 3 Oct 2019 13:07:14 -0400 Subject: [PATCH] reduced tls maximum message content length in menuconfig to 4KB --- arduino/libraries/WiFi/src/WiFiSSLClient.cpp | 7 ++++++- sdkconfig | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arduino/libraries/WiFi/src/WiFiSSLClient.cpp b/arduino/libraries/WiFi/src/WiFiSSLClient.cpp index 669f0d3..22b4924 100644 --- a/arduino/libraries/WiFi/src/WiFiSSLClient.cpp +++ b/arduino/libraries/WiFi/src/WiFiSSLClient.cpp @@ -218,7 +218,7 @@ int WiFiSSLClient::connect(const char* host, uint16_t port, const char* client_c // set own certificate chain and key ret = mbedtls_ssl_conf_own_cert(&_sslConfig, &_clientCrt, &_clientKey); if (ret != 0) { - if (ret == -0x7F00) { + if (ret == -0x7f00) { ets_printf("Memory allocation failed, MBEDTLS_ERR_SSL_ALLOC_FAILED"); } ets_printf("Private key not parsed properly: %d\n", ret); @@ -235,6 +235,10 @@ int WiFiSSLClient::connect(const char* host, uint16_t port, const char* client_c ets_printf("*** connect ssl setup\n"); if ((ret = mbedtls_ssl_setup(&_sslContext, &_sslConfig)) != 0) { + if (ret == -0x7f00){ + ets_printf("MBEDTLS_ERR_SSL_ALLOC_FAILED"); + ets_printf("Free internal heap after TLS %u", heap_caps_get_free_size(MALLOC_CAP_8BIT)); + } ets_printf("Unable to connect ssl setup %d", ret); stop(); return 0; @@ -260,6 +264,7 @@ int WiFiSSLClient::connect(const char* host, uint16_t port, const char* client_c } if((millis() - start_handshake) > handshake_timeout){ ets_printf("Handshake timeout"); + stop(); return -1; } vTaskDelay(10 / portTICK_PERIOD_MS); diff --git a/sdkconfig b/sdkconfig index 80d13e3..ddfac98 100644 --- a/sdkconfig +++ b/sdkconfig @@ -514,7 +514,7 @@ CONFIG_LWIP_MAX_RAW_PCBS=16 CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC= CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC= -CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 +CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=4000 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN= CONFIG_MBEDTLS_DEBUG= CONFIG_MBEDTLS_HARDWARE_AES=y