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/err | |
| 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/err')
| -rw-r--r-- | crypto/err/err_all.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 1363fb026a..b844167f94 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -76,10 +76,8 @@ #ifndef OPENSSL_NO_DSA # include <openssl/dsa.h> #endif -#ifndef OPENSSL_NO_ECDSA +#ifndef OPENSSL_NO_EC # include <openssl/ecdsa.h> -#endif -#ifndef OPENSSL_NO_ECDH # include <openssl/ecdh.h> #endif #include <openssl/evp.h> @@ -138,11 +136,7 @@ void ERR_load_crypto_strings(void) # endif # ifndef OPENSSL_NO_EC ERR_load_EC_strings(); -# endif -# ifndef OPENSSL_NO_ECDSA ERR_load_ECDSA_strings(); -# endif -# ifndef OPENSSL_NO_ECDH ERR_load_ECDH_strings(); # endif /* skip ERR_load_SSL_strings() because it is not in this library */ |