3 files changed, 41 insertions, 41 deletions

diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c
index f5fcbb9f6b..dc6eb579bf 100644
--- a/src/lib/libcrypto/conf/conf_api.c
+++ b/src/lib/libcrypto/conf/conf_api.c
@@ -119,9 +119,9 @@ int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value)
         if (v != NULL)
                 {
                 (void)sk_CONF_VALUE_delete_ptr(ts,v);
-                OPENSSL_free(v->name);
-                OPENSSL_free(v->value);
-                OPENSSL_free(v);
+                free(v->name);
+                free(v->value);
+                free(v);
                 }
         return 1;
         }
@@ -226,7 +226,7 @@ void _CONF_free_data(CONF *conf)
         if (conf == NULL || conf->data == NULL) return;
 
         lh_CONF_VALUE_down_load(conf->data)=0; /* evil thing to make
-                                  * sure the 'OPENSSL_free()' works as
+                                  * sure the 'free()' works as
                                   * expected */
         lh_CONF_VALUE_doall_arg(conf->data,
                                 LHASH_DOALL_ARG_FN(value_free_hash),
@@ -257,13 +257,13 @@ static void value_free_stack_doall(CONF_VALUE *a)
         for (i=sk_CONF_VALUE_num(sk)-1; i>=0; i--)
                 {
                 vv=sk_CONF_VALUE_value(sk,i);
-                OPENSSL_free(vv->value);
-                OPENSSL_free(vv->name);
-                OPENSSL_free(vv);
+                free(vv->value);
+                free(vv->name);
+                free(vv);
                 }
         if (sk != NULL) sk_CONF_VALUE_free(sk);
-        OPENSSL_free(a->section);
-        OPENSSL_free(a);
+        free(a->section);
+        free(a);
         }
 
 /* Up until OpenSSL 0.9.5a, this was new_section */
@@ -275,10 +275,10 @@ CONF_VALUE *_CONF_new_section(CONF *conf, const char *section)
 
         if ((sk=sk_CONF_VALUE_new_null()) == NULL)
                 goto err;
-        if ((v=OPENSSL_malloc(sizeof(CONF_VALUE))) == NULL)
+        if ((v=malloc(sizeof(CONF_VALUE))) == NULL)
                 goto err;
         i=strlen(section)+1;
-        if ((v->section=OPENSSL_malloc(i)) == NULL)
+        if ((v->section=malloc(i)) == NULL)
                 goto err;
 
         memcpy(v->section,section,i);
@@ -292,7 +292,7 @@ err:
         if (!ok)
                 {
                 if (sk != NULL) sk_CONF_VALUE_free(sk);
-                if (v != NULL) OPENSSL_free(v);
+                if (v != NULL) free(v);
                 v=NULL;
                 }
         return(v);
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c
index 15e5613e36..32d47458a0 100644
--- a/src/lib/libcrypto/conf/conf_def.c
+++ b/src/lib/libcrypto/conf/conf_def.c
@@ -129,11 +129,11 @@ static CONF *def_create(CONF_METHOD *meth)
         {
         CONF *ret;
 
-        ret = OPENSSL_malloc(sizeof(CONF) + sizeof(unsigned short *));
+        ret = malloc(sizeof(CONF) + sizeof(unsigned short *));
         if (ret)
                 if (meth->init(ret) == 0)
                         {
-                        OPENSSL_free(ret);
+                        free(ret);
                         ret = NULL;
                         }
         return ret;
@@ -167,7 +167,7 @@ static int def_destroy(CONF *conf)
         {
         if (def_destroy_data(conf))
                 {
-                OPENSSL_free(conf);
+                free(conf);
                 return 1;
                 }
         return 0;
@@ -228,7 +228,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
                 goto err;
                 }
 
-        section=(char *)OPENSSL_malloc(10);
+        section=(char *)malloc(10);
         if (section == NULL)
                 {
                 CONFerr(CONF_F_DEF_LOAD_BIO,ERR_R_MALLOC_FAILURE);
@@ -373,14 +373,14 @@ again:
                         p++;
                         *p='\0';
 
-                        if (!(v=(CONF_VALUE *)OPENSSL_malloc(sizeof(CONF_VALUE))))
+                        if (!(v=(CONF_VALUE *)malloc(sizeof(CONF_VALUE))))
                                 {
                                 CONFerr(CONF_F_DEF_LOAD_BIO,
                                                         ERR_R_MALLOC_FAILURE);
                                 goto err;
                                 }
                         if (psection == NULL) psection=section;
-                        v->name=(char *)OPENSSL_malloc(strlen(pname)+1);
+                        v->name=(char *)malloc(strlen(pname)+1);
                         v->value=NULL;
                         if (v->name == NULL)
                                 {
@@ -424,20 +424,20 @@ again:
                         if (vv != NULL)
                                 {
                                 sk_CONF_VALUE_delete_ptr(ts,vv);
-                                OPENSSL_free(vv->name);
-                                OPENSSL_free(vv->value);
-                                OPENSSL_free(vv);
+                                free(vv->name);
+                                free(vv->value);
+                                free(vv);
                                 }
 #endif
                         v=NULL;
                         }
                 }
         if (buff != NULL) BUF_MEM_free(buff);
-        if (section != NULL) OPENSSL_free(section);
+        if (section != NULL) free(section);
         return(1);
 err:
         if (buff != NULL) BUF_MEM_free(buff);
-        if (section != NULL) OPENSSL_free(section);
+        if (section != NULL) free(section);
         if (line != NULL) *line=eline;
         (void) snprintf(btmp,sizeof btmp,"%ld",eline);
         ERR_add_error_data(2,"line ",btmp);
@@ -448,9 +448,9 @@ err:
                 }
         if (v != NULL)
                 {
-                if (v->name != NULL) OPENSSL_free(v->name);
-                if (v->value != NULL) OPENSSL_free(v->value);
-                if (v != NULL) OPENSSL_free(v);
+                if (v->name != NULL) free(v->name);
+                if (v->value != NULL) free(v->value);
+                if (v != NULL) free(v);
                 }
         return(0);
         }
@@ -637,9 +637,9 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
                         buf->data[to++]= *(from++);
                 }
         buf->data[to]='\0';
-        if (*pto != NULL) OPENSSL_free(*pto);
+        if (*pto != NULL) free(*pto);
         *pto=buf->data;
-        OPENSSL_free(buf);
+        free(buf);
         return(1);
 err:
         if (buf != NULL) BUF_MEM_free(buf);
diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c
index 994294f655..652ad6469a 100644
--- a/src/lib/libcrypto/conf/conf_mod.c
+++ b/src/lib/libcrypto/conf/conf_mod.c
@@ -197,7 +197,7 @@ int CONF_modules_load_file(const char *filename, const char *appname,
 
         err:
         if (filename == NULL)
-                OPENSSL_free(file);
+                free(file);
         NCONF_free(conf);
 
         return ret;
@@ -296,7 +296,7 @@ static CONF_MODULE *module_add(DSO *dso, const char *name,
                 supported_modules = sk_CONF_MODULE_new_null();
         if (supported_modules == NULL)
                 return NULL;
-        tmod = OPENSSL_malloc(sizeof(CONF_MODULE));
+        tmod = malloc(sizeof(CONF_MODULE));
         if (tmod == NULL)
                 return NULL;
 
@@ -308,7 +308,7 @@ static CONF_MODULE *module_add(DSO *dso, const char *name,
 
         if (!sk_CONF_MODULE_push(supported_modules, tmod))
                 {
-                OPENSSL_free(tmod);
+                free(tmod);
                 return NULL;
                 }
 
@@ -352,7 +352,7 @@ static int module_init(CONF_MODULE *pmod, char *name, char *value,
         CONF_IMODULE *imod = NULL;
 
         /* Otherwise add initialized module to list */
-        imod = OPENSSL_malloc(sizeof(CONF_IMODULE));
+        imod = malloc(sizeof(CONF_IMODULE));
         if (!imod)
                 goto err;
 
@@ -404,10 +404,10 @@ static int module_init(CONF_MODULE *pmod, char *name, char *value,
         if (imod)
                 {
                 if (imod->name)
-                        OPENSSL_free(imod->name);
+                        free(imod->name);
                 if (imod->value)
-                        OPENSSL_free(imod->value);
-                OPENSSL_free(imod);
+                        free(imod->value);
+                free(imod);
                 }
 
         return -1;
@@ -447,8 +447,8 @@ static void module_free(CONF_MODULE *md)
         {
         if (md->dso)
                 DSO_free(md->dso);
-        OPENSSL_free(md->name);
-        OPENSSL_free(md);
+        free(md->name);
+        free(md);
         }
 
 /* finish and free up all modules instances */
@@ -472,9 +472,9 @@ static void module_finish(CONF_IMODULE *imod)
         if (imod->pmod->finish)
                 imod->pmod->finish(imod);
         imod->pmod->links--;
-        OPENSSL_free(imod->name);
-        OPENSSL_free(imod->value);
-        OPENSSL_free(imod);
+        free(imod->name);
+        free(imod->value);
+        free(imod);
         }
 
 /* Add a static module to OpenSSL */
@@ -558,7 +558,7 @@ char *CONF_get1_default_config_file(void)
 #endif
         len += strlen(OPENSSL_CONF);
 
-        file = OPENSSL_malloc(len + 1);
+        file = malloc(len + 1);
 
         if (!file)
                 return NULL;