From: Tomas Mraz <tomas@openssl.org>
Date: Tue, 3 Aug 2021 10:23:43 +0000 (+0200)
Subject: Use copy.pl to install the fips module on Windows
X-Git-Tag: openssl-3.0.0~164
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8f35a5527bd7c1f48e3a5ae3d8241ae3988ea94;p=thirdparty%2Fopenssl.git

Use copy.pl to install the fips module on Windows

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16208)
---

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index f0f4a76147a..26357c75bc3 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -501,12 +501,10 @@ install_fips: build_sw $(INSTALL_FIPSMODULECONF)
 	@$(PERL) $(SRCDIR)\util\mkdir-p.pl $(MODULESDIR)
 	@$(ECHO) "*** Installing FIPS module"
 	@$(ECHO) "install $(INSTALL_FIPSMODULE) -> $(MODULESDIR)\$(FIPSMODULENAME)"
-	@copy "$(INSTALL_FIPSMODULE)" $(MODULESDIR)\$(FIPSMODULENAME).new
-	@move /Y $(MODULESDIR)\$(FIPSMODULENAME).new \
-	       $(MODULESDIR)\$(FIPSMODULENAME)
+	@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(INSTALL_FIPSMODULE)" "$(MODULESDIR)"
 	@$(ECHO) "*** Installing FIPS module configuration"
 	@$(ECHO) "install $(INSTALL_FIPSMODULECONF) -> $(OPENSSLDIR)\fipsmodule.cnf"
-	@copy $(INSTALL_FIPSMODULECONF) "$(OPENSSLDIR)\fipsmodule.cnf"
+	@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(INSTALL_FIPSMODULECONF)" "$(OPENSSLDIR)"
 
 uninstall_fips:
 	@$(ECHO) "*** Uninstalling FIPS module configuration"