From bddb7c686e3d1aeb156722adc64b6c35ae720f87 Mon Sep 17 00:00:00 2001 From: beck <> Date: Thu, 17 Apr 2014 13:37:50 +0000 Subject: 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 --- src/lib/libcrypto/objects/obj_lib.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/lib/libcrypto/objects/obj_lib.c') diff --git a/src/lib/libcrypto/objects/obj_lib.c b/src/lib/libcrypto/objects/obj_lib.c index 23e9d48cdf..338fe851fc 100644 --- a/src/lib/libcrypto/objects/obj_lib.c +++ b/src/lib/libcrypto/objects/obj_lib.c @@ -80,7 +80,7 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o) OBJerr(OBJ_F_OBJ_DUP,ERR_R_ASN1_LIB); return(NULL); } - data=OPENSSL_malloc(o->length); + data=malloc(o->length); if (data == NULL) goto err; if (o->data != NULL) @@ -93,7 +93,7 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o) if (o->ln != NULL) { i=strlen(o->ln)+1; - ln=OPENSSL_malloc(i); + ln=malloc(i); if (ln == NULL) goto err; memcpy(ln,o->ln,i); r->ln=ln; @@ -102,7 +102,7 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o) if (o->sn != NULL) { i=strlen(o->sn)+1; - sn=OPENSSL_malloc(i); + sn=malloc(i); if (sn == NULL) goto err; memcpy(sn,o->sn,i); r->sn=sn; @@ -112,10 +112,10 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o) return(r); err: OBJerr(OBJ_F_OBJ_DUP,ERR_R_MALLOC_FAILURE); - if (ln != NULL) OPENSSL_free(ln); - if (sn != NULL) OPENSSL_free(sn); - if (data != NULL) OPENSSL_free(data); - if (r != NULL) OPENSSL_free(r); + if (ln != NULL) free(ln); + if (sn != NULL) free(sn); + if (data != NULL) free(data); + if (r != NULL) free(r); return(NULL); } -- cgit v1.2.3-55-g6feb