Merge branch 'develop' into fix-config-mbedtls

found two more
adapt SSL_MAX_CONTENT_LEN size to framework-libs
2026-06-06 02:18:42 +00:00 · 2026-05-22 21:47:13 +01:00 · 2026-05-22 22:43:09 +02:00 · 2026-05-22 22:31:17 +02:00 · 2026-05-22 20:22:15 +01:00 · 2026-05-22 20:41:32 +02:00
1 changed files with 10 additions and 5 deletions
@@ -195,7 +195,7 @@ custom_sdkconfig =
  ;
  ; MBEDTLS
  ;
-  CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192
+  CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 ; do not change, affects buffer allocation (PR10535)
  CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=n
  CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y
  ; Switch to custom CA bundle (for Meshtastic MQTT/etc) in the future
@@ -205,10 +205,15 @@ custom_sdkconfig =
  CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=1
  ; #shame
  CONFIG_MBEDTLS_ALLOW_WEAK_CERTIFICATE_VERIFICATION=y
-  CONFIG_MBEDTLS_SSL_RENEGOTIATION=n
-  CONFIG_MBEDTLS_SSL_PROTO_DTLS=n
-  CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=n
-  CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=n
+  ; These six options must match the precompiled framework-arduinoespressif32-libs
+  ; which was built with all six enabled. Disabling them changes mbedtls_ssl_context
+  ; struct layout, causing an ABI mismatch and a crash in mbedtls_ssl_set_hostname.
+  CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
+  CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+  CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y
+  CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y
+  CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=y
+  CONFIG_MBEDTLS_SSL_ALPN=y
  CONFIG_MBEDTLS_PKCS7_C=n
  CONFIG_MBEDTLS_CAMELLIA_C=n
  CONFIG_MBEDTLS_CCM_C=n
Author	SHA1	Message	Date
Manuel	e1943b0064	Merge branch 'develop' into fix-config-mbedtls	2026-05-22 21:47:13 +01:00
Manuel	132b89cb0d	found two more	2026-05-22 22:43:09 +02:00
Manuel	50dced3fef	adapt SSL_MAX_CONTENT_LEN size to framework-libs	2026-05-22 22:31:17 +02:00
Manuel	2e72dc295f	Merge branch 'develop' into fix-config-mbedtls	2026-05-22 20:22:15 +01:00
Manuel	bb4a315690	fix mbed TLS crash	2026-05-22 20:41:32 +02:00