Changeset 11719

Timestamp:

06/06/23 12:09:26 (4 months ago)

Author:

bust3d

Message:

Fixing Mapping LOG thanks to @Qu4k3
Nagra fix thanks to @w33dburner

Location:

trunk

Files:

• oscam-config.c (modified) (1 diff)
• reader-nagra.c (modified) (2 diffs)

trunk/oscam-config.c

@@ -1181 +1181 @@
                 if(match_whitelist(er, entry))
                 {
+                    cs_log_dbg(D_TRACE, "whitelist: mapped %04X@%06X to %04X@%06X", er->caid, er->prid, entry->mapcaid, entry->mapprovid);
                     er->caid = entry->mapcaid;
                     er->prid = entry->mapprovid;
-                    cs_log_dbg(D_TRACE, "whitelist: mapped %04X@%06X to %04X@%06X", er->caid, er->prid, entry->mapcaid, entry->mapprovid);
                     break;
                 }

trunk/reader-nagra.c

@@ -8 +8 @@
 #include "reader-nagra-common.h"
 #include "oscam-work.h"
+#include "oscam-chk.h"
 
 int8_t ins7e11_state = 0;
@@ -1405 +1406 @@
                 rdr_log_dbg(reader, D_READER, "CW1 after 3DES decrypt: %s", cs_hexdump(1, _cwe1, 8, tmp_dbg, sizeof(tmp_dbg)));
 
-                int chkok = 1;
-                if(((_cwe0[0] + _cwe0[1] + _cwe0[2]) & 0xFF) != _cwe0[3])
+                if (!cfg.disablecrccws && !reader->disablecrccws && !chk_if_ignore_checksum((ECM_REQUEST*) er, &cfg.disablecrccws_only_for) && !chk_if_ignore_checksum((ECM_REQUEST*) er, &reader->disablecrccws_only_for))
                 {
-                    chkok = 0;
-                    rdr_log_dbg(reader, D_READER, "CW0 checksum error [0]");
+                    int chkok = 1;
+                    if(((_cwe0[0] + _cwe0[1] + _cwe0[2]) & 0xFF) != _cwe0[3])
+                    {
+                        chkok = 0;
+                        rdr_log_dbg(reader, D_READER, "CW0 checksum error [0]");
+                    }
+
+                    if(((_cwe0[4] + _cwe0[5] + _cwe0[6]) & 0xFF) != _cwe0[7])
+                    {
+                        chkok = 0;
+                        rdr_log_dbg(reader, D_READER, "CW0 checksum error [1]");
+                    }
+
+                    if(((_cwe1[0] + _cwe1[1] + _cwe1[2]) & 0xFF) != _cwe1[3])
+                    {
+                        chkok = 0;
+                        rdr_log_dbg(reader, D_READER, "CW1 checksum error [0]");
+                    }
+
+                    if(((_cwe1[4] + _cwe1[5] + _cwe1[6]) & 0xFF) != _cwe1[7])
+                    {
+                        chkok = 0;
+                        rdr_log_dbg(reader, D_READER, "CW1 checksum error [1]");
+                    }
+
+                    if(chkok == 0)
+                    {
+                        rdr_log_dbg(reader, D_READER, "CW Decrypt failed");
+                        return ERROR;
+                    }
                 }
-
-                if(((_cwe0[4] + _cwe0[5] + _cwe0[6]) & 0xFF) != _cwe0[7])
+                else
                 {
-                    chkok = 0;
-                    rdr_log_dbg(reader, D_READER, "CW0 checksum error [1]");
-                }
-
-                if(((_cwe1[0] + _cwe1[1] + _cwe1[2]) & 0xFF) != _cwe1[3])
-                {
-                    chkok = 0;
-                    rdr_log_dbg(reader, D_READER, "CW1 checksum error [0]");
-                }
-
-                if(((_cwe1[4] + _cwe1[5] + _cwe1[6]) & 0xFF) != _cwe1[7])
-                {
-                    chkok = 0;
-                    rdr_log_dbg(reader, D_READER, "CW1 checksum error [1]");
-                }
-
-                if(chkok == 0)
-                {
-                    rdr_log_dbg(reader, D_READER, "CW Decrypt failed");
-                    return ERROR;
+                    rdr_log_dbg(reader, D_READER, "checksum test skipped");
                 }
             }