From: Matt Caswell <matt@openssl.org>
Date: Tue, 24 Nov 2020 14:45:07 +0000 (+0000)
Subject: Fix no-rc2
X-Git-Tag: openssl-3.0.0-alpha9~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d840893e78253bcce428603fdbcda159bdebe08;p=thirdparty%2Fopenssl.git

Fix no-rc2

Skip a test that relies on RC2 being present in a no-rc2 build.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13496)
---

diff --git a/test/recipes/80-test_pkcs12.t b/test/recipes/80-test_pkcs12.t
index 0f977d7755f..03edc59eeac 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));