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/ecdh | |
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/ecdh')
-rw-r--r-- | crypto/ecdh/ecdh.h | 2 | ||||
-rw-r--r-- | crypto/ecdh/ecdhtest.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/ecdh/ecdh.h b/crypto/ecdh/ecdh.h index 0d643a3f05..25ccdc9088 100644 --- a/crypto/ecdh/ecdh.h +++ b/crypto/ecdh/ecdh.h @@ -71,7 +71,7 @@ # include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_ECDH +# ifdef OPENSSL_NO_EC # error ECDH is disabled. # endif diff --git a/crypto/ecdh/ecdhtest.c b/crypto/ecdh/ecdhtest.c index 41725f6a8d..578de316be 100644 --- a/crypto/ecdh/ecdhtest.c +++ b/crypto/ecdh/ecdhtest.c @@ -73,7 +73,7 @@ #include "../e_os.h" -#include <openssl/opensslconf.h> /* for OPENSSL_NO_ECDH */ +#include <openssl/opensslconf.h> /* for OPENSSL_NO_EC */ #include <openssl/crypto.h> #include <openssl/bio.h> #include <openssl/bn.h> @@ -82,7 +82,7 @@ #include <openssl/sha.h> #include <openssl/err.h> -#ifdef OPENSSL_NO_ECDH +#ifdef OPENSSL_NO_EC int main(int argc, char *argv[]) { printf("No ECDH support\n"); |