From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 12 Jun 2017 16:17:06 +0000 (+0200)
Subject: descrambler: more AES / AES128 fixes
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c4cdc98e09d17c3bd4991811f958fb3bbbbe4a4;p=thirdparty%2Ftvheadend.git

descrambler: more AES / AES128 fixes
---

diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index a569f1dd4..67d076ff6 100644
--- a/src/descrambler/capmt.c
+++ b/src/descrambler/capmt.c
@@ -145,7 +145,7 @@ typedef struct ca_info {
   enum {
     CA_ALGO_DVBCSA,
     CA_ALGO_DES,
-    CA_ALGO_AES128,
+    CA_ALGO_AES,
   } algo;
   enum {
     CA_MODE_ECB,
@@ -1153,7 +1153,7 @@ capmt_send_key(capmt_t *capmt)
   case CA_ALGO_DES:
     type = DESCRAMBLER_DES_NCB;
     break;
-  case CA_ALGO_AES128:
+  case CA_ALGO_AES:
     if (cai->cipher_mode == CA_MODE_ECB) {
       type = DESCRAMBLER_AES_ECB;
     } else {
@@ -1358,9 +1358,9 @@ capmt_analyze_cmd(capmt_t *capmt, uint32_t cmd, int adapter, sbuf_t *sb, int off
       return;
     cai = &capmt->capmt_adapters[adapter].ca_info[index];
     if (parity == 0) {
-      capmt_process_key(capmt, adapter, cai, DESCRAMBLER_AES_ECB, cw, NULL, 1);
+      capmt_process_key(capmt, adapter, cai, DESCRAMBLER_AES128_ECB, cw, NULL, 1);
     } else if (parity == 1) {
-      capmt_process_key(capmt, adapter, cai, DESCRAMBLER_AES_ECB, NULL, cw, 1);
+      capmt_process_key(capmt, adapter, cai, DESCRAMBLER_AES128_ECB, NULL, cw, 1);
     } else
       tvherror(LS_CAPMT, "%s: Invalid parity %d in CA_SET_DESCR_AES for adapter%d", capmt_name(capmt), parity, adapter);
 
diff --git a/src/descrambler/cccam.c b/src/descrambler/cccam.c
index af9da373b..410deae83 100644
--- a/src/descrambler/cccam.c
+++ b/src/descrambler/cccam.c
@@ -701,7 +701,7 @@ forbid:
     es3 = *es;
     pthread_mutex_unlock(&cccam->cccam_mutex);
     descrambler_keys((th_descrambler_t *)ct,
-                     off == 16 ? DESCRAMBLER_AES_ECB : DESCRAMBLER_CSA_CBC,
+                     off == 16 ? DESCRAMBLER_AES128_ECB : DESCRAMBLER_CSA_CBC,
                      0, dcw, dcw + off);
     snprintf(chaninfo, sizeof(chaninfo), "%s:%i", cccam->cccam_hostname, cccam->cccam_port);
     descrambler_notify((th_descrambler_t *)ct,
diff --git a/src/descrambler/cwc.c b/src/descrambler/cwc.c
index 731e1dcdc..2a245564f 100644
--- a/src/descrambler/cwc.c
+++ b/src/descrambler/cwc.c
@@ -849,7 +849,7 @@ forbid:
     es3 = *es;
     pthread_mutex_unlock(&cwc->cwc_mutex);
     descrambler_keys((th_descrambler_t *)ct,
-                     off == 16 ? DESCRAMBLER_AES_ECB : DESCRAMBLER_CSA_CBC,
+                     off == 16 ? DESCRAMBLER_AES128_ECB : DESCRAMBLER_CSA_CBC,
                      0, msg + 3, msg + 3 + off);
     snprintf(chaninfo, sizeof(chaninfo), "%s:%i", cwc->cwc_hostname, cwc->cwc_port);
     descrambler_notify((th_descrambler_t *)ct,
diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index 3d60e4256..05492bf7d 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -677,9 +677,10 @@ descrambler_keys ( th_descrambler_t *td, int type, uint16_t pid,
   else
     snprintf(pidname, sizeof(pidname), "[%d]", pid);
   switch(type) {
-  case DESCRAMBLER_CSA_CBC: ktype = "CSA"; break;
-  case DESCRAMBLER_DES_NCB: ktype = "DES"; break;
-  case DESCRAMBLER_AES_ECB: ktype = "AES EBC"; break;
+  case DESCRAMBLER_CSA_CBC:    ktype = "CSA"; break;
+  case DESCRAMBLER_DES_NCB:    ktype = "DES"; break;
+  case DESCRAMBLER_AES_ECB:    ktype = "AES EBC"; break;
+  case DESCRAMBLER_AES128_ECB: ktype = "AES128 EBC"; break;
   default: abort();
   }