From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 1 Mar 2006 21:17:50 +0000 (+0000)
Subject: Update from HEAD.
X-Git-Tag: OpenSSL_0_9_8b~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=81418b7c773082cdb0e95c8236cebfebfaf7a860;p=oweals%2Fopenssl.git

Update from HEAD.
---

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);