summaryrefslogtreecommitdiff
path: root/crypto/openssl/crypto/buffer
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2012-05-30 12:01:28 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2012-05-30 12:01:28 +0000
commit071183ef48062f3d4cd317aac2b7639dc2d70dc9 (patch)
tree65737bc2effe2c9fe69b85d98c9b789db453e3d5 /crypto/openssl/crypto/buffer
parenta856ddc6658d0602ba942b1c357be145a033ead5 (diff)
downloadsrc-test2-071183ef48062f3d4cd317aac2b7639dc2d70dc9.tar.gz
src-test2-071183ef48062f3d4cd317aac2b7639dc2d70dc9.zip
Update the previous openssl fix. [12:01]
Fix a bug in crypt(3) ignoring characters of a passphrase. [12:02] Security: FreeBSD-SA-12:01.openssl (revised) Security: FreeBSD-SA-12:02.crypt Approved by: so (bz, simon)
Notes
Notes: svn path=/head/; revision=236304
Diffstat (limited to 'crypto/openssl/crypto/buffer')
-rw-r--r--crypto/openssl/crypto/buffer/buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/buffer/buffer.c b/crypto/openssl/crypto/buffer/buffer.c
index 0335d48f68af..3b4c79f7048c 100644
--- a/crypto/openssl/crypto/buffer/buffer.c
+++ b/crypto/openssl/crypto/buffer/buffer.c
@@ -166,7 +166,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, int len)
/* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */
if (len > LIMIT_BEFORE_EXPANSION)
{
- BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
+ BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE);
return 0;
}
n=(len+3)/3*4;