wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

wc_scrypt: Check for underflow in blocksSz calculation.

Browse Source
This commit is contained in:
Kareem
2021-10-28 14:18:22 -07:00
parent 6bb7e3900e
commit 0ecb81e74a
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wolfcrypt/src/pwdbased.c
View File

@ -566,6 +566,11 @@ int wc_PKCS12_PBKDF_ex(byte* output, const byte* passwd, int passLen,
*/ */
#define R(a, b) rotlFixed(a, b) #define R(a, b) rotlFixed(a, b)
/* (2^32 - 1) */
#define WORD32_MAX 4294967295
/* (2^32 - 1) * 32, used in a couple of scrypt max calculations. */
#define SCRYPT_MAX 137438953440
/* One round of Salsa20/8. /* One round of Salsa20/8.
* Code taken from RFC 7914: scrypt PBKDF. * Code taken from RFC 7914: scrypt PBKDF.
* *
@ -755,7 +760,15 @@ int wc_scrypt(byte* output, const byte* passwd, int passLen,
if (cost < 1 || cost >= 128 * blockSize / 8 || parallel < 1 || dkLen < 1) if (cost < 1 || cost >= 128 * blockSize / 8 || parallel < 1 || dkLen < 1)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (parallel > (SCRYPT_MAX / (128 * blockSize)))
return BAD_FUNC_ARG;
if (blockSize > (WORD32_MAX / 128))
return BAD_FUNC_ARG;
bSz = 128 * blockSize; bSz = 128 * blockSize;
if (parallel > (WORD32_MAX / bSz))
return BAD_FUNC_ARG;
blocksSz = bSz * parallel; blocksSz = bSz * parallel;
blocks = (byte*)XMALLOC(blocksSz, NULL, DYNAMIC_TYPE_TMP_BUFFER); blocks = (byte*)XMALLOC(blocksSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (blocks == NULL) { if (blocks == NULL) {