Commit f120fa1e authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix util/mkdef.pl 



The deprecation checking code here didn't work the same way as in
Configure, and used $config{options} to find an --api= option that
was never there.  This is replaced with checking $config{api}, which
is the controlling variable for deprecation.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3126)
parent e361a7b2

util/mkdef.pl

+10 −18
Original line number Diff line number Diff line
@@ -142,6 +142,14 @@ foreach (@known_algorithms) { 
# disabled by default

$disabled_algorithms{"STATIC_ENGINE"} = 1;



my $apiv = sprintf "%x%02x%02x", split(/\./, $config{api});

foreach (keys %disabled_algorithms) {

	if (/^DEPRECATEDIN_(\d+)_(\d+)_(\d+)$/) {

		my $depv = sprintf "%x%02x%02x", $1, $2, $3;

		$disabled_algorithms{$_} = 1 if $apiv ge $depv;

	}

}



my $zlib;



foreach (@ARGV, split(/ /, $config{options}))
@@ -177,23 +185,7 @@ foreach (@ARGV, split(/ /, $config{options})) 
	$do_ctest=1 if $_ eq "ctest";

	$do_ctestall=1 if $_ eq "ctestall";

	$do_checkexist=1 if $_ eq "exist";

	if (/^--api=(\d+)\.(\d+)\.(\d+)$/) {

		my $apiv = sprintf "%x%02x%02x", $1, $2, $3;

		foreach (keys %disabled_algorithms) {

			if (/^DEPRECATEDIN_(\d+)_(\d+)_(\d+)$/) {

				my $depv = sprintf "%x%02x%02x", $1, $2, $3;

				$disabled_algorithms{$_} = 1 if $apiv ge $depv;

			}

		}

	}

	if (/^no-deprecated$/) {

		foreach (keys %disabled_algorithms) {

			if (/^DEPRECATEDIN_/) {

				$disabled_algorithms{$_} = 1;

			}

		}

	}

	elsif (/^(enable|disable|no)-(.*)$/) {

	if (/^(enable|disable|no)-(.*)$/) {

		my $alg = uc $2;

		$alg =~ tr/-/_/;

		if (exists $disabled_algorithms{$alg}) {