Added the pinning feature

Change-Id: Ief701f3a775ab1625282f873f362715d7e2a8df7

diff --git a/email-core/CMakeLists.txt b/email-core/CMakeLists.txt
index 4d41754..4d1a036 100755 (executable)
--- a/email-core/CMakeLists.txt
+++ b/email-core/CMakeLists.txt
@@ -232,7 +232,7 @@ INCLUDE_DIRECTORIES(
 
 
 INCLUDE(FindPkgConfig)
-SET(PKG_MODULES glib-2.0 dlog dbus-1 gthread-2.0 key-manager
+SET(PKG_MODULES glib-2.0 dlog dbus-1 gthread-2.0 key-manager tpkp-curl
                        uw-imap-toolkit vconf vconf-internal-keys contacts-service2 
                        openssl accounts-svc alarm-service notification libcurl libxml-2.0 
                        cert-svc-vcore badge capi-appfw-application icu-i18n gmime-2.6 storage)

diff --git a/email-core/email-core-account.c b/email-core/email-core-account.c
index ab7ccd1..b7aa06e 100755 (executable)
--- a/email-core/email-core-account.c
+++ b/email-core/email-core-account.c
@@ -38,6 +38,7 @@
 #include <vconf.h>
 #include <curl/curl.h>
 #include <sys/shm.h>
+#include <tpkp_curl.h>
 
 #include "email-convert.h"
 #include "email-types.h"
@@ -1471,6 +1472,9 @@ 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));
@@ -1524,9 +1528,11 @@ FINISH_OFF:
 
        EM_SAFE_FREE(result_string);
 
-       if(curl)
+       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 d062208..5a47b62 100755 (executable)
--- a/packaging/email-service.spec
+++ b/packaging/email-service.spec
@@ -40,7 +40,6 @@ BuildRequires:  pkgconfig(vconf-internal-keys)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(dbus-1)
-
 BuildRequires:  pkgconfig(uw-imap-toolkit)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(alarm-service)
@@ -51,6 +50,7 @@ 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)