mirror of
https://github.com/openssl/openssl.git
synced 2024-12-19 15:03:38 +08:00
no-ripemd is an alias for no-rmd160
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:
parent
7f96f15bcf
commit
2b1343b914
24
Configure
24
Configure
@ -324,7 +324,6 @@ my @disablables = (
|
||||
"rc5",
|
||||
"rdrand",
|
||||
"rfc3779",
|
||||
"ripemd",
|
||||
"rmd160",
|
||||
"scrypt",
|
||||
"sctp",
|
||||
@ -355,9 +354,10 @@ foreach my $proto ((@tls, @dtls))
|
||||
push(@disablables, "$proto-method");
|
||||
}
|
||||
|
||||
my @deprecated_disablables = (
|
||||
"ssl2",
|
||||
"buf-freelists",
|
||||
my %deprecated_disablables = (
|
||||
"ssl2" => undef,
|
||||
"buf-freelists" => undef,
|
||||
"ripemd" => "rmd160"
|
||||
);
|
||||
|
||||
# All of the following is disabled by default (RC5 was enabled before 0.9.8):
|
||||
@ -554,12 +554,8 @@ foreach (@argvcopy)
|
||||
if (/^(no|disable|enable)-(.+)$/)
|
||||
{
|
||||
my $word = $2;
|
||||
if (grep { $word =~ /^${_}$/ } @deprecated_disablables)
|
||||
{
|
||||
$deprecated_options{$_} = 1;
|
||||
next;
|
||||
}
|
||||
elsif (!grep { $word =~ /^${_}$/ } @disablables)
|
||||
if (!exists $deprecated_disablables{$word}
|
||||
&& !grep { $word =~ /^${_}$/ } @disablables)
|
||||
{
|
||||
$unsupported_options{$_} = 1;
|
||||
next;
|
||||
@ -605,6 +601,14 @@ foreach (@argvcopy)
|
||||
{
|
||||
$disabled{"dynamic-engine"} = "option";
|
||||
}
|
||||
elsif (exists $deprecated_disablables{$1})
|
||||
{
|
||||
$deprecated_options{$_} = 1;
|
||||
if (defined $deprecated_disablables{$1})
|
||||
{
|
||||
$disabled{$deprecated_disablables{$1}} = "option";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$disabled{$1} = "option";
|
||||
|
Loading…
Reference in New Issue
Block a user