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

test/scripts/components: Applied consistent style.

Browse Source 
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
This commit is contained in:
Minos Galanakis 2024-07-26 20:49:51 +01:00
parent dc0f73a5e2
commit f78447f22e
6 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/scripts/components-basic-checks.sh
View File

@ -151,7 +151,7 @@ component_check_code_style () {
./scripts/code_style.py ./scripts/code_style.py
} }
support_check_code_style() { support_check_code_style () {
case $(uncrustify --version) in case $(uncrustify --version) in
*0.75.1*) true;; *0.75.1*) true;;
*) false;; *) false;;

8
tests/scripts/components-compiler.sh
View File

@ -14,7 +14,7 @@ support_build_tfm_armcc () {
support_build_armcc support_build_armcc
} }
component_build_tfm_armcc() { component_build_tfm_armcc () {
# test the TF-M configuration can build cleanly with various warning flags enabled # test the TF-M configuration can build cleanly with various warning flags enabled
cp configs/config-tfm.h "$CONFIG_H" cp configs/config-tfm.h "$CONFIG_H"
@ -22,12 +22,12 @@ component_build_tfm_armcc() {
armc6_build_test "--target=arm-arm-none-eabi -march=armv7-m -mthumb -Os -std=c99 -Werror -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wasm-operand-widths -Wunused -I../tests/include/spe" armc6_build_test "--target=arm-arm-none-eabi -march=armv7-m -mthumb -Os -std=c99 -Werror -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wasm-operand-widths -Wunused -I../tests/include/spe"
} }
support_test_aesni_m32_clang() { support_test_aesni_m32_clang () {
# clang >= 4 is required to build with target attributes # clang >= 4 is required to build with target attributes
support_test_aesni_m32 && [[ $(clang_version) -ge 4 ]] support_test_aesni_m32 && [[ $(clang_version) -ge 4 ]]
} }
component_test_aesni_m32_clang() { component_test_aesni_m32_clang () {
scripts/config.py set MBEDTLS_AESNI_C scripts/config.py set MBEDTLS_AESNI_C
scripts/config.py unset MBEDTLS_AES_USE_HARDWARE_ONLY scripts/config.py unset MBEDTLS_AES_USE_HARDWARE_ONLY
@ -297,7 +297,7 @@ component_build_mingw () {
make WINDOWS_BUILD=1 clean make WINDOWS_BUILD=1 clean
} }
support_build_mingw() { support_build_mingw () {
case $(i686-w64-mingw32-gcc -dumpversion 2>/dev/null) in case $(i686-w64-mingw32-gcc -dumpversion 2>/dev/null) in
[0-5]*|"") false;; [0-5]*|"") false;;
*) true;; *) true;;

54
tests/scripts/components-configuration-crypto.sh
View File

@ -57,7 +57,7 @@ component_build_psa_crypto_spm () {
check_renamed_symbols tests/include/spe/crypto_spe.h library/libmbedcrypto.a check_renamed_symbols tests/include/spe/crypto_spe.h library/libmbedcrypto.a
} }
component_test_no_rsa_key_pair_generation() { component_test_no_rsa_key_pair_generation () {
msg "build: default config minus PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE" msg "build: default config minus PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE"
scripts/config.py set MBEDTLS_PSA_CRYPTO_CONFIG scripts/config.py set MBEDTLS_PSA_CRYPTO_CONFIG
scripts/config.py unset MBEDTLS_GENPRIME scripts/config.py unset MBEDTLS_GENPRIME
@ -98,7 +98,7 @@ component_test_psa_inject_entropy () {
make test make test
} }
component_full_no_pkparse_pkwrite() { component_full_no_pkparse_pkwrite () {
msg "build: full without pkparse and pkwrite" msg "build: full without pkparse and pkwrite"
scripts/config.py crypto_full scripts/config.py crypto_full
@ -178,7 +178,7 @@ component_test_full_no_cipher () {
make test make test
} }
component_test_full_no_ccm() { component_test_full_no_ccm () {
msg "build: full no PSA_WANT_ALG_CCM" msg "build: full no PSA_WANT_ALG_CCM"
# Full config enables: # Full config enables:
@ -200,7 +200,7 @@ component_test_full_no_ccm() {
make test make test
} }
component_test_full_no_ccm_star_no_tag() { component_test_full_no_ccm_star_no_tag () {
msg "build: full no PSA_WANT_ALG_CCM_STAR_NO_TAG" msg "build: full no PSA_WANT_ALG_CCM_STAR_NO_TAG"
# Full config enables CRYPTO_CONFIG so that PSA_WANT config symbols are evaluated # Full config enables CRYPTO_CONFIG so that PSA_WANT config symbols are evaluated
@ -580,7 +580,7 @@ component_test_psa_crypto_config_reference_ffdh () {
tests/ssl-opt.sh -f "ffdh" tests/ssl-opt.sh -f "ffdh"
} }
component_test_psa_crypto_config_accel_pake() { component_test_psa_crypto_config_accel_pake () {
msg "build: full with accelerated PAKE" msg "build: full with accelerated PAKE"
loc_accel_list="ALG_JPAKE \ loc_accel_list="ALG_JPAKE \
@ -1019,7 +1019,7 @@ component_test_psa_crypto_config_reference_ecc_no_ecp_at_all () {
# $2: a string value which states which components are tested. Allowed values # $2: a string value which states which components are tested. Allowed values
# are "ECC" or "ECC_DH". # are "ECC" or "ECC_DH".
config_psa_crypto_config_accel_ecc_ffdh_no_bignum() { config_psa_crypto_config_accel_ecc_ffdh_no_bignum () {
driver_only="$1" driver_only="$1"
test_target="$2" test_target="$2"
# start with full config for maximum coverage (also enables USE_PSA) # start with full config for maximum coverage (also enables USE_PSA)
@ -1273,7 +1273,7 @@ component_test_tfm_config_p256m_driver_accel_ec () {
# Keep this in sync with component_test_tfm_config_p256m_driver_accel_ec() as # Keep this in sync with component_test_tfm_config_p256m_driver_accel_ec() as
# they are both meant to be used in analyze_outcomes.py for driver's coverage # they are both meant to be used in analyze_outcomes.py for driver's coverage
# analysis. # analysis.
component_test_tfm_config() { component_test_tfm_config () {
common_tfm_config common_tfm_config
# Disable P256M driver, which is on by default, so that analyze_outcomes # Disable P256M driver, which is on by default, so that analyze_outcomes
@ -1308,7 +1308,7 @@ component_test_tfm_config() {
# enabled, but one. Input arguments are as follows: # enabled, but one. Input arguments are as follows:
# - $1 is the key type under test, i.e. ECC/RSA/DH # - $1 is the key type under test, i.e. ECC/RSA/DH
# - $2 is the key option to be unset (i.e. generate, derive, etc) # - $2 is the key option to be unset (i.e. generate, derive, etc)
build_and_test_psa_want_key_pair_partial() { build_and_test_psa_want_key_pair_partial () {
key_type=$1 key_type=$1
unset_option=$2 unset_option=$2
disabled_psa_want="PSA_WANT_KEY_TYPE_${key_type}_KEY_PAIR_${unset_option}" disabled_psa_want="PSA_WANT_KEY_TYPE_${key_type}_KEY_PAIR_${unset_option}"
@ -1328,11 +1328,11 @@ build_and_test_psa_want_key_pair_partial() {
make test make test
} }
component_test_psa_ecc_key_pair_no_derive() { component_test_psa_ecc_key_pair_no_derive () {
build_and_test_psa_want_key_pair_partial "ECC" "DERIVE" build_and_test_psa_want_key_pair_partial "ECC" "DERIVE"
} }
component_test_psa_ecc_key_pair_no_generate() { component_test_psa_ecc_key_pair_no_generate () {
build_and_test_psa_want_key_pair_partial "ECC" "GENERATE" build_and_test_psa_want_key_pair_partial "ECC" "GENERATE"
} }
@ -1411,7 +1411,7 @@ component_test_psa_crypto_config_reference_rsa_crypto () {
# This is a temporary test to verify that full RSA support is present even when # This is a temporary test to verify that full RSA support is present even when
# only one single new symbols (PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC) is defined. # only one single new symbols (PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC) is defined.
component_test_new_psa_want_key_pair_symbol() { component_test_new_psa_want_key_pair_symbol () {
msg "Build: crypto config - MBEDTLS_RSA_C + PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC" msg "Build: crypto config - MBEDTLS_RSA_C + PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC"
# Create a temporary output file unless there is already one set # Create a temporary output file unless there is already one set
@ -1581,7 +1581,7 @@ component_test_psa_crypto_config_accel_hash_use_psa () {
# script to find regression in test coverage when accelerated hash is used (tests and ssl-opt). # script to find regression in test coverage when accelerated hash is used (tests and ssl-opt).
# Both components need to be kept in sync. # Both components need to be kept in sync.
component_test_psa_crypto_config_reference_hash_use_psa() { component_test_psa_crypto_config_reference_hash_use_psa () {
msg "test: full without accelerated hashes" msg "test: full without accelerated hashes"
config_psa_crypto_hash_use_psa 0 config_psa_crypto_hash_use_psa 0
@ -1624,7 +1624,7 @@ config_psa_crypto_hmac_use_psa () {
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_DETERMINISTIC_ECDSA scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_DETERMINISTIC_ECDSA
} }
component_test_psa_crypto_config_accel_hmac() { component_test_psa_crypto_config_accel_hmac () {
msg "test: full with accelerated hmac" msg "test: full with accelerated hmac"
loc_accel_list="ALG_HMAC KEY_TYPE_HMAC \ loc_accel_list="ALG_HMAC KEY_TYPE_HMAC \
@ -1654,7 +1654,7 @@ component_test_psa_crypto_config_accel_hmac() {
make test make test
} }
component_test_psa_crypto_config_reference_hmac() { component_test_psa_crypto_config_reference_hmac () {
msg "test: full without accelerated hmac" msg "test: full without accelerated hmac"
config_psa_crypto_hmac_use_psa 0 config_psa_crypto_hmac_use_psa 0
@ -1755,7 +1755,7 @@ component_test_psa_crypto_config_accel_aead () {
# - component_test_psa_crypto_config_accel_cipher_aead_cmac # - component_test_psa_crypto_config_accel_cipher_aead_cmac
# - component_test_psa_crypto_config_reference_cipher_aead_cmac # - component_test_psa_crypto_config_reference_cipher_aead_cmac
common_psa_crypto_config_accel_cipher_aead_cmac() { common_psa_crypto_config_accel_cipher_aead_cmac () {
# Start from the full config # Start from the full config
helper_libtestdriver1_adjust_config "full" helper_libtestdriver1_adjust_config "full"
@ -1849,7 +1849,7 @@ component_test_psa_crypto_config_reference_cipher_aead_cmac () {
tests/compat.sh -V NO -p mbedTLS tests/compat.sh -V NO -p mbedTLS
} }
common_block_cipher_dispatch() { common_block_cipher_dispatch () {
TEST_WITH_DRIVER="$1" TEST_WITH_DRIVER="$1"
# Start from the full config # Start from the full config
@ -1931,7 +1931,7 @@ component_test_full_block_cipher_legacy_dispatch () {
make test make test
} }
component_test_aead_chachapoly_disabled() { component_test_aead_chachapoly_disabled () {
msg "build: full minus CHACHAPOLY" msg "build: full minus CHACHAPOLY"
scripts/config.py full scripts/config.py full
scripts/config.py unset MBEDTLS_CHACHAPOLY_C scripts/config.py unset MBEDTLS_CHACHAPOLY_C
@ -1942,7 +1942,7 @@ component_test_aead_chachapoly_disabled() {
make test make test
} }
component_test_aead_only_ccm() { component_test_aead_only_ccm () {
msg "build: full minus CHACHAPOLY and GCM" msg "build: full minus CHACHAPOLY and GCM"
scripts/config.py full scripts/config.py full
scripts/config.py unset MBEDTLS_CHACHAPOLY_C scripts/config.py unset MBEDTLS_CHACHAPOLY_C
@ -1955,7 +1955,7 @@ component_test_aead_only_ccm() {
make test make test
} }
component_test_ccm_aes_sha256() { component_test_ccm_aes_sha256 () {
msg "build: CCM + AES + SHA256 configuration" msg "build: CCM + AES + SHA256 configuration"
cp "$CONFIG_TEST_DRIVER_H" "$CONFIG_H" cp "$CONFIG_TEST_DRIVER_H" "$CONFIG_H"
@ -1975,7 +1975,7 @@ component_test_ccm_aes_sha256() {
# It may be "" if all combinations are valid. # It may be "" if all combinations are valid.
# It receives a string containing a combination of options, as passed to the compiler, # It receives a string containing a combination of options, as passed to the compiler,
# e.g. "-DOPT1 -DOPT2 ...". It must return 0 iff the combination is valid, non-zero if invalid. # e.g. "-DOPT1 -DOPT2 ...". It must return 0 iff the combination is valid, non-zero if invalid.
build_test_config_combos() { build_test_config_combos () {
file=$1 file=$1
shift shift
validate_options=$1 validate_options=$1
@ -2041,7 +2041,7 @@ build_test_config_combos() {
rm ${makefile} rm ${makefile}
} }
validate_aes_config_variations() { validate_aes_config_variations () {
if [[ "$1" == *"MBEDTLS_AES_USE_HARDWARE_ONLY"* ]]; then if [[ "$1" == *"MBEDTLS_AES_USE_HARDWARE_ONLY"* ]]; then
if [[ !(("$HOSTTYPE" == "aarch64" && "$1" != *"MBEDTLS_AESCE_C"*) || \ if [[ !(("$HOSTTYPE" == "aarch64" && "$1" != *"MBEDTLS_AESCE_C"*) || \
("$HOSTTYPE" == "x86_64" && "$1" != *"MBEDTLS_AESNI_C"*)) ]]; then ("$HOSTTYPE" == "x86_64" && "$1" != *"MBEDTLS_AESNI_C"*)) ]]; then
@ -2051,7 +2051,7 @@ validate_aes_config_variations() {
return 0 return 0
} }
component_build_aes_variations() { component_build_aes_variations () {
# 18s - around 90ms per clang invocation on M1 Pro # 18s - around 90ms per clang invocation on M1 Pro
# #
# aes.o has many #if defined(...) guards that intersect in complex ways. # aes.o has many #if defined(...) guards that intersect in complex ways.
@ -2084,7 +2084,7 @@ component_build_aes_variations() {
"MBEDTLS_AESNI_C" "MBEDTLS_AESCE_C" "MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH" "MBEDTLS_AESNI_C" "MBEDTLS_AESCE_C" "MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH"
} }
support_test_aesni() { support_test_aesni () {
# Check that gcc targets x86_64 (we can build AESNI), and check for # Check that gcc targets x86_64 (we can build AESNI), and check for
# AESNI support on the host (we can run AESNI). # AESNI support on the host (we can run AESNI).
# #
@ -2149,7 +2149,7 @@ component_test_aesni () { # ~ 60s
not grep -q "AES note: built-in implementation." ./programs/test/selftest not grep -q "AES note: built-in implementation." ./programs/test/selftest
} }
component_test_sha3_variations() { component_test_sha3_variations () {
msg "sha3 loop unroll variations" msg "sha3 loop unroll variations"
# define minimal config sufficient to test SHA3 # define minimal config sufficient to test SHA3
@ -2169,7 +2169,7 @@ END
./tf-psa-crypto/tests/test_suite_shax ./tf-psa-crypto/tests/test_suite_shax
} }
support_test_aesni_m32() { support_test_aesni_m32 () {
support_test_m32_no_asm && (lscpu | grep -qw aes) support_test_m32_no_asm && (lscpu | grep -qw aes)
} }
@ -2233,7 +2233,7 @@ component_build_aes_aesce_armcc () {
armc6_build_test "-O1 --target=aarch64-arm-none-eabi -march=armv8-a+crypto" armc6_build_test "-O1 --target=aarch64-arm-none-eabi -march=armv8-a+crypto"
} }
support_build_aes_armce() { support_build_aes_armce () {
# clang >= 11 is required to build with AES extensions # clang >= 11 is required to build with AES extensions
[[ $(clang_version) -ge 11 ]] [[ $(clang_version) -ge 11 ]]
} }
@ -2289,7 +2289,7 @@ component_build_aes_armce () {
not grep -E 'aes[a-z]+\s*[qv]' ${BUILTIN_SRC_PATH}/aesce.o not grep -E 'aes[a-z]+\s*[qv]' ${BUILTIN_SRC_PATH}/aesce.o
} }
support_build_sha_armce() { support_build_sha_armce () {
# clang >= 4 is required to build with SHA extensions # clang >= 4 is required to build with SHA extensions
[[ $(clang_version) -ge 4 ]] [[ $(clang_version) -ge 4 ]]
} }

4
tests/scripts/components-configuration-tls.sh
View File

@ -324,7 +324,7 @@ component_test_tls1_2_default_cbc_legacy_cbc_etm_cipher_only () {
# implementations ourselves: one using PSA, the other not. At least test that # implementations ourselves: one using PSA, the other not. At least test that
# these two interoperate with each other. # these two interoperate with each other.
component_test_tls1_2_ecjpake_compatibility() { component_test_tls1_2_ecjpake_compatibility () {
msg "build: TLS1.2 server+client w/ EC-JPAKE w/o USE_PSA" msg "build: TLS1.2 server+client w/ EC-JPAKE w/o USE_PSA"
scripts/config.py set MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED scripts/config.py set MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
# Explicitly make lib first to avoid a race condition: # Explicitly make lib first to avoid a race condition:
@ -819,7 +819,7 @@ component_test_tls13_no_compatibility_mode () {
tests/ssl-opt.sh tests/ssl-opt.sh
} }
component_test_full_minus_session_tickets() { component_test_full_minus_session_tickets () {
msg "build: full config without session tickets" msg "build: full config without session tickets"
scripts/config.py full scripts/config.py full
scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS

4
tests/scripts/components-configuration.sh
View File

@ -244,7 +244,7 @@ support_build_baremetal () {
! grep -q -F time.h /usr/include/x86_64-linux-gnu/sys/types.h ! grep -q -F time.h /usr/include/x86_64-linux-gnu/sys/types.h
} }
component_test_no_psa_crypto_full_cmake_asan() { component_test_no_psa_crypto_full_cmake_asan () {
# full minus MBEDTLS_PSA_CRYPTO_C: 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 PSA crypto, ASan" msg "build: cmake, full config minus PSA crypto, ASan"
scripts/config.py full scripts/config.py full
@ -278,7 +278,7 @@ component_test_no_psa_crypto_full_cmake_asan() {
env OPENSSL="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA' env OPENSSL="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA'
} }
component_build_tfm() { component_build_tfm () {
# Check that the TF-M configuration can build cleanly with various # Check that the TF-M configuration can build cleanly with various
# warning flags enabled. We don't build or run tests, since the # warning flags enabled. We don't build or run tests, since the
# TF-M configuration needs a TF-M platform. A tweaked version of # TF-M configuration needs a TF-M platform. A tweaked version of

2
tests/scripts/components-psasim.sh
View File

@ -10,7 +10,7 @@
################################################################ ################################################################
# Helper function for controlling (start & stop) the psasim server. # Helper function for controlling (start & stop) the psasim server.
helper_psasim_server() { helper_psasim_server () {
OPERATION=$1 OPERATION=$1
if [ "$OPERATION" == "start" ]; then if [ "$OPERATION" == "start" ]; then
( (