QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-18 12:29:42 +00:00
Code Issues Projects Releases Wiki Activity

evp/pbe_scrypt.c: add boundary condition for implicit cast.

Browse Source 
Even though |Blen| is declared uint64_t it was casted implicitly to int.
[Caught by VC warning subsytem.]

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4721)
This commit is contained in:
Andy Polyakov 2017-11-11 22:15:33 +01:00
parent 3724631039
commit b4c0e4dff6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crypto/evp/pbe_scrypt.c
View File

@ -191,6 +191,14 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen,
* p * r < SCRYPT_PR_MAX * p * r < SCRYPT_PR_MAX
*/ */
Blen = p * 128 * r; Blen = p * 128 * r;
/*
* Yet we pass it as integer to PKCS5_PBKDF2_HMAC... [This would
* have to be revised when/if PKCS5_PBKDF2_HMAC accepts size_t.]
*/
if (Blen > INT_MAX) {
EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_MEMORY_LIMIT_EXCEEDED);
return 0;
}
/* /*
* Check 32 * r * (N + 2) * sizeof(uint32_t) fits in uint64_t * Check 32 * r * (N + 2) * sizeof(uint32_t) fits in uint64_t
@ -221,25 +229,25 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen,
if (key == NULL) if (key == NULL)
return 1; return 1;
B = OPENSSL_malloc(Blen + Vlen); B = OPENSSL_malloc((size_t)(Blen + Vlen));
if (B == NULL) if (B == NULL)
return 0; return 0;
X = (uint32_t *)(B + Blen); X = (uint32_t *)(B + Blen);
T = X + 32 * r; T = X + 32 * r;
V = T + 32 * r; V = T + 32 * r;
if (PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, 1, EVP_sha256(), if (PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, 1, EVP_sha256(),
Blen, B) == 0) (int)Blen, B) == 0)
goto err; goto err;
for (i = 0; i < p; i++) for (i = 0; i < p; i++)
scryptROMix(B + 128 * r * i, r, N, X, T, V); scryptROMix(B + 128 * r * i, r, N, X, T, V);
if (PKCS5_PBKDF2_HMAC(pass, passlen, B, Blen, 1, EVP_sha256(), if (PKCS5_PBKDF2_HMAC(pass, passlen, B, (int)Blen, 1, EVP_sha256(),
keylen, key) == 0) keylen, key) == 0)
goto err; goto err;
rv = 1; rv = 1;
err: err:
OPENSSL_clear_free(B, Blen + Vlen); OPENSSL_clear_free(B, (size_t)(Blen + Vlen));
return rv; return rv;
} }
#endif #endif