Revert "Revert "Migrate to openssl 1.1""

This reverts commit 7a7f23de5d88c877db2280942ea5b53b63660961.

Change-Id: Ifa1cb76a0a86e5e2944a520270b3efd808c2d1ed

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index aec1ab8b4602f6cd0b4eddd2ad2e20ecca1e750d..1c114636c59539c31e3fa0637ea59996349ee1db 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -460,7 +460,6 @@ LIBDALI_ADAPTOR_LA_CXXFLAGS = \
                       $(LIBDRM_CFLAGS) \
                       $(LIBEXIF_CFLAGS) \
                       $(LIBCURL_CFLAGS) \
-                      $(LIBCRYPTO_CFLAGS) \
                       $(TPKP_CURL_CFLAGS) \
                       $(UTILX_CFLAGS)
 
@@ -489,7 +488,6 @@ LIBDALI_ADAPTOR_LA_LIBADD = \
                       $(LIBDRM_LIBS) \
                       $(LIBEXIF_LIBS) \
                       $(LIBCURL_LIBS) \
-                      $(LIBCRYPTO_LIBS) \
                       $(HARFBUZZ_LIBS) \
                       $(AUTOFILL_LIBS) \
                       $(TPKP_CURL_LIBS) \

diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac
index b182ba7e4dce8a18c8b0c0b4fccaf00d3de650b2..531ba188484afff83d4c7c0bb0ae9ab958abb4be 100644 (file)
--- a/build/tizen/adaptor/configure.ac
+++ b/build/tizen/adaptor/configure.ac
@@ -44,7 +44,6 @@ PKG_CHECK_MODULES(PNG, libpng)
 PKG_CHECK_MODULES(LIBEXIF, libexif)
 PKG_CHECK_MODULES(LIBDRM, libdrm)
 PKG_CHECK_MODULES(LIBCURL, libcurl)
-PKG_CHECK_MODULES(LIBCRYPTO, libcrypto)
 PKG_CHECK_MODULES(HARFBUZZ, harfbuzz)
 PKG_CHECK_MODULES(FRIBIDI, fribidi)
 PKG_CHECK_MODULES(CAIRO, cairo)

diff --git a/dali/internal/imaging/common/file-download.cpp b/dali/internal/imaging/common/file-download.cpp
index 402e3c0931aef7a7864908b2645cf5b2bf960452..3a5367eaee723bfa3f47754a19b1472acce986c7 100755 (executable)
--- a/dali/internal/imaging/common/file-download.cpp
+++ b/dali/internal/imaging/common/file-download.cpp
@@ -214,75 +214,18 @@ bool DownloadFile( CURL* curlHandle,
 namespace Network
 {
 
-std::mutex* CurlEnvironment::mMutexs = NULL;
-
 CurlEnvironment::CurlEnvironment()
 {
   // Must be called before we attempt any loads. e.g. by using curl_easy_init()
   // and before we start any threads.
   curl_global_init(CURL_GLOBAL_ALL);
-
- // libcurl with openssl needs locking_function and thread id for threadsafe
- // https://curl.haxx.se/libcurl/c/threadsafe.html
- // https://www.openssl.org/docs/man1.0.2/crypto/threads.html#DESCRIPTION
- // SetLockingFunction sets locking_function and get thread id by the guide.
-  SetLockingFunction();
 }
 
 CurlEnvironment::~CurlEnvironment()
 {
-  UnsetLockingFunction();
-
   curl_global_cleanup();
 }
 
-// libcurl with openssl needs locking_function and thread id for threadsafe
-// https://curl.haxx.se/libcurl/c/threadsafe.html
-// https://www.openssl.org/docs/man1.0.2/crypto/threads.html#DESCRIPTION
-void CurlEnvironment::OnOpenSSLLocking( int mode, int n, const char* file, int line )
-{
-  if( mode & CRYPTO_LOCK )
-  {
-    mMutexs[n].lock();
-  }
-  else
-  {
-    mMutexs[n].unlock();
-  }
-}
-
-void CurlEnvironment::GetThreadId( CRYPTO_THREADID* tid )
-{
-  // If dali uses c++ thread, we may replace pthread_self() to this_thread::get_id()
-  CRYPTO_THREADID_set_numeric( tid, static_cast< unsigned long > ( pthread_self() ) );
-}
-
-void CurlEnvironment::SetLockingFunction()
-{
-  if( mMutexs != NULL )
-  {
-    return;
-  }
-
-  mMutexs = new std::mutex[ CRYPTO_num_locks() ];
-
-  CRYPTO_THREADID_set_callback( &CurlEnvironment::GetThreadId );
-  CRYPTO_set_locking_callback( &CurlEnvironment::OnOpenSSLLocking );
-}
-
-void CurlEnvironment::UnsetLockingFunction()
-{
-  if( mMutexs == NULL )
-  {
-    return;
-  }
-
-  CRYPTO_THREADID_set_callback( NULL );
-  CRYPTO_set_locking_callback( NULL );
-  delete [] mMutexs;
-  mMutexs = NULL;
-}
-
 bool DownloadRemoteFileIntoMemory( const std::string& url,
                                    Dali::Vector<uint8_t>& dataBuffer,
                                    size_t& dataSize,

diff --git a/dali/internal/imaging/common/file-download.h b/dali/internal/imaging/common/file-download.h
index f807b227d8165c5db0695708e820ae0cc71ccc24..d53438c010356da67d322dc85c66062c0729999b 100755 (executable)
--- a/dali/internal/imaging/common/file-download.h
+++ b/dali/internal/imaging/common/file-download.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <mutex> //c++11
 #include <stdint.h> // uint8
-#include <openssl/crypto.h>
 
 namespace Dali
 {
@@ -59,24 +58,6 @@ public:
   CurlEnvironment& operator=( const CurlEnvironment& ) = delete;
   CurlEnvironment( CurlEnvironment&& ) = default;
   CurlEnvironment& operator=( CurlEnvironment&& ) = default;
-
-  /**
-   * Locking function for libcurl with openssl
-   */
-  static void OnOpenSSLLocking( int mode, int n, const char* file, int line );
-
-  /**
-   * Gets thread id for libcurl with openssl
-   */
-  static void GetThreadId( CRYPTO_THREADID* tid );
-
-private:
-
-  void SetLockingFunction();
-
-  void UnsetLockingFunction();
-
-  static std::mutex* mMutexs;
 };
 
 

diff --git a/dali/internal/imaging/windows/file-download-win.cpp b/dali/internal/imaging/windows/file-download-win.cpp
index a6ab471d74bbfb860f7659631cfc780dcb26753e..198e828648dc4a78b49b5a3f2a3c1b01aef2261b 100755 (executable)
--- a/dali/internal/imaging/windows/file-download-win.cpp
+++ b/dali/internal/imaging/windows/file-download-win.cpp
@@ -21,7 +21,6 @@
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 #include <pthread.h>
-#include <openssl/crypto.h>
 #include <cstring>
 #include <curl/curl.h>
 #include <../ExInclude/InternalFileOperation.h>
@@ -224,70 +223,18 @@ bool DownloadFile( CURL* curlHandle,
 namespace Network
 {
 
-std::mutex* CurlEnvironment::mMutexs = NULL;
-
 CurlEnvironment::CurlEnvironment()
 {
   // Must be called before we attempt any loads. e.g. by using curl_easy_init()
   // and before we start any threads.
   curl_global_init(CURL_GLOBAL_ALL);
-
- // libcurl with openssl needs locking_function and thread id for threadsafe
- // https://curl.haxx.se/libcurl/c/threadsafe.html
- // https://www.openssl.org/docs/man1.0.2/crypto/threads.html#DESCRIPTION
- // SetLockingFunction sets locking_function and get thread id by the guide.
-  SetLockingFunction();
 }
 
 CurlEnvironment::~CurlEnvironment()
 {
-  UnsetLockingFunction();
-
   curl_global_cleanup();
 }
 
-// libcurl with openssl needs locking_function and thread id for threadsafe
-// https://curl.haxx.se/libcurl/c/threadsafe.html
-// https://www.openssl.org/docs/man1.0.2/crypto/threads.html#DESCRIPTION
-void CurlEnvironment::OnOpenSSLLocking( int mode, int n, const char* file, int line )
-{
-  if( mode & CRYPTO_LOCK )
-  {
-    mMutexs[n].lock();
-  }
-  else
-  {
-    mMutexs[n].unlock();
-  }
-}
-
-void CurlEnvironment::SetLockingFunction()
-{
-  if( mMutexs != NULL )
-  {
-    return;
-  }
-
-  mMutexs = new std::mutex[ CRYPTO_num_locks() ];
-
-  CRYPTO_set_id_callback( &CurlEnvironment::GetThreadId );
-  CRYPTO_set_locking_callback( &CurlEnvironment::OnOpenSSLLocking );
-}
-
-void CurlEnvironment::UnsetLockingFunction()
-{
-  if( mMutexs == NULL )
-  {
-    return;
-  }
-
-  CRYPTO_set_id_callback( NULL );
-  CRYPTO_set_locking_callback( NULL );
-
-  delete [] mMutexs;
-  mMutexs = NULL;
-}
-
 bool DownloadRemoteFileIntoMemory( const std::string& url,
                                    Dali::Vector<uint8_t>& dataBuffer,
                                    size_t& dataSize,

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 9e36ce12e4946c4131885aafb7d11d246161b834..df05710217de572b0123c4106f083944896a7b7c 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -65,7 +65,6 @@ BuildRequires:  fribidi-devel
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(capi-system-sensor)
 
-BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  pkgconfig(cairo)
 
 BuildRequires:  pkgconfig(wayland-egl)