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

18 files changed, 73 insertions, 73 deletions

diff --git a/src/lib/libcrypto/x509v3/pcy_cache.c b/src/lib/libcrypto/x509v3/pcy_cache.c
index 172b7e7ee4..24c79b4a80 100644
--- a/src/lib/libcrypto/x509v3/pcy_cache.c
+++ b/src/lib/libcrypto/x509v3/pcy_cache.c
@@ -134,7 +134,7 @@ static int policy_cache_new(X509 *x)
         CERTIFICATEPOLICIES *ext_cpols = NULL;
         POLICY_MAPPINGS *ext_pmaps = NULL;
         int i;
-        cache = OPENSSL_malloc(sizeof(X509_POLICY_CACHE));
+        cache = malloc(sizeof(X509_POLICY_CACHE));
         if (!cache)
                 return 0;
         cache->anyPolicy = NULL;
@@ -240,7 +240,7 @@ void policy_cache_free(X509_POLICY_CACHE *cache)
                 policy_data_free(cache->anyPolicy);
         if (cache->data)
                 sk_X509_POLICY_DATA_pop_free(cache->data, policy_data_free);
-        OPENSSL_free(cache);
+        free(cache);
         }
 
 const X509_POLICY_CACHE *policy_cache_set(X509 *x)
diff --git a/src/lib/libcrypto/x509v3/pcy_data.c b/src/lib/libcrypto/x509v3/pcy_data.c
index 3444b03195..7c80915f5b 100644
--- a/src/lib/libcrypto/x509v3/pcy_data.c
+++ b/src/lib/libcrypto/x509v3/pcy_data.c
@@ -72,7 +72,7 @@ void policy_data_free(X509_POLICY_DATA *data)
                 sk_POLICYQUALINFO_pop_free(data->qualifier_set,
                                         POLICYQUALINFO_free);
         sk_ASN1_OBJECT_pop_free(data->expected_policy_set, ASN1_OBJECT_free);
-        OPENSSL_free(data);
+        free(data);
         }
 
 /* Create a data based on an existing policy. If 'id' is NULL use the
@@ -97,13 +97,13 @@ X509_POLICY_DATA *policy_data_new(POLICYINFO *policy,
                 }
         else
                 id = NULL;
-        ret = OPENSSL_malloc(sizeof(X509_POLICY_DATA));
+        ret = malloc(sizeof(X509_POLICY_DATA));
         if (!ret)
                 return NULL;
         ret->expected_policy_set = sk_ASN1_OBJECT_new_null();
         if (!ret->expected_policy_set)
                 {
-                OPENSSL_free(ret);
+                free(ret);
                 if (id)
                         ASN1_OBJECT_free(id);
                 return NULL;
diff --git a/src/lib/libcrypto/x509v3/pcy_node.c b/src/lib/libcrypto/x509v3/pcy_node.c
index bd1e7f1ae8..8c2124a7f6 100644
--- a/src/lib/libcrypto/x509v3/pcy_node.c
+++ b/src/lib/libcrypto/x509v3/pcy_node.c
@@ -115,7 +115,7 @@ X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,
                         X509_POLICY_TREE *tree)
         {
         X509_POLICY_NODE *node;
-        node = OPENSSL_malloc(sizeof(X509_POLICY_NODE));
+        node = malloc(sizeof(X509_POLICY_NODE));
         if (!node)
                 return NULL;
         node->data = data;
@@ -164,7 +164,7 @@ X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,
 
 void policy_node_free(X509_POLICY_NODE *node)
         {
-        OPENSSL_free(node);
+        free(node);
         }
 
 /* See if a policy node matches a policy OID. If mapping enabled look through
diff --git a/src/lib/libcrypto/x509v3/pcy_tree.c b/src/lib/libcrypto/x509v3/pcy_tree.c
index bb9777348f..c4239b1fd9 100644
--- a/src/lib/libcrypto/x509v3/pcy_tree.c
+++ b/src/lib/libcrypto/x509v3/pcy_tree.c
@@ -219,13 +219,13 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
 
         /* If we get this far initialize the tree */
 
-        tree = OPENSSL_malloc(sizeof(X509_POLICY_TREE));
+        tree = malloc(sizeof(X509_POLICY_TREE));
 
         if (!tree)
                 return 0;
 
         tree->flags = 0;
-        tree->levels = OPENSSL_malloc(sizeof(X509_POLICY_LEVEL) * n);
+        tree->levels = malloc(sizeof(X509_POLICY_LEVEL) * n);
         tree->nlevel = 0;
         tree->extra_data = NULL;
         tree->auth_policies = NULL;
@@ -233,7 +233,7 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
 
         if (!tree->levels)
                 {
-                OPENSSL_free(tree);
+                free(tree);
                 return 0;
                 }
 
@@ -516,7 +516,7 @@ static int tree_prune(X509_POLICY_TREE *tree, X509_POLICY_LEVEL *curr)
                         if (node->data->flags & POLICY_DATA_FLAG_MAP_MASK)
                                 {
                                 node->parent->nchild--;
-                                OPENSSL_free(node);
+                                free(node);
                                 (void)sk_X509_POLICY_NODE_delete(nodes,i);
                                 }
                         }
@@ -531,7 +531,7 @@ static int tree_prune(X509_POLICY_TREE *tree, X509_POLICY_LEVEL *curr)
                         if (node->nchild == 0)
                                 {
                                 node->parent->nchild--;
-                                OPENSSL_free(node);
+                                free(node);
                                 (void)sk_X509_POLICY_NODE_delete(nodes, i);
                                 }
                         }
@@ -539,7 +539,7 @@ static int tree_prune(X509_POLICY_TREE *tree, X509_POLICY_LEVEL *curr)
                         {
                         if (curr->anyPolicy->parent)
                                 curr->anyPolicy->parent->nchild--;
-                        OPENSSL_free(curr->anyPolicy);
+                        free(curr->anyPolicy);
                         curr->anyPolicy = NULL;
                         }
                 if (curr == tree->levels)
@@ -721,7 +721,7 @@ static int tree_evaluate(X509_POLICY_TREE *tree)
 static void exnode_free(X509_POLICY_NODE *node)
         {
         if (node->data && (node->data->flags & POLICY_DATA_FLAG_EXTRA_NODE))
-                OPENSSL_free(node);
+                free(node);
         }
 
 
@@ -751,8 +751,8 @@ void X509_policy_tree_free(X509_POLICY_TREE *tree)
                 sk_X509_POLICY_DATA_pop_free(tree->extra_data,
                                                 policy_data_free);
 
-        OPENSSL_free(tree->levels);
-        OPENSSL_free(tree);
+        free(tree->levels);
+        free(tree);
 
         }
 
diff --git a/src/lib/libcrypto/x509v3/v3_addr.c b/src/lib/libcrypto/x509v3/v3_addr.c
index df46a4983b..179f08d222 100644
--- a/src/lib/libcrypto/x509v3/v3_addr.c
+++ b/src/lib/libcrypto/x509v3/v3_addr.c
@@ -1013,7 +1013,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
         X509V3_conf_err(val);
         goto err;
       }
-      OPENSSL_free(s);
+      free(s);
       s = NULL;
       continue;
     }
@@ -1077,7 +1077,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
       goto err;
     }
 
-    OPENSSL_free(s);
+    free(s);
     s = NULL;
   }
 
@@ -1089,7 +1089,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
   return addr;
 
  err:
-  OPENSSL_free(s);
+  free(s);
   sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free);
   return NULL;
 }
diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c
index c6b68ee221..04e1fb9544 100644
--- a/src/lib/libcrypto/x509v3/v3_akey.c
+++ b/src/lib/libcrypto/x509v3/v3_akey.c
@@ -87,7 +87,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
         if(akeyid->keyid) {
                 tmp = hex_to_string(akeyid->keyid->data, akeyid->keyid->length);
                 X509V3_add_value("keyid", tmp, &extlist);
-                OPENSSL_free(tmp);
+                free(tmp);
         }
         if(akeyid->issuer) 
                 extlist = i2v_GENERAL_NAMES(NULL, akeyid->issuer, extlist);
@@ -95,7 +95,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
                 tmp = hex_to_string(akeyid->serial->data,
                                                  akeyid->serial->length);
                 X509V3_add_value("serial", tmp, &extlist);
-                OPENSSL_free(tmp);
+                free(tmp);
         }
         return extlist;
 }
diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c
index 8de5dd041b..636677df94 100644
--- a/src/lib/libcrypto/x509v3/v3_alt.c
+++ b/src/lib/libcrypto/x509v3/v3_alt.c
@@ -578,11 +578,11 @@ static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)
         if (!(gen->d.otherName->value = ASN1_generate_v3(p + 1, ctx)))
                 return 0;
         objlen = p - value;
-        objtmp = OPENSSL_malloc(objlen + 1);
+        objtmp = malloc(objlen + 1);
         if (objtmp) {
                 strlcpy(objtmp, value, objlen + 1);
                 gen->d.otherName->type_id = OBJ_txt2obj(objtmp, 0);
-                OPENSSL_free(objtmp);
+                free(objtmp);
         } else
                 gen->d.otherName->type_id = NULL;
         if (!gen->d.otherName->type_id)
diff --git a/src/lib/libcrypto/x509v3/v3_asid.c b/src/lib/libcrypto/x509v3/v3_asid.c
index 1587e8ed72..325c8e0406 100644
--- a/src/lib/libcrypto/x509v3/v3_asid.c
+++ b/src/lib/libcrypto/x509v3/v3_asid.c
@@ -125,17 +125,17 @@ static int i2r_ASIdentifierChoice(BIO *out,
         if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL)
           return 0;
         BIO_printf(out, "%*s%s\n", indent + 2, "", s);
-        OPENSSL_free(s);
+        free(s);
         break;
       case ASIdOrRange_range:
         if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->min)) == NULL)
           return 0;
         BIO_printf(out, "%*s%s-", indent + 2, "", s);
-        OPENSSL_free(s);
+        free(s);
         if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->max)) == NULL)
           return 0;
         BIO_printf(out, "%s\n", s);
-        OPENSSL_free(s);
+        free(s);
         break;
       default:
         return 0;
@@ -471,7 +471,7 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
       ASRange *r;
       switch (a->type) {
       case ASIdOrRange_id:
-        if ((r = OPENSSL_malloc(sizeof(ASRange))) == NULL) {
+        if ((r = malloc(sizeof(ASRange))) == NULL) {
           X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,
                     ERR_R_MALLOC_FAILURE);
           goto done;
@@ -620,7 +620,7 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
       s[i1] = '\0';
       min = s2i_ASN1_INTEGER(NULL, s);
       max = s2i_ASN1_INTEGER(NULL, s + i2);
-      OPENSSL_free(s);
+      free(s);
       if (min == NULL || max == NULL) {
         X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
         goto err;
diff --git a/src/lib/libcrypto/x509v3/v3_conf.c b/src/lib/libcrypto/x509v3/v3_conf.c
index 6730f9a6ee..519aefc93c 100644
--- a/src/lib/libcrypto/x509v3/v3_conf.c
+++ b/src/lib/libcrypto/x509v3/v3_conf.c
@@ -190,7 +190,7 @@ static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method, int ext_nid,
                 {
                 unsigned char *p;
                 ext_len = method->i2d(ext_struc, NULL);
-                if(!(ext_der = OPENSSL_malloc(ext_len))) goto merr;
+                if(!(ext_der = malloc(ext_len))) goto merr;
                 p = ext_der;
                 method->i2d(ext_struc, &p);
                 }
@@ -300,7 +300,7 @@ static X509_EXTENSION *v3_generic_extension(const char *ext, char *value,
         err:
         ASN1_OBJECT_free(obj);
         M_ASN1_OCTET_STRING_free(oct);
-        if(ext_der) OPENSSL_free(ext_der);
+        if(ext_der) free(ext_der);
         return extension;
 
         }
diff --git a/src/lib/libcrypto/x509v3/v3_cpols.c b/src/lib/libcrypto/x509v3/v3_cpols.c
index 1f0798b946..1a337fa07e 100644
--- a/src/lib/libcrypto/x509v3/v3_cpols.c
+++ b/src/lib/libcrypto/x509v3/v3_cpols.c
@@ -426,7 +426,7 @@ static void print_notice(BIO *out, USERNOTICE *notice, int indent)
                         if(i) BIO_puts(out, ", ");
                         tmp = i2s_ASN1_INTEGER(NULL, num);
                         BIO_puts(out, tmp);
-                        OPENSSL_free(tmp);
+                        free(tmp);
                 }
                 BIO_puts(out, "\n");
         }
diff --git a/src/lib/libcrypto/x509v3/v3_ia5.c b/src/lib/libcrypto/x509v3/v3_ia5.c
index ab1c5188b8..98789b36e9 100644
--- a/src/lib/libcrypto/x509v3/v3_ia5.c
+++ b/src/lib/libcrypto/x509v3/v3_ia5.c
@@ -82,7 +82,7 @@ static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
 {
         char *tmp;
         if(!ia5 || !ia5->length) return NULL;
-        if(!(tmp = OPENSSL_malloc(ia5->length + 1))) {
+        if(!(tmp = malloc(ia5->length + 1))) {
                 X509V3err(X509V3_F_I2S_ASN1_IA5STRING,ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
diff --git a/src/lib/libcrypto/x509v3/v3_info.c b/src/lib/libcrypto/x509v3/v3_info.c
index 44bc3e1105..2b290ca00c 100644
--- a/src/lib/libcrypto/x509v3/v3_info.c
+++ b/src/lib/libcrypto/x509v3/v3_info.c
@@ -115,7 +115,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method
                 vtmp = sk_CONF_VALUE_value(ret, i);
                 i2t_ASN1_OBJECT(objtmp, sizeof objtmp, desc->method);
                 nlen = strlen(objtmp) + strlen(vtmp->name) + 5;
-                ntmp = OPENSSL_malloc(nlen);
+                ntmp = malloc(nlen);
                 if(!ntmp) {
                         X509V3err(X509V3_F_I2V_AUTHORITY_INFO_ACCESS,
                                         ERR_R_MALLOC_FAILURE);
@@ -124,7 +124,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method
                 BUF_strlcpy(ntmp, objtmp, nlen);
                 BUF_strlcat(ntmp, " - ", nlen);
                 BUF_strlcat(ntmp, vtmp->name, nlen);
-                OPENSSL_free(vtmp->name);
+                free(vtmp->name);
                 vtmp->name = ntmp;
                 
         }
@@ -161,7 +161,7 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *metho
                 ctmp.value = cnf->value;
                 if(!v2i_GENERAL_NAME_ex(acc->location, method, ctx, &ctmp, 0))
                                                                  goto err; 
-                if(!(objtmp = OPENSSL_malloc(objlen + 1))) {
+                if(!(objtmp = malloc(objlen + 1))) {
                         X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
@@ -170,10 +170,10 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *metho
                 if(!acc->method) {
                         X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,X509V3_R_BAD_OBJECT);
                         ERR_add_error_data(2, "value=", objtmp);
-                        OPENSSL_free(objtmp);
+                        free(objtmp);
                         goto err;
                 }
-                OPENSSL_free(objtmp);
+                free(objtmp);
 
         }
         return ainfo;
diff --git a/src/lib/libcrypto/x509v3/v3_lib.c b/src/lib/libcrypto/x509v3/v3_lib.c
index 0f1e1d4422..0613ea7f22 100644
--- a/src/lib/libcrypto/x509v3/v3_lib.c
+++ b/src/lib/libcrypto/x509v3/v3_lib.c
@@ -133,7 +133,7 @@ int X509V3_EXT_add_alias(int nid_to, int nid_from)
                 X509V3err(X509V3_F_X509V3_EXT_ADD_ALIAS,X509V3_R_EXTENSION_NOT_FOUND);
                 return 0;
         }
-        if(!(tmpext = (X509V3_EXT_METHOD *)OPENSSL_malloc(sizeof(X509V3_EXT_METHOD)))) {
+        if(!(tmpext = (X509V3_EXT_METHOD *)malloc(sizeof(X509V3_EXT_METHOD)))) {
                 X509V3err(X509V3_F_X509V3_EXT_ADD_ALIAS,ERR_R_MALLOC_FAILURE);
                 return 0;
         }
@@ -151,7 +151,7 @@ void X509V3_EXT_cleanup(void)
 
 static void ext_list_free(X509V3_EXT_METHOD *ext)
 {
-        if(ext->ext_flags & X509V3_EXT_DYNAMIC) OPENSSL_free(ext);
+        if(ext->ext_flags & X509V3_EXT_DYNAMIC) free(ext);
 }
 
 /* Legacy function: we don't need to add standard extensions
diff --git a/src/lib/libcrypto/x509v3/v3_pci.c b/src/lib/libcrypto/x509v3/v3_pci.c
index 0dcfa004fe..9cef94258c 100644
--- a/src/lib/libcrypto/x509v3/v3_pci.c
+++ b/src/lib/libcrypto/x509v3/v3_pci.c
@@ -135,7 +135,7 @@ static int process_pci_value(CONF_VALUE *val,
                                 goto err;
                                 }
 
-                        tmp_data = OPENSSL_realloc((*policy)->data,
+                        tmp_data = realloc((*policy)->data,
                                 (*policy)->length + val_len + 1);
                         if (tmp_data)
                                 {
@@ -147,7 +147,7 @@ static int process_pci_value(CONF_VALUE *val,
                                 }
                         else
                                 {
-                                OPENSSL_free(tmp_data2);
+                                free(tmp_data2);
                                 /* realloc failure implies the original data space is b0rked too! */
                                 (*policy)->data = NULL;
                                 (*policy)->length = 0;
@@ -155,7 +155,7 @@ static int process_pci_value(CONF_VALUE *val,
                                 X509V3_conf_err(val);
                                 goto err;
                                 }
-                        OPENSSL_free(tmp_data2);
+                        free(tmp_data2);
                         }
                 else if (strncmp(val->value, "file:", 5) == 0)
                         {
@@ -173,7 +173,7 @@ static int process_pci_value(CONF_VALUE *val,
                                 {
                                 if (!n) continue;
 
-                                tmp_data = OPENSSL_realloc((*policy)->data,
+                                tmp_data = realloc((*policy)->data,
                                         (*policy)->length + n + 1);
 
                                 if (!tmp_data)
@@ -197,7 +197,7 @@ static int process_pci_value(CONF_VALUE *val,
                 else if (strncmp(val->value, "text:", 5) == 0)
                         {
                         val_len = strlen(val->value + 5);
-                        tmp_data = OPENSSL_realloc((*policy)->data,
+                        tmp_data = realloc((*policy)->data,
                                 (*policy)->length + val_len + 1);
                         if (tmp_data)
                                 {
diff --git a/src/lib/libcrypto/x509v3/v3_prn.c b/src/lib/libcrypto/x509v3/v3_prn.c
index 2124b447b4..565937af47 100644
--- a/src/lib/libcrypto/x509v3/v3_prn.c
+++ b/src/lib/libcrypto/x509v3/v3_prn.c
@@ -126,7 +126,7 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int inde
 
         err:
                 sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
-                if(value) OPENSSL_free(value);
+                if(value) free(value);
                 if(method->it) ASN1_item_free(ext_str, ASN1_ITEM_ptr(method->it));
                 else method->ext_free(ext_str);
                 return ok;
diff --git a/src/lib/libcrypto/x509v3/v3_purp.c b/src/lib/libcrypto/x509v3/v3_purp.c
index f59bfc1844..45d7251c29 100644
--- a/src/lib/libcrypto/x509v3/v3_purp.c
+++ b/src/lib/libcrypto/x509v3/v3_purp.c
@@ -183,17 +183,17 @@ int X509_PURPOSE_add(int id, int trust, int flags,
         idx = X509_PURPOSE_get_by_id(id);
         /* Need a new entry */
         if(idx == -1) {
-                if(!(ptmp = OPENSSL_malloc(sizeof(X509_PURPOSE)))) {
+                if(!(ptmp = malloc(sizeof(X509_PURPOSE)))) {
                         X509V3err(X509V3_F_X509_PURPOSE_ADD,ERR_R_MALLOC_FAILURE);
                         return 0;
                 }
                 ptmp->flags = X509_PURPOSE_DYNAMIC;
         } else ptmp = X509_PURPOSE_get0(idx);
 
-        /* OPENSSL_free existing name if dynamic */
+        /* free existing name if dynamic */
         if(ptmp->flags & X509_PURPOSE_DYNAMIC_NAME) {
-                OPENSSL_free(ptmp->name);
-                OPENSSL_free(ptmp->sname);
+                free(ptmp->name);
+                free(ptmp->sname);
         }
         /* dup supplied name */
         ptmp->name = BUF_strdup(name);
@@ -232,10 +232,10 @@ static void xptable_free(X509_PURPOSE *p)
         if (p->flags & X509_PURPOSE_DYNAMIC) 
                 {
                 if (p->flags & X509_PURPOSE_DYNAMIC_NAME) {
-                        OPENSSL_free(p->name);
-                        OPENSSL_free(p->sname);
+                        free(p->name);
+                        free(p->sname);
                 }
-                OPENSSL_free(p);
+                free(p);
                 }
         }
 
diff --git a/src/lib/libcrypto/x509v3/v3_sxnet.c b/src/lib/libcrypto/x509v3/v3_sxnet.c
index 2a6bf11b65..a2b0322e44 100644
--- a/src/lib/libcrypto/x509v3/v3_sxnet.c
+++ b/src/lib/libcrypto/x509v3/v3_sxnet.c
@@ -114,7 +114,7 @@ static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
                 id = sk_SXNETID_value(sx->ids, i);
                 tmp = i2s_ASN1_INTEGER(NULL, id->zone);
                 BIO_printf(out, "\n%*sZone: %s, User: ", indent, "", tmp);
-                OPENSSL_free(tmp);
+                free(tmp);
                 M_ASN1_OCTET_STRING_print(out, id->user);
         }
         return 1;
diff --git a/src/lib/libcrypto/x509v3/v3_utl.c b/src/lib/libcrypto/x509v3/v3_utl.c
index c4b6143eff..d938a175ed 100644
--- a/src/lib/libcrypto/x509v3/v3_utl.c
+++ b/src/lib/libcrypto/x509v3/v3_utl.c
@@ -85,7 +85,7 @@ int X509V3_add_value(const char *name, const char *value,
         char *tname = NULL, *tvalue = NULL;
         if(name && !(tname = BUF_strdup(name))) goto err;
         if(value && !(tvalue = BUF_strdup(value))) goto err;
-        if(!(vtmp = (CONF_VALUE *)OPENSSL_malloc(sizeof(CONF_VALUE)))) goto err;
+        if(!(vtmp = (CONF_VALUE *)malloc(sizeof(CONF_VALUE)))) goto err;
         if(!*extlist && !(*extlist = sk_CONF_VALUE_new_null())) goto err;
         vtmp->section = NULL;
         vtmp->name = tname;
@@ -94,9 +94,9 @@ int X509V3_add_value(const char *name, const char *value,
         return 1;
         err:
         X509V3err(X509V3_F_X509V3_ADD_VALUE,ERR_R_MALLOC_FAILURE);
-        if(vtmp) OPENSSL_free(vtmp);
-        if(tname) OPENSSL_free(tname);
-        if(tvalue) OPENSSL_free(tvalue);
+        if(vtmp) free(vtmp);
+        if(tname) free(tname);
+        if(tvalue) free(tvalue);
         return 0;
 }
 
@@ -111,10 +111,10 @@ int X509V3_add_value_uchar(const char *name, const unsigned char *value,
 void X509V3_conf_free(CONF_VALUE *conf)
 {
         if(!conf) return;
-        if(conf->name) OPENSSL_free(conf->name);
-        if(conf->value) OPENSSL_free(conf->value);
-        if(conf->section) OPENSSL_free(conf->section);
-        OPENSSL_free(conf);
+        if(conf->name) free(conf->name);
+        if(conf->value) free(conf->value);
+        if(conf->section) free(conf->section);
+        free(conf);
 }
 
 int X509V3_add_value_bool(const char *name, int asn1_bool,
@@ -206,7 +206,7 @@ int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
         if(!aint) return 1;
         if(!(strtmp = i2s_ASN1_INTEGER(NULL, aint))) return 0;
         ret = X509V3_add_value(name, strtmp, extlist);
-        OPENSSL_free(strtmp);
+        free(strtmp);
         return ret;
 }
 
@@ -328,11 +328,11 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
                 }
                 X509V3_add_value(ntmp, NULL, &values);
         }
-OPENSSL_free(linebuf);
+free(linebuf);
 return values;
 
 err:
-OPENSSL_free(linebuf);
+free(linebuf);
 sk_CONF_VALUE_pop_free(values, X509V3_conf_free);
 return NULL;
 
@@ -355,7 +355,7 @@ static char *strip_spaces(char *name)
 
 /* hex string utilities */
 
-/* Given a buffer of length 'len' return a OPENSSL_malloc'ed string with its
+/* Given a buffer of length 'len' return a malloc'ed string with its
  * hex representation
  * @@@ (Contents of buffer are always kept in ASCII, also on EBCDIC machines)
  */
@@ -367,7 +367,7 @@ char *hex_to_string(const unsigned char *buffer, long len)
         int i;
         const static char hexdig[] = "0123456789ABCDEF";
         if(!buffer || !len) return NULL;
-        if(!(tmp = OPENSSL_malloc(len * 3 + 1))) {
+        if(!(tmp = malloc(len * 3 + 1))) {
                 X509V3err(X509V3_F_HEX_TO_STRING,ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
@@ -393,14 +393,14 @@ unsigned char *string_to_hex(const char *str, long *len)
                 X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_INVALID_NULL_ARGUMENT);
                 return NULL;
         }
-        if(!(hexbuf = OPENSSL_malloc(strlen(str) >> 1))) goto err;
+        if(!(hexbuf = malloc(strlen(str) >> 1))) goto err;
         for(p = (unsigned char *)str, q = hexbuf; *p;) {
                 ch = *p++;
                 if(ch == ':') continue;
                 cl = *p++;
                 if(!cl) {
                         X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_ODD_NUMBER_OF_DIGITS);
-                        OPENSSL_free(hexbuf);
+                        free(hexbuf);
                         return NULL;
                 }
                 if(isupper(ch)) ch = tolower(ch);
@@ -422,12 +422,12 @@ unsigned char *string_to_hex(const char *str, long *len)
         return hexbuf;
 
         err:
-        if(hexbuf) OPENSSL_free(hexbuf);
+        if(hexbuf) free(hexbuf);
         X509V3err(X509V3_F_STRING_TO_HEX,ERR_R_MALLOC_FAILURE);
         return NULL;
 
         badhex:
-        OPENSSL_free(hexbuf);
+        free(hexbuf);
         X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_ILLEGAL_HEX_DIGIT);
         return NULL;
 
@@ -531,7 +531,7 @@ static STACK_OF(OPENSSL_STRING) *get_email(X509_NAME *name, GENERAL_NAMES *gens)
 
 static void str_free(OPENSSL_STRING str)
 {
-        OPENSSL_free(str);
+        free(str);
 }
 
 static int append_ia5(STACK_OF(OPENSSL_STRING) **sk, ASN1_IA5STRING *email)
@@ -608,7 +608,7 @@ ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc)
 
         iplen2 = a2i_ipadd(ipout + iplen1, p);
 
-        OPENSSL_free(iptmp);
+        free(iptmp);
         iptmp = NULL;
 
         if (!iplen2 || (iplen1 != iplen2))
@@ -624,7 +624,7 @@ ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc)
 
         err:
         if (iptmp)
-                OPENSSL_free(iptmp);
+                free(iptmp);
         if (ret)
                 ASN1_OCTET_STRING_free(ret);
         return NULL;