Strip CRs when installing fips_premain.c Correct compat library rule

in FIPS mode.

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 59c688bbfac78303c442621f14c64349b6165b38..8f01f0c462fc60feb520003d79749017a8b4b10b 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -542,6 +542,8 @@ if ($fipscanisteronly)
        $libs_dep = "";
        }
 
+$cp2 = $cp unless defined $cp2;
+
 $extra_install= <<"EOF";
        \$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
        \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\"
@@ -554,7 +556,7 @@ if ($fipscanisteronly)
        $extra_install = <<"EOF";
        \$(CP) \"\$(O_FIPSCANISTER)\" \"\$(INSTALLTOP)${o}lib\"
        \$(CP) \"\$(O_FIPSCANISTER).sha1\" \"\$(INSTALLTOP)${o}lib\"
-       \$(CP) \"fips${o}fips_premain.c\" \"\$(INSTALLTOP)${o}lib\"
+       \$(CP2) \"fips${o}fips_premain.c\" \"\$(INSTALLTOP)${o}lib\"
        \$(CP) \"fips${o}fips_premain.c.sha1\" \"\$(INSTALLTOP)${o}lib\"
        \$(CP) \"\$(INCO_D)${o}fips.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
        \$(CP) \"\$(INCO_D)${o}fips_rand.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
@@ -640,6 +642,7 @@ INCO_D=$inc_dir${o}openssl
 
 PERL=$perl
 CP=$cp
+CP2=$cp2
 RM=$rm
 RANLIB=$ranlib
 MKDIR=$mkdir
@@ -924,7 +927,7 @@ if ($fips)
                {
                $rules.= &do_lib_rule("\$(CRYPTOOBJ)",
                        "\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)", "");
-               $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(FIPSOBJ)",
+               $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
                        "\$(LIB_D)$o$crypto_compat",$crypto,$shlib,"\$(SO_CRYPTO)", "");
                }
        }

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 9c674d4eed862dd66b6885b31b4d3eb4396286dd..693adae6e4778b5b2148e1a0e233ab9d243bef83 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -23,6 +23,7 @@ if ($fipscanisterbuild)
 
 $o='\\';
 $cp='$(PERL) util/copy.pl';
+$cp2='$(PERL) util/copy.pl -stripcr';
 $mkdir='$(PERL) util/mkdir-p.pl';
 $rm='del /Q';