From 3293ee7f21e12c11500db87f81e518c9dada1317 Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Fri, 19 Jun 2015 06:05:11 +0000
Subject: Disable ENGINE_load_dynamic (dynamic engine support).

We do not build, test or ship any dynamic engines, so we can remove the dynamic
engine loader as well. This leaves a stub initialization function in its place.

ok beck@, reyk@, miod@
---
 src/lib/libcrypto/engine/eng_list.c | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

(limited to 'src/lib/libcrypto/engine/eng_list.c')

diff --git a/src/lib/libcrypto/engine/eng_list.c b/src/lib/libcrypto/engine/eng_list.c
index 939cc82b17..7f3cb35515 100644
--- a/src/lib/libcrypto/engine/eng_list.c
+++ b/src/lib/libcrypto/engine/eng_list.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_list.c,v 1.18 2015/04/11 16:03:21 deraadt Exp $ */
+/* $OpenBSD: eng_list.c,v 1.19 2015/06/19 06:05:11 bcook Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -351,7 +351,6 @@ ENGINE *
 ENGINE_by_id(const char *id)
 {
 	ENGINE *iterator;
-	char *load_dir = NULL;
 
 	if (id == NULL) {
 		ENGINEerr(ENGINE_F_ENGINE_BY_ID,
@@ -381,30 +380,9 @@ ENGINE_by_id(const char *id)
 	}
 	CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
 
-	/* EEK! Experimental code starts */
-	if (iterator)
-		return iterator;
-	/* Prevent infinite recusrion if we're looking for the dynamic engine. */
-	if (strcmp(id, "dynamic")) {
-		load_dir = ENGINESDIR;
-
-		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, "LIST_ADD", "1", 0) ||
-		    !ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
-			goto notfound;
-		return iterator;
-	}
-
-notfound:
-	ENGINE_free(iterator);
-	ENGINEerr(ENGINE_F_ENGINE_BY_ID, ENGINE_R_NO_SUCH_ENGINE);
-	ERR_asprintf_error_data("id=%s", id);
-	return NULL;
-	/* EEK! Experimental code ends */
+	if (iterator == NULL)
+		ENGINEerr(ENGINE_F_ENGINE_BY_ID, ENGINE_R_NO_SUCH_ENGINE);
+	return iterator;
 }
 
 int
-- 
cgit v1.2.3-55-g6feb