mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-02-09 18:04:25 +09:00
buffer: adapt kex.c to new ssh_buffer_(un)pack()
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
committed by
Andreas Schneider
parent
1f2c61d6ad
commit
cb10ad0c84
22
src/kex.c
22
src/kex.c
@@ -582,14 +582,15 @@ int ssh_send_kex(ssh_session session, int server_kex) {
|
|||||||
&session->next_crypto->client_kex);
|
&session->next_crypto->client_kex);
|
||||||
ssh_string str = NULL;
|
ssh_string str = NULL;
|
||||||
int i;
|
int i;
|
||||||
|
int rc;
|
||||||
|
|
||||||
if (buffer_add_u8(session->out_buffer, SSH2_MSG_KEXINIT) < 0) {
|
rc = ssh_buffer_pack(session->out_buffer,
|
||||||
|
"bP",
|
||||||
|
SSH2_MSG_KEXINIT,
|
||||||
|
16,
|
||||||
|
kex->cookie); /* cookie */
|
||||||
|
if (rc != SSH_OK)
|
||||||
goto error;
|
goto error;
|
||||||
}
|
|
||||||
if (ssh_buffer_add_data(session->out_buffer, kex->cookie, 16) < 0) {
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hashbufout_add_cookie(session) < 0) {
|
if (hashbufout_add_cookie(session) < 0) {
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
@@ -612,10 +613,11 @@ int ssh_send_kex(ssh_session session, int server_kex) {
|
|||||||
str = NULL;
|
str = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buffer_add_u8(session->out_buffer, 0) < 0) {
|
rc = ssh_buffer_pack(session->out_buffer,
|
||||||
goto error;
|
"bd",
|
||||||
}
|
0,
|
||||||
if (buffer_add_u32(session->out_buffer, 0) < 0) {
|
0);
|
||||||
|
if (rc != SSH_OK) {
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user