diff options
author | markus@openbsd.org <markus@openbsd.org> | 2016-09-19 19:02:19 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-09-21 11:03:55 +1000 |
commit | 28652bca29046f62c7045e933e6b931de1d16737 (patch) | |
tree | 54780f2ea3a511e4b80b9888b0fa20e71418f09e /kex.c | |
parent | 492710894acfcc2f173d14d1d45bd2e688df605d (diff) |
upstream commit
move inbound NEWKEYS handling to kex layer; otherwise
early NEWKEYS causes NULL deref; found by Robert Swiecki/honggfuzz; fixed
with & ok djm@
Upstream-ID: 9a68b882892e9f51dc7bfa9f5a423858af358b2f
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.c,v 1.121 2016/09/12 23:31:27 djm Exp $ */ | 1 | /* $OpenBSD: kex.c,v 1.122 2016/09/19 19:02:19 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -425,6 +425,8 @@ kex_input_newkeys(int type, u_int32_t seq, void *ctxt) | |||
425 | ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error); | 425 | ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error); |
426 | if ((r = sshpkt_get_end(ssh)) != 0) | 426 | if ((r = sshpkt_get_end(ssh)) != 0) |
427 | return r; | 427 | return r; |
428 | if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0) | ||
429 | return r; | ||
428 | kex->done = 1; | 430 | kex->done = 1; |
429 | sshbuf_reset(kex->peer); | 431 | sshbuf_reset(kex->peer); |
430 | /* sshbuf_reset(kex->my); */ | 432 | /* sshbuf_reset(kex->my); */ |