1 files changed, 5 insertions, 1 deletions

diff --git a/packet.c b/packet.c
index 3c1c23d3a..4bfb50726 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.268 2017/12/10 05:55:29 dtucker Exp $ */
+/* $OpenBSD: packet.c,v 1.269 2017/12/18 23:13:42 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2173,7 +2173,9 @@ kex_to_blob(struct sshbuf *m, struct kex *kex)
         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 ||
@@ -2337,7 +2339,9 @@ kex_from_blob(struct sshbuf *m, struct kex **kexp)
         }
         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 ||