projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6ffaf15
)
Add explanatory comment about fitting into a size_t.
author
Pauli
<paul.dale@oracle.com>
Thu, 14 Sep 2017 22:01:42 +0000
(08:01 +1000)
committer
Pauli
<paul.dale@oracle.com>
Thu, 14 Sep 2017 23:02:00 +0000
(09:02 +1000)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4373)
crypto/evp/pbe_scrypt.c
patch
|
blob
|
history
diff --git
a/crypto/evp/pbe_scrypt.c
b/crypto/evp/pbe_scrypt.c
index 80a1acd2ce143200cc676945b571173c75193c13..b30e6d571998f41e9208d51a53247f54e964e89e 100644
(file)
--- 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;