From 5ce5f787e3b03c33297b1480ec138938a4ff5e8e Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 24 Sep 2017 21:58:58 +0100 Subject: [PATCH] Use tls1_group_id_lookup in tls1_curve_allowed Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/=4412) --- ssl/t1_lib.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 78e42fe239..196466bd98 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -254,13 +254,11 @@ void tls1_get_grouplist(SSL *s, int sess, const uint16_t **pcurves, /* See if curve is allowed by security callback */ int tls_curve_allowed(SSL *s, uint16_t curve, int op) { - const TLS_GROUP_INFO *cinfo; + const TLS_GROUP_INFO *cinfo = tls1_group_id_lookup(curve); unsigned char ctmp[2]; - if (curve > 0xff) - return 1; - if (curve < 1 || curve > OSSL_NELEM(nid_list)) + + if (cinfo == NULL) return 0; - cinfo = &nid_list[curve - 1]; # ifdef OPENSSL_NO_EC2M if (cinfo->flags & TLS_CURVE_CHAR2) return 0; -- 2.25.1