mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-07-19 05:43:14 +03:00
Fix selection of default FFDH group
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
@ -227,22 +227,23 @@ static int ssl_tls13_get_default_group_id(mbedtls_ssl_context *ssl,
|
|||||||
if (group_list == NULL) {
|
if (group_list == NULL) {
|
||||||
return MBEDTLS_ERR_SSL_BAD_CONFIG;
|
return MBEDTLS_ERR_SSL_BAD_CONFIG;
|
||||||
}
|
}
|
||||||
#if defined(PSA_WANT_ALG_FFDH)
|
|
||||||
if (mbedtls_ssl_tls13_named_group_is_dhe(*group_list)) {
|
|
||||||
*group_id = *group_list;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif /* PSA_WANT_ALG_FFDH */
|
|
||||||
#if defined(PSA_WANT_ALG_ECDH)
|
|
||||||
for (; *group_list != 0; group_list++) {
|
for (; *group_list != 0; group_list++) {
|
||||||
|
#if defined(PSA_WANT_ALG_ECDH)
|
||||||
if ((mbedtls_ssl_get_psa_curve_info_from_tls_id(
|
if ((mbedtls_ssl_get_psa_curve_info_from_tls_id(
|
||||||
*group_list, NULL, NULL) == PSA_SUCCESS) &&
|
*group_list, NULL, NULL) == PSA_SUCCESS) &&
|
||||||
mbedtls_ssl_tls13_named_group_is_ecdhe(*group_list)) {
|
mbedtls_ssl_tls13_named_group_is_ecdhe(*group_list)) {
|
||||||
*group_id = *group_list;
|
*group_id = *group_list;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
#if defined(PSA_WANT_ALG_FFDH)
|
||||||
|
if (mbedtls_ssl_tls13_named_group_is_dhe(*group_list)) {
|
||||||
|
*group_id = *group_list;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif /* PSA_WANT_ALG_ECDH */
|
|
||||||
#else
|
#else
|
||||||
((void) ssl);
|
((void) ssl);
|
||||||
((void) group_id);
|
((void) group_id);
|
||||||
|
Reference in New Issue
Block a user