Configure: make no-whirlpool work.
authorAndy Polyakov <appro@openssl.org>
Sat, 3 Mar 2012 13:17:47 +0000 (13:17 +0000)
committerAndy Polyakov <appro@openssl.org>
Sat, 3 Mar 2012 13:17:47 +0000 (13:17 +0000)
Configure

index f6ca42c..5900e18 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1125,6 +1125,8 @@ foreach (sort (keys %disabled))
                        else
                                {
                                push @skip, $algo;
+                               # fix-up crypto/directory name(s)
+                               @skip[$#skip]="whrlpool" if $algo eq "whirlpool";
                                print " (skip dir)";
 
                                $depflags .= " -DOPENSSL_NO_$ALGO";
@@ -1576,7 +1578,7 @@ else      {
        $aes_obj=$aes_enc;
        }
 $wp_obj="" if ($wp_obj =~ /mmx/ && $processor eq "386");
-if ($wp_obj =~ /\.o$/)
+if ($wp_obj =~ /\.o$/ && !$disabled{"whirlpool"})
        {
        $cflags.=" -DWHIRLPOOL_ASM";
        }