tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix session id mismatch (#505)

This commit is contained in:
bagajjal 2021-05-03 12:31:24 -07:00 committed by GitHub
parent 349e834a04
commit 507b4e52be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
monitor.c
View File

@ -1701,9 +1701,7 @@ monitor_send_keystate(struct monitor *pmonitor) {
if ((m = sshbuf_new()) == NULL) if ((m = sshbuf_new()) == NULL)
fatal("%s: sshbuf_new failed", __func__); fatal("%s: sshbuf_new failed", __func__);
if ((r = sshbuf_put_u32(m, session_id2_len)) != 0) if ((r = sshbuf_put_string(m, session_id2, session_id2_len)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r));
if ((r = sshbuf_put_cstring(m, session_id2)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r)); fatal("%s: buffer error: %s", __func__, ssh_err(r));
if ((r = sshbuf_put_stringb(m, child_state)) != 0) if ((r = sshbuf_put_stringb(m, child_state)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r)); fatal("%s: buffer error: %s", __func__, ssh_err(r));
@ -1732,9 +1730,7 @@ monitor_recv_keystate(struct monitor*pmonitor) {
if (ver != 0) if (ver != 0)
fatal("%s: rexec version mismatch", __func__); fatal("%s: rexec version mismatch", __func__);
if ((r = sshbuf_get_u32(m, &session_id2_len)) != 0) if ((r = sshbuf_get_string(m, &session_id2, &session_id2_len)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r));
if ((r = sshbuf_get_cstring(m, &session_id2, NULL)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r)); fatal("%s: buffer error: %s", __func__, ssh_err(r));
if ((r = sshbuf_get_string_direct(m, &cp, &len)) != 0) if ((r = sshbuf_get_string_direct(m, &cp, &len)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r)); fatal("%s: buffer error: %s", __func__, ssh_err(r));
@ -1818,7 +1814,7 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor)
} }
if (memcmp(sshbuf_ptr(ssh->kex->session_id), session_id2, if (memcmp(sshbuf_ptr(ssh->kex->session_id), session_id2,
strlen(sshbuf_ptr(ssh->kex->session_id))) != 0) session_id2_len) != 0)
fatal_f("session ID mismatch"); fatal_f("session ID mismatch");
/* XXX set callbacks */ /* XXX set callbacks */