diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-02-25 17:46:36 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-03-03 14:47:43 +0100 |
| commit | 05869bba7fbe59d04bb8605b81b470d4dedb38ac (patch) | |
| tree | 1ba9b958d6d90fcf51b1e0bf7482111c629d86d2 /providers/build.info | |
| parent | 79f47ef507c945f4c73bcf8eb12f2caef19dc04e (diff) | |
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 <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14320)
Diffstat (limited to 'providers/build.info')
| -rw-r--r-- | providers/build.info | 10 |
1 files changed, 10 insertions, 0 deletions
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 # |