Commit b9b0a177 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

new flag to stop ENGINE methods being registered

parent 9609ea86

crypto/engine/eng_fat.c

+2 −1
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ int ENGINE_register_all_complete(void) 
	ENGINE *e;



	for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))

		if (!(e->flags & ENGINE_FLAGS_NO_REGISTER_ALL))

			ENGINE_register_complete(e);

	return 1;

	}

crypto/engine/engine.h

+7 −0
Original line number Diff line number Diff line
@@ -141,6 +141,13 @@ extern "C" { 
 * the existing ENGINE's structural reference count. */

#define ENGINE_FLAGS_BY_ID_COPY		(int)0x0004



/* This flag if for an ENGINE that does not want its methods registered as 

 * part of ENGINE_register_all_complete() for example if the methods are

 * not usable as default methods.

 */



#define ENGINE_FLAGS_NO_REGISTER_ALL	(int)0x0008



/* ENGINEs can support their own command types, and these flags are used in

 * ENGINE_CTRL_GET_CMD_FLAGS to indicate to the caller what kind of input each

 * command expects. Currently only numeric and string input is supported. If a

engines/e_capi.c

+1 −0
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ static int bind_capi(ENGINE *e) 
	{

	if (!ENGINE_set_id(e, engine_capi_id)

		|| !ENGINE_set_name(e, engine_capi_name)

		|| !ENGINE_set_flags(e, ENGINE_FLAGS_NO_REGISTER_ALL)

		|| !ENGINE_set_init_function(e, capi_init)

		|| !ENGINE_set_finish_function(e, capi_finish)

		|| !ENGINE_set_destroy_function(e, capi_destroy)