diff options
| -rwxr-xr-x | Configure | 6 | ||||
| -rw-r--r-- | engines/e_4758_cca.c | 4 | ||||
| -rw-r--r-- | engines/e_aep.c | 2 | ||||
| -rw-r--r-- | engines/e_atalla.c | 4 | ||||
| -rw-r--r-- | engines/e_cswift.c | 4 | ||||
| -rw-r--r-- | engines/e_ncipher.c | 4 | ||||
| -rw-r--r-- | engines/e_nuron.c | 4 | ||||
| -rw-r--r-- | engines/e_sureware.c | 2 | ||||
| -rw-r--r-- | engines/e_ubsec.c | 4 |
9 files changed, 20 insertions, 14 deletions
@@ -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 6d41b9ed2a..b02989f336 100644 --- 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 8b8380a582..daea7e86e9 100644 --- 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 6151c46902..3f7494c707 100644 --- 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 1b4e4e876e..a813227149 100644 --- 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 a43d4360f2..614f9a1dde 100644 --- 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 130b6d8b40..c3a5327594 100644 --- 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 89f708661d..89488b9e1b 100644 --- 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 ed8401ec16..7d077c7bc3 100644 --- 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 */ |