From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 25 Feb 2016 10:31:23 +0000 (+0100)
Subject: cwc: fix AES key handling (broken by previous commit)
X-Git-Tag: v4.2.1~979
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eeabcd33da315c325b51a78f34a334fb5619aff4;p=thirdparty%2Ftvheadend.git

cwc: fix AES key handling (broken by previous commit)
---

diff --git a/src/descrambler/cwc.c b/src/descrambler/cwc.c
index 303da8897..6cbc0cdd5 100644
--- a/src/descrambler/cwc.c
+++ b/src/descrambler/cwc.c
@@ -846,7 +846,9 @@ forbid:
 
     es3 = *es;
     pthread_mutex_unlock(&cwc->cwc_mutex);
-    descrambler_keys((th_descrambler_t *)ct, DESCRAMBLER_DES, msg + 3, msg + 3 + off);
+    descrambler_keys((th_descrambler_t *)ct,
+                     off == 16 ? DESCRAMBLER_AES : DESCRAMBLER_DES,
+                     msg + 3, msg + 3 + off);
     snprintf(chaninfo, sizeof(chaninfo), "%s:%i", cwc->cwc_hostname, cwc->cwc_port);
     descrambler_notify((th_descrambler_t *)ct,
                        es3.es_caid, es3.es_provid,