[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  ca50cd911ca3c9dc9ec8dd956f8eb45557585a98 (commit)
      from  f90bc6c5cb9ca4d97730ff63e6d34fd94047893e (commit)


- Log -----------------------------------------------------------------
commit ca50cd911ca3c9dc9ec8dd956f8eb45557585a98
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)

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

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 b777b3a..6f4923d 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;