Update repository with private 0.1.22

Change-Id: I71ed3c8f186ee720ca24969bb9c8b9892585cb1e

diff --git a/client/ClientIPC.cpp b/client/ClientIPC.cpp
index 4f6dbb0377f8c58584bf3a44e61a440913e02433..5239ff9c3def52d0d74044a20d7df5c3e5e070e9 100644 (file)
--- a/client/ClientIPC.cpp
+++ b/client/ClientIPC.cpp
@@ -48,7 +48,7 @@ namespace smartcard_service_api
                        {
                                int error;
 
-                               if ((error = security_server_request_cookie(buffer, length))
+                               if ((error = security_server_request_cookie((char *)buffer, length))
                                        == SECURITY_SERVER_API_SUCCESS)
                                {
                                        cookie.assign(buffer, length);

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 0be1cb8491c1f3115dbe4352f6a9be5592bf3518..f9e94bb0ce1cbcded4c088e65f76d04151b9d657 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -54,6 +54,7 @@ SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${VERSION})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_common_LDFLAGS})
 
 SET(EXPORT_HEADER 
+       include/smartcard-types.h
        include/Debug.h
        include/Exception.h
        include/ByteArray.h

diff --git a/common/include/SignatureHelper.h b/common/include/SignatureHelper.h
index 301bdb90c028df1e19aaa4a07c44d26d8a24f88f..f65844cbfcc60a678c8c03fe598310738522bf04 100644 (file)
--- a/common/include/SignatureHelper.h
+++ b/common/include/SignatureHelper.h
@@ -39,8 +39,8 @@ namespace smartcard_service_api
        {
        public:
                static int getPackageName(int pid, char *package, size_t length);
-               static ByteArray getCertificationHash(const char *packageName);
-               static ByteArray getCertificationHash(int pid);
+               static const ByteArray getCertificationHash(const char *packageName);
+               static const ByteArray getCertificationHash(int pid);
                static bool getCertificationHashes(int pid, vector<ByteArray> &certHashes);
                static bool getCertificationHashes(const char *packageName, vector<ByteArray> &certHashes);
        };

diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec
index 6fa579619718e8950748f47ad01db017b2015058..2af01c960508be125aecc9de1b4f1ac662f2fcbc 100644 (file)
--- a/packaging/smartcard-service.spec
+++ b/packaging/smartcard-service.spec
@@ -5,7 +5,7 @@
 
 Name:       smartcard-service
 Summary:    Smartcard Service FW
-Version:    0.1.20
+Version:    0.1.22
 Release:    0
 Group:      libs
 License:    Apache-2.0

diff --git a/server/ServerDispatcher.cpp b/server/ServerDispatcher.cpp
index 178243fafe746699881c5ddbdf37c2fea27af275..bd49ad42a7925579915c147b70c6a722a62d7cf1 100644 (file)
--- a/server/ServerDispatcher.cpp
+++ b/server/ServerDispatcher.cpp
@@ -380,7 +380,7 @@ namespace smartcard_service_api
 #ifdef USE_AUTOSTART
                        if (resource->getClientCount() == 0)
                        {
-                               _DBG("There is no client. shutting down service");
+                               _INFO("There is no client. shutting down service");
                                g_main_loop_quit((GMainLoop *)resource->getMainLoopInstance());
                        }
 #endif

diff --git a/server/ServerGDBus.cpp b/server/ServerGDBus.cpp
index b74ed8ed6fdb831c9ca852f92a863ade424f27a1..7409a1982eafc968f1d8ca2e9fc430d8fae99bb1 100644 (file)
--- a/server/ServerGDBus.cpp
+++ b/server/ServerGDBus.cpp
@@ -236,10 +236,10 @@ namespace smartcard_service_api
 
        void ServerGDBus::deinit()
        {
-               deinitSEService();
-               deinitReader();
-               deinitSession();
                deinitChannel();
+               deinitSession();
+               deinitReader();
+               deinitSEService();
 
                _deinit();
 

diff --git a/server/ServerIPC.cpp b/server/ServerIPC.cpp
index 537034f3ecec21cdc1eb01bb2fe2bd21a5f151fb..419fc15591e6e8d0d2adf3eaaaa7b4a00e4c598b 100644 (file)
--- a/server/ServerIPC.cpp
+++ b/server/ServerIPC.cpp
@@ -65,7 +65,7 @@ namespace smartcard_service_api
                _BEGIN();
 
                buffer = IPCHelper::retrieveBuffer(socket);
-               if (buffer.getLength() > 0)
+               if (buffer.size() > 0)
                {
 #ifdef SECURITY_SERVER
                        ByteArray cookie;
@@ -77,7 +77,7 @@ namespace smartcard_service_api
                        cookie.assign(buffer.getBuffer(), 20);
 
                        gid = security_server_get_gid("smartcard-daemon");
-                       if ((result = security_server_check_privilege(cookie.getBuffer(), gid)) != SECURITY_SERVER_API_SUCCESS)
+                       if ((result = security_server_check_privilege((char *)cookie.getBuffer(), gid)) != SECURITY_SERVER_API_SUCCESS)
                        {
                                _ERR("security_server_check_privilege failed [%d]", result);
                                return msg;

diff --git a/server/ServerResource.cpp b/server/ServerResource.cpp
index 7905e2652384bdd98150ca3a3e72094690dc102e..549d2c63eefe97f278aadd298fa8c79348613073 100644 (file)
--- a/server/ServerResource.cpp
+++ b/server/ServerResource.cpp
@@ -849,9 +849,9 @@ namespace smartcard_service_api
        }
 
        bool ServerResource::_isAuthorizedAccess(ServerChannel *channel,
-               const ByteArray aid, const vector<ByteArray> &hashes)
+               const ByteArray &aid, const vector<ByteArray> &hashes)
        {
-               bool result = true;
+               bool result = false;
                AccessControlList *acList = NULL;
 
                /* request open channel sequence */

diff --git a/server/include/ClientInstance.h b/server/include/ClientInstance.h
index f3952ea2e3a32d877363fd787826a8097e9bf13b..65f3006b575e7998dec2057fd1995d096bbf9e57 100644 (file)
--- a/server/include/ClientInstance.h
+++ b/server/include/ClientInstance.h
@@ -20,6 +20,7 @@
 /* standard library header */
 #include <map>
 #include <vector>
+#include <string>
 #ifndef USE_GDBUS
 #include <glib.h>
 #endif

diff --git a/server/org.tizen.smartcard_service.service b/server/org.tizen.smartcard_service.service
index 204a68680ed6b7478268ebc6592bd78b45071018..8b75c5e30dade068efba0251b7b09b8c24144ae2 100644 (file)
--- a/server/org.tizen.smartcard_service.service
+++ b/server/org.tizen.smartcard_service.service
@@ -1,4 +1,3 @@
 [D-BUS Service]
-Name=org.tizen.smartcard_service
+Name=org.tizen.SmartcardService
 Exec=/usr/bin/smartcard-daemon
-User=root
\ No newline at end of file