From 6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd 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/o_names.c | 14 +++++++------- src/lib/libcrypto/objects/obj_dat.c | 26 +++++++++++++------------- src/lib/libcrypto/objects/obj_lib.c | 14 +++++++------- src/lib/libcrypto/objects/obj_xref.c | 6 +++--- 4 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/lib/libcrypto/objects') diff --git a/src/lib/libcrypto/objects/o_names.c b/src/lib/libcrypto/objects/o_names.c index 4a548c2ed4..4c959db2da 100644 --- a/src/lib/libcrypto/objects/o_names.c +++ b/src/lib/libcrypto/objects/o_names.c @@ -83,7 +83,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *), for (i=sk_NAME_FUNCS_num(name_funcs_stack); itype)->free_func(ret->name,ret->type,ret->data); } - OPENSSL_free(ret); + free(ret); } else { @@ -252,7 +252,7 @@ int OBJ_NAME_remove(const char *name, int type) sk_NAME_FUNCS_value(name_funcs_stack, ret->type)->free_func(ret->name,ret->type,ret->data); } - OPENSSL_free(ret); + free(ret); return(1); } else @@ -318,7 +318,7 @@ void OBJ_NAME_do_all_sorted(int type,void (*fn)(const OBJ_NAME *,void *arg), int n; d.type=type; - d.names=OPENSSL_malloc(lh_OBJ_NAME_num_items(names_lh)*sizeof *d.names); + d.names=malloc(lh_OBJ_NAME_num_items(names_lh)*sizeof *d.names); d.n=0; OBJ_NAME_do_all(type,do_all_sorted_fn,&d); @@ -327,7 +327,7 @@ void OBJ_NAME_do_all_sorted(int type,void (*fn)(const OBJ_NAME *,void *arg), for(n=0 ; n < d.n ; ++n) fn(d.names[n],arg); - OPENSSL_free((void *)d.names); + free((void *)d.names); } static int free_type; @@ -345,7 +345,7 @@ static IMPLEMENT_LHASH_DOALL_FN(names_lh_free, OBJ_NAME) static void name_funcs_free(NAME_FUNCS *ptr) { - OPENSSL_free(ptr); + free(ptr); } void OBJ_NAME_cleanup(int type) diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index bced796e62..641a97c8aa 100644 --- a/src/lib/libcrypto/objects/obj_dat.c +++ b/src/lib/libcrypto/objects/obj_dat.c @@ -199,7 +199,7 @@ static void cleanup3_doall(ADDED_OBJ *a) { if (--a->obj->nid == 0) ASN1_OBJECT_free(a->obj); - OPENSSL_free(a); + free(a); } static IMPLEMENT_LHASH_DOALL_FN(cleanup1, ADDED_OBJ) @@ -253,13 +253,13 @@ int OBJ_add_object(const ASN1_OBJECT *obj) if (added == NULL) if (!init_added()) return(0); if ((o=OBJ_dup(obj)) == NULL) goto err; - if (!(ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; + if (!(ao[ADDED_NID]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2; if ((o->length != 0) && (obj->data != NULL)) - if (!(ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; + if (!(ao[ADDED_DATA]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2; if (o->sn != NULL) - if (!(ao[ADDED_SNAME]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; + if (!(ao[ADDED_SNAME]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2; if (o->ln != NULL) - if (!(ao[ADDED_LNAME]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; + if (!(ao[ADDED_LNAME]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2; for (i=ADDED_DATA; i<=ADDED_NID; i++) { @@ -270,7 +270,7 @@ int OBJ_add_object(const ASN1_OBJECT *obj) aop=lh_ADDED_OBJ_insert(added,ao[i]); /* memory leak, buit should not normally matter */ if (aop != NULL) - OPENSSL_free(aop); + free(aop); } } o->flags&= ~(ASN1_OBJECT_FLAG_DYNAMIC|ASN1_OBJECT_FLAG_DYNAMIC_STRINGS| @@ -281,8 +281,8 @@ err2: OBJerr(OBJ_F_OBJ_ADD_OBJECT,ERR_R_MALLOC_FAILURE); err: for (i=ADDED_DATA; i<=ADDED_NID; i++) - if (ao[i] != NULL) OPENSSL_free(ao[i]); - if (o != NULL) OPENSSL_free(o); + if (ao[i] != NULL) free(ao[i]); + if (o != NULL) free(o); return(NID_undef); } @@ -449,7 +449,7 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name) /* Work out total size */ j = ASN1_object_size(0,i,V_ASN1_OBJECT); - if((buf=(unsigned char *)OPENSSL_malloc(j)) == NULL) return NULL; + if((buf=(unsigned char *)malloc(j)) == NULL) return NULL; p = buf; /* Write out tag+length */ @@ -459,7 +459,7 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name) cp=buf; op=d2i_ASN1_OBJECT(NULL,&cp,j); - OPENSSL_free(buf); + free(buf); return op; } @@ -590,7 +590,7 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name) } n++; n += i; - OPENSSL_free(bndec); + free(bndec); } else { @@ -774,7 +774,7 @@ int OBJ_create(const char *oid, const char *sn, const char *ln) i=a2d_ASN1_OBJECT(NULL,0,oid,-1); if (i <= 0) return(0); - if ((buf=(unsigned char *)OPENSSL_malloc(i)) == NULL) + if ((buf=(unsigned char *)malloc(i)) == NULL) { OBJerr(OBJ_F_OBJ_CREATE,ERR_R_MALLOC_FAILURE); return(0); @@ -788,7 +788,7 @@ int OBJ_create(const char *oid, const char *sn, const char *ln) ok=OBJ_add_object(op); err: ASN1_OBJECT_free(op); - OPENSSL_free(buf); + free(buf); return(ok); } 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); } diff --git a/src/lib/libcrypto/objects/obj_xref.c b/src/lib/libcrypto/objects/obj_xref.c index 9f744bcede..797adc8d10 100644 --- a/src/lib/libcrypto/objects/obj_xref.c +++ b/src/lib/libcrypto/objects/obj_xref.c @@ -162,7 +162,7 @@ int OBJ_add_sigid(int signid, int dig_id, int pkey_id) sigx_app = sk_nid_triple_new(sigx_cmp); if (!sigx_app) return 0; - ntr = OPENSSL_malloc(sizeof(int) * 3); + ntr = malloc(sizeof(int) * 3); if (!ntr) return 0; ntr->sign_id = signid; @@ -171,7 +171,7 @@ int OBJ_add_sigid(int signid, int dig_id, int pkey_id) if (!sk_nid_triple_push(sig_app, ntr)) { - OPENSSL_free(ntr); + free(ntr); return 0; } @@ -186,7 +186,7 @@ int OBJ_add_sigid(int signid, int dig_id, int pkey_id) static void sid_free(nid_triple *tt) { - OPENSSL_free(tt); + free(tt); } void OBJ_sigid_free(void) -- cgit v1.2.3-55-g6feb