From: Norbert Pocs <norbertp@openssl.org>
Date: Tue, 2 Sep 2025 08:03:21 +0000 (+0200)
Subject: Remove OPENSSL_NO_STATIC_ENGINE macro
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b890e5c07c539ed74154e0593890a951d9f8f14f;p=thirdparty%2Fopenssl.git

Remove OPENSSL_NO_STATIC_ENGINE macro

Resolves: https://github.com/openssl/project/issues/1364

Signed-off-by: Norbert Pocs <norbertp@openssl.org>

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29305)
---

diff --git a/Configure b/Configure
index 321b5039382..7481af7d0fe 100755
--- a/Configure
+++ b/Configure
@@ -544,7 +544,6 @@ my @disablables = (
     "sse2",
     "ssl",
     "ssl-trace",
-    "static-engine",
     "stdio",
     "sslkeylog",
     "tests",
@@ -925,10 +924,6 @@ while (@argvcopy)
                                 $disabled{$proto} = "option(tls)";
                                 }
                         }
-                elsif ($1 eq "static-engine")
-                        {
-                        delete $disabled{"dynamic-engine"};
-                        }
                 elsif (exists $deprecated_disablables{$1})
                         {
                         $deprecated_options{$_} = 1;
@@ -950,11 +945,7 @@ while (@argvcopy)
                 }
         elsif (/^enable-(.+)$/)
                 {
-                if ($1 eq "static-engine")
-                        {
-                        $disabled{"dynamic-engine"} = "option";
-                        }
-                elsif ($1 eq "zlib-dynamic")
+                if ($1 eq "zlib-dynamic")
                         {
                         delete $disabled{"zlib"};
                         }
@@ -1963,10 +1954,6 @@ foreach my $what (sort keys %disabled) {
     }
 }
 
-if (!$disabled{"dynamic-engine"}) {
-    push @{$config{openssl_feature_defines}}, "OPENSSL_NO_STATIC_ENGINE";
-}
-
 # If we use the unified build, collect information from build.info files
 my %unified_info = ();