--- a/cli-auth.c	Thu May 17 08:09:19 2012 +0800
+++ b/cli-auth.c	Thu May 17 08:33:11 2012 +0800
@@ -257,10 +257,13 @@
 #endif
 
 #ifdef ENABLE_CLI_INTERACT_AUTH
+#if defined(DROPBEAR_NONE_CIPHER) && !defined(ALLOW_NONE_PASSWORD_AUTH)
 	if (ses.keys->trans.algo_crypt->cipherdesc == NULL) {
 		fprintf(stderr, "Sorry, I won't let you use interactive auth unencrypted.\n");
 	}
-	else if (!finished && ses.authstate.authtypes & AUTH_TYPE_INTERACT) {
+	else 
+#endif
+	if (!finished && ses.authstate.authtypes & AUTH_TYPE_INTERACT) {
 		if (cli_ses.auth_interact_failed) {
 			finished = 0;
 		} else {
@@ -272,10 +275,13 @@
 #endif
 
 #ifdef ENABLE_CLI_PASSWORD_AUTH
+#if defined(DROPBEAR_NONE_CIPHER) && !defined(ALLOW_NONE_PASSWORD_AUTH)
 	if (ses.keys->trans.algo_crypt->cipherdesc == NULL) {
 		fprintf(stderr, "Sorry, I won't let you use password auth unencrypted.\n");
 	}
-	else if (!finished && ses.authstate.authtypes & AUTH_TYPE_PASSWORD) {
+	else 
+#endif
+	if (!finished && ses.authstate.authtypes & AUTH_TYPE_PASSWORD) {
 		cli_auth_password();
 		finished = 1;
 		cli_ses.lastauthtype = AUTH_TYPE_PASSWORD;