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

Return to packet.c CVS log

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

version 1.268, 2017/12/10 05:55:29

version 1.269, 2017/12/18 23:13:42

Line 2153

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

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 ||

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

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

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

Line 2317

Line 2319

}

if ((r = sshbuf_get_string(m, &kex->session_id, &kex->session_id_len)) != 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 ||

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

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

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