Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186638
b: refs/heads/master
c: 0daa04a
h: refs/heads/master
v: v3
  • Loading branch information
Simon Horman authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 2e1c70a commit f173c7b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: e36e8c0add960eb523a8a1bc93c7efa744339415
refs/heads/master: 0daa04a586f03de8f9022e29fb41c9dc0de28c4a
5 changes: 3 additions & 2 deletions trunk/drivers/staging/otus/80211core/ctkip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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->tk, key, 16);

iv16 = *initIv++;
iv16 = *initIv;
initIv++;
iv16 += *initIv<<8;
initIv++;

Expand All @@ -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
{
iv32 += *initIv<<(i*8);
*initIv++;
initIv++;
}

pSeed->iv32 = iv32+1; // Force Recalculating on Tkip Phase1
Expand Down

0 comments on commit f173c7b

Please sign in to comment.