Update Mbed TLS to v2.28.5 (#2800)

nanoframework · Oct 24, 2023 · 665556f · 665556f
1 parent 085a5b9
commit 665556f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/.devcontainer/Dockerfile.All b/.devcontainer/Dockerfile.All
@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-all:v2.38
+FROM ghcr.io/nanoframework/dev-container-all:v2.39
diff --git a/.devcontainer/Dockerfile.AzureRTOS b/.devcontainer/Dockerfile.AzureRTOS
@@ -1 +1 @@
-FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.21
+FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.22
diff --git a/.devcontainer/scripts/git-pull-repos.sh b/.devcontainer/scripts/git-pull-repos.sh
@@ -15,7 +15,7 @@ git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHE
 cd /sources/ChibiOs-Contrib
 git pull origin nanoframework
 cd /sources/mbedtls
-git pull origin mbedtls-2.28.2
+git pull origin mbedtls-2.28.5
 cd /sources/fatfs
 git pull origin R0.14b
 cd /sources/FreeRTOS

diff --git a/.devcontainer/sources/Dockerfile.All b/.devcontainer/sources/Dockerfile.All
@@ -78,7 +78,7 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
     && git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo \
     && git clone --branch nanoframework https://github.com/nanoframework/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
 # Clone mbedtls and fatfs
-RUN git clone --branch mbedtls-2.28.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
+RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
     && git clone --branch R0.14b https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
 # Clone FreeRTOS and what is needed for ESP32
 RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-Kernel.git --depth 1 ./sources/FreeRTOS \

diff --git a/.devcontainer/sources/Dockerfile.AzureRTOS b/.devcontainer/sources/Dockerfile.AzureRTOS
@@ -57,7 +57,7 @@ RUN git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x
     && git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo
 
 # Clone mbedtls and fatfs
-RUN git clone --branch mbedtls-2.28.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
+RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
     && git clone --branch R0.14b https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
     && git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs
 

diff --git a/src/PAL/COM/sockets/ssl/MbedTLS/nf_mbedtls_config.h b/src/PAL/COM/sockets/ssl/MbedTLS/nf_mbedtls_config.h
@@ -103,7 +103,6 @@ extern "C"
 #define MBEDTLS_CMAC_C
 
 /* Mbed TLS modules */
-#define MBEDTLS_AESNI_C
 #define MBEDTLS_AES_C
 #define MBEDTLS_ASN1_PARSE_C
 #define MBEDTLS_ASN1_WRITE_C

diff --git a/targets/ChibiOS/CMakeLists.txt b/targets/ChibiOS/CMakeLists.txt
@@ -223,7 +223,7 @@ if(USE_SECURITY_MBEDTLS_OPTION)
 
     # set tag for currently supported version
     # WHEN CHANGING THIS MAKE SURE TO UPDATE THE DEV CONTAINERS
-    set(MBEDTLS_GIT_TAG "mbedtls-2.28.2")
+    set(MBEDTLS_GIT_TAG "mbedtls-2.28.5")
 
     # set options for Mbed TLS
     option(ENABLE_TESTING "no testing when building Mbed TLS." OFF)