Commit ecd45314 authored by Richard Levitte's avatar Richard Levitte
Browse files

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.
parent 3e06fb75

Configure

+6 −0
Original line number Diff line number Diff line
@@ -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";

engines/e_4758_cca.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */

engines/e_aep.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

engines/e_atalla.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */

engines/e_cswift.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */