wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4515 from kareem-wolfssl/zd13006

Browse Source 
wc_scrypt: Check for underflow in blocksSz calculation.
This commit is contained in:
David Garske
2021-10-29 08:23:37 -07:00
committed by GitHub
parent 6b3ff9bae2 39c9fa96bc
commit 8a8a6cf17f
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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)
/* (2^32 - 1) */
#define SCRYPT_WORD32_MAX 4294967295U
/* (2^32 - 1) * 32, used in a couple of scrypt max calculations. */
#define SCRYPT_MAX 137438953440UL
/* One round of Salsa20/8.
* Code taken from RFC 7914: scrypt PBKDF.
*
@@ -755,7 +760,12 @@ int wc_scrypt(byte* output, const byte* passwd, int passLen,
if (cost < 1 || cost >= 128 * blockSize / 8 || parallel < 1 || dkLen < 1)
return BAD_FUNC_ARG;
if ((word32)parallel > (SCRYPT_MAX / (128 * blockSize)))
return BAD_FUNC_ARG;
bSz = 128 * blockSize;
if ((word32)parallel > (SCRYPT_WORD32_MAX / bSz))
return BAD_FUNC_ARG;
blocksSz = bSz * parallel;
blocks = (byte*)XMALLOC(blocksSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (blocks == NULL) {

6
wolfcrypt/test/test.c
View File

@@ -20179,6 +20179,12 @@ WOLFSSL_TEST_SUBROUTINE int scrypt_test(void)
if (XMEMCMP(derived, verify2, sizeof(verify2)) != 0)
return -9203;
/* Test case with parallel overflowing */
ret = wc_scrypt(derived, (byte*)"password", 16, (byte*)"NaCl", 16, 2, 4, 8388608,
sizeof(verify2));
if (ret != BAD_FUNC_ARG)
return -9210;
/* Don't run these test on embedded, since they use large mallocs */
#if !defined(BENCH_EMBEDDED) && !defined(WOLFSSL_LINUXKM) && !defined(HAVE_INTEL_QA)
ret = wc_scrypt(derived, (byte*)"pleaseletmein", 13,