Crypto: Fix crypto init for any legacy driver
Change-Id: I5192c8e8cb1edaae38ed852f53906a24b3c71553
Signed-off-by: Michel Jaouen <michel.jaouen@st.com>
diff --git a/bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h b/bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h
index 49f2f13..5e3e3ee 100644
--- a/bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h
+++ b/bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h
@@ -82,18 +82,18 @@
#endif /* CRYPTO_HW_ACCELERATOR_OTP_PROVISIONING */
#ifdef CRYPTO_HW_ACCELERATOR
-#ifndef CC312_LEGACY_DRIVER_API_ENABLED
+#ifndef LEGACY_DRIVER_API_ENABLED
/*
* Forcing the legacy driver API enabled all the time regardless of
* cmake configuration in BL2.
*/
-#define CC312_LEGACY_DRIVER_API_ENABLED
-#warning "Use CC312 legacy driver API for BL2"
+#define LEGACY_DRIVER_API_ENABLED
+#warning "Use legacy driver API for BL2"
#include "mbedtls_accelerator_config.h"
-#undef CC312_LEGACY_DRIVER_API_ENABLED
+#undef LEGACY_DRIVER_API_ENABLED
#else
#include "mbedtls_accelerator_config.h"
-#endif /* !CC312_LEGACY_DRIVER_API_ENABLED */
+#endif /* !LEGACY_DRIVER_API_ENABLED */
#endif
#endif /* __MCUBOOT_MBEDTLS_CFG__ */
diff --git a/platform/ext/accelerator/cc312/CMakeLists.txt b/platform/ext/accelerator/cc312/CMakeLists.txt
index 4a022e6..1d25c2e 100644
--- a/platform/ext/accelerator/cc312/CMakeLists.txt
+++ b/platform/ext/accelerator/cc312/CMakeLists.txt
@@ -241,6 +241,7 @@
PUBLIC
CRYPTO_HW_ACCELERATOR
MBEDTLS_ECDH_LEGACY_CONTEXT
+ $<$<BOOL:${CC312_LEGACY_DRIVER_API_ENABLED}>:LEGACY_DRIVER_API_ENABLED>
$<$<BOOL:${CC312_LEGACY_DRIVER_API_ENABLED}>:CC312_LEGACY_DRIVER_API_ENABLED>
)
diff --git a/platform/ext/accelerator/cc312/mbedtls_accelerator_config.h b/platform/ext/accelerator/cc312/mbedtls_accelerator_config.h
index 2506f78..d0f20eb 100644
--- a/platform/ext/accelerator/cc312/mbedtls_accelerator_config.h
+++ b/platform/ext/accelerator/cc312/mbedtls_accelerator_config.h
@@ -23,7 +23,7 @@
#define MBEDTLS_ENTROPY_FORCE_SHA256
/* Main Config */
-#ifdef CC312_LEGACY_DRIVER_API_ENABLED
+#ifdef LEGACY_DRIVER_API_ENABLED
#ifdef MBEDTLS_DHM_C
#define MBEDTLS_DHM_ALT
#endif /* MBEDTLS_DHM_C */
@@ -35,7 +35,7 @@
#ifdef MBEDTLS_POLY1305_C
#define MBEDTLS_POLY1305_ALT
#endif /* MBEDTLS_POLY1305_C */
-#endif /* CC312_LEGACY_DRIVER_API_ENABLED */
+#endif /* LEGACY_DRIVER_API_ENABLED */
/****************************************************************/
/* Require built-in implementations based on PSA requirements */
@@ -49,7 +49,7 @@
#undef PSA_WANT_ALG_CFB
#endif /* PSA_WANT_ALG_CFB */
-#ifdef CC312_LEGACY_DRIVER_API_ENABLED
+#ifdef LEGACY_DRIVER_API_ENABLED
#ifdef PSA_WANT_KEY_TYPE_AES
#define MBEDTLS_AES_ALT
@@ -117,7 +117,7 @@
#define MBEDTLS_ECJPAKE_ALT
#endif
-#endif /* CC312_LEGACY_DRIVER_API_ENABLED */
+#endif /* LEGACY_DRIVER_API_ENABLED */
#if defined(PSA_WANT_ALG_RSA_OAEP) || \
defined(PSA_WANT_ALG_RSA_PKCS1V15_CRYPT) || \
@@ -125,10 +125,10 @@
defined(PSA_WANT_ALG_RSA_PSS) || \
defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR) || \
defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY)
-#ifdef CC312_LEGACY_DRIVER_API_ENABLED
+#ifdef LEGACY_DRIVER_API_ENABLED
#define MBEDTLS_RSA_ALT
#define MBEDTLS_PK_RSA_ALT_SUPPORT
-#endif /* CC312_LEGACY_DRIVER_API_ENABLED */
+#endif /* LEGACY_DRIVER_API_ENABLED */
#define MBEDTLS_GENPRIME
#endif
@@ -143,7 +143,7 @@
#undef MBEDTLS_CIPHER_MODE_CFB
#endif /* MBEDTLS_CIPHER_MODE_CFB */
-#ifdef CC312_LEGACY_DRIVER_API_ENABLED
+#ifdef LEGACY_DRIVER_API_ENABLED
#ifdef MBEDTLS_AES_C
#define MBEDTLS_AES_ALT
@@ -205,13 +205,13 @@
#define MBEDTLS_ECJPAKE_ALT
#endif /* MBEDTLS_ECP_C && MBEDTLS_MD_C */
-#endif /* CC312_LEGACY_DRIVER_API_ENABLED */
+#endif /* LEGACY_DRIVER_API_ENABLED */
#ifdef MBEDTLS_RSA_C
-#ifdef CC312_LEGACY_DRIVER_API_ENABLED
+#ifdef LEGACY_DRIVER_API_ENABLED
#define MBEDTLS_RSA_ALT
#define MBEDTLS_PK_RSA_ALT_SUPPORT
-#endif /* CC312_LEGACY_DRIVER_API_ENABLED */
+#endif /* LEGACY_DRIVER_API_ENABLED */
#define MBEDTLS_GENPRIME
#endif /* MBEDTLS_RSA_C */
diff --git a/platform/ext/accelerator/stm/CMakeLists.txt b/platform/ext/accelerator/stm/CMakeLists.txt
index 81f0820..a63a8e5 100644
--- a/platform/ext/accelerator/stm/CMakeLists.txt
+++ b/platform/ext/accelerator/stm/CMakeLists.txt
@@ -47,6 +47,7 @@
target_compile_definitions(crypto_service_mbedcrypto
PUBLIC
CRYPTO_HW_ACCELERATOR
+ LEGACY_DRIVER_API_ENABLED
)
target_compile_options(crypto_service_mbedcrypto
diff --git a/secure_fw/partitions/crypto/crypto_init.c b/secure_fw/partitions/crypto/crypto_init.c
index 8c115c8..da20896 100644
--- a/secure_fw/partitions/crypto/crypto_init.c
+++ b/secure_fw/partitions/crypto/crypto_init.c
@@ -277,7 +277,7 @@
* performed directly through psa_crypto_init() while the PSA subsystem is
* initialised
*/
-#if defined(CRYPTO_HW_ACCELERATOR) && defined(CC312_LEGACY_DRIVER_API_ENABLED)
+#if defined(CRYPTO_HW_ACCELERATOR) && defined(LEGACY_DRIVER_API_ENABLED)
LOG_INFFMT("[INF][Crypto] Initialising HW accelerator... ");
if (crypto_hw_accelerator_init() != 0) {
return PSA_ERROR_HARDWARE_FAILURE;