From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 9 Mar 2002 18:58:05 +0000 (+0000)
Subject: Make ciphers and digests obtain an ENGINE functional reference
X-Git-Tag: OpenSSL_0_9_6d~20^2~84
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bf6a9e66d6b339770dcc8733f97fd6eb10d58d6c;p=oweals%2Fopenssl.git

Make ciphers and digests obtain an ENGINE functional reference
if impl is explicitly supplied.
---

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 12c6cec5d8..a969ac69ed 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -152,7 +152,15 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl)
 		 * ENGINE and EVP_MD could be used). */
 		if(ctx->engine)
 			ENGINE_finish(ctx->engine);
-		if(!impl)
+		if(impl)
+			{
+			if (!ENGINE_init(impl))
+				{
+				EVPerr(EVP_F_EVP_DIGESTINIT, EVP_R_INITIALIZATION_ERROR);
+				return 0;
+				}
+			}
+		else
 			/* Ask if an ENGINE is reserved for this job */
 			impl = ENGINE_get_digest_engine(type->type);
 		if(impl)
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 9c65a553d3..22a7b745c1 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -100,7 +100,15 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp
 		 * ENGINE and EVP_CIPHER could be used). */
 		if(ctx->engine)
 			ENGINE_finish(ctx->engine);
-		if(!impl)
+		if(impl)
+			{
+			if (!ENGINE_init(impl))
+				{
+				EVPerr(EVP_F_EVP_CIPHERINIT, EVP_R_INITIALIZATION_ERROR);
+				return 0;
+				}
+			}
+		else
 			/* Ask if an ENGINE is reserved for this job */
 			impl = ENGINE_get_cipher_engine(cipher->nid);
 		if(impl)