[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  2d840893e78253bcce428603fdbcda159bdebe08 (commit)
      from  0f386f2eb036d3efc61427b0f83cf5db654d0d49 (commit)


- Log -----------------------------------------------------------------
commit 2d840893e78253bcce428603fdbcda159bdebe08
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 24 14:45:07 2020 +0000

    Fix no-rc2
    
    Skip a test that relies on RC2 being present in a no-rc2 build.
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/13496)

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

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

diff --git a/test/recipes/80-test_pkcs12.t b/test/recipes/80-test_pkcs12.t
index 0f977d7755..03edc59eea 100644
--- a/test/recipes/80-test_pkcs12.t
+++ b/test/recipes/80-test_pkcs12.t
@@ -90,13 +90,17 @@ ok(run(app(["openssl", "pkcs12", "-export",
             "-out", $outfile2])),
    "test_pkcs12_passcerts");
 
-# Test reading legacy PKCS#12 file
-ok(run(app(["openssl", "pkcs12", "-export",
-            "-in", srctop_file(@path, "v3-certs-RC2.p12"),
-            "-passin", "pass:v3-certs",
-            "-provider", "default", "-provider", "legacy",
-            "-nokeys", "-passout", "pass:v3-certs", "-descert",
-            "-out", $outfile3])),
-   "test_pkcs12_passcerts_legacy");
+SKIP: {
+    skip "Skipping legacy PKCS#12 test because RC2 is disabled in this build", 1
+        if disabled("rc2");
+    # Test reading legacy PKCS#12 file
+    ok(run(app(["openssl", "pkcs12", "-export",
+                "-in", srctop_file(@path, "v3-certs-RC2.p12"),
+                "-passin", "pass:v3-certs",
+                "-provider", "default", "-provider", "legacy",
+                "-nokeys", "-passout", "pass:v3-certs", "-descert",
+                "-out", $outfile3])),
+    "test_pkcs12_passcerts_legacy");
+}
 
 SetConsoleOutputCP($savedcp) if (defined($savedcp));