diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-05-24 14:24:32 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-05-26 15:11:01 +0200 |
| commit | f5657ce8e664cbb1e3314f54385b9a4d653e6bae (patch) | |
| tree | 01368af9a1ae88a21ee681dbb92029816c6a0b04 /Configurations/windows-makefile.tmpl | |
| parent | Build file templates: rework how general dependencies are computed (diff) | |
| download | openssl-f5657ce8e664cbb1e3314f54385b9a4d653e6bae.tar.xz openssl-f5657ce8e664cbb1e3314f54385b9a4d653e6bae.zip | |
Build file templates: rework FIPS module installation
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15436)
Diffstat (limited to '')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 37f623a4bd..af8a81c8b2 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -112,12 +112,6 @@ INSTALL_ENGINEPDBS={- && $unified_info{attributes}->{modules}->{$_}->{engine} } @{$unified_info{modules}}) -} -INSTALL_FIPS={- - join(" ", map { quotify1(platform->dso($_)) } - grep { !$unified_info{attributes}->{modules}->{$_}->{noinst} - && $unified_info{attributes}->{modules}->{$_}->{fips} } - @{$unified_info{modules}}) --} INSTALL_MODULES={- join(" ", map { quotify1(platform->dso($_)) } grep { !$unified_info{attributes}->{modules}->{$_}->{noinst} @@ -131,6 +125,13 @@ INSTALL_MODULEPDBS={- && !$unified_info{attributes}->{modules}->{$_}->{engine} } @{$unified_info{modules}}) -} +INSTALL_FIPSMODULE={- + join(" ", map { quotify1(platform->dso($_)) } + grep { !$unified_info{attributes}->{modules}->{$_}->{noinst} + && $unified_info{attributes}->{modules}->{$_}->{fips} } + @{$unified_info{modules}}) +-} +INSTALL_FIPSMODULECONF=providers\fipsmodule.cnf INSTALL_PROGRAMS={- join(" ", map { quotify1(platform->bin($_)) } grep { !$unified_info{attributes}->{programs}->{$_}->{noinst} } @@ -499,13 +500,13 @@ install_fips: build_sw providers\fipsmodule.cnf # @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @$(PERL) $(SRCDIR)\util\mkdir-p.pl $(MODULESDIR) @$(ECHO) "*** Installing FIPS module" - @$(ECHO) "install $(INSTALL_FIPS) -> $(MODULESDIR)\$(FIPSMODULENAME)" - @copy "$(INSTALL_FIPS)" $(MODULESDIR)\$(FIPSMODULENAME).new + @$(ECHO) "install $(INSTALL_FIPSMODULE) -> $(MODULESDIR)\$(FIPSMODULENAME)" + @copy "$(INSTALL_FIPSMODULE)" $(MODULESDIR)\$(FIPSMODULENAME).new @move /Y $(MODULESDIR)\$(FIPSMODULENAME).new \ $(MODULESDIR)\$(FIPSMODULENAME) @$(ECHO) "*** Installing FIPS module configuration" - @$(ECHO) "install providers\fipsmodule.cnf -> $(OPENSSLDIR)\fipsmodule.cnf" - @copy providers\fipsmodule.cnf "$(OPENSSLDIR)\fipsmodule.cnf" + @$(ECHO) "install $(INSTALL_FIPSMODULECONF) -> $(OPENSSLDIR)\fipsmodule.cnf" + @copy $(INSTALL_FIPSMODULECONF) "$(OPENSSLDIR)\fipsmodule.cnf" uninstall_fips: @$(ECHO) "*** Uninstalling FIPS module configuration" |