commit 6a9fb932fbb0ecc804731c8f750d665807fb5f5f
author Dave Rodgman <dave.rodgman@arm.com> Wed Aug 16 17:50:36 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Wed Aug 16 17:50:36 2023 +0100
tree 756bef1fa8198d79d5a4fb030c601bb5f322d9e9
parent a4c01dd6e9264c40c33a1b9fcd3309b0cad0595f

Use MBEDTLS_GET_UINT16_BE in mbedtls_ecp_tls_read_group_id

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/ecp.c

diff --git a/library/ecp.c b/library/ecp.c
index f9b6672..5f2a7b0 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -958,9 +958,8 @@
     /*
      * Next two bytes are the namedcurve value
      */
-    tls_id = *(*buf)++;
-    tls_id <<= 8;
-    tls_id |= *(*buf)++;
+    tls_id = MBEDTLS_GET_UINT16_BE(*buf, 0);
+    *buf += 2;
 
     if ((curve_info = mbedtls_ecp_curve_info_from_tls_id(tls_id)) == NULL) {
         return MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE;