summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_sess.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_sess.c')
-rw-r--r--src/lib/libssl/ssl_sess.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
index 9e01f72753..416def8908 100644
--- a/src/lib/libssl/ssl_sess.c
+++ b/src/lib/libssl/ssl_sess.c
@@ -111,7 +111,7 @@ SSL_SESSION *SSL_SESSION_new(void)
111 { 111 {
112 SSL_SESSION *ss; 112 SSL_SESSION *ss;
113 113
114 ss=(SSL_SESSION *)Malloc(sizeof(SSL_SESSION)); 114 ss=(SSL_SESSION *)OPENSSL_malloc(sizeof(SSL_SESSION));
115 if (ss == NULL) 115 if (ss == NULL)
116 { 116 {
117 SSLerr(SSL_F_SSL_SESSION_NEW,ERR_R_MALLOC_FAILURE); 117 SSLerr(SSL_F_SSL_SESSION_NEW,ERR_R_MALLOC_FAILURE);
@@ -310,7 +310,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len)
310#if 0 /* This is way too late. */ 310#if 0 /* This is way too late. */
311 311
312 /* If a thread got the session, then 'swaped', and another got 312 /* If a thread got the session, then 'swaped', and another got
313 * it and then due to a time-out decided to 'Free' it we could 313 * it and then due to a time-out decided to 'OPENSSL_free' it we could
314 * be in trouble. So I'll increment it now, then double decrement 314 * be in trouble. So I'll increment it now, then double decrement
315 * later - am I speaking rubbish?. */ 315 * later - am I speaking rubbish?. */
316 CRYPTO_add(&ret->references,1,CRYPTO_LOCK_SSL_SESSION); 316 CRYPTO_add(&ret->references,1,CRYPTO_LOCK_SSL_SESSION);
@@ -474,7 +474,7 @@ void SSL_SESSION_free(SSL_SESSION *ss)
474 if (ss->peer != NULL) X509_free(ss->peer); 474 if (ss->peer != NULL) X509_free(ss->peer);
475 if (ss->ciphers != NULL) sk_SSL_CIPHER_free(ss->ciphers); 475 if (ss->ciphers != NULL) sk_SSL_CIPHER_free(ss->ciphers);
476 memset(ss,0,sizeof(*ss)); 476 memset(ss,0,sizeof(*ss));
477 Free(ss); 477 OPENSSL_free(ss);
478 } 478 }
479 479
480int SSL_set_session(SSL *s, SSL_SESSION *session) 480int SSL_set_session(SSL *s, SSL_SESSION *session)