Commit b1883510 authored by David Cunado's avatar David Cunado
Browse files

mbedtls: Namespace for TF specific macros



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: default avatarDavid Cunado <david.cunado@arm.com>
parent b4b541cb
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
/* /*
* mbed TLS heap * 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) #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) #define MBEDTLS_HEAP_SIZE (8*1024)
#endif #endif
static unsigned char heap[MBEDTLS_HEAP_SIZE]; static unsigned char heap[MBEDTLS_HEAP_SIZE];
......
...@@ -31,18 +31,18 @@ ifeq (${MBEDTLS_KEY_ALG},ecdsa) ...@@ -31,18 +31,18 @@ ifeq (${MBEDTLS_KEY_ALG},ecdsa)
ecp_curves.c \ ecp_curves.c \
ecp.c \ ecp.c \
) )
TBBR_KEY_ALG_ID := TBBR_ECDSA TF_MBEDTLS_KEY_ALG_ID := TF_MBEDTLS_ECDSA
else ifeq (${MBEDTLS_KEY_ALG},rsa) else ifeq (${MBEDTLS_KEY_ALG},rsa)
MBEDTLS_CRYPTO_SOURCES += $(addprefix ${MBEDTLS_DIR}/library/, \ MBEDTLS_CRYPTO_SOURCES += $(addprefix ${MBEDTLS_DIR}/library/, \
rsa.c \ rsa.c \
) )
TBBR_KEY_ALG_ID := TBBR_RSA TF_MBEDTLS_KEY_ALG_ID := TF_MBEDTLS_RSA
else else
$(error "MBEDTLS_KEY_ALG=${MBEDTLS_KEY_ALG} not supported on mbed TLS") $(error "MBEDTLS_KEY_ALG=${MBEDTLS_KEY_ALG} not supported on mbed TLS")
endif endif
# Needs to be set to drive mbed TLS configuration correctly # 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} BL1_SOURCES += ${MBEDTLS_CRYPTO_SOURCES}
BL2_SOURCES += ${MBEDTLS_CRYPTO_SOURCES} BL2_SOURCES += ${MBEDTLS_CRYPTO_SOURCES}
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
/* /*
* Key algorithms currently supported on mbed TLS libraries * Key algorithms currently supported on mbed TLS libraries
*/ */
#define TBBR_RSA 1 #define TF_MBEDTLS_RSA 1
#define TBBR_ECDSA 2 #define TF_MBEDTLS_ECDSA 2
/* /*
* Configuration file to build mbed TLS with the required features for * Configuration file to build mbed TLS with the required features for
...@@ -45,11 +45,11 @@ ...@@ -45,11 +45,11 @@
#define MBEDTLS_PLATFORM_C #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_ECDSA_C
#define MBEDTLS_ECP_C #define MBEDTLS_ECP_C
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED #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 #define MBEDTLS_RSA_C
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment