[master] openssl backward compatibility fix

4604.	[bug]		Don't use ERR_load_crypto_strings() when building
			with OpenSSL 1.1.0. [RT #45117]
This commit is contained in:
Evan Hunt 2017-04-21 18:56:00 -07:00
parent 8ee6a6afd8
commit 4c31eda5e1
2 changed files with 4 additions and 1 deletions

View file

@ -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]

View file

@ -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) {