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

server: Reformat ssh_handle_key_exchange

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Norbert Pocs <npocs@redhat.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Jakub Jelen
2023-03-14 09:43:17 +01:00
parent 545724b7df
commit b923d25fef
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server.c
View File

@@ -525,10 +525,14 @@ void ssh_set_auth_methods(ssh_session session, int auth_methods)
} }
/* Do the banner and key exchange */ /* Do the banner and key exchange */
int ssh_handle_key_exchange(ssh_session session) { int ssh_handle_key_exchange(ssh_session session)
{
int rc; int rc;
if (session->session_state != SSH_SESSION_STATE_NONE)
if (session->session_state != SSH_SESSION_STATE_NONE) {
goto pending; goto pending;
}
rc = ssh_send_banner(session, 1); rc = ssh_send_banner(session, 1);
if (rc < 0) { if (rc < 0) {
return SSH_ERROR; return SSH_ERROR;
@@ -552,8 +556,9 @@ int ssh_handle_key_exchange(ssh_session session) {
ssh_server_kex_termination,session); ssh_server_kex_termination,session);
SSH_LOG(SSH_LOG_PACKET, "ssh_handle_key_exchange: current state : %d", SSH_LOG(SSH_LOG_PACKET, "ssh_handle_key_exchange: current state : %d",
session->session_state); session->session_state);
if (rc != SSH_OK) if (rc != SSH_OK) {
return rc; return rc;
}
if (session->session_state == SSH_SESSION_STATE_ERROR || if (session->session_state == SSH_SESSION_STATE_ERROR ||
session->session_state == SSH_SESSION_STATE_DISCONNECTED) { session->session_state == SSH_SESSION_STATE_DISCONNECTED) {
return SSH_ERROR; return SSH_ERROR;