Configure: make no-whirlpool work [from HEAD].

This commit is contained in:
Andy Polyakov 2012-03-03 13:48:21 +00:00
parent 2cf4bc9ecd
commit ad83334e73

View File

@ -1015,6 +1015,8 @@ foreach (sort (keys %disabled))
else else
{ {
push @skip, $algo; push @skip, $algo;
# fix-up crypto/directory name(s)
@skip[$#skip]="whrlpool" if $algo eq "whirlpool";
print " (skip dir)"; print " (skip dir)";
$depflags .= " -DOPENSSL_NO_$ALGO"; $depflags .= " -DOPENSSL_NO_$ALGO";
@ -1415,7 +1417,7 @@ else {
$aes_obj=$aes_enc; $aes_obj=$aes_enc;
} }
$wp_obj="" if ($wp_obj =~ /mmx/ && $processor eq "386"); $wp_obj="" if ($wp_obj =~ /mmx/ && $processor eq "386");
if ($wp_obj =~ /\.o$/) if ($wp_obj =~ /\.o$/ && !$disabled{"whirlpool"})
{ {
$cflags.=" -DWHIRLPOOL_ASM"; $cflags.=" -DWHIRLPOOL_ASM";
} }