shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

client: Reformat ssh_client_connection_callback

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Norbert Pocs <npocs@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jakub Jelen
2023-03-16 11:37:07 +01:00
committed by Andreas Schneider
parent a29d28d1f6
commit 82850b6ed1
1 changed files with 71 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/client.c
View File

@@ -391,7 +391,7 @@ static void ssh_client_connection_callback(ssh_session session)
{ {
int rc; int rc;
switch(session->session_state) { switch (session->session_state) {
case SSH_SESSION_STATE_NONE: case SSH_SESSION_STATE_NONE:
case SSH_SESSION_STATE_CONNECTING: case SSH_SESSION_STATE_CONNECTING:
break; break;
@@ -405,8 +405,7 @@ static void ssh_client_connection_callback(ssh_session session)
goto error; goto error;
} }
set_status(session, 0.4f); set_status(session, 0.4f);
SSH_LOG(SSH_LOG_DEBUG, SSH_LOG(SSH_LOG_DEBUG, "SSH server banner: %s", session->serverbanner);
"SSH server banner: %s", session->serverbanner);
/* Here we analyze the different protocols the server allows. */ /* Here we analyze the different protocols the server allows. */
rc = ssh_analyze_banner(session, 0); rc = ssh_analyze_banner(session, 0);
@@ -436,10 +435,10 @@ static void ssh_client_connection_callback(ssh_session session)
/* TODO: This state should disappear in favor of get_key handle */ /* TODO: This state should disappear in favor of get_key handle */
break; break;
case SSH_SESSION_STATE_KEXINIT_RECEIVED: case SSH_SESSION_STATE_KEXINIT_RECEIVED:
set_status(session,0.6f); set_status(session, 0.6f);
ssh_list_kex(&session->next_crypto->server_kex); ssh_list_kex(&session->next_crypto->server_kex);
if (session->next_crypto->client_kex.methods[0] == NULL) { if (session->next_crypto->client_kex.methods[0] == NULL) {
/* in rekeying state if next_crypto client_kex is empty */ /* in rekeying state if next_crypto client_kex might be empty */
rc = ssh_set_client_kex(session); rc = ssh_set_client_kex(session);
if (rc != SSH_OK) { if (rc != SSH_OK) {
goto error; goto error;
@@ -451,20 +450,21 @@ static void ssh_client_connection_callback(ssh_session session)
} }
if (ssh_kex_select_methods(session) == SSH_ERROR) if (ssh_kex_select_methods(session) == SSH_ERROR)
goto error; goto error;
set_status(session,0.8f); set_status(session, 0.8f);
session->session_state=SSH_SESSION_STATE_DH; session->session_state = SSH_SESSION_STATE_DH;
if (dh_handshake(session) == SSH_ERROR) { if (dh_handshake(session) == SSH_ERROR) {
goto error; goto error;
} }
FALL_THROUGH; FALL_THROUGH;
case SSH_SESSION_STATE_DH: case SSH_SESSION_STATE_DH:
if(session->dh_handshake_state==DH_STATE_FINISHED){ if (session->dh_handshake_state == DH_STATE_FINISHED) {
set_status(session,1.0f); set_status(session, 1.0f);
session->connected = 1; session->connected = 1;
if (session->flags & SSH_SESSION_FLAG_AUTHENTICATED) if (session->flags & SSH_SESSION_FLAG_AUTHENTICATED) {
session->session_state = SSH_SESSION_STATE_AUTHENTICATED; session->session_state = SSH_SESSION_STATE_AUTHENTICATED;
else } else {
session->session_state=SSH_SESSION_STATE_AUTHENTICATING; session->session_state = SSH_SESSION_STATE_AUTHENTICATING;
}
} }
break; break;
case SSH_SESSION_STATE_AUTHENTICATING: case SSH_SESSION_STATE_AUTHENTICATING:
@@ -472,14 +472,15 @@ static void ssh_client_connection_callback(ssh_session session)
case SSH_SESSION_STATE_ERROR: case SSH_SESSION_STATE_ERROR:
goto error; goto error;
default: default:
ssh_set_error(session,SSH_FATAL,"Invalid state %d",session->session_state); ssh_set_error(session, SSH_FATAL, "Invalid state %d",
session->session_state);
} }
return; return;
error: error:
ssh_socket_close(session->socket); ssh_socket_close(session->socket);
session->alive = 0; session->alive = 0;
session->session_state=SSH_SESSION_STATE_ERROR; session->session_state = SSH_SESSION_STATE_ERROR;
SSH_LOG(SSH_LOG_WARN, "%s", ssh_get_error(session)); SSH_LOG(SSH_LOG_WARN, "%s", ssh_get_error(session));
} }