# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1125423039 0
# Node ID 1c03b27e1cebea3159abce36980f755b75a3a3ed
# Parent  5e4110bb753a8e471b2f1d5c16104e5356820135
- "twofish-cbc" is an alias for "twofish256-cbc"
- increase the maximum key length constant

diff -r 5e4110bb753a -r 1c03b27e1ceb common-algo.c
--- a/common-algo.c	Tue Aug 30 16:58:57 2005 +0000
+++ b/common-algo.c	Tue Aug 30 17:30:39 2005 +0000
@@ -84,6 +84,13 @@
 /* The following map ssh names to internal values */
 
 algo_type sshciphers[] = {
+#ifdef DROPBEAR_TWOFISH256_CBC
+	{"twofish256-cbc", 0, (void*)&dropbear_twofish256, 1},
+	{"twofish-cbc", 0, (void*)&dropbear_twofish256, 1},
+#endif
+#ifdef DROPBEAR_TWOFISH128_CBC
+	{"twofish128-cbc", 0, (void*)&dropbear_twofish128, 1},
+#endif
 #ifdef DROPBEAR_AES128_CBC
 	{"aes128-cbc", 0, (void*)&dropbear_aes128, 1},
 #endif
@@ -96,12 +103,6 @@
 #ifdef DROPBEAR_BLOWFISH_CBC
 	{"blowfish-cbc", 0, (void*)&dropbear_blowfish, 1},
 #endif
-#ifdef DROPBEAR_TWOFISH256_CBC
-	{"twofish256-cbc", 0, (void*)&dropbear_twofish256, 1},
-#endif
-#ifdef DROPBEAR_TWOFISH128_CBC
-	{"twofish128-cbc", 0, (void*)&dropbear_twofish128, 1},
-#endif
 	{NULL, 0, NULL, 0}
 };
 
diff -r 5e4110bb753a -r 1c03b27e1ceb options.h
--- a/options.h	Tue Aug 30 16:58:57 2005 +0000
+++ b/options.h	Tue Aug 30 17:30:39 2005 +0000
@@ -278,7 +278,7 @@
 #define MAX_MAC_LEN SHA1_HASH_SIZE
 
 
-#define MAX_KEY_LEN 24 /* 3DES requires a 24 byte key */
+#define MAX_KEY_LEN 32 /* 256 bytes for aes256 etc */
 #define MAX_IV_LEN 20 /* must be same as max blocksize, 
 						 and >= SHA1_HASH_SIZE */
 #define MAX_MAC_KEY 20