mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 15:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

test c**

Browse Source
This commit is contained in:
max10
2015-11-18 17:16:23 +01:00
parent 5ed2d1c73e
commit 91b9bb6c9e
5 changed files with 109 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libdvbci/dvbci_ccmgr.cpp
View File

@@ -1029,7 +1029,6 @@ bool eDVBCIContentControlManagerSession::data_initialize(tSlot *tslot)
printf("%s -> %s\n", FILENAME, __FUNCTION__);
// if (session->private_data) {
if (tslot->private_data) {
fprintf(stderr, "strange private_data not null!\n");
return false;
@@ -1042,7 +1041,6 @@ bool eDVBCIContentControlManagerSession::data_initialize(tSlot *tslot)
}
/* parent */
// data->session = session;
data->slot = tslot;
/* clear storage of credentials */
@@ -1267,15 +1265,8 @@ eDVBCIContentControlManagerSession::~eDVBCIContentControlManagerSession()
void eDVBCIContentControlManagerSession::ci_ccmgr_doClose(tSlot *tslot)
{
struct cc_ctrl_data *data = (struct cc_ctrl_data*)(tslot->private_data);
uint8_t clearData[32];
printf("%s -> %s\n", FILENAME, __FUNCTION__);
printf("close content_control\n");
for (int i = 0; i < 32; i++)
clearData[i] = 0;
descrambler_set_key((int)data->slot->source, 0, clearData);
descrambler_set_key((int)data->slot->source, 1, clearData);
descrambler_deinit();
element_init(data);
@@ -1295,7 +1286,7 @@ int eDVBCIContentControlManagerSession::receivedAPDU(const unsigned char *tag, c
switch (tag[2]) {
case 0x01: ci_ccmgr_cc_open_cnf(slot); break;
case 0x03: ci_ccmgr_cc_data_req(slot, (const uint8_t*)data, len); break;
case 0x05: ci_ccmgr_cc_sync_req(); slot->ccmgr_ready = false; break;
case 0x05: ci_ccmgr_cc_sync_req(); break;
case 0x07: ci_ccmgr_cc_sac_data_req(slot, (const uint8_t*)data, len); break;
case 0x09: ci_ccmgr_cc_sac_sync_req(slot, (const uint8_t*)data, len); break;
default:
@@ -1327,7 +1318,7 @@ int eDVBCIContentControlManagerSession::doAction()
void eDVBCIContentControlManagerSession::resendKey(tSlot *tslot)
{
if (!tslot->SidBlackListed)
if (!tslot->SidBlackListed && (tslot->inUse || tslot->slot == cCA::GetInstance()->GetLiveSlot()))
descrambler_set_key((int)tslot->source, tslot->lastParity, tslot->lastKey);
}