From 11bb654c60dee6fdfe30eba43e8310437b4b8ab0 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 17 Sep 2016 21:57:29 +0200 Subject: [PATCH] Have the configuration options 'no-err' and 'no-async' work again In an earlier attempt to simplify the processing of disabled options, 'no-err' and 'no-async' stopped working properly. 'err' and 'async' are directories under 'crypto/', but they are special insofar that they can't be simply skipped, like all the algorithm directories can, so they need special treatment among the disablable things. Reviewed-by: Tim Hudson (cherry picked from commit 66fe388aa410820d80ab1d99730b64b1b56a89d4) --- Configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Configure b/Configure index dcc317a204..e919066413 100755 --- a/Configure +++ b/Configure @@ -868,7 +868,8 @@ foreach (sort (keys %disabled)) $what = "ripemd" if $what eq "rmd160"; $what = "whrlpool" if $what eq "whirlpool"; - if (grep { $_ eq $what } @{$config{sdirs}}) + if ($what ne "async" && $what ne "err" + && grep { $_ eq $what } @{$config{sdirs}}) { push @{$config{openssl_algorithm_defines}}, "OPENSSL_NO_$WHAT"; @{$config{sdirs}} = grep { $_ ne $what} @{$config{sdirs}}; -- 2.25.1