From dc3b1540cddf7f15da42ba05bc5e18a2c2c909ab Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Fri, 20 Jan 2023 11:39:00 +0000 Subject: [PATCH 1/3] Fix test guards Signed-off-by: Dave Rodgman --- tests/suites/test_suite_x509write.function | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function index a21ad475a8..03b9baea39 100644 --- a/tests/suites/test_suite_x509write.function +++ b/tests/suites/test_suite_x509write.function @@ -345,7 +345,7 @@ void x509_crt_check(char *subject_key_file, char *subject_pwd, issuer_key_type = mbedtls_pk_get_type(&issuer_key); -#if defined(MBEDTLS_RSA_C) +#if defined(MBEDTLS_RSA_C) && defined(MBEDTLS_PK_RSA_ALT_SUPPORT) /* For RSA PK contexts, create a copy as an alternative RSA context. */ if (pk_wrap == 1 && issuer_key_type == MBEDTLS_PK_RSA) { TEST_ASSERT(mbedtls_pk_setup_rsa_alt(&issuer_key_alt, From fd09b310110e7bfa182280827b7fcaa6e76288f0 Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Fri, 20 Jan 2023 11:41:43 +0000 Subject: [PATCH 2/3] Add Changelog Signed-off-by: Dave Rodgman --- ChangeLog.d/fix-rsaalt-test-guards.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ChangeLog.d/fix-rsaalt-test-guards.txt diff --git a/ChangeLog.d/fix-rsaalt-test-guards.txt b/ChangeLog.d/fix-rsaalt-test-guards.txt new file mode 100644 index 0000000000..f4f39c9e53 --- /dev/null +++ b/ChangeLog.d/fix-rsaalt-test-guards.txt @@ -0,0 +1,3 @@ +Bugfix + * Fix compile error where MBEDTLS_RSA_C and MBEDTLS_X509_CRT_WRITE_C are + defined, but MBEDTLS_PK_RSA_ALT_SUPPORT is not defined. Fixes #3174. From 1a034dcc20f303589aedbfc72d11bdf39ec00ec9 Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Fri, 20 Jan 2023 13:18:05 +0000 Subject: [PATCH 3/3] Add regression test Signed-off-by: Dave Rodgman --- tests/scripts/all.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 1e10da04c1..bf40764921 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1948,6 +1948,18 @@ component_test_depends_py_pkalgs_psa () { tests/scripts/depends.py pkalgs } +component_build_no_pk_rsa_alt_support () { + msg "build: !MBEDTLS_PK_RSA_ALT_SUPPORT" # ~30s + + scripts/config.py full + scripts/config.py unset MBEDTLS_PK_RSA_ALT_SUPPORT + scripts/config.py set MBEDTLS_RSA_C + scripts/config.py set MBEDTLS_X509_CRT_WRITE_C + + # Only compile - this is primarily to test for compile issues + make CC=gcc CFLAGS='-Werror -Wall -Wextra -I../tests/include/alt-dummy' +} + component_build_module_alt () { msg "build: MBEDTLS_XXX_ALT" # ~30s scripts/config.py full