diff options
| author |   djm <djm@openbsd.org> | 2009-01-23 07:58:11 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2009-01-23 07:58:11 +0000 |
| commit | 4ca2f4ee8154d82ef72e71da7a7f0c53e71941a7 (patch) | |
| tree | 011ad0c1a9aa8227e5a3e3cec0df5e66a322824c | |
| parent | Make bus_mem_add_mapping() return ENOMEM if we fail to allocate kva instead (diff) | |
| download | wireguard-openbsd-4ca2f4ee8154d82ef72e71da7a7f0c53e71941a7.tar.xz wireguard-openbsd-4ca2f4ee8154d82ef72e71da7a7f0c53e71941a7.zip | |
prefer CTR modes and revised arcfour (i.e w/ discard) modes to CBC
modes; ok markus@
| -rw-r--r-- | usr.bin/ssh/myproposal.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/ssh/myproposal.h b/usr.bin/ssh/myproposal.h index da4b9f29a03..bfd124563c1 100644 --- a/usr.bin/ssh/myproposal.h +++ b/usr.bin/ssh/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.22 2007/06/07 19:37:34 pvalchev Exp $ */ +/* $OpenBSD: myproposal.h,v 1.23 2009/01/23 07:58:11 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -29,11 +29,12 @@ "diffie-hellman-group14-sha1," \ "diffie-hellman-group1-sha1" #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" + #define KEX_DEFAULT_ENCRYPT \ + "aes128-ctr,aes192-ctr,aes256-ctr," \ + "arcfour256,arcfour128," \ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ - "arcfour128,arcfour256,arcfour," \ - "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \ - "aes128-ctr,aes192-ctr,aes256-ctr" + "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" #define KEX_DEFAULT_MAC \ "hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \ "hmac-ripemd160@openssh.com," \ |