diff options
author | Richard Levitte <levitte@openssl.org> | 2016-09-17 21:57:29 +0200 |
---|---|---|
committer | Richard Levitte <richard@levitte.org> | 2016-09-17 23:22:16 +0200 |
commit | 11bb654c60dee6fdfe30eba43e8310437b4b8ab0 (patch) | |
tree | a95182077409a6d2adf10ec93a615786c0b7468c /Configure | |
parent | ebae51f4900af1fbc1e024bab44412b74fc46fa7 (diff) |
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>
(cherry picked from commit 66fe388aa410820d80ab1d99730b64b1b56a89d4)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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}}; |