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)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 1f4697f52a3c08a896a70552e2f54fc684e42113..9d5bfe0bd17022b04cda8a843eecd6a293f4151d 100644 (file)
--- 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

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 6e0dd3567499890d361283093fea73651d160129..3b08b6dd299d8bdcf87a38eba0b9932232d94e77 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -475,13 +475,12 @@ install_fips: install_sw
        @$(ECHO) "fipsinstall $(MODULESDIR)\$(FIPSMODULENAME).cnf"
        @$(PERL) "$(BLDDIR)\util\wrap.pl" "$(BLDDIR)\apps\openssl" fipsinstall \
                -module "$(MODULESDIR)\$(FIPSMODULENAME)" \
-               -out "$(MODULESDIR)\$(FIPSMODULENAME).cnf" \
+               -out "$(OPENSSLDIR)\fipsmodule.cnf" \
                -macopt "hexkey:$(FIPSKEY)"
 
 uninstall_fips: uninstall_sw
        @$(ECHO) "*** Uninstalling FIPS module configuration"
-       @$(ECHO) "$(RM) $(MODULESDIR)\$(FIPSMODULENAME).cnf"
-       @$(RM) "$(MODULESDIR)\$(FIPSMODULENAME).cnf"
+       $(RM) "$(OPENSSLDIR)\fipsmodule.cnf"
 
 install_ssldirs:
        @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(OPENSSLDIR)\certs"