[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  ef2fb64f9dfde1965cb0b8a5f8765c4f467c1604 (commit)
      from  f99b34957f4173f68d6f19d0d9fac37d797b7e0c (commit)


- Log -----------------------------------------------------------------
commit ef2fb64f9dfde1965cb0b8a5f8765c4f467c1604
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Oct 22 16:09:44 2021 +0100

    Fix no-cmac
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16894)

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

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

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index b241387b5e..2c604daae9 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -3988,6 +3988,12 @@ static int test_signatures_with_engine(int tst)
     size_t maclen = 0;
     int ret;
 
+#  ifdef OPENSSL_NO_CMAC
+    /* Skip CMAC tests in a no-cmac build */
+    if (tst <= 1)
+        return 1;
+#  endif
+
     if (!TEST_ptr(e = ENGINE_by_id(engine_id)))
         return 0;