Changeset 2451
- Timestamp:
- 06/15/10 11:10:06 (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r2428 r2451 506 506 uchar nagra_boxkey[16]; //n3 boxkey 8byte or tiger idea key 16byte 507 507 int has_rsa; 508 int force_irdeto; 508 509 uchar aes_key[16]; 509 510 uchar rsa_mod[120]; //rsa modulus for nagra cards. -
trunk/oscam-config.c
r2384 r2451 2930 2930 } 2931 2931 2932 if (!strcmp(token, "force_irdeto")) { 2933 if(strlen(value) == 0) { 2934 rdr->force_irdeto = 0; 2935 return; 2936 } else { 2937 rdr->force_irdeto = atoi(value); 2938 return; 2939 } 2940 } 2941 2942 2932 2943 if ((!strcmp(token, "atr"))) { 2933 2944 if(strlen(value) == 0) { … … 3406 3417 reader[nr].cardmhz = 357; 3407 3418 reader[nr].deprecated = 0; 3419 reader[nr].force_irdeto = 0; 3408 3420 reader[nr].cachecm = 1; 3409 3421 strcpy(reader[nr].pincode, "none"); -
trunk/reader-irdeto.c
r2440 r2451 197 197 if (memcmp(atr+4, "IRDETO", 6)) 198 198 return ERROR; 199 cs_ri_log(reader, "detect Irdeto card");199 cs_ri_log(reader, "detect irdeto card"); 200 200 201 201 if(reader->has_rsa) // we use rsa from config as camkey -
trunk/reader-nagra.c
r2116 r2451 539 539 if (memcmp(atr+11, "DNASP", 5)==0) 540 540 { 541 cs_ri_log(reader, "detect native NAGRA card T1 protocol");541 cs_ri_log(reader, "detect native nagra card"); 542 542 memcpy(reader->rom,atr+11,15); 543 543 } 544 544 else if (memcmp(atr+11, "TIGER", 5)==0 || (memcmp(atr+11, "NCMED", 5)==0)) 545 545 { 546 cs_ri_log(reader, "detect NAGRAtiger card");546 cs_ri_log(reader, "detect nagra tiger card"); 547 547 memcpy(reader->rom,atr+11,15); 548 548 reader->is_tiger=1; … … 550 550 else if ((!memcmp(atr+4, "IRDETO", 6)) && ((atr[14]==0x03) && (atr[15]==0x84) && (atr[16]==0x55))) 551 551 { 552 cs_ri_log(reader, "detect Irdeto tunneled NAGRAcard");552 cs_ri_log(reader, "detect irdeto tunneled nagra card"); 553 553 if(!reader->has_rsa) 554 554 { 555 cs_ri_log(reader, "switching back to Irdeto mode"); 556 return ERROR; 557 } 558 cs_ri_log(reader, "using NAGRA mode"); 555 cs_ri_log(reader, "no rsa key configured -> using irdeto mode"); 556 return ERROR; 557 } 558 if(reader->force_irdeto) 559 { 560 cs_ri_log(reader, "rsa key configured but irdeto mode forced -> using irdeto mode"); 561 return ERROR; 562 } 563 cs_ri_log(reader, "rsa key configured -> using nagra mode"); 559 564 reader->is_pure_nagra=1; 560 565 if(!do_cmd(reader, 0x10,0x02,0x90,0x11,0,cta_res,&cta_lr)) … … 572 577 if(!do_cmd(reader, 0x12,0x02,0x92,0x06,0,cta_res,&cta_lr)) 573 578 { 574 cs_debug("[nagra-reader] get Serial failed");579 cs_debug("[nagra-reader] get serial failed"); 575 580 return ERROR; 576 581 }
Note:
See TracChangeset
for help on using the changeset viewer.