From: Matt Caswell <matt@openssl.org>
Date: Wed, 2 Dec 2020 12:45:47 +0000 (+0000)
Subject: Skip testing ciphers in the legacy provider if no legacy
X-Git-Tag: openssl-3.0.0-alpha10~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81959b26a31bfa807f80d43234db2168f80784c2;p=thirdparty%2Fopenssl.git

Skip testing ciphers in the legacy provider if no legacy

test_enc should not test ciphers that are not available due to a lack
of the legacy provider

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13595)
---

diff --git a/test/recipes/20-test_enc.t b/test/recipes/20-test_enc.t
index 003b1fc3440..8cd4cf98b71 100644
--- a/test/recipes/20-test_enc.t
+++ b/test/recipes/20-test_enc.t
@@ -15,6 +15,7 @@ use File::Copy;
 use File::Compare qw/compare_text/;
 use File::Basename;
 use OpenSSL::Test qw/:DEFAULT srctop_file bldtop_dir/;
+use OpenSSL::Test::Utils;
 
 setup("test_enc");
 
@@ -27,13 +28,16 @@ my $test = catfile(".", "p");
 
 my $cmd = "openssl";
 my $provpath = bldtop_dir("providers");
-my @prov = ("-provider-path", $provpath, "-provider", "default", "-provider", "legacy");
-
+my @prov = ("-provider-path", $provpath, "-provider", "default");
+push @prov, ("-provider", "legacy") unless disabled("legacy");
 my $ciphersstatus = undef;
 my @ciphers =
     map { s/^\s+//; s/\s+$//; split /\s+/ }
     run(app([$cmd, "list", "-cipher-commands"]),
         capture => 1, statusvar => \$ciphersstatus);
+@ciphers = grep {!/^(bf|cast|des$|des-cbc|des-cfb|des-ecb|des-ofb|desx|idea
+                     |rc2|rc4|seed)/x} @ciphers
+    if disabled("legacy");
 
 plan tests => 2 + (scalar @ciphers)*2;