ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-20 15:41:25 +08:00
Code Issues Releases Wiki Activity

Merge pull request #6950 from daverodgman/fix-rsaalt-test-guards

Browse Source
This commit is contained in:
Dave Rodgman 2023-01-20 18:28:38 +00:00 committed by GitHub
commit d4fa9e99a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.d/fix-rsaalt-test-guards.txt Normal file
View File

@ -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.

12
tests/scripts/all.sh
View File

@ -1948,6 +1948,18 @@ component_test_depends_py_pkalgs_psa () {
tests/scripts/depends.py pkalgs 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 () { component_build_module_alt () {
msg "build: MBEDTLS_XXX_ALT" # ~30s msg "build: MBEDTLS_XXX_ALT" # ~30s
scripts/config.py full scripts/config.py full

2
tests/suites/test_suite_x509write.function
View File

@ -345,7 +345,7 @@ void x509_crt_check(char *subject_key_file, char *subject_pwd,
issuer_key_type = mbedtls_pk_get_type(&issuer_key); 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. */ /* For RSA PK contexts, create a copy as an alternative RSA context. */
if (pk_wrap == 1 && issuer_key_type == MBEDTLS_PK_RSA) { if (pk_wrap == 1 && issuer_key_type == MBEDTLS_PK_RSA) {
TEST_ASSERT(mbedtls_pk_setup_rsa_alt(&issuer_key_alt, TEST_ASSERT(mbedtls_pk_setup_rsa_alt(&issuer_key_alt,