Fix no-engine
authorMatt Caswell <matt@openssl.org>
Tue, 24 Nov 2020 16:45:48 +0000 (16:45 +0000)
committerMatt Caswell <matt@openssl.org>
Fri, 27 Nov 2020 17:32:03 +0000 (17:32 +0000)
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)

Configure

index dfad3fe7a5aac3361c1629c4a7d5a2deba409778..c3083961e9592a01aa7f2aa7bed6481efbfded3a 100755 (executable)
--- 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