diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-05-24 14:24:32 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-05-26 15:11:01 +0200 |
| commit | f5657ce8e664cbb1e3314f54385b9a4d653e6bae (patch) | |
| tree | 01368af9a1ae88a21ee681dbb92029816c6a0b04 /Configurations/descrip.mms.tmpl | |
| parent | 6dd07a9328950ff8bf3f95ad35caf3a4e1e33a15 (diff) | |
Build file templates: rework FIPS module installation
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15436)
Diffstat (limited to 'Configurations/descrip.mms.tmpl')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index cdc341f9e7..3430f7258d 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -62,7 +62,12 @@ @{$unified_info{modules}}; our @install_modules = grep { !$unified_info{attributes}->{modules}->{$_}->{noinst} - && !$unified_info{attributes}->{modules}->{$_}->{engine} } + && !$unified_info{attributes}->{modules}->{$_}->{engine} + && !$unified_info{attributes}->{modules}->{$_}->{fips} } + @{$unified_info{modules}}; + our @install_fipsmodules = + grep { !$unified_info{attributes}->{modules}->{$_}->{noinst} + && $unified_info{attributes}->{modules}->{$_}->{fips} } @{$unified_info{modules}}; our @install_programs = grep { !$unified_info{attributes}->{programs}->{$_}->{noinst} } @@ -315,6 +320,8 @@ INSTALL_LIBS={- join(", ", map { "-\n\t".$_.".OLB" } @install_libs) -} INSTALL_SHLIBS={- join(", ", map { "-\n\t".$_.".EXE" } @install_shlibs) -} INSTALL_ENGINES={- join(", ", map { "-\n\t".$_.".EXE" } @install_engines) -} INSTALL_MODULES={- join(", ", map { "-\n\t".$_.".EXE" } @install_modules) -} +INSTALL_FIPSMODULE={- join(", ", map { "-\n\t".$_.".EXE" } @install_fipsmodules) -} +INSTALL_FIPSMODULECONF=[.providers]fipsmodule.cnf INSTALL_PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } @install_programs) -} BIN_SCRIPTS={- join(", ", @install_bin_scripts) -} MISC_SCRIPTS={- join(", ", @install_misc_scripts) -} @@ -557,17 +564,20 @@ install_docs : install_html_docs uninstall_docs : uninstall_html_docs -install_fips : install_sw +{- output_off() if $disabled{fips}; "" -} +install_fips : install_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" - @ WRITE SYS$OUTPUT "fipsinstall $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf" - openssl fipsinstall - - -module ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch']$(FIPSMODULENAME) - - -out ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch']$(FIPSMODULENAME).cnf - - -macopt "hexkey:$(FIPSKEY)" + COPY/PROT=W:RE $(INSTALL_FIPSMODULESCONF) OSSL_DATAROOT:[000000] uninstall_fips : uninstall_sw @ WRITE SYS$OUTPUT "*** Uninstalling FIPS module configuration" - DELETE ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch']$(FIPSMODULENAME).cnf;* + DELETE OSSL_DATAROOT:[000000]fipsmodule.cnf;* + @ WRITE SYS$OUTPUT "*** Uninstalling FIPS module" + DELETE ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch']$(FIPSMODULENAME);* +{- output_on() if $disabled{fips}; "" -} install_ssldirs : check_INSTALLTOP - CREATE/DIR/PROT=(S:RWED,O:RWE,G:RE,W:RE) OSSL_DATAROOT:[000000] |