Don't set default public key methods in FIPS mode so applications

[thirdparty/openssl.git] / crypto / rsa / rsa_lib.c

diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index e844395482e1b9c57c581b00416ea39de7c5047c..c95ceafc824da915163848592cb84d810442f975 100644 (file)
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -91,18 +91,16 @@ const RSA_METHOD *RSA_get_default_method(void)
        {
        if (default_RSA_meth == NULL)
                {
-#ifdef RSA_NULL
-               default_RSA_meth=RSA_null_method();
-#else
-#if 0 /* was: #ifdef RSAref */
-               default_RSA_meth=RSA_PKCS1_RSAref();
-#else
 #ifdef OPENSSL_FIPS
                if (FIPS_mode())
-                       default_RSA_meth = FIPS_rsa_pkcs1_ssleay();
+                       return FIPS_rsa_pkcs1_ssleay();
                else
-#endif
-                       default_RSA_meth=RSA_PKCS1_SSLeay();
+                       return RSA_PKCS1_SSLeay();
+#else
+#ifdef RSA_NULL
+               default_RSA_meth=RSA_null_method();
+#else
+               default_RSA_meth=RSA_PKCS1_SSLeay();
 #endif
 #endif
                }