Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-10 09:19:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

failure to save cx->i and cx->j caused second arcfour encrypt/decrypt to return garbage: bug 52192 r=mcgreer

Browse Source
This commit is contained in:
jgmyers%netscape.com 2000-09-12 23:02:24 +00:00
parent adfa88a416
commit 3d68e7a779
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
security/nss/lib/freebl/arcfour.c
View File

@ -208,6 +208,8 @@ rc4_no_opt(RC4Context *cx, unsigned char *output,
output[index] = cx->S[t] ^ input[index];
}
*outputLen = inputLen;
cx->i = tmpi;
cx->j = tmpj;
return SECSuccess;
}
@ -460,9 +462,12 @@ rc4_wordconv(RC4Context *cx, unsigned char *output,
*pOutWord++ = inWord ^ streamWord;
inWord = nextInWord;
}
if (inputLen == 0)
if (inputLen == 0) {
/* Nothing left to do. */
cx->i = tmpi;
cx->j = tmpj;
return SECSuccess;
}
/* If the amount of remaining input is greater than the amount
* bytes pulled from the current input word, need to do another
* word load. What's left in inWord will be consumed in step 3.
@ -477,6 +482,8 @@ rc4_wordconv(RC4Context *cx, unsigned char *output,
}
if (inputLen == 0) {
/* Nothing left to do. */
cx->i = tmpi;
cx->j = tmpj;
return SECSuccess;
} else {
/* A partial input word remains at the tail. Load it. The
@ -502,6 +509,8 @@ rc4_wordconv(RC4Context *cx, unsigned char *output,
mask |= 0xff << 8*i;
}
*pOutWord = (*pOutWord & ~mask) | ((inWord ^ streamWord) & mask);
cx->i = tmpi;
cx->j = tmpj;
return SECSuccess;
}