mirror of
https://git.libssh.org/projects/libssh.git
synced 2025-12-11 03:42:35 +03:00
server: Reformat ssh_handle_key_exchange
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:
committed by
Andreas Schneider
parent
1f3143b18c
commit
b0ce6935fc
11
src/server.c
11
src/server.c
@@ -538,10 +538,14 @@ int ssh_send_issue_banner(ssh_session session, const ssh_string banner)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* 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;
|
||||||
@@ -565,8 +569,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;
|
||||||
|
|||||||
Reference in New Issue
Block a user