commit b47d0f893ed984efb039389989f8b44641b95425
author Jerry Yu <jerry.h.yu@arm.com> Mon Dec 20 17:34:40 2021 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Mon Dec 20 17:38:50 2021 +0800
tree ee046005e8c5b48e660d8db9009d40fb34d019d3
parent 9fa5bf8e88508b47ea803b24f4fcfedebd31f662

Replace SUPPORTED_ELLIPTIC_CURVES with SUPPORTED_GROUPS

According to RFC7919 and RFC8442 , they are same.

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

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 32d4969..32befc2 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -302,10 +302,10 @@
 
 #if defined(MBEDTLS_ECDH_C) || defined(MBEDTLS_ECDSA_C) || \
     defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED)
-static int ssl_write_supported_elliptic_curves_ext( mbedtls_ssl_context *ssl,
-                                                    unsigned char *buf,
-                                                    const unsigned char *end,
-                                                    size_t *olen )
+static int ssl_write_supported_groups_ext( mbedtls_ssl_context *ssl,
+                                           unsigned char *buf,
+                                           const unsigned char *end,
+                                           size_t *olen )
 {
     unsigned char *p = buf;
     unsigned char *elliptic_curve_list = p + 6;
@@ -351,7 +351,7 @@
     if( elliptic_curve_len == 0 )
         return( MBEDTLS_ERR_SSL_BAD_CONFIG );
 
-    MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SUPPORTED_ELLIPTIC_CURVES, p, 0 );
+    MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SUPPORTED_GROUPS, p, 0 );
     p += 2;
 
     MBEDTLS_PUT_UINT16_BE( elliptic_curve_len + 2, p, 0 );
@@ -1206,10 +1206,10 @@
     defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED)
     if( uses_ec )
     {
-        if( ( ret = ssl_write_supported_elliptic_curves_ext( ssl, p + 2 + ext_len,
-                                                             end, &olen ) ) != 0 )
+        if( ( ret = ssl_write_supported_groups_ext( ssl, p + 2 + ext_len,
+                                                    end, &olen ) ) != 0 )
         {
-            MBEDTLS_SSL_DEBUG_RET( 1, "ssl_write_supported_elliptic_curves_ext", ret );
+            MBEDTLS_SSL_DEBUG_RET( 1, "ssl_write_supported_groups_ext", ret );
             return( ret );
         }
         ext_len += olen;