WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

WOLFSSH_USERAUTH_REJECTED

pull/175/head
Takashi Kojo 2019-06-29 12:37:34 +09:00
parent 153fa4798b
commit 58a768df29
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/echoserver/echoserver.c
View File

@ -742,7 +742,7 @@ static int wsUserAuth(byte authType,
else { else {
ret = (authType == WOLFSSH_USERAUTH_PASSWORD ? ret = (authType == WOLFSSH_USERAUTH_PASSWORD ?
(--passwdRetry > 0 ? (--passwdRetry > 0 ?
WOLFSSH_USERAUTH_INVALID_PASSWORD : WS_PASSWORD_RETRYOUT) WOLFSSH_USERAUTH_INVALID_PASSWORD : WOLFSSH_USERAUTH_REJECTED)
: WOLFSSH_USERAUTH_INVALID_PUBLICKEY); : WOLFSSH_USERAUTH_INVALID_PUBLICKEY);
if (passwdRetry == 0)passwdRetry = MAX_PASSWD_RETRY; if (passwdRetry == 0)passwdRetry = MAX_PASSWD_RETRY;
return ret; return ret;

9
src/internal.c
View File

@ -272,9 +272,6 @@ const char* GetErrorString(int err)
case WS_EXTDATA: case WS_EXTDATA:
return "Extended Data available to be read"; return "Extended Data available to be read";
case WS_PASSWORD_RETRYOUT:
return "Password retry out";
default: default:
return "Unknown error code"; return "Unknown error code";
} }
@ -3224,11 +3221,11 @@ static int DoUserAuthRequestPassword(WOLFSSH* ssh, WS_UserAuthData* authData,
ssh->clientState = CLIENT_USERAUTH_DONE; ssh->clientState = CLIENT_USERAUTH_DONE;
ret = WS_SUCCESS; ret = WS_SUCCESS;
} }
else if (ret == WS_PASSWORD_RETRYOUT) { else if (ret == WOLFSSH_USERAUTH_REJECTED) {
WLOG(WS_LOG_DEBUG, "DUARPW: password retry out"); WLOG(WS_LOG_DEBUG, "DUARPW: password rejected");
ret = SendUserAuthFailure(ssh, 0); ret = SendUserAuthFailure(ssh, 0);
if (ret == WS_SUCCESS) if (ret == WS_SUCCESS)
ret = WS_PASSWORD_RETRYOUT; ret = WS_FATAL_ERROR;
} }
else { else {
WLOG(WS_LOG_DEBUG, "DUARPW: password check failed, retry"); WLOG(WS_LOG_DEBUG, "DUARPW: password check failed, retry");

3
wolfssh/error.h
View File

@ -105,9 +105,8 @@ enum WS_ErrorCodes {
WS_CLOSE_FILE_E = -1065, /* Unable to close local file */ WS_CLOSE_FILE_E = -1065, /* Unable to close local file */
WS_PUBKEY_REJECTED_E = -1066, /* Server public key rejected */ WS_PUBKEY_REJECTED_E = -1066, /* Server public key rejected */
WS_EXTDATA = -1067, /* Extended Data available to be read */ 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 */
}; };

6
wolfssh/ssh.h
View File

@ -232,17 +232,17 @@ enum WS_UserAuthTypes {
WOLFSSH_USERAUTH_PUBLICKEY WOLFSSH_USERAUTH_PUBLICKEY
}; };
enum WS_UserAuthResults
enum WS_UserAuthResults { {
WOLFSSH_USERAUTH_SUCCESS, WOLFSSH_USERAUTH_SUCCESS,
WOLFSSH_USERAUTH_FAILURE, WOLFSSH_USERAUTH_FAILURE,
WOLFSSH_USERAUTH_INVALID_AUTHTYPE, WOLFSSH_USERAUTH_INVALID_AUTHTYPE,
WOLFSSH_USERAUTH_INVALID_USER, WOLFSSH_USERAUTH_INVALID_USER,
WOLFSSH_USERAUTH_INVALID_PASSWORD, WOLFSSH_USERAUTH_INVALID_PASSWORD,
WOLFSSH_USERAUTH_REJECTED,
WOLFSSH_USERAUTH_INVALID_PUBLICKEY WOLFSSH_USERAUTH_INVALID_PUBLICKEY
}; };
enum WS_DisconnectReasonCodes { enum WS_DisconnectReasonCodes {
WOLFSSH_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT = 1, WOLFSSH_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT = 1,
WOLFSSH_DISCONNECT_PROTOCOL_ERROR = 2, WOLFSSH_DISCONNECT_PROTOCOL_ERROR = 2,