From 2b78ffa639bf9492e4351ca147ecddd191f2caf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Fri, 19 Mar 2021 03:27:51 +0000 Subject: [PATCH] Update mbedTLS to 2.26.0 (#1861) --- src/PAL/COM/sockets/ssl/mbedTLS/nf_mbedtls_config.h | 2 ++ targets/CMSIS-OS/ChibiOS/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/PAL/COM/sockets/ssl/mbedTLS/nf_mbedtls_config.h b/src/PAL/COM/sockets/ssl/mbedTLS/nf_mbedtls_config.h index d494b5f404..98c90a40ab 100644 --- a/src/PAL/COM/sockets/ssl/mbedTLS/nf_mbedtls_config.h +++ b/src/PAL/COM/sockets/ssl/mbedTLS/nf_mbedtls_config.h @@ -106,6 +106,7 @@ extern "C" #define MBEDTLS_AES_C #define MBEDTLS_ARC4_C #define MBEDTLS_ASN1_PARSE_C +#define MBEDTLS_ASN1_WRITE_C #define MBEDTLS_BASE64_C @@ -123,6 +124,7 @@ extern "C" #define MBEDTLS_DES_C #define MBEDTLS_DHM_C #define MBEDTLS_ECDH_C +#define MBEDTLS_ECDSA_C #define MBEDTLS_ECP_C diff --git a/targets/CMSIS-OS/ChibiOS/CMakeLists.txt b/targets/CMSIS-OS/ChibiOS/CMakeLists.txt index ed7926f3ed..7553030d0e 100644 --- a/targets/CMSIS-OS/ChibiOS/CMakeLists.txt +++ b/targets/CMSIS-OS/ChibiOS/CMakeLists.txt @@ -209,7 +209,7 @@ if(NF_SECURITY_MBEDTLS) endif() # set tag for currently supported version - set(MBEDTLS_GIT_TAG "mbedtls-2.23.0") + set(MBEDTLS_GIT_TAG "mbedtls-2.26.0") # set options for mbed TLS option(ENABLE_TESTING "no testing when building mbed TLS." OFF) @@ -220,7 +220,7 @@ if(NF_SECURITY_MBEDTLS) FetchContent_Declare( mbedtls - GIT_REPOSITORY https://github.com/nanoframework/mbedtls + GIT_REPOSITORY https://github.com/ARMmbed/mbedtls GIT_TAG ${MBEDTLS_GIT_TAG} )