From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 22 Sep 2023 11:15:35 +0000 (+0200)
Subject: - Fix #942: 1.18.0 libunbound DNS regression when built without
X-Git-Tag: release-1.19.0rc1~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=654a7eab62cbd1844d483cc4a0f2cf2fbcbaf00a;p=thirdparty%2Funbound.git

- Fix #942: 1.18.0 libunbound DNS regression when built without
  OpenSSL.
---

diff --git a/doc/Changelog b/doc/Changelog
index 1ff496d82..9b3ccf8ea 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+22 September 2023: Wouter
+	- Fix #942: 1.18.0 libunbound DNS regression when built without
+	  OpenSSL.
+
 18 September 2023: Wouter
 	- Fix rpz tcp-only action with rpz triggers nsdname and nsip.
 
diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index 104244937..865c71438 100644
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -168,6 +168,7 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb)
 		hints_delete(w->env->hints);
 		w->env->hints = NULL;
 	}
+#ifdef HAVE_SSL
 	w->sslctx = connect_sslctx_create(NULL, NULL,
 		cfg->tls_cert_bundle, cfg->tls_win_cert);
 	if(!w->sslctx) {
@@ -175,6 +176,7 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb)
 		hints_delete(w->env->hints);
 		w->env->hints = NULL;
 	}
+#endif
 	if(!w->is_bg || w->is_bg_thread) {
 		lock_basic_unlock(&ctx->cfglock);
 	}