summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--packet.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b2de4ee6..7120cceec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - itojun@cvs.openbsd.org 2002/10/16 14:31:48 3 - itojun@cvs.openbsd.org 2002/10/16 14:31:48
4 [sftp-common.c] 4 [sftp-common.c]
5 64bit pedant. %llu is "unsigned long long". markus ok 5 64bit pedant. %llu is "unsigned long long". markus ok
6 - markus@cvs.openbsd.org 2002/10/23 10:32:13
7 [packet.c]
8 use %u for u_int
6 9
720021021 1020021021
8 - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from 11 - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from
@@ -780,4 +783,4 @@
780 save auth method before monitor_reset_key_state(); bugzilla bug #284; 783 save auth method before monitor_reset_key_state(); bugzilla bug #284;
781 ok provos@ 784 ok provos@
782 785
783$Id: ChangeLog,v 1.2500 2002/11/09 15:40:34 mouring Exp $ 786$Id: ChangeLog,v 1.2501 2002/11/09 15:41:39 mouring Exp $
diff --git a/packet.c b/packet.c
index bd347ef0f..5078630e7 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
37 */ 37 */
38 38
39#include "includes.h" 39#include "includes.h"
40RCSID("$OpenBSD: packet.c,v 1.97 2002/07/04 08:12:15 deraadt Exp $"); 40RCSID("$OpenBSD: packet.c,v 1.98 2002/10/23 10:32:13 markus Exp $");
41 41
42#include "xmalloc.h" 42#include "xmalloc.h"
43#include "buffer.h" 43#include "buffer.h"
@@ -840,7 +840,7 @@ packet_read_poll1(void)
840 cp = buffer_ptr(&input); 840 cp = buffer_ptr(&input);
841 len = GET_32BIT(cp); 841 len = GET_32BIT(cp);
842 if (len < 1 + 2 + 2 || len > 256 * 1024) 842 if (len < 1 + 2 + 2 || len > 256 * 1024)
843 packet_disconnect("Bad packet length %d.", len); 843 packet_disconnect("Bad packet length %u.", len);
844 padded_len = (len + 8) & ~7; 844 padded_len = (len + 8) & ~7;
845 845
846 /* Check if the packet has been entirely received. */ 846 /* Check if the packet has been entirely received. */
@@ -936,9 +936,9 @@ packet_read_poll2(u_int32_t *seqnr_p)
936 packet_length = GET_32BIT(cp); 936 packet_length = GET_32BIT(cp);
937 if (packet_length < 1 + 4 || packet_length > 256 * 1024) { 937 if (packet_length < 1 + 4 || packet_length > 256 * 1024) {
938 buffer_dump(&incoming_packet); 938 buffer_dump(&incoming_packet);
939 packet_disconnect("Bad packet length %d.", packet_length); 939 packet_disconnect("Bad packet length %u.", packet_length);
940 } 940 }
941 DBG(debug("input: packet len %d", packet_length+4)); 941 DBG(debug("input: packet len %u", packet_length+4));
942 buffer_consume(&input, block_size); 942 buffer_consume(&input, block_size);
943 } 943 }
944 /* we have a partial packet of block_size bytes */ 944 /* we have a partial packet of block_size bytes */