Remove remaining cert-svc package dependency

Change-Id: I05d21df0a9f091d059e243608279aa636ffce08d
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

7 files changed, 2 insertions, 18 deletions

diff --git a/email-core/CMakeLists.txt b/email-core/CMakeLists.txt
index 765e6f6..4d41754 100755
--- a/email-core/CMakeLists.txt
+++ b/email-core/CMakeLists.txt
@@ -235,7 +235,7 @@ INCLUDE(FindPkgConfig)
 SET(PKG_MODULES glib-2.0 dlog dbus-1 gthread-2.0 key-manager
 			uw-imap-toolkit vconf vconf-internal-keys contacts-service2 
 			openssl accounts-svc alarm-service notification libcurl libxml-2.0 
-			cert-svc cert-svc-vcore badge capi-appfw-application icu-i18n gmime-2.6 storage)
+			cert-svc-vcore badge capi-appfw-application icu-i18n gmime-2.6 storage)
 
 pkg_check_modules(core_pkgs REQUIRED ${PKG_MODULES})
 
@@ -293,7 +293,7 @@ INCLUDE_DIRECTORIES(
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(smime_pkgs REQUIRED glib-2.0 dlog cert-svc cert-svc-vcore)
+pkg_check_modules(smime_pkgs REQUIRED glib-2.0 dlog cert-svc-vcore)
 
 set(EXTRA_CFLAGS "")
 FOREACH(flag ${smime_pkgs_CFLAGS})
diff --git a/email-core/email-core-cert.c b/email-core/email-core-cert.c
index c567588..8f44291 100755
--- a/email-core/email-core-cert.c
+++ b/email-core/email-core-cert.c
@@ -33,7 +33,6 @@
 #include <openssl/pkcs12.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>
-#include <cert-service.h>
 #include <glib.h>
 #include <cert-svc/ccert.h>
 #include <cert-svc/cstring.h>
@@ -51,8 +50,6 @@
 #define READ_MODE "r"
 #define WRITE_MODE "w"
 
-#define TRUSTED_USER "trusteduser/email/"
-
 typedef enum {
 	CERT_TYPE_ETC          = 0,
 	CERT_TYPE_PKCS12,
diff --git a/email-core/email-core-smime.c b/email-core/email-core-smime.c
index d96291e..0ea3df8 100755
--- a/email-core/email-core-smime.c
+++ b/email-core/email-core-smime.c
@@ -51,8 +51,6 @@
 #include "email-core-key-manager.h"
 #include "email-debug-log.h"
 
-/* /opt/share/cert-svc/certs is a base path */
-
 #define SMIME_SIGNED_FILE "smime.p7s"
 #define SMIME_ENCRYPT_FILE "smime.p7m"
 #define DECRYPT_TEMP_FILE "decrypt_temp_file.eml"
@@ -381,7 +379,6 @@ INTERNAL_FUNC int emcore_smime_set_encrypt_message(char *multi_user_name,
 //	int flags = PKCS7_DETACHED | PKCS7_STREAM;
 	int flags = PKCS7_BINARY;
 
-	CERT_CONTEXT *loaded_cert = NULL;
 	STACK_OF(X509) *recipient_certs = NULL;
 	X509 *cert = NULL;
 	BIO *bio_mime_entity = NULL, *bio_cert = NULL;
@@ -389,8 +386,6 @@ INTERNAL_FUNC int emcore_smime_set_encrypt_message(char *multi_user_name,
 	PKCS7 *encrypt_message = NULL;
 	const EVP_CIPHER *cipher = NULL;
 
-	loaded_cert = cert_svc_cert_context_init();
-
 	SNPRINTF(temp_smime_filepath, sizeof(temp_smime_filepath), "%s%s%s", MAILTEMP, DIR_SEPERATOR, SMIME_ENCRYPT_FILE);
 	EM_DEBUG_LOG_SEC("attachment file path of smime : [%s]", temp_smime_filepath);
 
@@ -444,7 +439,6 @@ FINISH_OFF:
 	BIO_free(bio_mime_entity);
 	BIO_free_all(smime_attachment);
 
-	cert_svc_cert_context_final(loaded_cert);
 	if (err_code != NULL)
 		*err_code = err;
 
diff --git a/email-core/include/email-core-pgp.h b/email-core/include/email-core-pgp.h
index b7d2288..784f462 100644
--- a/email-core/include/email-core-pgp.h
+++ b/email-core/include/email-core-pgp.h
@@ -33,8 +33,6 @@
 #ifndef EM_CORE_GPG_H_
 #define EM_CORE_GPG_H_
 
-#include <cert-service.h>
-
 #include "email-types.h"
 
 INTERNAL_FUNC int emcore_pgp_set_signed_message(char *certificate, char *password, char *mime_entity, char *user_id, email_digest_type digest_type, char **file_path);
diff --git a/email-core/include/email-core-smime.h b/email-core/include/email-core-smime.h
index 547f0fa..5aa3587 100755
--- a/email-core/include/email-core-smime.h
+++ b/email-core/include/email-core-smime.h
@@ -33,8 +33,6 @@
 #ifndef EM_CORE_SMIME_H_
 #define EM_CORE_SMIME_H_
 
-#include <cert-service.h>
-
 #include "email-types.h"
 
 INTERNAL_FUNC int emcore_smime_set_signed_message(char *certificate, char *mime_entity, email_digest_type digest_type, char **file_path, int *err_code);
diff --git a/packaging/email-service.spec b/packaging/email-service.spec
index 7502a58..dc60529 100755
--- a/packaging/email-service.spec
+++ b/packaging/email-service.spec
@@ -42,7 +42,6 @@ BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(cert-svc)
 BuildRequires:  pkgconfig(cert-svc-vcore)
 BuildRequires:  pkgconfig(badge)
 BuildRequires:  pkgconfig(capi-appfw-application)
diff --git a/packaging/email-service_init_db.sh b/packaging/email-service_init_db.sh
index cd84cf8..b7b96d4 100644
--- a/packaging/email-service_init_db.sh
+++ b/packaging/email-service_init_db.sh
@@ -27,5 +27,3 @@ mkdir -m775 -p ${TZ_USER_DATA}/email/.email_data
 
 mkdir -m775 -p ${TZ_USER_DATA}/email/.email_data/tmp
 
-mkdir -p ${TZ_SYS_SHARE}/cert-svc/certs/trusteduser/email
-