Step 6 of move of engines: rename the macro ENGINE_DYNAMIC_SUPPORT to

OPENSSL_NO_DYNAMIC_ENGINE and make sure that gets defined unless
shared library support has been specifically requested.

diff --git a/Configure b/Configure
index 1c00b7fdf1f1d0807ecee90036494d534ea57160..60351404cc410be8392c526d9b8485326dc2109c 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1117,6 +1117,12 @@ else
        $no_shared = 1;
        }
 
+if ($no_shared)
+       {
+       $cflags="-DOPENSSL_NO_DYNAMIC_ENGINE $cflags";
+       $openssl_other_defines.="#define OPENSSL_NO_DYNAMIC_ENGINE\n";
+       }
+
 if ($sys_id ne "")
        {
        $cflags="-DOPENSSL_SYSNAME_$sys_id $cflags";

diff --git a/engines/e_4758_cca.c b/engines/e_4758_cca.c
index 6d41b9ed2ad93b9211d1c4abc338d280e2bb67cd..b02989f3367abc1004b10cfcc12e5c2fccb0179d 100644 (file)
--- a/engines/e_4758_cca.c
+++ b/engines/e_4758_cca.c
@@ -950,7 +950,7 @@ static void cca_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad, int idx,
        }
 
 /* Goo to handle building as a dynamic engine */
-#ifdef ENGINE_DYNAMIC_SUPPORT 
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE 
 static int bind_fn(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_4758_cca_id) != 0))
@@ -961,7 +961,7 @@ static int bind_fn(ENGINE *e, const char *id)
        }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_4758_CCA */
 #endif /* !OPENSSL_NO_HW */

diff --git a/engines/e_aep.c b/engines/e_aep.c
index 8b8380a582b4d1432a76862a70ef6aff952652ce..daea7e86e9b9ae80da6a34f343452707936daf34 100644 (file)
--- a/engines/e_aep.c
+++ b/engines/e_aep.c
@@ -318,7 +318,7 @@ static int bind_aep(ENGINE *e)
        return 1;
 }
 
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_helper(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_aep_id) != 0))

diff --git a/engines/e_atalla.c b/engines/e_atalla.c
index 6151c469024b0698f7c63878e08c109b469c7661..3f7494c707d3d570a49751262f75d5b27c7eac78 100644 (file)
--- a/engines/e_atalla.c
+++ b/engines/e_atalla.c
@@ -575,7 +575,7 @@ static int atalla_mod_exp_dh(const DH *dh, BIGNUM *r,
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_atalla_id) != 0))
@@ -586,7 +586,7 @@ static int bind_fn(ENGINE *e, const char *id)
        }
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_ATALLA */
 #endif /* !OPENSSL_NO_HW */

diff --git a/engines/e_cswift.c b/engines/e_cswift.c
index 1b4e4e876ecac0253d85a74b3a839efe8a8bd1f1..a813227149a96e370355bcc17437d930c4cb2119 100644 (file)
--- a/engines/e_cswift.c
+++ b/engines/e_cswift.c
@@ -978,7 +978,7 @@ static int cswift_rand_status(void)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_cswift_id) != 0))
@@ -989,7 +989,7 @@ static int bind_fn(ENGINE *e, const char *id)
        }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_CSWIFT */
 #endif /* !OPENSSL_NO_HW */

diff --git a/engines/e_ncipher.c b/engines/e_ncipher.c
index a43d4360f2a6c22bac789cc38a990458cd4d7524..614f9a1dde278faa381c3889934071385edaa9fa 100644 (file)
--- a/engines/e_ncipher.c
+++ b/engines/e_ncipher.c
@@ -1325,7 +1325,7 @@ static void hwcrhk_log_message(void *logstr, const char *message)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */     
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_hwcrhk_id) != 0))
@@ -1336,7 +1336,7 @@ static int bind_fn(ENGINE *e, const char *id)
        }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_NCIPHER */
 #endif /* !OPENSSL_NO_HW */

diff --git a/engines/e_nuron.c b/engines/e_nuron.c
index 130b6d8b40571e40bdd034d80dc4d16e3974392a..c3a53275946c4a033846c9c4c5ac7ac22a3df029 100644 (file)
--- a/engines/e_nuron.c
+++ b/engines/e_nuron.c
@@ -399,7 +399,7 @@ void ENGINE_load_nuron(void)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */     
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_nuron_id) != 0))
@@ -410,7 +410,7 @@ static int bind_fn(ENGINE *e, const char *id)
        }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_NURON */
 #endif /* !OPENSSL_NO_HW */

diff --git a/engines/e_sureware.c b/engines/e_sureware.c
index 89f708661d2c5d057d64c418a581ec0d4713d9c5..89488b9e1b37d2536af74c9075f8c248dd74569b 100644 (file)
--- a/engines/e_sureware.c
+++ b/engines/e_sureware.c
@@ -278,7 +278,7 @@ static int bind_sureware(ENGINE *e)
        return 1;
 }
 
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_helper(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_sureware_id) != 0))

diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c
index ed8401ec162655ed0948b1caa4ae1efa08fe4a50..7d077c7bc322abbc43bc188c057015d89d1eae98 100644 (file)
--- a/engines/e_ubsec.c
+++ b/engines/e_ubsec.c
@@ -1042,7 +1042,7 @@ static int ubsec_rand_status(void)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_ubsec_id) != 0))
@@ -1053,7 +1053,7 @@ static int bind_fn(ENGINE *e, const char *id)
        }
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_UBSEC */
 #endif /* !OPENSSL_NO_HW */