Remove some lines related to openssl

Change-Id: I7d65482d306cc90742e435a115adaa9184932db8

diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
index ccb5c18..a919d65 100755 (executable)
--- a/agent/CMakeLists.txt
+++ b/agent/CMakeLists.txt
@@ -105,11 +105,6 @@ IF (SUPPORT_OMA_DRM)
        ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
 ENDIF (SUPPORT_OMA_DRM)
 
-IF (USE_SSL_THREAD_LOCKING)
-       MESSAGE("USE_SSL_THREAD_LOCKING(openssl<=1.0):On")
-       ADD_DEFINITIONS("-DUSE_SSL_THREAD_LOCKING")
-ENDIF (USE_SSL_THREAD_LOCKING)
-
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fpic -Wall -Werror -Werror-implicit-function-declaration")
 IF (BUILD_GTESTS)
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=default")

diff --git a/agent/download-agent-dl-info.c b/agent/download-agent-dl-info.c
index 568b304..9d1836d 100644 (file)
--- a/agent/download-agent-dl-info.c
+++ b/agent/download-agent-dl-info.c
@@ -19,10 +19,6 @@
 #include <curl/curl.h>
 #include <pthread.h>
 
-#ifdef USE_SSL_THREAD_LOCKING
-#include <openssl/crypto.h>
-#endif
-
 #include "download-agent-dl-info.h"
 #include "download-agent-http-mgr.h"
 #include "download-agent-http-msg-handler.h"
@@ -30,64 +26,6 @@
 static pthread_mutex_t mutex_da_info_list = PTHREAD_MUTEX_INITIALIZER;
 da_info_t *da_info_list[DA_MAX_ID];
 
-#ifdef USE_SSL_THREAD_LOCKING
-static pthread_mutex_t *g_openssl_locks_list;
-
-/* locking mechnism for safe use of openssl context */
-static void openssl_lock_callback(int mode, int type, char *file, int line)
-{
-       DA_LOGV("type [%d], mode [%d]", type, mode);
-       (void)file;
-       (void)line;
-
-       if (mode & CRYPTO_LOCK)
-               pthread_mutex_lock(&(g_openssl_locks_list[type]));
-       else
-               pthread_mutex_unlock(&(g_openssl_locks_list[type]));
-}
-
-static unsigned long thread_id(void)
-{
-       unsigned long ret = (unsigned long)pthread_self();
-       return ret;
-}
-
-da_ret_t init_openssl_locks(void)
-{
-       DA_LOGD("");
-       int index;
-       int crypto_num_locks = CRYPTO_num_locks();
-       DA_LOGD("crypto_num_locks [%d]", crypto_num_locks);
-       g_openssl_locks_list = (pthread_mutex_t *)OPENSSL_malloc(crypto_num_locks * sizeof(pthread_mutex_t));
-       if (g_openssl_locks_list == DA_NULL) {
-               DA_LOGE("Failed to OPENSSL_malloc");
-               return DA_ERR_FAIL_TO_MEMALLOC;
-       }
-       for (index = 0; index < crypto_num_locks; index++)
-               pthread_mutex_init(&(g_openssl_locks_list[index]), NULL);
-
-       CRYPTO_set_id_callback((unsigned long (*)())thread_id);
-       CRYPTO_set_locking_callback((void (*)())openssl_lock_callback);
-
-       return DA_RESULT_OK;
-}
-da_ret_t deinit_openssl_locks(void)
-{
-       DA_LOGD("");
-       int index;
-       int crypto_num_locks = CRYPTO_num_locks();
-       for (index = 0; index < crypto_num_locks; index++)
-               pthread_mutex_destroy(&(g_openssl_locks_list[index]));
-
-       CRYPTO_set_id_callback(NULL);
-       CRYPTO_set_locking_callback(NULL);
-       OPENSSL_free(g_openssl_locks_list);
-       g_openssl_locks_list = NULL;
-
-       return DA_RESULT_OK;
-}
-#endif
-
 static void __init_da_info(int id)
 {
        da_info_t *da_info = DA_NULL;

diff --git a/agent/download-agent-interface.c b/agent/download-agent-interface.c
index 212df53..3289b48 100755 (executable)
--- a/agent/download-agent-interface.c
+++ b/agent/download-agent-interface.c
@@ -21,10 +21,6 @@ int da_init()
 {
        DA_LOGV("");
        da_ret_t ret = DA_RESULT_OK;
-#ifdef USE_SSL_THREAD_LOCKING
-       ret = init_openssl_locks();
-       DA_LOGI("Return ret = %d", ret);
-#endif
        return ret;
 }
 
@@ -34,9 +30,6 @@ int da_deinit()
 
        DA_LOGV("");
        destroy_da_info_list();
-#ifdef USE_SSL_THREAD_LOCKING
-       deinit_openssl_locks();
-#endif
        DA_LOGI("====== da_deint EXIT =====");
        return ret;
 }

diff --git a/agent/include/download-agent-dl-info.h b/agent/include/download-agent-dl-info.h
index 4823018..b5612dd 100644 (file)
--- a/agent/include/download-agent-dl-info.h
+++ b/agent/include/download-agent-dl-info.h
@@ -190,11 +190,6 @@ extern da_info_t *da_info_list[DA_MAX_ID];
        DA_MUTEX_UNLOCK(&GET_STATE_MUTEX(INFO));\
        }
 
-#ifdef USE_SSL_THREAD_LOCKING
-da_ret_t init_openssl_locks(void);
-da_ret_t deinit_openssl_locks(void);
-#endif
-
 da_ret_t get_available_da_id(int *available_id);
 da_ret_t copy_user_input_data(da_info_t *da_info, const char *url,
                req_data_t *ext_data, da_cb_t *da_cb_data);

diff --git a/cache/CMakeLists.txt b/cache/CMakeLists.txt
index 887233e..8939fda 100755 (executable)
--- a/cache/CMakeLists.txt
+++ b/cache/CMakeLists.txt
@@ -55,11 +55,6 @@ IF (SUPPORT_OMA_DRM)
        ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
 ENDIF (SUPPORT_OMA_DRM)
 
-IF (USE_SSL_THREAD_LOCKING)
-       MESSAGE("USE_SSL_THREAD_LOCKING(openssl<=1.0):On")
-       ADD_DEFINITIONS("-DUSE_SSL_THREAD_LOCKING")
-ENDIF (USE_SSL_THREAD_LOCKING)
-
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fpic -Wall -Werror -Werror-implicit-function-declaration")
 IF (BUILD_GTESTS)
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=default")