[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  b8fa02e8a4a4a9c274aafdb4fc834ba051301afb (commit)
      from  ee46dfbf2c117a9532f887b478c9c65d8f30d50c (commit)


- Log -----------------------------------------------------------------
commit b8fa02e8a4a4a9c274aafdb4fc834ba051301afb
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 24 16:45:48 2020 +0000

    Fix no-engine
    
    If we specify no-engine then this should cascade to also mean
    no-dynamic-engine. The store test was only checking whether
    dynamic-engine was disabled, meaning that some tests were failing
    in a no-engine build.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13502)

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

Summary of changes:
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index dfad3fe7a5..c3083961e9 100755
--- a/Configure
+++ b/Configure
@@ -581,7 +581,7 @@ my @disable_cascades = (
 
     "module"            => [ "fips", "dso" ],
 
-    "engine"            => [ grep /eng$/, @disablables ],
+    "engine"            => [ "dynamic-engine", grep(/eng$/, @disablables) ],
     "hw"                => [ "padlockeng" ],
 
     # no-autoalginit is only useful when building non-shared