mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-10-21 16:17:57 +00:00
library: ssl: remove mbedtls_ecp_group_id field from mbedtls_ecp_group_id
This field is now completely useless. Signed-off-by: Valerio Setti <[email protected]>
This commit is contained in:
+10
-11
@@ -5795,39 +5795,38 @@ int mbedtls_ssl_check_curve_tls_id(const mbedtls_ssl_context *ssl, uint16_t tls_
|
|||||||
|
|
||||||
static const struct {
|
static const struct {
|
||||||
uint16_t tls_id;
|
uint16_t tls_id;
|
||||||
mbedtls_ecp_group_id ecp_group_id;
|
|
||||||
psa_ecc_family_t psa_family;
|
psa_ecc_family_t psa_family;
|
||||||
uint16_t bits;
|
uint16_t bits;
|
||||||
} tls_id_match_table[] =
|
} tls_id_match_table[] =
|
||||||
{
|
{
|
||||||
#if defined(PSA_WANT_ECC_SECP_R1_521)
|
#if defined(PSA_WANT_ECC_SECP_R1_521)
|
||||||
{ 25, MBEDTLS_ECP_DP_SECP521R1, PSA_ECC_FAMILY_SECP_R1, 521 },
|
{ 25, PSA_ECC_FAMILY_SECP_R1, 521 },
|
||||||
#endif
|
#endif
|
||||||
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_512)
|
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_512)
|
||||||
{ 28, MBEDTLS_ECP_DP_BP512R1, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 512 },
|
{ 28, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 512 },
|
||||||
#endif
|
#endif
|
||||||
#if defined(PSA_WANT_ECC_SECP_R1_384)
|
#if defined(PSA_WANT_ECC_SECP_R1_384)
|
||||||
{ 24, MBEDTLS_ECP_DP_SECP384R1, PSA_ECC_FAMILY_SECP_R1, 384 },
|
{ 24, PSA_ECC_FAMILY_SECP_R1, 384 },
|
||||||
#endif
|
#endif
|
||||||
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_384)
|
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_384)
|
||||||
{ 27, MBEDTLS_ECP_DP_BP384R1, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 384 },
|
{ 27, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 384 },
|
||||||
#endif
|
#endif
|
||||||
#if defined(PSA_WANT_ECC_SECP_R1_256)
|
#if defined(PSA_WANT_ECC_SECP_R1_256)
|
||||||
{ 23, MBEDTLS_ECP_DP_SECP256R1, PSA_ECC_FAMILY_SECP_R1, 256 },
|
{ 23, PSA_ECC_FAMILY_SECP_R1, 256 },
|
||||||
#endif
|
#endif
|
||||||
#if defined(PSA_WANT_ECC_SECP_K1_256)
|
#if defined(PSA_WANT_ECC_SECP_K1_256)
|
||||||
{ 22, MBEDTLS_ECP_DP_SECP256K1, PSA_ECC_FAMILY_SECP_K1, 256 },
|
{ 22, PSA_ECC_FAMILY_SECP_K1, 256 },
|
||||||
#endif
|
#endif
|
||||||
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256)
|
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256)
|
||||||
{ 26, MBEDTLS_ECP_DP_BP256R1, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 256 },
|
{ 26, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 256 },
|
||||||
#endif
|
#endif
|
||||||
#if defined(PSA_WANT_ECC_MONTGOMERY_255)
|
#if defined(PSA_WANT_ECC_MONTGOMERY_255)
|
||||||
{ 29, MBEDTLS_ECP_DP_CURVE25519, PSA_ECC_FAMILY_MONTGOMERY, 255 },
|
{ 29, PSA_ECC_FAMILY_MONTGOMERY, 255 },
|
||||||
#endif
|
#endif
|
||||||
#if defined(PSA_WANT_ECC_MONTGOMERY_448)
|
#if defined(PSA_WANT_ECC_MONTGOMERY_448)
|
||||||
{ 30, MBEDTLS_ECP_DP_CURVE448, PSA_ECC_FAMILY_MONTGOMERY, 448 },
|
{ 30, PSA_ECC_FAMILY_MONTGOMERY, 448 },
|
||||||
#endif
|
#endif
|
||||||
{ 0, MBEDTLS_ECP_DP_NONE, 0, 0 },
|
{ 0, 0, 0 },
|
||||||
};
|
};
|
||||||
|
|
||||||
int mbedtls_ssl_get_psa_curve_info_from_tls_id(uint16_t tls_id,
|
int mbedtls_ssl_get_psa_curve_info_from_tls_id(uint16_t tls_id,
|
||||||
|
|||||||
Reference in New Issue
Block a user