ports/libssh
ports/libssh
1
1
Форкнуть 0
Код Релизы 1 Активность

kex: Use a len variable for length checks in ssh_packet_kexinit()

Просмотр исходного кода 
Fixes T188

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Этот коммит содержится в:
Andreas Schneider 2019-10-31 13:58:35 +01:00
родитель 815f874964
Коммит be34ff967f
1 изменённых файлов: 9 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

17
src/kex.c
Просмотреть файл

@ -334,6 +334,7 @@ SSH_PACKET_CALLBACK(ssh_packet_kexinit)
char *strings[SSH_KEX_METHODS] = {0}; char *strings[SSH_KEX_METHODS] = {0};
char *rsa_sig_ext = NULL; char *rsa_sig_ext = NULL;
int rc = SSH_ERROR; int rc = SSH_ERROR;
size_t len;
uint8_t first_kex_packet_follows = 0; uint8_t first_kex_packet_follows = 0;
uint32_t kexinit_reserved = 0; uint32_t kexinit_reserved = 0;
@ -349,26 +350,26 @@ SSH_PACKET_CALLBACK(ssh_packet_kexinit)
} }
if (server_kex) { if (server_kex) {
rc = ssh_buffer_get_data(packet,session->next_crypto->client_kex.cookie, 16); len = ssh_buffer_get_data(packet,session->next_crypto->client_kex.cookie, 16);
if (rc != 16) { if (len != 16) {
ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: no cookie in packet"); ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: no cookie in packet");
goto error; goto error;
} }
rc = ssh_hashbufin_add_cookie(session, session->next_crypto->client_kex.cookie); len = ssh_hashbufin_add_cookie(session, session->next_crypto->client_kex.cookie);
if (rc < 0) { if (len < 0) {
ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: adding cookie failed"); ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: adding cookie failed");
goto error; goto error;
} }
} else { } else {
rc = ssh_buffer_get_data(packet,session->next_crypto->server_kex.cookie, 16); len = ssh_buffer_get_data(packet,session->next_crypto->server_kex.cookie, 16);
if (rc != 16) { if (len != 16) {
ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: no cookie in packet"); ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: no cookie in packet");
goto error; goto error;
} }
rc = ssh_hashbufin_add_cookie(session, session->next_crypto->server_kex.cookie); len = ssh_hashbufin_add_cookie(session, session->next_crypto->server_kex.cookie);
if (rc < 0) { if (len < 0) {
ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: adding cookie failed"); ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: adding cookie failed");
goto error; goto error;
} }