diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | packet.c | 3 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,11 @@ | |||
1 | 20121213 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2012/12/12 16:45:52 | ||
4 | [packet.c] | ||
5 | reset incoming_packet buffer for each new packet in EtM-case, too; | ||
6 | this happens if packets are parsed only parially (e.g. ignore | ||
7 | messages sent when su/sudo turn off echo); noted by sthen/millert | ||
8 | |||
1 | 20121212 | 9 | 20121212 |
2 | - (djm) OpenBSD CVS Sync | 10 | - (djm) OpenBSD CVS Sync |
3 | - markus@cvs.openbsd.org 2012/12/11 22:16:21 | 11 | - markus@cvs.openbsd.org 2012/12/11 22:16:21 |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.178 2012/12/11 22:31:18 markus Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.179 2012/12/12 16:45:52 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1278,6 +1278,7 @@ packet_read_poll2(u_int32_t *seqnr_p) | |||
1278 | logit("Bad packet length %u.", active_state->packlen); | 1278 | logit("Bad packet length %u.", active_state->packlen); |
1279 | packet_disconnect("Packet corrupt"); | 1279 | packet_disconnect("Packet corrupt"); |
1280 | } | 1280 | } |
1281 | buffer_clear(&active_state->incoming_packet); | ||
1281 | } else if (active_state->packlen == 0) { | 1282 | } else if (active_state->packlen == 0) { |
1282 | /* | 1283 | /* |
1283 | * check if input size is less than the cipher block size, | 1284 | * check if input size is less than the cipher block size, |