diff options
| author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2021-04-26 00:14:59 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2021-04-29 11:26:57 +0200 |
| commit | 18da9fc31f050edaf65da162f01c7bea920a5aac (patch) | |
| tree | d5eaf2c1c5d70aa39ce04813cd06afd76be65f4a | |
| parent | 4e282708c5bb82b6caed8e0565b9ac4ac15a7ac3 (diff) | |
| download | openssl-new-18da9fc31f050edaf65da162f01c7bea920a5aac.tar.gz | |
Configure/Makefile: install the fips provider if it was configured
To follow the principle "what you configure is what you install",
the `make install` target now includes the installation of the
fips provider (`make install_fips`) if (and only if) OpenSSL was
configured with fips support (`enable-fips`).
The `make install_fips` target exists as well and can be used
to install just the fips provider. It requires `enable-fips`
and issues an error message if `no-fips` was configured.
The anologue holds for the 'uninstall_fips' target.
Fixes #13693
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13684)
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 13 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 8 |
2 files changed, 19 insertions, 2 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index bc82527579..4ace44477d 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -526,9 +526,9 @@ list-tests: @echo "Tests are not supported with your chosen Configure options" @ : {- output_on() if !$disabled{tests}; "" -} -install: install_sw install_ssldirs install_docs +install: install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -} -uninstall: uninstall_docs uninstall_sw +uninstall: uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} libclean: @set -e; for s in $(SHLIB_INFO); do \ @@ -594,6 +594,7 @@ install_docs: install_man_docs install_html_docs uninstall_docs: uninstall_man_docs uninstall_html_docs $(RM) -r $(DESTDIR)$(DOCDIR) +{- output_off() if $disabled{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) @@ -612,6 +613,14 @@ uninstall_fips: $(RM) $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf @$(ECHO) "*** Uninstalling FIPS module" $(RM) $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME) +{- if ($disabled{fips}) { output_on(); } else { output_off(); } "" -} +install_fips: + @$(ECHO) "The 'install_fips' target requires the 'enable-fips' option" + +uninstall_fips: + @$(ECHO) "The 'uninstall_fips' target requires the 'enable-fips' option" +{- output_on() if !$disabled{fips}; "" -} + install_ssldirs: @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 1e388d0b5f..c6d63651cb 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -477,6 +477,7 @@ install_docs: install_html_docs uninstall_docs: uninstall_html_docs +{- output_off() if $disabled{fips}; "" -} install_fips: build_sw providers\fipsmodule.cnf # @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @$(PERL) $(SRCDIR)\util\mkdir-p.pl $(MODULESDIR) @@ -494,6 +495,13 @@ uninstall_fips: $(RM) "$(OPENSSLDIR)\fipsmodule.cnf" @$(ECHO) "*** Uninstalling FIPS module" $(RM) "$(MODULESDIR)\$(FIPSMODULENAME)" +{- if ($disabled{fips}) { output_on(); } else { output_off(); } "" -} +install_fips: + @$(ECHO) "The 'install_fips' target requires the 'enable-fips' option" + +uninstall_fips: + @$(ECHO) "The 'uninstall_fips' target requires the 'enable-fips' option" +{- output_on() if !$disabled{fips}; "" -} install_ssldirs: @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(OPENSSLDIR)\certs" |