From: spdfrk <spdfrk123456@gmail.com>
Date: Thu, 18 Feb 2016 19:33:51 +0000 (+0100)
Subject: Fix incomplete packet handling
X-Git-Tag: v4.2.1~1011
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2ebe106f94970a756e52b218d3ac370f9f3313b;p=thirdparty%2Ftvheadend.git

Fix incomplete packet handling

A calculation error (offset / length) was made which only was a problem for incomplete packets. Also some slight optimization was possible.
---

diff --git a/src/descrambler/libaesdec/libaesdec.c b/src/descrambler/libaesdec/libaesdec.c
index 8e754b204..1d4a5c1c8 100644
--- a/src/descrambler/libaesdec/libaesdec.c
+++ b/src/descrambler/libaesdec/libaesdec.c
@@ -59,7 +59,6 @@ void aes_decrypt_packet(void *keys, unsigned char *packet) {
   unsigned char *pkt;
   unsigned char ev_od = 0;
   int xc0, offset, n;
-  int len;
   pkt = packet;
   AES_KEY k;
 
@@ -78,15 +77,13 @@ void aes_decrypt_packet(void *keys, unsigned char *packet) {
     pkt[3] &= 0x3f;  // consider it decrypted now
     if (pkt[3] & 0x20) { // incomplete packet
       offset = 4 + pkt[4] + 1;
-      len = 188 - offset;
-      n = len >> 3;
+      n = (188 - offset) >> 4;
       if (n == 0) { // decrypted==encrypted!
         return;  // this doesn't need more processing
       }
     } else {
-        len = 184;
-	offset = 4;
-      }
+      offset = 4;
+    }
   } else {
     return;
   }
@@ -97,9 +94,7 @@ void aes_decrypt_packet(void *keys, unsigned char *packet) {
     k = ((struct aes_keys_t *) keys)->odd;
   }
 
-  // TODO room for improvement?
-  int i;
-  for (i = offset; i <= (len - 16); i += 16) {
-    AES_ecb_encrypt(pkt + i, pkt + i, &k, AES_DECRYPT);
+  for (; offset <= (188 - 16); offset += 16) {
+    AES_ecb_encrypt(pkt + offset, pkt + offset, &k, AES_DECRYPT);
   }
 }