From: Richard Levitte <levitte@openssl.org>
Date: Sat, 17 Sep 2016 19:57:29 +0000 (+0200)
Subject: Have the configuration options 'no-err' and 'no-async' work again
X-Git-Tag: OpenSSL_1_1_1-pre1~3516
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=66fe388aa410820d80ab1d99730b64b1b56a89d4

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 <tjh@openssl.org>
---

diff --git a/Configure b/Configure
index d78ab7aac7..0cfc3ea36d 100755
--- a/Configure
+++ b/Configure
@@ -886,7 +886,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}};