From: Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com>
Date: Tue, 15 Dec 2020 21:34:41 +0000 (+0100)
Subject: Configure/Makefile: use the correct openssl app for FIPS installation
X-Git-Tag: openssl-3.0.0-alpha16~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6821df0d0713e05af338f5a7dba51a63f2c79b9;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index e7287b6290d..1f4697f52a3 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)'
 
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 24db68fa06f..6e0dd356749 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -472,15 +472,16 @@ uninstall_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) \
-		-out $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf \
+	@$(ECHO) "fipsinstall $(MODULESDIR)\$(FIPSMODULENAME).cnf"
+	@$(PERL) "$(BLDDIR)\util\wrap.pl" "$(BLDDIR)\apps\openssl" fipsinstall \
+		-module "$(MODULESDIR)\$(FIPSMODULENAME)" \
+		-out "$(MODULESDIR)\$(FIPSMODULENAME).cnf" \
 		-macopt "hexkey:$(FIPSKEY)"
 
 uninstall_fips: uninstall_sw
 	@$(ECHO) "*** Uninstalling FIPS module configuration"
-	@$(ECHO) "$(RM) $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf"
-	@$(RM) $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf
+	@$(ECHO) "$(RM) $(MODULESDIR)\$(FIPSMODULENAME).cnf"
+	@$(RM) "$(MODULESDIR)\$(FIPSMODULENAME).cnf"
 
 install_ssldirs:
 	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(OPENSSLDIR)\certs"