[master] openssl backward compatibility fix

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

diff --git a/CHANGES b/CHANGES
index e320f270dc48857fabb86a32b82da0fdb9c91699..e26704590f0eb121c1438981c326a9cbd5e7f5d1 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 7f744899376dac897adf0cec12ba92bb525b2a51..88e7921d468e34d2e4280b5bdc24220c3e47a957 100644 (file)
--- 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) {