From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 20 Jun 2022 14:27:15 +0000 (+0200)
Subject: - Remove unused LDNS function check for GOST Engine unloading.
X-Git-Tag: release-1.16.1rc1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c9177095f37391eccd4836defb2b9c21793b87c;p=thirdparty%2Funbound.git

- Remove unused LDNS function check for GOST Engine unloading.
---

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 0e3923b4e..4ed531855 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -795,7 +795,7 @@ daemon_delete(struct daemon* daemon)
 	ub_c_lex_destroy();
 	/* libcrypto cleanup */
 #ifdef HAVE_SSL
-#  if defined(USE_GOST) && defined(HAVE_LDNS_KEY_EVP_UNLOAD_GOST)
+#  if defined(USE_GOST)
 	sldns_key_EVP_unload_gost();
 #  endif
 #  if HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS && HAVE_DECL_SK_SSL_COMP_POP_FREE
diff --git a/doc/Changelog b/doc/Changelog
index 917c7e939..73ed03dfc 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+20 June 2022: George
+	- Remove unused LDNS function check for GOST Engine unloading.
+
 14 June 2022: George
 	- Merge PR #688: Rpz url notify issue.
 	- Note in the unbound.conf text that NOTIFY is allowed from the url:
diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index 16aa88450..b6dac5507 100644
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -918,7 +918,7 @@ main(int argc, char* argv[])
 	checklock_stop();
 	printf("%d checks ok.\n", testcount);
 #ifdef HAVE_SSL
-#  if defined(USE_GOST) && defined(HAVE_LDNS_KEY_EVP_UNLOAD_GOST)
+#  if defined(USE_GOST)
 	sldns_key_EVP_unload_gost();
 #  endif
 #  ifdef HAVE_OPENSSL_CONFIG