[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  910fff7eb6cb8175fec4535ede09dc871c9895ac (commit)
      from  fbe9dafdddc5e4aa7190617d189eeadf2da34a4d (commit)


- Log -----------------------------------------------------------------
commit 910fff7eb6cb8175fec4535ede09dc871c9895ac
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Jul 17 11:43:30 2018 +0100

    Skip the GOST test where appropriate
    
    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 the test on no-dsa or no-cms.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6730)

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

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

diff --git a/test/recipes/90-test_gost.t b/test/recipes/90-test_gost.t
index 00f95af..c7bbb4e 100644
--- a/test/recipes/90-test_gost.t
+++ b/test/recipes/90-test_gost.t
@@ -11,8 +11,12 @@ 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.
 plan skip_all => "GOST support is disabled in this OpenSSL build"
-    if disabled("gost");
+    if disabled("gost") || disabled("engine") || disabled("dynamic-engine")
+       || disabled("dsa") || disabled("cms");
 
 plan skip_all => "TLSv1.3 or TLSv1.2 are disabled in this OpenSSL build"
     if disabled("tls1_3") || disabled("tls1_2");