From 2236cfa9794805b4cdf2654fd3ca1421345a11a1 Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Fri, 19 Jun 2015 06:05:11 +0000
Subject: [PATCH] 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/crypto/arch/alpha/opensslconf.h   | 1 -
 src/lib/libcrypto/crypto/arch/amd64/opensslconf.h   | 1 -
 src/lib/libcrypto/crypto/arch/arm/opensslconf.h     | 1 -
 src/lib/libcrypto/crypto/arch/hppa/opensslconf.h    | 1 -
 src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h  | 1 -
 src/lib/libcrypto/crypto/arch/i386/opensslconf.h    | 1 -
 src/lib/libcrypto/crypto/arch/m88k/opensslconf.h    | 1 -
 src/lib/libcrypto/crypto/arch/mips64/opensslconf.h  | 1 -
 src/lib/libcrypto/crypto/arch/powerpc/opensslconf.h | 1 -
 src/lib/libcrypto/crypto/arch/sh/opensslconf.h      | 1 -
 src/lib/libcrypto/crypto/arch/sparc/opensslconf.h   | 1 -
 src/lib/libcrypto/crypto/arch/sparc64/opensslconf.h | 1 -
 src/lib/libcrypto/crypto/arch/vax/opensslconf.h     | 1 -
 13 files changed, 13 deletions(-)

diff --git a/src/lib/libcrypto/crypto/arch/alpha/opensslconf.h b/src/lib/libcrypto/crypto/arch/alpha/opensslconf.h
index 6e1e9b6f..a74c6df6 100644
--- a/src/lib/libcrypto/crypto/arch/alpha/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/alpha/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h
index c64d4d33..cbd5d53c 100644
--- a/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/arm/opensslconf.h b/src/lib/libcrypto/crypto/arch/arm/opensslconf.h
index afbd54ed..e3795ce7 100644
--- a/src/lib/libcrypto/crypto/arch/arm/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/arm/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/hppa/opensslconf.h b/src/lib/libcrypto/crypto/arch/hppa/opensslconf.h
index afbd54ed..e3795ce7 100644
--- a/src/lib/libcrypto/crypto/arch/hppa/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/hppa/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h b/src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h
index 73df98a2..54b8f59b 100644
--- a/src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/i386/opensslconf.h b/src/lib/libcrypto/crypto/arch/i386/opensslconf.h
index e47000cf..37137ff1 100644
--- a/src/lib/libcrypto/crypto/arch/i386/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/i386/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/m88k/opensslconf.h b/src/lib/libcrypto/crypto/arch/m88k/opensslconf.h
index afbd54ed..e3795ce7 100644
--- a/src/lib/libcrypto/crypto/arch/m88k/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/m88k/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/mips64/opensslconf.h b/src/lib/libcrypto/crypto/arch/mips64/opensslconf.h
index 52159f30..ef7a679d 100644
--- a/src/lib/libcrypto/crypto/arch/mips64/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/mips64/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/powerpc/opensslconf.h b/src/lib/libcrypto/crypto/arch/powerpc/opensslconf.h
index afbd54ed..e3795ce7 100644
--- a/src/lib/libcrypto/crypto/arch/powerpc/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/powerpc/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/sh/opensslconf.h b/src/lib/libcrypto/crypto/arch/sh/opensslconf.h
index afbd54ed..e3795ce7 100644
--- a/src/lib/libcrypto/crypto/arch/sh/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/sh/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/sparc/opensslconf.h b/src/lib/libcrypto/crypto/arch/sparc/opensslconf.h
index afbd54ed..e3795ce7 100644
--- a/src/lib/libcrypto/crypto/arch/sparc/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/sparc/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/sparc64/opensslconf.h b/src/lib/libcrypto/crypto/arch/sparc64/opensslconf.h
index 52159f30..ef7a679d 100644
--- a/src/lib/libcrypto/crypto/arch/sparc64/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/sparc64/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif
 
diff --git a/src/lib/libcrypto/crypto/arch/vax/opensslconf.h b/src/lib/libcrypto/crypto/arch/vax/opensslconf.h
index afbd54ed..e3795ce7 100644
--- a/src/lib/libcrypto/crypto/arch/vax/opensslconf.h
+++ b/src/lib/libcrypto/crypto/arch/vax/opensslconf.h
@@ -5,7 +5,6 @@
 #undef I386_ONLY
 
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
 #define OPENSSLDIR "/etc/ssl"
 #endif