From 005a64da0f457410045ef0bfa93c863c2450447d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 21 Aug 2014 10:48:41 +1000 Subject: - (djm) [key.h] Fix ifdefs for no-ECC OpenSSL --- ChangeLog | 1 + key.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b81314a..8f78d23c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 20140821 - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too. + - (djm) [key.h] Fix ifdefs for no-ECC OpenSSL 20140820 - (djm) [configure.ac] Check OpenSSL version is supported at configure time; diff --git a/key.h b/key.h index 4be4fedd..c6401a57 100644 --- a/key.h +++ b/key.h @@ -81,10 +81,10 @@ int key_cert_check_authority(const Key *, int, int, const char *, const char **); char *key_alg_list(int, int); -#ifdef WITH_OPENSSL +#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) int key_ec_validate_public(const EC_GROUP *, const EC_POINT *); int key_ec_validate_private(const EC_KEY *); -#endif /* WITH_OPENSSL */ +#endif /* defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) */ Key *key_from_blob(const u_char *, u_int); int key_to_blob(const Key *, u_char **, u_int *); -- cgit v1.2.1