Update to mk1mf.pl and ms\do_fips.bat to install relevant files for

WIN32 FIPS builds.

diff --git a/ms/do_fips.bat b/ms/do_fips.bat
index 4df263c27b8aa621a544ec45984b3a987ff6fe90..aac21ad327323678315da4b47875e6295c16125d 100644 (file)
--- 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 f650952f2e3b9a4624826a0fad148fd56727e3ad..59c688bbfac78303c442621f14c64349b6165b38 100755 (executable)
--- 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