summaryrefslogtreecommitdiffstats
path: root/crypto/dsa
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-06-20 19:41:13 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-06-20 19:41:13 +0000
commit3a5b97b7f124cbd5346ab0d8fe6fc1705a81a675 (patch)
tree0f027ac3ffcd69a7242023f43d5b309be2b71983 /crypto/dsa
parent45bf825066b1929ec219b8b76321f5191e44f370 (diff)
Don't set default public key methods in FIPS mode so applications
can switch between modes.
Diffstat (limited to 'crypto/dsa')
-rw-r--r--crypto/dsa/dsa_lib.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index f7960901a0..e416ef3e12 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -89,10 +89,12 @@ const DSA_METHOD *DSA_get_default_method(void)
{
#ifdef OPENSSL_FIPS
if (FIPS_mode())
- default_DSA_method = FIPS_dsa_openssl();
+ return FIPS_dsa_openssl();
else
+ return DSA_OpenSSL();
+#else
+ default_DSA_method = DSA_OpenSSL();
#endif
- default_DSA_method = DSA_OpenSSL();
}
return default_DSA_method;
}