mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-01-06 11:41:12 +03:00
remove secp224[k|r]1 curves
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
@@ -263,7 +263,6 @@ REVERSE_DEPENDENCIES = {
|
||||
'PSA_WANT_ECC_MONTGOMERY_255': ['MBEDTLS_ECP_DP_CURVE25519_ENABLED'],
|
||||
'PSA_WANT_ECC_MONTGOMERY_448': ['MBEDTLS_ECP_DP_CURVE448_ENABLED'],
|
||||
'PSA_WANT_ECC_SECP_R1_192': ['MBEDTLS_ECP_DP_SECP192R1_ENABLED'],
|
||||
'PSA_WANT_ECC_SECP_R1_224': ['MBEDTLS_ECP_DP_SECP224R1_ENABLED'],
|
||||
'PSA_WANT_ECC_SECP_R1_256': ['PSA_WANT_ALG_JPAKE',
|
||||
'MBEDTLS_ECP_DP_SECP256R1_ENABLED'],
|
||||
'PSA_WANT_ECC_SECP_R1_384': ['MBEDTLS_ECP_DP_SECP384R1_ENABLED'],
|
||||
@@ -482,9 +481,7 @@ class DomainData:
|
||||
if alg.can_do(crypto_knowledge.AlgorithmCategory.HASH)}
|
||||
|
||||
# Find elliptic curve enabling macros by name.
|
||||
# MBEDTLS_ECP_DP_SECP224K1_ENABLED added to disable it for all curves
|
||||
curve_symbols = self.config_symbols_matching(r'PSA_WANT_ECC_\w+\Z|'
|
||||
r'MBEDTLS_ECP_DP_SECP224K1_ENABLED')
|
||||
curve_symbols = self.config_symbols_matching(r'PSA_WANT_ECC_\w+\Z|')
|
||||
|
||||
# Find key exchange enabling macros by name.
|
||||
key_exchange_symbols = self.config_symbols_matching(r'MBEDTLS_KEY_EXCHANGE_\w+_ENABLED\Z')
|
||||
|
||||
@@ -28,12 +28,10 @@ CLASSIC_DEPENDENCIES = frozenset([
|
||||
'MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN',
|
||||
'MBEDTLS_CIPHER_PADDING_ZEROS',
|
||||
#curve#'MBEDTLS_ECP_DP_SECP192R1_ENABLED',
|
||||
#curve#'MBEDTLS_ECP_DP_SECP224R1_ENABLED',
|
||||
#curve#'MBEDTLS_ECP_DP_SECP256R1_ENABLED',
|
||||
#curve#'MBEDTLS_ECP_DP_SECP384R1_ENABLED',
|
||||
#curve#'MBEDTLS_ECP_DP_SECP521R1_ENABLED',
|
||||
#curve#'MBEDTLS_ECP_DP_SECP192K1_ENABLED',
|
||||
#curve#'MBEDTLS_ECP_DP_SECP224K1_ENABLED',
|
||||
#curve#'MBEDTLS_ECP_DP_SECP256K1_ENABLED',
|
||||
#curve#'MBEDTLS_ECP_DP_BP256R1_ENABLED',
|
||||
#curve#'MBEDTLS_ECP_DP_BP384R1_ENABLED',
|
||||
|
||||
@@ -2659,8 +2659,6 @@ requires_config_enabled PSA_WANT_ECC_SECP_K1_256
|
||||
run_test_psa_force_curve "secp256k1"
|
||||
requires_config_enabled PSA_WANT_ECC_BRAINPOOL_P_R1_256
|
||||
run_test_psa_force_curve "brainpoolP256r1"
|
||||
requires_config_enabled PSA_WANT_ECC_SECP_R1_224
|
||||
run_test_psa_force_curve "secp224r1"
|
||||
requires_config_enabled PSA_WANT_ECC_SECP_R1_192
|
||||
run_test_psa_force_curve "secp192r1"
|
||||
requires_config_enabled PSA_WANT_ECC_SECP_K1_192
|
||||
|
||||
@@ -3538,7 +3538,6 @@ exit:
|
||||
void conf_group()
|
||||
{
|
||||
uint16_t iana_tls_group_list[] = { MBEDTLS_SSL_IANA_TLS_GROUP_SECP192R1,
|
||||
MBEDTLS_SSL_IANA_TLS_GROUP_SECP224R1,
|
||||
MBEDTLS_SSL_IANA_TLS_GROUP_SECP256R1,
|
||||
MBEDTLS_SSL_IANA_TLS_GROUP_NONE };
|
||||
|
||||
@@ -4050,11 +4049,6 @@ void elliptic_curve_get_properties()
|
||||
#else
|
||||
TEST_UNAVAILABLE_ECC(26, MBEDTLS_ECP_DP_BP256R1, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 256);
|
||||
#endif
|
||||
#if defined(PSA_WANT_ECC_SECP_R1_224)
|
||||
TEST_AVAILABLE_ECC(21, MBEDTLS_ECP_DP_SECP224R1, PSA_ECC_FAMILY_SECP_R1, 224);
|
||||
#else
|
||||
TEST_UNAVAILABLE_ECC(21, MBEDTLS_ECP_DP_SECP224R1, PSA_ECC_FAMILY_SECP_R1, 224);
|
||||
#endif
|
||||
#if defined(PSA_WANT_ECC_SECP_R1_192)
|
||||
TEST_AVAILABLE_ECC(19, MBEDTLS_ECP_DP_SECP192R1, PSA_ECC_FAMILY_SECP_R1, 192);
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user