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

(limited to 'src/lib/libcrypto/cryptlib.c')

diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c
index 2bf5def17d..dc3cc2ab02 100644
--- a/src/lib/libcrypto/cryptlib.c
+++ b/src/lib/libcrypto/cryptlib.c
@@ -211,7 +211,7 @@ CRYPTO_get_new_lockid(char *name)
 	}
 	i = sk_OPENSSL_STRING_push(app_locks, str);
 	if (!i)
-		OPENSSL_free(str);
+		free(str);
 	else
 		i += CRYPTO_NUM_LOCKS; /* gap of one :-) */
 	return (i);
@@ -242,7 +242,7 @@ CRYPTO_get_new_dynlockid(void)
 	}
 	CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);
 
-	pointer = (CRYPTO_dynlock *)OPENSSL_malloc(sizeof(CRYPTO_dynlock));
+	pointer = (CRYPTO_dynlock *)malloc(sizeof(CRYPTO_dynlock));
 	if (pointer == NULL) {
 		CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID, ERR_R_MALLOC_FAILURE);
 		return (0);
@@ -250,7 +250,7 @@ CRYPTO_get_new_dynlockid(void)
 	pointer->references = 1;
 	pointer->data = dynlock_create_callback(__FILE__, __LINE__);
 	if (pointer->data == NULL) {
-		OPENSSL_free(pointer);
+		free(pointer);
 		CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID, ERR_R_MALLOC_FAILURE);
 		return (0);
 	}
@@ -273,7 +273,7 @@ CRYPTO_get_new_dynlockid(void)
 
 	if (i == -1) {
 		dynlock_destroy_callback(pointer->data, __FILE__, __LINE__);
-		OPENSSL_free(pointer);
+		free(pointer);
 	} else
 		i += 1; /* to avoid 0 */
 	return - i;
@@ -312,7 +312,7 @@ CRYPTO_destroy_dynlockid(int i)
 
 	if (pointer) {
 		dynlock_destroy_callback(pointer->data, __FILE__, __LINE__);
-		OPENSSL_free(pointer);
+		free(pointer);
 	}
 }
 
-- 
cgit v1.2.3-55-g6feb