Changeset 1202

Timestamp:

01/13/10 00:02:14 (11 years ago)

Author:

rorothetroll

Message:

resync with trunk

Location:

branches/smartreader

Files:

• Distribution/doc/man/oscam.server.5 (modified) (1 diff)
• Distribution/doc/txt/oscam.server.txt (modified) (1 diff)
• oscam-config.c (modified) (2 diffs)
• reader-irdeto.c (modified) (2 diffs)
• reader-nagra.c (modified) (1 diff)

branches/smartreader/Distribution/doc/man/oscam.server.5

@@ -220 +220 @@
 .RE
 .PP
-\fBn3_rsakey\fP = \fBRSA key\fP
+\fBn3_rsakey\fP|\fBrsakey\fP = \fBRSA key\fP
 .RS 3n
 RSA key for Nagravision SCs
 .RE
 .PP
-\fBn3_boxkey\fP = \fBbox key\fP
+\fBn3_boxkey\fP|\fBboxkey\fP = \fBbox key\fP
 .RS 3n
 box key for Nagravision SCs

branches/smartreader/Distribution/doc/txt/oscam.server.txt

@@ -166 +166 @@
             readnano = /var/oscam/write.emm
 
-       n3_rsakey = RSA key
+       n3_rsakey|rsakey = RSA key
       RSA key for Nagravision SCs
 
-       n3_boxkey = box key
+       n3_boxkey|boxkey = box key
       box key for Nagravision SCs
 

branches/smartreader/oscam-config.c

@@ -1136 +1136 @@
     if (key_atob_l(value, rdr->rsa_mod, 128))
     {
-      fprintf(stderr, "Configuration reader: Error in n3_rsakey\n");
+      fprintf(stderr, "Configuration reader: Error in rsakey\n");
       exit(1);
     }
@@ -1154 +1154 @@
     if (key_atob_l(value, rdr->nagra_boxkey, 16))
     {
-      fprintf(stderr, "Configuration reader: Error in Nagra Boxkey\n");
-      exit(1);
-    }
-    return;
-  }
-  if (!strcmp(token, "tiger_ideakey"))
-  {
-    if (key_atob_l(value, rdr->nagra_boxkey, 32))
-    {
-      fprintf(stderr, "Configuration reader: Error in Nagra Boxkey\n");
+      fprintf(stderr, "Configuration reader: Error in boxkey\n");
       exit(1);
     }

branches/smartreader/reader-irdeto.c

@@ -164 +164 @@
     return(0);
   nagra=0;
-
-  /*
-   * Check Nagra
-   */
-  /*if ((!reader_cmd2icc(sc_GetROM, sizeof(sc_GetROM))) && (cta_res[cta_lr-2]==0x90))
-  {
-    nagra=1;
-    if (cta_res[0]==0x90)
-    {
-      char *ptr;
-      cta_res[cta_res[1]+4]='\0';
-      if( (ptr=strstr(cta_res+2, "ASP")) )
-      {
-        sprintf(buf, ", rom=%c.%c%c", ptr[3], ptr[4], ptr[5]);
-        if( (ptr=strstr(cta_res+2, "Rev")) )
-          sprintf(buf+10, "(%c%c%c)", ptr[3], ptr[4], ptr[5]);
-      }
-    }
-  } */
+  
+  if(reader[ridx].has_rsa) // we use rsa from config as camkey
+  {
+    cs_debug("[irdeto-reader] using camkey data from config");
+    memcpy(&sc_GetCamKey383C[5], reader[ridx].rsa_mod, 0x40);
+    memcpy(sc_CamKey, reader[ridx].nagra_boxkey, 8);
+    cs_debug("[irdeto-reader]      camkey: %s", cs_hexdump (0, sc_CamKey, 8));
+    cs_debug("[irdeto-reader] camkey-data: %s", cs_hexdump (0, &sc_GetCamKey383C[5], 32));
+    cs_debug("[irdeto-reader] camkey-data: %s", cs_hexdump (0, &sc_GetCamKey383C[37], 32));
+  }
 
   /*
@@ -247 +238 @@
   
   cs_ptyp=D_DEVICE;
-  cs_debug("set camkey for type=%d", camkey);
+  cs_debug("[irdeto-reader] set camkey for type=%d", camkey);
   cs_ptyp=cs_ptyp_orig;
 

branches/smartreader/reader-nagra.c

@@ -591 +591 @@
         is_tiger=1;
     }
-    else if (!memcmp(atr+4, "IRDETO", 6))
+    else if ((!memcmp(atr+4, "IRDETO", 6)) && ((atr[14]==0x03) && (atr[15]==0x84) && (atr[16]==0x55)))
     {
         cs_ri_log("[nagra-reader] detect Irdeto tunneled nagra card");