Rename fipsinstall.cnf->fipsmodule.cnf
authorRich Salz <rsalz@akamai.com>
Tue, 21 Apr 2020 17:55:12 +0000 (13:55 -0400)
committerTomas Mraz <tmraz@fedoraproject.org>
Fri, 24 Apr 2020 11:19:16 +0000 (13:19 +0200)
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)

test/recipes/80-test_ssl_new.t
test/recipes/80-test_ssl_old.t
test/recipes/90-test_sslapi.t
test/recipes/90-test_sslprovider.t

index fc0c376..8a26119 100644 (file)
@@ -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',
index 345ec0f..42963c3 100644 (file)
@@ -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',
index feca1c2..b89b783 100644 (file)
@@ -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',
index 7af6c96..793756b 100644 (file)
@@ -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',