diff options
| -rw-r--r-- | build/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | build/key-manager.pc.in (renamed from build/key-manager/key-manager.pc.in) | 0 | ||||
| -rw-r--r-- | build/key-manager/CMakeLists.txt | 27 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/manager/service/ckm-logic.cpp | 27 |
5 files changed, 33 insertions, 35 deletions
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 02ca0258..baf97d4a 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -13,7 +13,15 @@ # limitations under the License. # # @file CMakeLists.txt -# @author Tomasz Swierczek (t.swierczek@samsung.com) +# @author Barlomiej Grzelewski (b.grzelewski@samsung.com) +# @author Zofia Abramowska (z.abramowska@samsung.com) +# @brief # -ADD_SUBDIRECTORY(key-manager) +CONFIGURE_FILE(key-manager.pc.in key-manager.pc @ONLY) + +INSTALL(FILES + ${CMAKE_BINARY_DIR}/build/key-manager.pc + DESTINATION + ${LIB_INSTALL_DIR}/pkgconfig + ) diff --git a/build/key-manager/key-manager.pc.in b/build/key-manager.pc.in index f5167149..f5167149 100644 --- a/build/key-manager/key-manager.pc.in +++ b/build/key-manager.pc.in diff --git a/build/key-manager/CMakeLists.txt b/build/key-manager/CMakeLists.txt deleted file mode 100644 index 896cf6f8..00000000 --- a/build/key-manager/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2011 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 Barlomiej Grzelewski (b.grzelewski@samsung.com) -# @author Zofia Abramowska (z.abramowska@samsung.com) -# @brief -# - -CONFIGURE_FILE(key-manager.pc.in key-manager.pc @ONLY) - -INSTALL(FILES - ${CMAKE_BINARY_DIR}/build/key-manager/key-manager.pc - DESTINATION - ${LIB_INSTALL_DIR}/pkgconfig - ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e559a8aa..8cbcec5d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -79,7 +79,7 @@ ADD_LIBRARY(${TARGET_KEY_MANAGER_CLIENT} SHARED ${KEY_MANAGER_CLIENT_SOURCES}) SET_TARGET_PROPERTIES( ${TARGET_KEY_MANAGER_CLIENT} PROPERTIES - COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=hidden" + COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=default" SOVERSION ${KEY_MANAGER_CLIENT_VERSION_MAJOR} VERSION ${KEY_MANAGER_CLIENT_VERSION} ) diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp index d8132e12..927b8d2c 100644 --- a/src/manager/service/ckm-logic.cpp +++ b/src/manager/service/ckm-logic.cpp @@ -19,6 +19,8 @@ * @version 1.0 * @brief Sample service implementation. */ +#include <dpl/serialization.h> + #include <ckm/ckm-error.h> #include <ckm/ckm-type.h> @@ -31,17 +33,26 @@ CKMLogic::~CKMLogic(){} RawBuffer CKMLogic::unlockUserKey(const std::string &user, const RawBuffer &password) { (void)user; (void)password; - return RawBuffer(); + + MessageBuffer response; + Serialization::Serialize(response, static_cast<int>(KEY_MANAGER_API_SUCCESS)); + return response.Pop(); } RawBuffer CKMLogic::lockUserKey(const std::string &user) { (void)user; - return RawBuffer(); + + MessageBuffer response; + Serialization::Serialize(response, static_cast<int>(KEY_MANAGER_API_SUCCESS)); + return response.Pop(); } RawBuffer CKMLogic::removeUserData(const std::string &user) { (void)user; - return RawBuffer(); + + MessageBuffer response; + Serialization::Serialize(response, static_cast<int>(KEY_MANAGER_API_SUCCESS)); + return response.Pop(); } RawBuffer CKMLogic::changeUserPassword( @@ -52,7 +63,10 @@ RawBuffer CKMLogic::changeUserPassword( (void)user; (void)oldPassword; (void)newPassword; - return RawBuffer(); + + MessageBuffer response; + Serialization::Serialize(response, static_cast<int>(KEY_MANAGER_API_SUCCESS)); + return response.Pop(); } RawBuffer CKMLogic::resetUserPassword( @@ -61,7 +75,10 @@ RawBuffer CKMLogic::resetUserPassword( { (void)user; (void)newPassword; - return RawBuffer(); + + MessageBuffer response; + Serialization::Serialize(response, static_cast<int>(KEY_MANAGER_API_SUCCESS)); + return response.Pop(); } RawBuffer CKMLogic::saveData( |