Skip to content

Commit 665556f

Browse files
authored
Update Mbed TLS to v2.28.5 (#2800)
1 parent 085a5b9 commit 665556f

File tree

7 files changed

+6
-7
lines changed

7 files changed

+6
-7
lines changed

.devcontainer/Dockerfile.All

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-all:v2.38
1+
FROM ghcr.io/nanoframework/dev-container-all:v2.39

.devcontainer/Dockerfile.AzureRTOS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.21
1+
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.22

.devcontainer/scripts/git-pull-repos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHE
1515
cd /sources/ChibiOs-Contrib
1616
git pull origin nanoframework
1717
cd /sources/mbedtls
18-
git pull origin mbedtls-2.28.2
18+
git pull origin mbedtls-2.28.5
1919
cd /sources/fatfs
2020
git pull origin R0.14b
2121
cd /sources/FreeRTOS

.devcontainer/sources/Dockerfile.All

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
7878
&& git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo \
7979
&& git clone --branch nanoframework https://github.com/nanoframework/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
8080
# Clone mbedtls and fatfs
81-
RUN git clone --branch mbedtls-2.28.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
81+
RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
8282
&& git clone --branch R0.14b https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
8383
# Clone FreeRTOS and what is needed for ESP32
8484
RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-Kernel.git --depth 1 ./sources/FreeRTOS \

.devcontainer/sources/Dockerfile.AzureRTOS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ RUN git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x
5757
&& git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo
5858

5959
# Clone mbedtls and fatfs
60-
RUN git clone --branch mbedtls-2.28.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
60+
RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
6161
&& git clone --branch R0.14b https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
6262
&& git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs
6363

src/PAL/COM/sockets/ssl/MbedTLS/nf_mbedtls_config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ extern "C"
103103
#define MBEDTLS_CMAC_C
104104

105105
/* Mbed TLS modules */
106-
#define MBEDTLS_AESNI_C
107106
#define MBEDTLS_AES_C
108107
#define MBEDTLS_ASN1_PARSE_C
109108
#define MBEDTLS_ASN1_WRITE_C

targets/ChibiOS/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ if(USE_SECURITY_MBEDTLS_OPTION)
223223

224224
# set tag for currently supported version
225225
# WHEN CHANGING THIS MAKE SURE TO UPDATE THE DEV CONTAINERS
226-
set(MBEDTLS_GIT_TAG "mbedtls-2.28.2")
226+
set(MBEDTLS_GIT_TAG "mbedtls-2.28.5")
227227

228228
# set options for Mbed TLS
229229
option(ENABLE_TESTING "no testing when building Mbed TLS." OFF)

0 commit comments

Comments
 (0)