diff options
author | Rich Salz <rsalz@akamai.com> | 2020-06-29 12:20:41 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2020-06-29 12:20:41 +1000 |
commit | 31214258309251aff297da67a60a6b60bf4ef27e (patch) | |
tree | aee548533bd6a7fe25c3c6ebf06b46287dfccb6c /Configurations/descrip.mms.tmpl | |
parent | 9afbb681ecd433623fb39db2a110ec3351d271c7 (diff) |
Add --fips-key configuration parameter to fipsinstall application.
Change default FIPS HMAC KEY from all-zero's
Use default FIPSKEY if not given on command line.
Make all -macopt in fipsinstall optional
Make all tests, except fipsinstall, use the default -macopt and
-mac_name flags.
Define and use FIPSDIR variable on VMS/MMS.
Also use SRCDIR/BLDDIR in SRCTOP/BLDTOP.
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12235)
Diffstat (limited to 'Configurations/descrip.mms.tmpl')
-rw-r--r-- | Configurations/descrip.mms.tmpl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 2eb05d12dc..b30d08b53a 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -106,6 +106,7 @@ OPTIONS={- $config{options} -} CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -}) SRCDIR={- $config{sourcedir} -} BLDDIR={- $config{builddir} -} +FIPSKEY={- $config{FIPSKEY} -} # Allow both V and VERBOSE to indicate verbosity. This only applies # to testing. @@ -439,19 +440,21 @@ all : build_sw build_docs test : tests {- dependmagic('tests'); -} : build_programs_nodep, build_modules_nodep copy-utils @ ! {- output_off() if $disabled{tests}; "" -} - DEFINE SRCTOP {- sourcedir() -} - DEFINE BLDTOP {- builddir() -} + DEFINE SRCTOP "$(SRCDIR)" + DEFINE BLDTOP "$(BLDDIR)" + DEFINE FIPSKEY "$(FIPSKEY)" IF "$(VERBOSE)" .NES. "" THEN DEFINE VERBOSE "$(VERBOSE)" $(PERL) {- sourcefile("test", "run_tests.pl") -} $(TESTS) DEASSIGN BLDTOP DEASSIGN SRCTOP + DEASSIGN FIPSKEY @ ! {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} @ WRITE SYS$OUTPUT "Tests are not supported with your chosen Configure options" @ ! {- output_on() if !$disabled{tests}; "" -} list-tests : @ ! {- output_off() if $disabled{tests}; "" -} - @ DEFINE SRCTOP {- sourcedir() -} + @ DEFINE SRCTOP "$(SRCDIR)" @ $(PERL) {- sourcefile("test", "run_tests.pl") -} list @ DEASSIGN SRCTOP @ ! {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} |