mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-19 15:03:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

no-ripemd is an alias for no-rmd160

Browse Source 
mkdef.pl was failing to understand no-ripemd. This is a deprecated option
which should act as an alias for no-rmd160.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2016-06-16 11:45:24 +01:00
parent 7f96f15bcf
commit 2b1343b914
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Configure
View File

@ -324,7 +324,6 @@ my @disablables = (
"rc5", "rc5",
"rdrand", "rdrand",
"rfc3779", "rfc3779",
"ripemd",
"rmd160", "rmd160",
"scrypt", "scrypt",
"sctp", "sctp",
@ -355,9 +354,10 @@ foreach my $proto ((@tls, @dtls))
push(@disablables, "$proto-method"); push(@disablables, "$proto-method");
} }
my @deprecated_disablables = ( my %deprecated_disablables = (
"ssl2", "ssl2" => undef,
"buf-freelists", "buf-freelists" => undef,
"ripemd" => "rmd160"
); );
# All of the following is disabled by default (RC5 was enabled before 0.9.8): # All of the following is disabled by default (RC5 was enabled before 0.9.8):
@ -552,21 +552,17 @@ foreach (@argvcopy)
s /^zlib-dynamic$/enable-zlib-dynamic/; s /^zlib-dynamic$/enable-zlib-dynamic/;
if (/^(no|disable|enable)-(.+)$/) if (/^(no|disable|enable)-(.+)$/)
{ {
my $word = $2; my $word = $2;
if (grep { $word =~ /^${_}$/ } @deprecated_disablables) if (!exists $deprecated_disablables{$word}
{ && !grep { $word =~ /^${_}$/ } @disablables)
$deprecated_options{$_} = 1; {
next; $unsupported_options{$_} = 1;
} next;
elsif (!grep { $word =~ /^${_}$/ } @disablables) }
{ }
$unsupported_options{$_} = 1; if (/^no-(.+)$/ || /^disable-(.+)$/)
next; {
}
}
if (/^no-(.+)$/ || /^disable-(.+)$/)
{
foreach my $proto ((@tls, @dtls)) foreach my $proto ((@tls, @dtls))
{ {
if ($1 eq "$proto-method") if ($1 eq "$proto-method")
@ -605,6 +601,14 @@ foreach (@argvcopy)
{ {
$disabled{"dynamic-engine"} = "option"; $disabled{"dynamic-engine"} = "option";
} }
elsif (exists $deprecated_disablables{$1})
{
$deprecated_options{$_} = 1;
if (defined $deprecated_disablables{$1})
{
$disabled{$deprecated_disablables{$1}} = "option";
}
}
else else
{ {
$disabled{$1} = "option"; $disabled{$1} = "option";