Remove cert-checker dependency

[AS-IS]
* cert-checker API is called by cert-svc when ocsp check failed.

[TO-BE]
* cert-checker API should be change to plug-in.
* This is for removing dependency on mobile profile.

Change-Id: I8184367cb89d128391b680fc5d71287db8f5346a
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index d35f2a3bf9703288ecba313415856859dfb6b6fe..fd50ddd28a7407464a6d439155ddbc427fa0678e 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -30,9 +30,6 @@ Requires: ca-certificates
 Requires: ca-certificates-tizen
 Requires: security-config
 Requires: openssl
-%if "%{?profile}" == "mobile"
-BuildRequires: pkgconfig(cert-checker)
-%endif
 
 %global user_name security_fw
 %global group_name security_fw
@@ -117,11 +114,6 @@ export FFLAGS="$FFLAGS -DTIZEN_EMULATOR_MODE"
          -DCERT_SVC_OLD_DB_PATH=%cert_svc_old_db_path \
          -DUPGRADE_SCRIPT_PATH=%upgrade_script_path \
          -DUPGRADE_DATA_PATH=%upgrade_data_path \
-%if "%{?profile}" == "mobile"
-         -DTIZEN_PROFILE_MOBILE:BOOL=ON \
-%else
-         -DTIZEN_PROFILE_MOBILE:BOOL=OFF \
-%endif
 %if 0%{?certsvc_test_build}
          -DCERTSVC_TEST_BUILD=1 \
          -DCERT_SVC_TESTS=%cert_svc_tests \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8589ad6567f02408ee82195e26438ea7e9a521ec..94a9a59e94020c3be6d23b1b1f2292314d9adb0a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,12 +18,6 @@
 #
 
 ######################### VCORE #########################
-
-IF(TIZEN_PROFILE_MOBILE)
-    ADD_DEFINITIONS("-DTIZEN_PROFILE_MOBILE")
-    SET(LIB_CERT_CHECKER cert-checker)
-ENDIF(TIZEN_PROFILE_MOBILE)
-
 PKG_CHECK_MODULES(VCORE_DEPS
     REQUIRED
     libxml-2.0
@@ -32,7 +26,6 @@ PKG_CHECK_MODULES(VCORE_DEPS
     xmlsec1
     dlog
     libsystemd-journal
-    ${LIB_CERT_CHECKER}
     )
 
 ADD_DEFINITIONS(${VCORE_DEPS_CFLAGS})

diff --git a/src/vcore/BaseValidator.cpp b/src/vcore/BaseValidator.cpp
index 1c7ac682f7bc2ac6138223afd3ea88147c160181..e978fb71cae57e40f1d5a958211b7a08ec2d8f06 100644 (file)
--- a/src/vcore/BaseValidator.cpp
+++ b/src/vcore/BaseValidator.cpp
@@ -36,10 +36,6 @@
 #include <vcore/SignatureFinder.h>
 #include <vcore/Ocsp.h>
 
-#ifdef TIZEN_PROFILE_MOBILE
-#include <cchecker/ocsp.h>
-#endif
-
 using namespace ValidationCore::CertStoreId;
 
 namespace {
@@ -369,17 +365,6 @@ VCerr BaseValidator::baseCheck(const std::string &contentPath,
                LogInfo("Ocsp unsupported : " << e.DumpToString());
        } catch (const Ocsp::Exception::Base &e) {
                LogInfo("Ocsp check throw exeption : " << e.DumpToString());
-#ifdef TIZEN_PROFILE_MOBILE
-               LogInfo("Launch cert-checker.");
-               try {
-                       if (cchecker_ocsp_request() != 0)
-                               LogError("Load cert-checker failed.");
-               } catch (const std::exception &e) {
-                       LogError("std exception occured while cchecker running : " << e.what());
-               } catch (...) {
-                       LogError("Unknown exception occuured while cchecker running. ");
-               }
-#endif
        } catch (const std::exception &e) {
                LogError("std exception occured : " << e.what());
                return E_SIG_UNKNOWN;
@@ -434,17 +419,6 @@ VCerr BaseValidator::baseCheckList(bool checkOcsp, const UriList &uriList)
                LogInfo("Ocsp unsupported : " << e.DumpToString());
        } catch (const Ocsp::Exception::Base &e) {
                LogInfo("Ocsp check throw exeption : " << e.DumpToString());
-#ifdef TIZEN_PROFILE_MOBILE
-               LogInfo("Launch cert-checker.");
-               try {
-                       if (cchecker_ocsp_request() != 0)
-                               LogError("Load cert-checker failed.");
-               } catch (const std::exception &e) {
-                       LogError("std exception occured while cchecker running : " << e.what());
-               } catch (...) {
-                       LogError("Unknown exception occuured while cchecker running. ");
-               }
-#endif
        } catch (...) {
                LogError("Unknown exception in BaseValidator::checkList");
                return E_SIG_UNKNOWN;