feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #2578 from cariepointer/ZD-9478-and-9479

Browse Source 
Add sanity checks for parameters in wc_scrypt and wc_Arc4SetKey
This commit is contained in:
toddouska
2019-12-19 10:59:05 -08:00
committed by GitHub
parent 2aa8fa2de6 cfd91fb0b8
commit 3342a19e29
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/arc4.c
View File

@ -38,7 +38,7 @@ int wc_Arc4SetKey(Arc4* arc4, const byte* key, word32 length)
word32 i;
word32 keyIndex = 0, stateIndex = 0;
if (arc4 == NULL || key == NULL) {
if (arc4 == NULL || key == NULL || length == 0) {
return BAD_FUNC_ARG;
}

2
wolfcrypt/src/pwdbased.c
View File

@ -715,7 +715,7 @@ int wc_scrypt(byte* output, const byte* passwd, int passLen,
if (blockSize > 8)
return BAD_FUNC_ARG;
if (cost < 1 || cost >= 128 * blockSize / 8)
if (cost < 1 || cost >= 128 * blockSize / 8 || parallel < 1 || dkLen < 1)
return BAD_FUNC_ARG;
bSz = 128 * blockSize;