diff options
| author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-12-15 22:34:41 +0100 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2021-04-29 11:26:57 +0200 |
| commit | b6821df0d0713e05af338f5a7dba51a63f2c79b9 (patch) | |
| tree | a665b90a16e89106f94d938fffded570087f3026 /Configurations/unix-Makefile.tmpl | |
| parent | 59cf2869199b695cace97869c578d40fafff24c6 (diff) | |
Configure/Makefile: use the correct openssl app for FIPS installation
The `openssl` app was previously called without a path, which
would generally invoke the system's copy of the openssl application.
Currently, that's most likely an openssl version 1.1.1 application,
which does not recognize the `fipsinstall` command and terminates
with an error message.
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.tmpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index e7287b6290..1f4697f52a 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -588,7 +588,8 @@ uninstall_docs: uninstall_man_docs uninstall_html_docs install_fips: install_sw @$(ECHO) "*** Installing FIPS module configuration" @$(ECHO) "fipsinstall $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf" - @openssl fipsinstall -module $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME) \ + @$(PERL) $(BLDDIR)/util/wrap.pl $(BLDDIR)/apps/openssl fipsinstall \ + -module $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME) \ -out $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf \ -macopt 'hexkey:$(FIPSKEY)' |