[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  9afaa8d65bab372ddd9c62af67b63769bf09c091 (commit)
      from  f11f86f6ec7fb31bde1da2810ac975c032205321 (commit)


- Log -----------------------------------------------------------------
commit 9afaa8d65bab372ddd9c62af67b63769bf09c091
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 4 17:29:37 2020 +0000

    Fix no-sm2
    
    Fix ecdsatest to not run the SM2 test if SM2 has been disabled.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11015)

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

Summary of changes:
 test/ecdsatest.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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;