diff options
author | Ronald Cron <ronald.cron@arm.com> | 2024-03-18 12:39:04 +0100 |
---|---|---|
committer | Ronald Cron <ronald.cron@arm.com> | 2024-03-18 13:06:59 +0100 |
commit | 46ac0658cf155a3fb1eda983790093ad4e4cc205 (patch) | |
tree | a32cc5f9d00bf890174366c0f8ae6aac1470d3ed | |
parent | a3f385d1a8a0b30d3e4b3516e4f65d7aa9053076 (diff) | |
download | mbedtls-46ac0658cf155a3fb1eda983790093ad4e4cc205.zip mbedtls-46ac0658cf155a3fb1eda983790093ad4e4cc205.tar.gz mbedtls-46ac0658cf155a3fb1eda983790093ad4e4cc205.tar.bz2 |
all.sh: Adapt/Fix some components
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
-rwxr-xr-x | tests/scripts/all.sh | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index bf248c8..f0bf7f6 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -2622,7 +2622,6 @@ component_test_psa_crypto_config_accel_ecdsa () { # Start from default config (no USE_PSA) + TLS 1.3 helper_libtestdriver1_adjust_config "default" - scripts/config.py set MBEDTLS_SSL_PROTO_TLS1_3 # Disable the module that's accelerated scripts/config.py unset MBEDTLS_ECDSA_C @@ -2663,7 +2662,7 @@ component_test_psa_crypto_config_accel_ecdh () { # Configure # --------- - # Start from default config (no TLS 1.3, no USE_PSA) + # Start from default config (no USE_PSA) helper_libtestdriver1_adjust_config "default" # Disable the module that's accelerated @@ -3656,7 +3655,7 @@ component_test_psa_crypto_config_accel_hash () { # Configure # --------- - # Start from default config (no TLS 1.3, no USE_PSA) + # Start from default config (no USE_PSA) helper_libtestdriver1_adjust_config "default" # Disable the things that are being accelerated @@ -3700,7 +3699,7 @@ component_test_psa_crypto_config_accel_hash_keep_builtins () { ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512 \ ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512" - # Start from default config (no TLS 1.3, no USE_PSA) + # Start from default config (no USE_PSA) helper_libtestdriver1_adjust_config "default" helper_libtestdriver1_make_drivers "$loc_accel_list" @@ -4195,7 +4194,6 @@ component_build_psa_accel_alg_hkdf() { msg "build: full - MBEDTLS_USE_PSA_CRYPTO + PSA_WANT_ALG_HKDF without MBEDTLS_HKDF_C" scripts/config.py full scripts/config.py unset MBEDTLS_USE_PSA_CRYPTO - scripts/config.py unset MBEDTLS_SSL_PROTO_TLS1_3 scripts/config.py unset MBEDTLS_HKDF_C # Make sure to unset TLS1_3 since it requires HKDF_C and will not build properly without it. scripts/config.py unset MBEDTLS_SSL_PROTO_TLS1_3 @@ -5875,7 +5873,7 @@ support_build_armcc () { } component_test_tls13_only () { - msg "build: default config with MBEDTLS_SSL_PROTO_TLS1_3, without MBEDTLS_SSL_PROTO_TLS1_2" + msg "build: default config without MBEDTLS_SSL_PROTO_TLS1_2" scripts/config.py set MBEDTLS_SSL_EARLY_DATA scripts/config.py set MBEDTLS_SSL_RECORD_SIZE_LIMIT make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/tls13-only.h\"'" @@ -6012,29 +6010,25 @@ component_test_tls13_only_ephemeral_all () { tests/ssl-opt.sh } -component_test_tls13 () { - msg "build: default config with MBEDTLS_SSL_PROTO_TLS1_3 enabled, without padding" - scripts/config.py set MBEDTLS_SSL_PROTO_TLS1_3 - scripts/config.py set MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE +component_test_tls13_no_padding () { + msg "build: default config plus early data minus padding" scripts/config.py set MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY 1 scripts/config.py set MBEDTLS_SSL_EARLY_DATA CC=$ASAN_CC cmake -D CMAKE_BUILD_TYPE:String=Asan . make - msg "test: default config with MBEDTLS_SSL_PROTO_TLS1_3 enabled, without padding" + msg "test: default config plus early data minus padding" make test - msg "ssl-opt.sh (TLS 1.3)" + msg "ssl-opt.sh (TLS 1.3 no padding)" tests/ssl-opt.sh } component_test_tls13_no_compatibility_mode () { - msg "build: default config with MBEDTLS_SSL_PROTO_TLS1_3 enabled, without padding" - scripts/config.py set MBEDTLS_SSL_PROTO_TLS1_3 + msg "build: default config plus early data minus middlebox compatibility mode" scripts/config.py unset MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE - scripts/config.py set MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY 1 scripts/config.py set MBEDTLS_SSL_EARLY_DATA CC=$ASAN_CC cmake -D CMAKE_BUILD_TYPE:String=Asan . make - msg "test: default config with MBEDTLS_SSL_PROTO_TLS1_3 enabled, without padding" + msg "test: default config plus early data minus middlebox compatibility mode" make test msg "ssl-opt.sh (TLS 1.3 no compatibility mode)" tests/ssl-opt.sh |