[openssl] OpenSSL_1_1_1-stable update

[Matt Caswell]

The branch OpenSSL_1_1_1-stable has been updated
       via  95fd012db5827d4e29f33213b0ba178a4628c40d (commit)
      from  0ad7578822b188447b1946e65a0ec4b5b07ead3f (commit)


- Log -----------------------------------------------------------------
commit 95fd012db5827d4e29f33213b0ba178a4628c40d
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)
    
    (cherry picked from commit ef2fb64f9dfde1965cb0b8a5f8765c4f467c1604)

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

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 74b7e0bcb8..e4a0b180d7 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -1786,6 +1786,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;