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 e7287b6290d68e660f62f510c7341d79a1f86711..1f4697f52a3c08a896a70552e2f54fc684e42113 100644 (file)
--- 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 24db68fa06f2effdb9b3993c14d9855588e56d76..6e0dd3567499890d361283093fea73651d160129 100644 (file)
--- 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"