From: jsing <jsing@openbsd.org>
Date: Mon, 4 Aug 2014 15:48:01 +0000 (+0000)
Subject: Free the SSL context first and let the reference counting do its thing.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8a273387d675009bbcb66a943833ae366fed6611;p=openbsd

Free the SSL context first and let the reference counting do its thing.
---

diff --git a/lib/libressl/ressl.c b/lib/libressl/ressl.c
index bc257bd1a87..c4a1e42dfaf 100644
--- a/lib/libressl/ressl.c
+++ b/lib/libressl/ressl.c
@@ -102,11 +102,8 @@ ressl_free(struct ressl *ctx)
 void
 ressl_reset(struct ressl *ctx)
 {
-	/* SSL_free frees the SSL context. */
-	if (ctx->ssl_conn != NULL)
-		SSL_free(ctx->ssl_conn);
-	else
-		SSL_CTX_free(ctx->ssl_ctx);
+	SSL_CTX_free(ctx->ssl_ctx);
+	SSL_free(ctx->ssl_conn);
 
 	ctx->ssl_conn = NULL;
 	ctx->ssl_ctx = NULL;