[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  6f04bcc7e3b258f4a075279515881b13bd3fd04c (commit)
      from  1010e4ac9743a273d12e4f7c49959607aa4f6403 (commit)


- Log -----------------------------------------------------------------
commit 6f04bcc7e3b258f4a075279515881b13bd3fd04c
Author: Daniel Bevenius <daniel.bevenius at gmail.com>
Date:   Mon Aug 31 08:07:13 2020 +0200

    Fix typo in FIPS_MODULE endif macro comment
    
    Reviewed-by: David von Oheimb <david.von.oheimb at siemens.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12755)

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

Summary of changes:
 crypto/rsa/rsa_gen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
index 1cdc8d91e8..b7a37b77a2 100644
--- a/crypto/rsa/rsa_gen.c
+++ b/crypto/rsa/rsa_gen.c
@@ -66,7 +66,7 @@ int RSA_generate_multi_prime_key(RSA *rsa, int bits, int primes,
         else
             return 0;
     }
-#endif /* FIPS_MODUKE */
+#endif /* FIPS_MODULE */
     return rsa_keygen(rsa->libctx, rsa, bits, primes, e_value, cb, 0);
 }