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/dso/dso_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/dso/dso_lib.c')
| -rw-r--r-- | src/lib/libcrypto/dso/dso_lib.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/dso/dso_lib.c b/src/lib/libcrypto/dso/dso_lib.c index 8a15b794ab..68f5430ea8 100644 --- a/src/lib/libcrypto/dso/dso_lib.c +++ b/src/lib/libcrypto/dso/dso_lib.c | |||
| @@ -100,7 +100,7 @@ DSO *DSO_new_method(DSO_METHOD *meth) | |||
| 100 | * to stealing the "best available" method. Will fallback | 100 | * to stealing the "best available" method. Will fallback |
| 101 | * to DSO_METH_null() in the worst case. */ | 101 | * to DSO_METH_null() in the worst case. */ |
| 102 | default_DSO_meth = DSO_METHOD_openssl(); | 102 | default_DSO_meth = DSO_METHOD_openssl(); |
| 103 | ret = (DSO *)OPENSSL_malloc(sizeof(DSO)); | 103 | ret = (DSO *)malloc(sizeof(DSO)); |
| 104 | if(ret == NULL) | 104 | if(ret == NULL) |
| 105 | { | 105 | { |
| 106 | DSOerr(DSO_F_DSO_NEW_METHOD,ERR_R_MALLOC_FAILURE); | 106 | DSOerr(DSO_F_DSO_NEW_METHOD,ERR_R_MALLOC_FAILURE); |
| @@ -112,7 +112,7 @@ DSO *DSO_new_method(DSO_METHOD *meth) | |||
| 112 | { | 112 | { |
| 113 | /* sk_new doesn't generate any errors so we do */ | 113 | /* sk_new doesn't generate any errors so we do */ |
| 114 | DSOerr(DSO_F_DSO_NEW_METHOD,ERR_R_MALLOC_FAILURE); | 114 | DSOerr(DSO_F_DSO_NEW_METHOD,ERR_R_MALLOC_FAILURE); |
| 115 | OPENSSL_free(ret); | 115 | free(ret); |
| 116 | return(NULL); | 116 | return(NULL); |
| 117 | } | 117 | } |
| 118 | if(meth == NULL) | 118 | if(meth == NULL) |
| @@ -122,7 +122,7 @@ DSO *DSO_new_method(DSO_METHOD *meth) | |||
| 122 | ret->references = 1; | 122 | ret->references = 1; |
| 123 | if((ret->meth->init != NULL) && !ret->meth->init(ret)) | 123 | if((ret->meth->init != NULL) && !ret->meth->init(ret)) |
| 124 | { | 124 | { |
| 125 | OPENSSL_free(ret); | 125 | free(ret); |
| 126 | ret=NULL; | 126 | ret=NULL; |
| 127 | } | 127 | } |
| 128 | return(ret); | 128 | return(ret); |
| @@ -165,11 +165,11 @@ int DSO_free(DSO *dso) | |||
| 165 | 165 | ||
| 166 | sk_void_free(dso->meth_data); | 166 | sk_void_free(dso->meth_data); |
| 167 | if(dso->filename != NULL) | 167 | if(dso->filename != NULL) |
| 168 | OPENSSL_free(dso->filename); | 168 | free(dso->filename); |
| 169 | if(dso->loaded_filename != NULL) | 169 | if(dso->loaded_filename != NULL) |
| 170 | OPENSSL_free(dso->loaded_filename); | 170 | free(dso->loaded_filename); |
| 171 | 171 | ||
| 172 | OPENSSL_free(dso); | 172 | free(dso); |
| 173 | return(1); | 173 | return(1); |
| 174 | } | 174 | } |
| 175 | 175 | ||
| @@ -377,7 +377,7 @@ int DSO_set_filename(DSO *dso, const char *filename) | |||
| 377 | return(0); | 377 | return(0); |
| 378 | } | 378 | } |
| 379 | /* We'll duplicate filename */ | 379 | /* We'll duplicate filename */ |
| 380 | copied = OPENSSL_malloc(strlen(filename) + 1); | 380 | copied = malloc(strlen(filename) + 1); |
| 381 | if(copied == NULL) | 381 | if(copied == NULL) |
| 382 | { | 382 | { |
| 383 | DSOerr(DSO_F_DSO_SET_FILENAME,ERR_R_MALLOC_FAILURE); | 383 | DSOerr(DSO_F_DSO_SET_FILENAME,ERR_R_MALLOC_FAILURE); |
| @@ -385,7 +385,7 @@ int DSO_set_filename(DSO *dso, const char *filename) | |||
| 385 | } | 385 | } |
| 386 | BUF_strlcpy(copied, filename, strlen(filename) + 1); | 386 | BUF_strlcpy(copied, filename, strlen(filename) + 1); |
| 387 | if(dso->filename) | 387 | if(dso->filename) |
| 388 | OPENSSL_free(dso->filename); | 388 | free(dso->filename); |
| 389 | dso->filename = copied; | 389 | dso->filename = copied; |
| 390 | return(1); | 390 | return(1); |
| 391 | } | 391 | } |
| @@ -435,7 +435,7 @@ char *DSO_convert_filename(DSO *dso, const char *filename) | |||
| 435 | } | 435 | } |
| 436 | if(result == NULL) | 436 | if(result == NULL) |
| 437 | { | 437 | { |
| 438 | result = OPENSSL_malloc(strlen(filename) + 1); | 438 | result = malloc(strlen(filename) + 1); |
| 439 | if(result == NULL) | 439 | if(result == NULL) |
| 440 | { | 440 | { |
| 441 | DSOerr(DSO_F_DSO_CONVERT_FILENAME, | 441 | DSOerr(DSO_F_DSO_CONVERT_FILENAME, |
