[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  66fe388aa410820d80ab1d99730b64b1b56a89d4 (commit)
      from  41240e68d745972d56dd037caf439d9c5032813f (commit)


- Log -----------------------------------------------------------------
commit 66fe388aa410820d80ab1d99730b64b1b56a89d4
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Sep 17 21:57:29 2016 +0200

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index d78ab7a..0cfc3ea 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}};