[fedfs-utils] [PATCH 1/2] openssl-1.1 update fixes

Chuck Lever chuck.lever at oracle.com
Mon Apr 10 10:49:38 PDT 2017


From: Ian Kent <ikent at redhat.com>

Changing OpenSSL to version 1.1 changes the API in some cases.
The two functions excluded here do nothing and have been deprecated
or removed in OpenSSL 1.1.

Signed-off-by: Ian Kent <ikent at redhat.com>
---
 src/libnsdb/connsec.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libnsdb/connsec.c b/src/libnsdb/connsec.c
index bb81eee..8bbf306 100644
--- a/src/libnsdb/connsec.c
+++ b/src/libnsdb/connsec.c
@@ -44,7 +44,9 @@ nsdb_connsec_crypto_startup(void)
 {
 	xlog(D_CALL, "%s", __func__);
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	CRYPTO_malloc_init();
+#endif
 	ERR_load_crypto_strings();
 	OpenSSL_add_all_algorithms();
 	ENGINE_load_builtin_engines();
@@ -62,7 +64,9 @@ nsdb_connsec_crypto_shutdown(void)
 	EVP_cleanup();
 	ENGINE_cleanup();
 	CRYPTO_cleanup_all_ex_data();
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	ERR_remove_thread_state(NULL);
+#endif
 	ERR_free_strings();
 }
 




More information about the fedfs-utils-devel mailing list