# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1125675225 0
# Node ID 961f6a74c5f40642da7f6986e06cff78cfa42825
# Parent  c3dbd3e1a8ce5318e59a02478ffe7b37831b86bc# Parent  ea5189f97cfde46db4a96db510bfcdb6ca26e42f
merge of 57902417ad22502b79c63fcabb7f4a8c8449e682
     and 92bb4dd3f6f212342a5c991f738b987d7a07a6b2

diff -r ea5189f97cfd -r 961f6a74c5f4 common-algo.c
--- a/common-algo.c	Fri Sep 02 15:33:09 2005 +0000
+++ b/common-algo.c	Fri Sep 02 15:33:45 2005 +0000
@@ -84,13 +84,6 @@
 /* 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
@@ -100,6 +93,13 @@
 #ifdef DROPBEAR_AES256_CBC
 	{"aes256-cbc", 0, (void*)&dropbear_aes256, 1},
 #endif
+#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_BLOWFISH_CBC
 	{"blowfish-cbc", 0, (void*)&dropbear_blowfish, 1},
 #endif