summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-08-22 17:36:56 +1000
committerDamien Miller <djm@mindrot.org>2014-08-22 17:36:56 +1000
commit0c11f1ac369d2c0aeb0ab0458a7cd04c72fe5e9e (patch)
tree176ca0920aaa5bb62a0224f46d27ba7f37972259
parent6d62784b8973340b251fea6b04890f471adf28db (diff)
downloadopenssh-git-0c11f1ac369d2c0aeb0ab0458a7cd04c72fe5e9e.tar.gz
- (djm) [sshbuf-getput-crypto.c] Fix compilation when OpenSSL lacks ECC
-rw-r--r--ChangeLog1
-rw-r--r--sshbuf-getput-crypto.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9330c805..26dfabde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
20140822
- (djm) [configure.ac] include leading zero characters in OpenSSL version
number; fixes test for unsupported versions
+ - (djm) [sshbuf-getput-crypto.c] Fix compilation when OpenSSL lacks ECC
20140821
- (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too.
diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c
index cfe6f796..74351d3e 100644
--- a/sshbuf-getput-crypto.c
+++ b/sshbuf-getput-crypto.c
@@ -24,7 +24,9 @@
#include <string.h>
#include <openssl/bn.h>
-#include <openssl/ec.h>
+#ifdef OPENSSL_HAS_ECC
+# include <openssl/ec.h>
+#endif /* OPENSSL_HAS_ECC */
#include "ssherr.h"
#include "sshbuf.h"