summaryrefslogtreecommitdiffstats
path: root/myproposal.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2009-01-28 16:33:31 +1100
committerDamien Miller <djm@mindrot.org>2009-01-28 16:33:31 +1100
commit67081b5148f73c9af21e933b460f5bc1affb5661 (patch)
tree736112ce3aaad8a26b71e0f83e6d43b3e6582093 /myproposal.h
parente37dde06a6a1ce6c2d2ce853d9834b715af82d47 (diff)
- djm@cvs.openbsd.org 2009/01/23 07:58:11
[myproposal.h] prefer CTR modes and revised arcfour (i.e w/ discard) modes to CBC modes; ok markus@
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/myproposal.h b/myproposal.h
index 87a9e582..7bca3bca 100644
--- a/myproposal.h
+++ b/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.
@@ -41,11 +41,12 @@
#endif
#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," \