[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  c4232b9edbeb242583a804dfb0bafaf57610e6fb (commit)
      from  592dcfd3df129235fa94144e866812800e2941e8 (commit)


- Log -----------------------------------------------------------------
commit c4232b9edbeb242583a804dfb0bafaf57610e6fb
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Mon Sep 28 07:46:29 2020 +1000

    rsa_mp_coeff_names should only have one entry in it for fips mode.
    
    Reported by Tim Hudson
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13011)

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

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

diff --git a/crypto/rsa/rsa_mp_names.c b/crypto/rsa/rsa_mp_names.c
index 15b1b9e0da..2fb1f53c43 100644
--- a/crypto/rsa/rsa_mp_names.c
+++ b/crypto/rsa/rsa_mp_names.c
@@ -62,8 +62,8 @@ const char *rsa_mp_exp_names[] = {
  */
 const char *rsa_mp_coeff_names[] = {
     OSSL_PKEY_PARAM_RSA_COEFFICIENT1,
-    OSSL_PKEY_PARAM_RSA_COEFFICIENT2,
 #ifndef FIPS_MODULE
+    OSSL_PKEY_PARAM_RSA_COEFFICIENT2,
     OSSL_PKEY_PARAM_RSA_COEFFICIENT3,
     OSSL_PKEY_PARAM_RSA_COEFFICIENT4,
     OSSL_PKEY_PARAM_RSA_COEFFICIENT5,