From 58a768df293740c45e53717eca349c10cc028d42 Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Sat, 29 Jun 2019 12:37:34 +0900 Subject: [PATCH] WOLFSSH_USERAUTH_REJECTED --- examples/echoserver/echoserver.c | 2 +- src/internal.c | 9 +++------ wolfssh/error.h | 3 +-- wolfssh/ssh.h | 6 +++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c index 25518aa..27969ca 100644 --- a/examples/echoserver/echoserver.c +++ b/examples/echoserver/echoserver.c @@ -742,7 +742,7 @@ static int wsUserAuth(byte authType, else { ret = (authType == WOLFSSH_USERAUTH_PASSWORD ? (--passwdRetry > 0 ? - WOLFSSH_USERAUTH_INVALID_PASSWORD : WS_PASSWORD_RETRYOUT) + WOLFSSH_USERAUTH_INVALID_PASSWORD : WOLFSSH_USERAUTH_REJECTED) : WOLFSSH_USERAUTH_INVALID_PUBLICKEY); if (passwdRetry == 0)passwdRetry = MAX_PASSWD_RETRY; return ret; diff --git a/src/internal.c b/src/internal.c index 73917f1..f29bb63 100644 --- a/src/internal.c +++ b/src/internal.c @@ -272,9 +272,6 @@ const char* GetErrorString(int err) case WS_EXTDATA: return "Extended Data available to be read"; - case WS_PASSWORD_RETRYOUT: - return "Password retry out"; - default: return "Unknown error code"; } @@ -3224,11 +3221,11 @@ static int DoUserAuthRequestPassword(WOLFSSH* ssh, WS_UserAuthData* authData, ssh->clientState = CLIENT_USERAUTH_DONE; ret = WS_SUCCESS; } - else if (ret == WS_PASSWORD_RETRYOUT) { - WLOG(WS_LOG_DEBUG, "DUARPW: password retry out"); + else if (ret == WOLFSSH_USERAUTH_REJECTED) { + WLOG(WS_LOG_DEBUG, "DUARPW: password rejected"); ret = SendUserAuthFailure(ssh, 0); if (ret == WS_SUCCESS) - ret = WS_PASSWORD_RETRYOUT; + ret = WS_FATAL_ERROR; } else { WLOG(WS_LOG_DEBUG, "DUARPW: password check failed, retry"); diff --git a/wolfssh/error.h b/wolfssh/error.h index ea46c9e..4cbd0df 100644 --- a/wolfssh/error.h +++ b/wolfssh/error.h @@ -105,9 +105,8 @@ enum WS_ErrorCodes { WS_CLOSE_FILE_E = -1065, /* Unable to close local file */ WS_PUBKEY_REJECTED_E = -1066, /* Server public key rejected */ WS_EXTDATA = -1067, /* Extended Data available to be read */ - WS_PASSWORD_RETRYOUT = -1068, /* Password retry out */ - WS_LAST_E = -1068 /* Update this to indicate last error */ + WS_LAST_E = -1067 /* Update this to indicate last error */ }; diff --git a/wolfssh/ssh.h b/wolfssh/ssh.h index fee8c17..97b482c 100644 --- a/wolfssh/ssh.h +++ b/wolfssh/ssh.h @@ -232,17 +232,17 @@ enum WS_UserAuthTypes { WOLFSSH_USERAUTH_PUBLICKEY }; - -enum WS_UserAuthResults { +enum WS_UserAuthResults +{ WOLFSSH_USERAUTH_SUCCESS, WOLFSSH_USERAUTH_FAILURE, WOLFSSH_USERAUTH_INVALID_AUTHTYPE, WOLFSSH_USERAUTH_INVALID_USER, WOLFSSH_USERAUTH_INVALID_PASSWORD, + WOLFSSH_USERAUTH_REJECTED, WOLFSSH_USERAUTH_INVALID_PUBLICKEY }; - enum WS_DisconnectReasonCodes { WOLFSSH_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT = 1, WOLFSSH_DISCONNECT_PROTOCOL_ERROR = 2,