summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-03-01 21:17:50 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-03-01 21:17:50 +0000
commit81418b7c773082cdb0e95c8236cebfebfaf7a860 (patch)
treeb5ab0038daf4012efd9f012a3c00195a26b5b3e6 /crypto
parent8bd0c77ae3f369ded26a6691649d4f9bf8b51bd0 (diff)
Update from HEAD.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/evp/evp_key.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c
index 0a27f496c9..361ea69ab6 100644
--- a/crypto/evp/evp_key.c
+++ b/crypto/evp/evp_key.c
@@ -126,7 +126,8 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
EVP_MD_CTX_init(&c);
for (;;)
{
- EVP_DigestInit_ex(&c,md, NULL);
+ if (!EVP_DigestInit_ex(&c,md, NULL))
+ return 0;
if (addmd++)
EVP_DigestUpdate(&c,&(md_buf[0]),mds);
EVP_DigestUpdate(&c,data,datal);