test/recipes/15-test_dsa.t: Deal with deprecation of 'openssl dsa'

Do not run programs that depend on deprecated APIs when
'no-deprecated' is configured.

We still retain the conversion tests that use 'openssl pkey', and add
the one that's missing.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10977)

diff --git a/test/recipes/15-test_dsa.t b/test/recipes/15-test_dsa.t
index eb22ed876e7559bd33594118b26bad7a94bba33c..90193fc1b7db7e2f59cc638a8cd15c3ada43114e 100644 (file)
--- a/test/recipes/15-test_dsa.t
+++ b/test/recipes/15-test_dsa.t
@@ -16,25 +16,41 @@ use OpenSSL::Test::Utils;
 
 setup("test_dsa");
 
-plan tests => 6;
+plan skip_all => 'DSA is not supported in this build' if disabled('dsa');
+plan tests => 7;
+
+my $deprecated_dsa =
+    disabled('deprecated')
+    && (!defined config('api') || config('api') >= 30000);
 
 require_ok(srctop_file('test','recipes','tconversion.pl'));
 
-ok(run(test(["dsatest"])), "running dsatest");
-ok(run(test(["dsa_no_digest_size_test"])), "running dsa_no_digest_size_test");
+ SKIP: {
+     skip "Skipping initial dsa tests", 2
+         if $deprecated_dsa;
+
+     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", 3
-        if disabled("dsa");
+     skip "Skipping dsa conversion test using 'openssl dsa'", 2
+         if $deprecated_dsa;
 
-     subtest 'dsa conversions -- private key' => sub {
-        tconversion("dsa", srctop_file("test","testdsa.pem"));
-     };
-     subtest 'dsa conversions -- private key PKCS#8' => sub {
-        tconversion("dsa", srctop_file("test","testdsa.pem"), "pkey");
+     subtest "dsa conversions using 'openssl dsa' -- private key"> sub {
+         tconversion("dsa", srctop_file("test","testdsa.pem"));
      };
-     subtest 'dsa conversions -- public key' => sub {
-        tconversion("msb", srctop_file("test","testdsapub.pem"), "dsa",
-                        "-pubin", "-pubout");
+     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");
+};
+subtest "dsa conversions using 'openssl pkey' -- public key" => sub {
+    tconversion("dsa", srctop_file("test","testdsapub.pem"), "pkey",
+                "-pubin", "-pubout");
+};