From: leslie <unknown>
Date: Tue, 17 Feb 2009 02:39:16 +0000 (+0800)
Subject: cardclient-radegast: add Nagra2 ECM support (from emun-sc)
X-Git-Tag: 0.9.2~65
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=db84922b6ee9ddc7c95caf66bae0a25e1ab3bad9;p=sasc-ng.git

cardclient-radegast: add Nagra2 ECM support (from emun-sc)
---

diff --git a/systems/cardclient/radegast.c b/systems/cardclient/radegast.c
index 8fc446b..5893611 100644
--- a/systems/cardclient/radegast.c
+++ b/systems/cardclient/radegast.c
@@ -227,9 +227,12 @@ bool cCardClientRadegast::ProcessECM(const cEcmInfo *ecm, const unsigned char *s
   int keynr=-1;
   switch(ecm->caId>>8) {
     case 0x01: // Seca
-      keynr=source[7]&0x0F; break;
+      keynr=cParseSeca::KeyNr(source)&0x0F; break;
     case 0x05: // Viaccess
-      keynr=source[4]&0x0F; break;
+      keynr=cParseViaccess::KeyNr(source); break;
+    case 0x18: // Nagra2
+      if(ecm->caId>=0x1801) keynr=(source[7]&0x10) | 0x86;
+      break;
     }
   unsigned char buff[512], tmp[10];
   StartMsg(buff,1);			// CMD_ECM_KEY_ASK