From 9ee928fb8c63d50bb2b9fdcb43c8374192f8cfca Mon Sep 17 00:00:00 2001
From: Norbert Pocs <norbertp@openssl.org>
Date: Mon, 8 Sep 2025 15:25:31 +0200
Subject: [PATCH]  Engine removal: Silence the CI tests about engines
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

As we can't do every change in one big PR (and we also don't want),
therefore there always will be failing tests until everything is
resolved/cleaned up. This way we silence the CI about engine tests and
later we can reenable them to see what else needs to be fixed.

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

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

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
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)
---
 Configurations/10-main.conf |  3 ---
 Configure                   | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 7e9396868af..bef0ab3d887 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -694,7 +694,6 @@ my %targets = (
         shared_target    => "linux-shared",
         shared_cflag     => "-fPIC",
         shared_ldflag    => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
-        enable           => [ "afalgeng" ],
     },
     "linux-latomic" => {
         inherit_from     => [ "linux-generic32" ],
@@ -1027,7 +1026,6 @@ my %targets = (
         cflags           => threads("-pthread"),
         cppflags         => threads("-D_THREAD_SAFE -D_REENTRANT"),
         ex_libs          => add(threads("-pthread")),
-        enable           => add("devcryptoeng"),
         bn_ops           => "BN_LLONG",
         thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
@@ -1201,7 +1199,6 @@ my %targets = (
         cflags           => threads("-pthread"),
         cppflags         => threads("-D_THREAD_SAFE -D_REENTRANT"),
         ex_libs          => add(threads("-pthread")),
-        enable           => add("devcryptoeng"),
         bn_ops           => "BN_LLONG",
         thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
diff --git a/Configure b/Configure
index b19a093ea89..806da2e0ff7 100755
--- a/Configure
+++ b/Configure
@@ -24,6 +24,14 @@ use OpenSSL::config;
 
 # see INSTALL.md for instructions.
 
+# Set this variable to 1 if you want to skip all the Engine related tests
+# Re-enable with 0. (and you also should add back 'afalgeng' in
+# Configurations/10-main.conf to the enable array at (possible) line 697
+# (targets/linux_generic32)
+# This is needed for engine removal process, because we can't do it in one big
+# bulk and otherwise there will be failing tests and we want the CI to be happy.
+my $disable_engine_removal = 1;
+
 my $orig_death_handler = $SIG{__DIE__};
 $SIG{__DIE__} = \&death_handler;
 
@@ -1834,6 +1842,14 @@ $config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings'
                               : ( $_ ) }
                     @{$config{CFLAGS}} ];
 
+if ($disable_engine_removal == 1) {
+    disable("engine-removal", "engine");
+    disable("engine-removal", "afalgeng");
+    disable("engine-removal", "capieng");
+    disable("engine-removal", "loadereng");
+    disable("engine-removal", "padlockeng");
+}
+
 unless ($disabled{afalgeng}) {
     $config{afalgeng}="";
     if (grep { $_ eq 'afalgeng' } @{$target{enable}}) {
-- 
2.47.3