X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/b2552997dd6cfa68abbd01b0fb0b29602f08ce53..5486a45797557bd2ffca421ca5e7ad2441f4db59:/myproposal.h

diff --git a/myproposal.h b/myproposal.h
index 03f76839..8b431d9d 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: myproposal.h,v 1.11 2001/02/11 12:59:24 markus Exp $	*/
+/*	$OpenBSD: myproposal.h,v 1.15 2003/05/17 04:27:52 markus Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -26,12 +26,11 @@
 #define KEX_DEFAULT_KEX		"diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1"
 #define	KEX_DEFAULT_PK_ALG	"ssh-rsa,ssh-dss"
 #define	KEX_DEFAULT_ENCRYPT \
-	"3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
-	"aes128-cbc,aes192-cbc,aes256-cbc," \
-	"rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \
-	"rijndael-cbc@lysator.liu.se"
+	"aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
+	"aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \
+	"aes128-ctr,aes192-ctr,aes256-ctr"
 #define	KEX_DEFAULT_MAC \
-	"hmac-sha1,hmac-md5,hmac-ripemd160," \
+	"hmac-md5,hmac-sha1,hmac-ripemd160," \
 	"hmac-ripemd160@openssh.com," \
 	"hmac-sha1-96,hmac-md5-96"
 #define	KEX_DEFAULT_COMP	"none,zlib"