Deprecate pubkey-pinning

Pubkey-pinning is not supported from tizen-6.0.

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

diff --git a/packaging/oauth2.spec b/packaging/oauth2.spec
index 3aab2a52f0229b197acc0844ed28808769d9391e..8cb8316d09c4572269bd5a37a213b4691456c0b1 100644 (file)
--- a/packaging/oauth2.spec
+++ b/packaging/oauth2.spec
@@ -20,7 +20,6 @@ BuildRequires:  pkgconfig(ewebkit2)
 
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(elementary)
-BuildRequires:  pkgconfig(tpkp-curl)
 BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(capi-system-info)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 42d23ce9a4ba87023438615aae24f40bda3d421f..4390bbcfff09122b71d9f48eb64b887c0f20a70c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,9 +24,9 @@ endif()
 
 if(USE_CHROMIUM_EFL)
        add_definitions(-DWITH_CHROMIUM)
-       pkg_check_modules(clientpkgs REQUIRED dlog glib-2.0 gio-2.0 gio-unix-2.0 capi-base-common libcurl efl-extension ecore evas chromium-efl json-glib-1.0 elementary tpkp-curl cynara-client capi-system-info)
+       pkg_check_modules(clientpkgs REQUIRED dlog glib-2.0 gio-2.0 gio-unix-2.0 capi-base-common libcurl efl-extension ecore evas chromium-efl json-glib-1.0 elementary cynara-client capi-system-info)
 else()
-       pkg_check_modules(clientpkgs REQUIRED dlog glib-2.0 gio-2.0 gio-unix-2.0 capi-base-common libcurl efl-extension ecore evas ewebkit2 json-glib-1.0 elementary tpkp-curl cynara-client capi-system-info)
+       pkg_check_modules(clientpkgs REQUIRED dlog glib-2.0 gio-2.0 gio-unix-2.0 capi-base-common libcurl efl-extension ecore evas ewebkit2 json-glib-1.0 elementary cynara-client capi-system-info)
 endif()
 
 FOREACH(flag ${clientpkgs_CFLAGS})

diff --git a/src/oauth2_manager.c b/src/oauth2_manager.c
index 0fa23a23003c7d0d5f69f7cab0c1c59f6b549ad4..35c20523ffba7652a8f54681feed6afc7282f6f7 100755 (executable)
--- a/src/oauth2_manager.c
+++ b/src/oauth2_manager.c
@@ -16,7 +16,6 @@
  */
 
 #include <efl_extension.h>
-#include <tpkp_curl.h>
 #include <cynara-client.h>
 #include <cynara-error.h>
 #include <system_info.h>
@@ -621,19 +620,15 @@ __curl_post_request(oauth2_manager_s *mgr_handle, const char *url,
                OAUTH2_LOG_I("__curl_post_request post body=[%s]", post_body);
 
        curl_easy_setopt(mgr_handle->curl_handle, CURLOPT_URL, url);
-       curl_easy_setopt(mgr_handle->curl_handle, CURLOPT_SSL_VERIFYPEER, FALSE);/*1L);*/
-       /*curl_easy_setopt(mgr_handle->curl_handle, CURLOPT_SSL_CTX_FUNCTION, tpkp_curl_ssl_ctx_callback);*/
        curl_easy_setopt(mgr_handle->curl_handle, CURLOPT_POSTFIELDS, post_body);
        char *data = NULL;
        curl_easy_setopt(mgr_handle->curl_handle, CURLOPT_WRITEDATA, &data);
        curl_easy_setopt(mgr_handle->curl_handle, CURLOPT_WRITEFUNCTION, __store_curl_response);
-       /*curl_easy_setopt(mgr_handle->curl_handle, CURLOPT_SSL_VERIFYPEER, FALSE);*/
 
        *curl_err = curl_easy_perform(mgr_handle->curl_handle);
        OAUTH2_LOG_I("Response id curl code=[%d]", *curl_err);
        if (*curl_err != CURLE_OK) {
                curl_easy_cleanup(mgr_handle->curl_handle);
-               tpkp_curl_cleanup();
 
                return NULL;
        }
@@ -644,13 +639,11 @@ __curl_post_request(oauth2_manager_s *mgr_handle, const char *url,
        if (*http_code != 200) {
                OAUTH2_LOG_I("http_code=[%ld]", *http_code);
                curl_easy_cleanup(mgr_handle->curl_handle);
-               tpkp_curl_cleanup();
 
                return NULL;
        }
 
        curl_easy_cleanup(mgr_handle->curl_handle);
-       tpkp_curl_cleanup();
 
        mgr_handle->curl_handle = NULL;