Rename vcore directory to srcsubmit/tizen_3.0_wearable/20161015.000001submit/tizen_3.0_tv/20161015.000001submit/tizen_3.0_mobile/20161015.000001submit/tizen_3.0_ivi/20161010.000010submit/tizen_3.0_ivi/20161010.000000submit/tizen/20160926.005548accepted/tizen/wearable/20160927.020826accepted/tizen/tv/20160927.020657accepted/tizen/mobile/20160927.020843accepted/tizen/ivi/20160927.020901accepted/tizen/common/20160926.154111accepted/tizen/3.0/wearable/20161015.081932accepted/tizen/3.0/tv/20161016.004035accepted/tizen/3.0/mobile/20161015.032743accepted/tizen/3.0/ivi/20161011.053535

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

83 files changed, 174 insertions, 155 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44f6ba5..f55fc49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ INSTALL(FILES
     DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
 )
 
-ADD_SUBDIRECTORY(vcore)
+ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(systemd)
 ADD_SUBDIRECTORY(etc)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..227ba74
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,172 @@
+# Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+# @file        CMakeLists.txt
+# @author      Kyungwook Tak (k.tak@samsung.com)
+# @author      Sangwan Kwon (sangwan.kwon@samsung.com)
+#
+
+######################### 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
+    libpcrecpp
+    openssl
+    xmlsec1
+    dlog
+    libsystemd-journal
+    ${LIB_CERT_CHECKER}
+    )
+
+ADD_DEFINITIONS(${VCORE_DEPS_CFLAGS})
+ADD_DEFINITIONS(${VCORE_DEPS_CFLAGS_OTHER})
+
+SET(VCORE_SOURCES
+    dpl/core/src/assert.cpp
+    dpl/core/src/exception.cpp
+    dpl/core/src/singleton.cpp
+    dpl/core/src/colors.cpp
+
+    dpl/log/src/abstract_log_provider.cpp
+    dpl/log/src/old_style_log_provider.cpp
+    dpl/log/src/dlog_log_provider.cpp
+    dpl/log/src/journal_log_provider.cpp
+    dpl/log/src/log.cpp
+
+    vcore/api.cpp
+    vcore/Base64.cpp
+    vcore/Certificate.cpp
+    vcore/CertificateCollection.cpp
+    vcore/CertificateConfigReader.cpp
+    vcore/CertificateLoader.cpp
+    vcore/CertStoreType.cpp
+    vcore/ReferenceValidator.cpp
+    vcore/SaxReader.cpp
+    vcore/SignatureData.cpp
+    vcore/SignatureFinder.cpp
+    vcore/SignatureReader.cpp
+    vcore/TimeConversion.cpp
+    vcore/ValidatorFactories.cpp
+    vcore/SignatureValidator.cpp
+    vcore/XmlsecAdapter.cpp
+    vcore/pkcs12.cpp
+    vcore/exception.cpp
+    vcore/Client.cpp
+    vcore/Ocsp.cpp
+    vcore/CryptoInit.cpp
+    vcore/PluginHandler.cpp
+    vcore/init-lib.cpp
+    )
+
+SET(VCORE_INCLUDES
+    ./
+    dpl/core/include
+    dpl/log/include
+    )
+
+INCLUDE_DIRECTORIES(
+    SYSTEM
+    ${VCORE_DEPS_INCLUDE_DIRS}
+    ${VCORE_INCLUDES}
+    )
+
+ADD_LIBRARY(${TARGET_VCORE_LIB} SHARED ${VCORE_SOURCES})
+
+# TODO: visibility needed to be hidden
+SET_TARGET_PROPERTIES(${TARGET_VCORE_LIB}
+    PROPERTIES
+        COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=default"
+        SOVERSION ${SO_VERSION}
+        VERSION ${VERSION})
+
+TARGET_LINK_LIBRARIES(${TARGET_VCORE_LIB}
+    ${VCORE_DEPS_LIBRARIES}
+    ${TARGET_CERT_SVC_LIB}
+    -ldl
+    )
+
+INSTALL(TARGETS ${TARGET_VCORE_LIB}
+    DESTINATION ${LIB_INSTALL_DIR}
+    )
+
+######################### CERT_SERVER #########################
+
+PKG_CHECK_MODULES(CERT_SERVER_DEP
+    REQUIRED
+    dlog
+    sqlite3
+    db-util
+    libsystemd-daemon
+    key-manager
+    )
+
+SET(CERT_SERVER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server)
+
+SET(CERT_SERVER_SRC
+    ${CERT_SERVER_DIR}/src/cert-server-main.c
+    ${CERT_SERVER_DIR}/src/cert-server-logic.c
+    ${CERT_SERVER_DIR}/src/cert-server-db.c
+    )
+
+INCLUDE_DIRECTORIES(
+    SYSTEM
+    ./
+    ${CERT_SERVER_DEP_INCLUDE_DIRS}
+    ${CERT_SERVER_DIR}/include
+    )
+
+SET_SOURCE_FILES_PROPERTIES(
+    ${CERT_SERVER_SRC}
+    PROPERTIES
+        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -fPIE"
+    )
+
+ADD_EXECUTABLE(${TARGET_CERT_SERVER} ${CERT_SERVER_SRC})
+
+TARGET_LINK_LIBRARIES(${TARGET_CERT_SERVER}
+    ${CERT_SERVER_DEP_LIBRARIES}
+    -pie
+    )
+
+INSTALL(TARGETS ${TARGET_CERT_SERVER} DESTINATION ${BIN_DIR})
+
+######################### API HEADERS #########################
+
+INSTALL(FILES
+    vcore/SignatureValidator.h
+    vcore/SignatureFinder.h
+    vcore/Certificate.h
+    vcore/SignatureData.h
+    vcore/CertStoreType.h
+    vcore/exception.h
+    vcore/ValidatorPluginApi.h
+    vcore/Error.h
+    DESTINATION ${INCLUDEDIR}/cert-svc/vcore
+    )
+
+INSTALL(FILES
+    cert-svc/ccert.h
+    cert-svc/cinstance.h
+    cert-svc/cerror.h
+    cert-svc/cpkcs12.h
+    cert-svc/cprimitives.h
+    cert-svc/cstring.h
+    DESTINATION ${INCLUDEDIR}/cert-svc/cert-svc
+    )
diff --git a/vcore/cert-svc/ccert.h b/src/cert-svc/ccert.h
index cc2f61b..cc2f61b 100644
--- a/vcore/cert-svc/ccert.h
+++ b/src/cert-svc/ccert.h
diff --git a/vcore/cert-svc/cerror.h b/src/cert-svc/cerror.h
index 54c74f5..54c74f5 100644
--- a/vcore/cert-svc/cerror.h
+++ b/src/cert-svc/cerror.h
diff --git a/vcore/cert-svc/cinstance.h b/src/cert-svc/cinstance.h
index 3ca455c..3ca455c 100644
--- a/vcore/cert-svc/cinstance.h
+++ b/src/cert-svc/cinstance.h
diff --git a/vcore/cert-svc/cpkcs12.h b/src/cert-svc/cpkcs12.h
index 101d2e3..101d2e3 100644
--- a/vcore/cert-svc/cpkcs12.h
+++ b/src/cert-svc/cpkcs12.h
diff --git a/vcore/cert-svc/cprimitives.h b/src/cert-svc/cprimitives.h
index 8feb9e9..8feb9e9 100644
--- a/vcore/cert-svc/cprimitives.h
+++ b/src/cert-svc/cprimitives.h
diff --git a/vcore/cert-svc/cstring.h b/src/cert-svc/cstring.h
index 4f3c37f..4f3c37f 100644
--- a/vcore/cert-svc/cstring.h
+++ b/src/cert-svc/cstring.h
diff --git a/vcore/dpl/core/include/dpl/assert.h b/src/dpl/core/include/dpl/assert.h
index 14ef0b7..14ef0b7 100644
--- a/vcore/dpl/core/include/dpl/assert.h
+++ b/src/dpl/core/include/dpl/assert.h
diff --git a/vcore/dpl/core/include/dpl/colors.h b/src/dpl/core/include/dpl/colors.h
index 5d8e91c..5d8e91c 100644
--- a/vcore/dpl/core/include/dpl/colors.h
+++ b/src/dpl/core/include/dpl/colors.h
diff --git a/vcore/dpl/core/include/dpl/exception.h b/src/dpl/core/include/dpl/exception.h
index fba822a..fba822a 100644
--- a/vcore/dpl/core/include/dpl/exception.h
+++ b/src/dpl/core/include/dpl/exception.h
diff --git a/vcore/dpl/core/include/dpl/singleton.h b/src/dpl/core/include/dpl/singleton.h
index bec534a..bec534a 100644
--- a/vcore/dpl/core/include/dpl/singleton.h
+++ b/src/dpl/core/include/dpl/singleton.h
diff --git a/vcore/dpl/core/include/dpl/singleton_impl.h b/src/dpl/core/include/dpl/singleton_impl.h
index 502d926..502d926 100644
--- a/vcore/dpl/core/include/dpl/singleton_impl.h
+++ b/src/dpl/core/include/dpl/singleton_impl.h
diff --git a/vcore/dpl/core/src/assert.cpp b/src/dpl/core/src/assert.cpp
index 6e02192..6e02192 100644
--- a/vcore/dpl/core/src/assert.cpp
+++ b/src/dpl/core/src/assert.cpp
diff --git a/vcore/dpl/core/src/colors.cpp b/src/dpl/core/src/colors.cpp
index 2ec2749..2ec2749 100644
--- a/vcore/dpl/core/src/colors.cpp
+++ b/src/dpl/core/src/colors.cpp
diff --git a/vcore/dpl/core/src/exception.cpp b/src/dpl/core/src/exception.cpp
index 7e9faa2..7e9faa2 100644
--- a/vcore/dpl/core/src/exception.cpp
+++ b/src/dpl/core/src/exception.cpp
diff --git a/vcore/dpl/core/src/singleton.cpp b/src/dpl/core/src/singleton.cpp
index 54abd52..54abd52 100644
--- a/vcore/dpl/core/src/singleton.cpp
+++ b/src/dpl/core/src/singleton.cpp
diff --git a/vcore/dpl/log/include/dpl/log/abstract_log_provider.h b/src/dpl/log/include/dpl/log/abstract_log_provider.h
index b2bf970..b2bf970 100644
--- a/vcore/dpl/log/include/dpl/log/abstract_log_provider.h
+++ b/src/dpl/log/include/dpl/log/abstract_log_provider.h
diff --git a/vcore/dpl/log/include/dpl/log/dlog_log_provider.h b/src/dpl/log/include/dpl/log/dlog_log_provider.h
index e1e5be2..e1e5be2 100644
--- a/vcore/dpl/log/include/dpl/log/dlog_log_provider.h
+++ b/src/dpl/log/include/dpl/log/dlog_log_provider.h
diff --git a/vcore/dpl/log/include/dpl/log/journal_log_provider.h b/src/dpl/log/include/dpl/log/journal_log_provider.h
index 3c2cc5a..3c2cc5a 100644
--- a/vcore/dpl/log/include/dpl/log/journal_log_provider.h
+++ b/src/dpl/log/include/dpl/log/journal_log_provider.h
diff --git a/vcore/dpl/log/include/dpl/log/log.h b/src/dpl/log/include/dpl/log/log.h
index 07cac3d..07cac3d 100644
--- a/vcore/dpl/log/include/dpl/log/log.h
+++ b/src/dpl/log/include/dpl/log/log.h
diff --git a/vcore/dpl/log/include/dpl/log/old_style_log_provider.h b/src/dpl/log/include/dpl/log/old_style_log_provider.h
index e26da28..e26da28 100644
--- a/vcore/dpl/log/include/dpl/log/old_style_log_provider.h
+++ b/src/dpl/log/include/dpl/log/old_style_log_provider.h
diff --git a/vcore/dpl/log/src/abstract_log_provider.cpp b/src/dpl/log/src/abstract_log_provider.cpp
index 21fd2f1..21fd2f1 100644
--- a/vcore/dpl/log/src/abstract_log_provider.cpp
+++ b/src/dpl/log/src/abstract_log_provider.cpp
diff --git a/vcore/dpl/log/src/dlog_log_provider.cpp b/src/dpl/log/src/dlog_log_provider.cpp
index 4f514b2..4f514b2 100644
--- a/vcore/dpl/log/src/dlog_log_provider.cpp
+++ b/src/dpl/log/src/dlog_log_provider.cpp
diff --git a/vcore/dpl/log/src/journal_log_provider.cpp b/src/dpl/log/src/journal_log_provider.cpp
index 0abf8d8..0abf8d8 100644
--- a/vcore/dpl/log/src/journal_log_provider.cpp
+++ b/src/dpl/log/src/journal_log_provider.cpp
diff --git a/vcore/dpl/log/src/log.cpp b/src/dpl/log/src/log.cpp
index 5bd61ed..5bd61ed 100644
--- a/vcore/dpl/log/src/log.cpp
+++ b/src/dpl/log/src/log.cpp
diff --git a/vcore/dpl/log/src/old_style_log_provider.cpp b/src/dpl/log/src/old_style_log_provider.cpp
index f1dd0d0..f1dd0d0 100644
--- a/vcore/dpl/log/src/old_style_log_provider.cpp
+++ b/src/dpl/log/src/old_style_log_provider.cpp
diff --git a/vcore/server/include/cert-server-db.h b/src/server/include/cert-server-db.h
index 5aea447..5aea447 100644
--- a/vcore/server/include/cert-server-db.h
+++ b/src/server/include/cert-server-db.h
diff --git a/vcore/server/include/cert-server-debug.h b/src/server/include/cert-server-debug.h
index 1d91b41..1d91b41 100644
--- a/vcore/server/include/cert-server-debug.h
+++ b/src/server/include/cert-server-debug.h
diff --git a/vcore/server/include/cert-server-logic.h b/src/server/include/cert-server-logic.h
index e0a01a5..e0a01a5 100644
--- a/vcore/server/include/cert-server-logic.h
+++ b/src/server/include/cert-server-logic.h
diff --git a/vcore/server/src/cert-server-db.c b/src/server/src/cert-server-db.c
index 77a3246..77a3246 100644
--- a/vcore/server/src/cert-server-db.c
+++ b/src/server/src/cert-server-db.c
diff --git a/vcore/server/src/cert-server-logic.c b/src/server/src/cert-server-logic.c
index adb07f8..adb07f8 100644
--- a/vcore/server/src/cert-server-logic.c
+++ b/src/server/src/cert-server-logic.c
diff --git a/vcore/server/src/cert-server-main.c b/src/server/src/cert-server-main.c
index 80dc700..80dc700 100644
--- a/vcore/server/src/cert-server-main.c
+++ b/src/server/src/cert-server-main.c
diff --git a/vcore/vcore/Base64.cpp b/src/vcore/Base64.cpp
index e3b85ef..e3b85ef 100644
--- a/vcore/vcore/Base64.cpp
+++ b/src/vcore/Base64.cpp
diff --git a/vcore/vcore/Base64.h b/src/vcore/Base64.h
index d8f3817..d8f3817 100644
--- a/vcore/vcore/Base64.h
+++ b/src/vcore/Base64.h
diff --git a/vcore/vcore/CertStoreType.cpp b/src/vcore/CertStoreType.cpp
index dbabf21..dbabf21 100644
--- a/vcore/vcore/CertStoreType.cpp
+++ b/src/vcore/CertStoreType.cpp
diff --git a/vcore/vcore/CertStoreType.h b/src/vcore/CertStoreType.h
index ea01f7b..ea01f7b 100644
--- a/vcore/vcore/CertStoreType.h
+++ b/src/vcore/CertStoreType.h
diff --git a/vcore/vcore/Certificate.cpp b/src/vcore/Certificate.cpp
index d2c5c01..d2c5c01 100644
--- a/vcore/vcore/Certificate.cpp
+++ b/src/vcore/Certificate.cpp
diff --git a/vcore/vcore/Certificate.h b/src/vcore/Certificate.h
index 64673ab..64673ab 100644
--- a/vcore/vcore/Certificate.h
+++ b/src/vcore/Certificate.h
diff --git a/vcore/vcore/CertificateCollection.cpp b/src/vcore/CertificateCollection.cpp
index f7734a3..f7734a3 100644
--- a/vcore/vcore/CertificateCollection.cpp
+++ b/src/vcore/CertificateCollection.cpp
diff --git a/vcore/vcore/CertificateCollection.h b/src/vcore/CertificateCollection.h
index 7ec3186..7ec3186 100644
--- a/vcore/vcore/CertificateCollection.h
+++ b/src/vcore/CertificateCollection.h
diff --git a/vcore/vcore/CertificateConfigReader.cpp b/src/vcore/CertificateConfigReader.cpp
index 856641f..856641f 100644
--- a/vcore/vcore/CertificateConfigReader.cpp
+++ b/src/vcore/CertificateConfigReader.cpp
diff --git a/vcore/vcore/CertificateConfigReader.h b/src/vcore/CertificateConfigReader.h
index 0d31934..0d31934 100644
--- a/vcore/vcore/CertificateConfigReader.h
+++ b/src/vcore/CertificateConfigReader.h
diff --git a/vcore/vcore/CertificateIdentifier.h b/src/vcore/CertificateIdentifier.h
index adf05c7..adf05c7 100644
--- a/vcore/vcore/CertificateIdentifier.h
+++ b/src/vcore/CertificateIdentifier.h
diff --git a/vcore/vcore/CertificateLoader.cpp b/src/vcore/CertificateLoader.cpp
index 40c82b1..40c82b1 100644
--- a/vcore/vcore/CertificateLoader.cpp
+++ b/src/vcore/CertificateLoader.cpp
diff --git a/vcore/vcore/CertificateLoader.h b/src/vcore/CertificateLoader.h
index d87ed7b..d87ed7b 100644
--- a/vcore/vcore/CertificateLoader.h
+++ b/src/vcore/CertificateLoader.h
diff --git a/vcore/vcore/Client.cpp b/src/vcore/Client.cpp
index d0f48ae..d0f48ae 100644
--- a/vcore/vcore/Client.cpp
+++ b/src/vcore/Client.cpp
diff --git a/vcore/vcore/Client.h b/src/vcore/Client.h
index 0e62cf2..0e62cf2 100644
--- a/vcore/vcore/Client.h
+++ b/src/vcore/Client.h
diff --git a/vcore/vcore/CryptoInit.cpp b/src/vcore/CryptoInit.cpp
index b1ad4cf..b1ad4cf 100644
--- a/vcore/vcore/CryptoInit.cpp
+++ b/src/vcore/CryptoInit.cpp
diff --git a/vcore/vcore/CryptoInit.h b/src/vcore/CryptoInit.h
index 05f8c62..05f8c62 100644
--- a/vcore/vcore/CryptoInit.h
+++ b/src/vcore/CryptoInit.h
diff --git a/vcore/vcore/Error.h b/src/vcore/Error.h
index 358f5c5..358f5c5 100644
--- a/vcore/vcore/Error.h
+++ b/src/vcore/Error.h
diff --git a/vcore/vcore/Ocsp.cpp b/src/vcore/Ocsp.cpp
index ae1dc87..ae1dc87 100644
--- a/vcore/vcore/Ocsp.cpp
+++ b/src/vcore/Ocsp.cpp
diff --git a/vcore/vcore/Ocsp.h b/src/vcore/Ocsp.h
index d335e67..d335e67 100644
--- a/vcore/vcore/Ocsp.h
+++ b/src/vcore/Ocsp.h
diff --git a/vcore/vcore/ParserSchema.h b/src/vcore/ParserSchema.h
index 02ff6ed..02ff6ed 100644
--- a/vcore/vcore/ParserSchema.h
+++ b/src/vcore/ParserSchema.h
diff --git a/vcore/vcore/PluginHandler.cpp b/src/vcore/PluginHandler.cpp
index e722bfc..e722bfc 100644
--- a/vcore/vcore/PluginHandler.cpp
+++ b/src/vcore/PluginHandler.cpp
diff --git a/vcore/vcore/PluginHandler.h b/src/vcore/PluginHandler.h
index 1b83b02..1b83b02 100644
--- a/vcore/vcore/PluginHandler.h
+++ b/src/vcore/PluginHandler.h
diff --git a/vcore/vcore/ReferenceValidator.cpp b/src/vcore/ReferenceValidator.cpp
index b4f4713..b4f4713 100644
--- a/vcore/vcore/ReferenceValidator.cpp
+++ b/src/vcore/ReferenceValidator.cpp
diff --git a/vcore/vcore/ReferenceValidator.h b/src/vcore/ReferenceValidator.h
index 450e224..450e224 100644
--- a/vcore/vcore/ReferenceValidator.h
+++ b/src/vcore/ReferenceValidator.h
diff --git a/vcore/vcore/SaxReader.cpp b/src/vcore/SaxReader.cpp
index 46dd690..46dd690 100644
--- a/vcore/vcore/SaxReader.cpp
+++ b/src/vcore/SaxReader.cpp
diff --git a/vcore/vcore/SaxReader.h b/src/vcore/SaxReader.h
index 8c7e975..8c7e975 100644
--- a/vcore/vcore/SaxReader.h
+++ b/src/vcore/SaxReader.h
diff --git a/vcore/vcore/SignatureData.cpp b/src/vcore/SignatureData.cpp
index 8663414..8663414 100644
--- a/vcore/vcore/SignatureData.cpp
+++ b/src/vcore/SignatureData.cpp
diff --git a/vcore/vcore/SignatureData.h b/src/vcore/SignatureData.h
index 52e39fa..52e39fa 100644
--- a/vcore/vcore/SignatureData.h
+++ b/src/vcore/SignatureData.h
diff --git a/vcore/vcore/SignatureFinder.cpp b/src/vcore/SignatureFinder.cpp
index 5010563..5010563 100644
--- a/vcore/vcore/SignatureFinder.cpp
+++ b/src/vcore/SignatureFinder.cpp
diff --git a/vcore/vcore/SignatureFinder.h b/src/vcore/SignatureFinder.h
index 40881b9..40881b9 100644
--- a/vcore/vcore/SignatureFinder.h
+++ b/src/vcore/SignatureFinder.h
diff --git a/vcore/vcore/SignatureReader.cpp b/src/vcore/SignatureReader.cpp
index 3fd1b58..3fd1b58 100644
--- a/vcore/vcore/SignatureReader.cpp
+++ b/src/vcore/SignatureReader.cpp
diff --git a/vcore/vcore/SignatureReader.h b/src/vcore/SignatureReader.h
index 846db22..846db22 100644
--- a/vcore/vcore/SignatureReader.h
+++ b/src/vcore/SignatureReader.h
diff --git a/vcore/vcore/SignatureValidator.cpp b/src/vcore/SignatureValidator.cpp
index 1007f95..1007f95 100644
--- a/vcore/vcore/SignatureValidator.cpp
+++ b/src/vcore/SignatureValidator.cpp
diff --git a/vcore/vcore/SignatureValidator.h b/src/vcore/SignatureValidator.h
index 8dc4692..8dc4692 100644
--- a/vcore/vcore/SignatureValidator.h
+++ b/src/vcore/SignatureValidator.h
diff --git a/vcore/vcore/TimeConversion.cpp b/src/vcore/TimeConversion.cpp
index 45a642b..45a642b 100644
--- a/vcore/vcore/TimeConversion.cpp
+++ b/src/vcore/TimeConversion.cpp
diff --git a/vcore/vcore/TimeConversion.h b/src/vcore/TimeConversion.h
index 3cf2acd..3cf2acd 100644
--- a/vcore/vcore/TimeConversion.h
+++ b/src/vcore/TimeConversion.h
diff --git a/vcore/vcore/ValidatorFactories.cpp b/src/vcore/ValidatorFactories.cpp
index 79c0e1c..79c0e1c 100644
--- a/vcore/vcore/ValidatorFactories.cpp
+++ b/src/vcore/ValidatorFactories.cpp
diff --git a/vcore/vcore/ValidatorFactories.h b/src/vcore/ValidatorFactories.h
index b5d87b4..b5d87b4 100644
--- a/vcore/vcore/ValidatorFactories.h
+++ b/src/vcore/ValidatorFactories.h
diff --git a/vcore/vcore/ValidatorPluginApi.h b/src/vcore/ValidatorPluginApi.h
index fb895b4..fb895b4 100644
--- a/vcore/vcore/ValidatorPluginApi.h
+++ b/src/vcore/ValidatorPluginApi.h
diff --git a/vcore/vcore/XmlsecAdapter.cpp b/src/vcore/XmlsecAdapter.cpp
index 1694f2e..1694f2e 100644
--- a/vcore/vcore/XmlsecAdapter.cpp
+++ b/src/vcore/XmlsecAdapter.cpp
diff --git a/vcore/vcore/XmlsecAdapter.h b/src/vcore/XmlsecAdapter.h
index 0a0a522..0a0a522 100644
--- a/vcore/vcore/XmlsecAdapter.h
+++ b/src/vcore/XmlsecAdapter.h
diff --git a/vcore/vcore/api.cpp b/src/vcore/api.cpp
index 4554e77..4554e77 100644
--- a/vcore/vcore/api.cpp
+++ b/src/vcore/api.cpp
diff --git a/vcore/vcore/exception.cpp b/src/vcore/exception.cpp
index b52655e..b52655e 100644
--- a/vcore/vcore/exception.cpp
+++ b/src/vcore/exception.cpp
diff --git a/vcore/vcore/exception.h b/src/vcore/exception.h
index 0129e0a..0129e0a 100644
--- a/vcore/vcore/exception.h
+++ b/src/vcore/exception.h
diff --git a/vcore/vcore/init-lib.cpp b/src/vcore/init-lib.cpp
index 4d3446b..4d3446b 100644
--- a/vcore/vcore/init-lib.cpp
+++ b/src/vcore/init-lib.cpp
diff --git a/vcore/vcore/pkcs12.cpp b/src/vcore/pkcs12.cpp
index 5985005..5985005 100644
--- a/vcore/vcore/pkcs12.cpp
+++ b/src/vcore/pkcs12.cpp
diff --git a/vcore/vcore/pkcs12.h b/src/vcore/pkcs12.h
index f98ebf8..f98ebf8 100644
--- a/vcore/vcore/pkcs12.h
+++ b/src/vcore/pkcs12.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 58bfe1e..11bdab1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -45,7 +45,7 @@ SET(DPL_TEST_SOURCES
 INCLUDE_DIRECTORIES(
     SYSTEM
     ${TEST_DEP_INCLUDE_DIRS}
-    ${PROJECT_SOURCE_DIR}/vcore
+    ${PROJECT_SOURCE_DIR}/src
     ${TEST_DIR}/dpl/include
     )
 
diff --git a/vcore/CMakeLists.txt b/vcore/CMakeLists.txt
deleted file mode 100644
index 474e062..0000000
--- a/vcore/CMakeLists.txt
+++ /dev/null
@@ -1,153 +0,0 @@
-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
-    libpcrecpp
-    openssl
-    xmlsec1
-    dlog
-    libsystemd-journal
-    ${LIB_CERT_CHECKER}
-    )
-
-ADD_DEFINITIONS(${VCORE_DEPS_CFLAGS})
-ADD_DEFINITIONS(${VCORE_DEPS_CFLAGS_OTHER})
-
-SET(VCORE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(VCORE_SOURCES
-    ${VCORE_DIR}/dpl/core/src/assert.cpp
-    ${VCORE_DIR}/dpl/core/src/exception.cpp
-    ${VCORE_DIR}/dpl/core/src/singleton.cpp
-    ${VCORE_DIR}/dpl/core/src/colors.cpp
-
-    ${VCORE_DIR}/dpl/log/src/abstract_log_provider.cpp
-    ${VCORE_DIR}/dpl/log/src/old_style_log_provider.cpp
-    ${VCORE_DIR}/dpl/log/src/dlog_log_provider.cpp
-    ${VCORE_DIR}/dpl/log/src/journal_log_provider.cpp
-    ${VCORE_DIR}/dpl/log/src/log.cpp
-
-    ${VCORE_DIR}/vcore/api.cpp
-    ${VCORE_DIR}/vcore/Base64.cpp
-    ${VCORE_DIR}/vcore/Certificate.cpp
-    ${VCORE_DIR}/vcore/CertificateCollection.cpp
-    ${VCORE_DIR}/vcore/CertificateConfigReader.cpp
-    ${VCORE_DIR}/vcore/CertificateLoader.cpp
-    ${VCORE_DIR}/vcore/CertStoreType.cpp
-    ${VCORE_DIR}/vcore/ReferenceValidator.cpp
-    ${VCORE_DIR}/vcore/SaxReader.cpp
-    ${VCORE_DIR}/vcore/SignatureData.cpp
-    ${VCORE_DIR}/vcore/SignatureFinder.cpp
-    ${VCORE_DIR}/vcore/SignatureReader.cpp
-    ${VCORE_DIR}/vcore/TimeConversion.cpp
-    ${VCORE_DIR}/vcore/ValidatorFactories.cpp
-    ${VCORE_DIR}/vcore/SignatureValidator.cpp
-    ${VCORE_DIR}/vcore/XmlsecAdapter.cpp
-    ${VCORE_DIR}/vcore/pkcs12.cpp
-    ${VCORE_DIR}/vcore/exception.cpp
-    ${VCORE_DIR}/vcore/Client.cpp
-    ${VCORE_DIR}/vcore/Ocsp.cpp
-    ${VCORE_DIR}/vcore/CryptoInit.cpp
-    ${VCORE_DIR}/vcore/PluginHandler.cpp
-    ${VCORE_DIR}/vcore/init-lib.cpp
-    )
-
-SET(VCORE_INCLUDES
-    ${VCORE_DIR}/dpl/core/include
-    ${VCORE_DIR}/dpl/log/include
-    ${VCORE_DIR}
-    )
-
-########### VCORE SOURCES ########
-
-INCLUDE_DIRECTORIES(
-    SYSTEM
-    ${VCORE_DEPS_INCLUDE_DIRS}
-    ${VCORE_INCLUDES}
-    )
-
-ADD_LIBRARY(${TARGET_VCORE_LIB} SHARED ${VCORE_SOURCES})
-
-# TODO: visibility needed to be hidden
-SET_TARGET_PROPERTIES(${TARGET_VCORE_LIB}
-    PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=default"
-        SOVERSION ${SO_VERSION}
-        VERSION ${VERSION})
-
-TARGET_LINK_LIBRARIES(${TARGET_VCORE_LIB}
-    ${VCORE_DEPS_LIBRARIES}
-    ${TARGET_CERT_SVC_LIB}
-    -ldl
-    )
-
-########## cert-server #############
-PKG_CHECK_MODULES(CERT_SERVER_DEP
-    REQUIRED
-    dlog
-    sqlite3
-    db-util
-    libsystemd-daemon
-    key-manager
-    )
-
-SET(CERT_SERVER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server)
-
-SET(CERT_SERVER_SRC
-    ${CERT_SERVER_DIR}/src/cert-server-main.c
-    ${CERT_SERVER_DIR}/src/cert-server-logic.c
-    ${CERT_SERVER_DIR}/src/cert-server-db.c
-    )
-
-INCLUDE_DIRECTORIES(
-    SYSTEM
-    ${CERT_SERVER_DEP_INCLUDE_DIRS}
-    ${VCORE_DIR}
-    ${CERT_SERVER_DIR}/include
-    )
-
-SET_SOURCE_FILES_PROPERTIES(
-    ${CERT_SERVER_SRC}
-    PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -fPIE"
-    )
-
-ADD_EXECUTABLE(${TARGET_CERT_SERVER} ${CERT_SERVER_SRC})
-
-TARGET_LINK_LIBRARIES(${TARGET_CERT_SERVER}
-    ${CERT_SERVER_DEP_LIBRARIES}
-    -pie
-    )
-
-INSTALL(TARGETS ${TARGET_CERT_SERVER} DESTINATION ${BIN_DIR})
-
-########################################################
-INSTALL(TARGETS ${TARGET_VCORE_LIB}
-    DESTINATION ${LIB_INSTALL_DIR}
-    )
-
-INSTALL(FILES
-    ${VCORE_DIR}/vcore/SignatureValidator.h
-    ${VCORE_DIR}/vcore/SignatureFinder.h
-    ${VCORE_DIR}/vcore/Certificate.h
-    ${VCORE_DIR}/vcore/SignatureData.h
-    ${VCORE_DIR}/vcore/CertStoreType.h
-    ${VCORE_DIR}/vcore/exception.h
-    ${VCORE_DIR}/vcore/ValidatorPluginApi.h
-    ${VCORE_DIR}/vcore/Error.h
-    DESTINATION ${INCLUDEDIR}/cert-svc/vcore
-    )
-
-INSTALL(FILES
-    ${VCORE_DIR}/cert-svc/ccert.h
-    ${VCORE_DIR}/cert-svc/cinstance.h
-    ${VCORE_DIR}/cert-svc/cerror.h
-    ${VCORE_DIR}/cert-svc/cpkcs12.h
-    ${VCORE_DIR}/cert-svc/cprimitives.h
-    ${VCORE_DIR}/cert-svc/cstring.h
-    DESTINATION ${INCLUDEDIR}/cert-svc/cert-svc
-    )