Changeset 9827

Timestamp:

08/12/14 23:39:40 (9 years ago)

Author:

theparasol

Message:

• Reworked viaccess nano e0 detection since the implemented detection was not catching the nano e0 on all channels

• Added more general way to detect cw's that need additional postprocessing in ecm handler currently seca nano01 & viaccess nano e0 are added and detected

Location:

trunk

Files:

• oscam-ecm.c (modified) (3 diffs)
• reader-viaccess.c (modified) (3 diffs)

trunk/oscam-ecm.c

@@ -1686 +1686 @@
                 if(cw[i + 3] != c)
                 {
-                    bool nano = false;
-                    if(er->caid == 0x100 && er->ecm[5] > 0x00){
-                        cs_debug_mask(D_TRACE,"NANO%02d: this cw needs additional decryption!", er->ecm[5]);
-                        nano = true;
+                    unsigned char nano = 0x00;
+                    if(er->caid == 0x100 && er->ecm[5] > 0x00)
+                    {
+                        nano = er->ecm[5]; // seca nano protection
                     }
-                    if(reader->dropbadcws && !nano)
+                    if(er->caid == 0x500)
+                    {
+                        //search for nano E0
+                        int16_t s;
+                        for (s = 0; s < er->ecmlen-3 && (er->ecm[s] != 0xE0 && er->ecm[s+1] != 0x02 && er->ecm[s+2] != 0x00 && er->ecm[s+3] != 0x02) ; s++)
+                        {
+                            nano = er->ecm[s]; // viaccess nano protection
+                        }
+                    }   
+                        
+                    if(reader->dropbadcws && !nano) // only drop controlword if no cw encryption is applied
                     {
                         rc = E_NOTFOUND;
@@ -1699 +1709 @@
                     else
                     {
-                        if(!nano)
+                        if(!nano) // only fix checksum if no cw encryption is applied
                         {
                             cs_debug_mask(D_TRACE, "notice: changed dcw checksum byte cw[%i] from %02x to %02x", i + 3, cw[i + 3], c);
@@ -1706 +1716 @@
                         else
                         {
-                            cs_debug_mask(D_TRACE,"NANO%02d: not fixing the crc of this cw since its still encrypted!", er->ecm[5]);
+                            cs_debug_mask(D_TRACE,"NANO%02d: not fixing the crc of this cw since its still encrypted!", nano);
                         }
                     }

trunk/reader-viaccess.c

@@ -939 +939 @@
 
     nextEcm = ecm88Data;
- 
- //looking for nano E0 
-            while (ecm88Len) 
-            { 
-                // 80 33 nano 80 (ecm) + len (33) 
-                if(ecm88Data[0]==0x80) { // nano 80, give ecm len 
-                    curEcm88len=ecm88Data[1]; 
-                    nextEcm=ecm88Data+curEcm88len+2; 
-                    ecm88Data += 2; 
-                    ecm88Len -= 2; 
-         
-                    if (ecm88Data[0]==0x90  && ecm88Data[1]==0x07) 
-                    { 
-                        curnumber_ecm =(ecm88Data[6]<<8) | (ecm88Data[7]); 
-                        //if number_ecm & nano E0 ecm  not suported 
-                        if ((ecm88Data[9] == 0xE0) && (ecm88Data[10] == 0x02)) 
-                        { 
-                            cs_log("[viaccess-reader] ECM: Invalid ECM nano E0 Rejecting"); 
-                            return ERROR; 
-                        } 
-                    } 
-                    ecm88Data=nextEcm; 
-                    ecm88Len-=curEcm88len; 
-                    continue; //loop to next ecm 
-                } else  ecm88Len = 0; //exit while 
-            } 
-         
-            //reset to beginning of ECM 
-            ecm88Data=&ecmData[0]; //XXX what is the 4th byte for ?? 
-            ecm88Len=SCT_LEN(er->ecm)-4; 
-            curEcm88len=0; 
-            nextEcm=ecm88Data; 
-
 
     while(ecm88Len > 0 && !rc)
@@ -1120 +1087 @@
                 ecm88Data += 6;
             }
-            //
+            
+            // E0
+            if(ecm88Data[0] == 0xE0 && ecm88Data[1] == 0x02 && ecm88Data[2] == 0x00 && ecm88Data[3] == 0x02)
+            {
+                cs_log("[viaccess-reader] ECM: This ECM is using nano E0 -> skip since preprocessing / postprocessing is unknown!");
+                ecm88Data = nextEcm;
+                ecm88Len -= curEcm88len;
+                continue;
+            }
+            
 
             if(csystem_data->last_geo.provid != provid)
@@ -1245 +1221 @@
                 ecm88Data = nextEcm;
                 ecm88Len -= curEcm88len;
-                rdr_debug_mask(reader, D_READER, "ECM: key to use is not the current one, trying next ECM");
+                rdr_debug_mask(reader, D_READER, "Error: card respondend %02X %02X, trying next ECM", cta_res[0], cta_res[1]);
                 snprintf(ea->msglog, MSGLOGSIZE, "key to use is not the current one, trying next ECM");
             }