From: Matt Caswell <matt@openssl.org>
Date: Tue, 24 Apr 2018 09:10:39 +0000 (+0100)
Subject: Fix the MAX_CURVELIST definition
X-Git-Tag: OpenSSL_1_1_1-pre6~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca50cd911ca3c9dc9ec8dd956f8eb45557585a98;p=oweals%2Fopenssl.git

Fix the MAX_CURVELIST definition

The MAX_CURVELIST macro defines the total number of in-built SSL/TLS curves
that we support. However it has not been updated as new curves are added.

Fixes #5232

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/6065)
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index b777b3acbb..6f4923d5b6 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -366,7 +366,7 @@ int tls1_set_groups(uint16_t **pext, size_t *pextlen,
     return 1;
 }
 
-# define MAX_CURVELIST   28
+# define MAX_CURVELIST   OSSL_NELEM(nid_list)
 
 typedef struct {
     size_t nidcnt;