summaryrefslogtreecommitdiffstats
path: root/crypto/engine
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-01-28 13:51:58 +0000
committerDr. Stephen Henson <steve@openssl.org>2014-01-28 13:57:14 +0000
commit9614ed695d77476f3c929d3ebe24f5e01985d7fa (patch)
tree5039bdda2c06a24380915bb85c403d1916ab7c8f /crypto/engine
parentaabfee601ef6dfabee44adf07a8d9d125f8e34cc (diff)
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)
Diffstat (limited to 'crypto/engine')
-rw-r--r--crypto/engine/eng_list.c1
1 files changed, 1 insertions, 0 deletions
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;