mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-11 18:40:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disable MBEDTLS_PSA_CRYPTO_CLIENT in no-PSA builds

Browse Source 
When building without PSA crypto functions, disable
MBEDTLS_PSA_CRYPTO_CLIENT as well as MBEDTLS_PSA_CRYPTO_C. With
just MBEDTLS_PSA_CRYPTO_CLIENT, PSA crypto API functions are supposed to
exist at link time but be provided by a third party.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2024-01-23 20:25:47 +01:00
parent 00f3085163
commit 64996c3be9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/scripts/all.sh
View File

@ -1552,6 +1552,7 @@ component_test_full_no_cipher_no_psa_crypto () {
scripts/config.py unset MBEDTLS_CMAC_C scripts/config.py unset MBEDTLS_CMAC_C
scripts/config.py unset MBEDTLS_NIST_KW_C scripts/config.py unset MBEDTLS_NIST_KW_C
scripts/config.py unset MBEDTLS_PSA_CRYPTO_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_C
scripts/config.py unset MBEDTLS_PSA_CRYPTO_CLIENT
scripts/config.py unset MBEDTLS_SSL_TLS_C scripts/config.py unset MBEDTLS_SSL_TLS_C
scripts/config.py unset MBEDTLS_SSL_TICKET_C scripts/config.py unset MBEDTLS_SSL_TICKET_C
# Disable features that depend on PSA_CRYPTO_C # Disable features that depend on PSA_CRYPTO_C
@ -2430,11 +2431,12 @@ component_build_dhm_alt () {
make CFLAGS='-Werror -Wall -Wextra -I../tests/include/alt-dummy' lib make CFLAGS='-Werror -Wall -Wextra -I../tests/include/alt-dummy' lib
} }
component_test_no_use_psa_crypto_full_cmake_asan() { component_test_no_psa_crypto_full_cmake_asan() {
# full minus MBEDTLS_USE_PSA_CRYPTO: run the same set of tests as basic-build-test.sh # full minus MBEDTLS_PSA_CRYPTO_C: run the same set of tests as basic-build-test.sh
msg "build: cmake, full config minus MBEDTLS_USE_PSA_CRYPTO, ASan" msg "build: cmake, full config minus PSA crypto, ASan"
scripts/config.py full scripts/config.py full
scripts/config.py unset MBEDTLS_PSA_CRYPTO_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_C
scripts/config.py unset MBEDTLS_PSA_CRYPTO_CLIENT
scripts/config.py unset MBEDTLS_USE_PSA_CRYPTO scripts/config.py unset MBEDTLS_USE_PSA_CRYPTO
scripts/config.py unset MBEDTLS_SSL_PROTO_TLS1_3 scripts/config.py unset MBEDTLS_SSL_PROTO_TLS1_3
scripts/config.py unset MBEDTLS_PSA_ITS_FILE_C scripts/config.py unset MBEDTLS_PSA_ITS_FILE_C
@ -2445,7 +2447,7 @@ component_test_no_use_psa_crypto_full_cmake_asan() {
CC=$ASAN_CC cmake -D CMAKE_BUILD_TYPE:String=Asan . CC=$ASAN_CC cmake -D CMAKE_BUILD_TYPE:String=Asan .
make make
msg "test: main suites (full minus MBEDTLS_USE_PSA_CRYPTO)" msg "test: main suites (full minus PSA crypto)"
make test make test
# Note: ssl-opt.sh has some test cases that depend on # Note: ssl-opt.sh has some test cases that depend on