From: Matt Caswell <matt@openssl.org>
Date: Tue, 4 Feb 2020 17:29:37 +0000 (+0000)
Subject: Fix no-sm2
X-Git-Tag: openssl-3.0.0-alpha1~538
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9afaa8d65bab372ddd9c62af67b63769bf09c091;p=oweals%2Fopenssl.git

Fix no-sm2

Fix ecdsatest to not run the SM2 test if SM2 has been disabled.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11015)
---

diff --git a/test/ecdsatest.c b/test/ecdsatest.c
index a87715a990..9747fb9042 100644
--- a/test/ecdsatest.c
+++ b/test/ecdsatest.c
@@ -384,11 +384,13 @@ static int test_builtin_as_ec(int n)
     return test_builtin(n, EVP_PKEY_EC);
 }
 
+# ifndef OPENSSL_NO_SM2
 static int test_builtin_as_sm2(int n)
 {
     return test_builtin(n, EVP_PKEY_SM2);
 }
-#endif
+# endif
+#endif /* OPENSSL_NO_EC */
 
 int setup_tests(void)
 {
@@ -401,7 +403,9 @@ int setup_tests(void)
         || !TEST_true(EC_get_builtin_curves(curves, crv_len)))
         return 0;
     ADD_ALL_TESTS(test_builtin_as_ec, crv_len);
+# ifndef OPENSSL_NO_SM2
     ADD_ALL_TESTS(test_builtin_as_sm2, crv_len);
+# endif
     ADD_ALL_TESTS(x9_62_tests, OSSL_NELEM(ecdsa_cavs_kats));
 #endif
     return 1;