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_1-pre1~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b53fdad0e4350ba49812c50305686ee5a6239111;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)
---

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 72d1c8f467..fac911a471 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -152,7 +152,7 @@ my %disabled_algorithms =
     map { (my $x = uc $_) =~ s|-|_|g; $x => 1; } keys %disabled;
 
 my $apiv = sprintf "%x%02x%02x", split(/\./, $config{api});
-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;