summaryrefslogtreecommitdiff
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:34 +0000
commitad03c71ea173680f1aa2af5cfdfbd09be47d7ef1 (patch)
tree58ef2305ff0e24d77944db2cd6cab8790c01dc3d
parent4eedf86a163284478140c46edb7b462d33898c93 (diff)
downloadopenssl-new-ad03c71ea173680f1aa2af5cfdfbd09be47d7ef1.tar.gz
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)
-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;