When removing an accept state, didn't take the state ID out

or skip it. Handshake would then stall with non-blocking
sockets. Cleaned up the state issue.
pull/269/head
John Safranek 2020-07-14 14:25:15 -07:00
parent 1250e1f9d8
commit 98c9c853dd
No known key found for this signature in database
GPG Key ID: 8CE817DE0D3CCB4A
2 changed files with 2 additions and 3 deletions

View File

@ -514,8 +514,8 @@ int wolfSSH_accept(WOLFSSH* ssh)
return WS_FATAL_ERROR;
}
}
ssh->acceptState = ACCEPT_CLIENT_CHANNEL_REQUEST_DONE;
WLOG(WS_LOG_DEBUG, acceptState, "CLIENT_CHANNEL_REQUEST_DONE");
ssh->acceptState = ACCEPT_SERVER_CHANNEL_ACCEPT_SENT;
WLOG(WS_LOG_DEBUG, acceptState, "SERVER_CHANNEL_ACCEPT_SENT");
FALL_THROUGH;
/* no break */

View File

@ -602,7 +602,6 @@ enum AcceptStates {
ACCEPT_SERVER_USERAUTH_ACCEPT_SENT,
ACCEPT_CLIENT_USERAUTH_DONE,
ACCEPT_SERVER_USERAUTH_SENT,
ACCEPT_CLIENT_CHANNEL_REQUEST_DONE,
ACCEPT_SERVER_CHANNEL_ACCEPT_SENT,
ACCEPT_CLIENT_SESSION_ESTABLISHED,
#ifdef WOLFSSH_SCP