[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  67cd43084cacb976ef79bbc23ccab048b06e5c1c (commit)
      from  5432d827ec2cffa2e75bf8dd0bc570288cba19f6 (commit)


- Log -----------------------------------------------------------------
commit 67cd43084cacb976ef79bbc23ccab048b06e5c1c
Author: Pauli <pauli at openssl.org>
Date:   Sat May 1 13:38:34 2021 +1000

    test: fix failure with FIPS and no-des configured.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15105)

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

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

diff --git a/test/recipes/80-test_pkcs12.t b/test/recipes/80-test_pkcs12.t
index b259c1a335..12189da3a3 100644
--- a/test/recipes/80-test_pkcs12.t
+++ b/test/recipes/80-test_pkcs12.t
@@ -96,8 +96,8 @@ SKIP: {
 }
 
 SKIP: {
-    skip "Skipping legacy PKCS#12 test because RC2 is disabled in this build", 1
-        if disabled("rc2") || disabled("legacy");
+    skip "Skipping legacy PKCS#12 test because the required algorithms are disabled", 1
+        if disabled("des") || disabled("rc2") || disabled("legacy");
     # Test reading legacy PKCS#12 file
     ok(run(app(["openssl", "pkcs12", "-export",
                 "-in", srctop_file(@path, "v3-certs-RC2.p12"),