diff options
author | Rich Salz <rsalz@openssl.org> | 2017-04-07 12:07:42 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2017-04-07 12:19:46 -0400 |
commit | 076fc55527a1499391fa6de109c8387895199ee9 (patch) | |
tree | 8a7d5eba7a2baf36080d6f4925dee48157a2e304 /crypto/dsa | |
parent | 2f881d2d9065342454fe352eac9e835cefa0ba90 (diff) | |
download | openssl-076fc55527a1499391fa6de109c8387895199ee9.zip openssl-076fc55527a1499391fa6de109c8387895199ee9.tar.gz openssl-076fc55527a1499391fa6de109c8387895199ee9.tar.bz2 |
Make default_method mostly compile-time
Document thread-safety issues
Have RSA_null return NULL (always fails)
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2244)
Diffstat (limited to 'crypto/dsa')
-rw-r--r-- | crypto/dsa/dsa_lib.c | 14 | ||||
-rw-r--r-- | crypto/dsa/dsa_ossl.c | 12 |
2 files changed, 12 insertions, 14 deletions
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c index e24c6b5..c90d09b 100644 --- a/crypto/dsa/dsa_lib.c +++ b/crypto/dsa/dsa_lib.c @@ -17,20 +17,6 @@ #include <openssl/engine.h> #include <openssl/dh.h> -static const DSA_METHOD *default_DSA_method = NULL; - -void DSA_set_default_method(const DSA_METHOD *meth) -{ - default_DSA_method = meth; -} - -const DSA_METHOD *DSA_get_default_method(void) -{ - if (!default_DSA_method) - default_DSA_method = DSA_OpenSSL(); - return default_DSA_method; -} - DSA *DSA_new(void) { return DSA_new_method(NULL); diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c index f9f6a13..4793377 100644 --- a/crypto/dsa/dsa_ossl.c +++ b/crypto/dsa/dsa_ossl.c @@ -41,6 +41,18 @@ static DSA_METHOD openssl_dsa_meth = { NULL }; +static const DSA_METHOD *default_DSA_method = &openssl_dsa_meth; + +void DSA_set_default_method(const DSA_METHOD *meth) +{ + default_DSA_method = meth; +} + +const DSA_METHOD *DSA_get_default_method(void) +{ + return default_DSA_method; +} + const DSA_METHOD *DSA_OpenSSL(void) { return &openssl_dsa_meth; |