From b6821df0d0713e05af338f5a7dba51a63f2c79b9 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Tue, 15 Dec 2020 22:34:41 +0100 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/13684) --- Configurations/unix-Makefile.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Configurations/unix-Makefile.tmpl') 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)' -- cgit v1.2.3