commit 6cfab2880a59f435214761fa2510d9226a6915c4
author Ronald Cron <ronald.cron@arm.com> Mon Sep 15 18:32:29 2025 +0200
committer Ronald Cron <ronald.cron@arm.com> Tue Sep 16 15:53:43 2025 +0200
tree 2f0bc782f89ef43b93e3238a5359091e057f1b68
parent 2ad1e5c1a2f9e755c1c6199d51a00c96b64760d9

Cleanup following the removal of MBEDTLS_ECP_C option

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

tests/scripts/components-configuration-crypto.sh

diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh
index 3e066d4..860371d 100644
--- a/tests/scripts/components-configuration-crypto.sh
+++ b/tests/scripts/components-configuration-crypto.sh
@@ -728,9 +728,6 @@
                     KEY_TYPE_ECC_KEY_PAIR_EXPORT \
                     $(helper_get_psa_curve_list)"
 
-    # Disable modules that are accelerated - some will be re-enabled
-    scripts/config.py unset MBEDTLS_ECP_C
-
     # Disable all curves - those that aren't accelerated should be re-enabled
     helper_disable_builtin_curves
 
@@ -789,9 +786,6 @@
     scripts/config.py unset MBEDTLS_PK_PARSE_C
     scripts/config.py unset MBEDTLS_PK_WRITE_C
 
-    # Disable modules that are accelerated - some will be re-enabled
-    scripts/config.py unset MBEDTLS_ECP_C
-
     # Disable all curves - those that aren't accelerated should be re-enabled
     helper_disable_builtin_curves
 
@@ -897,10 +891,6 @@
     driver_only="$1"
     # start with config full for maximum coverage (also enables USE_PSA)
     helper_libtestdriver1_adjust_config "full"
-    if [ "$driver_only" -eq 1 ]; then
-        # Disable modules that are accelerated
-        scripts/config.py unset MBEDTLS_ECP_C
-    fi
 
     # Restartable feature is not yet supported by PSA. Once it will in
     # the future, the following line could be removed (see issues
@@ -988,11 +978,6 @@
     # start with full config for maximum coverage (also enables USE_PSA)
     helper_libtestdriver1_adjust_config "full"
 
-    if [ "$driver_only" -eq 1 ]; then
-        # Disable ECP module (entirely)
-        scripts/config.py unset MBEDTLS_ECP_C
-    fi
-
     # Disable all the features that auto-enable ECP_LIGHT (see build_info.h)
     scripts/config.py unset MBEDTLS_PK_PARSE_EC_EXTENDED
     scripts/config.py unset MBEDTLS_PK_PARSE_EC_COMPRESSED
@@ -1100,8 +1085,6 @@
     helper_libtestdriver1_adjust_config "full"
 
     if [ "$driver_only" -eq 1 ]; then
-        # Disable ECP module (entirely)
-        scripts/config.py unset MBEDTLS_ECP_C
         # Also disable bignum
         scripts/config.py unset MBEDTLS_BIGNUM_C
     fi

tests/scripts/depends.py

diff --git a/tests/scripts/depends.py b/tests/scripts/depends.py
index 5d2efc7..7a7c754 100755
--- a/tests/scripts/depends.py
+++ b/tests/scripts/depends.py
@@ -295,8 +295,7 @@
         'MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED',
         'MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED',
         'MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED',
-        'MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED',
-        'MBEDTLS_ECP_C'],
+        'MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED'],
     'PSA_WANT_ALG_JPAKE': ['MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED'],
     'PSA_WANT_ALG_RSA_OAEP': ['PSA_WANT_ALG_RSA_PSS',
                               'MBEDTLS_X509_RSASSA_PSS_SUPPORT'],