upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add SSL cleanup for tcp timeout.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4915 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-09-25 09:01:13 +00:00
parent f82a128909
commit 377d5b426a
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -3,6 +3,7 @@
for DNS over TLS service. It sets the configured tls auth name. for DNS over TLS service. It sets the configured tls auth name.
This is useful for hosts that apart from the DNS over TLS services This is useful for hosts that apart from the DNS over TLS services
also provide other (web) services. also provide other (web) services.
- Add SSL cleanup for tcp timeout.
17 September 2018: Wouter 17 September 2018: Wouter
- Fix compile on Mac for unbound, provide explicit_bzero when libc - Fix compile on Mac for unbound, provide explicit_bzero when libc

11
services/outside_network.c
View file

@ -366,7 +366,9 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
#endif #endif
pend->c->ssl_shake_state = comm_ssl_shake_write; pend->c->ssl_shake_state = comm_ssl_shake_write;
if(w->tls_auth_name) { if(w->tls_auth_name) {
#ifdef HAVE_SSL
(void)SSL_set_tlsext_host_name(pend->c->ssl, w->tls_auth_name); (void)SSL_set_tlsext_host_name(pend->c->ssl, w->tls_auth_name);
#endif
} }
#ifdef HAVE_SSL_SET1_HOST #ifdef HAVE_SSL_SET1_HOST
if(w->tls_auth_name) { if(w->tls_auth_name) {
@ -377,6 +379,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)) { if(!SSL_set1_host(pend->c->ssl, w->tls_auth_name)) {
log_err("SSL_set1_host failed"); log_err("SSL_set1_host failed");
pend->c->fd = s; pend->c->fd = s;
SSL_free(pend->c->ssl);
pend->c->ssl = NULL;
comm_point_close(pend->c); comm_point_close(pend->c);
return 0; return 0;
} }
@ -1264,6 +1268,13 @@ outnet_tcptimer(void* arg)
} else { } else {
/* it was in use */ /* it was in use */
struct pending_tcp* pend=(struct pending_tcp*)w->next_waiting; 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); comm_point_close(pend->c);
pend->query = NULL; pend->query = NULL;
pend->next_free = outnet->tcp_free; pend->next_free = outnet->tcp_free;