[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  138a522c8995ccf6bc0d3ba24f0b9111ee4de056 (commit)
      from  8bb9c60ba82ae8e5dcd105258996d9c2fe3ac472 (commit)


- Log -----------------------------------------------------------------
commit 138a522c8995ccf6bc0d3ba24f0b9111ee4de056
Author: Pauli <paul.dale at oracle.com>
Date:   Thu Feb 13 08:02:08 2020 +1000

    dsatest: fix the non-deprecated version of the test run.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11081)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/15-test_dsa.t | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/recipes/15-test_dsa.t b/test/recipes/15-test_dsa.t
index aa8c75a93a..1495724e48 100644
--- a/test/recipes/15-test_dsa.t
+++ b/test/recipes/15-test_dsa.t
@@ -19,14 +19,11 @@ setup("test_dsa");
 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'));
 
  SKIP: {
      skip "Skipping initial dsa tests", 2
-         if $deprecated_dsa;
+         if disabled('deprecated-3.0');
 
      ok(run(test(["dsatest"])), "running dsatest");
      ok(run(test(["dsa_no_digest_size_test"])),
@@ -35,9 +32,9 @@ require_ok(srctop_file('test','recipes','tconversion.pl'));
 
  SKIP: {
      skip "Skipping dsa conversion test using 'openssl dsa'", 2
-         if $deprecated_dsa;
+         if disabled('deprecated-3.0');
 
-     subtest "dsa conversions using 'openssl dsa' -- private key"> sub {
+     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 {