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)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 778c19897225100a0659214a4859212d28fd3ba1..bc82527579d061a42c0df3ab19420070d49fa19d 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -594,7 +594,7 @@ install_docs: install_man_docs install_html_docs
 uninstall_docs: uninstall_man_docs uninstall_html_docs
        $(RM) -r $(DESTDIR)$(DOCDIR)
 
-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 $(DESTDIR)$(MODULESDIR)
        @$(ECHO) "*** Installing FIPS module"
@@ -604,11 +604,8 @@ install_fips:
        @mv -f $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new \
               $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME)
        @$(ECHO) "*** Installing FIPS module configuration"
-       @$(ECHO) "fipsinstall $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf"
-       @$(PERL) $(BLDDIR)/util/wrap.pl $(BLDDIR)/apps/openssl fipsinstall \
-               -module $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME) \
-               -out $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf \
-               -macopt 'hexkey:$(FIPSKEY)'
+       @$(ECHO) "install providers/fipsmodule.cnf -> $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf"
+       @cp providers/fipsmodule.cnf $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf
 
 uninstall_fips:
        @$(ECHO) "*** Uninstalling FIPS module configuration"

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 3685b4fa7a1e701bb96f24608886223f09ff1c47..1e388d0b5f6e480d1adc2c1d7a390cfa09eee60e 100644 (file)
--- 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"