diff options
| author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2021-04-14 20:37:37 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2021-04-29 11:26:57 +0200 |
| commit | 4e282708c5bb82b6caed8e0565b9ac4ac15a7ac3 (patch) | |
| tree | 2dbc948478ccb391d9a4a9503126770d898d7aa9 /Configurations/windows-makefile.tmpl | |
| parent | 5b689181853ca6d240d756cd7d65678124838b11 (diff) | |
Configure/Makefile: don't generate a fresh fipsmodule.cnf when installing it
There is already a `providers/fipsmodule.cnf` target which is required by
the tests. Instead of creating another fipsmodule.cnf, the `install_fips`
target simply copies that configuration file to its final destination.
This commit also restores the minimal dependencies to build the `install_fips`
target immediately after configuring, which was broken after the removal
of the `install_sw` dependency.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13684)
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 3685b4fa7a..1e388d0b5f 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -477,7 +477,7 @@ install_docs: install_html_docs uninstall_docs: uninstall_html_docs -install_fips: +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" @@ -486,11 +486,8 @@ install_fips: @move /Y $(MODULESDIR)\$(FIPSMODULENAME).new \ $(MODULESDIR)\$(FIPSMODULENAME) @$(ECHO) "*** Installing FIPS module configuration" - @$(ECHO) "fipsinstall $(OPENSSLDIR)\fipsmodule.cnf" - @$(PERL) "$(BLDDIR)\util\wrap.pl" "$(BLDDIR)\apps\openssl" fipsinstall \ - -module "$(MODULESDIR)\$(FIPSMODULENAME)" \ - -out "$(OPENSSLDIR)\fipsmodule.cnf" \ - -macopt "hexkey:$(FIPSKEY)" + @$(ECHO) "install providers\fipsmodule.cnf -> $(OPENSSLDIR)\fipsmodule.cnf" + @copy providers\fipsmodule.cnf "$(OPENSSLDIR)\fipsmodule.cnf" uninstall_fips: @$(ECHO) "*** Uninstalling FIPS module configuration" |