From: Nils Larsch <nils@openssl.org>
Date: Sat, 6 Aug 2005 10:34:35 +0000 (+0000)
Subject: avoid infinite recursion if dynamic engine isn't loaded
X-Git-Tag: OpenSSL_0_9_8a~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d7e35e037163319142be0d9bf51d99e96ee6e91f;p=oweals%2Fopenssl.git

avoid infinite recursion if dynamic engine isn't loaded

Submitted by: Jonathon Green <jonathon_au@yahoo.com>
---

diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index f337e0f3bc..bd511944ba 100644
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.c
@@ -394,19 +394,23 @@ ENGINE *ENGINE_by_id(const char *id)
 #else
 	/* EEK! Experimental code starts */
 	if(iterator) return iterator;
+	/* Prevent infinite recusrion if we're looking for the dynamic engine. */
+	if (strcmp(id, "dynamic"))
+		{
 #ifdef OPENSSL_SYS_VMS
-	if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]";
+		if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]";
 #else
-	if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR;
+		if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR;
 #endif
-	iterator = ENGINE_by_id("dynamic");
-	if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
-			!ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||
-			!ENGINE_ctrl_cmd_string(iterator, "DIR_ADD",
-				load_dir, 0) ||
-			!ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
-		goto notfound;
-	return iterator;
+		iterator = ENGINE_by_id("dynamic");
+		if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
+				!ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||
+				!ENGINE_ctrl_cmd_string(iterator, "DIR_ADD",
+					load_dir, 0) ||
+				!ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
+				goto notfound;
+		return iterator;
+		}
 notfound:
 	ENGINEerr(ENGINE_F_ENGINE_BY_ID,ENGINE_R_NO_SUCH_ENGINE);
 	ERR_add_error_data(2, "id=", id);