Crypto: Replace MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS

Use the MBEDTLS_ALLOW_PRIVATE_ACCESS macro to allow access to private
identifiers in TF-PSA-Crypto instead of
MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS. The latter is set automatically as
a consequence of the former. Define the macro with a file scope where
possible to avoid redefinition warnings.

Change-Id: I45312bcb11633c796266e272daf507a518e7aeba
Signed-off-by: David Vincze <david.vincze@arm.com>

Author: davidvincze

lib/ext/cryptocell-312-runtime/codesafe/src/crypto_api/CMakeLists.txt

@@ -114,7 +114,7 @@ target_compile_definitions(${CC312_LIB_TARGET}
     PRIVATE
         # The driver needs to access private identifiers from TF-PSA-Crypto,
         # which were previously exposed in Mbed TLS.
-        MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS
+        MBEDTLS_ALLOW_PRIVATE_ACCESS
 )
 
 ########################## CDMPU ###############################################

platform/ext/target/arm/corstone1000/CMakeLists.txt

@@ -219,11 +219,6 @@ target_compile_definitions(platform_bl1_1
         # can be used if the BL1 target needs different implementation than
         # the TFM_S target.
         BL1_BUILD
-    PRIVATE
-        # c312_rom_crypto.c refers to private identifiers from drivers/builtin/src/sha512.c
-        # Fixme: BL1 crypto layer will need to be be re-implemented using the PSA Crypto API only.
-        #        For now, we need to expose the private identifiers to BL1 code to avoid build errors.
-        MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS
 )
 
 target_include_directories(platform_bl1_1_interface

platform/ext/target/arm/corstone1000/bl1/cc312_rom_crypto.c

@@ -5,6 +5,12 @@
  *
  */
 
+/* BL1 crypto layer still calls mbedtls functions directly which are now
+ * considered a private interface of TF-PSA-Crypto. For now, we need to expose
+ * these private identifiers to avoid build errors.
+ */
+#define MBEDTLS_ALLOW_PRIVATE_ACCESS
+
 #include "bl1_crypto.h"
 
 #include <stdint.h>

platform/ext/target/arm/mps4/common/bl1/crypto_mbedcrypto.c

@@ -5,6 +5,12 @@
  *
  */
 
+/* BL1 crypto layer still calls mbedtls functions directly which are now
+ * considered a private interface of TF-PSA-Crypto. For now, we need to expose
+ * these private identifiers to avoid build errors.
+ */
+#define MBEDTLS_ALLOW_PRIVATE_ACCESS
+
 #include "bl1_crypto.h"
 
 #include <string.h>

platform/ext/target/arm/mps4/common/common.cmake

@@ -362,10 +362,6 @@ target_sources(bl1_1_psa_crypto
         $<$<BOOL:${TFM_BL1_SOFTWARE_CRYPTO}>:${TF_PSA_CRYPTO_PATH}/drivers/builtin/src/psa_crypto_cipher.c>
 )
 
-# Fixme: BL1 crypto layer will need to be be re-implemented using PSA Crypto API only.
-# For now, we need to expose the private identifiers to MPS4 BL1 code to avoid build errors.
-target_compile_definitions(bl1_1_psa_crypto PRIVATE MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS)
-
 #========================= Platform BL1_2 =====================================#
 
 target_add_scatter_file(bl1_2