Fix no-rmd160 classic Windows build

[openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 4fb3a539f675bc919c44bc44d07ab6e8b4602b3d..209113fea14e730dc07cb399467ceb222d164ba1 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -134,7 +134,7 @@ foreach (@ARGV)
                print STDERR <<"EOF";
 and [options] can be one of
        no-md2 no-md4 no-md5 no-sha no-mdc2     - Skip this digest
-       no-ripemd
+       no-rmd160
        no-rc2 no-rc4 no-rc5 no-idea no-des     - Skip this symetric cipher
        no-bf no-cast no-aes no-camellia no-seed
        no-rsa no-dsa no-dh                     - Skip this public key cipher
@@ -1230,7 +1230,7 @@ sub perlasm_compile_target
        my($ret);
        $bname =~ s/(.*)\.[^\.]$/$1/;
        $ret ="\$(TMP_D)$o$bname$asm_suffix: $source\n";
-       $ret.="\t\$(PERL) $source $asmtype \$(CFLAG) >\$\@\n";
+       $ret.="\t\$(PERL) $source $asmtype \$(CFLAG) \$\@\n";
        if ($fipscanisteronly)
                {
                $ret .= "\t\$(PERL) util$o.pl . \$@ norunasm \$(CFLAG)\n";
@@ -1295,7 +1295,7 @@ sub do_asm_rule
                        my $plasm = $objfile;
                        $plasm =~ s/${obj}/.pl/;
                        $ret.="$srcfile: $plasm\n";
-                       $ret.="\t\$(PERL) $plasm $asmtype \$(CFLAG) >$srcfile\n\n";
+                       $ret.="\t\$(PERL) $plasm $asmtype \$(CFLAG) $srcfile\n\n";
                        }
 
                $ret.="$objfile: $srcfile\n";
@@ -1377,7 +1377,7 @@ sub read_options
                "no-md2" => \$no_md2,
                "no-md4" => \$no_md4,
                "no-md5" => \$no_md5,
-               "no-ripemd" => \$no_ripemd,
+               "no-rmd160" => \$no_ripemd,
                "no-mdc2" => \$no_mdc2,
                "no-whirlpool" => \$no_whirlpool,
                "no-patents" => 
@@ -1392,6 +1392,7 @@ sub read_options
                "gaswin" => \$gaswin,
                "no-ssl3" => \$no_ssl3,
                "no-ssl3-method" => 0,
+               "no-weak-ssl-ciphers" => 0,
                "no-srp" => \$no_srp,
                "no-cms" => \$no_cms,
                "no-ec2m" => \$no_ec2m,
@@ -1416,6 +1417,7 @@ sub read_options
                "gcc" => \$gcc,
                "debug" => \$debug,
                "--debug" => \$debug,
+               "--classic" => 0,
                "profile" => \$profile,
                "shlib" => \$shlib,
                "dll" => \$shlib,