From: djm@openbsd.org <djm@openbsd.org>
Date: Mon, 8 May 2017 00:21:36 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_6_P1~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7461a5bc571696273252df28a1f1578968cae506;p=thirdparty%2Fopenssh-portable.git

upstream commit

I was too aggressive with the scalpel in the last commit;
unbreak sshd, spotted quickly by naddy@

Upstream-ID: fb7e75d2b2c7e6ca57dee00ca645e322dd49adbf
---

diff --git a/packet.c b/packet.c
index ec0eb0cd3..083c475a0 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.254 2017/05/07 23:12:57 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.255 2017/05/08 00:21:36 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2237,8 +2237,9 @@ ssh_packet_get_state(struct ssh *ssh, struct sshbuf *m)
 	    (r = sshbuf_put_u32(m, state->p_read.seqnr)) != 0 ||
 	    (r = sshbuf_put_u64(m, state->p_read.blocks)) != 0 ||
 	    (r = sshbuf_put_u32(m, state->p_read.packets)) != 0 ||
-	    (r = sshbuf_put_u64(m, state->p_read.bytes)) != 0)
-		return r;
+	    (r = sshbuf_put_u64(m, state->p_read.bytes)) != 0 ||
+	    (r = sshbuf_put_stringb(m, state->input)) != 0 ||
+	    (r = sshbuf_put_stringb(m, state->output)) != 0)
 
 	return 0;
 }