tizen 2.4 release

[framework/security/key-manager.git] / src / manager / client-capi / ckmc-control.cpp

diff --git a/src/manager/client-capi/ckmc-control.cpp b/src/manager/client-capi/ckmc-control.cpp
index 997cf02..5caf087 100644 (file)
--- a/src/manager/client-capi/ckmc-control.cpp
+++ b/src/manager/client-capi/ckmc-control.cpp
@@ -14,7 +14,7 @@
  *  limitations under the License
  *
  *
- * @file        ckmc-control.h
+ * @file        ckmc-control.cpp
  * @author      Yuseok Jeon(yuseok.jeon@samsung.com)
  * @version     1.0
  * @brief       provides conversion methods to C from C++ for key-manager control functions.
@@ -34,20 +34,13 @@ CKM::Password _toPasswordStr(const char *str)
     return CKM::Password(str);
 }
 
-int _ckmc_set_permission_by_adm(uid_t user, const char *alias, const char *accessor, int permissions)
-{
-    if (!alias || !accessor)
-        return CKMC_ERROR_INVALID_PARAMETER;
-
-    auto control = CKM::Control::create();
-    return to_ckmc_error(control->setPermission(user, alias, accessor, permissions));
-}
-
 KEY_MANAGER_CAPI
 int ckmc_unlock_user_key(uid_t user, const char *password)
 {
     auto control = CKM::Control::create();
-    int ret = control->unlockUserKey(user, _toPasswordStr(password));
+    int ret = control->unlockUserKey(
+                CKM::ClientInfo(user),
+                _toPasswordStr(password));
     return to_ckmc_error(ret);
 }
 
@@ -55,7 +48,7 @@ KEY_MANAGER_CAPI
 int ckmc_lock_user_key(uid_t user)
 {
     auto control = CKM::Control::create();
-    int ret = control->lockUserKey(user);
+    int ret = control->lockUserKey(CKM::ClientInfo(user));
     return to_ckmc_error(ret);
 }
 
@@ -63,7 +56,7 @@ KEY_MANAGER_CAPI
 int ckmc_remove_user_data(uid_t user)
 {
     auto control = CKM::Control::create();
-    int ret = control->removeUserData(user);
+    int ret = control->removeUserData(CKM::ClientInfo(user));
     return to_ckmc_error(ret);
 }
 
@@ -71,9 +64,10 @@ KEY_MANAGER_CAPI
 int ckmc_change_user_password(uid_t user, const char *oldPassword, const char *newPassword)
 {
     auto control = CKM::Control::create();
-    int ret = control->changeUserPassword(user,
-                                          _toPasswordStr(oldPassword),
-                                          _toPasswordStr(newPassword));
+    int ret = control->changeUserPassword(
+                CKM::ClientInfo(user),
+                _toPasswordStr(oldPassword),
+                _toPasswordStr(newPassword));
     return to_ckmc_error(ret);
 }
 
@@ -81,7 +75,9 @@ KEY_MANAGER_CAPI
 int ckmc_reset_user_password(uid_t user, const char *newPassword)
 {
     auto control = CKM::Control::create();
-    int ret = control->resetUserPassword(user, _toPasswordStr(newPassword));
+    int ret = control->resetUserPassword(
+                CKM::ClientInfo(user),
+                _toPasswordStr(newPassword));
     return to_ckmc_error(ret);
 }
 
@@ -97,7 +93,21 @@ int ckmc_allow_access_by_adm(uid_t user, const char* owner, const char *alias, c
         return ec;
 
     // if label given twice, service will return an error
-    return _ckmc_set_permission_by_adm(user, CKM::AliasSupport::merge(CKM::Label(owner), CKM::Name(alias)).c_str(), accessor, permissionMask);
+    return ckmc_set_permission_by_adm(user, CKM::AliasSupport::merge(CKM::Label(owner), CKM::Name(alias)).c_str(), accessor, permissionMask);
+}
+
+KEY_MANAGER_CAPI
+int ckmc_set_permission_by_adm(uid_t user, const char *alias, const char *accessor, int permissions)
+{
+    if (!alias || !accessor)
+        return CKMC_ERROR_INVALID_PARAMETER;
+
+    auto control = CKM::Control::create();
+    return to_ckmc_error(control->setPermission(
+                CKM::ClientInfo(user),
+                alias,
+                accessor,
+                permissions));
 }
 
 KEY_MANAGER_CAPI
@@ -109,8 +119,9 @@ int ckmc_deny_access_by_adm(uid_t user, const char* owner, const char *alias, co
     // if label given twice, service will return an error
     auto control = CKM::Control::create();
     return to_ckmc_error(control->setPermission(
-                                user,
-                                CKM::AliasSupport::merge(CKM::Label(owner), CKM::Name(alias)).c_str(),
-                                accessor,
-                                CKM::Permission::NONE));
+                CKM::ClientInfo(user),
+                CKM::AliasSupport::merge(CKM::Label(owner),
+                CKM::Name(alias)).c_str(),
+                accessor,
+                CKM::Permission::NONE));
 }