commit 89e103c54c78b53b1c7f075cebd979c54c42f50f
author Jerry Yu <jerry.h.yu@arm.com> Wed Mar 30 22:43:29 2022 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Fri Apr 22 16:45:01 2022 +0800
tree bbc9504a286c74bba6983ee64d490c1833660f2b
parent 3bf2c6449d31f2f2ea9c15ba97aebc5d35069468

tls13: Share write ecdh_key_exchange function

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>

library/ssl_tls13_server.c

diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index ae49eff..d6450a5 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -822,20 +822,27 @@
                                             size_t *out_len )
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
-
+    ((void) ssl);
+    ((void) named_group);
+    ((void) buf);
+    ((void) end);
+    ((void) out_len);
+#if defined(MBEDTLS_ECDH_C)
     if( mbedtls_ssl_tls13_named_group_is_ecdhe( named_group ) )
     {
-        ret = mbedtls_ecdh_tls13_make_params( &ssl->handshake->ecdh_ctx,
-                out_len, buf, end - buf, ssl->conf->f_rng, ssl->conf->p_rng );
+        ret = mbedtls_ssl_tls13_generate_and_write_ecdh_key_exchange(
+                                        ssl, named_group, buf, end, out_len );
         if( ret != 0 )
         {
-            MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ecdh_make_tls13_params", ret );
+            MBEDTLS_SSL_DEBUG_RET(
+                1, "mbedtls_ssl_tls13_generate_and_write_ecdh_key_exchange",
+                ret );
             return( ret );
         }
-
-        MBEDTLS_SSL_DEBUG_ECDH( 3, &ssl->handshake->ecdh_ctx, MBEDTLS_DEBUG_ECDH_Q );
     }
-    else if( 0 /* Other kinds of KEMs */ )
+    else
+#endif /* MBEDTLS_ECDH_C */
+    if( 0 /* Other kinds of KEMs */ )
     {
     }
     else