Add a bytestogroup macro

[openssl.git] / ssl / statem / extensions_clnt.c

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index 01a80a075553454e1fe4d58ff1a4743868ece325..ea379199e04019a46c938c4a52ea2c4236b7ed83 100644 (file)
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -614,7 +614,7 @@ int tls_construct_ctos_key_share(SSL *s, WPACKET *pkt, unsigned int context,
             if (!tls_curve_allowed(s, pcurves, SSL_SECOP_CURVE_SUPPORTED))
                 continue;
 
-            curve_id = (pcurves[0] << 8) | pcurves[1];
+            curve_id = bytestogroup(pcurves);
             break;
         }
     }
@@ -1235,7 +1235,7 @@ int tls_parse_stoc_key_share(SSL *s, PACKET *pkt, unsigned int context, X509 *x,
             return 0;
         }
         for (i = 0; i < num_curves; i++, pcurves += 2) {
-            if (group_id == (unsigned int)((pcurves[0] << 8) | pcurves[1]))
+            if (group_id == bytestogroup(pcurves))
                 break;
         }
         if (i >= num_curves