[v9_10] openssl backward compatibility fix

4604.	[bug]		Don't use ERR_load_crypto_strings() when building
			with OpenSSL 1.1.0. [RT #45117]

(cherry picked from commit 4c31eda5e10d35969d3df8846fe44df4d36c7b96)

diff --git a/CHANGES b/CHANGES
index 7cc124c5078499a0737bcc59438bcb0bad06d933..afb3bffe60d9d3526f83c4c3767112596a26e045 100644 (file)
--- 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 fc13bdd431d58147aa8d37957d860984123e8d29..a23b807c21c4a3e62ce1ea43e57c985868b62633 100644 (file)
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -212,9 +212,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) {