From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 22 Apr 2021 07:41:04 +0000 (+0200)
Subject: - Fix that testcode dohclient has OpenSSL initialisation calls.
X-Git-Tag: release-1.13.2rc1~190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7226d2f9f24f2047357a192ebb7be9754357fe93;p=thirdparty%2Funbound.git

- Fix that testcode dohclient has OpenSSL initialisation calls.
---

diff --git a/doc/Changelog b/doc/Changelog
index 793b40cf1..85eb78c2a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	- Fix #468: OpenSSL 1.0.1 can no longer build Unbound.
 	- Further fix for #468: detect SSL_CTX_set_alpn_protos for build with
 	  OpenSSL 1.0.1.
+	- Fix that testcode dohclient has OpenSSL initialisation calls.
 
 13 April 2021: George
 	- Fix documentation comment for files previously residing in checkconf/.
diff --git a/testcode/dohclient.c b/testcode/dohclient.c
index b00bb15e0..0dc039f26 100644
--- a/testcode/dohclient.c
+++ b/testcode/dohclient.c
@@ -622,7 +622,25 @@ int main(int argc, char** argv)
 		return 1;
 	}
 
-
+	if(!no_tls) {
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
+		ERR_load_SSL_strings();
+#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
+#  ifndef S_SPLINT_S
+		OpenSSL_add_all_algorithms();
+#  endif
+#else
+		OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
+			| OPENSSL_INIT_ADD_ALL_DIGESTS
+			| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
+		(void)SSL_library_init();
+#else
+		(void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
+#endif
+	}
 	run(h2_session, port, no_tls, argc, argv);
 
 	checklock_stop();