1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6805e8a10..526a05102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
   algorithms (Ciphers, MACs and HostKeyAlgorithms) from man pages.
 - (dtucker) [myproposal.h] Do not advertise AES GSM ciphers if we don't have
   the required OpenSSL support.  Patch from naddy at freebsd.
+ - (dtucker) [myproposal.h] Make the conditional algorithm support consistent
+   and add some comments so it's clear what goes where.
 20130605
 - (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of

diff --git a/ChangeLog b/ChangeLog index 6805e8a10..526a05102 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -13,6 +13,8 @@
13	algorithms (Ciphers, MACs and HostKeyAlgorithms) from man pages.	13	algorithms (Ciphers, MACs and HostKeyAlgorithms) from man pages.
14	- (dtucker) [myproposal.h] Do not advertise AES GSM ciphers if we don't have	14	- (dtucker) [myproposal.h] Do not advertise AES GSM ciphers if we don't have
15	the required OpenSSL support. Patch from naddy at freebsd.	15	the required OpenSSL support. Patch from naddy at freebsd.
		16	- (dtucker) [myproposal.h] Make the conditional algorithm support consistent
		17	and add some comments so it's clear what goes where.
16		18
17	20130605	19	20130605
18	- (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of	20	- (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of