diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-09 00:07:10 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-09 00:33:38 +0100 |
| commit | be1251f73def8169b98d53430b631df13d430dbc (patch) | |
| tree | 5c86f206d7fde6cbc510920253fa1f5ff1e42d5b /include/openssl/engine.h | |
| parent | 6d5667110a6844640af4c7a9cb91b0cffa297ce7 (diff) | |
| download | openssl-be1251f73def8169b98d53430b631df13d430dbc.zip openssl-be1251f73def8169b98d53430b631df13d430dbc.tar.gz openssl-be1251f73def8169b98d53430b631df13d430dbc.tar.bz2 | |
Remove the transfer of lock hooks from bind_engine
With the new threads API, this is no longer needed.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'include/openssl/engine.h')
| -rw-r--r-- | include/openssl/engine.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/openssl/engine.h b/include/openssl/engine.h index 2539371..d1cd17a 100644 --- a/include/openssl/engine.h +++ b/include/openssl/engine.h @@ -737,26 +737,10 @@ typedef struct st_dynamic_MEM_fns { * FIXME: Perhaps the memory and locking code (crypto.h) should declare and * use these types so we (and any other dependant code) can simplify a bit?? */ -typedef void (*dyn_lock_locking_cb) (int, int, const char *, int); -typedef int (*dyn_lock_add_lock_cb) (int *, int, int, const char *, int); -typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb) (const char *, - int); -typedef void (*dyn_dynlock_lock_cb) (int, struct CRYPTO_dynlock_value *, - const char *, int); -typedef void (*dyn_dynlock_destroy_cb) (struct CRYPTO_dynlock_value *, - const char *, int); -typedef struct st_dynamic_LOCK_fns { - dyn_lock_locking_cb lock_locking_cb; - dyn_lock_add_lock_cb lock_add_lock_cb; - dyn_dynlock_create_cb dynlock_create_cb; - dyn_dynlock_lock_cb dynlock_lock_cb; - dyn_dynlock_destroy_cb dynlock_destroy_cb; -} dynamic_LOCK_fns; /* The top-level structure */ typedef struct st_dynamic_fns { void *static_state; dynamic_MEM_fns mem_fns; - dynamic_LOCK_fns lock_fns; } dynamic_fns; /* @@ -807,11 +791,6 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id, CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \ fns->mem_fns.realloc_fn, \ fns->mem_fns.free_fn); \ - CRYPTO_set_locking_callback(fns->lock_fns.lock_locking_cb); \ - CRYPTO_set_add_lock_callback(fns->lock_fns.lock_add_lock_cb); \ - CRYPTO_set_dynlock_create_callback(fns->lock_fns.dynlock_create_cb); \ - CRYPTO_set_dynlock_lock_callback(fns->lock_fns.dynlock_lock_cb); \ - CRYPTO_set_dynlock_destroy_callback(fns->lock_fns.dynlock_destroy_cb); \ skip_cbs: \ if(!fn(e,id)) return 0; \ return 1; } |