summaryrefslogtreecommitdiffstats
path: root/Configurations/unix-Makefile.tmpl
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com>2020-12-15 22:44:32 +0100
committerDr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com>2021-04-29 11:26:57 +0200
commitc3bda8a2e0d51a8be2c2c0afc673048bc9457dcd (patch)
tree0fa38113a62d36ffb0752a642cb4dd4bf6694454 /Configurations/unix-Makefile.tmpl
parentb6821df0d0713e05af338f5a7dba51a63f2c79b9 (diff)
Configure/Makefile: correct the FIPS module configuration file path
According to the OpenSSL 3.0 Wiki, the file should be located at $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf next to the openssl.cnf file. Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13684)
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
-rw-r--r--Configurations/unix-Makefile.tmpl7
1 files changed, 3 insertions, 4 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 1f4697f52a..9d5bfe0bd1 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -587,16 +587,15 @@ uninstall_docs: uninstall_man_docs uninstall_html_docs
install_fips: install_sw
@$(ECHO) "*** Installing FIPS module configuration"
- @$(ECHO) "fipsinstall $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf"
+ @$(ECHO) "fipsinstall $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf"
@$(PERL) $(BLDDIR)/util/wrap.pl $(BLDDIR)/apps/openssl fipsinstall \
-module $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME) \
- -out $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf \
+ -out $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf \
-macopt 'hexkey:$(FIPSKEY)'
uninstall_fips: uninstall_sw
@$(ECHO) "*** Uninstalling FIPS module configuration"
- @$(ECHO) "$(RM) $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf"
- @$(RM) $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf
+ $(RM) $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf
install_ssldirs:
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs