[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  97a8878c5d7ff59a315b975252fef97d3ab6ac41 (commit)
      from  5ccada09aae0cf846d3381a161d3eb20d4d9abfd (commit)


- Log -----------------------------------------------------------------
commit 97a8878c5d7ff59a315b975252fef97d3ab6ac41
Author: Kelvin Lee <kiyolee at gmail.com>
Date:   Thu Aug 6 15:07:39 2020 +1000

    Use .cnf for config files, not .conf
    
    CLA: trivial
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12592)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/03-test_fipsinstall.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/recipes/03-test_fipsinstall.t b/test/recipes/03-test_fipsinstall.t
index 1d7a1ff6ae..ca516539b0 100644
--- a/test/recipes/03-test_fipsinstall.t
+++ b/test/recipes/03-test_fipsinstall.t
@@ -203,7 +203,7 @@ SKIP: {
     skip "Skipping KAS DH corruption test because of no dh in this build", 1
         if disabled("dh");
 
-    ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile,
+    ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module', $infile,
                 '-provider_name', 'fips', '-mac_name', 'HMAC',
                 '-macopt', 'digest:SHA256', '-macopt', "hexkey:$fipskey",
                 '-section_name', 'fips_sect',
@@ -216,7 +216,7 @@ SKIP: {
 SKIP: {
     skip "Skipping Signature DSA corruption test because of no dsa in this build", 1
         if disabled("dsa");
-    ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile,
+    ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module', $infile,
                 '-provider_name', 'fips', '-mac_name', 'HMAC',
                 '-macopt', 'digest:SHA256', '-macopt', "hexkey:$fipskey",
                 '-section_name', 'fips_sect',