Merge tag 'ktest-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[~andy/linux] / drivers / staging / vt6655 / rc4.c

diff --git a/drivers/staging/vt6655/rc4.c b/drivers/staging/vt6655/rc4.c
index 4a53f159cb3072acc353b864d2a1f3a082954791..343b815c0a9e9a89fd08869a80b3769c9c45a7e7 100644 (file)
--- a/drivers/staging/vt6655/rc4.c
+++ b/drivers/staging/vt6655/rc4.c
@@ -32,56 +32,56 @@
 
 #include "rc4.h"
 
-void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len)
+void rc4_init(PRC4Ext pRC4, unsigned char *pbyKey, unsigned int cbKey_len)
 {
-    UINT  ust1, ust2;
-    UINT  keyindex;
-    UINT  stateindex;
-    PBYTE pbyst;
-    UINT  idx;
+       unsigned int ust1, ust2;
+       unsigned int keyindex;
+       unsigned int stateindex;
+       unsigned char *pbyst;
+       unsigned int idx;
 
-    pbyst = pRC4->abystate;
-    pRC4->ux = 0;
-    pRC4->uy = 0;
-    for (idx = 0; idx < 256; idx++)
-        pbyst[idx] = (BYTE)idx;
-    keyindex = 0;
-    stateindex = 0;
-    for (idx = 0; idx < 256; idx++) {
-        ust1 = pbyst[idx];
-        stateindex = (stateindex + pbyKey[keyindex] + ust1) & 0xff;
-        ust2 = pbyst[stateindex];
-        pbyst[stateindex] = (BYTE)ust1;
-        pbyst[idx] = (BYTE)ust2;
-        if (++keyindex >= cbKey_len)
-            keyindex = 0;
-    }
+       pbyst = pRC4->abystate;
+       pRC4->ux = 0;
+       pRC4->uy = 0;
+       for (idx = 0; idx < 256; idx++)
+               pbyst[idx] = (unsigned char)idx;
+       keyindex = 0;
+       stateindex = 0;
+       for (idx = 0; idx < 256; idx++) {
+               ust1 = pbyst[idx];
+               stateindex = (stateindex + pbyKey[keyindex] + ust1) & 0xff;
+               ust2 = pbyst[stateindex];
+               pbyst[stateindex] = (unsigned char)ust1;
+               pbyst[idx] = (unsigned char)ust2;
+               if (++keyindex >= cbKey_len)
+                       keyindex = 0;
+       }
 }
 
-UINT rc4_byte(PRC4Ext pRC4)
+unsigned int rc4_byte(PRC4Ext pRC4)
 {
-    UINT ux;
-    UINT uy;
-    UINT ustx, usty;
-    PBYTE pbyst;
+       unsigned int ux;
+       unsigned int uy;
+       unsigned int ustx, usty;
+       unsigned char *pbyst;
 
-    pbyst = pRC4->abystate;
-    ux = (pRC4->ux + 1) & 0xff;
-    ustx = pbyst[ux];
-    uy = (ustx + pRC4->uy) & 0xff;
-    usty = pbyst[uy];
-    pRC4->ux = ux;
-    pRC4->uy = uy;
-    pbyst[uy] = (BYTE)ustx;
-    pbyst[ux] = (BYTE)usty;
+       pbyst = pRC4->abystate;
+       ux = (pRC4->ux + 1) & 0xff;
+       ustx = pbyst[ux];
+       uy = (ustx + pRC4->uy) & 0xff;
+       usty = pbyst[uy];
+       pRC4->ux = ux;
+       pRC4->uy = uy;
+       pbyst[uy] = (unsigned char)ustx;
+       pbyst[ux] = (unsigned char)usty;
 
-    return pbyst[(ustx + usty) & 0xff];
+       return pbyst[(ustx + usty) & 0xff];
 }
 
-void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest,
-                     PBYTE pbySrc, UINT cbData_len)
+void rc4_encrypt(PRC4Ext pRC4, unsigned char *pbyDest,
+                unsigned char *pbySrc, unsigned int cbData_len)
 {
-    UINT ii;
-    for (ii = 0; ii < cbData_len; ii++)
-        pbyDest[ii] = (BYTE)(pbySrc[ii] ^ rc4_byte(pRC4));
+       unsigned int ii;
+       for (ii = 0; ii < cbData_len; ii++)
+               pbyDest[ii] = (unsigned char)(pbySrc[ii] ^ rc4_byte(pRC4));
 }