[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  44589b5d44217aacbceff08f8317c2a0a4e0ff40 (commit)
      from  6ffaf15d2363e782c6feeb8285a570986d03dd99 (commit)


- Log -----------------------------------------------------------------
commit 44589b5d44217aacbceff08f8317c2a0a4e0ff40
Author: Pauli <paul.dale at oracle.com>
Date:   Fri Sep 15 08:01:42 2017 +1000

    Add explanatory comment about fitting into a size_t.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4373)

-----------------------------------------------------------------------

Summary of changes:
 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 80a1acd..b30e6d5 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;