1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a830e281d..92adafcc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
   regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] Only do NISTP256
   curve tests if OpenSSL has them.
+ - (dtucker) [myprosal.h] Don't include curve25519-sha256@libssh.org in
+   the proposal if the version of OpenSSL we're using doesn't support ECC.
 20140527
 - (djm) [cipher.c] Fix merge botch.

diff --git a/ChangeLog b/ChangeLog index a830e281d..92adafcc7 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -2,6 +2,8 @@
2	- (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c	2	- (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
3	regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] Only do NISTP256	3	regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] Only do NISTP256
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
		6	the proposal if the version of OpenSSL we're using doesn't support ECC.
5		7
6	20140527	8	20140527
7	- (djm) [cipher.c] Fix merge botch.	9	- (djm) [cipher.c] Fix merge botch.