summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/evp_pbe.c
diff options
context:
space:
mode:
authorbeck <>2014-04-17 13:37:50 +0000
committerbeck <>2014-04-17 13:37:50 +0000
commit6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd (patch)
tree7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/evp/evp_pbe.c
parent4d13fb9c7b5ac7311d7031173c21ab0121388413 (diff)
downloadopenbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.tar.gz
openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.tar.bz2
openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.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/evp/evp_pbe.c')
-rw-r--r--src/lib/libcrypto/evp/evp_pbe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c
index f8c32d825e..c808b96fef 100644
--- a/src/lib/libcrypto/evp/evp_pbe.c
+++ b/src/lib/libcrypto/evp/evp_pbe.c
@@ -238,7 +238,7 @@ int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid, int md_nid,
238 EVP_PBE_CTL *pbe_tmp; 238 EVP_PBE_CTL *pbe_tmp;
239 if (!pbe_algs) 239 if (!pbe_algs)
240 pbe_algs = sk_EVP_PBE_CTL_new(pbe_cmp); 240 pbe_algs = sk_EVP_PBE_CTL_new(pbe_cmp);
241 if (!(pbe_tmp = (EVP_PBE_CTL*) OPENSSL_malloc (sizeof(EVP_PBE_CTL)))) 241 if (!(pbe_tmp = (EVP_PBE_CTL*) malloc (sizeof(EVP_PBE_CTL))))
242 { 242 {
243 EVPerr(EVP_F_EVP_PBE_ALG_ADD_TYPE,ERR_R_MALLOC_FAILURE); 243 EVPerr(EVP_F_EVP_PBE_ALG_ADD_TYPE,ERR_R_MALLOC_FAILURE);
244 return 0; 244 return 0;
@@ -306,7 +306,7 @@ int EVP_PBE_find(int type, int pbe_nid,
306 306
307static void free_evp_pbe_ctl(EVP_PBE_CTL *pbe) 307static void free_evp_pbe_ctl(EVP_PBE_CTL *pbe)
308 { 308 {
309 OPENSSL_freeFunc(pbe); 309 free(pbe);
310 } 310 }
311 311
312void EVP_PBE_cleanup(void) 312void EVP_PBE_cleanup(void)