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

mbedtls: Namespace for TF specific macros

Browse source 
An earlier patch (arm-trusted-firmware#874) migrated MBEDTLS_ suffixed
macros to have a TBBR_ suffix to avoid any potential clash with future
mbedtls macros.

But on reflection the TBBR_ suffix could be confusing as the macros
are used to drive TF-specific configuration of mbedtls. As such
this patch migrates these macros from TBBR_suffix to TF_MBEDTLS_
suffix which more accurately conveys their use.

Change-Id: Ic87642b653ceeaa03d62f724976abd5e12e867d4
Signed-off-by: David Cunado <david.cunado@arm.com>
This commit is contained in:
David Cunado 2017-05-10 16:38:44 +01:00
parent b4b541cb29
commit b188351025
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,9 +12,9 @@
/*
* mbed TLS heap
*/
#if (TBBR_KEY_ALG_ID == TBBR_ECDSA)
#if (TF_MBEDTLS_KEY_ALG_ID == TF_MBEDTLS_ECDSA)
#define MBEDTLS_HEAP_SIZE (14*1024)
#elif (TBBR_KEY_ALG_ID == TBBR_RSA)
#elif (TF_MBEDTLS_KEY_ALG_ID == TF_MBEDTLS_RSA)
#define MBEDTLS_HEAP_SIZE (8*1024)
#endif
static unsigned char heap[MBEDTLS_HEAP_SIZE];

6
drivers/auth/mbedtls/mbedtls_crypto.mk
View file

@ -31,18 +31,18 @@ ifeq (${MBEDTLS_KEY_ALG},ecdsa)
ecp_curves.c \
ecp.c \
)
TBBR_KEY_ALG_ID := TBBR_ECDSA
TF_MBEDTLS_KEY_ALG_ID := TF_MBEDTLS_ECDSA
else ifeq (${MBEDTLS_KEY_ALG},rsa)
MBEDTLS_CRYPTO_SOURCES += $(addprefix ${MBEDTLS_DIR}/library/, \
rsa.c \
)
TBBR_KEY_ALG_ID := TBBR_RSA
TF_MBEDTLS_KEY_ALG_ID := TF_MBEDTLS_RSA
else
$(error "MBEDTLS_KEY_ALG=${MBEDTLS_KEY_ALG} not supported on mbed TLS")
endif
# Needs to be set to drive mbed TLS configuration correctly
$(eval $(call add_define,TBBR_KEY_ALG_ID))
$(eval $(call add_define,TF_MBEDTLS_KEY_ALG_ID))
BL1_SOURCES += ${MBEDTLS_CRYPTO_SOURCES}
BL2_SOURCES += ${MBEDTLS_CRYPTO_SOURCES}

8
include/drivers/auth/mbedtls/mbedtls_config.h
View file

@ -9,8 +9,8 @@
/*
* Key algorithms currently supported on mbed TLS libraries
*/
#define TBBR_RSA 1
#define TBBR_ECDSA 2
#define TF_MBEDTLS_RSA 1
#define TF_MBEDTLS_ECDSA 2
/*
* Configuration file to build mbed TLS with the required features for
@ -45,11 +45,11 @@
#define MBEDTLS_PLATFORM_C
#if (TBBR_KEY_ALG_ID == TBBR_ECDSA)
#if (TF_MBEDTLS_KEY_ALG_ID == TF_MBEDTLS_ECDSA)
#define MBEDTLS_ECDSA_C
#define MBEDTLS_ECP_C
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
#elif (TBBR_KEY_ALG_ID == TBBR_RSA)
#elif (TF_MBEDTLS_KEY_ALG_ID == TF_MBEDTLS_RSA)
#define MBEDTLS_RSA_C
#endif