diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2012-12-12 16:45:53 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2012-12-12 16:45:53 +0000 |
| commit | 524eb8dd0dfe508616acd02f8e9ac65dc9dbdb5e (patch) | |
| tree | c0520f7145c85c764d1d03dcbb1ff8725d975913 /usr.bin/ssh | |
| parent | 3ee3a81fdce28760e2c3a358822348cc0ddfbf94 (diff) | |
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
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/packet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index c9a6dcb8c1b..b3aa9195c88 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/packet.c @@ -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> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1266,6 +1266,7 @@ packet_read_poll2(u_int32_t *seqnr_p) logit("Bad packet length %u.", active_state->packlen); packet_disconnect("Packet corrupt"); } + buffer_clear(&active_state->incoming_packet); } else if (active_state->packlen == 0) { /* * check if input size is less than the cipher block size, |