[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  2d3e6d41165ca2f225d500cfbc7dff8714f37f95 (commit)
      from  eb7598039683971b020a3d1395b2ca1257579a59 (commit)


- Log -----------------------------------------------------------------
commit 2d3e6d41165ca2f225d500cfbc7dff8714f37f95
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Apr 20 11:23:34 2020 +0100

    Fix no-des
    
    Disable a recently added CMS test in the case of no-des.
    
    Reviewed-by: Paul Yang <kaishen.yy at antfin.com>
    (Merged from https://github.com/openssl/openssl/pull/11578)

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

Summary of changes:
 test/recipes/80-test_cms.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index 0e2969dee0..3b472a7402 100644
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -640,8 +640,8 @@ subtest "CMS Decrypt message encrypted with OpenSSL 1.1.1\n" => sub {
     plan tests => 1;
 
     SKIP: {
-        skip "EC isn't supported in this build", 1
-            if disabled("ec");
+        skip "EC or DES isn't supported in this build", 1
+            if disabled("ec") || disabled("des");
 
         my $out = "smtst.txt";