diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | packet.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -46,6 +46,9 @@ | |||
46 | - miod@cvs.openbsd.org 2003/09/18 13:02:21 | 46 | - miod@cvs.openbsd.org 2003/09/18 13:02:21 |
47 | [authfd.c bufaux.c dh.c mac.c ssh-keygen.c] | 47 | [authfd.c bufaux.c dh.c mac.c ssh-keygen.c] |
48 | A few signedness fixes for harmless situations; markus@ ok | 48 | A few signedness fixes for harmless situations; markus@ ok |
49 | - markus@cvs.openbsd.org 2003/09/19 09:02:02 | ||
50 | [packet.c] | ||
51 | buffer_dump only if PACKET_DEBUG is defined; Jedi/Sector One; pr 3471 | ||
49 | 52 | ||
50 | 20030919 | 53 | 20030919 |
51 | - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; | 54 | - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; |
@@ -1182,4 +1185,4 @@ | |||
1182 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1185 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1183 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1186 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1184 | 1187 | ||
1185 | $Id: ChangeLog,v 1.3028 2003/09/22 11:05:50 dtucker Exp $ | 1188 | $Id: ChangeLog,v 1.3029 2003/09/22 11:06:46 dtucker Exp $ |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.109 2003/07/10 14:42:28 markus Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.110 2003/09/19 09:02:02 markus Exp $"); |
41 | 41 | ||
42 | #include "openbsd-compat/sys-queue.h" | 42 | #include "openbsd-compat/sys-queue.h" |
43 | 43 | ||
@@ -1020,7 +1020,9 @@ packet_read_poll2(u_int32_t *seqnr_p) | |||
1020 | cp = buffer_ptr(&incoming_packet); | 1020 | cp = buffer_ptr(&incoming_packet); |
1021 | packet_length = GET_32BIT(cp); | 1021 | packet_length = GET_32BIT(cp); |
1022 | if (packet_length < 1 + 4 || packet_length > 256 * 1024) { | 1022 | if (packet_length < 1 + 4 || packet_length > 256 * 1024) { |
1023 | #ifdef PACKET_DEBUG | ||
1023 | buffer_dump(&incoming_packet); | 1024 | buffer_dump(&incoming_packet); |
1025 | #endif | ||
1024 | packet_disconnect("Bad packet length %u.", packet_length); | 1026 | packet_disconnect("Bad packet length %u.", packet_length); |
1025 | } | 1027 | } |
1026 | DBG(debug("input: packet len %u", packet_length+4)); | 1028 | DBG(debug("input: packet len %u", packet_length+4)); |