d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix openssl deprecated function use.

Browse Source
This commit is contained in:
Roger A. Light 2019-02-28 12:21:11 +00:00
parent 36f10c7623
commit a6f845bc67
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/net_mosq.c
View File

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

4
src/mosquitto_passwd.c
View File

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