Enable sources when MCUBOOT_USE_PSA_CRYPTO and not MBEDTLS_PSA_CRYPTO_C

adeaarm · tomi-font · commit dd5801b6975a · 2024-09-02T15:04:02.000+03:00
Gate relevant files for the thin PSA crypto core on MCUBOOT_USE_PSA_CRYPTO
during BL2 build instead of MBEDTLS_PSA_CRYPTO_C which is not defined in
such case. A full solution might require a change in config strategy of
Mbed TLS with the definition

Signed-off-by: Antonio de Angelis &lt;antonio.deangelis@arm.com&gt;

applied using:
git am modules/tee/tf-m/trusted-firmware-m/lib/ext/mbedcrypto/\
0007-Enable-sources-when-MCUBOOT_USE_PSA_CRYPTO-and-not-M.patch

Signed-off-by: Tomi Fontanilles &lt;tomi.fontanilles@nordicsemi.no&gt;
diff --git a/include/mbedtls/psa_util.h b/include/mbedtls/psa_util.h
@@ -21,7 +21,7 @@
  * otherwise error codes would be unknown in test_suite_psa_crypto_util.data.*/
 #include <mbedtls/asn1write.h>
 
-#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
+#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) || defined(MCUBOOT_USE_PSA_CRYPTO)
 
 /** The random generator function for the PSA subsystem.
  *
diff --git a/library/psa_crypto_driver_wrappers.h b/library/psa_crypto_driver_wrappers.h
@@ -23,7 +23,7 @@
 #include "mbedtls/constant_time.h"
 /* END-common headers */
 
-#if defined(MBEDTLS_PSA_CRYPTO_C)
+#if defined(MBEDTLS_PSA_CRYPTO_C) || defined(MCUBOOT_USE_PSA_CRYPTO)
 
 /* BEGIN-driver headers */
 /* Headers for mbedtls_test opaque driver */
diff --git a/library/psa_crypto_ecp.c b/library/psa_crypto_ecp.c
@@ -8,7 +8,7 @@
 
 #include "common.h"
 
-#if defined(MBEDTLS_PSA_CRYPTO_C)
+#if defined(MBEDTLS_PSA_CRYPTO_C) || defined(MCUBOOT_USE_PSA_CRYPTO)
 
 #include <psa/crypto.h>
 #include "psa_crypto_core.h"
diff --git a/library/psa_crypto_hash.c b/library/psa_crypto_hash.c
@@ -8,7 +8,7 @@
 
 #include "common.h"
 
-#if defined(MBEDTLS_PSA_CRYPTO_C)
+#if defined(MBEDTLS_PSA_CRYPTO_C) || defined(MCUBOOT_USE_PSA_CRYPTO)
 
 #include <psa/crypto.h>
 #include "psa_crypto_core.h"
diff --git a/library/psa_crypto_rsa.c b/library/psa_crypto_rsa.c
@@ -8,7 +8,7 @@
 
 #include "common.h"
 
-#if defined(MBEDTLS_PSA_CRYPTO_C)
+#if defined(MBEDTLS_PSA_CRYPTO_C) || defined(MCUBOOT_USE_PSA_CRYPTO)
 
 #include <psa/crypto.h>
 #include "psa/crypto_values.h"

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`* otherwise error codes would be unknown in test_suite_psa_crypto_util.data.*/`
`22`	`22`	`#include <mbedtls/asn1write.h>`
`23`	`23`
`24`		`-#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)`
	`24`	`+#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) \|\| defined(MCUBOOT_USE_PSA_CRYPTO)`
`25`	`25`
`26`	`26`	`/** The random generator function for the PSA subsystem.`
`27`	`27`	`*`