Move MAC computations for Finished from ssl3_read_bytes into

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 4289c9d950e4ea42e8c4b536ed6e70e2c73471e4..38fb9e901f801f678c00c0fbbec625b3a8662744 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -422,7 +422,7 @@ foreach (@ARGV)
                {
                $no_asm=1;
                $flags .= "-DNO_ASM ";
-               $openssl_algorithm_defines .= "#define NO_ASM\n";
+               $openssl_other_defines .= "#define NO_ASM\n";
                }
        elsif (/^no-threads$/)
                { $no_threads=1; }
@@ -507,6 +507,14 @@ if ($target eq "TABLE") {
        exit 0;
 }
 
+if ($target eq "LIST") {
+       foreach (sort keys %table) {
+               print;
+               print "\n";
+       }
+       exit 0;
+}
+
 &usage if (!defined($table{$target}));
 
 my $IsWindows=scalar grep /^$target$/,@WinTargets;
@@ -871,22 +879,33 @@ exit(0);
 sub usage
        {
        print STDERR $usage;
-       print STDERR "pick os/compiler from:";
+       print STDERR "\npick os/compiler from:\n";
        my $j=0;
        my $i;
+        my $k=0;
        foreach $i (sort keys %table)
                {
                next if $i =~ /^debug/;
-               print STDERR "\n" if ($j++ % 4) == 0;
-               printf(STDERR "%-18s ",$i);
+               $k += length($i) + 1;
+               if ($k > 78)
+                       {
+                       print STDERR "\n";
+                       $k=length($i);
+                       }
+               print STDERR $i . " ";
                }
        foreach $i (sort keys %table)
                {
                next if $i !~ /^debug/;
-               print STDERR "\n" if ($j++ % 4) == 0;
-               printf(STDERR "%-18s ",$i);
+               $k += length($i) + 1;
+               if ($k > 78)
+                       {
+                       print STDERR "\n";
+                       $k=length($i);
+                       }
+               print STDERR $i . " ";
                }
-       print STDERR "\n";
+       print STDERR "\n\nNOTE: If in doubt, on Unix-ish systems use './config'.\n";
        exit(1);
        }