From 7b2c42aa75488a0dc4c720a1f3cdabfeef76ec91 Mon Sep 17 00:00:00 2001
From: Fedor Brunner <fedor.brunner@azet.sk>
Date: Fri, 23 Jan 2015 22:21:06 +0800
Subject: [PATCH] Integrity error (bad packet size %u) negative length
When corrupted packet is received negative length of packet is
displayed.
(re-apply of pull request #8)
---
packet.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/packet.c b/packet.c
index add32032..89b1bcfd 100644
--- a/packet.c
+++ b/packet.c
@@ -283,14 +283,14 @@ static int read_packet_init() {
}
len = buf_getint(ses.readbuf) + 4 + macsize;
- TRACE2(("packet size is %d, block %d mac %d", len, blocksize, macsize))
+ TRACE2(("packet size is %u, block %u mac %u", len, blocksize, macsize))
/* check packet length */
if ((len > RECV_MAX_PACKET_LEN) ||
(len < MIN_PACKET_LEN + macsize) ||
((len - macsize) % blocksize != 0)) {
- dropbear_exit("Integrity error (bad packet size %d)", len);
+ dropbear_exit("Integrity error (bad packet size %u)", len);
}
if (len > ses.readbuf->size) {
@@ -342,7 +342,7 @@ void decrypt_packet() {
/* - 4 - 1 is for LEN and PADLEN values */
len = ses.readbuf->len - padlen - 4 - 1 - macsize;
if ((len > RECV_MAX_PAYLOAD_LEN+ZLIB_COMPRESS_EXPANSION) || (len < 1)) {
- dropbear_exit("Bad packet size %d", len);
+ dropbear_exit("Bad packet size %u", len);
}
buf_setpos(ses.readbuf, PACKET_PAYLOAD_OFF);
--
GitLab