From a6f845bc679dcb7986fc87192498b1476480a07c Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Thu, 28 Feb 2019 12:21:11 +0000
Subject: [PATCH] Fix openssl deprecated function use.

---
 lib/net_mosq.c         | 10 +++++-----
 src/mosquitto_passwd.c |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/net_mosq.c b/lib/net_mosq.c
index 0d72443c..6b5a31c0 100644
--- a/lib/net_mosq.c
+++ b/lib/net_mosq.c
@@ -123,17 +123,17 @@ int net__init(void)
 #endif
 
 #ifdef WITH_TLS
-#  if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_API_COMPAT < 0x10100000L
+#  if OPENSSL_VERSION_NUMBER < 0x10100000L
 	SSL_load_error_strings();
 	SSL_library_init();
 	OpenSSL_add_all_algorithms();
-	ENGINE_load_builtin_engines();
-	setup_ui_method();
 #  else
 	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
 			| OPENSSL_INIT_ADD_ALL_DIGESTS \
 			| OPENSSL_INIT_LOAD_CONFIG, NULL);
 #  endif
+	ENGINE_load_builtin_engines();
+	setup_ui_method();
 	if(tls_ex_index_mosq == -1){
 		tls_ex_index_mosq = SSL_get_ex_new_index(0, "client context", NULL, NULL, NULL);
 	}
@@ -144,10 +144,10 @@ int net__init(void)
 void net__cleanup(void)
 {
 #ifdef WITH_TLS
-#  if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_API_COMPAT < 0x10100000L
+#  if OPENSSL_VERSION_NUMBER < 0x10100000L
 	CRYPTO_cleanup_all_ex_data();
 	ERR_free_strings();
-	ERR_remove_state(0);
+	ERR_remove_thread_state(NULL);
 	EVP_cleanup();
 
 #    if !defined(OPENSSL_NO_ENGINE)
diff --git a/src/mosquitto_passwd.c b/src/mosquitto_passwd.c
index 77f34a9f..cde212fa 100644
--- a/src/mosquitto_passwd.c
+++ b/src/mosquitto_passwd.c
@@ -430,6 +430,10 @@ int main(int argc, char *argv[])
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L || OPENSSL_API_COMPAT < 0x10100000L
 	OpenSSL_add_all_digests();
+#else
+	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+			| OPENSSL_INIT_ADD_ALL_DIGESTS \
+			| OPENSSL_INIT_LOAD_CONFIG, NULL);
 #endif
 
 	if(argc == 1){