Skip to content

Commit

Permalink
Configure/Makefile: correct the FIPS module configuration file path
Browse files Browse the repository at this point in the history
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 openssl#13684)
  • Loading branch information
mspncp committed Apr 29, 2021
1 parent b6821df commit c3bda8a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
7 changes: 3 additions & 4 deletions Configurations/unix-Makefile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions Configurations/windows-makefile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit c3bda8a

Please sign in to comment.