diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2013-01-08 18:49:05 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2013-01-08 18:49:05 +0000 |
| commit | adf9515dca30a3e56b227376e4caf8279c4385cd (patch) | |
| tree | 2ef3374d339cc3c8ba5369bf449b62680f0fc5d8 /usr.bin/ssh/myproposal.h | |
| parent | 9c87c513b2e6c27969fbb097086b37bbff57e99a (diff) | |
support AES-GCM as defined in RFC 5647 (but with simpler KEX handling)
ok and feedback djm@
Diffstat (limited to 'usr.bin/ssh/myproposal.h')
| -rw-r--r-- | usr.bin/ssh/myproposal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/myproposal.h b/usr.bin/ssh/myproposal.h index 269bdbc839c..22a4f3998e7 100644 --- a/usr.bin/ssh/myproposal.h +++ b/usr.bin/ssh/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.31 2012/12/11 22:31:18 markus Exp $ */ +/* $OpenBSD: myproposal.h,v 1.32 2013/01/08 18:49:04 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -50,6 +50,7 @@ #define KEX_DEFAULT_ENCRYPT \ "aes128-ctr,aes192-ctr,aes256-ctr," \ "arcfour256,arcfour128," \ + "aes128-gcm@openssh.com,aes256-gcm@openssh.com," \ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" #define KEX_DEFAULT_MAC \ |