Changeset 5355 for trunk/oscam-config.c
- Timestamp:
- 06/05/11 19:18:47 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-config.c
r5354 r5355 281 281 else if (zFiltName && zFiltName[0] == 'c') { 282 282 cs_log("PANIC: CAID field not found in CHID parameter!"); 283 cs_exit(1);283 return; 284 284 } 285 285 newftab.nfilts++; … … 1001 1001 if (key_atob_l(value, cfg.c33_key, 32)) { 1002 1002 fprintf(stderr, "Configuration camd3.3x: Error in Key\n"); 1003 exit(1); 1003 cfg.c33_crypted = 0; 1004 memset(cfg.c33_key, 0, sizeof(cfg.c33_key)); 1005 return; 1004 1006 } 1005 1007 cfg.c33_crypted=1; … … 1101 1103 1102 1104 if (!strcmp(token, "key")) { 1103 if(strlen(value) == 0) 1104 return; 1105 if(strlen(value) == 0){ 1106 memset(cfg.ncd_key, 0, sizeof(cfg.ncd_key)); 1107 return; 1108 } 1105 1109 if (key_atob_l(value, cfg.ncd_key, 28)) { 1106 1110 fprintf(stderr, "Configuration newcamd: Error in Key\n"); 1107 exit(1);1111 memset(cfg.ncd_key, 0, sizeof(cfg.ncd_key)); 1108 1112 } 1109 1113 return; … … 1172 1176 // cccam version 1173 1177 if (!strcmp(token, "version")) { 1178 memset(cfg.cc_version, 0, sizeof(cfg.cc_version)); 1174 1179 if (strlen(value) > sizeof(cfg.cc_version) - 1) { 1175 1180 fprintf(stderr, "cccam config: version too long\n"); 1176 exit(1); 1177 } 1178 memset(cfg.cc_version, 0, sizeof(cfg.cc_version)); 1179 strncpy((char*)cfg.cc_version, value, sizeof(cfg.cc_version) - 1); 1181 } else 1182 cs_strncpy((char*)cfg.cc_version, value, sizeof(cfg.cc_version)); 1180 1183 return; 1181 1184 } … … 3537 3540 } else if (key_atob_l(value, rdr->ncd_key, 28)) { 3538 3541 fprintf(stderr, "Configuration newcamd: Error in Key\n"); 3542 memset(rdr->ncd_key, 0, sizeof(rdr->ncd_key)); 3539 3543 } 3540 3544 return; … … 3801 3805 if (key_atob_l(value, rdr->rsa_mod, len)) { 3802 3806 fprintf(stderr, "Configuration reader: Error in rsakey\n"); 3803 exit(1);3807 memset(rdr->rsa_mod, 0, sizeof(rdr->rsa_mod)); 3804 3808 } 3805 3809 return; … … 3814 3818 if (key_atob_l(value, rdr->nagra_boxkey, 16)) { 3815 3819 fprintf(stderr, "Configuration reader: Error in boxkey\n"); 3816 exit(1);3820 memset(rdr->nagra_boxkey, 0, sizeof(rdr->nagra_boxkey)); 3817 3821 } 3818 3822 return; … … 4216 4220 if (!strcmp(token, "cccversion")) { 4217 4221 // cccam version 4222 memset(rdr->cc_version, 0, sizeof(rdr->cc_version)); 4218 4223 if (strlen(value) > sizeof(rdr->cc_version) - 1) { 4219 fprintf(stderr, "cccam config: version too long\n"); 4220 exit(1); 4221 } 4222 memset(rdr->cc_version, 0, sizeof(rdr->cc_version)); 4223 cs_strncpy(rdr->cc_version, value, sizeof(rdr->cc_version)); 4224 fprintf(stderr, "cccam config: version too long.\n"); 4225 } else 4226 cs_strncpy(rdr->cc_version, value, sizeof(rdr->cc_version)); 4224 4227 return; 4225 4228 }
Note:
See TracChangeset
for help on using the changeset viewer.