From 7ecdc3e0d5660ae573e24fd8ff557c94bcdb9d4f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 27 Nov 2013 17:38:21 +0100 Subject: [PATCH] ecdh: Check if we have ECC support. --- include/libssh/curve25519.h | 5 ++++- include/libssh/ecdh.h | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/libssh/curve25519.h b/include/libssh/curve25519.h index 35e25be0..0406b9ee 100644 --- a/include/libssh/curve25519.h +++ b/include/libssh/curve25519.h @@ -39,7 +39,10 @@ int crypto_scalarmult_base(unsigned char *q, const unsigned char *n); int crypto_scalarmult(unsigned char *q, const unsigned char *n, const unsigned char *p); #endif /* WITH_NACL */ -#define HAVE_CURVE25519 +#ifdef HAVE_ECC +#define HAVE_CURVE25519 1 +#endif + typedef unsigned char ssh_curve25519_pubkey[CURVE25519_PUBKEY_SIZE]; typedef unsigned char ssh_curve25519_privkey[CURVE25519_PRIVKEY_SIZE]; diff --git a/include/libssh/ecdh.h b/include/libssh/ecdh.h index b35b2af7..8d1e7515 100644 --- a/include/libssh/ecdh.h +++ b/include/libssh/ecdh.h @@ -26,7 +26,9 @@ #ifdef HAVE_LIBCRYPTO #ifdef HAVE_OPENSSL_ECDH_H -#define HAVE_ECDH +#ifdef HAVE_ECC +#define HAVE_ECDH 1 +#endif #endif /* HAVE_OPENSSL_ECDH_H */ #endif /* HAVE_LIBCRYPTO */