Support for Espressif chipsets via ESP-IDF

.github/workflows/ci.yml

@@ -123,10 +123,10 @@ jobs:
             export CXX="clang++"
           fi
           echo "Using CC: $CC and CXX: $CXX"
-          
+
           mkdir -p build
           cd build
-          
+
           if [[ "${{ matrix.compiler }}" == "gcc" ]]; then
             # Skip building the tests for Mac with GCC
             # https://github.com/awslabs/aws-crt-cpp/issues/605
@@ -246,7 +246,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DBUILD_TEST=ON -DENABLE_AWS_SDK_IN_TESTS=OFF -DUSE_OPENSSL=OFF -DUSE_MBEDTLS=ON
+          cmake .. -DBUILD_TEST=ON -DENABLE_AWS_SDK_IN_TESTS=OFF -DUSE_OPENSSL=OFF -DUSE_MBEDTLS=ON -DBUILD_OLD_MBEDTLS_VERSION=ON
           make -j
 
       - name: Configure AWS Credentials

.gitignore

@@ -12,3 +12,7 @@ tags
 CMakeLists.txt.user
 *.vscode
 *.swp
+
+sdkconfig
+sdkconfig.old
+dependencies.lock

CMake/Dependencies/libmbedtls-CMakeLists.txt

@@ -4,6 +4,12 @@ project(libmbedtls-download NONE)
 
 include(ExternalProject)
 
+if (BUILD_OLD_MBEDTLS_VERSION)
+  SET(MBEDTLS_GIT_TAG "v2.28.8")
+else()
+  SET(MBEDTLS_GIT_TAG "v3.6.3")
+endif()
+
 if (BUILD_STATIC_LIBS)
   set(BUILD_SHARED 0)
 else()
@@ -21,7 +27,7 @@ message(STATUS "C flags here are ${CMAKE_C_FLAGS}")
 ExternalProject_Add(
   project_libmbedtls
   GIT_REPOSITORY  https://github.com/ARMmbed/mbedtls.git
-  GIT_TAG         v2.28.8
+  GIT_TAG         ${MBEDTLS_GIT_TAG}
   GIT_PROGRESS    TRUE
   GIT_SHALLOW     TRUE
   PREFIX          ${CMAKE_CURRENT_BINARY_DIR}/build
@@ -32,6 +38,6 @@ ExternalProject_Add(
     -DCMAKE_MACOSX_RPATH=${CMAKE_MACOSX_RPATH}
     -DENABLE_TESTING=OFF
     -DENABLE_PROGRAMS=OFF
-    -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+    "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -Wno-array-bounds"
   BUILD_ALWAYS    TRUE
   TEST_COMMAND    "")

CMake/Dependencies/libwebsockets-CMakeLists.txt

@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.6.3)
 
 project(libwebsocket-download NONE)
 
-SET(PATCH_COMMAND git apply --verbose --ignore-whitespace ${CMAKE_CURRENT_LIST_DIR}/libwebsockets-old-gcc-fix-cast-cmakelists.patch)
-
 include(ExternalProject)
 if (BUILD_STATIC_LIBS)
   set(LWS_WITH_SHARED 0)
@@ -30,10 +28,9 @@ endif()
 
 ExternalProject_Add(project_libwebsockets
     GIT_REPOSITORY    https://github.com/warmcat/libwebsockets.git
-    GIT_TAG           v4.3.3
+    GIT_TAG           v4.3.5
     GIT_PROGRESS      TRUE
     GIT_SHALLOW       TRUE
-    PATCH_COMMAND     ${PATCH_COMMAND}
     PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
     LIST_SEPARATOR    |
     CMAKE_ARGS
@@ -58,7 +55,7 @@ ExternalProject_Add(project_libwebsockets
         -DLWS_MBEDTLS_LIBRARIES=${LWS_MBEDTLS_LIBRARIES}
         -DLWS_MBEDTLS_INCLUDE_DIRS=${LWS_MBEDTLS_INCLUDE_DIRS}
         -DLWS_WITH_MINIMAL_EXAMPLES=1
-        -DLWS_HAVE_PTHREAD_H=1 
+        -DLWS_HAVE_PTHREAD_H=1
         -DLWS_WITH_THREADPOOL=${LWS_WITH_THREADPOOL}
         -DLWS_WITH_ZLIB=0
         -DLWS_HAVE_EVENTFD=0

CMakeLists.txt

@@ -22,6 +22,7 @@ option(ENABLE_KVS_THREADPOOL "Enable support for KVS thread pool in signaling" O
 option(INSTRUMENTED_ALLOCATORS "Enable memory instrumentation" OFF)
 option(ENABLE_AWS_SDK_IN_TESTS "Enable support for compiling AWS SDKs for tests" ON)
 option(ENABLE_STATS_CALCULATION_CONTROL "Enable support for runtime control of ice agent stat calculations." OFF)
+option(BUILD_OLD_MBEDTLS_VERSION "Use MbedTLS version 2.28.8." OFF)
 
 # Developer Flags
 option(BUILD_TEST "Build the testing tree." OFF)
@@ -182,6 +183,7 @@ if(BUILD_DEPENDENCIES)
   elseif(USE_MBEDTLS)
     set(BUILD_ARGS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
                    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                   -DBUILD_OLD_MBEDTLS_VERSION=${BUILD_OLD_MBEDTLS_VERSION}
                     "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -std=c99")
       build_dependency(mbedtls ${BUILD_ARGS})
   endif()
@@ -446,7 +448,7 @@ target_link_libraries(
   kvsWebrtcSignalingClient
   PUBLIC
         kvsCommonLws
-        ${LIBWEBSOCKETS_LIBRARIES} 
+        ${LIBWEBSOCKETS_LIBRARIES}
   PRIVATE kvspicUtils
          kvspicState
          ${CMAKE_THREAD_LIBS_INIT}