eden-emu/mbedtls
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: renaming component testing accelerated EC

Browse source 
References in analyze_outcomes.py are updated accordingly.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2023-06-14 10:33:10 +02:00
parent 44ff5a9208
commit 4d25a8d48a
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
tests/scripts/all.sh
View file

@ -2323,10 +2323,10 @@ component_test_psa_crypto_config_accel_pake() {
# #
# This is used by the two following components to ensure they always use the # This is used by the two following components to ensure they always use the
# same config, except for the use of driver or built-in EC algorithms: # 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_accel_ecc_ecp_light_only;
# - component_test_psa_crypto_config_reference_all_ec_algs_use_psa. # - component_test_psa_crypto_config_reference_ecc_ecp_light_only.
# This supports 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 () { config_psa_crypto_config_ecp_ligh_only () {
DRIVER_ONLY="$1" DRIVER_ONLY="$1"
# start with config full for maximum coverage (also enables USE_PSA) # start with config full for maximum coverage (also enables USE_PSA)
helper_libtestdriver1_adjust_config "full" helper_libtestdriver1_adjust_config "full"
@ -2344,8 +2344,8 @@ config_psa_crypto_config_all_ec_algs_use_psa () {
scripts/config.py unset MBEDTLS_ECP_RESTARTABLE scripts/config.py unset MBEDTLS_ECP_RESTARTABLE
} }
# Keep in sync with component_test_psa_crypto_config_reference_all_ec_algs_use_psa # Keep in sync with component_test_psa_crypto_config_reference_ecc_ecp_light_only
component_test_psa_crypto_config_accel_all_ec_algs_use_psa () { component_test_psa_crypto_config_accel_ecc_ecp_light_only () {
msg "build: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated EC algs + USE_PSA" msg "build: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated EC algs + USE_PSA"
# Algorithms and key types to accelerate # Algorithms and key types to accelerate
@ -2358,7 +2358,7 @@ component_test_psa_crypto_config_accel_all_ec_algs_use_psa () {
# --------- # ---------
# Use the same config as reference, only without built-in EC algs # Use the same config as reference, only without built-in EC algs
config_psa_crypto_config_all_ec_algs_use_psa 1 config_psa_crypto_config_ecp_ligh_only 1
# Temporary hack to enable MBEDTLS_ECP_LIGHT # Temporary hack to enable MBEDTLS_ECP_LIGHT
# (will soon be auto-enabled in build_info.h) # (will soon be auto-enabled in build_info.h)
@ -2389,11 +2389,11 @@ component_test_psa_crypto_config_accel_all_ec_algs_use_psa () {
tests/ssl-opt.sh tests/ssl-opt.sh
} }
# Keep in sync with component_test_psa_crypto_config_accel_all_ec_algs_use_psa # Keep in sync with component_test_psa_crypto_config_accel_ecc_ecp_light_only
component_test_psa_crypto_config_reference_all_ec_algs_use_psa () { component_test_psa_crypto_config_reference_ecc_ecp_light_only () {
msg "build: MBEDTLS_PSA_CRYPTO_CONFIG with non-accelerated EC algs + USE_PSA" msg "build: MBEDTLS_PSA_CRYPTO_CONFIG with non-accelerated EC algs + USE_PSA"
config_psa_crypto_config_all_ec_algs_use_psa 0 config_psa_crypto_config_ecp_ligh_only 0
make make
@ -2405,8 +2405,8 @@ component_test_psa_crypto_config_reference_all_ec_algs_use_psa () {
} }
# This helper function is used by: # This helper function is used by:
# - component_test_psa_crypto_full_accel_all_ec_algs_no_ecp_use_psa() # - component_test_psa_crypto_config_accel_ecc_no_ecp_at_all()
# - component_test_psa_crypto_full_reference_all_ec_algs_no_ecp_use_psa() # - component_test_psa_crypto_config_reference_ecc_no_ecp_at_all()
# to ensure that both tests use the same underlying configuration when testing # to ensure that both tests use the same underlying configuration when testing
# driver's coverage with analyze_outcomes.py. # driver's coverage with analyze_outcomes.py.
# #
@ -2417,7 +2417,7 @@ component_test_psa_crypto_config_reference_all_ec_algs_use_psa () {
# #
# PK_C and RSA_C are always disabled to ensure there is no remaining dependency # PK_C and RSA_C are always disabled to ensure there is no remaining dependency
# on the ECP module. # on the ECP module.
config_psa_crypto_full_all_ec_algs_no_ecp_use_psa () { config_psa_crypto_no_ecp_at_all () {
DRIVER_ONLY="$1" DRIVER_ONLY="$1"
# start with crypto_full config for maximum coverage (also enables USE_PSA), # start with crypto_full config for maximum coverage (also enables USE_PSA),
# but excluding X509, TLS and key exchanges # but excluding X509, TLS and key exchanges
@ -2471,8 +2471,8 @@ config_psa_crypto_full_all_ec_algs_no_ecp_use_psa () {
# all support and dependencies from ECP and ECP_LIGHT are removed on the library # all support and dependencies from ECP and ECP_LIGHT are removed on the library
# side. # side.
# #
# Keep in sync with component_test_psa_crypto_full_reference_all_ec_algs_no_ecp_use_psa() # Keep in sync with component_test_psa_crypto_config_reference_ecc_no_ecp_at_all()
component_test_psa_crypto_full_accel_all_ec_algs_no_ecp_use_psa () { component_test_psa_crypto_config_accel_ecc_no_ecp_at_all () {
msg "build: crypto_full + accelerated EC algs + USE_PSA - ECP" msg "build: crypto_full + accelerated EC algs + USE_PSA - ECP"
# Algorithms and key types to accelerate # Algorithms and key types to accelerate
@ -2485,7 +2485,7 @@ component_test_psa_crypto_full_accel_all_ec_algs_no_ecp_use_psa () {
# --------- # ---------
# Set common configurations between library's and driver's builds # Set common configurations between library's and driver's builds
config_psa_crypto_full_all_ec_algs_no_ecp_use_psa 1 config_psa_crypto_no_ecp_at_all 1
# Build # Build
# ----- # -----
@ -2514,12 +2514,12 @@ component_test_psa_crypto_full_accel_all_ec_algs_no_ecp_use_psa () {
} }
# Reference function used for driver's coverage analysis in analyze_outcomes.py # Reference function used for driver's coverage analysis in analyze_outcomes.py
# in conjunction with component_test_psa_crypto_full_accel_all_ec_algs_no_ecp_use_psa(). # in conjunction with component_test_psa_crypto_config_accel_ecc_no_ecp_at_all().
# Keep in sync with its accelerated counterpart. # Keep in sync with its accelerated counterpart.
component_test_psa_crypto_full_reference_all_ec_algs_no_ecp_use_psa () { component_test_psa_crypto_config_reference_ecc_no_ecp_at_all () {
msg "build: crypto_full + non accelerated EC algs + USE_PSA" msg "build: crypto_full + non accelerated EC algs + USE_PSA"
config_psa_crypto_full_all_ec_algs_no_ecp_use_psa 0 config_psa_crypto_no_ecp_at_all 0
make make

12
tests/scripts/analyze_outcomes.py
View file

@ -196,11 +196,11 @@ TASKS = {
} }
} }
}, },
'analyze_driver_vs_reference_all_ec_algs': { 'analyze_driver_vs_reference_ecp_light_only': {
'test_function': do_analyze_driver_vs_reference, 'test_function': do_analyze_driver_vs_reference,
'args': { 'args': {
'component_ref': 'test_psa_crypto_config_reference_all_ec_algs_use_psa', 'component_ref': 'test_psa_crypto_config_reference_ecc_ecp_light_only',
'component_driver': 'test_psa_crypto_config_accel_all_ec_algs_use_psa', 'component_driver': 'test_psa_crypto_config_accel_ecc_ecp_light_only',
'ignored_suites': [ 'ignored_suites': [
'ecdsa', 'ecdsa',
'ecdh', 'ecdh',
@ -265,11 +265,11 @@ TASKS = {
} }
} }
}, },
'analyze_driver_vs_reference_all_ec_algs_no_ecp': { 'analyze_driver_vs_reference_no_ecp_at_all': {
'test_function': do_analyze_driver_vs_reference, 'test_function': do_analyze_driver_vs_reference,
'args': { 'args': {
'component_ref': 'test_psa_crypto_full_reference_all_ec_algs_no_ecp_use_psa', 'component_ref': 'test_psa_crypto_config_reference_ecc_no_ecp_at_all',
'component_driver': 'test_psa_crypto_full_accel_all_ec_algs_no_ecp_use_psa', 'component_driver': 'test_psa_crypto_config_accel_ecc_no_ecp_at_all',
'ignored_suites': [ 'ignored_suites': [
# Ignore test suites for the modules that are disabled in the # Ignore test suites for the modules that are disabled in the
# accelerated test case. # accelerated test case.