eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix selection of default FFDH group

Browse source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2023-06-15 16:58:51 +02:00
parent 8c0a95374f
commit a05e9c1ec8
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
library/ssl_tls13_client.c
View file

@ -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);