[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  2957150478260c8140eca389650956baa5195f15 (commit)
      from  f6f159e7a133d1b2f82a82fab3f8c357a07b574f (commit)


- Log -----------------------------------------------------------------
commit 2957150478260c8140eca389650956baa5195f15
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Thu Jul 9 23:04:02 2020 +1000

    Fix wrong fipsinstall key used in test
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12402)

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

Summary of changes:
 test/recipes/30-test_evp_libctx.t | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/recipes/30-test_evp_libctx.t b/test/recipes/30-test_evp_libctx.t
index 8fcc71a1cd..0d0a762900 100644
--- a/test/recipes/30-test_evp_libctx.t
+++ b/test/recipes/30-test_evp_libctx.t
@@ -38,7 +38,6 @@ unless ($no_fips) {
                '-out', bldtop_file('providers', 'fipsmodule.cnf'),
                '-module', $infile,
                '-provider_name', 'fips', '-mac_name', 'HMAC',
-               '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
                '-section_name', 'fips_sect'])),
        "fipsinstall");
 }