From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 28 Jan 2014 13:51:58 +0000 (+0000)
Subject: Add loaded dynamic ENGINEs to list.
X-Git-Tag: OpenSSL_1_0_0m~89
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=158d06160985fe15abff0d4ecab664b1d1064ed3;p=oweals%2Fopenssl.git

Add loaded dynamic ENGINEs to list.

Always add a dynamically loaded ENGINE to list. Otherwise it can cause
problems when multiply loaded, especially if it adds new public key methods.
For all current engines we only want a single implementation anyway.
(cherry picked from commit e933f91f50108a43c0198cdc63ecdfdbc77b4d0d)
---

diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index 27846edb1e..95c858960b 100644
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.c
@@ -408,6 +408,7 @@ ENGINE *ENGINE_by_id(const char *id)
 				!ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||
 				!ENGINE_ctrl_cmd_string(iterator, "DIR_ADD",
 					load_dir, 0) ||
+				!ENGINE_ctrl_cmd_string(iterator, "LIST_ADD", "1", 0) ||
 				!ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
 				goto notfound;
 		return iterator;