Use the fips-and-base.cnf config file in CMP tests

Two CMP tests were using the fips.cnf config file. However to
ensure that decoders are available the fips-and-base.cnf config
file needs to be used instead.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
This commit is contained in:
Matt Caswell 2021-05-28 14:03:25 +01:00
parent 15fd6c235c
commit 33fb6ed3ec
2 changed files with 2 additions and 2 deletions

View file

@ -36,5 +36,5 @@ ok(run(test([@basic_cmd, "none"])));
ok(run(test([@basic_cmd, "default", srctop_file("test", "default.cnf")])));
unless ($no_fips) {
ok(run(test([@basic_cmd, "fips", srctop_file("test", "fips.cnf")])));
ok(run(test([@basic_cmd, "fips", srctop_file("test", "fips-and-base.cnf")])));
}

View file

@ -47,5 +47,5 @@ ok(run(test([@basic_cmd, "none"])));
ok(run(test([@basic_cmd, "default", srctop_file("test", "default.cnf")])));
unless ($no_fips) {
ok(run(test([@basic_cmd, "fips", srctop_file("test", "fips.cnf")])));
ok(run(test([@basic_cmd, "fips", srctop_file("test", "fips-and-base.cnf")])));
}