diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-04-09 12:47:46 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-04-09 12:47:46 +1000 |
| commit | f5056577ba08b3694aab2722eae1c97bf00acc80 (patch) | |
| tree | 00492b31c1e6b69164d5a3be50557bac18cdcd2e /test/recipes/20-test_enc.t | |
| parent | cc45a884bd499e8b84de0c0133746591c3712f4c (diff) | |
| download | openssl-new-f5056577ba08b3694aab2722eae1c97bf00acc80.tar.gz | |
Move legacy ciphers into the legacy provider
DES, idea, seed, rc2, rc4, rc5, cast and blowfish have been moved out of the default provider.
Code shared between desx and tdes has been moved into a seperate file (cipher_tdes_common.c).
3 test recipes failed due to using app/openssl calls that used legacy ciphers.
These calls have been updated to supply both the default and legacy providers.
Fixed openssl app '-provider' memory leak
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11419)
Diffstat (limited to 'test/recipes/20-test_enc.t')
| -rw-r--r-- | test/recipes/20-test_enc.t | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/recipes/20-test_enc.t b/test/recipes/20-test_enc.t index b4a8e01878..896de8cde3 100644 --- a/test/recipes/20-test_enc.t +++ b/test/recipes/20-test_enc.t @@ -14,7 +14,7 @@ use File::Spec::Functions qw/catfile/; use File::Copy; use File::Compare qw/compare_text/; use File::Basename; -use OpenSSL::Test qw/:DEFAULT srctop_file/; +use OpenSSL::Test qw/:DEFAULT srctop_file bldtop_dir/; setup("test_enc"); @@ -26,6 +26,8 @@ my $testsrc = srctop_file("test","recipes",basename($0)); my $test = catfile(".", "p"); my $cmd = "openssl"; +my $provpath = bldtop_dir("providers"); +my @prov = ("-provider_path", $provpath, "-provider", "default", "-provider", "legacy"); my $ciphersstatus = undef; my @ciphers = @@ -59,8 +61,8 @@ plan tests => 2 + (scalar @ciphers)*2; @d = ( "enc", @{$variant{$t}}, "-d" ); } - ok(run(app([$cmd, @e, "-in", $test, "-out", $cipherfile])) - && run(app([$cmd, @d, "-in", $cipherfile, "-out", $clearfile])) + ok(run(app([$cmd, @e, @prov, "-in", $test, "-out", $cipherfile])) + && run(app([$cmd, @d, @prov, "-in", $cipherfile, "-out", $clearfile])) && compare_text($test,$clearfile) == 0, $t); } } |