From daa322a2de821343795da355ec122eef92bae8c3 Mon Sep 17 00:00:00 2001 From: Ryan Everett Date: Thu, 18 Apr 2024 16:48:55 +0100 Subject: [PATCH 1/2] Update component_test_psa_crypto_rsa_no_genprime Prepare this component for PSA_CRYPTO_CONFIG to be on by default. Rename it so that the name is still accurate when we remove legacy symbols Signed-off-by: Ryan Everett --- tests/scripts/all.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 2c800ffb09..66150725b1 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1366,12 +1366,13 @@ component_build_full_psa_crypto_client_without_crypto_provider () { grep mbedtls_pk_copy_from_psa library/libmbedcrypto.a } -component_test_psa_crypto_rsa_no_genprime() { - msg "build: default config minus MBEDTLS_GENPRIME" +component_test_no_rsa_key_pair_generation() { + msg "build: default config minus PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" scripts/config.py unset MBEDTLS_GENPRIME + scripts/config.py -f $CRYPTO_CONFIG_H unset PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE make - msg "test: default config minus MBEDTLS_GENPRIME" + msg "test: default config minus PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" make test } From fcd744fe69053f82c0ce32be5974e00c1fe6d2eb Mon Sep 17 00:00:00 2001 From: Ryan Everett Date: Mon, 22 Apr 2024 10:44:24 +0100 Subject: [PATCH 2/2] Set MBEDTLS_PSA_CRYPTO_CONFIG in component_test_no_rsa_key_pair_gen Signed-off-by: Ryan Everett --- tests/scripts/all.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 66150725b1..985d14d39f 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1368,6 +1368,7 @@ component_build_full_psa_crypto_client_without_crypto_provider () { component_test_no_rsa_key_pair_generation() { msg "build: default config minus PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" + scripts/config.py set MBEDTLS_PSA_CRYPTO_CONFIG scripts/config.py unset MBEDTLS_GENPRIME scripts/config.py -f $CRYPTO_CONFIG_H unset PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE make