summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2009-07-26 16:11:27 +0000
committerMatt Johnston <matt@ucc.asn.au>2009-07-26 16:11:27 +0000
commit61a3145d94244bc693ae02746ad1a566e87ddbab (patch)
tree96fdafb2327a2b0cdb8f86afc8d9a918e95a0abd
parent462544e04977e37ec83174b3d3e7277992c016c7 (diff)
downloaddropbear-61a3145d94244bc693ae02746ad1a566e87ddbab.tar.gz
- Payload length doesn't include macsize.
-rw-r--r--debug.h2
-rw-r--r--packet.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/debug.h b/debug.h
index b8c2a57..a9cc0bd 100644
--- a/debug.h
+++ b/debug.h
@@ -39,7 +39,7 @@
* Caution: Don't use this in an unfriendly environment (ie unfirewalled),
* since the printing may not sanitise strings etc. This will add a reasonable
* amount to your executable size. */
-/*#define DEBUG_TRACE*/
+#define DEBUG_TRACE
/* All functions writing to the cleartext payload buffer call
* CHECKCLEARTOWRITE() before writing. This is only really useful if you're
diff --git a/packet.c b/packet.c
index 37ffdd2..9621bbd 100644
--- a/packet.c
+++ b/packet.c
@@ -261,7 +261,7 @@ void decrypt_packet() {
/* payload length */
/* - 4 - 1 is for LEN and PADLEN values */
- len = ses.readbuf->len - padlen - 4 - 1;
+ len = ses.readbuf->len - padlen - 4 - 1 - macsize;
if ((len > RECV_MAX_PAYLOAD_LEN) || (len < 1)) {
dropbear_exit("bad packet size");
}