From 4b021ae6f0b957eeab8bb6c6f20f20173c5e29f2 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Fri, 9 Feb 2018 23:40:23 +0800
Subject: [PATCH] Remove none cipher

---
 common-algo.c | 35 -----------------------------------
 session.h     |  2 --
 sysoptions.h  |  4 ----
 3 files changed, 41 deletions(-)

diff --git a/common-algo.c b/common-algo.c
index 48a92e8..e61fcaa 100644
--- a/common-algo.c
+++ b/common-algo.c
@@ -179,9 +179,6 @@ algo_type sshciphers[] = {
 	{"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 @@ out:
 	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 --git a/session.h b/session.h
index 5d9e2ab..9a78ddb 100644
--- a/session.h
+++ b/session.h
@@ -295,8 +295,6 @@ struct clientsession {
 									  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 --git a/sysoptions.h b/sysoptions.h
index 64b149e..7aa1314 100644
--- a/sysoptions.h
+++ b/sysoptions.h
@@ -243,10 +243,6 @@
 #endif
 #endif
 
-#ifndef DROPBEAR_NONE_CIPHER
-#define DROPBEAR_NONE_CIPHER 0
-#endif
-
 /* free memory before exiting */
 #define DROPBEAR_CLEANUP 1