Remove useless parameters of VCoreInit

Change-Id: I2df6cf7f398505e9f77eb0e6c77a55cc4d6a4942
Signed-off-by: kyungwook tak <k.tak@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6747117..b678e0a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,7 @@ INCLUDE_DIRECTORIES(
 
 ADD_DEFINITIONS("-DDPL_LOGS_ENABLED")
 IF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
+MESSAGE("TIZEN_FEATURE_CERT_SVC_OCSP_CRL ENABLED")
 ADD_DEFINITIONS("-DTIZEN_FEATURE_CERT_SVC_OCSP_CRL")
 ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index d940aa0..f5f64ce 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -1,4 +1,3 @@
-#sbs-git:slp/pkgs/c/cert-svc cert-svc 1.0.1 ad7eb7efcefb37b06017c69cb2fc44e6f7b6cab7
 Name:    cert-svc
 Summary: Certification service
 Version: 1.0.1

diff --git a/vcore/src/vcore/VCore.cpp b/vcore/src/vcore/VCore.cpp
index 287b37f..3d7f572 100644 (file)
--- a/vcore/src/vcore/VCore.cpp
+++ b/vcore/src/vcore/VCore.cpp
@@ -32,12 +32,18 @@
 #include <dpl/assert.h>
 #include <dpl/log/log.h>
 
-#ifdef TIZEN_FEATURE_CERT_SVC_OCSP_CRL
 namespace {
+
+#ifdef TIZEN_FEATURE_CERT_SVC_OCSP_CRL
 DPL::DB::ThreadDatabaseSupport *threadInterface = NULL;
-} // namespace anonymous
+const std::string DatabasePath              = "/opt/dbspace/.cert_svc_vcore.db";
 #endif
 
+const std::string FingerprintListPath       = "/usr/share/ca-certificates/fingerprint/fingerprint_list.xml";
+const std::string FingerprintListSchemaPath = "/usr/share/ca-certificates/fingerprint/fingerprint_list.xsd";
+
+} // namespace anonymous
+
 namespace ValidationCore {
 
 void AttachToThreadRO(void)
@@ -86,30 +92,26 @@ DPL::DB::ThreadDatabaseSupport& ThreadInterface(void) {
     return *threadInterface;
 }
 #endif
-bool VCoreInit(const std::string& configFilePath,
-               const std::string& configSchemaPath,
-               const std::string& databasePath)
+void VCoreInit()
 {
 #ifdef TIZEN_FEATURE_CERT_SVC_OCSP_CRL
-       if(threadInterface) {
+       if (threadInterface) {
         LogDebug("Already Initialized");
-        return true;
+        return;
     }
 
     threadInterface = new DPL::DB::ThreadDatabaseSupport(
-        databasePath.c_str(),
+        DatabasePath.c_str(),
         DPL::DB::SqlConnection::Flag::UseLucene);
 #endif
+
     SSL_library_init();
-//    g_thread_init(NULL);
     g_type_init();
 
-    LogDebug("Initializing VCore");
     Config &globalConfig = ConfigSingleton::Instance();
-    globalConfig.setXMLConfigPath(configFilePath) &&
-        globalConfig.setXMLSchemaPath(configSchemaPath);
 
-    return true;
+    globalConfig.setXMLConfigPath(FingerprintListPath);
+    globalConfig.setXMLSchemaPath(FingerprintListSchemaPath);
 }
 
 void VCoreDeinit()

diff --git a/vcore/src/vcore/VCore.h b/vcore/src/vcore/VCore.h
index d293563..fd46bbd 100644 (file)
--- a/vcore/src/vcore/VCore.h
+++ b/vcore/src/vcore/VCore.h
@@ -26,20 +26,12 @@
 
 namespace ValidationCore {
 /*
- * configFilePath - path to XML config file with certificates configuration
- *
- * configSchemaPath - XMLschema of config file
- *
- * databasePath - path to database with OCSP/CRL cache.
- *
  * This function could be run only once. If you call it twice it will
  * return false and non data will be set.
  *
  * This function must be call before AttachToThread function.
  */
-bool VCoreInit(const std::string& configFilePath,
-               const std::string& configSchemaPath,
-               const std::string& databasePath);
+void VCoreInit(void);
 
 /*
  * This function will free internal structures responsible for db connection.