From: Pauli <pauli@openssl.org>
Date: Thu, 22 Apr 2021 01:50:15 +0000 (+1000)
Subject: Runchecker: fix no-ec2m build which was trying to validate the e2cm curves
X-Git-Tag: openssl-3.0.0-alpha16~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da671c4184a4c8e7c3856b9ccdc6a6b4cece4012;p=thirdparty%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14977)
---

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index b781c583b53..3d63482f645 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)
 {