This matches the current myproposal.h ordering with
chacha20-poly1305's promotion (and referenced in various release
notes). Please correct if I've misunderstood or misformatted. Thanks.

Index: usr.bin/ssh/ssh_config.5
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh_config.5,v
retrieving revision 1.214
diff -u -p -u -p -r1.214 ssh_config.5
--- usr.bin/ssh/ssh_config.5 30 Jul 2015 00:01:34 -0000 1.214
+++ usr.bin/ssh/ssh_config.5 11 Aug 2015 02:54:48 -0000
@@ -415,9 +415,9 @@ [email protected]
 .Pp
 The default is:
 .Bd -literal -offset indent
[email protected],
 aes128-ctr,aes192-ctr,aes256-ctr,
 [email protected],[email protected],
[email protected],
 arcfour256,arcfour128,
 aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,
 aes192-cbc,aes256-cbc,arcfour
Index: usr.bin/ssh/sshd_config.5
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sshd_config.5,v
retrieving revision 1.210
diff -u -p -u -p -r1.210 sshd_config.5
--- usr.bin/ssh/sshd_config.5 6 Aug 2015 14:53:21 -0000 1.210
+++ usr.bin/ssh/sshd_config.5 11 Aug 2015 02:54:48 -0000
@@ -477,9 +477,9 @@ [email protected]
 .Pp
 The default is:
 .Bd -literal -offset indent
[email protected],
 aes128-ctr,aes192-ctr,aes256-ctr,
[email protected],[email protected],
[email protected]
[email protected],[email protected]
 .Ed
 .Pp
 The list of available ciphers may also be obtained using the

Brian Conway

Reply via email to