Changeset 2736
- Timestamp:
- 07/13/10 23:37:11 (14 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-config.c
r2735 r2736 2282 2282 fprintf_conf(f, CONFVARWIDTH, "aeskey", "%s\n", key_btoa(NULL, reader[i].aes_key)); 2283 2283 2284 2285 //check for tiger 2286 int tigerkey = 0; 2287 for (j=64;j<240;j++) { 2288 if(reader[i].rsa_mod[j] > 0) { 2289 tigerkey = 1; 2290 break; 2291 } 2292 } 2293 2284 2294 //n3_rsakey 2285 2295 if (reader[i].has_rsa && isphysical) { 2286 //if (reader[i].is_pure_nagra) {2296 if (!tigerkey) { 2287 2297 fprintf_conf(f, CONFVARWIDTH, "rsakey", ""); 2288 2298 for (j=0;j<64;j++) { … … 2290 2300 } 2291 2301 fprintf(f, "\n"); 2292 /*}2293 else if (reader[i].is_tiger){2302 } 2303 else { 2294 2304 //tiger_rsakey 2295 2305 fprintf_conf(f, CONFVARWIDTH, "tiger_rsakey", ""); … … 2298 2308 } 2299 2309 fprintf(f, "\n"); 2300 } */2310 } 2301 2311 } 2302 2312 -
trunk/oscam-http.c
r2714 r2736 846 846 847 847 if(reader[ridx].has_rsa) { 848 for (i = 0; i < 64; i++) tpl_printf(vars, 1, "RSAKEY", "%02X", reader[ridx].rsa_mod[i]); 848 //check for tiger 849 int tigerkey = 0; 850 for (i=64;i<240;i++) { 851 if(reader[ridx].rsa_mod[i] > 0) { 852 tigerkey = 1; 853 break; 854 } 855 } 856 if (!tigerkey) { 857 for (i = 0; i < 64; i++) tpl_printf(vars, 1, "RSAKEY", "%02X", reader[ridx].rsa_mod[i]); 858 } else { 859 for (i = 0; i < 240; i++) tpl_printf(vars, 1, "TIGERRSAKEY", "%02X", reader[ridx].rsa_mod[i]); 860 } 849 861 for (i = 0; i < 8 ; i++) tpl_printf(vars, 1, "BOXKEY", "%02X", reader[ridx].nagra_boxkey[i]); 850 862 } -
trunk/oscam-http.h
r2714 r2736 644 644 <TR><TD>Force Irdeto:<input name=\"force_irdeto\" type=\"hidden\" value=\"0\"></TD><TD><input name=\"force_irdeto\" type=\"checkbox\" value=\"1\" ##FORCEIRDETOCHECKED##></TD></TR>\n\ 645 645 <TR><TD>Boxid:</TD><TD><input name=\"boxid\" type=\"text\" size=\"15\" maxlength=\"8\" value=\"##BOXID##\"></TD></TR>\n\ 646 <TR><TD>Rsakey:</TD><TD><input name=\"rsakey\" type=\"text\" size=\"140\" maxlength=\"128\" value=\"##RSAKEY##\"></TD></TR>\n\ 646 <TR><TD>RSA key:</TD><TD><input name=\"rsakey\" type=\"text\" size=\"140\" maxlength=\"128\" value=\"##RSAKEY##\"></TD></TR>\n\ 647 <TR><TD>Tiger RSA key:</TD><TD><input name=\"tiger_rsakey\" type=\"text\" size=\"240\" maxlength=\"480\" value=\"##TIGERRSAKEY##\"></TD></TR>\n\ 647 648 <TR><TD>Boxkey:</TD><TD><input name=\"boxkey\" type=\"text\" size=\"20\" maxlength=\"16\" value=\"##BOXKEY##\"></TD></TR>\n\ 648 649 <TR><TD>ATR:</TD><TD><input name=\"atr\" type=\"text\" size=\"70\" maxlength=\"54\" value=\"##ATR##\"></TD></TR>\n\
Note:
See TracChangeset
for help on using the changeset viewer.