- Fix compile failure with openssl 1.0.2.

NLnetLabs · Sep 13, 2021 · 222d640 · 222d640
1 parent ddecf7d
commit 222d640
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,6 @@
+13 September 2021: Wouter
+	- Fix compile failure with openssl 1.0.2.
+
 3 September 2021: Wouter
 	- Fix not reachable annotation in radix_find_prefix_node.
 

diff --git a/doc/RELNOTES b/doc/RELNOTES
@@ -20,6 +20,7 @@ BUG FIXES:
 	- Fix #189: nsd 4.3.7 crash answer_delegation: Assertion
 	  `query->delegation_rrset' failed.
 	- Fix #190: NSD returns 3 NSEC3 records for NODATA response.
+	- Fix compile failure with openssl 1.0.2.
 
 4.3.7
 ================

diff --git a/xfrd-tcp.c b/xfrd-tcp.c
@@ -177,6 +177,7 @@ struct xfrd_tcp_set* xfrd_tcp_set_create(struct region* region, const char *tls_
 				tls_cert_bundle);
 	}
 #else
+	(void)tls_cert_bundle;
 	log_msg(LOG_INFO, "xfrd: No TLS 1.3 support - XFR-over-TLS not available");
 #endif
 	for(i=0; i<XFRD_MAX_TCP; i++)

diff --git a/xfrd.c b/xfrd.c
@@ -402,8 +402,10 @@ xfrd_shutdown()
 	daemon_remote_delete(xfrd->nsd->rc); /* ssl-delete secret keys */
 	if (xfrd->nsd->tls_ctx)
 		SSL_CTX_free(xfrd->nsd->tls_ctx);
+#  ifdef HAVE_TLS_1_3
 	if (xfrd->tcp_set->ssl_ctx)
 		SSL_CTX_free(xfrd->tcp_set->ssl_ctx);
+#  endif
 #endif
 #ifdef USE_DNSTAP
 	dt_collector_close(nsd.dt_collector, &nsd);