Add support for more CA systems.

Add support for SECA/Mediaguard, Viaccess, Videoguard/NDS, Nagra
and DRE-Crypt.

README

@@ -1,9 +1,8 @@
 tsdecrypt
 =========
 tsdecrypt reads incoming mpeg transport stream over UDP/RTP and then decrypts it
-using libdvbcsa and keys obtained from OSCAM or similar cam server. Currently
-supported and tested cryptosystems are Conax, Cryptoworks and Irdeto. tsdecrypt
-communicates with camd using camd35 over tcp protocol also known as cs378x.
+using libdvbcsa and keys obtained from OSCAM or similar cam server. tsdecrypt
+communicates with CAM server using camd35 over tcp protocol also known as cs378x.
 
 Installation
 ============

libtsfuncs

@@ -1 +1 @@
-Subproject commit 5627d6d019dcc605862181231bb3841fb5dd4a6b
+Subproject commit d9734150a39af5019cb8cef21f3efea914222575

tsdecrypt.1

@@ -6,9 +6,8 @@ tsdecrypt - Decrypt mpegts stream.
 [\fIoptions\fR]
 .SH DESCRIPTION
 tsdecrypt reads incoming mpeg transport stream over UDP/RTP and then decrypts it
-using libdvbcsa and keys obtained from OSCAM or similar cam server. Currently
-supported and tested crypto systems are Conax, Cryptoworks and Irdeto. tsdecrypt
-communicates with camd using camd35 over tcp protocol also known as cs378x.
+using libdvbcsa and keys obtained from OSCAM or similar cam server. tsdecrypt
+communicates with CAM server using camd35 over tcp protocol also known as cs378x.
 .SH OPTIONS
 .TP
 .SH MAIN OPTIONS
@@ -76,8 +75,10 @@ in PMT like NIT, EIT, TDT tables and unknown pids is removed.
 .TP
 \fB\-c\fR, \fB\-\-ca\-system\fR <ca_sys>
 Process input EMM/ECM from <ca_sys>. Currently tested and working CA systems
-are \fBCONAX\fR, \fBCRYPTOWORKS\fR and \fBIRDETO\fR. The default <ca_sys> is
-\fBCONAX\fR.
+are \fBCONAX\fR, \fBCRYPTOWORKS\fR and \fBIRDETO\fR. Other supported CA
+systems that you can choose but are not tested are \fBSECA\fR
+(\fBMEDIAGUARD\fR), \fBVIACCESS\fR, \fBVIDEOGUARD\fR (\fBNDS\fR), \fBNAGRA\fR
+and \fBDRECRYPT\fR. The default <ca_sys> is \fBCONAX\fR.
 .TP
 \fB\-s\fR, \fB\-\-camd\-server\fR <addr[:port]>
 Set CAMD server ip and port (10.0.1.1:2233). Is not set default port is

tsdecrypt.c

@@ -113,7 +113,8 @@ static void show_help(struct ts *ts) {
 	printf("\n");
 	printf("CAMD server options:\n");
 	printf(" -c --ca-system <ca_sys>    | Process input EMM/ECM from <ca_sys>. Default: %s\n", ts_get_CA_sys_txt(ts->req_CA_sys));
-	printf("                            | Valid idents are: CONAX, CRYPTOWORKS and IRDETO\n");
+	printf("                            | Valid idents are: CONAX, CRYPTOWORKS, IRDETO, SECA (MEDIAGUARD),\n");
+	printf("                            |                   VIACCESS, VIDEOGUARD (NDS), NAGRA and DRECRYPT.\n");
 	printf(" -s --camd-server <addr>    | CAMD server address and port. Example: 1.2.3.4:2233. Default: not set\n");
 	printf(" -U --camd-user <user>      | CAMD server user. Default: %s\n", ts->camd35.user);
 	printf(" -P --camd-pass <pass>      | CAMD server password. Default: %s\n", ts->camd35.pass);
@@ -216,6 +217,16 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 					ts->req_CA_sys = CA_CONAX;
 				else if (strcasecmp("CRYPTOWORKS", optarg) == 0)
 					ts->req_CA_sys = CA_CRYPTOWORKS;
+				else if (strcasecmp("SECA", optarg) == 0 || strcasecmp("MEDIAGUARD", optarg) == 0)
+					ts->req_CA_sys = CA_SECA;
+				else if (strcasecmp("VIACCESS", optarg) == 0)
+					ts->req_CA_sys = CA_VIACCESS;
+				else if (strcasecmp("VIDEOGUARD", optarg) == 0 || strcasecmp("NDS", optarg) == 0)
+					ts->req_CA_sys = CA_VIDEOGUARD;
+				else if (strcasecmp("NAGRA", optarg) == 0)
+					ts->req_CA_sys = CA_NAGRA;
+				else if (strcasecmp("DRE-CRYPT", optarg) == 0 || strcasecmp("DRECRYPT", optarg) == 0)
+					ts->req_CA_sys = CA_DRECRYPT;
 				else
 					ca_err = 1;
 				break;