diff options
author | beck <> | 2014-04-17 13:37:50 +0000 |
---|---|---|
committer | beck <> | 2014-04-17 13:37:50 +0000 |
commit | bddb7c686e3d1aeb156722adc64b6c35ae720f87 (patch) | |
tree | 7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/objects/obj_lib.c | |
parent | ecec66222d758996a4ff2671ca5026d9ede5ef76 (diff) | |
download | openbsd-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/objects/obj_lib.c')
-rw-r--r-- | src/lib/libcrypto/objects/obj_lib.c | 14 |
1 files changed, 7 insertions, 7 deletions
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) | |||
80 | OBJerr(OBJ_F_OBJ_DUP,ERR_R_ASN1_LIB); | 80 | OBJerr(OBJ_F_OBJ_DUP,ERR_R_ASN1_LIB); |
81 | return(NULL); | 81 | return(NULL); |
82 | } | 82 | } |
83 | data=OPENSSL_malloc(o->length); | 83 | data=malloc(o->length); |
84 | if (data == NULL) | 84 | if (data == NULL) |
85 | goto err; | 85 | goto err; |
86 | if (o->data != NULL) | 86 | if (o->data != NULL) |
@@ -93,7 +93,7 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o) | |||
93 | if (o->ln != NULL) | 93 | if (o->ln != NULL) |
94 | { | 94 | { |
95 | i=strlen(o->ln)+1; | 95 | i=strlen(o->ln)+1; |
96 | ln=OPENSSL_malloc(i); | 96 | ln=malloc(i); |
97 | if (ln == NULL) goto err; | 97 | if (ln == NULL) goto err; |
98 | memcpy(ln,o->ln,i); | 98 | memcpy(ln,o->ln,i); |
99 | r->ln=ln; | 99 | r->ln=ln; |
@@ -102,7 +102,7 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o) | |||
102 | if (o->sn != NULL) | 102 | if (o->sn != NULL) |
103 | { | 103 | { |
104 | i=strlen(o->sn)+1; | 104 | i=strlen(o->sn)+1; |
105 | sn=OPENSSL_malloc(i); | 105 | sn=malloc(i); |
106 | if (sn == NULL) goto err; | 106 | if (sn == NULL) goto err; |
107 | memcpy(sn,o->sn,i); | 107 | memcpy(sn,o->sn,i); |
108 | r->sn=sn; | 108 | r->sn=sn; |
@@ -112,10 +112,10 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o) | |||
112 | return(r); | 112 | return(r); |
113 | err: | 113 | err: |
114 | OBJerr(OBJ_F_OBJ_DUP,ERR_R_MALLOC_FAILURE); | 114 | OBJerr(OBJ_F_OBJ_DUP,ERR_R_MALLOC_FAILURE); |
115 | if (ln != NULL) OPENSSL_free(ln); | 115 | if (ln != NULL) free(ln); |
116 | if (sn != NULL) OPENSSL_free(sn); | 116 | if (sn != NULL) free(sn); |
117 | if (data != NULL) OPENSSL_free(data); | 117 | if (data != NULL) free(data); |
118 | if (r != NULL) OPENSSL_free(r); | 118 | if (r != NULL) free(r); |
119 | return(NULL); | 119 | return(NULL); |
120 | } | 120 | } |
121 | 121 | ||