Changeset 3870

Timestamp:

11/10/10 20:13:23 (13 years ago)

Author:

rorothetroll

Message:

reader-viaccess.c : improvment on long ECM parsing and making sure we only send the right ECM to the card. NOT TESTED !!!!. I tested on a card with normal ECM and it still works. I need someone to test this on a card with long ECM in debug mode.
csctapi/ifd_pcsc.c : improve debug messages.
globals.h : added number_ecm for long ecm processing in viaccess.

Location:

trunk

Files:

• csctapi/ifd_pcsc.c (modified) (3 diffs)
• globals.h (modified) (1 diff)
• module-monitor.c (modified) (1 diff)
• reader-viaccess.c (modified) (6 diffs)

trunk/csctapi/ifd_pcsc.c

@@ -110 +110 @@
         //The pbRecvBuffer will receive the SW1 and SW2 status codes from the operation.
         //The pcbRecvLength should be at least two and will be set to two upon return.
-        cs_debug("command = %02X %02X %02X %02X %02X", buf[0],buf[1],buf[2],buf[3],buf[4]);
         if(buf[4])
             dwSendLength = l;
         else
             dwSendLength = l-1;
-        cs_debug("sending %d bytes to PCSC", dwSendLength);
+        cs_debug("sending %d bytes to PCSC : %s", dwSendLength,cs_hexdump(1,buf,l));
         rv = SCardTransmit((SCARDHANDLE)(pcsc_reader->hCard), SCARD_PCI_T0, (LPCBYTE) buf, dwSendLength, &pioRecvPci, (LPBYTE) cta_res, (LPDWORD) &dwRecvLength);
         *cta_lr=dwRecvLength;
@@ -121 +120 @@
     else  if(pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T1) {
         dwSendLength = l;
-        cs_debug("sending %d bytes to PCSC", dwSendLength);
+        cs_debug("sending %d bytes to PCSC : %s", dwSendLength,cs_hexdump(1,buf,l));
         rv = SCardTransmit((SCARDHANDLE)(pcsc_reader->hCard), SCARD_PCI_T1, (LPCBYTE) buf, dwSendLength, &pioRecvPci, (LPBYTE) cta_res, (LPDWORD) &dwRecvLength);
         *cta_lr=dwRecvLength;
@@ -130 +129 @@
     }
 
-     cs_debug("received %d bytes from PCSC with rv=%lx", *cta_lr, rv);
+     cs_debug("received %d bytes from PCSC with rv=%lx : %s", *cta_lr, rv,cs_hexdump(1,cta_res,*cta_lr));
+
      cs_debug("PCSC doapi (%lx ) (T=%d), %d", rv, ( pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T0 ? 0 :  1), *cta_lr );
 

trunk/globals.h

@@ -710 +710 @@
     uchar geo[256];
     uchar geo_len;
+    int number_ecm;
 };
 // for videoguard in s_reader

trunk/module-monitor.c

@@ -277 +277 @@
             sprintf(ltime, "%02d:%02d:%02d", lt->tm_hour, lt->tm_min, lt->tm_sec);
                         sprintf(sbuf, "[%c--CCC]%8lX|%c|%d|%s|%d|%d|%s|%d|%s|%s|%s|%d|%04X:%04X|%s|%d|%d|%d|%d|%d|%d|%d|%d|%d|%d\n",
-                    id, cl->thread, cl->typ, cnr, usr, cau, cl->crypted,
+                    id, (unsigned long)cl->thread, cl->typ, cnr, usr, cau, cl->crypted,
                     cs_inet_ntoa(cl->ip), cl->port, monitor_get_proto(cl),
                     ldate, ltime, lsec, cl->last_caid, cl->last_srvid,

trunk/reader-viaccess.c

@@ -162 +162 @@
 static int viaccess_card_init(struct s_reader * reader, ATR newatr)
 {
-  get_atr;
-  def_resp;
-  int i;
-  uchar buf[256];
-  uchar insac[] = { 0xca, 0xac, 0x00, 0x00, 0x00 }; // select data
-  uchar insb8[] = { 0xca, 0xb8, 0x00, 0x00, 0x00 }; // read selected data
-  uchar insa4[] = { 0xca, 0xa4, 0x00, 0x00, 0x00 }; // select issuer
-  uchar insc0[] = { 0xca, 0xc0, 0x00, 0x00, 0x00 }; // read data item
-
-  static const uchar insFAC[] = { 0x87, 0x02, 0x00, 0x00, 0x03 }; // init FAC
-  static const uchar FacDat[] = { 0x00, 0x00, 0x28 };
+    get_atr;
+    def_resp;
+    int i;
+    uchar buf[256];
+    uchar insac[] = { 0xca, 0xac, 0x00, 0x00, 0x00 }; // select data
+    uchar insb8[] = { 0xca, 0xb8, 0x00, 0x00, 0x00 }; // read selected data
+    uchar insa4[] = { 0xca, 0xa4, 0x00, 0x00, 0x00 }; // select issuer
+    uchar insc0[] = { 0xca, 0xc0, 0x00, 0x00, 0x00 }; // read data item
+    static const uchar insFAC[] = { 0x87, 0x02, 0x00, 0x00, 0x03 }; // init FAC
+    static const uchar FacDat[] = { 0x00, 0x00, 0x28 };
+    static unsigned char ins8702_data[] = { 0x00, 0x00, 0x11};
+    static unsigned char ins8704[] = { 0x87, 0x04, 0x00, 0x00, 0x07 };
+    static unsigned char ins8706[] = { 0x87, 0x06, 0x00, 0x00, 0x04 };
+
 
   if ((atr[0]!=0x3f) || (atr[1]!=0x77) || ((atr[2]!=0x18) && (atr[2]!=0x11) && (atr[2]!=0x19)) || (atr[9]!=0x68)) return ERROR;
@@ -230 +233 @@
   cs_ri_log(reader, "providers: %d (%s)", reader->nprov, buf+1);
 
-  /* init the maybe existing aes key */
-  aes_set_key((char *)reader->aes_key);
-
-  if (cfg->ulparent)
-    unlock_parental(reader);
-
-  cs_log("[viaccess-reader] ready for requests");
-  memset(&reader->last_geo, 0, sizeof(reader->last_geo));
-  return OK;
+    /* init the maybe existing aes key */
+    aes_set_key((char *)reader->aes_key);
+    
+    if (cfg->ulparent)
+        unlock_parental(reader);
+
+    if(card_write(reader, insFAC, ins8702_data, cta_res, &cta_lr) && 
+        card_write(reader, ins8704, NULL, cta_res, &cta_lr) &&
+        card_write(reader, ins8706, NULL, cta_res, &cta_lr) &&
+        (cta_res[cta_lr-2]==0x90) && (cta_res[cta_lr-1]==0x00)) {
+        reader->last_geo.number_ecm =(cta_res[2]<<8) | (cta_res[3]);
+        cs_log("using ecm #%04x for long viaccess ecm",reader->last_geo.number_ecm);
+    }
+    else 
+        reader->last_geo.number_ecm = 0;
+
+    cs_log("[viaccess-reader] ready for requests");
+    memset(&reader->last_geo, 0, sizeof(reader->last_geo));
+    return OK;
 }
 
@@ -275 +288 @@
   uchar DE04[256];
   int D2KeyID=0;
+  int curnumber_ecm=0;
+
   memset(DE04, 0, sizeof(DE04)); //fix dorcel de04 bug
 
@@ -312 +327 @@
         hasD2 = 0;
 
+
     // 40 07 03 0b 00  -> nano 40, len =7  ident 030B00 (tntsat), key #0  <== we're pointing here
     // 09 -> use key #9 
@@ -323 +339 @@
 
         nanoLen=ecm88Data[1] + 2;
+        curnumber_ecm =(ecm88Data[6]<<8) | (ecm88Data[7]);
+        keynr=ecm88Data[4]&0x0F;        
+
+        // 40 07 03 0b 00  -> nano 40, len =7  ident 030B00 (tntsat), key #0  <== we're pointing here
+        // 09 -> use key #9 
+        if(nanoLen>5) {
+            if( reader->last_geo.number_ecm > 0 && reader->last_geo.number_ecm ==curnumber_ecm ) {
+    
+                keyToUse=ecm88Data[5];
+                keynr=keyToUse;
+                cs_debug("keyToUse = %d",keyToUse);
+            }
+            else
+            {
+                ecm88Data=nextEcm;
+                ecm88Len-=curEcm88len;
+                continue; //loop to next ecm
+            }
         
+        }
+
         memcpy (ident, &ecm88Data[2], sizeof(ident));
         provid = b2i(3, ident);
@@ -335 +371 @@
         }
 
-        keynr=ecm88Data[4]&0x0F;
-        // 40 07 03 0b 00  -> nano 40, len =7  ident 030B00 (tntsat), key #0  <== we're pointing here
-        // 09 -> use key #9 
-        if(nanoLen>5) {
-            keyToUse=ecm88Data[5];
-            keynr=keyToUse;
-            cs_debug("keyToUse = %d",keyToUse);
-        }
 
         if (!chk_prov(reader, ident, keynr))