RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2012/12/12 16:45:52 

[packet.c]
     reset incoming_packet buffer for each new packet in EtM-case, too;
     this happens if packets are parsed only parially (e.g. ignore
     messages sent when su/sudo turn off echo); noted by sthen/millert
This commit is contained in:
Damien Miller 2012-12-13 07:18:59 +11:00
parent faabeb6b36
commit 8c05da3326
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
20121213
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2012/12/12 16:45:52
[packet.c]
reset incoming_packet buffer for each new packet in EtM-case, too;
this happens if packets are parsed only parially (e.g. ignore
messages sent when su/sudo turn off echo); noted by sthen/millert
20121212 20121212
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2012/12/11 22:16:21 - markus@cvs.openbsd.org 2012/12/11 22:16:21

3
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.178 2012/12/11 22:31:18 markus Exp $ */ /* $OpenBSD: packet.c,v 1.179 2012/12/12 16:45:52 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1278,6 +1278,7 @@ packet_read_poll2(u_int32_t *seqnr_p)
logit("Bad packet length %u.", active_state->packlen); logit("Bad packet length %u.", active_state->packlen);
packet_disconnect("Packet corrupt"); packet_disconnect("Packet corrupt");
} }
buffer_clear(&active_state->incoming_packet);
} else if (active_state->packlen == 0) { } else if (active_state->packlen == 0) {
/* /*
* check if input size is less than the cipher block size, * check if input size is less than the cipher block size,