generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new flag to stop ENGINE methods being registered

Browse Source
This commit is contained in:
Dr. Stephen Henson
2011-05-15 15:58:38 +00:00
parent c6ead3cdd3
commit 676cd3a283
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/engine/eng_fat.c
View File

@@ -176,6 +176,7 @@ int ENGINE_register_all_complete(void)
ENGINE *e; ENGINE *e;
for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e)) for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))
ENGINE_register_complete(e); if (!(e->flags & ENGINE_FLAGS_NO_REGISTER_ALL))
ENGINE_register_complete(e);
return 1; return 1;
} }

7
crypto/engine/engine.h
View File

@@ -141,6 +141,13 @@ extern "C" {
* the existing ENGINE's structural reference count. */ * the existing ENGINE's structural reference count. */
#define ENGINE_FLAGS_BY_ID_COPY (int)0x0004 #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 /* 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 * 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 * command expects. Currently only numeric and string input is supported. If a

1
engines/e_capi.c
View File

@@ -522,6 +522,7 @@ static int bind_capi(ENGINE *e)
{ {
if (!ENGINE_set_id(e, engine_capi_id) if (!ENGINE_set_id(e, engine_capi_id)
|| !ENGINE_set_name(e, engine_capi_name) || !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_init_function(e, capi_init)
|| !ENGINE_set_finish_function(e, capi_finish) || !ENGINE_set_finish_function(e, capi_finish)
|| !ENGINE_set_destroy_function(e, capi_destroy) || !ENGINE_set_destroy_function(e, capi_destroy)