diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-08-03 12:23:43 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-08-04 14:05:54 +0200 |
| commit | a8f35a5527bd7c1f48e3a5ae3d8241ae3988ea94 (patch) | |
| tree | bb0397c24eb5b28cc229dcd9f0eeb79f6eea8275 /Configurations | |
| parent | 25ab542409488b65d15b787eb5cc7b0a0daf21c6 (diff) | |
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)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index f0f4a76147..26357c75bc 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" |