diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2019-10-31 13:58:35 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2019-12-09 16:08:03 +0100 |
commit | be34ff967f561ce53f8588d4439ef5633a233f62 (patch) | |
tree | 9a99a2af94352599988f5c8636320c5a63fd2421 /src/kex.c | |
parent | 815f8749641b1507110f3e2463dff524f4f0ce1a (diff) | |
download | libssh-be34ff967f561ce53f8588d4439ef5633a233f62.tar.gz libssh-be34ff967f561ce53f8588d4439ef5633a233f62.tar.xz libssh-be34ff967f561ce53f8588d4439ef5633a233f62.zip |
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>
Diffstat (limited to 'src/kex.c')
-rw-r--r-- | src/kex.c | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -334,6 +334,7 @@ SSH_PACKET_CALLBACK(ssh_packet_kexinit) char *strings[SSH_KEX_METHODS] = {0}; char *rsa_sig_ext = NULL; int rc = SSH_ERROR; + size_t len; uint8_t first_kex_packet_follows = 0; uint32_t kexinit_reserved = 0; @@ -349,26 +350,26 @@ SSH_PACKET_CALLBACK(ssh_packet_kexinit) } if (server_kex) { - rc = ssh_buffer_get_data(packet,session->next_crypto->client_kex.cookie, 16); - if (rc != 16) { + len = ssh_buffer_get_data(packet,session->next_crypto->client_kex.cookie, 16); + if (len != 16) { ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: no cookie in packet"); goto error; } - rc = ssh_hashbufin_add_cookie(session, session->next_crypto->client_kex.cookie); - if (rc < 0) { + len = ssh_hashbufin_add_cookie(session, session->next_crypto->client_kex.cookie); + if (len < 0) { ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: adding cookie failed"); goto error; } } else { - rc = ssh_buffer_get_data(packet,session->next_crypto->server_kex.cookie, 16); - if (rc != 16) { + len = ssh_buffer_get_data(packet,session->next_crypto->server_kex.cookie, 16); + if (len != 16) { ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: no cookie in packet"); goto error; } - rc = ssh_hashbufin_add_cookie(session, session->next_crypto->server_kex.cookie); - if (rc < 0) { + len = ssh_hashbufin_add_cookie(session, session->next_crypto->server_kex.cookie); + if (len < 0) { ssh_set_error(session, SSH_FATAL, "ssh_packet_kexinit: adding cookie failed"); goto error; } |