mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-25 20:00:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't use the legacy provider in test_store if its not available

Browse Source 
If we don't have the legacy provider then we avoid having to use it.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13595)
This commit is contained in:
Matt Caswell 2020-12-02 13:09:28 +00:00
parent d5e8d26008
commit 8891a12b5b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/recipes/90-test_store.t
View File

@ -19,7 +19,7 @@ setup($test_name);
my $mingw = config('target') =~ m|^mingw|;
my $use_md5 = !disabled("md5");
my $use_des = !disabled("des"); # also affects 3des and pkcs12 app
my $use_des = !(disabled("des") || disabled("legacy")); # also affects 3des and pkcs12 app
my $use_dsa = !disabled("dsa");
my $use_ecc = !disabled("ec");
@ -97,7 +97,9 @@ my @noexist_file_files =
# @methods is a collection of extra 'openssl storeutl' arguments used to
# try the different methods.
my @methods;
push @methods, [qw(-provider default -provider legacy)];
my @prov_method = qw(-provider default);
push @prov_method, qw(-provider legacy) unless disabled('legacy');
push @methods, [ @prov_method ];
push @methods, [qw(-engine loader_attic)]
unless disabled('dynamic-engine') || disabled('deprecated-3.0');
@ -291,7 +293,9 @@ indir "store_$$" => sub {
sub init {
my $cnf = srctop_file('test', 'ca-and-certs.cnf');
my $cakey = srctop_file('test', 'certs', 'ca-key.pem');
my @std_args = qw(-provider default -provider legacy);
my @std_args = qw(-provider default);
push @std_args, qw(-provider legacy)
unless disabled('legacy');
return (
# rsa-key-pkcs1.pem
run(app(["openssl", "pkey", @std_args,