# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1518190823 -28800
# Node ID 533e070b31266f3f727913e3c1ab659e46ce65f3
# Parent  8305ebe45940372f7e604eb18a11cb4c59119be3
Remove none cipher

diff -r 8305ebe45940 -r 533e070b3126 common-algo.c
--- a/common-algo.c	Fri Feb 09 23:35:07 2018 +0800
+++ b/common-algo.c	Fri Feb 09 23:40:23 2018 +0800
@@ -179,9 +179,6 @@
 	{"blowfish-cbc", 0, &dropbear_blowfish, 1, &dropbear_mode_cbc},
 #endif
 #endif /* DROPBEAR_ENABLE_CBC_MODE */
-#if DROPBEAR_NONE_CIPHER
-	{"none", 0, (void*)&dropbear_nocipher, 1, &dropbear_mode_none},
-#endif
 	{NULL, 0, NULL, 0, NULL}
 };
 
@@ -466,38 +463,6 @@
 	return ret;
 }
 
-#if DROPBEAR_NONE_CIPHER
-
-void
-set_algo_usable(algo_type algos[], const char * algo_name, int usable)
-{
-	algo_type *a;
-	for (a = algos; a->name != NULL; a++)
-	{
-		if (strcmp(a->name, algo_name) == 0)
-		{
-			a->usable = usable;
-			return;
-		}
-	}
-}
-
-int
-get_algo_usable(algo_type algos[], const char * algo_name)
-{
-	algo_type *a;
-	for (a = algos; a->name != NULL; a++)
-	{
-		if (strcmp(a->name, algo_name) == 0)
-		{
-			return a->usable;
-		}
-	}
-	return 0;
-}
-
-#endif /* DROPBEAR_NONE_CIPHER */
-
 #if DROPBEAR_USER_ALGO_LIST
 
 char *
diff -r 8305ebe45940 -r 533e070b3126 session.h
--- a/session.h	Fri Feb 09 23:35:07 2018 +0800
+++ b/session.h	Fri Feb 09 23:40:23 2018 +0800
@@ -295,8 +295,6 @@
 									  info request from the server for
 									  interactive auth.*/
 #endif
-	int cipher_none_after_auth; /* Set to 1 if the user requested "none"
-								   auth */
 	sign_key *lastprivkey;
 
 	int retval; /* What the command exit status was - we emulate it */
diff -r 8305ebe45940 -r 533e070b3126 sysoptions.h
--- a/sysoptions.h	Fri Feb 09 23:35:07 2018 +0800
+++ b/sysoptions.h	Fri Feb 09 23:40:23 2018 +0800
@@ -243,10 +243,6 @@
 #endif
 #endif
 
-#ifndef DROPBEAR_NONE_CIPHER
-#define DROPBEAR_NONE_CIPHER 0
-#endif
-
 /* free memory before exiting */
 #define DROPBEAR_CLEANUP 1