commit 43b95d736561e64dd7c1c97555f39a98c56d1ae3
author Dr. Stephen Henson <steve@openssl.org> Sat Sep 23 00:15:34 2017 +0100
committer Dr. Stephen Henson <steve@openssl.org> Tue Sep 26 13:00:26 2017 +0100
tree 3a109e69834d8ab7aed1bc9af4c3995a689768ab
parent 0e464d9ddd3b7995bce27d780f8295f47ac5a647

Replace tls1_ec_curve_id2nid.

Replace tls1_ec_curve_id2nid() with tls_group_id_lookup() which returns
the TLS_GROUP_INFO for the group.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/=4412)

ssl/t1_lib.c

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 0f57b53..c7a8a53 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -186,16 +186,12 @@
     TLSEXT_curve_P_384
 };
 
-int tls1_ec_curve_id2nid(uint16_t curve_id, unsigned int *pflags)
+const TLS_GROUP_INFO *tls1_group_id_lookup(uint16_t curve_id)
 {
-    const TLS_GROUP_INFO *cinfo;
     /* ECC curves from RFC 4492 and RFC 7027 */
     if (curve_id < 1 || curve_id > OSSL_NELEM(nid_list))
-        return NID_undef;
-    cinfo = nid_list + curve_id - 1;
-    if (pflags)
-        *pflags = cinfo->flags;
-    return cinfo->nid;
+        return NULL;
+    return &nid_list[curve_id - 1];
 }
 
 uint16_t tls1_ec_nid2curve_id(int nid)