From 05869bba7fbe59d04bb8605b81b470d4dedb38ac Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 25 Feb 2021 17:46:36 +0100 Subject: Make 'tests' depend on a generated 'providers/fipsmodule.cnf' providers/fipsmodule.cnf is generated using 'openssl fipsinstall' with the openssl program in the build directory. Fixes #14315 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/14320) --- providers/build.info | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'providers') diff --git a/providers/build.info b/providers/build.info index b365bda0ec..1fab34c28d 100644 --- a/providers/build.info +++ b/providers/build.info @@ -142,6 +142,16 @@ IF[{- !$disabled{fips} -}] # statements, the final build file will not have a trace of it. MODULES{fips}=$FIPSGOAL LIBS{noinst}=$LIBFIPS + + # 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. + DEPEND[|tests|]=fipsmodule.cnf + GENERATE[fipsmodule.cnf]=../apps/openssl fipsinstall \ + -module providers/$(FIPSMODULENAME) -provider_name fips \ + -mac_name HMAC -section_name fips_sect -out - + DEPEND[fipsmodule.cnf]=$FIPSGOAL ENDIF # -- cgit v1.2.3