From c3de647e7d50cb9a4154d4548f3981c7b13f3bfd Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Wed, 15 Jun 2011 21:04:09 +0000
Subject: [PATCH] Update to mk1mf.pl and ms\do_fips.bat to install relevant
 files for WIN32 FIPS builds.

---
 ms/do_fips.bat |  1 +
 util/mk1mf.pl  | 31 +++++++++++++++++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/ms/do_fips.bat b/ms/do_fips.bat
index 4df263c27b..aac21ad327 100644
--- a/ms/do_fips.bat
+++ b/ms/do_fips.bat
@@ -55,6 +55,7 @@ perl util\mk1mf.pl dll %ASM% %TARGET% >ms\ntdll.mak
 
 nmake -f ms\ntdll.mak clean
 nmake -f ms\ntdll.mak
+nmake -f ms\ntdll.mak install
 @if ERRORLEVEL 1 goto error
 
 @echo.
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index f650952f2e..59c688bbfa 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -541,11 +541,30 @@ if ($fipscanisteronly)
 	$build_targets = "\$(O_FIPSCANISTER) \$(T_EXE)";
 	$libs_dep = "";
 	}
-	
 
-if ($shlib)
+$extra_install= <<"EOF";
+	\$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
+	\$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\"
+	\$(MKDIR) \"\$(OPENSSLDIR)\"
+	\$(CP) apps${o}openssl.cnf \"\$(OPENSSLDIR)\"
+EOF
+
+if ($fipscanisteronly)
 	{
-	$extra_install= <<"EOF";
+	$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\"
+	\$(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\"
+	\$(CP) "\$(BIN_D)${o}fips_standalone_sha1$exep" \"\$(INSTALLTOP)${o}bin\"
+	\$(CP) \"util${o}fipslink.pl\" \"\$(INSTALLTOP)${o}bin\"
+EOF
+	}
+elsif ($shlib)
+	{
+	$extra_install .= <<"EOF";
 	\$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}bin\"
 	\$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}bin\"
 	\$(CP) \"\$(L_SSL)\" \"\$(INSTALLTOP)${o}lib\"
@@ -561,7 +580,7 @@ EOF
 	}
 else
 	{
-	$extra_install= <<"EOF";
+	$extra_install .= <<"EOF";
 	\$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}lib\"
 	\$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
 EOF
@@ -723,10 +742,6 @@ install: all
 	\$(MKDIR) \"\$(INSTALLTOP)${o}include\"
 	\$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
 	\$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
-	\$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
-	\$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\"
-	\$(MKDIR) \"\$(OPENSSLDIR)\"
-	\$(CP) apps${o}openssl.cnf \"\$(OPENSSLDIR)\"
 $extra_install
 
 
-- 
2.34.1