]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Use copy.pl to install the fips module on Windows
authorTomas Mraz <tomas@openssl.org>
Tue, 3 Aug 2021 10:23:43 +0000 (12:23 +0200)
committerTomas Mraz <tomas@openssl.org>
Wed, 4 Aug 2021 12:05:54 +0000 (14:05 +0200)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16208)

Configurations/windows-makefile.tmpl

index f0f4a76147aff543eee4f028e634fa2de50b90b9..26357c75bc347523f2b57b8c1254d65869341c8d 100644 (file)
@@ -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"