diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2015-03-24 09:17:22 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2015-03-24 09:17:22 +0000 |
| commit | 19df6bf24e61227cf531f2476f4ec2871c16421a (patch) | |
| tree | 3d609ae192cb7c33c39db03bae1f44439b8e92cb /usr.bin | |
| parent | a20ccefaf95e5c94bbb2ac22d75a81b5a62f821c (diff) | |
promote chacha20-poly1305@openssh.com to be the default cipher;
ok markus
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/myproposal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/myproposal.h b/usr.bin/ssh/myproposal.h index fb848c6705d..6f962b25962 100644 --- a/usr.bin/ssh/myproposal.h +++ b/usr.bin/ssh/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.41 2014/07/11 13:54:34 tedu Exp $ */ +/* $OpenBSD: myproposal.h,v 1.42 2015/03/24 09:17:21 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -55,9 +55,9 @@ "ssh-dss" #define KEX_SERVER_ENCRYPT \ + "chacha20-poly1305@openssh.com," \ "aes128-ctr,aes192-ctr,aes256-ctr," \ - "aes128-gcm@openssh.com,aes256-gcm@openssh.com," \ - "chacha20-poly1305@openssh.com" + "aes128-gcm@openssh.com,aes256-gcm@openssh.com" #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \ "arcfour256,arcfour128," \ @@ -95,8 +95,8 @@ "ssh-ed25519-cert-v01@openssh.com," \ "ssh-ed25519" #define KEX_SERVER_ENCRYPT \ - "aes128-ctr,aes192-ctr,aes256-ctr," \ - "chacha20-poly1305@openssh.com" + "chacha20-poly1305@openssh.com," + "aes128-ctr,aes192-ctr,aes256-ctr" #define KEX_SERVER_MAC \ "umac-64-etm@openssh.com," \ "umac-128-etm@openssh.com," \ |