install_fips: Create the OPENSSLDIR as it might not exist

Fixes #16564

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16569)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 9812df2aefb2c2a2edd70eb99ecbae952a509f67..9767802e8875bee5f584e8b362af3940a8c0cb73 100644 (file)
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -570,6 +570,8 @@ uninstall_docs : uninstall_html_docs
 {- output_off() if $disabled{fips}; "" -}
 install_fips : build_sw $(INSTALL_FIPSMODULECONF)
        @ WRITE SYS$OUTPUT "*** Installing FIPS module"
+       - CREATE/DIR ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch']
+       - CREATE/DIR/PROT=(S:RWED,O:RWE,G:RE,W:RE) OSSL_DATAROOT:[000000]
        COPY/PROT=W:RE $(INSTALL_FIPSMODULES) -
                 ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch']$(FIPSMODULENAME)
        @ WRITE SYS$OUTPUT "*** Installing FIPS module configuration"

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 0cab39267cd6bc578dc8900d400c9a8030a77dbf..bf53cbcec5dbba329e87f6f3a73418d842051a11 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -619,6 +619,7 @@ uninstall_docs: uninstall_man_docs uninstall_html_docs
 install_fips: build_sw $(INSTALL_FIPSMODULECONF)
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
        @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR)
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)
        @$(ECHO) "*** Installing FIPS module"
        @$(ECHO) "install $(INSTALL_FIPSMODULE) -> $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME)"
        @cp "$(INSTALL_FIPSMODULE)" $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index d6dc008ba735ab409928650cb7a425795a99f966..63431b97edee60dac69fba525e12292435be30ed 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -500,6 +500,7 @@ uninstall_docs: uninstall_html_docs
 install_fips: build_sw $(INSTALL_FIPSMODULECONF)
 #      @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
        @$(PERL) $(SRCDIR)\util\mkdir-p.pl $(MODULESDIR)
+       @$(PERL) $(SRCDIR)\util\mkdir-p.pl $(OPENSSLDIR)
        @$(ECHO) "*** Installing FIPS module"
        @$(ECHO) "install $(INSTALL_FIPSMODULE) -> $(MODULESDIR)\$(FIPSMODULENAME)"
        @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(INSTALL_FIPSMODULE)" "$(MODULESDIR)"