commit f595c5b69a0e9fd90abaf5446e9f653c6d265eda
author Przemek Stekiel <przemyslaw.stekiel@mobica.com> Fri Jun 16 14:31:27 2023 +0200
committer Przemek Stekiel <przemyslaw.stekiel@mobica.com> Fri Jun 16 15:45:37 2023 +0200
tree 44fcf597dd382dfc15186cd70b35804db6fb7734
parent 1f5c2ba4955d324ea2e4694afa97db1086cdd9a8

Use valid guard for filling group list with EC groups

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>

library/ssl_client.c

diff --git a/library/ssl_client.c b/library/ssl_client.c
index 2a2efe1..8ee06eb 100644
--- a/library/ssl_client.c
+++ b/library/ssl_client.c
@@ -258,7 +258,8 @@
     for (; *group_list != 0; group_list++) {
         MBEDTLS_SSL_DEBUG_MSG(1, ("got supported group(%04x)", *group_list));
 
-#if defined(PSA_WANT_ALG_ECDH)
+#if defined(MBEDTLS_ECDH_C) || defined(MBEDTLS_ECDSA_C) || \
+        defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED)
         if ((mbedtls_ssl_conf_is_tls13_enabled(ssl->conf) &&
              mbedtls_ssl_tls13_named_group_is_ecdhe(*group_list)) ||
             (mbedtls_ssl_conf_is_tls12_enabled(ssl->conf) &&
@@ -274,7 +275,7 @@
                                       mbedtls_ssl_get_curve_name_from_tls_id(*group_list),
                                       *group_list));
         }
-#endif /* PSA_WANT_ALG_ECDH */
+#endif /* MBEDTLS_ECDH_C || MBEDTLS_ECDSA_C || MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED */
 #if defined(PSA_WANT_ALG_FFDH)
         if ((mbedtls_ssl_conf_is_tls13_enabled(ssl->conf) &&
              mbedtls_ssl_tls13_named_group_is_dhe(*group_list))) {