Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-30 07:39:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from topic "update-mbedtls-to-3.6.2" into integration

Browse source 
* changes:
  feat(mbedtls): mbedtls config update for v3.6.2
  docs(prerequisites): update mbedtls to version 3.6.2
  refactor(mbedtls): rename default mbedtls confs
This commit is contained in:
Manish V Badarkhe 2024-12-11 14:55:43 +01:00 • committed by TrustedFirmware Code Review
commit 7dc43344c4
6 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/getting_started/prerequisites.rst
View file

@ -31,7 +31,7 @@ Arm GNU Compiler 13.3
Clang/LLVM 18.1.8 Clang/LLVM 18.1.8
Device Tree Compiler 1.6.1 Device Tree Compiler 1.6.1
GNU make 3.81 GNU make 3.81
mbed TLS\ [#f1]_ 3.6.1 mbed TLS\ [#f1]_ 3.6.2
Node.js [#f2]_ 16 Node.js [#f2]_ 16
OpenSSL 1.0.0 OpenSSL 1.0.0
Poetry 1.3.2 Poetry 1.3.2

4
drivers/auth/mbedtls/mbedtls_common.mk
View file

@ -25,9 +25,9 @@ endif
# Specify mbed TLS configuration file # Specify mbed TLS configuration file
ifeq (${PSA_CRYPTO},1) ifeq (${PSA_CRYPTO},1)
MBEDTLS_CONFIG_FILE ?= "<drivers/auth/mbedtls/psa_mbedtls_config.h>" MBEDTLS_CONFIG_FILE ?= "<drivers/auth/mbedtls/default_psa_mbedtls_config.h>"
else else
MBEDTLS_CONFIG_FILE ?= "<drivers/auth/mbedtls/mbedtls_config-3.h>" MBEDTLS_CONFIG_FILE ?= "<drivers/auth/mbedtls/default_mbedtls_config.h>"
endif endif
$(eval $(call add_define,MBEDTLS_CONFIG_FILE)) $(eval $(call add_define,MBEDTLS_CONFIG_FILE))

5
include/drivers/auth/mbedtls/mbedtls_config-3.h → include/drivers/auth/mbedtls/default_mbedtls_config.h
View file

@ -10,6 +10,11 @@
* memory footprint. * memory footprint.
*/ */
/*
* This file is compatible with versions >= 3.6.2
*/
#define MBEDTLS_CONFIG_VERSION 0x03060200
/* /*
* Key algorithms currently supported on mbed TLS libraries * Key algorithms currently supported on mbed TLS libraries
*/ */

2
include/drivers/auth/mbedtls/psa_mbedtls_config.h → include/drivers/auth/mbedtls/default_psa_mbedtls_config.h
View file

@ -7,7 +7,7 @@
#ifndef PSA_MBEDTLS_CONFIG_H #ifndef PSA_MBEDTLS_CONFIG_H
#define PSA_MBEDTLS_CONFIG_H #define PSA_MBEDTLS_CONFIG_H
#include "mbedtls_config-3.h" #include "default_mbedtls_config.h"
#define MBEDTLS_PSA_CRYPTO_C #define MBEDTLS_PSA_CRYPTO_C
#define MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS #define MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS

2
plat/arm/board/tc/plat_tc_mbedtls_config.h
View file

@ -8,7 +8,7 @@
#define PLAT_TC_MBEDTLS_CONFIG_H #define PLAT_TC_MBEDTLS_CONFIG_H
#include <export/lib/utils_def_exp.h> #include <export/lib/utils_def_exp.h>
#include <mbedtls_config-3.h> #include <default_mbedtls_config.h>
#ifndef TF_MBEDTLS_HEAP_SIZE #ifndef TF_MBEDTLS_HEAP_SIZE
#error TF_MBEDTLS_HEAP_SIZE is not defined #error TF_MBEDTLS_HEAP_SIZE is not defined

2
plat/arm/common/plat_arm_mbedtls_config.h
View file

@ -7,7 +7,7 @@
#ifndef PLAT_ARM_MBEDTLS_CONFIG_H #ifndef PLAT_ARM_MBEDTLS_CONFIG_H
#define PLAT_ARM_MBEDTLS_CONFIG_H #define PLAT_ARM_MBEDTLS_CONFIG_H
#include <mbedtls_config-3.h> #include <default_mbedtls_config.h>
/** /**
* On Arm platforms, the ROTPK is always hashed using the SHA-256 * On Arm platforms, the ROTPK is always hashed using the SHA-256