Changeset 1200
- Timestamp:
- 01/12/10 23:02:14 (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/reader-irdeto.c
r1125 r1200 164 164 return(0); 165 165 nagra=0; 166 167 /* 168 * Check Nagra 169 */ 170 /*if ((!reader_cmd2icc(sc_GetROM, sizeof(sc_GetROM))) && (cta_res[cta_lr-2]==0x90)) 171 { 172 nagra=1; 173 if (cta_res[0]==0x90) 174 { 175 char *ptr; 176 cta_res[cta_res[1]+4]='\0'; 177 if( (ptr=strstr(cta_res+2, "ASP")) ) 178 { 179 sprintf(buf, ", rom=%c.%c%c", ptr[3], ptr[4], ptr[5]); 180 if( (ptr=strstr(cta_res+2, "Rev")) ) 181 sprintf(buf+10, "(%c%c%c)", ptr[3], ptr[4], ptr[5]); 182 } 183 } 184 } */ 166 167 if(reader[ridx].has_rsa) // we use rsa from config as camkey 168 { 169 cs_debug("[irdeto-reader] using camkey data from config"); 170 memcpy(&sc_GetCamKey383C[5], reader[ridx].rsa_mod, 0x40); 171 memcpy(sc_CamKey, reader[ridx].nagra_boxkey, 8); 172 cs_debug("[irdeto-reader] camkey: %s", cs_hexdump (0, sc_CamKey, 8)); 173 cs_debug("[irdeto-reader] camkey-data: %s", cs_hexdump (0, &sc_GetCamKey383C[5], 32)); 174 cs_debug("[irdeto-reader] camkey-data: %s", cs_hexdump (0, &sc_GetCamKey383C[37], 32)); 175 } 185 176 186 177 /* … … 247 238 248 239 cs_ptyp=D_DEVICE; 249 cs_debug(" set camkey for type=%d", camkey);240 cs_debug("[irdeto-reader] set camkey for type=%d", camkey); 250 241 cs_ptyp=cs_ptyp_orig; 251 242 -
trunk/reader-nagra.c
r1196 r1200 591 591 is_tiger=1; 592 592 } 593 else if ( !memcmp(atr+4, "IRDETO", 6))593 else if ((!memcmp(atr+4, "IRDETO", 6)) && ((atr[14]==0x03) && (atr[15]==0x84) && (atr[16]==0x55))) 594 594 { 595 595 cs_ri_log("[nagra-reader] detect Irdeto tunneled nagra card");
Note:
See TracChangeset
for help on using the changeset viewer.