From 98c9c853dd5f67278d73f900092d26dcf75315fd Mon Sep 17 00:00:00 2001 From: John Safranek Date: Tue, 14 Jul 2020 14:25:15 -0700 Subject: [PATCH] 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. --- src/ssh.c | 4 ++-- wolfssh/internal.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ssh.c b/src/ssh.c index 08ead30..7a3540b 100644 --- a/src/ssh.c +++ b/src/ssh.c @@ -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 */ diff --git a/wolfssh/internal.h b/wolfssh/internal.h index 02da9a2..ab4bbbb 100644 --- a/wolfssh/internal.h +++ b/wolfssh/internal.h @@ -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