Commit 66fe388a authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarTim Hudson <tjh@openssl.org>
parent 41240e68

Configure

+2 −1
Original line number Diff line number Diff line
@@ -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}};