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/ssl_sess.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
index 0b1c655820..f9f6ee5ecb 100644
--- a/src/lib/libssl/ssl_sess.c
+++ b/src/lib/libssl/ssl_sess.c
@@ -195,7 +195,7 @@ SSL_SESSION
 {
 	SSL_SESSION *ss;
 
-	ss = (SSL_SESSION *)OPENSSL_malloc(sizeof(SSL_SESSION));
+	ss = (SSL_SESSION *)malloc(sizeof(SSL_SESSION));
 	if (ss == NULL) {
 		SSLerr(SSL_F_SSL_SESSION_NEW, ERR_R_MALLOC_FAILURE);
 		return (0);
@@ -371,8 +371,8 @@ ssl_get_new_session(SSL *s, int session)
 #ifndef OPENSSL_NO_EC
 		if (s->tlsext_ecpointformatlist) {
 			if (ss->tlsext_ecpointformatlist != NULL)
-				OPENSSL_free(ss->tlsext_ecpointformatlist);
-			if ((ss->tlsext_ecpointformatlist = OPENSSL_malloc(s->tlsext_ecpointformatlist_length)) == NULL) {
+				free(ss->tlsext_ecpointformatlist);
+			if ((ss->tlsext_ecpointformatlist = malloc(s->tlsext_ecpointformatlist_length)) == NULL) {
 				SSLerr(SSL_F_SSL_GET_NEW_SESSION, ERR_R_MALLOC_FAILURE);
 				SSL_SESSION_free(ss);
 				return 0;
@@ -382,8 +382,8 @@ ssl_get_new_session(SSL *s, int session)
 		}
 		if (s->tlsext_ellipticcurvelist) {
 			if (ss->tlsext_ellipticcurvelist != NULL)
-				OPENSSL_free(ss->tlsext_ellipticcurvelist);
-			if ((ss->tlsext_ellipticcurvelist = OPENSSL_malloc(s->tlsext_ellipticcurvelist_length)) == NULL) {
+				free(ss->tlsext_ellipticcurvelist);
+			if ((ss->tlsext_ellipticcurvelist = malloc(s->tlsext_ellipticcurvelist_length)) == NULL) {
 				SSLerr(SSL_F_SSL_GET_NEW_SESSION, ERR_R_MALLOC_FAILURE);
 				SSL_SESSION_free(ss);
 				return 0;
@@ -719,30 +719,30 @@ SSL_SESSION_free(SSL_SESSION *ss)
 		sk_SSL_CIPHER_free(ss->ciphers);
 #ifndef OPENSSL_NO_TLSEXT
 	if (ss->tlsext_hostname != NULL)
-		OPENSSL_free(ss->tlsext_hostname);
+		free(ss->tlsext_hostname);
 	if (ss->tlsext_tick != NULL)
-		OPENSSL_free(ss->tlsext_tick);
+		free(ss->tlsext_tick);
 #ifndef OPENSSL_NO_EC
 	ss->tlsext_ecpointformatlist_length = 0;
 	if (ss->tlsext_ecpointformatlist != NULL)
-		OPENSSL_free(ss->tlsext_ecpointformatlist);
+		free(ss->tlsext_ecpointformatlist);
 	ss->tlsext_ellipticcurvelist_length = 0;
 	if (ss->tlsext_ellipticcurvelist != NULL)
-		OPENSSL_free(ss->tlsext_ellipticcurvelist);
+		free(ss->tlsext_ellipticcurvelist);
 #endif /* OPENSSL_NO_EC */
 #endif
 #ifndef OPENSSL_NO_PSK
 	if (ss->psk_identity_hint != NULL)
-		OPENSSL_free(ss->psk_identity_hint);
+		free(ss->psk_identity_hint);
 	if (ss->psk_identity != NULL)
-		OPENSSL_free(ss->psk_identity);
+		free(ss->psk_identity);
 #endif
 #ifndef OPENSSL_NO_SRP
 	if (ss->srp_username != NULL)
-		OPENSSL_free(ss->srp_username);
+		free(ss->srp_username);
 #endif
 	OPENSSL_cleanse(ss, sizeof(*ss));
-	OPENSSL_free(ss);
+	free(ss);
 }
 
 int
@@ -768,7 +768,7 @@ SSL_set_session(SSL *s, SSL_SESSION *session)
 #ifndef OPENSSL_NO_KRB5
 		if (s->kssl_ctx && !s->kssl_ctx->client_princ &&
 			session->krb5_client_princ_len > 0) {
-			s->kssl_ctx->client_princ = (char *)OPENSSL_malloc(session->krb5_client_princ_len + 1);
+			s->kssl_ctx->client_princ = (char *)malloc(session->krb5_client_princ_len + 1);
 			memcpy(s->kssl_ctx->client_princ, session->krb5_client_princ,
 			session->krb5_client_princ_len);
 			s->kssl_ctx->client_princ[session->krb5_client_princ_len] = '\0';
@@ -900,11 +900,11 @@ SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len)
 {
 	if (s->version >= TLS1_VERSION) {
 		if (s->tlsext_session_ticket) {
-			OPENSSL_free(s->tlsext_session_ticket);
+			free(s->tlsext_session_ticket);
 			s->tlsext_session_ticket = NULL;
 		}
 
-		s->tlsext_session_ticket = OPENSSL_malloc(sizeof(TLS_SESSION_TICKET_EXT) + ext_len);
+		s->tlsext_session_ticket = malloc(sizeof(TLS_SESSION_TICKET_EXT) + ext_len);
 		if (!s->tlsext_session_ticket) {
 			SSLerr(SSL_F_SSL_SET_SESSION_TICKET_EXT, ERR_R_MALLOC_FAILURE);
 			return 0;
-- 
cgit v1.2.3-55-g6feb