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

static.

diff --git a/crypto/engine/hw_4758_cca.c b/crypto/engine/hw_4758_cca.c
index 6d41b9ed2ad93b9211d1c4abc338d280e2bb67cd..55a9883ef5dc8338cee0ff4a560ca5d2109447fc 100644 (file)
--- a/crypto/engine/hw_4758_cca.c
+++ b/crypto/engine/hw_4758_cca.c
@@ -223,6 +223,7 @@ static int bind_helper(ENGINE *e)
        return 1;
        }
 
+#ifndef ENGINE_DYNAMIC_SUPPORT
 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/crypto/engine/hw_atalla.c b/crypto/engine/hw_atalla.c
index 6151c469024b0698f7c63878e08c109b469c7661..e9eff9fad11ec1d8a6f3404cc09273d900e04917 100644 (file)
--- a/crypto/engine/hw_atalla.c
+++ b/crypto/engine/hw_atalla.c
@@ -242,6 +242,7 @@ static int bind_helper(ENGINE *e)
        return 1;
        }
 
+#ifndef ENGINE_DYNAMIC_SUPPORT
 static ENGINE *engine_atalla(void)
        {
        ENGINE *ret = ENGINE_new();
@@ -264,6 +265,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/crypto/engine/hw_cswift.c b/crypto/engine/hw_cswift.c
index 1b4e4e876ecac0253d85a74b3a839efe8a8bd1f1..f128ee5a68d94d4d1bbad3c2d2f0b0ca86242c5b 100644 (file)
--- a/crypto/engine/hw_cswift.c
+++ b/crypto/engine/hw_cswift.c
@@ -259,6 +259,7 @@ static int bind_helper(ENGINE *e)
        return 1;
        }
 
+#ifndef ENGINE_DYNAMIC_SUPPORT
 static ENGINE *engine_cswift(void)
        {
        ENGINE *ret = ENGINE_new();
@@ -281,6 +282,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/crypto/engine/hw_ncipher.c b/crypto/engine/hw_ncipher.c
index a43d4360f2a6c22bac789cc38a990458cd4d7524..488aea424470dbae93527f0ca277ba9cc84abdbb 100644 (file)
--- a/crypto/engine/hw_ncipher.c
+++ b/crypto/engine/hw_ncipher.c
@@ -373,6 +373,7 @@ static int bind_helper(ENGINE *e)
        return 1;
        }
 
+#ifndef ENGINE_DYNAMIC_SUPPORT
 static ENGINE *engine_ncipher(void)
        {
        ENGINE *ret = ENGINE_new();
@@ -395,6 +396,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/crypto/engine/hw_nuron.c b/crypto/engine/hw_nuron.c
index 130b6d8b40571e40bdd034d80dc4d16e3974392a..fb9188bfe5be49e6e2fcb599d23474bf00d296ca 100644 (file)
--- a/crypto/engine/hw_nuron.c
+++ b/crypto/engine/hw_nuron.c
@@ -374,6 +374,7 @@ static int bind_helper(ENGINE *e)
        return 1;
        }
 
+#ifndef ENGINE_DYNAMIC_SUPPORT
 static ENGINE *engine_nuron(void)
        {
        ENGINE *ret = ENGINE_new();
@@ -396,6 +397,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/crypto/engine/hw_ubsec.c b/crypto/engine/hw_ubsec.c
index ed8401ec162655ed0948b1caa4ae1efa08fe4a50..6286dd851c61a2347b8e90c80592e9f804938b7a 100644 (file)
--- a/crypto/engine/hw_ubsec.c
+++ b/crypto/engine/hw_ubsec.c
@@ -242,6 +242,7 @@ static int bind_helper(ENGINE *e)
        return 1;
        }
 
+#ifndef ENGINE_DYNAMIC_SUPPORT
 static ENGINE *engine_ubsec(void)
        {
        ENGINE *ret = ENGINE_new();
@@ -264,6 +265,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