From 33fb6ed3ecee73fe2de9047e7bca0bdf2c39303f Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 28 May 2021 14:03:25 +0100 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/15504) --- test/recipes/65-test_cmp_server.t | 2 +- test/recipes/65-test_cmp_vfy.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/recipes/65-test_cmp_server.t b/test/recipes/65-test_cmp_server.t index 478de7751a6..ba09fbe924e 100644 --- a/test/recipes/65-test_cmp_server.t +++ b/test/recipes/65-test_cmp_server.t @@ -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")]))); } diff --git a/test/recipes/65-test_cmp_vfy.t b/test/recipes/65-test_cmp_vfy.t index cc0ef8cee70..f722800e276 100644 --- a/test/recipes/65-test_cmp_vfy.t +++ b/test/recipes/65-test_cmp_vfy.t @@ -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")]))); } -- 2.47.2