diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-03-10 19:09:27 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2015-03-11 09:29:37 -0400 |
| commit | 10bf4fc2c3da332a54247da1f3c0dcb44944f7ff (patch) | |
| tree | c2f597e901f98829266ec4045492195cefdd958c /crypto/engine | |
| parent | ac5a110621ca48f0bebd5b4d76d081de403da29e (diff) | |
| download | openssl-10bf4fc2c3da332a54247da1f3c0dcb44944f7ff.tar.gz | |
Merge OPENSSL_NO_EC{DH,DSA} into OPENSSL_NO_EC
Suggested by John Foley <foleyj@cisco.com>.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_fat.c | 8 | ||||
| -rw-r--r-- | crypto/engine/eng_list.c | 4 | ||||
| -rw-r--r-- | crypto/engine/eng_openssl.c | 4 | ||||
| -rw-r--r-- | crypto/engine/engine.h | 4 |
4 files changed, 5 insertions, 15 deletions
diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c index 4279dd94b1..af353bd936 100644 --- a/crypto/engine/eng_fat.c +++ b/crypto/engine/eng_fat.c @@ -79,11 +79,9 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags) if ((flags & ENGINE_METHOD_DH) && !ENGINE_set_default_DH(e)) return 0; #endif -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC if ((flags & ENGINE_METHOD_ECDH) && !ENGINE_set_default_ECDH(e)) return 0; -#endif -#ifndef OPENSSL_NO_ECDSA if ((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e)) return 0; #endif @@ -159,10 +157,8 @@ int ENGINE_register_complete(ENGINE *e) #ifndef OPENSSL_NO_DH ENGINE_register_DH(e); #endif -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC ENGINE_register_ECDH(e); -#endif -#ifndef OPENSSL_NO_ECDSA ENGINE_register_ECDSA(e); #endif ENGINE_register_RAND(e); diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c index c69e8a7eda..9e80eafdde 100644 --- a/crypto/engine/eng_list.c +++ b/crypto/engine/eng_list.c @@ -300,10 +300,8 @@ static void engine_cpy(ENGINE *dest, const ENGINE *src) #ifndef OPENSSL_NO_DH dest->dh_meth = src->dh_meth; #endif -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC dest->ecdh_meth = src->ecdh_meth; -#endif -#ifndef OPENSSL_NO_ECDSA dest->ecdsa_meth = src->ecdsa_meth; #endif dest->rand_meth = src->rand_meth; diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index 3e12ecf760..78fa3c8d45 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c @@ -149,10 +149,8 @@ static int bind_helper(ENGINE *e) # ifndef OPENSSL_NO_DSA || !ENGINE_set_DSA(e, DSA_get_default_method()) # endif -# ifndef OPENSSL_NO_ECDH +# ifndef OPENSSL_NO_EC || !ENGINE_set_ECDH(e, ECDH_OpenSSL()) -# endif -# ifndef OPENSSL_NO_ECDSA || !ENGINE_set_ECDSA(e, ECDSA_OpenSSL()) # endif # ifndef OPENSSL_NO_DH diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h index c931907599..e2f3e5cd9e 100644 --- a/crypto/engine/engine.h +++ b/crypto/engine/engine.h @@ -82,10 +82,8 @@ # ifndef OPENSSL_NO_DH # include <openssl/dh.h> # endif -# ifndef OPENSSL_NO_ECDH +# ifndef OPENSSL_NO_EC # include <openssl/ecdh.h> -# endif -# ifndef OPENSSL_NO_ECDSA # include <openssl/ecdsa.h> # endif # include <openssl/rand.h> |