From 44589b5d44217aacbceff08f8317c2a0a4e0ff40 Mon Sep 17 00:00:00 2001 From: Pauli Date: Fri, 15 Sep 2017 08:01:42 +1000 Subject: [PATCH] Add explanatory comment about fitting into a size_t. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/4373) --- crypto/evp/pbe_scrypt.c | 2 ++ 1 file changed, 2 insertions(+) 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; -- 2.25.1