DvdGiessen
diff --git a/‎ports/esp32/boards/sdkconfig.base
Lines changed: 3 additions & 0 deletions b/‎ports/esp32/boards/sdkconfig.base
Lines changed: 3 additions & 0 deletions
diff --git a/‎ports/esp32/main.c
Lines changed: 10 additions & 0 deletions b/‎ports/esp32/main.c
Lines changed: 10 additions & 0 deletions
@@ -46,6 +46,9 @@ CONFIG_LWIP_PPP_CHAP_SUPPORT=y
 # SSL
 # Use 4kiB output buffer instead of default 16kiB (because IDF heap is fragmented in 4.0)
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
+# Use uPy heap allocator as custom allocator
+CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=n
+CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=y
 
 # ULP coprocessor support
 CONFIG_ESP32_ULP_COPROC_ENABLED=y
 
@@ -67,6 +67,11 @@
 #include "extmod/modbluetooth.h"
 #endif
 
+#if MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS && MICROPY_TRACKED_ALLOC && CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC
+#include "py/misc.h"
+#include "mbedtls/platform.h"
+#endif
+
 // MicroPython runs as a task under FreeRTOS
 #define MP_TASK_PRIORITY        (ESP_TASK_PRIO_MIN + 1)
 #define MP_TASK_STACK_SIZE      (16 * 1024)
@@ -143,6 +148,11 @@ void mp_task(void *pvParameter) {
         mp_task_heap = malloc(mp_task_heap_size);
     }
 
+    #if MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS && MICROPY_TRACKED_ALLOC && CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC
+    // Configure mbedtls to allocate from the heap
+    mbedtls_platform_set_calloc_free(&m_tracked_calloc, &m_tracked_free);
+    #endif
+
 soft_reset:
     // initialise the stack pointer for the main thread
     mp_stack_set_top((void *)sp);