redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Staging: otus: zfTkipInit(): increment another pointer

Browse source 
Increment the pointer rather than its value.
These appear to be logic errors.

Thanks to Dan Carpenter for the first hunk of this change.

Cc: Dan Carpenter <error27@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Simon Horman 2010-01-12 11:50:09 +11:00 committed by Greg Kroah-Hartman
parent e36e8c0add
commit 0daa04a586
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/otus/80211core/ctkip.c
View file

@ -255,7 +255,8 @@ void zfTkipInit(u8_t* key, u8_t* ta, struct zsTkipSeed* pSeed, u8_t* initIv)
zfMemoryCopy(pSeed->ta, ta, 6); zfMemoryCopy(pSeed->ta, ta, 6);
zfMemoryCopy(pSeed->tk, key, 16); zfMemoryCopy(pSeed->tk, key, 16);
iv16 = *initIv++; iv16 = *initIv;
initIv++;
iv16 += *initIv<<8; iv16 += *initIv<<8;
initIv++; initIv++;
@ -264,7 +265,7 @@ void zfTkipInit(u8_t* key, u8_t* ta, struct zsTkipSeed* pSeed, u8_t* initIv)
for(i=0; i<4; i++) // initiv is little endian for(i=0; i<4; i++) // initiv is little endian
{ {
iv32 += *initIv<<(i*8); iv32 += *initIv<<(i*8);
*initIv++; initIv++;
} }
pSeed->iv32 = iv32+1; // Force Recalculating on Tkip Phase1 pSeed->iv32 = iv32+1; // Force Recalculating on Tkip Phase1