Merging tizen into ckm. Stage 2.

Merged commit '7019d2b04887994ff0f87ab8020cc367ffe1994a' into ckm

Change-Id: I80f23e4825da2bb7167d43863e6ed1331a5f5776

diff --combined CMakeLists.txt
index c684579,35e367e..99f65e4
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (c) 2012 Samsung Electronics Co., Ltd All Rights Reserved
+ # Copyright (c) 2012-2015 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.
@@@ -80,8 -80,7 +80,8 @@@ ENDIF(SMACK_ENABLE
  
  ############################# Targets names ###################################
  
 -# No target defined so far
 +SET(TARGET_CKM_TESTS "ckm-tests")
 +SET(COMMON_TARGET_TEST "tests-common")
  
  ############################# subdirectories ##################################
  

diff --combined src/CMakeLists.txt
index df2812a,b3c75e6..94eef00
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
 -# Copyright (c) 2011-2015 Samsung Electronics Co., Ltd All Rights Reserved
++# Copyright (c) 2014-2015 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.

diff --combined src/ckm/CMakeLists.txt
index b0f4610,eb6fc57..06e78b3
--- 1/src/ckm/CMakeLists.txt
--- 2/src/ckm/CMakeLists.txt
+++ b/src/ckm/CMakeLists.txt
@@@ -1,5 -1,4 +1,4 @@@
- #
- #Copyright (c) 2013 Samsung Electronics Co., Ltd All Rights Reserved
+ # Copyright (c) 2013-2015 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.
@@@ -20,52 -19,30 +19,52 @@@
  
  INCLUDE(FindPkgConfig)
  
 +# mdpp flag
 +IF (DEFINED SECURITY_MDFPP_STATE_ENABLED)
 +    MESSAGE("SECURITY_MDFPP_STATE_ENABLE ENABLED !")
 +    ADD_DEFINITIONS("-DSECURITY_MDFPP_STATE_ENABLE")
 +ELSE (DEFINED SECURITY_MDFPP_STATE_ENABLE)
 +    MESSAGE("SECURITY_MDFPP_STATE_ENABLE DISABLED !")
 +ENDIF (DEFINED SECURITY_MDFPP_STATE_ENABLE)
 +
  # Dependencies
  PKG_CHECK_MODULES(CKM_DEP
      libsmack
      key-manager
 -    dlog
 +    dbus-1
 +    vconf
      REQUIRED)
  
  # Targets definition
  
 -SET(TARGET_CKM_TESTS "ckm-tests")
 -
  SET(CKM_SOURCES
 +    ${PROJECT_SOURCE_DIR}/src/ckm/access_provider2.cpp
      ${PROJECT_SOURCE_DIR}/src/ckm/main.cpp
      ${PROJECT_SOURCE_DIR}/src/ckm/capi-testcases.cpp
 +    ${PROJECT_SOURCE_DIR}/src/ckm/capi-certificate-chains.cpp
 +    ${PROJECT_SOURCE_DIR}/src/ckm/capi-access_control.cpp
 +    ${PROJECT_SOURCE_DIR}/src/ckm/async-api.cpp
 +    ${PROJECT_SOURCE_DIR}/src/ckm/ckm-common.cpp
 +    ${PROJECT_SOURCE_DIR}/src/ckm/cc-mode.cpp
 +#    ${PROJECT_SOURCE_DIR}/src/ckm/password-integration.cpp
 +    ${PROJECT_SOURCE_DIR}/src/ckm/clean-env.cpp
 +    ${PROJECT_SOURCE_DIR}/src/ckm/test-certs.cpp
  )
  
  INCLUDE_DIRECTORIES(SYSTEM ${CKM_DEP_INCLUDE_DIRS})
  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/common/ )
 +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/ckm/ )
  
  ADD_EXECUTABLE(${TARGET_CKM_TESTS} ${CKM_SOURCES})
  
 -TARGET_LINK_LIBRARIES(${TARGET_CKM_TESTS} ${CKM_DEP_LIBRARIES} tests-common)
 +TARGET_LINK_LIBRARIES(${TARGET_CKM_TESTS} ${CKM_DEP_LIBRARIES} ${COMMON_TARGET_TEST})
  
  # Installation
  
  INSTALL(TARGETS ${TARGET_CKM_TESTS} DESTINATION bin)
 -INSTALL(FILES test1801.pkcs12 DESTINATION /usr/share/ckm-test)
 +INSTALL(FILES
 +    test1801.pkcs12
 +    pkcs.p12
 +    capi-t3096.p12
 +    DESTINATION /usr/share/ckm-test
 +    )