From: Richard Levitte <levitte@openssl.org>
Date: Wed, 13 Nov 2002 15:30:25 +0000 (+0000)
Subject: When build as dynamic engines, the loading functions should be defined
X-Git-Tag: OpenSSL_0_9_7-beta4~18^2~46
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8f797f14b8ff7d3d5cb04443284259a0c94860b3;p=oweals%2Fopenssl.git

When build as dynamic engines, the loading functions should be defined
static.
---

diff --git a/engines/e_4758_cca.c b/engines/e_4758_cca.c
index 203a8a75e6..84de02df92 100644
--- a/engines/e_4758_cca.c
+++ b/engines/e_4758_cca.c
@@ -223,6 +223,7 @@ static int bind_helper(ENGINE *e)
 	return 1;
 	}
 
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_4758_cca(void)
 	{
 	ENGINE *ret = ENGINE_new();
@@ -244,6 +245,7 @@ void ENGINE_load_4758cca(void)
 	ENGINE_free(e_4758);
 	ERR_clear_error();   
 	}
+#endif
 
 static int ibm_4758_cca_destroy(ENGINE *e)
 	{
diff --git a/engines/e_atalla.c b/engines/e_atalla.c
index 65339a0d68..9922189420 100644
--- a/engines/e_atalla.c
+++ b/engines/e_atalla.c
@@ -243,6 +243,7 @@ static int bind_helper(ENGINE *e)
 	return 1;
 	}
 
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_atalla(void)
 	{
 	ENGINE *ret = ENGINE_new();
@@ -265,6 +266,7 @@ void ENGINE_load_atalla(void)
 	ENGINE_free(toadd);
 	ERR_clear_error();
 	}
+#endif
 
 /* This is a process-global DSO handle used for loading and unloading
  * the Atalla library. NB: This is only set (or unset) during an
diff --git a/engines/e_cswift.c b/engines/e_cswift.c
index f3d3628366..ac4909857a 100644
--- a/engines/e_cswift.c
+++ b/engines/e_cswift.c
@@ -262,6 +262,7 @@ static int bind_helper(ENGINE *e)
 	return 1;
 	}
 
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_cswift(void)
 	{
 	ENGINE *ret = ENGINE_new();
@@ -284,6 +285,7 @@ void ENGINE_load_cswift(void)
 	ENGINE_free(toadd);
 	ERR_clear_error();
 	}
+#endif
 
 /* This is a process-global DSO handle used for loading and unloading
  * the CryptoSwift library. NB: This is only set (or unset) during an
diff --git a/engines/e_ncipher.c b/engines/e_ncipher.c
index f38a6a6b35..6126948ed1 100644
--- a/engines/e_ncipher.c
+++ b/engines/e_ncipher.c
@@ -372,6 +372,7 @@ static int bind_helper(ENGINE *e)
 	return 1;
 	}
 
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_ncipher(void)
 	{
 	ENGINE *ret = ENGINE_new();
@@ -394,6 +395,7 @@ void ENGINE_load_chil(void)
 	ENGINE_free(toadd);
 	ERR_clear_error();
 	}
+#endif
 
 /* This is a process-global DSO handle used for loading and unloading
  * the HWCryptoHook library. NB: This is only set (or unset) during an
diff --git a/engines/e_nuron.c b/engines/e_nuron.c
index d7960a9d95..88f29640ec 100644
--- a/engines/e_nuron.c
+++ b/engines/e_nuron.c
@@ -375,6 +375,7 @@ static int bind_helper(ENGINE *e)
 	return 1;
 	}
 
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_nuron(void)
 	{
 	ENGINE *ret = ENGINE_new();
@@ -397,6 +398,7 @@ void ENGINE_load_nuron(void)
 	ENGINE_free(toadd);
 	ERR_clear_error();
 	}
+#endif
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */	   
diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c
index 35af495b71..c5d1f5829a 100644
--- a/engines/e_ubsec.c
+++ b/engines/e_ubsec.c
@@ -243,6 +243,7 @@ static int bind_helper(ENGINE *e)
 	return 1;
 	}
 
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_ubsec(void)
 	{
 	ENGINE *ret = ENGINE_new();
@@ -265,6 +266,7 @@ void ENGINE_load_ubsec(void)
 	ENGINE_free(toadd);
 	ERR_clear_error();
 	}
+#endif
 
 /* This is a process-global DSO handle used for loading and unloading
  * the UBSEC library. NB: This is only set (or unset) during an