The branch master has been updated
via 2b1343b91478a9f230186535e82ed1f9db069221 (commit)
from 7f96f15bcfabaa4597fcc9529b7a0716f15e55ff (commit)
- Log -----------------------------------------------------------------
commit 2b1343b91478a9f230186535e82ed1f9db069221
Author: Matt Caswell <[email protected]>
Date: Thu Jun 16 11:45:24 2016 +0100
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 <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configure | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/Configure b/Configure
index 70350f4..e0d086f 100755
--- a/Configure
+++ b/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):
@@ -552,21 +552,17 @@ foreach (@argvcopy)
s /^zlib-dynamic$/enable-zlib-dynamic/;
if (/^(no|disable|enable)-(.+)$/)
- {
- my $word = $2;
- if (grep { $word =~ /^${_}$/ } @deprecated_disablables)
- {
- $deprecated_options{$_} = 1;
- next;
- }
- elsif (!grep { $word =~ /^${_}$/ } @disablables)
- {
- $unsupported_options{$_} = 1;
- next;
- }
- }
- if (/^no-(.+)$/ || /^disable-(.+)$/)
- {
+ {
+ my $word = $2;
+ if (!exists $deprecated_disablables{$word}
+ && !grep { $word =~ /^${_}$/ } @disablables)
+ {
+ $unsupported_options{$_} = 1;
+ next;
+ }
+ }
+ if (/^no-(.+)$/ || /^disable-(.+)$/)
+ {
foreach my $proto ((@tls, @dtls))
{
if ($1 eq "$proto-method")
@@ -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";
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
