Replace ckmc_label_shared_owner

Change-Id: I792190f989ff4f42823e34bdeb07b9d34b0c2738
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/src/ckm/capi-testcases.cpp b/src/ckm/capi-testcases.cpp
index 1615170c9ac688d4db302992c0e2731a744f1af7..cdd929f8c35c9116d280876355aa76ccd72e2fae 100644 (file)
--- a/src/ckm/capi-testcases.cpp
+++ b/src/ckm/capi-testcases.cpp
@@ -155,7 +155,7 @@ RUNNER_TEST(T3017_Control_C_API_remove_system_DB)
        save_data(sharedDatabase(TEST_SYSTEM_ALIAS).c_str(), TEST_DATA);
 
        // [test] - expect success
-       check_read(TEST_SYSTEM_ALIAS, ckmc_label_shared_owner, TEST_DATA);
+       check_read(TEST_SYSTEM_ALIAS, ckmc_owner_id_system, TEST_DATA);
 
        // remove user data - expect to map to the system DB
        int temp;
@@ -164,7 +164,7 @@ RUNNER_TEST(T3017_Control_C_API_remove_system_DB)
                        CKMCReadableError(temp));
 
        // [test] - expect fail
-       check_read(TEST_SYSTEM_ALIAS, ckmc_label_shared_owner, TEST_DATA, CKMC_ERROR_DB_ALIAS_UNKNOWN);
+       check_read(TEST_SYSTEM_ALIAS, ckmc_owner_id_system, TEST_DATA, CKMC_ERROR_DB_ALIAS_UNKNOWN);
 }
 
 RUNNER_TEST_GROUP_INIT (T302_CKMC_QUICK_SET_GET_TESTS_C_API);

diff --git a/src/ckm/ckm-common.cpp b/src/ckm/ckm-common.cpp
index 1f350411e623d6095ad1fbdd1b93b740cdda7019..27ebce163cab34095f3b1d93b44c5c3723392656 100644 (file)
--- a/src/ckm/ckm-common.cpp
+++ b/src/ckm/ckm-common.cpp
@@ -484,7 +484,7 @@ size_t count_aliases(alias_type_ type, size_t minimum_initial_element_count)
 
 std::string sharedDatabase(const CKM::Alias & alias)
 {
-    return aliasWithLabel(ckmc_label_shared_owner, alias.c_str());
+    return aliasWithLabel(ckmc_owner_id_system, alias.c_str());
 }
 
 ckmc_raw_buffer_s* createRandomBufferCAPI(size_t random_bytes)

diff --git a/src/ckm/system-db.cpp b/src/ckm/system-db.cpp
index 5a0f7ef5d0354e7106fa680418d6040494d3bf19..f45d67b98193cef823e0f293a1e5da277964c3ca 100644 (file)
--- a/src/ckm/system-db.cpp
+++ b/src/ckm/system-db.cpp
@@ -42,7 +42,7 @@ const uid_t GROUP_APP           = 5050;
 const char* APP_PASS            = "user-pass";
 
 const char* TEST_ALIAS          = "test-alias";
-const char* SYSTEM_LABEL        = ckmc_label_shared_owner;
+const char* SYSTEM_LABEL        = ckmc_owner_id_system;
 const char* INVALID_LABEL       = "coco-jumbo";
 std::string TEST_SYSTEM_ALIAS   = aliasWithLabel(SYSTEM_LABEL, TEST_ALIAS);
 std::string TEST_SYSTEM_ALIAS_2 = aliasWithLabel(SYSTEM_LABEL, "test-alias-2");