From: Richard Levitte <levitte@openssl.org>
Date: Thu, 8 Feb 2018 11:31:05 +0000 (+0100)
Subject: util/mkdef.pl: use better array in search of 'DEPRECATEDIN_'
X-Git-Tag: OpenSSL_1_1_0h~84
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=65de3f1657d8a3bdb7c48063931a3c619817c921;p=oweals%2Fopenssl.git

util/mkdef.pl: use better array in search of 'DEPRECATEDIN_'

%disabled_algorithms isn't necessarily initialised with the "algos"
'DEPRECATEDIN_1_1_0' etc.  However, we know that @known_algorithms has
them all, so use that to find them instead.

Fixes #5157
(where this was reported)

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5282)

(cherry picked from commit b53fdad0e4350ba49812c50305686ee5a6239111)
---

diff --git a/util/mkdef.pl b/util/mkdef.pl
index bbe961c254..3775b70e93 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -190,7 +190,7 @@ foreach (@ARGV, split(/ /, $config{options}))
 	$do_checkexist=1 if $_ eq "exist";
 	if (/^--api=(\d+)\.(\d+)\.(\d+)$/) {
 		my $apiv = sprintf "%x%02x%02x", $1, $2, $3;
-		foreach (keys %disabled_algorithms) {
+		foreach (@known_algorithms) {
 			if (/^DEPRECATEDIN_(\d+)_(\d+)_(\d+)$/) {
 				my $depv = sprintf "%x%02x%02x", $1, $2, $3;
 				$disabled_algorithms{$_} = 1 if $apiv ge $depv;