mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-10-17 04:51:22 +03:00
Cleanup following the removal of MBEDTLS_ECDH_C option
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
@@ -223,7 +223,7 @@
|
|||||||
*
|
*
|
||||||
* Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
|
* Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
|
||||||
*
|
*
|
||||||
* Requires: MBEDTLS_ECDH_C or PSA_WANT_ALG_ECDH
|
* Requires: PSA_WANT_ALG_ECDH
|
||||||
* MBEDTLS_ECDSA_C or PSA_WANT_ALG_ECDSA
|
* MBEDTLS_ECDSA_C or PSA_WANT_ALG_ECDSA
|
||||||
* MBEDTLS_X509_CRT_PARSE_C
|
* MBEDTLS_X509_CRT_PARSE_C
|
||||||
*
|
*
|
||||||
@@ -247,7 +247,7 @@
|
|||||||
*
|
*
|
||||||
* Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
|
* Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
|
||||||
*
|
*
|
||||||
* Requires: MBEDTLS_ECDH_C or PSA_WANT_ALG_ECDH
|
* Requires: PSA_WANT_ALG_ECDH
|
||||||
*
|
*
|
||||||
* This enables the following ciphersuites (if other requisites are
|
* This enables the following ciphersuites (if other requisites are
|
||||||
* enabled as well):
|
* enabled as well):
|
||||||
@@ -265,7 +265,7 @@
|
|||||||
*
|
*
|
||||||
* Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
|
* Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
|
||||||
*
|
*
|
||||||
* Requires: MBEDTLS_ECDH_C or PSA_WANT_ALG_ECDH
|
* Requires: PSA_WANT_ALG_ECDH
|
||||||
* PSA_WANT_ALG_RSA_PKCS1V15_SIGN
|
* PSA_WANT_ALG_RSA_PKCS1V15_SIGN
|
||||||
* MBEDTLS_X509_CRT_PARSE_C
|
* MBEDTLS_X509_CRT_PARSE_C
|
||||||
*
|
*
|
||||||
|
@@ -610,9 +610,6 @@ component_test_psa_crypto_config_accel_ecdh () {
|
|||||||
$(helper_get_psa_key_type_list "ECC") \
|
$(helper_get_psa_key_type_list "ECC") \
|
||||||
$(helper_get_psa_curve_list)"
|
$(helper_get_psa_curve_list)"
|
||||||
|
|
||||||
# Disable the module that's accelerated
|
|
||||||
scripts/config.py unset MBEDTLS_ECDH_C
|
|
||||||
|
|
||||||
# Disable things that depend on it
|
# Disable things that depend on it
|
||||||
scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDHE_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_RSA_ENABLED
|
||||||
@@ -739,7 +736,6 @@ component_test_psa_crypto_config_accel_ecc_some_key_types () {
|
|||||||
|
|
||||||
# Disable modules that are accelerated - some will be re-enabled
|
# Disable modules that are accelerated - some will be re-enabled
|
||||||
scripts/config.py unset MBEDTLS_ECDSA_C
|
scripts/config.py unset MBEDTLS_ECDSA_C
|
||||||
scripts/config.py unset MBEDTLS_ECDH_C
|
|
||||||
scripts/config.py unset MBEDTLS_ECJPAKE_C
|
scripts/config.py unset MBEDTLS_ECJPAKE_C
|
||||||
scripts/config.py unset MBEDTLS_ECP_C
|
scripts/config.py unset MBEDTLS_ECP_C
|
||||||
|
|
||||||
@@ -803,7 +799,6 @@ common_test_psa_crypto_config_accel_ecc_some_curves () {
|
|||||||
|
|
||||||
# Disable modules that are accelerated - some will be re-enabled
|
# Disable modules that are accelerated - some will be re-enabled
|
||||||
scripts/config.py unset MBEDTLS_ECDSA_C
|
scripts/config.py unset MBEDTLS_ECDSA_C
|
||||||
scripts/config.py unset MBEDTLS_ECDH_C
|
|
||||||
scripts/config.py unset MBEDTLS_ECJPAKE_C
|
scripts/config.py unset MBEDTLS_ECJPAKE_C
|
||||||
scripts/config.py unset MBEDTLS_ECP_C
|
scripts/config.py unset MBEDTLS_ECP_C
|
||||||
|
|
||||||
@@ -915,7 +910,6 @@ config_psa_crypto_config_ecp_light_only () {
|
|||||||
if [ "$driver_only" -eq 1 ]; then
|
if [ "$driver_only" -eq 1 ]; then
|
||||||
# Disable modules that are accelerated
|
# Disable modules that are accelerated
|
||||||
scripts/config.py unset MBEDTLS_ECDSA_C
|
scripts/config.py unset MBEDTLS_ECDSA_C
|
||||||
scripts/config.py unset MBEDTLS_ECDH_C
|
|
||||||
scripts/config.py unset MBEDTLS_ECJPAKE_C
|
scripts/config.py unset MBEDTLS_ECJPAKE_C
|
||||||
scripts/config.py unset MBEDTLS_ECP_C
|
scripts/config.py unset MBEDTLS_ECP_C
|
||||||
fi
|
fi
|
||||||
@@ -1009,7 +1003,6 @@ config_psa_crypto_no_ecp_at_all () {
|
|||||||
if [ "$driver_only" -eq 1 ]; then
|
if [ "$driver_only" -eq 1 ]; then
|
||||||
# Disable modules that are accelerated
|
# Disable modules that are accelerated
|
||||||
scripts/config.py unset MBEDTLS_ECDSA_C
|
scripts/config.py unset MBEDTLS_ECDSA_C
|
||||||
scripts/config.py unset MBEDTLS_ECDH_C
|
|
||||||
scripts/config.py unset MBEDTLS_ECJPAKE_C
|
scripts/config.py unset MBEDTLS_ECJPAKE_C
|
||||||
# Disable ECP module (entirely)
|
# Disable ECP module (entirely)
|
||||||
scripts/config.py unset MBEDTLS_ECP_C
|
scripts/config.py unset MBEDTLS_ECP_C
|
||||||
@@ -1124,7 +1117,6 @@ config_psa_crypto_config_accel_ecc_ffdh_no_bignum () {
|
|||||||
if [ "$driver_only" -eq 1 ]; then
|
if [ "$driver_only" -eq 1 ]; then
|
||||||
# Disable modules that are accelerated
|
# Disable modules that are accelerated
|
||||||
scripts/config.py unset MBEDTLS_ECDSA_C
|
scripts/config.py unset MBEDTLS_ECDSA_C
|
||||||
scripts/config.py unset MBEDTLS_ECDH_C
|
|
||||||
scripts/config.py unset MBEDTLS_ECJPAKE_C
|
scripts/config.py unset MBEDTLS_ECJPAKE_C
|
||||||
# Disable ECP module (entirely)
|
# Disable ECP module (entirely)
|
||||||
scripts/config.py unset MBEDTLS_ECP_C
|
scripts/config.py unset MBEDTLS_ECP_C
|
||||||
|
@@ -438,7 +438,6 @@ component_test_tls13_only_psk () {
|
|||||||
scripts/config.py unset PSA_WANT_DH_RFC7919_6144
|
scripts/config.py unset PSA_WANT_DH_RFC7919_6144
|
||||||
scripts/config.py unset PSA_WANT_DH_RFC7919_8192
|
scripts/config.py unset PSA_WANT_DH_RFC7919_8192
|
||||||
# Note: The four unsets below are to be removed for Mbed TLS 4.0
|
# Note: The four unsets below are to be removed for Mbed TLS 4.0
|
||||||
scripts/config.py unset MBEDTLS_ECDH_C
|
|
||||||
scripts/config.py unset MBEDTLS_ECDSA_C
|
scripts/config.py unset MBEDTLS_ECDSA_C
|
||||||
|
|
||||||
make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/tls13-only.h\"'"
|
make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/tls13-only.h\"'"
|
||||||
@@ -475,8 +474,6 @@ component_test_tls13_only_ephemeral_ffdh () {
|
|||||||
|
|
||||||
scripts/config.py set MBEDTLS_TEST_HOOKS
|
scripts/config.py set MBEDTLS_TEST_HOOKS
|
||||||
scripts/config.py unset PSA_WANT_ALG_ECDH
|
scripts/config.py unset PSA_WANT_ALG_ECDH
|
||||||
# Note: The unset below is to be removed for Mbed TLS 4.0
|
|
||||||
scripts/config.py unset MBEDTLS_ECDH_C
|
|
||||||
|
|
||||||
make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/tls13-only.h\"'"
|
make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/tls13-only.h\"'"
|
||||||
|
|
||||||
@@ -531,7 +528,6 @@ component_test_tls13_only_psk_ephemeral_ffdh () {
|
|||||||
scripts/config.py unset PSA_WANT_ALG_RSA_OAEP
|
scripts/config.py unset PSA_WANT_ALG_RSA_OAEP
|
||||||
scripts/config.py unset PSA_WANT_ALG_RSA_PSS
|
scripts/config.py unset PSA_WANT_ALG_RSA_PSS
|
||||||
# Note: The three unsets below are to be removed for Mbed TLS 4.0
|
# Note: The three unsets below are to be removed for Mbed TLS 4.0
|
||||||
scripts/config.py unset MBEDTLS_ECDH_C
|
|
||||||
scripts/config.py unset MBEDTLS_ECDSA_C
|
scripts/config.py unset MBEDTLS_ECDSA_C
|
||||||
|
|
||||||
make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/tls13-only.h\"'"
|
make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/tls13-only.h\"'"
|
||||||
|
@@ -283,7 +283,7 @@ REVERSE_DEPENDENCIES = {
|
|||||||
'MBEDTLS_ECDSA_C'],
|
'MBEDTLS_ECDSA_C'],
|
||||||
'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC': [
|
'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC': [
|
||||||
'PSA_WANT_ALG_ECDSA',
|
'PSA_WANT_ALG_ECDSA',
|
||||||
'PSA_WANT_ALG_ECDH', 'MBEDTLS_ECDH_C',
|
'PSA_WANT_ALG_ECDH',
|
||||||
'PSA_WANT_ALG_JPAKE',
|
'PSA_WANT_ALG_JPAKE',
|
||||||
'PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY',
|
'PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY',
|
||||||
'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT',
|
'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT',
|
||||||
|
Reference in New Issue
Block a user