# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1518191927 -28800
# Node ID 546d7dabdf99c439f20906f56ce21d5a67fe7e06
# Parent  3a933956437e3d77d4c9ad28525678ee4a7d3c82# Parent  38c6bcbf4f4a0c026ce7a05e6f4c6f9d69a7767d
merge

diff -r 3a933956437e -r 546d7dabdf99 cli-session.c
--- a/cli-session.c	Fri Feb 09 23:49:22 2018 +0800
+++ b/cli-session.c	Fri Feb 09 23:58:47 2018 +0800
@@ -165,13 +165,6 @@
 	cli_ses.lastprivkey = NULL;
 	cli_ses.lastauthtype = 0;
 
-#if DROPBEAR_NONE_CIPHER
-	cli_ses.cipher_none_after_auth = get_algo_usable(sshciphers, "none");
-	set_algo_usable(sshciphers, "none", 0);
-#else
-	cli_ses.cipher_none_after_auth = 0;
-#endif
-
 	/* For printing "remote host closed" for the user */
 	ses.remoteclosed = cli_remoteclosed;
 
@@ -275,14 +268,6 @@
 			}
 #endif
 
-#if DROPBEAR_NONE_CIPHER
-			if (cli_ses.cipher_none_after_auth)
-			{
-				set_algo_usable(sshciphers, "none", 1);
-				send_msg_kexinit();
-			}
-#endif
-
 			if (cli_opts.backgrounded) {
 				int devnull;
 				/* keeping stdin open steals input from the terminal and