From 4e282708c5bb82b6caed8e0565b9ac4ac15a7ac3 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Wed, 14 Apr 2021 20:37:37 +0200 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/13684) --- Configurations/unix-Makefile.tmpl | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Configurations/unix-Makefile.tmpl') diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 778c198972..bc82527579 100644 --- 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" -- cgit v1.2.3