[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  87bbbfb1e4fc2035e8f9ec1d6313a41c410a3218 (commit)
      from  e74be3d497e5ef60515c186100f3abef832a9f9d (commit)


- Log -----------------------------------------------------------------
commit 87bbbfb1e4fc2035e8f9ec1d6313a41c410a3218
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 4 10:24:19 2019 +0000

    Fix no-cmac
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7979)

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

Summary of changes:
 test/recipes/90-test_gost.t | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/recipes/90-test_gost.t b/test/recipes/90-test_gost.t
index ac214e2..d4f27b8 100644
--- a/test/recipes/90-test_gost.t
+++ b/test/recipes/90-test_gost.t
@@ -12,11 +12,11 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
 setup("test_gost");
 
 # The GOST ciphers are dynamically loaded via the GOST engine, so we must be
-# able to support that. The engine also uses DSA and CMS symbols, so we skip
-# this test on no-dsa or no-cms.
+# able to support that. The engine also uses DSA, CMS and CMAC symbols, so we
+# skip this test on no-dsa, no-cms or no-cmac.
 plan skip_all => "GOST support is disabled in this OpenSSL build"
     if disabled("gost") || disabled("engine") || disabled("dynamic-engine")
-       || disabled("dsa") || disabled("cms");
+       || disabled("dsa") || disabled("cms") || disabled("cmac");
 
 plan skip_all => "TLSv1.3 or TLSv1.2 are disabled in this OpenSSL build"
     if disabled("tls1_3") || disabled("tls1_2");