src/usr.bin/ssh/packet.c - diff

Return to packet.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.298, 2020/11/27 00:49:58

version 1.299, 2021/01/27 10:05:28

Line 2173

{

int r;

if ((r = sshbuf_put_string(m, kex->session_id,

if ((r = sshbuf_put_u32(m, kex->we_need)) != 0 ||

kex->session_id_len)) != 0 ||

(r = sshbuf_put_u32(m, kex->we_need)) != 0 ||

(r = sshbuf_put_cstring(m, kex->hostkey_alg)) != 0 ||

(r = sshbuf_put_u32(m, kex->hostkey_type)) != 0 ||

(r = sshbuf_put_u32(m, kex->hostkey_nid)) != 0 ||

Line 2184

Line 2182

(r = sshbuf_put_stringb(m, kex->peer)) != 0 ||

(r = sshbuf_put_stringb(m, kex->client_version)) != 0 ||

(r = sshbuf_put_stringb(m, kex->server_version)) != 0 ||

(r = sshbuf_put_stringb(m, kex->session_id)) != 0 ||

(r = sshbuf_put_u32(m, kex->flags)) != 0)

return r;

return 0;

Line 2336

Line 2335

if ((kex = kex_new()) == NULL)

return SSH_ERR_ALLOC_FAIL;

if ((r = sshbuf_get_string(m, &kex->session_id, &kex->session_id_len)) != 0 ||

if ((r = sshbuf_get_u32(m, &kex->we_need)) != 0 ||

(r = sshbuf_get_u32(m, &kex->we_need)) != 0 ||

(r = sshbuf_get_cstring(m, &kex->hostkey_alg, NULL)) != 0 ||

(r = sshbuf_get_u32(m, (u_int *)&kex->hostkey_type)) != 0 ||

(r = sshbuf_get_u32(m, (u_int *)&kex->hostkey_nid)) != 0 ||

Line 2346

Line 2344

(r = sshbuf_get_stringb(m, kex->peer)) != 0 ||

(r = sshbuf_get_stringb(m, kex->client_version)) != 0 ||

(r = sshbuf_get_stringb(m, kex->server_version)) != 0 ||

(r = sshbuf_get_stringb(m, kex->session_id)) != 0 ||

(r = sshbuf_get_u32(m, &kex->flags)) != 0)

goto out;

kex->server = 1;