Commit 76b2ae83 authored by Pauli's avatar Pauli
Browse files

Ensure that the requested memory size cannot exceed the limit imposed by a 


size_t variable.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4357)
parent f4eb2483

crypto/evp/pbe_scrypt.c

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, 


    if (maxmem == 0)

        maxmem = SCRYPT_MAX_MEM;

    if (maxmem > SIZE_MAX)

        maxmem = SIZE_MAX;



    if (Blen + Vlen > maxmem) {

        EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_MEMORY_LIMIT_EXCEEDED);