stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

capmt: allow single key updates again

Browse source
This commit is contained in:
Jaroslav Kysela 2014-06-12 17:01:27 +02:00
parent 65360e3cb6
commit 6574564d9d
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/descrambler/capmt.c
View file

@ -991,7 +991,6 @@ capmt_analyze_cmd(capmt_t *capmt, int adapter, sbuf_t *sb, int offset)
int32_t parity = sbuf_peek_s32(sb, offset + 8);
uint8_t *cw = sbuf_peek (sb, offset + 12);
ca_info_t *cai;
static uint8_t empty[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
tvhlog(LOG_DEBUG, "capmt", "CA_SET_DESCR adapter %d par %d idx %d %02x%02x%02x%02x%02x%02x%02x%02x", adapter, parity, index, cw[0], cw[1], cw[2], cw[3], cw[4], cw[5], cw[6], cw[7]);
if (index == -1) // skipping removal request
@ -1001,12 +1000,10 @@ capmt_analyze_cmd(capmt_t *capmt, int adapter, sbuf_t *sb, int offset)
cai = &capmt->capmt_adapters[adapter].ca_info[index];
if (parity == 0) {
memcpy(cai->even, cw, 8); // even key
if (memcmp(empty, cai->odd, 8))
capmt_process_key(capmt, adapter, cai->pid, cai->even, cai->odd, 1);
capmt_process_key(capmt, adapter, cai->pid, cai->even, cai->odd, 1);
} else if (parity == 1) {
memcpy(cai->odd, cw, 8); // odd key
if (memcmp(empty, cai->even, 8))
capmt_process_key(capmt, adapter, cai->pid, cai->even, cai->odd, 1);
capmt_process_key(capmt, adapter, cai->pid, cai->even, cai->odd, 1);
} else
tvhlog(LOG_ERR, "capmt", "Invalid parity %d in CA_SET_DESCR for adapter%d", parity, adapter);