From: Milan Broz Date: Tue, 25 Nov 2025 16:18:46 +0000 (+0100) Subject: Remove engine-related tests X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3522100eec2907de7b361eebe017ff25e11c3e5;p=thirdparty%2Fopenssl.git Remove engine-related tests As engines are no longer included in test, these configuration options make no longer sense. All other test should be already enabled. Fixes openssl/project#1376 Signed-off-by: Milan Broz Reviewed-by: Norbert Pocs Reviewed-by: Saša Nedvědický (Merged from https://github.com/openssl/openssl/pull/29219) --- diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index bef0ab3d887..92b3923e40f 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -2046,7 +2046,7 @@ my %targets = ( asflags => sub { vms_info()->{asflags} }, perlasm_scheme => sub { vms_info()->{perlasm_scheme} }, - disable => add('pinshared', 'loadereng'), + disable => add('pinshared'), }, diff --git a/Configure b/Configure index adbd3230c1f..901f20be7b5 100755 --- a/Configure +++ b/Configure @@ -24,14 +24,6 @@ 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; @@ -430,7 +422,6 @@ my @dtls = qw(dtls1 dtls1_2); my @disablables = ( "acvp-tests", - "afalgeng", "apps", "argon2", "aria", @@ -449,7 +440,6 @@ my @disablables = ( "bulk", "cached-fetch", "camellia", - "capieng", "winstore", "cast", "chacha", @@ -466,7 +456,6 @@ my @disablables = ( "hqinterop", "deprecated", "des", - "devcryptoeng", "dgram", "dh", "docs", @@ -498,7 +487,6 @@ my @disablables = ( "ktls", "legacy", "lms", - "loadereng", "makedepend", "md2", "md4", @@ -511,7 +499,6 @@ my @disablables = ( "nextprotoneg", "ocb", "ocsp", - "padlockeng", "pic", "pie", "pinshared", @@ -591,8 +578,8 @@ my %deprecated_disablables = ( "ssl2" => undef, "buf-freelists" => undef, "crypto-mdebug-backtrace" => undef, - "hw" => "hw", # causes cascade, but no macro - "hw-padlock" => "padlockeng", + "hw" => undef, + "hw-padlock" => undef, "ripemd" => "rmd160", "ui" => "ui-console", "heartbeats" => undef, @@ -696,12 +683,11 @@ my @disable_cascades = ( "pic" => [ "shared", "module" ], "engine" => [ grep(/eng$/, @disablables) ], - "hw" => [ "padlockeng" ], # no-autoalginit is only useful when building non-shared "autoalginit" => [ "shared", "apps", "fips" ], - "stdio" => [ "apps", "capieng", "egd" ], + "stdio" => [ "apps", "egd" ], "apps" => [ "tests" ], "tests" => [ "external-tests" ], "comp" => [ "zlib", "brotli", "zstd" ], @@ -1817,38 +1803,6 @@ $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}}) { - push @{$config{engdirs}}, "afalg"; - } else { - disable('not-linux', 'afalgeng'); - } -} - -unless ($disabled{devcryptoeng}) { - if ($target =~ m/^BSD/) { - my $maxver = 5*100 + 7; - my $sysstr = `uname -s`; - my $verstr = `uname -r`; - $sysstr =~ s|\R$||; - $verstr =~ s|\R$||; - my ($ma, $mi, @rest) = split m|\.|, $verstr; - my $ver = $ma*100 + $mi; - if ($sysstr eq 'OpenBSD' && $ver >= $maxver) { - disable('too-new-kernel', 'devcryptoeng'); - } - } -} - unless ($disabled{ktls}) { $config{ktls}=""; my $cc = $config{CROSS_COMPILE}.$config{CC}; diff --git a/INSTALL.md b/INSTALL.md index f90b937cef6..364d153215b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -584,12 +584,6 @@ In the following list, always the non-default variant is documented: if feature `xxxx` is disabled by default then `enable-xxxx` is documented and if feature `xxxx` is enabled by default then `no-xxxx` is documented. -### no-afalgeng - -Don't build the AFALG engine. - -This option will be forced on a platform that does not support AFALG. - ### enable-ktls Build with Kernel TLS support. @@ -715,12 +709,6 @@ this option will reduce run-time memory usage but it also introduces a significant performance penalty. This option is primarily designed to help with detecting incorrect reference counting. -### no-capieng - -Don't build the CAPI engine. - -This option will be forced if on a platform that does not support CAPI. - ### no-cmp Don't build support for Certificate Management Protocol (CMP) @@ -773,13 +761,6 @@ Don't build and install documentation, i.e. manual pages in various forms. Don't build support for loading Dynamic Shared Objects (DSO) -### enable-devcryptoeng - -Build the `/dev/crypto` engine. - -This option is automatically selected on the BSD platform, in which case it can -be disabled with `no-devcryptoeng`. - ### no-dynamic-engine Don't build the dynamically loaded engines. @@ -940,14 +921,6 @@ Don't build support for the Next Protocol Negotiation (NPN) TLS extension. Don't build support for Online Certificate Status Protocol (OCSP). -### no-padlockeng - -Don't build the padlock engine. - -### no-hw-padlock - -As synonym for `no-padlockeng`. Deprecated and should not be used. - ### no-pic Don't build with support for Position Independent Code.