diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-05-24 14:06:00 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-05-26 15:11:01 +0200 |
| commit | a2405c5f2019707d1a4306f152faa9ccda5f4cd5 (patch) | |
| tree | 528689875f29e32f651bc95a07ff9153bc50b405 /providers | |
| parent | bfd6b619b6ccba8aee6b1d9ea1af21f0e03567dc (diff) | |
Rework how providers/fipsmodule.cnf is produced
First of all, we have concluded that we can calculate the integrity
checksum with a simple perl script.
Second, having the production of providers/fipsmodule.cnf as a
dependency for run_tests wasn't quite right. What we really want is
to generate it as soon as a new providers/fips.so is produced. That
required a small bit of fiddling with how diverse dependencies are
made.
Fixes #15166
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15436)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/build.info | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/providers/build.info b/providers/build.info index e9ec4cf646..3f55f3aa44 100644 --- a/providers/build.info +++ b/providers/build.info @@ -114,17 +114,10 @@ IF[{- !$disabled{fips} -}] GENERATE[fips.ld]=../util/providers.num ENDIF - # For tests that try to use the FIPS module, we need to make a local fips - # module installation. We have the output go to standard output, because - # the generated commands in build templates are expected to catch that, - # and thereby keep control over the exact output file location. - IF[{- !$disabled{tests} -}] - DEPEND[|run_tests|]=fipsmodule.cnf - GENERATE[fipsmodule.cnf]=../apps/openssl fipsinstall \ - -module providers/$(FIPSMODULENAME) -provider_name fips \ - -mac_name HMAC -section_name fips_sect - DEPEND[fipsmodule.cnf]=$FIPSGOAL - ENDIF + DEPEND[|build_modules_nodep|]=fipsmodule.cnf + GENERATE[fipsmodule.cnf]=../util/mk-fipsmodule-cnf.pl \ + -module $(FIPSMODULE) -section_name fips_sect -key $(FIPSKEY) + DEPEND[fipsmodule.cnf]=$FIPSGOAL ENDIF # |