summaryrefslogtreecommitdiffstats
path: root/crypto/evp/pbe_scrypt.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright yearMatt Caswell2018-04-031-1/+1
| | | | | Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5851)
* EVP,KDF: Add more error code along some return 0 in ...FdaSilvaYY2018-03-291-5/+18
| | | | | | | | | | | | | methods : - EVP_PBE_scrypt - EVP_PKEY_meth_add0 - EVP_PKEY_meth_new - EVP_PKEY_CTX_dup Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> (Merged from https://github.com/openssl/openssl/pull/5783)
* evp/pbe_scrypt.c: add boundary condition for implicit cast.Andy Polyakov2017-11-131-4/+12
| | | | | | | | 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)
* Add explanatory comment about fitting into a size_t.Pauli2017-09-151-0/+2
| | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4373)
* Ensure that the requested memory size cannot exceed the limit imposed by aPauli2017-09-141-0/+2
| | | | | | | | 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)
* Manually revert "Ensure allocation size fits into size_t"Pauli2017-09-141-11/+4
| | | | | | | | | 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)
* Use "" not <> for internal/ includesRich Salz2017-08-221-1/+1
| | | | | Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4217)
* Rename crypto/evp/scrypt.c to crypto/evp/pbe_scrypt.cRichard Levitte2017-08-151-0/+248
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)