From bddb7c686e3d1aeb156722adc64b6c35ae720f87 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/x509v3/v3_asid.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/libcrypto/x509v3/v3_asid.c')

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;
-- 
cgit v1.2.3-55-g6feb