From 44b178ca60aaec9a821e3dfacef6a43245df3715 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Wed, 22 Mar 2023 14:02:57 +0100 Subject: [PATCH] test: fix erroneous changes in all.sh Signed-off-by: Valerio Setti --- tests/scripts/all.sh | 68 ++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 44 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 2ba898e15..341cabba5 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -2103,33 +2103,11 @@ component_test_psa_crypto_config_accel_ecdsa () { make test } -# Auxiliary function to build config for ECDSA with and without drivers -config_psa_crypto_config_ecdsa_use_psa () { - DRIVER_ONLY="$1" - # start with config full for maximum coverage (also enables USE_PSA) - scripts/config.py full - # enable support for drivers and configuring PSA-only algorithms - scripts/config.py set MBEDTLS_PSA_CRYPTO_CONFIG - scripts/config.py set MBEDTLS_PSA_CRYPTO_DRIVERS - if [ "$DRIVER_ONLY" -eq 1 ]; then - # Disable the module that's accelerated - scripts/config.py unset MBEDTLS_ECDSA_C - fi - # Restartable feature is not yet supported by PSA. Once it will in - # the future, the following line could be removed (see issues - # 6061, 6332 and following ones) - scripts/config.py unset MBEDTLS_ECP_RESTARTABLE - # Dynamic secure element support is a deprecated feature and needs to be disabled here. - # This is done to have the same form of psa_key_attributes_s for libdriver and library. - scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C -} - -# Keep in sync with component_test_psa_crypto_config_reference_ecdsa_use_psa -component_test_psa_crypto_config_accel_ecdsa_use_psa () { - msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated ECDSA + USE_PSA" +component_test_psa_crypto_config_accel_ecdh () { + msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated ECDH" # Algorithms and key types to accelerate - loc_accel_list="ALG_ECDSA ALG_DETERMINISTIC_ECDSA KEY_TYPE_ECC_KEY_PAIR KEY_TYPE_ECC_PUBLIC_KEY" + loc_accel_list="ALG_ECDH KEY_TYPE_ECC_KEY_PAIR KEY_TYPE_ECC_PUBLIC_KEY" # Configure and build the test driver library # ------------------------------------------- @@ -2140,35 +2118,37 @@ component_test_psa_crypto_config_accel_ecdsa_use_psa () { scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_ECB_NO_PADDING loc_accel_flags=$( echo "$loc_accel_list" | sed 's/[^ ]* */-DLIBTESTDRIVER1_MBEDTLS_PSA_ACCEL_&/g' ) - # SHA-1 and all variants of SHA-2 are needed for ECDSA and X.509 tests - loc_accel_flags="$loc_accel_flags -DLIBTESTDRIVER1_MBEDTLS_PSA_ACCEL_ALG_SHA_1" - loc_accel_flags="$loc_accel_flags -DLIBTESTDRIVER1_MBEDTLS_PSA_ACCEL_ALG_SHA_224" - loc_accel_flags="$loc_accel_flags -DLIBTESTDRIVER1_MBEDTLS_PSA_ACCEL_ALG_SHA_256" - loc_accel_flags="$loc_accel_flags -DLIBTESTDRIVER1_MBEDTLS_PSA_ACCEL_ALG_SHA_384" - loc_accel_flags="$loc_accel_flags -DLIBTESTDRIVER1_MBEDTLS_PSA_ACCEL_ALG_SHA_512" - make -C tests libtestdriver1.a CFLAGS="$ASAN_CFLAGS $loc_accel_flags" LDFLAGS="$ASAN_CFLAGS" + make -C tests libtestdriver1.a CFLAGS=" $ASAN_CFLAGS $loc_accel_flags" LDFLAGS="$ASAN_CFLAGS" - # Configure and build the main libraries with drivers enabled - # ----------------------------------------------------------- + # Configure and build the main libraries + # -------------------------------------- - # Use the same config as reference, only without built-in ECDSA - config_psa_crypto_config_ecdsa_use_psa 1 + # Start from default config (no USE_PSA or TLS 1.3) + driver support + scripts/config.py set MBEDTLS_PSA_CRYPTO_DRIVERS + scripts/config.py set MBEDTLS_PSA_CRYPTO_CONFIG - # Build the library + # Disable the module that's accelerated + scripts/config.py unset MBEDTLS_ECDH_C + + # Disable things that depend on it + scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED + scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED + scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED + scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED + scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED + + # Build the main library loc_accel_flags="$loc_accel_flags $( echo "$loc_accel_list" | sed 's/[^ ]* */-DMBEDTLS_PSA_ACCEL_&/g' )" make CFLAGS="$ASAN_CFLAGS -O -Werror -I../tests/include -I../tests -I../../tests -DPSA_CRYPTO_DRIVER_TEST -DMBEDTLS_TEST_LIBTESTDRIVER1 $loc_accel_flags" LDFLAGS="-ltestdriver1 $ASAN_CFLAGS" - # Make sure ECDSA was not re-enabled by accident (additive config) - not grep mbedtls_ecdsa_ library/ecdsa.o + # Make sure this was not re-enabled by accident (additive config) + not grep mbedtls_ecdh_ library/ecdh.o # Run the tests # ------------- - msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated ECDSA + USE_PSA" + msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated ECDH" make test - - msg "test: ssl-opt.sh" - tests/ssl-opt.sh } # Auxiliary function to build config for all EC based algorithms (EC-JPAKE, @@ -2178,7 +2158,7 @@ component_test_psa_crypto_config_accel_ecdsa_use_psa () { # same config, except for the use of driver or built-in EC algorithms: # - component_test_psa_crypto_config_accel_all_ec_algs_use_psa; # - component_test_psa_crypto_config_reference_all_ec_algs_use_psa. -# This support comparing their test coverage with analyze_outcomes.py. +# This supports comparing their test coverage with analyze_outcomes.py. config_psa_crypto_config_all_ec_algs_use_psa () { DRIVER_ONLY="$1" # start with config full for maximum coverage (also enables USE_PSA)