summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/engine/eng_table.c
diff options
context:
space:
mode:
authorbeck <>2014-04-17 13:37:50 +0000
committerbeck <>2014-04-17 13:37:50 +0000
commitbddb7c686e3d1aeb156722adc64b6c35ae720f87 (patch)
tree7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/engine/eng_table.c
parentecec66222d758996a4ff2671ca5026d9ede5ef76 (diff)
downloadopenbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.tar.gz
openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.tar.bz2
openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.zip
Change library to use intrinsic memory allocation functions instead of
OPENSSL_foo wrappers. This changes: OPENSSL_malloc->malloc OPENSSL_free->free OPENSSL_relloc->realloc OPENSSL_freeFunc->free
Diffstat (limited to 'src/lib/libcrypto/engine/eng_table.c')
-rw-r--r--src/lib/libcrypto/engine/eng_table.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/engine/eng_table.c b/src/lib/libcrypto/engine/eng_table.c
index 4fde948185..b7e77f7625 100644
--- a/src/lib/libcrypto/engine/eng_table.c
+++ b/src/lib/libcrypto/engine/eng_table.c
@@ -146,14 +146,14 @@ int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup,
146 fnd = lh_ENGINE_PILE_retrieve(&(*table)->piles, &tmplate); 146 fnd = lh_ENGINE_PILE_retrieve(&(*table)->piles, &tmplate);
147 if(!fnd) 147 if(!fnd)
148 { 148 {
149 fnd = OPENSSL_malloc(sizeof(ENGINE_PILE)); 149 fnd = malloc(sizeof(ENGINE_PILE));
150 if(!fnd) goto end; 150 if(!fnd) goto end;
151 fnd->uptodate = 1; 151 fnd->uptodate = 1;
152 fnd->nid = *nids; 152 fnd->nid = *nids;
153 fnd->sk = sk_ENGINE_new_null(); 153 fnd->sk = sk_ENGINE_new_null();
154 if(!fnd->sk) 154 if(!fnd->sk)
155 { 155 {
156 OPENSSL_free(fnd); 156 free(fnd);
157 goto end; 157 goto end;
158 } 158 }
159 fnd->funct = NULL; 159 fnd->funct = NULL;
@@ -218,7 +218,7 @@ static void int_cleanup_cb_doall(ENGINE_PILE *p)
218 sk_ENGINE_free(p->sk); 218 sk_ENGINE_free(p->sk);
219 if(p->funct) 219 if(p->funct)
220 engine_unlocked_finish(p->funct, 0); 220 engine_unlocked_finish(p->funct, 0);
221 OPENSSL_free(p); 221 free(p);
222 } 222 }
223static IMPLEMENT_LHASH_DOALL_FN(int_cleanup_cb, ENGINE_PILE) 223static IMPLEMENT_LHASH_DOALL_FN(int_cleanup_cb, ENGINE_PILE)
224 224