From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 5 Jun 2008 15:13:03 +0000 (+0000)
Subject: If auto load ENGINE lookup fails retry adding builtin ENGINEs.
X-Git-Tag: OpenSSL_0_9_8i~53
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0278e15fa358bc1d09bfed8132fb347bb3986a5c;p=oweals%2Fopenssl.git

If auto load ENGINE lookup fails retry adding builtin ENGINEs.
---

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index c834eada16..5c6ca2e666 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1525,6 +1525,12 @@ SSL_CTX *SSL_CTX_new(SSL_METHOD *meth)
 	{
 	ENGINE *eng;
 	eng = ENGINE_by_id(eng_str(OPENSSL_SSL_CLIENT_ENGINE_AUTO));
+	if (!eng)
+		{
+		ERR_clear_error();
+		ENGINE_load_builtin_engines();
+		eng = ENGINE_by_id(eng_str(OPENSSL_SSL_CLIENT_ENGINE_AUTO));
+		}
 	if (!eng || !SSL_CTX_set_client_cert_engine(ret, eng))
 		ERR_clear_error();
 	}