From: Sangwan Kwon <sangwan.kwon@samsung.com>
Date: Mon, 2 Mar 2020 04:11:09 +0000 (+0900)
Subject: Deprecate pubkey-pinning
X-Git-Tag: dali_1.9.3~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52c8c18bc454ba364c60cc2cdf74973a90dd26f8;hp=cf35096b79f8c5a0c0b66c66e80cb59bac32f423;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Deprecate pubkey-pinning

Pubkey-pinning is not supported from tizen-6.0.

Change-Id: I4bd368bf39ec6c9f48bd36372d2b4c1f255d51d7
Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
---

diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake
index da06257..b496dd9 100644
--- a/build/tizen/deps-check.cmake
+++ b/build/tizen/deps-check.cmake
@@ -78,7 +78,6 @@ CHECK_MODULE_AND_SET( ECORE ecore [] )
 CHECK_MODULE_AND_SET( ECORE_IPC ecore-ipc [] )
 CHECK_MODULE_AND_SET( ECORE_IMF ecore-imf [] )
 CHECK_MODULE_AND_SET( ELDBUS eldbus eldbus_available )
-CHECK_MODULE_AND_SET( TPKP_CURL tpkp-curl tpkp_curl_available )
 CHECK_MODULE_AND_SET( UTILX utilX utilx_available )
 CHECK_MODULE_AND_SET( OPENGLES20 glesv2 [] )
 CHECK_MODULE_AND_SET( EGL egl [] )
@@ -137,10 +136,6 @@ IF( eldbus_available )
   ADD_DEFINITIONS( -DDALI_ELDBUS_AVAILABLE )
 ENDIF()
 
-IF( tpkp_curl_available )
-  ADD_DEFINITIONS( -DTPK_CURL_ENABLED )
-ENDIF()
-
 ADD_DEFINITIONS( -DPLATFORM_TIZEN )
 
 IF( enable_debug )
@@ -248,7 +243,6 @@ SET( DALI_CFLAGS
   ${LIBDRM_CFLAGS}
   ${LIBEXIF_CFLAGS}
   ${LIBCURL_CFLAGS}
-  ${TPKP_CURL_CFLAGS}
   ${UTILX_CFLAGS}
   -Wall
 )
@@ -271,7 +265,6 @@ SET( DALI_LDFLAGS
   ${LIBCURL_LDFLAGS}
   ${LIBCRYPTO_LDFLAGS}
   ${HARFBUZZ_LDFLAGS}
-  ${TPKP_CURL_LDFLAGS}
   ${UTILX_LDFLAGS}
   -lgif
   -lturbojpeg
diff --git a/build/tizen/profiles/ubuntu-profile.cmake b/build/tizen/profiles/ubuntu-profile.cmake
index 363f118..27cc6ad 100644
--- a/build/tizen/profiles/ubuntu-profile.cmake
+++ b/build/tizen/profiles/ubuntu-profile.cmake
@@ -107,7 +107,6 @@ ADD_COMPILE_OPTIONS(
   ${LIBEXIF_CFLAGS}
   ${LIBCURL_CFLAGS}
   ${LIBCRYPTO_CFLAGS}
-  ${TPKP_CURL_CFLAGS}
   ${UTILX_CFLAGS}
 )
 
diff --git a/dali/internal/imaging/common/file-download.cpp b/dali/internal/imaging/common/file-download.cpp
index 3a5367e..6930618 100755
--- a/dali/internal/imaging/common/file-download.cpp
+++ b/dali/internal/imaging/common/file-download.cpp
@@ -27,10 +27,6 @@
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/file-writer.h>
 
-#ifdef TPK_CURL_ENABLED
-#include <tpkp_curl.h>
-#endif // TPK_CURL_ENABLED
-
 using namespace Dali::Integration;
 
 namespace Dali
@@ -68,11 +64,6 @@ void ConfigureCurlOptions( CURL* curlHandle, const std::string& url )
   curl_easy_setopt( curlHandle, CURLOPT_TIMEOUT, TIMEOUT_SECONDS );
   curl_easy_setopt( curlHandle, CURLOPT_HEADER, INCLUDE_HEADER );
   curl_easy_setopt( curlHandle, CURLOPT_NOBODY, EXCLUDE_BODY );
-
-#ifdef TPK_CURL_ENABLED
-  // Apply certificate pinning on Tizen
-  curl_easy_setopt( curlHandle, CURLOPT_SSL_CTX_FUNCTION, tpkp_curl_ssl_ctx_callback );
-#endif // TPK_CURL_ENABLED
 }
 
 // Without a write function or a buffer (file descriptor) to write to, curl will pump out
@@ -249,11 +240,6 @@ bool DownloadRemoteFileIntoMemory( const std::string& url,
 
     // clean up session
     curl_easy_cleanup( curlHandle );
-
-#ifdef TPK_CURL_ENABLED
-    // Clean up tpkp(the module for certificate pinning) resources on Tizen
-    tpkp_curl_cleanup();
-#endif // TPK_CURL_ENABLED
   }
   return result;
 }
diff --git a/dali/internal/imaging/windows/file-download-win.cpp b/dali/internal/imaging/windows/file-download-win.cpp
index 465ef1c..3f7db68 100755
--- a/dali/internal/imaging/windows/file-download-win.cpp
+++ b/dali/internal/imaging/windows/file-download-win.cpp
@@ -27,10 +27,6 @@
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/file-writer.h>
 
-#ifdef TPK_CURL_ENABLED
-#include <tpkp_curl.h>
-#endif // TPK_CURL_ENABLED
-
 using namespace Dali::Integration;
 
 namespace Dali
@@ -255,11 +251,6 @@ bool DownloadRemoteFileIntoMemory( const std::string& url,
   // clean up session
   curl_easy_cleanup( curlHandle );
 
-#ifdef TPK_CURL_ENABLED
-  // Clean up tpkp(the module for certificate pinning) resources on Tizen
-  tpkp_curl_cleanup();
-#endif // TPK_CURL_ENABLED
-
   return result;
 }
 
diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index c70c13d..ff77509 100644
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -90,8 +90,6 @@ BuildRequires:  pkgconfig(ecore-wayland)
 # dali-adaptor needs tbm_surface in tizen 3.0 wayland
 BuildRequires:  pkgconfig(libtbm)
 
-BuildRequires:  pkgconfig(tpkp-curl)
-
 # for dali-adaptor
 BuildRequires:  pkgconfig(appcore-ui)
 BuildRequires:  pkgconfig(appcore-widget-base)