diff common-algo.c @ 360:09cb54106e89 insecure-nocrypto

explicit merge of '0501e6f661b5415eb76f3b312d183c3adfbfb712' and '2b954d406290e6a2be8eb4a262d3675ac95ac544'
author Matt Johnston <matt@ucc.asn.au>
date Mon, 02 Oct 2006 06:39:32 +0000
parents 64abb124763d
children 582cb38e4eb5
line wrap: on
line diff
--- a/common-algo.c	Sat Mar 11 14:59:34 2006 +0000
+++ b/common-algo.c	Mon Oct 02 06:39:32 2006 +0000
@@ -103,6 +103,9 @@
 #ifdef DROPBEAR_BLOWFISH_CBC
 	{"blowfish-cbc", 0, (void*)&dropbear_blowfish, 1},
 #endif
+#ifdef DROPBEAR_NONE_CIPHER
+	{"none", 0, (void*)&dropbear_nocipher, 1},
+#endif
 	{NULL, 0, NULL, 0}
 };
 
@@ -116,6 +119,9 @@
 #ifdef DROPBEAR_MD5_HMAC
 	{"hmac-md5", 0, (void*)&dropbear_md5, 1},
 #endif
+#ifdef DROPBEAR_NONE_INTEGRITY
+	{"none", 0, (void*)&dropbear_nohash, 1},
+#endif
 	{NULL, 0, NULL, 0}
 };