From 377d5b426a30fc915cf7905786f93c0ec89845b7 Mon Sep 17 00:00:00 2001

From: Wouter Wijngaards <wouter@nlnetlabs.nl>

Date: Tue, 25 Sep 2018 09:01:13 +0000

Subject: [PATCH] - Add SSL cleanup for tcp timeout.

git-svn-id: file:///svn/unbound/trunk@4915 be551aaa-1e26-0410-a405-d3ace91eadb9

---

 services/outside_network.c | 11 +++++++++++

 1 files changed, 9 insertions(+)

diff --git a/services/outside_network.c b/services/outside_network.c

index 5700ef8..b52cdab 100644

--- a/services/outside_network.c

+++ b/services/outside_network.c

@@ -373,6 +373,8 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)

                         if(!SSL_set1_host(pend->c->ssl, w->tls_auth_name)) {

                                 log_err("SSL_set1_host failed");

 				pend->c->fd = s;

+				SSL_free(pend->c->ssl);

+				pend->c->ssl = NULL;

 				comm_point_close(pend->c);

 				return 0;

 			}

@@ -1258,6 +1260,13 @@ outnet_tcptimer(void* arg)

 	} else {

 		/* it was in use */

 		struct pending_tcp* pend=(struct pending_tcp*)w->next_waiting;

+		if(pend->c->ssl) {

+#ifdef HAVE_SSL

+			SSL_shutdown(pend->c->ssl);

+			SSL_free(pend->c->ssl);

+			pend->c->ssl = NULL;

+#endif

+		}

 		comm_point_close(pend->c);

 		pend->query = NULL;

 		pend->next_free = outnet->tcp_free;