Fix LwIP file altcp_tls_mbedtls.c

altcp_tls_mbedtls.c is not compatible with mbedtls 3.x so use a
patched version until this is resolved.

Make sure MBEDTLS_VERSION_MAJOR is visible to LwIP.

Author: peterharperuk

src/cmake/rp2_common.cmake

@@ -127,9 +127,9 @@ if (NOT PICO_BARE_METAL)
     pico_add_subdirectory(rp2_common/pico_async_context)
     pico_add_subdirectory(rp2_common/pico_btstack)
     pico_add_subdirectory(rp2_common/pico_cyw43_driver)
+    pico_add_subdirectory(rp2_common/pico_mbedtls)
     pico_add_subdirectory(rp2_common/pico_lwip)
     pico_add_subdirectory(rp2_common/pico_cyw43_arch)
-    pico_add_subdirectory(rp2_common/pico_mbedtls)
 
     pico_add_subdirectory(rp2_common/pico_time_adapter)
 

src/rp2_common/pico_lwip/CMakeLists.txt

@@ -235,14 +235,29 @@ if (EXISTS ${PICO_LWIP_PATH}/${LWIP_TEST_PATH})
             ${PICO_LWIP_PATH}/src/apps/tftp/tftp.c
             )
 
+
     # Mbed TLS files
     pico_add_library(pico_lwip_mbedtls NOFLAG)
     target_sources(pico_lwip_mbedtls INTERFACE
-            ${PICO_LWIP_PATH}/src/apps/altcp_tls/altcp_tls_mbedtls.c
             ${PICO_LWIP_PATH}/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c
             ${PICO_LWIP_PATH}/src/apps/snmp/snmpv3_mbedtls.c
             )
 
+    # altcp_tls_mbedtls.c is not compatible with mbedtls 3.x so use a patched version until this is resolved
+    # See https://savannah.nongnu.org/patch/index.php?10448
+    if (MBEDTLS_VERSION_MAJOR AND MBEDTLS_VERSION_MAJOR GREATER_EQUAL  3)
+        target_sources(pico_lwip_mbedtls INTERFACE
+            ${CMAKE_CURRENT_LIST_DIR}/altcp_tls_mbedtls.c
+            )
+        target_include_directories(pico_lwip_mbedtls INTERFACE
+            ${PICO_LWIP_PATH}/src/apps/altcp_tls
+            )
+    else()
+        target_sources(pico_lwip_mbedtls INTERFACE
+            ${PICO_LWIP_PATH}/src/apps/altcp_tls/altcp_tls_mbedtls.c
+            )
+    endif()
+
     # MQTT client files
     pico_add_library(pico_lwip_mqtt NOFLAG)
     target_sources(pico_lwip_mqtt INTERFACE