diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-08-03 11:35:58 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-08-04 14:05:54 +0200 |
| commit | 25ab542409488b65d15b787eb5cc7b0a0daf21c6 (patch) | |
| tree | 7bad301db6a8f9346b0b8bd1bb4cfcaa2423b37b /Configurations | |
| parent | da496bc159361b0bc22df2432fb07b1cd7491ac2 (diff) | |
Windows, VMS: Do install_fips on install if fips is enabled
Also fix some inconsistencies and minor bugs related to the
install_fips target on Windows and VMS.
Fixes #16194
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16208)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 10 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index bad8e0a776..3ffd387903 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -500,7 +500,7 @@ list-tests : @ WRITE SYS$OUTPUT "Tests are not supported with your chosen Configure options" @ ! {- output_on() if !$disabled{tests}; "" -} -install : install_sw install_ssldirs install_docs install_msg +install : install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -} install_msg install_msg : @ WRITE SYS$OUTPUT "" @@ -516,7 +516,7 @@ install_msg : check_install : spawn/nolog @ossl_installroot:[SYSTEST]openssl_ivp{- $osslver -}.com -uninstall : uninstall_docs uninstall_sw +uninstall : uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} # Because VMS wants the generation number (or *) to delete files, we can't # use $(LIBS), $(PROGRAMS), $(GENERATED) and $(MODULES) directly. @@ -565,14 +565,14 @@ install_docs : install_html_docs uninstall_docs : uninstall_html_docs {- output_off() if $disabled{fips}; "" -} -install_fips : install_sw $(INSTALL_FIPSMODULECONF) +install_fips : build_sw $(INSTALL_FIPSMODULECONF) @ WRITE SYS$OUTPUT "*** Installing FIPS module" COPY/PROT=W:RE $(INSTALL_FIPSMODULES) - ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch']$(FIPSMODULENAME) @ WRITE SYS$OUTPUT "*** Installing FIPS module configuration" - COPY/PROT=W:RE $(INSTALL_FIPSMODULESCONF) OSSL_DATAROOT:[000000] + COPY/PROT=W:RE $(INSTALL_FIPSMODULECONF) OSSL_DATAROOT:[000000] -uninstall_fips : uninstall_sw +uninstall_fips : @ WRITE SYS$OUTPUT "*** Uninstalling FIPS module configuration" DELETE OSSL_DATAROOT:[000000]fipsmodule.cnf;* @ WRITE SYS$OUTPUT "*** Uninstalling FIPS module" diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index fc40e61144..f0f4a76147 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -452,9 +452,9 @@ list-tests: @$(ECHO) "Tests are not supported with your chosen Configure options" @{- output_on() if !$disabled{tests}; "\@rem" -} -install: install_sw install_ssldirs install_docs +install: install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -} -uninstall: uninstall_docs uninstall_sw +uninstall: uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} libclean: "$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """{.,apps,test,fuzz}/$$1.*"""; } @ARGV" $(SHLIBS) @@ -496,7 +496,7 @@ install_docs: install_html_docs uninstall_docs: uninstall_html_docs {- output_off() if $disabled{fips}; "" -} -install_fips: build_sw providers\fipsmodule.cnf +install_fips: build_sw $(INSTALL_FIPSMODULECONF) # @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @$(PERL) $(SRCDIR)\util\mkdir-p.pl $(MODULESDIR) @$(ECHO) "*** Installing FIPS module" |