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/libssl/d1_srvr.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib/libssl/d1_srvr.c')

diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 6040dd96ca..9b87dcd067 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1188,7 +1188,7 @@ dtls1_send_server_key_exchange(SSL *s)
 			NULL, 0, NULL);
 
 			encodedPoint = (unsigned char *)
-			OPENSSL_malloc(encodedlen*sizeof(unsigned char));
+			malloc(encodedlen*sizeof(unsigned char));
 
 			bn_ctx = BN_CTX_new();
 			if ((encodedPoint == NULL) || (bn_ctx == NULL)) {
@@ -1289,7 +1289,7 @@ dtls1_send_server_key_exchange(SSL *s)
 			memcpy((unsigned char*)p,
 			(unsigned char *)encodedPoint,
 			encodedlen);
-			OPENSSL_free(encodedPoint);
+			free(encodedPoint);
 			p += encodedlen;
 		}
 #endif
@@ -1398,7 +1398,7 @@ f_err:
 err:
 #ifndef OPENSSL_NO_ECDH
 	if (encodedPoint != NULL)
-		OPENSSL_free(encodedPoint);
+		free(encodedPoint);
 	BN_CTX_free(bn_ctx);
 #endif
 	EVP_MD_CTX_cleanup(&md_ctx);
@@ -1564,7 +1564,7 @@ dtls1_send_newsession_ticket(SSL *s)
 		    DTLS1_HM_HEADER_LENGTH + 22 + EVP_MAX_IV_LENGTH +
 		    EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + slen))
 			return -1;
-		senc = OPENSSL_malloc(slen);
+		senc = malloc(slen);
 		if (!senc)
 			return -1;
 		p = senc;
@@ -1580,7 +1580,7 @@ dtls1_send_newsession_ticket(SSL *s)
 		if (tctx->tlsext_ticket_key_cb) {
 			if (tctx->tlsext_ticket_key_cb(s, key_name, iv, &ctx,
 				&hctx, 1) < 0) {
-				OPENSSL_free(senc);
+				free(senc);
 				return -1;
 			}
 		} else {
@@ -1624,7 +1624,7 @@ dtls1_send_newsession_ticket(SSL *s)
 		s->init_num = len;
 		s->state = SSL3_ST_SW_SESSION_TICKET_B;
 		s->init_off = 0;
-		OPENSSL_free(senc);
+		free(senc);
 
 		/* XDTLS:  set message header ? */
 		msg_len = s->init_num - DTLS1_HM_HEADER_LENGTH;
-- 
cgit v1.2.3-55-g6feb