aboutsummaryrefslogtreecommitdiff
path: root/crypto/engine
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-03-06 02:54:40 +0100
committerRichard Levitte <levitte@openssl.org>2016-03-09 00:33:38 +0100
commit6d5667110a6844640af4c7a9cb91b0cffa297ce7 (patch)
treeb7ba9c68742ec634df3d18ede9ed479243df41c8 /crypto/engine
parent8458f1bfab1b30ce96a39593331a94b44efbe2b2 (diff)
downloadopenssl-6d5667110a6844640af4c7a9cb91b0cffa297ce7.zip
openssl-6d5667110a6844640af4c7a9cb91b0cffa297ce7.tar.gz
openssl-6d5667110a6844640af4c7a9cb91b0cffa297ce7.tar.bz2
Engine API repair - memory management hooks
The Engine API lost the setting of memory management hooks in bind_engine. Here's putting that back. EX_DATA and ERR functions need the same treatment. Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/engine')
-rw-r--r--crypto/engine/eng_dyn.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c
index 648332a..30ffa75 100644
--- a/crypto/engine/eng_dyn.c
+++ b/crypto/engine/eng_dyn.c
@@ -510,6 +510,8 @@ static int dynamic_load(ENGINE *e, dynamic_data_ctx *ctx)
* would also increase opaqueness.
*/
fns.static_state = ENGINE_get_static_state();
+ CRYPTO_get_mem_functions(fns.mem_fns.malloc_fn, fns.mem_fns.realloc_fn,
+ fns.mem_fns.free_fn);
fns.lock_fns.lock_locking_cb = CRYPTO_get_locking_callback();
fns.lock_fns.lock_add_lock_cb = CRYPTO_get_add_lock_callback();
fns.lock_fns.dynlock_create_cb = CRYPTO_get_dynlock_create_callback();