summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2020-04-21 13:55:12 -0400
committerTomas Mraz <tmraz@fedoraproject.org>2020-04-24 13:19:16 +0200
commit713fc10f83a4d5cac4153a98374be8cac6af1771 (patch)
treef8fc704dbc2561e7e2f1e3c7116059b327a4c57a
parent1cd2c1f857e114f176eee01c96e27a8d7a14a356 (diff)
Rename fipsinstall.cnf->fipsmodule.cnf
Introduced by rebasing Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/11177)
-rw-r--r--test/recipes/80-test_ssl_new.t2
-rw-r--r--test/recipes/80-test_ssl_old.t2
-rw-r--r--test/recipes/90-test_sslapi.t2
-rw-r--r--test/recipes/90-test_sslprovider.t2
4 files changed, 4 insertions, 4 deletions
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index fc0c376c1f..8a26119f86 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -119,7 +119,7 @@ my %skip = (
unless ($no_fips) {
ok(run(app(['openssl', 'fipsinstall',
- '-out', bldtop_file('providers', 'fipsinstall.cnf'),
+ '-out', bldtop_file('providers', 'fipsmodule.cnf'),
'-module', bldtop_file('providers', platform->dso('fips')),
'-provider_name', 'fips', '-mac_name', 'HMAC',
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index 345ec0fa67..42963c364a 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -94,7 +94,7 @@ plan tests =>
unless ($no_fips) {
ok(run(app(['openssl', 'fipsinstall',
- '-out', bldtop_file('providers', 'fipsinstall.cnf'),
+ '-out', bldtop_file('providers', 'fipsmodule.cnf'),
'-module', bldtop_file('providers', platform->dso('fips')),
'-provider_name', 'fips', '-mac_name', 'HMAC',
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
diff --git a/test/recipes/90-test_sslapi.t b/test/recipes/90-test_sslapi.t
index feca1c2e20..b89b783805 100644
--- a/test/recipes/90-test_sslapi.t
+++ b/test/recipes/90-test_sslapi.t
@@ -41,7 +41,7 @@ ok(run(test(["sslapitest", srctop_dir("test", "certs"),
unless ($no_fips) {
ok(run(app(['openssl', 'fipsinstall',
- '-out', bldtop_file('providers', 'fipsinstall.cnf'),
+ '-out', bldtop_file('providers', 'fipsmodule.cnf'),
'-module', bldtop_file('providers', platform->dso('fips')),
'-provider_name', 'fips', '-mac_name', 'HMAC',
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
diff --git a/test/recipes/90-test_sslprovider.t b/test/recipes/90-test_sslprovider.t
index 7af6c962ad..793756bc6d 100644
--- a/test/recipes/90-test_sslprovider.t
+++ b/test/recipes/90-test_sslprovider.t
@@ -31,7 +31,7 @@ SKIP: {
if disabled("fips");
ok(run(app(['openssl', 'fipsinstall',
- '-out', bldtop_file('providers', 'fipsinstall.cnf'),
+ '-out', bldtop_file('providers', 'fipsmodule.cnf'),
'-module', bldtop_file('providers', platform->dso('fips')),
'-provider_name', 'fips', '-mac_name', 'HMAC',
'-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',