- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / myproposal.h

diff --git a/myproposal.h b/myproposal.h
index e246e0dd9d8b3d29a81df4a7b3ee59bcfbd895fc..7bca3bcae44ae97b83296f8b8045f4de49d44763 100644 (file)
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.21 2006/03/25 22:22:43 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.23 2009/01/23 07:58:11 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -41,13 +41,14 @@
 #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,hmac-ripemd160," \
+       "hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \
        "hmac-ripemd160@openssh.com," \
        "hmac-sha1-96,hmac-md5-96"
 #define        KEX_DEFAULT_COMP        "none,zlib@openssh.com,zlib"