Changeset 1210 for branches/monitor-improvement/oscam-config.c
- Timestamp:
- 01/13/10 19:00:52 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/monitor-improvement/oscam-config.c
r1195 r1210 793 793 return; 794 794 } 795 if (!strcmp(token, "group")) \796 {795 if (!strcmp(token, "group")) { 796 account->grp = 0; 797 797 for (ptr1=strtok(value, ","); ptr1; ptr1=strtok(NULL, ",")) 798 798 { … … 1512 1512 return; 1513 1513 } 1514 if ( !strcmp(token, "n3_rsakey"))1515 { 1516 rdr-> nagra_native=1;1514 if ((!strcmp(token, "n3_rsakey")) || (!strcmp(token, "rsakey")) ) 1515 { 1516 rdr->has_rsa=1; 1517 1517 if (key_atob_l(value, rdr->rsa_mod, 128)) 1518 1518 { 1519 fprintf(stderr, "Configuration reader: Error in n3_rsakey\n");1519 fprintf(stderr, "Configuration reader: Error in rsakey\n"); 1520 1520 exit(1); 1521 1521 } … … 1524 1524 if (!strcmp(token, "tiger_rsakey")) 1525 1525 { 1526 rdr->nagra_native=1;1527 1526 if (key_atob_l(value, rdr->rsa_mod, 240)) 1528 1527 { … … 1532 1531 return; 1533 1532 } 1534 if ( !strcmp(token, "n3_boxkey"))1533 if ((!strcmp(token, "n3_boxkey")) || (!strcmp(token, "boxkey"))) 1535 1534 { 1536 1535 if (key_atob_l(value, rdr->nagra_boxkey, 16)) 1537 1536 { 1538 fprintf(stderr, "Configuration reader: Error in Nagra Boxkey\n"); 1539 exit(1); 1540 } 1541 return; 1542 } 1543 if (!strcmp(token, "tiger_ideakey")) 1544 { 1545 if (key_atob_l(value, rdr->nagra_boxkey, 32)) 1546 { 1547 fprintf(stderr, "Configuration reader: Error in Nagra Boxkey\n"); 1537 fprintf(stderr, "Configuration reader: Error in boxkey\n"); 1548 1538 exit(1); 1549 1539 }
Note:
See TracChangeset
for help on using the changeset viewer.