Browse Source

The norwegian CA is called CONAX not CONNAX.

Georgi Chorbadzhiyski 12 years ago
parent
commit
a7f4ba8d89
3 changed files with 5 additions and 5 deletions
  1. 1
    1
      data.c
  2. 1
    1
      libts
  3. 3
    3
      tsdecrypt.c

+ 1
- 1
data.c View File

@@ -54,7 +54,7 @@ void data_init(struct ts *ts) {
54 54
 	ts->ts_discont  = 1;
55 55
 
56 56
 	ts->debug_level = 0;
57
-	ts->req_CA_sys  = CA_CONNAX;
57
+	ts->req_CA_sys  = CA_CONAX;
58 58
 	ts->emm_send    = 0;
59 59
 	ts->pid_filter  = 1;
60 60
 

+ 1
- 1
libts

@@ -1 +1 @@
1
-Subproject commit 1feb066d7ecb245e2045487e4dc55a83fcb75cbb
1
+Subproject commit 9bd81d834bcdce23acdb66db92795c83f32d7415

+ 3
- 3
tsdecrypt.c View File

@@ -47,7 +47,7 @@ static void show_help(struct ts *ts) {
47 47
 	printf("                   |    -I -              (read from STDIN, the default)\n");
48 48
 	printf("    -R             | Enable RTP input\n");
49 49
 	printf("\n");
50
-	printf("    -c ca_system   | default: %s valid: IRDETO, CONNAX, CRYPTOWORKS\n", ts_get_CA_sys_txt(ts->req_CA_sys));
50
+	printf("    -c ca_system   | default: %s valid: IRDETO, CONAX, CRYPTOWORKS\n", ts_get_CA_sys_txt(ts->req_CA_sys));
51 51
 	printf("    -z             | Detect discontinuty errors in input stream (default: %s).\n", ts->ts_discont ? "report" : "ignore");
52 52
 	printf("\n");
53 53
 	printf("  Output options:\n");
@@ -139,8 +139,8 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
139 139
 			case 'c':
140 140
 				if (strcasecmp("IRDETO", optarg) == 0)
141 141
 					ts->req_CA_sys = CA_IRDETO;
142
-				else if (strcasecmp("CONNAX", optarg) == 0)
143
-					ts->req_CA_sys = CA_CONNAX;
142
+				else if (strcasecmp("CONNAX", optarg) == 0 || strcasecmp("CONAX", optarg) == 0)
143
+					ts->req_CA_sys = CA_CONAX;
144 144
 				else if (strcasecmp("CRYPTOWORKS", optarg) == 0)
145 145
 					ts->req_CA_sys = CA_CRYPTOWORKS;
146 146
 				else

Loading…
Cancel
Save