Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363539
b: refs/heads/master
c: 7e58568
h: refs/heads/master
i:
  363537: b7bd591
  363535: 0770582
v: v3
  • Loading branch information
Joe Perches authored and Greg Kroah-Hartman committed Mar 19, 2013
1 parent 1df80a4 commit cbd4468
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 474f0f89ef01f3b628fa84c488e9e029a081ce9b
refs/heads/master: 7e58568f13f325233687aa288d412848fef0d8e8
78 changes: 39 additions & 39 deletions trunk/drivers/staging/vt6655/rc4.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,54 +34,54 @@

void rc4_init(PRC4Ext pRC4, unsigned char *pbyKey, unsigned int cbKey_len)
{
unsigned int ust1, ust2;
unsigned int keyindex;
unsigned int stateindex;
unsigned char *pbyst;
unsigned int 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] = (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;
}
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;
}
}

unsigned int rc4_byte(PRC4Ext pRC4)
{
unsigned int ux;
unsigned int uy;
unsigned int ustx, usty;
unsigned char *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] = (unsigned char)ustx;
pbyst[ux] = (unsigned char)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, unsigned char *pbyDest,
unsigned char *pbySrc, unsigned int cbData_len)
unsigned char *pbySrc, unsigned int cbData_len)
{
unsigned int ii;
for (ii = 0; ii < cbData_len; ii++)
pbyDest[ii] = (unsigned char)(pbySrc[ii] ^ rc4_byte(pRC4));
unsigned int ii;
for (ii = 0; ii < cbData_len; ii++)
pbyDest[ii] = (unsigned char)(pbySrc[ii] ^ rc4_byte(pRC4));
}
6 changes: 3 additions & 3 deletions trunk/drivers/staging/vt6655/rc4.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
/*--------------------- Export Definitions -------------------------*/
/*--------------------- Export Types ------------------------------*/
typedef struct {
unsigned int ux;
unsigned int uy;
unsigned char abystate[256];
unsigned int ux;
unsigned int uy;
unsigned char abystate[256];
} RC4Ext, *PRC4Ext;

void rc4_init(PRC4Ext pRC4, unsigned char *pbyKey, unsigned int cbKey_len);
Expand Down

0 comments on commit cbd4468

Please sign in to comment.