[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  da671c4184a4c8e7c3856b9ccdc6a6b4cece4012 (commit)
      from  5af6e154d0a4cd5b1d3a46bcfab444e714364d67 (commit)


- Log -----------------------------------------------------------------
commit da671c4184a4c8e7c3856b9ccdc6a6b4cece4012
Author: Pauli <pauli at openssl.org>
Date:   Thu Apr 22 11:50:15 2021 +1000

    Runchecker: fix no-ec2m build which was trying to validate the e2cm curves
    
    The evp_extra_test program was trying to validate these curves when they were
    not build.
    
    Fixes #14959
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14977)

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

Summary of changes:
 test/evp_extra_test.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index b781c583b5..3d63482f64 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -2700,10 +2700,15 @@ err:
 #endif
 
 #ifndef OPENSSL_NO_EC
-static int ecpub_nids[] = { NID_brainpoolP256r1, NID_X9_62_prime256v1,
-    NID_secp384r1, NID_secp521r1, NID_sect233k1, NID_sect233r1, NID_sect283r1,
+static int ecpub_nids[] = {
+    NID_brainpoolP256r1, NID_X9_62_prime256v1,
+    NID_secp384r1, NID_secp521r1,
+# ifndef OPENSSL_NO_EC2M
+    NID_sect233k1, NID_sect233r1, NID_sect283r1,
     NID_sect409k1, NID_sect409r1, NID_sect571k1, NID_sect571r1,
-    NID_brainpoolP384r1, NID_brainpoolP512r1};
+# endif
+    NID_brainpoolP384r1, NID_brainpoolP512r1
+};
 
 static int test_ecpub(int idx)
 {