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/evp | |
| parent | ac5a110621ca48f0bebd5b4d76d081de403da29e (diff) | |
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/evp')
| -rw-r--r-- | crypto/evp/c_alld.c | 2 | ||||
| -rw-r--r-- | crypto/evp/evp.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c index 0d4278b86a..94039ef5fd 100644 --- a/crypto/evp/c_alld.c +++ b/crypto/evp/c_alld.c @@ -80,7 +80,7 @@ void OpenSSL_add_all_digests(void) EVP_add_digest_alias(SN_dsaWithSHA1, "DSS1"); EVP_add_digest_alias(SN_dsaWithSHA1, "dss1"); # endif -# ifndef OPENSSL_NO_ECDSA +# ifndef OPENSSL_NO_EC EVP_add_digest(EVP_ecdsa()); # endif #if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DES) diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 2e9f83fac7..0d26fd3129 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -234,7 +234,7 @@ typedef int evp_verify_method(int type, const unsigned char *m, # define EVP_PKEY_DSA_method EVP_PKEY_NULL_method # endif -# ifndef OPENSSL_NO_ECDSA +# ifndef OPENSSL_NO_EC # define EVP_PKEY_ECDSA_method (evp_sign_method *)ECDSA_sign, \ (evp_verify_method *)ECDSA_verify, \ {EVP_PKEY_EC,0,0,0} |