diff options
| author | Pauli <paul.dale@oracle.com> | 2017-09-15 08:01:42 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-09-15 09:02:00 +1000 |
| commit | 44589b5d44217aacbceff08f8317c2a0a4e0ff40 (patch) | |
| tree | 443934112aea805127b75c234aeebe3f94d7ca4e /crypto/evp/pbe_scrypt.c | |
| parent | 6ffaf15d2363e782c6feeb8285a570986d03dd99 (diff) | |
Add explanatory comment about fitting into a size_t.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4373)
Diffstat (limited to 'crypto/evp/pbe_scrypt.c')
| -rw-r--r-- | crypto/evp/pbe_scrypt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/evp/pbe_scrypt.c b/crypto/evp/pbe_scrypt.c index 80a1acd2ce..b30e6d5719 100644 --- a/crypto/evp/pbe_scrypt.c +++ b/crypto/evp/pbe_scrypt.c @@ -207,6 +207,8 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, if (maxmem == 0) maxmem = SCRYPT_MAX_MEM; + + /* Check that the maximum memory doesn't exceed a size_t limits */ if (maxmem > SIZE_MAX) maxmem = SIZE_MAX; |