diff options
| author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-12-15 22:44:32 +0100 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2021-04-29 11:26:57 +0200 |
| commit | c3bda8a2e0d51a8be2c2c0afc673048bc9457dcd (patch) | |
| tree | 0fa38113a62d36ffb0752a642cb4dd4bf6694454 /Configurations | |
| parent | b6821df0d0713e05af338f5a7dba51a63f2c79b9 (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')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 7 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 5 |
2 files changed, 5 insertions, 7 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 diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 6e0dd35674..3b08b6dd29 100644 --- 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" |