From 4c31eda5e10d35969d3df8846fe44df4d36c7b96 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Fri, 21 Apr 2017 18:56:00 -0700
Subject: [PATCH] [master] openssl backward compatibility fix

4604.	[bug]		Don't use ERR_load_crypto_strings() when building
			with OpenSSL 1.1.0. [RT #45117]
---
 CHANGES                | 3 +++
 lib/dns/openssl_link.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index e320f270dc..e26704590f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4604.	[bug]		Don't use ERR_load_crypto_strings() when building
+			with OpenSSL 1.1.0. [RT #45117]
+
 4603.	[doc]		Automatically generate named.conf(5) man page
 			from doc/misc/options. Thanks to Tony Finch.
 			[RT #43525]
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 7f74489937..88e7921d46 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -204,9 +204,9 @@ dst__openssl_init(const char *engine) {
 		goto cleanup_mutexalloc;
 	CRYPTO_set_locking_callback(lock_callback);
 	CRYPTO_set_id_callback(id_callback);
-#endif
 
 	ERR_load_crypto_strings();
+#endif
 
 	rm = mem_alloc(sizeof(RAND_METHOD) FILELINE);
 	if (rm == NULL) {
-- 
GitLab