test suites: Refactored component_test_ccm_aes_sha256.
This commit moves the tf-psa-crypto configuration options
for this test to `crypto-config-ccm-aes-sha256.h`.
A blank MbedTLS configuration file is now used for the library
side.
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
diff --git a/configs/crypto-config-ccm-aes-sha256.h b/configs/crypto-config-ccm-aes-sha256.h
index 68a9c0a..be8a746 100644
--- a/configs/crypto-config-ccm-aes-sha256.h
+++ b/configs/crypto-config-ccm-aes-sha256.h
@@ -20,4 +20,9 @@
#define PSA_WANT_KEY_TYPE_AES 1
#define PSA_WANT_KEY_TYPE_RAW_DATA 1
+
+#define MBEDTLS_PSA_CRYPTO_C
+#define MBEDTLS_CTR_DRBG_C
+#define MBEDTLS_ENTROPY_C
+
#endif /* PSA_CRYPTO_CONFIG_H */
diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh
index 3c897eb..fe8fe91 100644
--- a/tests/scripts/components-configuration-crypto.sh
+++ b/tests/scripts/components-configuration-crypto.sh
@@ -2165,12 +2165,8 @@
component_test_ccm_aes_sha256 () {
msg "build: CCM + AES + SHA256 configuration"
- cp "tf-psa-crypto/tests/configs/config_test_driver.h" "$CONFIG_H"
- head -n -1 configs/crypto-config-ccm-aes-sha256.h > "$CRYPTO_CONFIG_H"
- echo "#define MBEDTLS_PSA_CRYPTO_C" >> "$CRYPTO_CONFIG_H"
- echo "#define MBEDTLS_CTR_DRBG_C" >> "$CRYPTO_CONFIG_H"
- echo "#define MBEDTLS_ENTROPY_C" >> "$CRYPTO_CONFIG_H"
- echo "#endif /* PSA_CRYPTO_CONFIG_H */" >> "$CRYPTO_CONFIG_H"
+ # Setting a blank config disables everyhing in the library side.
+ echo '#define MBEDTLS_CONFIG_H ' >"$CONFIG_H"
make
msg "test: CCM + AES + SHA256 configuration"
make test