]> granicus.if.org Git - openssl/commitdiff
util/mkdef.pl: use better array in search of 'DEPRECATEDIN_'
authorRichard Levitte <levitte@openssl.org>
Thu, 8 Feb 2018 11:31:05 +0000 (12:31 +0100)
committerRichard Levitte <levitte@openssl.org>
Thu, 8 Feb 2018 11:46:36 +0000 (12:46 +0100)
%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)

util/mkdef.pl

index bbe961c25459603332f2a4f0a60f81ebdc97b88e..3775b70e936df0c0330c2914bdf52c3aa95fd2c7 100755 (executable)
@@ -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;