[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  86ff7cf2a6cdf26f2ba7e64db6fe5c92c64bf9ac (commit)
       via  488689507c9a2bc5626411c8e1c597db329183bc (commit)
      from  0d40745671e562725e865167854be66222798ae1 (commit)


- Log -----------------------------------------------------------------
commit 86ff7cf2a6cdf26f2ba7e64db6fe5c92c64bf9ac
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jun 22 12:10:21 2021 +0200

    Configure: Reflect that We don't build loader_attic when dynamic-engine is disabled
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15858)

commit 488689507c9a2bc5626411c8e1c597db329183bc
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jun 22 11:56:18 2021 +0200

    TEST: check 'loadereng' to determine if loader_attic should be tested
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15858)

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

Summary of changes:
 Configure                      |  1 +
 test/recipes/81-test_cmp_cli.t | 11 +++++++----
 test/recipes/90-test_store.t   |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Configure b/Configure
index 2181d34a21..0ec72395db 100755
--- a/Configure
+++ b/Configure
@@ -618,6 +618,7 @@ my @disable_cascades = (
     "module"            => [ "fips", "dso" ],
 
     "engine"            => [ "dynamic-engine", grep(/eng$/, @disablables) ],
+    "dynamic-engine"    => [ "loadereng" ],
     "hw"                => [ "padlockeng" ],
 
     # no-autoalginit is only useful when building non-shared
diff --git a/test/recipes/81-test_cmp_cli.t b/test/recipes/81-test_cmp_cli.t
index fd1a1b0607..20ce738052 100644
--- a/test/recipes/81-test_cmp_cli.t
+++ b/test/recipes/81-test_cmp_cli.t
@@ -41,12 +41,15 @@ my @cmp_basic_tests = (
     );
 
 my @cmp_server_tests = (
-    [ "with polling",             [ "-poll_count", "1"       ], 1 ],
-    [ "with loader_attic engine", [ "-engine", "loader_attic"],
-      !disabled('dynamic-engine') &&
-      !disabled("deprecated-3.0")  ]
+    [ "with polling",             [ "-poll_count", "1"       ], 1 ]
     );
 
+# loader_attic doesn't build on VMS, so we don't test it
+push @cmp_server_tests, (
+    [ "with loader_attic engine", [ "-engine", "loader_attic"], 1 ]
+    )
+    unless disabled('loadereng');
+
 plan tests => @cmp_basic_tests + @cmp_server_tests;
 
 foreach (@cmp_basic_tests) {
diff --git a/test/recipes/90-test_store.t b/test/recipes/90-test_store.t
index a61ed5b51e..e9a33c91d9 100644
--- a/test/recipes/90-test_store.t
+++ b/test/recipes/90-test_store.t
@@ -101,7 +101,7 @@ my @prov_method = qw(-provider default);
 push @prov_method, qw(-provider legacy) unless disabled('legacy');
 push @methods, [ @prov_method ];
 push @methods, [qw(-engine loader_attic)]
-    unless disabled('dynamic-engine') || disabled('deprecated-3.0');
+    unless disabled('loadereng');
 
 my $n = scalar @methods
     * ( (3 * scalar @noexist_files)