From 0b41fcc2cb0df4033c62516d33ab30ed630fa0a6 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sat, 18 Jun 2011 17:18:25 +0000
Subject: [PATCH] Strip CRs when installing fips_premain.c Correct compat
 library rule in FIPS mode.

---
 util/mk1mf.pl    | 7 +++++--
 util/pl/VC-32.pl | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 59c688bbfa..8f01f0c462 100755
--- 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 9c674d4eed..693adae6e4 100644
--- 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';
 
-- 
2.34.1