From: Seonah Moon <seonah1.moon@samsung.com>
Date: Wed, 8 May 2019 11:53:21 +0000 (+0900)
Subject: Use proper thread locking function according to openssl version used
X-Git-Tag: submit/tizen/20190510.041920^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cec584922f79a1d5a35cd37cf24efcd39068e306;p=platform%2Fcore%2Fapi%2Fhttp.git

Use proper thread locking function according to openssl version used

https://www.openssl.org/docs/man1.0.2/man3/CRYPTO_THREADID_set_callback.html

Change-Id: I0b335f65f81155525dcda22730882c5cac77fc41
---

diff --git a/packaging/capi-network-http.spec b/packaging/capi-network-http.spec
index da2530b..42fe994 100644
--- a/packaging/capi-network-http.spec
+++ b/packaging/capi-network-http.spec
@@ -1,6 +1,6 @@
 Name:		capi-network-http
 Summary:	Http Framework
-Version:	0.0.37
+Version:	0.0.38
 Release:	0
 Group:		System/Network
 License:	Apache-2.0
diff --git a/src/http_common.c b/src/http_common.c
index 66828ca..de02b92 100644
--- a/src/http_common.c
+++ b/src/http_common.c
@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <openssl/err.h>
+#include <openssl/opensslv.h>
 #include <cynara-client.h>
 
 #define MUTEX_TYPE       pthread_mutex_t
@@ -334,6 +335,13 @@ static unsigned long id_function(void)
 	return ((unsigned long)THREAD_ID);
 }
 
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+static void threadid_function(CRYPTO_THREADID *threadid)
+{
+	CRYPTO_THREADID_set_numeric(threadid, id_function());
+}
+#endif
+
 int thread_setup(void)
 {
 	int index = 0;
@@ -345,7 +353,11 @@ int thread_setup(void)
 	for (index = 0;  index < CRYPTO_num_locks();  index++)
 		MUTEX_SETUP(mutex_buf[index]);
 
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+	CRYPTO_THREADID_set_callback(threadid_function);
+#else
 	CRYPTO_set_id_callback(id_function);
+#endif
 	CRYPTO_set_locking_callback(locking_function);
 
 	return 1;