From 772c691feb9213d276eeb71316d858d538afbfda Mon Sep 17 00:00:00 2001 From: Sangwan Kwon Date: Mon, 2 Mar 2020 12:49:37 +0900 Subject: [PATCH] Deprecate pubkey-pinning Pubkey-pinning is not supported from tizen-6.0. Change-Id: If268863cd19cbd89c79cb334482ce25a367d2c35 Signed-off-by: Sangwan Kwon --- email-core/CMakeLists.txt | 2 +- email-core/email-core-account.c | 6 ------ packaging/email-service.spec | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/email-core/CMakeLists.txt b/email-core/CMakeLists.txt index d0aae80..5718786 100755 --- a/email-core/CMakeLists.txt +++ b/email-core/CMakeLists.txt @@ -233,7 +233,7 @@ INCLUDE_DIRECTORIES( INCLUDE(FindPkgConfig) -SET(PKG_MODULES glib-2.0 dlog dbus-1 gthread-2.0 key-manager tpkp-curl +SET(PKG_MODULES glib-2.0 dlog dbus-1 gthread-2.0 key-manager uw-imap-toolkit vconf vconf-internal-keys contacts-service2 openssl1.1 accounts-svc alarm-service notification libcurl libxml-2.0 cert-svc-vcore badge capi-appfw-application icu-i18n gmime-2.6 storage dpm cryptsvc) diff --git a/email-core/email-core-account.c b/email-core/email-core-account.c index 9d2eafb..c4b5436 100755 --- a/email-core/email-core-account.c +++ b/email-core/email-core-account.c @@ -38,7 +38,6 @@ #include #include #include -#include #include @@ -1489,9 +1488,6 @@ static int emcore_get_xoauth2_access_token(char *input_refresh_token, char **out curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)&result_string); curl_easy_setopt(curl, CURLOPT_HEADER, true); - /* pinning */ - curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, tpkp_curl_ssl_ctx_callback); - curl_ressult_code = curl_easy_perform(curl); EM_DEBUG_LOG_SEC("CURLcode: %d (%s)", curl_ressult_code, curl_easy_strerror(curl_ressult_code)); @@ -1548,8 +1544,6 @@ FINISH_OFF: if (curl) curl_easy_cleanup(curl); - tpkp_curl_cleanup(); - EM_DEBUG_FUNC_END("err [%d]", err); return err; } diff --git a/packaging/email-service.spec b/packaging/email-service.spec index 25e6adc..ad0ee78 100755 --- a/packaging/email-service.spec +++ b/packaging/email-service.spec @@ -40,7 +40,6 @@ BuildRequires: pkgconfig(accounts-svc) BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(tpkp-curl) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(cert-svc-vcore) BuildRequires: pkgconfig(badge) -- 2.7.4