tests: reinstate tests for deprecated but non-removed functionality

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11225)
This commit is contained in:
Pauli 2020-03-03 11:03:47 +10:00
parent cd3572a110
commit b0cfe526d7
3 changed files with 12 additions and 29 deletions

View File

@ -21,27 +21,17 @@ plan tests => 7;
require_ok(srctop_file('test','recipes','tconversion.pl'));
SKIP: {
skip "Skipping initial dsa tests", 2
if disabled('deprecated-3.0');
ok(run(test(["dsatest"])), "running dsatest");
ok(run(test(["dsa_no_digest_size_test"])),
"running dsa_no_digest_size_test");
ok(run(test(["dsatest"])), "running dsatest");
ok(run(test(["dsa_no_digest_size_test"])),
"running dsa_no_digest_size_test");
}
SKIP: {
skip "Skipping dsa conversion test using 'openssl dsa'", 2
if disabled('deprecated-3.0');
subtest "dsa conversions using 'openssl dsa' -- private key" => sub {
tconversion("dsa", srctop_file("test","testdsa.pem"));
};
subtest "dsa conversions using 'openssl dsa' -- public key" => sub {
tconversion("msb", srctop_file("test","testdsapub.pem"), "dsa",
"-pubin", "-pubout");
};
}
subtest "dsa conversions using 'openssl dsa' -- private key" => sub {
tconversion("dsa", srctop_file("test","testdsa.pem"));
};
subtest "dsa conversions using 'openssl dsa' -- public key" => sub {
tconversion("msb", srctop_file("test","testdsapub.pem"), "dsa",
"-pubin", "-pubout");
};
subtest "dsa conversions using 'openssl pkey' -- private key PKCS#8" => sub {
tconversion("dsa", srctop_file("test","testdsa.pem"), "pkey");

View File

@ -27,7 +27,7 @@ ok(run(test(["ectest"])), "running ectest");
# the command line tool in addition to the algorithm.
SKIP: {
skip "Skipping EC conversion test", 3
if disabled("ec") || disabled('deprecated-3.0');
if disabled("ec");
subtest 'EC conversions -- private key' => sub {
tconversion("ec", srctop_file("test","testec-p256.pem"));

View File

@ -16,9 +16,6 @@ use OpenSSL::Test::Utils;
setup("test_rsa");
#plan skip_all => "RSA command line tool not built"
# if disabled("deprecated-3.0");
plan tests => 10;
require_ok(srctop_file('test', 'recipes', 'tconversion.pl'));
@ -27,11 +24,7 @@ ok(run(test(["rsa_test"])), "running rsatest");
run_rsa_tests("pkey");
SKIP: {
skip "Skipping rsa command line tests", 4 if disabled('deprecated-3.0');
run_rsa_tests("rsa");
}
run_rsa_tests("rsa");
sub run_rsa_tests {
my $cmd = shift;