[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b53fdad0e4350ba49812c50305686ee5a6239111 (commit)
      from  22626b972c024d5ae9922e4a9d710a5f9e51f753 (commit)


- Log -----------------------------------------------------------------
commit b53fdad0e4350ba49812c50305686ee5a6239111
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 8 12:31:05 2018 +0100

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5282)

-----------------------------------------------------------------------

Summary of changes:
 util/mkdef.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 72d1c8f..fac911a 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;