shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-04 12:20:42 +09:00
Code Issues Packages Projects Releases Wiki Activity

CVE-2023-1667:kex: Remove needless function argument

Browse Source 
The information if the session is client or server session is already part of
the session structure so this argument only duplicated information.

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-13 15:11:25 +01:00
committed by Andreas Schneider
parent 247a4a761c
commit 99760776d4
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libssh/kex.h
View File

@@ -37,7 +37,7 @@ extern "C" {
SSH_PACKET_CALLBACK(ssh_packet_kexinit);
int ssh_send_kex(ssh_session session, int server_kex);
int ssh_send_kex(ssh_session session);
void ssh_list_kex(struct ssh_kex_struct *kex);
int ssh_set_client_kex(ssh_session session);
int ssh_kex_select_methods(ssh_session session);

4
src/client.c
View File

@@ -425,7 +425,7 @@ static void ssh_client_connection_callback(ssh_session session)
if (rc != SSH_OK) {
goto error;
}
rc = ssh_send_kex(session, 0);
rc = ssh_send_kex(session);
if (rc < 0) {
goto error;
}
@@ -444,7 +444,7 @@ static void ssh_client_connection_callback(ssh_session session)
if (rc != SSH_OK) {
goto error;
}
rc = ssh_send_kex(session, 0);
rc = ssh_send_kex(session);
if (rc < 0) {
goto error;
}

6
src/kex.c
View File

@@ -870,9 +870,9 @@ int ssh_kex_select_methods (ssh_session session)
/* this function only sends the predefined set of kex methods */
int ssh_send_kex(ssh_session session, int server_kex)
int ssh_send_kex(ssh_session session)
{
struct ssh_kex_struct *kex = (server_kex ?
struct ssh_kex_struct *kex = (session->server ?
&session->next_crypto->server_kex :
&session->next_crypto->client_kex);
ssh_string str = NULL;
@@ -974,7 +974,7 @@ int ssh_send_rekex(ssh_session session)
}
session->dh_handshake_state = DH_STATE_INIT;
rc = ssh_send_kex(session, session->server);
rc = ssh_send_kex(session);
if (rc < 0) {
SSH_LOG(SSH_LOG_PACKET, "Failed to send kex");
return rc;

4
src/server.c
View File

@@ -367,7 +367,7 @@ 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) {
if (ssh_send_kex(session) < 0) {
goto error;
}
break;
@@ -380,7 +380,7 @@ static void ssh_server_connection_callback(ssh_session session)
if (server_set_kex(session) == SSH_ERROR)
goto error;
/* We are in a rekeying, so we need to send the server kex */
if (ssh_send_kex(session, 1) < 0)
if (ssh_send_kex(session) < 0)
goto error;
}
ssh_list_kex(&session->next_crypto->client_kex); // log client kex