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

WS_PASSWORD_RETRYOUT

pull/175/head
Takashi Kojo 2019-06-29 12:11:51 +09:00
parent 650bdf40b4
commit 153fa4798b
4 changed files with 11 additions and 10 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 {
ret = (authType == WOLFSSH_USERAUTH_PASSWORD ?
(--passwdRetry > 0 ?
WOLFSSH_USERAUTH_INVALID_PASSWORD : WOLFSSH_USERAUTH_PASSWORD_RETRYOUT)
WOLFSSH_USERAUTH_INVALID_PASSWORD : WS_PASSWORD_RETRYOUT)
: WOLFSSH_USERAUTH_INVALID_PUBLICKEY);
if (passwdRetry == 0)passwdRetry = MAX_PASSWD_RETRY;
return ret;

15
src/internal.c
View File

@ -272,6 +272,9 @@ 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";
}
@ -3221,17 +3224,15 @@ static int DoUserAuthRequestPassword(WOLFSSH* ssh, WS_UserAuthData* authData,
ssh->clientState = CLIENT_USERAUTH_DONE;
ret = WS_SUCCESS;
}
else if (ret == WOLFSSH_USERAUTH_INVALID_PASSWORD) {
WLOG(WS_LOG_DEBUG, "DUARPW: password check failed");
else if (ret == WS_PASSWORD_RETRYOUT) {
WLOG(WS_LOG_DEBUG, "DUARPW: password retry out");
ret = SendUserAuthFailure(ssh, 0);
if (ret == WS_SUCCESS)
ret = WS_PASSWORD_RETRYOUT;
}
else {
WLOG(WS_LOG_DEBUG, "DUARPW: password check failed");
WLOG(WS_LOG_DEBUG, "DUARPW: password check failed, retry");
ret = SendUserAuthFailure(ssh, 0);
if(ret == WS_SUCCESS){
WLOG(WS_LOG_DEBUG, "DUARPW: WS_INVALID_USERNAME");
ret = WS_INVALID_USERNAME;
}
}
}
else {

3
wolfssh/error.h
View File

@ -105,8 +105,9 @@ 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 = -1067 /* Update this to indicate last error */
WS_LAST_E = -1068 /* Update this to indicate last error */
};

1
wolfssh/ssh.h
View File

@ -239,7 +239,6 @@ enum WS_UserAuthResults {
WOLFSSH_USERAUTH_INVALID_AUTHTYPE,
WOLFSSH_USERAUTH_INVALID_USER,
WOLFSSH_USERAUTH_INVALID_PASSWORD,
WOLFSSH_USERAUTH_PASSWORD_RETRYOUT,
WOLFSSH_USERAUTH_INVALID_PUBLICKEY
};