]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
cwc: fix AES key handling (broken by previous commit)
authorJaroslav Kysela <perex@perex.cz>
Thu, 25 Feb 2016 10:31:23 +0000 (11:31 +0100)
committerJaroslav Kysela <perex@perex.cz>
Thu, 25 Feb 2016 10:31:23 +0000 (11:31 +0100)
src/descrambler/cwc.c

index 303da88978c15b07c8f53c41943f072753506fbb..6cbc0cdd546785d99286d0a26d5b7f8eb2cfe1c9 100644 (file)
@@ -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,