diff options
| author | Matt Caswell <matt@openssl.org> | 2020-12-02 13:23:37 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-12-11 11:56:22 +0100 |
| commit | 49da54b9faca740592ff0645b480dfeaca775970 (patch) | |
| tree | aa5e65763cb6cb2d43eecc90d1cf3b56d382d84c /test/recipes | |
| parent | Fix sslapitest.c if built with no-legacy (diff) | |
| download | openssl-49da54b9faca740592ff0645b480dfeaca775970.tar.xz openssl-49da54b9faca740592ff0645b480dfeaca775970.zip | |
Don't use legacy provider if not available in test_ssl_old
If we've been configured with no-legacy then we should not attempt to
load the legacy provider.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13595)
Diffstat (limited to 'test/recipes')
| -rw-r--r-- | test/recipes/80-test_ssl_old.t | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t index 4e3c0998a2..05b940ca8e 100644 --- a/test/recipes/80-test_ssl_old.t +++ b/test/recipes/80-test_ssl_old.t @@ -104,7 +104,12 @@ subtest 'test_ss' => sub { }; note('test_ssl -- key U'); -testssl("keyU.ss", $Ucert, $CAcert, "default", srctop_file("test","default-and-legacy.cnf")); +my $configfile = srctop_file("test","default-and-legacy.cnf"); +if (disabled("legacy")) { + $configfile = srctop_file("test","default.cnf"); +} + +testssl("keyU.ss", $Ucert, $CAcert, "default", $configfile); unless ($no_fips) { testssl("keyU.ss", $Ucert, $CAcert, "fips", srctop_file("test","fips-and-base.cnf")); @@ -329,7 +334,7 @@ sub testssl { my @CA = $CAtmp ? ("-CAfile", $CAtmp) : ("-CApath", bldtop_dir("certs")); my @providerflags = ("-provider", $provider); - if ($provider eq "default") { + if ($provider eq "default" && !disabled("legacy")) { push @providerflags, "-provider", "legacy"; } |