summaryrefslogtreecommitdiffstats
path: root/crypto/evp/pbe_scrypt.c
AgeCommit message (Collapse)Author
2017-11-13evp/pbe_scrypt.c: add boundary condition for implicit cast.Andy Polyakov
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)
2017-09-15Add explanatory comment about fitting into a size_t.Pauli
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4373)
2017-09-14Ensure that the requested memory size cannot exceed the limit imposed by aPauli
size_t variable. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4357)
2017-09-14Manually revert "Ensure allocation size fits into size_t"Pauli
This reverts commit cc9c56894606fdf324933cd8090d9a54d967bf5b for the file pbe_scrypt.c instead of scrypt.c Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4357)
2017-08-22Use "" not <> for internal/ includesRich Salz
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4217)
2017-08-15Rename crypto/evp/scrypt.c to crypto/evp/pbe_scrypt.cRichard Levitte
There already is a scrypt.c in crypto/kdf/, both becoming script.o or script.obj. With some linkers, the same object files name more than once means one of them is dropped, either when building shared libraries or when building executables from static libraries. Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4164)