summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-06-11 07:38:49 +1000
committerDarren Tucker <dtucker@zip.com.au>2014-06-11 07:38:49 +1000
commit15c254a25394f96643da2ad0f674acdc51e89856 (patch)
tree5942e976f4d3379a36389178540446d2792f70b2
parentd7af0cc5bf273eeed0897a99420bc26841d07d8f (diff)
- (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] ifdef
ECC variable too.
-rw-r--r--ChangeLog2
-rw-r--r--regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 92adafcc7..e2171ec1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 curve tests if OpenSSL has them. 4 curve tests if OpenSSL has them.
5 - (dtucker) [myprosal.h] Don't include curve25519-sha256@libssh.org in 5 - (dtucker) [myprosal.h] Don't include curve25519-sha256@libssh.org in
6 the proposal if the version of OpenSSL we're using doesn't support ECC. 6 the proposal if the version of OpenSSL we're using doesn't support ECC.
7 - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] ifdef
8 ECC variable too.
7 9
820140527 1020140527
9 - (djm) [cipher.c] Fix merge botch. 11 - (djm) [cipher.c] Fix merge botch.
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
index a5e577d3f..3987515a4 100644
--- a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
@@ -29,7 +29,9 @@ attempt_parse_blob(u_char *blob, size_t len)
29{ 29{
30 struct sshbuf *p1; 30 struct sshbuf *p1;
31 BIGNUM *bn; 31 BIGNUM *bn;
32#ifdef OPENSSL_HAS_NISTP256
32 EC_KEY *eck; 33 EC_KEY *eck;
34#endif
33 u_char *s; 35 u_char *s;
34 size_t l; 36 size_t l;
35 u_int8_t u8; 37 u_int8_t u8;