summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-08-21 10:48:41 +1000
committerDamien Miller <djm@mindrot.org>2014-08-21 10:48:41 +1000
commit005a64da0f457410045ef0bfa93c863c2450447d (patch)
tree736caa5062cf29bd2d819cf20b51bc01d1134836
parentaa6598ebb3343c7380e918388e10e8ca5852b613 (diff)
- (djm) [key.h] Fix ifdefs for no-ECC OpenSSL
-rw-r--r--ChangeLog1
-rw-r--r--key.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b81314ac..8f78d23c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
120140821 120140821
2 - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too. 2 - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too.
3 - (djm) [key.h] Fix ifdefs for no-ECC OpenSSL
3 4
420140820 520140820
5 - (djm) [configure.ac] Check OpenSSL version is supported at configure time; 6 - (djm) [configure.ac] Check OpenSSL version is supported at configure time;
diff --git a/key.h b/key.h
index 4be4fedd6..c6401a576 100644
--- a/key.h
+++ b/key.h
@@ -81,10 +81,10 @@ int key_cert_check_authority(const Key *, int, int, const char *,
81 const char **); 81 const char **);
82char *key_alg_list(int, int); 82char *key_alg_list(int, int);
83 83
84#ifdef WITH_OPENSSL 84#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
85int key_ec_validate_public(const EC_GROUP *, const EC_POINT *); 85int key_ec_validate_public(const EC_GROUP *, const EC_POINT *);
86int key_ec_validate_private(const EC_KEY *); 86int key_ec_validate_private(const EC_KEY *);
87#endif /* WITH_OPENSSL */ 87#endif /* defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) */
88 88
89Key *key_from_blob(const u_char *, u_int); 89Key *key_from_blob(const u_char *, u_int);
90int key_to_blob(const Key *, u_char **, u_int *); 90int key_to_blob(const Key *, u_char **, u_int *);