[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  fab8fde3fc5ee871b0f92e207343a45ad8cc36b1 (commit)
      from  90ad284f4e76254f8d67686ae3a5d6c576037091 (commit)


- Log -----------------------------------------------------------------
commit fab8fde3fc5ee871b0f92e207343a45ad8cc36b1
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu May 14 17:15:05 2020 +0200

    test/evp_extra_test.c: Add OPENSSL_NO_CMAC around CMAC test
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11833)

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

Summary of changes:
 test/evp_extra_test.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index bbd95850c6..53d2f3afdb 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -1179,6 +1179,7 @@ static int test_EVP_PKEY_check(int i)
     return ret;
 }
 
+#ifndef OPENSSL_NO_CMAC
 static int test_CMAC_keygen(void)
 {
     /*
@@ -1199,6 +1200,7 @@ static int test_CMAC_keygen(void)
     EVP_PKEY_CTX_free(kctx);
     return ret;
 }
+#endif
 
 static int test_HKDF(void)
 {
@@ -1651,7 +1653,9 @@ int setup_tests(void)
     if (!TEST_int_eq(EVP_PKEY_meth_add0(custom_pmeth), 1))
         return 0;
     ADD_ALL_TESTS(test_EVP_PKEY_check, OSSL_NELEM(keycheckdata));
+#ifndef OPENSSL_NO_CMAC
     ADD_TEST(test_CMAC_keygen);
+#endif
     ADD_TEST(test_HKDF);
 #ifndef OPENSSL_NO_EC
     ADD_TEST(test_X509_PUBKEY_inplace);