diff options
| author | David Cunado <david.cunado@arm.com> | 2017-05-10 16:38:44 +0100 |
|---|---|---|
| committer | David Cunado <david.cunado@arm.com> | 2017-05-12 14:44:35 +0100 |
| commit | b18835102534381365aab391a0f9ce14f3c97331 (patch) | |
| tree | 05897343b246a21ae3d1957ffe2259610a172712 | |
| parent | b4b541cb29e13da89b886c1c6b6fb251f9282a6c (diff) | |
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: David Cunado <david.cunado@arm.com>
| -rw-r--r-- | drivers/auth/mbedtls/mbedtls_common.c | 4 | ||||
| -rw-r--r-- | drivers/auth/mbedtls/mbedtls_crypto.mk | 6 | ||||
| -rw-r--r-- | include/drivers/auth/mbedtls/mbedtls_config.h | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/auth/mbedtls/mbedtls_common.c b/drivers/auth/mbedtls/mbedtls_common.c index c71f81ea..aad49a71 100644 --- a/drivers/auth/mbedtls/mbedtls_common.c +++ b/drivers/auth/mbedtls/mbedtls_common.c @@ -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]; diff --git a/drivers/auth/mbedtls/mbedtls_crypto.mk b/drivers/auth/mbedtls/mbedtls_crypto.mk index 578fc106..11df5ad3 100644 --- a/drivers/auth/mbedtls/mbedtls_crypto.mk +++ b/drivers/auth/mbedtls/mbedtls_crypto.mk @@ -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} diff --git a/include/drivers/auth/mbedtls/mbedtls_config.h b/include/drivers/auth/mbedtls/mbedtls_config.h index edb294ab..7d8d17c3 100644 --- a/include/drivers/auth/mbedtls/mbedtls_config.h +++ b/include/drivers/auth/mbedtls/mbedtls_config.h @@ -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 |