From: Matt Caswell <matt@openssl.org>
Date: Tue, 24 Nov 2020 16:45:48 +0000 (+0000)
Subject: Fix no-engine
X-Git-Tag: openssl-3.0.0-alpha10~235
X-Git-Url: https://git.openssl.org/?a=commitdiff_plain;h=b8fa02e8a4a4a9c274aafdb4fc834ba051301afb;p=openssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13502)
---

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