commit 63706628d03bc0b5fd19f85f91f15efb7fd23e26
author Przemek Stekiel <przemyslaw.stekiel@mobica.com> Tue May 23 16:31:56 2023 +0200
committer Przemek Stekiel <przemyslaw.stekiel@mobica.com> Tue Jun 06 12:31:08 2023 +0200
tree c6b2263058a9d3a537a1e8567f47af08622b3830
parent 947ff56c45da8f7a60059e5cc3afc67ca33027c6

Adapt guards for FFDH

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

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index e3bc776..fad970c 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -2657,14 +2657,14 @@
     const mbedtls_ssl_ciphersuite_t *suite);
 #endif /* MBEDTLS_SSL_SOME_SUITES_USE_CBC_ETM */
 
-#if defined(PSA_WANT_ALG_ECDH)
+#if defined(PSA_WANT_ALG_ECDH) || defined(PSA_WANT_ALG_FFDH)
 
 MBEDTLS_CHECK_RETURN_CRITICAL
 int mbedtls_ssl_tls13_read_public_ecdhe_share(mbedtls_ssl_context *ssl,
                                               const unsigned char *buf,
                                               size_t buf_len);
 
-#endif /* PSA_WANT_ALG_ECDH */
+#endif /* PSA_WANT_ALG_ECDH || PSA_WANT_ALG_FFDH */
 
 static inline int mbedtls_ssl_tls13_cipher_suite_is_offered(
     mbedtls_ssl_context *ssl, int cipher_suite)

library/ssl_tls13_generic.c

diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index feca203..6a1006f 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -1488,7 +1488,7 @@
     return ret;
 }
 
-#if defined(PSA_WANT_ALG_ECDH)
+#if defined(PSA_WANT_ALG_ECDH) || defined(PSA_WANT_ALG_FFDH)
 
 int mbedtls_ssl_tls13_read_public_ecdhe_share(mbedtls_ssl_context *ssl,
                                               const unsigned char *buf,
@@ -1569,7 +1569,7 @@
 
     return 0;
 }
-#endif /* PSA_WANT_ALG_ECDH */
+#endif /* PSA_WANT_ALG_ECDH || PSA_WANT_ALG_FFDH */
 
 #if defined(PSA_WANT_ALG_FFDH)
 int mbedtls_ssl_tls13_generate_and_write_dhe_key_exchange(

library/ssl_tls13_server.c

diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index 31c6b17..351ef06 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -1562,7 +1562,7 @@
                 break;
 #endif /* PSA_WANT_ALG_ECDH */
 
-#if defined(PSA_WANT_ALG_ECDH)
+#if defined(PSA_WANT_ALG_ECDH) || defined(PSA_WANT_ALG_FFDH)
             case MBEDTLS_TLS_EXT_KEY_SHARE:
                 MBEDTLS_SSL_DEBUG_MSG(3, ("found key share extension"));
 
@@ -1587,7 +1587,7 @@
                 }
 
                 break;
-#endif /* PSA_WANT_ALG_ECDH */
+#endif /* PSA_WANT_ALG_ECDH || PSA_WANT_ALG_FFDH */
 
             case MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS:
                 /* Already parsed */
@@ -1924,7 +1924,7 @@
         }
     } else
 #endif /* PSA_WANT_ALG_ECDH */
-#if defined(MBEDTLS_DHM_C)
+#if defined(MBEDTLS_DHM_C) || defined(PSA_WANT_ALG_FFDH)
     if (mbedtls_ssl_tls13_named_group_is_dhe(named_group)) {
         ret = mbedtls_ssl_tls13_generate_and_write_dhe_key_exchange(
             ssl, named_group, buf, end, out_len);
@@ -1935,7 +1935,7 @@
             return ret;
         }
     } else
-#endif /* MBEDTLS_DHM_C */
+#endif /* MBEDTLS_DHM_C || PSA_WANT_ALG_FFDH */
     if (0 /* Other kinds of KEMs */) {
     } else {
         ((void) ssl);