=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.c,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- src/usr.bin/ssh/kex.c 2016/09/12 23:31:27 1.121 +++ src/usr.bin/ssh/kex.c 2016/09/19 19:02:19 1.122 @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.121 2016/09/12 23:31:27 djm Exp $ */ +/* $OpenBSD: kex.c,v 1.122 2016/09/19 19:02:19 markus Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -404,6 +404,8 @@ debug("SSH2_MSG_NEWKEYS received"); ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error); if ((r = sshpkt_get_end(ssh)) != 0) + return r; + if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0) return r; kex->done = 1; sshbuf_reset(kex->peer);