[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  36ebf15d495d8c10163c04d0fd7348dbc445c609 (commit)
      from  ba2fd95037b9550e3efb4547034951151cc0e273 (commit)


- Log -----------------------------------------------------------------
commit 36ebf15d495d8c10163c04d0fd7348dbc445c609
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 24 10:10:39 2018 +0100

    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 at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/6065)
    
    (cherry picked from commit ca50cd911ca3c9dc9ec8dd956f8eb45557585a98)

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index cd0cba0..3dddd9c 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -408,7 +408,7 @@ int tls1_set_curves(unsigned char **pext, size_t *pextlen,
     return 1;
 }
 
-# define MAX_CURVELIST   28
+# define MAX_CURVELIST   OSSL_NELEM(nid_list)
 
 typedef struct {
     size_t nidcnt;