diff --git a/scripts/config.py b/scripts/config.py index 34b79e0320..79e8e4e09d 100755 --- a/scripts/config.py +++ b/scripts/config.py @@ -185,7 +185,6 @@ EXCLUDE_FROM_FULL = frozenset([ 'MBEDTLS_PLATFORM_NO_STD_FUNCTIONS', # removes a feature 'MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT', # similar to non-platform xxx_ALT, requires platform_alt.h 'MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER', # variant toggle - 'MBEDTLS_PSA_CRYPTO_SE_C', 'MBEDTLS_PSA_CRYPTO_SPM', # platform dependency (PSA SPM) 'MBEDTLS_PSA_INJECT_ENTROPY', # build dependency (hook functions) 'MBEDTLS_REMOVE_3DES_CIPHERSUITES', # removes a feature diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 1085de0a22..34e71c79e0 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -985,6 +985,7 @@ component_test_no_use_psa_crypto_full_cmake_asan() { scripts/config.py unset MBEDTLS_PSA_CRYPTO_C scripts/config.py unset MBEDTLS_USE_PSA_CRYPTO scripts/config.py unset MBEDTLS_PSA_ITS_FILE_C + scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_STORAGE_C CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan . make @@ -1373,16 +1374,6 @@ component_test_se_default () { make test } -component_test_se_full () { - msg "build: full config + MBEDTLS_PSA_CRYPTO_SE_C" - scripts/config.py full - scripts/config.py set MBEDTLS_PSA_CRYPTO_SE_C - make CC=gcc CFLAGS="$ASAN_CFLAGS -O2" LDFLAGS="$ASAN_CFLAGS" - - msg "test: full config + MBEDTLS_PSA_CRYPTO_SE_C" - make test -} - component_test_make_shared () { msg "build/test: make shared" # ~ 40s make SHARED=1 all check diff --git a/tests/scripts/basic-build-test.sh b/tests/scripts/basic-build-test.sh index aca2f11fb4..5080c57908 100755 --- a/tests/scripts/basic-build-test.sh +++ b/tests/scripts/basic-build-test.sh @@ -68,10 +68,9 @@ export LDFLAGS=' --coverage' make clean cp "$CONFIG_H" "$CONFIG_BAK" scripts/config.py full -# Enable some deprecated or experimental features that are not in the +# Enable some deprecated features that are not in the # full config, but are compatible with it and have tests. scripts/config.py set MBEDTLS_SSL_PROTO_SSL3 -scripts/config.py set MBEDTLS_PSA_CRYPTO_SE_C make -j