lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-12 15:41:16 +03:00
Code Activity

server: Reformat ssh_server_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-14 11:25:16 +01:00
committed by Andreas Schneider
parent 1d6f2e4d9b
commit c00a3369c2
1 changed files with 112 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/server.c
View File

@@ -324,7 +324,8 @@ ssh_get_key_params(ssh_session session,
* @brief A function to be called each time a step has been done in the
* connection.
*/
static void ssh_server_connection_callback(ssh_session session){
static void ssh_server_connection_callback(ssh_session session)
{
int rc;
switch (session->session_state) {
@@ -355,7 +356,8 @@ static void ssh_server_connection_callback(ssh_session session){
ssh_packet_set_default_callbacks(session);
set_status(session, 0.5f);
session->session_state = SSH_SESSION_STATE_INITIAL_KEX;
if (ssh_send_kex(session, 1) < 0) {
rc = ssh_send_kex(session, 1);
if (rc < 0) {
goto error;
}
break;
@@ -365,18 +367,25 @@ static void ssh_server_connection_callback(ssh_session session){
case SSH_SESSION_STATE_KEXINIT_RECEIVED:
set_status(session, 0.6f);
if (session->next_crypto->server_kex.methods[0] == NULL) {
if(server_set_kex(session) == SSH_ERROR)
rc = server_set_kex(session);
if (rc == SSH_ERROR) {
goto error;
}
/* We are in a rekeying, so we need to send the server kex */
if(ssh_send_kex(session, 1) < 0)
rc = ssh_send_kex(session, 1);
if (rc < 0) {
goto error;
}
}
ssh_list_kex(&session->next_crypto->client_kex); // log client kex
if (ssh_kex_select_methods(session) < 0) {
rc = ssh_kex_select_methods(session);
if (rc < 0) {
goto error;
}
if (crypt_set_algorithms_server(session) == SSH_ERROR)
rc = crypt_set_algorithms_server(session);
if (rc == SSH_ERROR) {
goto error;
}
set_status(session, 0.8f);
session->session_state = SSH_SESSION_STATE_DH;
break;
@@ -395,15 +404,16 @@ static void ssh_server_connection_callback(ssh_session session){
*/
if (session->extensions & SSH_EXT_NEGOTIATION &&
session->session_state != SSH_SESSION_STATE_AUTHENTICATED) {
/*
* Only send an SSH_MSG_EXT_INFO message the first time the client
* undergoes NEWKEYS. It is unexpected for this message to be sent
* upon rekey, and may cause clients to log error messages.
* Only send an SSH_MSG_EXT_INFO message the first time the
* client undergoes NEWKEYS. It is unexpected for this message
* to be sent upon rekey, and may cause clients to log error
* messages.
*
* The session_state can not be used for this purpose because it is
* re-set to SSH_SESSION_STATE_KEXINIT_RECEIVED during rekey. So,
* use the connected flag which transitions from non-zero below.
* The session_state can not be used for this purpose because it
* is re-set to SSH_SESSION_STATE_KEXINIT_RECEIVED during rekey.
* So, use the connected flag which transitions from non-zero
* below.
*
* See also:
* - https://bugzilla.mindrot.org/show_bug.cgi?id=2929
@@ -426,7 +436,8 @@ static void ssh_server_connection_callback(ssh_session session){
case SSH_SESSION_STATE_ERROR:
goto error;
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;