summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 9330c8057..26dfabde6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120140822 120140822
2 - (djm) [configure.ac] include leading zero characters in OpenSSL version 2 - (djm) [configure.ac] include leading zero characters in OpenSSL version
3 number; fixes test for unsupported versions 3 number; fixes test for unsupported versions
4 - (djm) [sshbuf-getput-crypto.c] Fix compilation when OpenSSL lacks ECC
4 5
520140821 620140821
6 - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too. 7 - (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 cfe6f7963..74351d3e5 100644
--- a/sshbuf-getput-crypto.c
+++ b/sshbuf-getput-crypto.c
@@ -24,7 +24,9 @@
24#include <string.h> 24#include <string.h>
25 25
26#include <openssl/bn.h> 26#include <openssl/bn.h>
27#include <openssl/ec.h> 27#ifdef OPENSSL_HAS_ECC
28# include <openssl/ec.h>
29#endif /* OPENSSL_HAS_ECC */
28 30
29#include "ssherr.h" 31#include "ssherr.h"
30#include "sshbuf.h" 32#include "sshbuf.h"