diff options
author | Matt Johnston <matt@ucc.asn.au> | 2006-03-10 06:30:52 +0000 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2006-03-10 06:30:52 +0000 |
commit | f51d956b6ef2e4b9fe21cb2457fd324030d96945 (patch) | |
tree | a94270674f97649972076c799a6382b4b4a0e6ea /cli-auth.c | |
parent | 60ae0d366440dd449f1bc4c392cfe84b7318b191 (diff) | |
parent | d9760d08650c2d250a4a3f8e988446f5403a5727 (diff) | |
download | dropbear-f51d956b6ef2e4b9fe21cb2457fd324030d96945.tar.gz |
propagate from branch 'au.asn.ucc.matt.dropbear' (head 7ad1775ed65e75dbece27fe6b65bf1a234db386a)
to branch 'au.asn.ucc.matt.dropbear.insecure-nocrypto' (head 88ed2b94d9bfec9a4f661caf592ed01da5eb3b6a)
Diffstat (limited to 'cli-auth.c')
-rw-r--r-- | cli-auth.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -251,7 +251,10 @@ void cli_auth_try() { #endif #ifdef ENABLE_CLI_INTERACT_AUTH - if (!finished && ses.authstate.authtypes & AUTH_TYPE_INTERACT) { + 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) { if (cli_ses.auth_interact_failed) { finished = 0; } else { @@ -263,7 +266,10 @@ void cli_auth_try() { #endif #ifdef ENABLE_CLI_PASSWORD_AUTH - if (!finished && ses.authstate.authtypes & AUTH_TYPE_PASSWORD) { + 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) { cli_auth_password(); finished = 1; cli_ses.lastauthtype = AUTH_TYPE_PASSWORD; |