From: leslie <unknown>
Date: Sun, 2 Aug 2009 02:42:01 +0000 (+0800)
Subject: cardclient-cccam2: fix over-optimised encrypt
X-Git-Tag: upstream/620~234
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=fd529d76eeb82c1f9aa4cfe28958e37a5a064f7e;p=sasc-ng.git

cardclient-cccam2: fix over-optimised encrypt
---

diff --git a/systems/cardclient/cccam2.c b/systems/cardclient/cccam2.c
index 3c8b299..7fd2299 100644
--- a/systems/cardclient/cccam2.c
+++ b/systems/cardclient/cccam2.c
@@ -80,8 +80,8 @@ void cCCcamCrypt::Encrypt(const unsigned char *in, unsigned char *out, int lengt
   for(int pos=0; pos<length; pos++) {
     sum+=keytable[++counter];
     Swap(keytable+counter,keytable+sum);
+    out[pos]=in[pos] ^ state ^ keytable[(keytable[sum]+keytable[counter])&0xFF];
     state^=in[pos];
-    out[pos]=state ^ keytable[(keytable[sum]+keytable[counter])&0xFF];
     }
 }
 
@@ -488,6 +488,7 @@ bool cCardClientCCcam2::Login(void)
     return false;
     }
 
+  memset(buff2,0,20);
   strcpy((char *)buff2,username);
   LDUMP(L_CC_CCCAM2,buff2,20,"send username:");
   encr.Encrypt(buff2,buffer,20);