Replace char* with std::string in utilities

Change-Id: I7920d1d2925e6a0cbe47f51cfe89a94735cd39ec

diff --git a/src/ckm/ckm-common.cpp b/src/ckm/ckm-common.cpp
index 9a0f1fe73a16e580512f3d245dd82fba868251f2..01536420b842e0a898592743a86a06651ea62918 100644 (file)
--- a/src/ckm/ckm-common.cpp
+++ b/src/ckm/ckm-common.cpp
@@ -70,30 +70,35 @@ std::string getLabel() {
 }
 
 std::string getOwnerIdFromSelf() {
-    const std::string& prefix = SMACK_USER_APP_PREFIX;
-    std::string smack = getLabel();
-    if (0 == smack.compare(0, prefix.size(), prefix))
-        return smack.substr(prefix.size(), std::string::npos);
-    return "/" + smack;
+    if (smack_check()) {
+        const std::string& prefix = SMACK_USER_APP_PREFIX;
+        std::string smack = getLabel();
+        if (0 == smack.compare(0, prefix.size(), prefix))
+            return smack.substr(prefix.size());
+        smack.insert(smack.begin(), '/');
+        return smack;
+    } else {
+        return "default_app_no_Smack_mode";
+    }
 }
 
-std::string aliasWithLabel(const char *label, const char *alias)
+std::string aliasWithLabel(const std::string& label, const std::string& alias)
 {
-    if(label)
+    if (!label.empty())
     {
-        std::stringstream ss;
-        ss << label << std::string(ckmc_label_name_separator) << alias;
-        return ss.str();
+        auto res = label + ckmc_label_name_separator;
+        res += alias;
+        return res;
     }
-    return std::string(alias);
+    return alias;
 }
 
-std::string aliasWithLabelFromSelf(const char *alias)
+std::string aliasWithLabelFromSelf(const std::string_view& alias)
 {
-    std::ostringstream oss;
-    oss << getOwnerIdFromSelf() << ckmc_label_name_separator << alias;
-
-    return oss.str();
+    auto res = getOwnerIdFromSelf();
+    res += ckmc_label_name_separator;
+    res += alias;
+    return res;
 }
 
 #define ERRORDESCRIBE(name) case name: return #name
@@ -166,10 +171,9 @@ void ckmUpdateData(const ckmc_raw_buffer_s& data, const CKM::Alias& alias,
     callCKMManagerDataFunc(data, alias, policy, &CKM::Manager::saveData, expected);
 }
 
-void save_data(const char* alias, const char *data, size_t len, const char* password,
+void save_data(const std::string& alias, const char *data, size_t len, const char* password,
                int expected_err, bool exportable)
 {
-    RUNNER_ASSERT(alias);
     RUNNER_ASSERT(data);
 
     ckmc_raw_buffer_s buffer;
@@ -178,18 +182,18 @@ void save_data(const char* alias, const char *data, size_t len, const char* pass
     ckmc_policy_s policy;
     policy.password = const_cast<char*>(password);
     policy.extractable = exportable;
-    int ret = ckmc_save_data(alias, buffer, policy);
+    int ret = ckmc_save_data(alias.c_str(), buffer, policy);
     RUNNER_ASSERT_MSG(expected_err == ret, "Saving data failed. "
                       << CKMCErrorToString(ret) << " while expected: "
                       << CKMCErrorToString(expected_err));
 }
 
-void save_data(const char* alias, const char *data, int expected_err, bool exportable)
+void save_data(const std::string& alias, const char *data, int expected_err, bool exportable)
 {
     save_data(alias, data, strlen(data), nullptr, expected_err, exportable);
 }
 
-void save_data(const char* alias, const char *data, size_t len, int expected_err, bool exportable)
+void save_data(const std::string& alias, const char *data, size_t len, int expected_err, bool exportable)
 {
     save_data(alias, data, len, nullptr, expected_err, exportable);
 }
@@ -201,7 +205,7 @@ bool PidBound::SamePid() const
     return getpid() == m_pid;
 }
 
-ScopedRemoveData::ScopedRemoveData(const char* alias) : m_alias(alias)
+ScopedRemoveData::ScopedRemoveData(const std::string& alias) : m_alias(alias)
 {
 }
 
@@ -214,10 +218,10 @@ ScopedRemoveData::~ScopedRemoveData()
      * Let it throw. If we can't remove data then remaining tests results will be
      * unreliable anyway.
      */
-    check_remove_allowed(m_alias.c_str());
+    check_remove_allowed(m_alias);
 }
 
-ScopedSaveData::ScopedSaveData(const char* alias, const char *data, int expected_err) :
+ScopedSaveData::ScopedSaveData(const std::string& alias, const char *data, int expected_err) :
     ScopedRemoveData(alias)
 {
     save_data(alias, data, expected_err);
@@ -237,34 +241,34 @@ ScopedDBUnlock::~ScopedDBUnlock()
     RUNNER_ASSERT_MSG(CKMC_ERROR_NONE == (temp = ckmc_lock_user_key(m_uid)), CKMCErrorToString(temp));
 }
 
-void check_remove_allowed(const char* alias)
+void check_remove_allowed(const std::string& alias)
 {
-    int ret = ckmc_remove_alias(alias);
+    int ret = ckmc_remove_alias(alias.c_str());
     // remove, but ignore non existing
     RUNNER_ASSERT_MSG((CKMC_ERROR_NONE == ret) || (CKMC_ERROR_DB_ALIAS_UNKNOWN == ret),
                          "Removing data failed: " << CKMCErrorToString(ret));
 }
 
-void check_remove_denied(const char* alias)
+void check_remove_denied(const std::string& alias)
 {
-    int ret = ckmc_remove_alias(alias);
+    int ret = ckmc_remove_alias(alias.c_str());
     RUNNER_ASSERT_MSG(
             CKMC_ERROR_PERMISSION_DENIED == ret,
             "App with different label shouldn't have rights to remove this data. "
             << CKMCReadableError(ret));
 }
 
-void check_remove_not_visible(const char* alias)
+void check_remove_not_visible(const std::string& alias)
 {
-    int ret = ckmc_remove_alias(alias);
+    int ret = ckmc_remove_alias(alias.c_str());
     RUNNER_ASSERT_MSG(
             CKMC_ERROR_DB_ALIAS_UNKNOWN == ret,
             "App with different label shouldn't have rights to see this data. "
             << CKMCReadableError(ret));
 }
 
-void check_read(const char* alias,
-                const char *label,
+void check_read(const std::string& alias,
+                const std::string& label,
                 const char *test_data,
                 size_t len,
                 int expected_code)
@@ -292,23 +296,23 @@ void check_read(const char* alias,
     }
 }
 
-void check_read(const char* alias, const char *label, const char *test_data, int expected_code)
+void check_read(const std::string& alias, const std::string& label, const char *test_data, int expected_code)
 {
     check_read(alias, label, test_data, strlen(test_data), expected_code);
 }
 
-void check_read_allowed(const char* alias, const char *data)
+void check_read_allowed(const std::string& alias, const char *data)
 {
     // try to read previously saved data - label taken implicitly
-    check_read(alias, NULL, data);
+    check_read(alias, "", data);
 }
 
-void check_read_not_visible(const char* alias)
+void check_read_not_visible(const std::string& alias)
 {
     // try to read previously saved data - label taken implicitly
     {
         ckmc_raw_buffer_s* buffer = NULL;
-        int ret = ckmc_get_data(alias, NULL, &buffer);
+        int ret = ckmc_get_data(alias.c_str(), NULL, &buffer);
         RUNNER_ASSERT_MSG(CKMC_ERROR_DB_ALIAS_UNKNOWN == ret,
                             "App with different label shouldn't have rights to see this data. " << CKMCErrorToString(ret));
         ckmc_buffer_free(buffer);
@@ -365,33 +369,33 @@ void check_cert_not_visible(const char *alias)
                       "App with different label shouldn't have rights to see this cert. " << CKMCErrorToString(temp));
 }
 
-void allow_access(const char* alias, const char* accessor, int permissionMask)
+void allow_access(const std::string& alias, const std::string& accessor, int permissionMask)
 {
     // data removal should revoke this access
-    int ret = ckmc_set_permission(alias, accessor, permissionMask);
+    int ret = ckmc_set_permission(alias.c_str(), accessor.c_str(), permissionMask);
     RUNNER_ASSERT_MSG(CKMC_ERROR_NONE == ret, "Trying to allow access returned: "
                         << CKMCErrorToString(ret));
 }
 
-void allow_access_negative(const char* alias, const char* accessor, int permissionMask, int expectedCode)
+void allow_access_negative(const std::string& alias, const std::string& accessor, int permissionMask, int expectedCode)
 {
     // data removal should revoke this access
-    int ret = ckmc_set_permission(alias, accessor, permissionMask);
+    int ret = ckmc_set_permission(alias.c_str(), accessor.c_str(), permissionMask);
     RUNNER_ASSERT_MSG(expectedCode == ret, "Trying to allow access returned "
                         << CKMCErrorToString(ret) << ", while expected: "
                         << CKMCErrorToString(expectedCode));
 }
 
-void deny_access(const char* alias, const char* accessor)
+void deny_access(const std::string& alias, const std::string& accessor)
 {
-    int ret = ckmc_set_permission(alias, accessor, CKMC_PERMISSION_NONE);
+    int ret = ckmc_set_permission(alias.c_str(), accessor.c_str(), CKMC_PERMISSION_NONE);
     RUNNER_ASSERT_MSG(CKMC_ERROR_NONE == ret, "Denying access failed. Error: "
                         << CKMCErrorToString(ret));
 }
 
-void deny_access_negative(const char* alias, const char* accessor, int expectedCode)
+void deny_access_negative(const std::string& alias, const std::string& accessor, int expectedCode)
 {
-    int ret = ckmc_set_permission(alias, accessor, CKMC_PERMISSION_NONE);
+    int ret = ckmc_set_permission(alias.c_str(), accessor.c_str(), CKMC_PERMISSION_NONE);
     RUNNER_ASSERT_MSG(expectedCode == ret, "Denying access failed. "
                         << CKMCErrorToString(ret) << ", while expected: "
                         << CKMCErrorToString(expectedCode));
@@ -460,9 +464,7 @@ void check_alias_info_list_helper(const InfoVector& expected,
 
     for (const auto &expectedIt : expected)
     {
-        const auto expectedAlias = aliasWithLabel(userSmackLabel.empty() ? nullptr :
-                                                  userSmackLabel.c_str(),
-                                                  expectedIt.alias.c_str());
+        const auto expectedAlias = aliasWithLabel(userSmackLabel, expectedIt.alias);
         auto actualIt = actual.find(expectedAlias);
         if (actualIt != actual.end()) {
             if (actualIt->second.passwordProtected != expectedIt.passwordProtected) {
@@ -586,7 +588,7 @@ size_t count_aliases(alias_type_ type, size_t minimum_initial_element_count)
 
 std::string sharedDatabase(const CKM::Alias & alias)
 {
-    return aliasWithLabel(ckmc_owner_id_system, alias.c_str());
+    return aliasWithLabel(ckmc_owner_id_system, alias);
 }
 
 ckmc_raw_buffer_s* createRandomBufferCAPI(size_t random_bytes)

diff --git a/src/ckm/ckm-common.h b/src/ckm/ckm-common.h
index a8293b673f9246c9252fa7ed82f9edd23128196e..207b0497e3c6a1881cd54c14e1c9fa704b7d0992 100644 (file)
--- a/src/ckm/ckm-common.h
+++ b/src/ckm/ckm-common.h
@@ -163,15 +163,15 @@ std::string getLabel();
 // returns process owner id
 std::string getOwnerIdFromSelf();
 
-std::string aliasWithLabel(const char *label, const char *alias);
+std::string aliasWithLabel(const std::string& label, const std::string& alias);
 
-std::string aliasWithLabelFromSelf(const char *alias);
+std::string aliasWithLabelFromSelf(const std::string_view& alias);
 
-void save_data(const char* alias, const char *data, size_t len, const char* password,
+void save_data(const std::string& alias, const char *data, size_t len, const char* password,
                int expected_err = CKMC_ERROR_NONE, bool exportable = true);
-void save_data(const char* alias, const char *data, int expected_err = CKMC_ERROR_NONE,
+void save_data(const std::string& alias, const char *data, int expected_err = CKMC_ERROR_NONE,
                bool exportable = true);
-void save_data(const char* alias, const char *data, size_t len,
+void save_data(const std::string& alias, const char *data, size_t len,
                int expected_err = CKMC_ERROR_NONE, bool exportable = true);
 
 class PidBound
@@ -189,7 +189,7 @@ private:
 class ScopedRemoveData: public PidBound
 {
 public:
-    explicit ScopedRemoveData(const char* alias);
+    explicit ScopedRemoveData(const std::string& alias);
     virtual ~ScopedRemoveData();
 protected:
     std::string m_alias;
@@ -198,7 +198,7 @@ protected:
 class ScopedSaveData : public ScopedRemoveData
 {
 public:
-    ScopedSaveData(const char* alias, const char *data, int expected_err = CKMC_ERROR_NONE);
+    ScopedSaveData(const std::string& alias, const char *data, int expected_err = CKMC_ERROR_NONE);
 };
 
 class ScopedDBUnlock : public PidBound
@@ -211,20 +211,20 @@ private:
     uid_t m_uid;
 };
 
-void check_remove_allowed(const char* alias);
-void check_remove_denied(const char* alias);
-void check_remove_not_visible(const char* alias);
-void check_read(const char* alias,
-                const char *label,
+void check_remove_allowed(const std::string& alias);
+void check_remove_denied(const std::string& alias);
+void check_remove_not_visible(const std::string& alias);
+void check_read(const std::string& alias,
+                const std::string& label,
                 const char *test_data,
                 size_t len,
                 int expected_code = CKMC_ERROR_NONE);
-void check_read(const char* alias,
-                const char *label,
+void check_read(const std::string& alias,
+                const std::string& label,
                 const char *test_data,
                 int expected_code = CKMC_ERROR_NONE);
-void check_read_allowed(const char* alias, const char *data);
-void check_read_not_visible(const char* alias);
+void check_read_allowed(const std::string&  alias, const char *data);
+void check_read_not_visible(const std::string&  alias);
 void check_key(const char *alias,
                int expected_error = CKMC_ERROR_NONE,
                ckmc_key_type_e expected_type = CKMC_KEY_NONE);
@@ -239,10 +239,10 @@ void check_key_allowed(const char *alias, ckmc_key_type_e expected_type = CKMC_K
 void check_key_not_visible(const char *alias, const char *password = nullptr);
 void check_cert_allowed(const char *alias);
 void check_cert_not_visible(const char *alias);
-void allow_access(const char* alias, const char* accessor, int permissionMask);
-void allow_access_negative(const char* alias, const char* accessor, int permissionMask, int expectedCode);
-void deny_access(const char* alias, const char* accessor);
-void deny_access_negative(const char* alias, const char* accessor, int expectedCode);
+void allow_access(const std::string& alias, const std::string& accessor, int permissionMask);
+void allow_access_negative(const std::string& alias, const std::string& accessor, int permissionMask, int expectedCode);
+void deny_access(const std::string& alias, const std::string& accessor);
+void deny_access_negative(const std::string& alias, const std::string& accessor, int expectedCode);
 
 void unlock_user_data(uid_t user_id, const char *passwd);
 void remove_user_data(uid_t user_id);

diff --git a/src/ckm/privileged/async-api.cpp b/src/ckm/privileged/async-api.cpp
index 71560e8e455171128791f7d8211639fabcf0a653..6058c30bf9eae90cb7f3243ad7ea12783b795266 100644 (file)
--- a/src/ckm/privileged/async-api.cpp
+++ b/src/ckm/privileged/async-api.cpp
@@ -422,9 +422,9 @@ RUNNER_TEST(TA1820_allow_access, RemoveDataEnv<OWNER_USER_ID>)
     std::string alias3 = aliasWithLabel(TEST_LABEL, "alias-3");
     {
         ScopedAppContext ctx(TEST_LABEL, OWNER_USER_ID, OWNER_GROUP_ID);
-        save_data(alias1.c_str(), TEST_DATA);
-        save_data(alias2.c_str(), TEST_DATA);
-        save_data(alias3.c_str(), TEST_DATA);
+        save_data(alias1, TEST_DATA);
+        save_data(alias2, TEST_DATA);
+        save_data(alias3, TEST_DATA);
 
         test_positive(&ManagerAsync::setPermission,
                       alias2,
@@ -470,7 +470,7 @@ RUNNER_TEST(TA1920_deny_access, RemoveDataEnv<OWNER_USER_ID>)
     std::string alias1 = aliasWithLabel(TEST_LABEL, "alias-1");
     {
         ScopedAppContext ctx(TEST_LABEL, OWNER_USER_ID, OWNER_GROUP_ID);
-        save_data(alias1.c_str(), TEST_DATA);
+        save_data(alias1, TEST_DATA);
 
         test_positive(&ManagerAsync::setPermission,
                       alias1,

diff --git a/src/ckm/privileged/capi-access_control.cpp b/src/ckm/privileged/capi-access_control.cpp
index 12891df463a61eb51df0c04570e9faa5652e7ce9..f80139284688a194dc281b78168b0aad6efeffe8 100644 (file)
--- a/src/ckm/privileged/capi-access_control.cpp
+++ b/src/ckm/privileged/capi-access_control.cpp
@@ -180,10 +180,10 @@ RUNNER_CHILD_TEST(T3007_manager_check_alias_valid)
     ScopedSaveData ssd(TEST_ALIAS, TEST_DATA);
 
     std::string test_alias_playground = std::string("AAA BBB CCC");
-    check_read(test_alias_playground.c_str(), 0, TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
+    check_read(test_alias_playground, "", TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
 
     // control: expect success
-    check_read(TEST_ALIAS, 0, TEST_DATA);
+    check_read(TEST_ALIAS, "", TEST_DATA);
     check_read(TEST_ALIAS, APP_LABEL_1, TEST_DATA);
 }
 
@@ -197,22 +197,22 @@ RUNNER_CHILD_TEST(T3008_manager_check_label_valid)
 
     // basic test
     std::string APP_LABEL_1_playground = std::string("AAA BBB CCC");
-    check_read(TEST_ALIAS, APP_LABEL_1_playground.c_str(), TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
+    check_read(TEST_ALIAS, APP_LABEL_1_playground, TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
 
     // insert part of the separator in the middle
     APP_LABEL_1_playground = std::string(APP_LABEL_1);
     APP_LABEL_1_playground.insert(APP_LABEL_1_playground.size()/2, ckmc_label_name_separator);
-    check_read(TEST_ALIAS, APP_LABEL_1_playground.c_str(), TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
+    check_read(TEST_ALIAS, APP_LABEL_1_playground, TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
 
     // prepend separator
     APP_LABEL_1_playground = std::string(APP_LABEL_1);
     APP_LABEL_1_playground.insert(0, ckmc_label_name_separator);
-    check_read(TEST_ALIAS, APP_LABEL_1_playground.c_str(), TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
+    check_read(TEST_ALIAS, APP_LABEL_1_playground, TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
 
     // append separator
     APP_LABEL_1_playground = std::string(APP_LABEL_1);
     APP_LABEL_1_playground.append(ckmc_label_name_separator);
-    check_read(TEST_ALIAS, APP_LABEL_1_playground.c_str(), TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
+    check_read(TEST_ALIAS, APP_LABEL_1_playground, TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
 
     // control: expect success
     check_read(TEST_ALIAS, APP_LABEL_1, TEST_DATA);
@@ -235,8 +235,8 @@ RUNNER_TEST(T3020_manager_access_not_allowed, RemoveDataEnv<USER_ID_1>)
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
         std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
-        check_read_not_visible(TEST_ALIAS_adr.c_str());
-        check_remove_not_visible(TEST_ALIAS_adr.c_str());
+        check_read_not_visible(TEST_ALIAS_adr);
+        check_remove_not_visible(TEST_ALIAS_adr);
     }
 }
 
@@ -255,7 +255,7 @@ RUNNER_TEST(T3021_manager_access_allowed, RemoveDataEnv<USER_ID_1>)
     // test accessibility from another label
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
-        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
+        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS), TEST_DATA);
     }
 }
 
@@ -274,7 +274,7 @@ RUNNER_TEST(T3022_manager_access_allowed_with_remove, RemoveDataEnv<USER_ID_1>)
     // test accessibility from another label
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
-        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
+        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS), TEST_DATA);
     }
 }
 
@@ -294,8 +294,8 @@ RUNNER_TEST(T3023_manager_access_allowed_remove_denied, RemoveDataEnv<USER_ID_1>
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
         std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
-        check_remove_denied(TEST_ALIAS_adr.c_str());
-        check_read_allowed(TEST_ALIAS_adr.c_str(), TEST_DATA);
+        check_remove_denied(TEST_ALIAS_adr);
+        check_read_allowed(TEST_ALIAS_adr, TEST_DATA);
     }
 }
 
@@ -314,7 +314,7 @@ RUNNER_TEST(T3025_manager_remove_allowed, RemoveDataEnv<USER_ID_1>)
     // test accessibility from another label
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
-        check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
+        check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS));
     }
 }
 
@@ -339,8 +339,8 @@ RUNNER_TEST(T3026_manager_double_allow, RemoveDataEnv<USER_ID_1>)
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
         std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
-        check_remove_denied(TEST_ALIAS_adr.c_str());
-        check_read_allowed(TEST_ALIAS_adr.c_str(), TEST_DATA);
+        check_remove_denied(TEST_ALIAS_adr);
+        check_read_allowed(TEST_ALIAS_adr, TEST_DATA);
     }
 }
 
@@ -362,8 +362,8 @@ RUNNER_TEST(T3027_manager_allow_deny, RemoveDataEnv<USER_ID_1>)
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_remove_denied(TEST_ALIAS_adr.c_str());
-        check_read_allowed(TEST_ALIAS_adr.c_str(), TEST_DATA);
+        check_remove_denied(TEST_ALIAS_adr);
+        check_read_allowed(TEST_ALIAS_adr, TEST_DATA);
     }
 
     // remove permission
@@ -377,8 +377,8 @@ RUNNER_TEST(T3027_manager_allow_deny, RemoveDataEnv<USER_ID_1>)
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_remove_not_visible(TEST_ALIAS_adr.c_str());
-        check_read_not_visible(TEST_ALIAS_adr.c_str());
+        check_remove_not_visible(TEST_ALIAS_adr);
+        check_read_not_visible(TEST_ALIAS_adr);
     }
 }
 
@@ -411,7 +411,7 @@ RUNNER_TEST(T3028_manager_access_by_label, RemoveDataEnv<USER_ID_1>)
         ScopedAppContext ctx(APP_LABEL_1, USER_ID_1, GROUP_ID_1);
 
         // test if can access label2 alias from label1 domain - should succeed
-        check_read_allowed(aliasWithLabel(APP_LABEL_2, TEST_ALIAS).c_str(), additional_data);
+        check_read_allowed(aliasWithLabel(APP_LABEL_2, TEST_ALIAS), additional_data);
     }
 }
 
@@ -432,8 +432,8 @@ RUNNER_TEST(T3029_manager_access_modification_by_foreign_label, RemoveDataEnv<US
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        allow_access_negative(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), APP_LABEL_4, CKMC_PERMISSION_READ | CKMC_PERMISSION_REMOVE, CKMC_ERROR_PERMISSION_DENIED);
-        deny_access_negative (aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), APP_LABEL_4, CKMC_ERROR_PERMISSION_DENIED);
+        allow_access_negative(aliasWithLabel(APP_LABEL_1, TEST_ALIAS), APP_LABEL_4, CKMC_PERMISSION_READ | CKMC_PERMISSION_REMOVE, CKMC_ERROR_PERMISSION_DENIED);
+        deny_access_negative (aliasWithLabel(APP_LABEL_1, TEST_ALIAS), APP_LABEL_4, CKMC_ERROR_PERMISSION_DENIED);
     }
 }
 
@@ -498,7 +498,7 @@ RUNNER_TEST(T3031_manager_deprecated_access_allowed, RemoveDataEnv<USER_ID_1>)
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
+        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS), TEST_DATA);
     }
 }
 
@@ -519,7 +519,7 @@ RUNNER_TEST(T3032_manager_deprecated_access_allowed_with_remove, RemoveDataEnv<U
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
+        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS), TEST_DATA);
     }
 }
 
@@ -541,8 +541,8 @@ RUNNER_TEST(T3033_manager_deprecated_access_allowed_remove_denied, RemoveDataEnv
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
         std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
-        check_remove_denied(TEST_ALIAS_adr.c_str());
-        check_read_allowed(TEST_ALIAS_adr.c_str(), TEST_DATA);
+        check_remove_denied(TEST_ALIAS_adr);
+        check_read_allowed(TEST_ALIAS_adr, TEST_DATA);
     }
 }
 
@@ -563,7 +563,7 @@ RUNNER_TEST(T3034_manager_deprecated_remove_allowed, RemoveDataEnv<USER_ID_1>)
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
+        check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS));
     }
 }
 
@@ -624,8 +624,8 @@ RUNNER_TEST(T3101_control_allow_access_invalid, RemoveDataEnv<USER_ID_1>)
     RUNNER_ASSERT(CKMC_ERROR_INVALID_PARAMETER == ret);
 
     // double owner
-    std::string aliasLabel = aliasWithLabel(getOwnerIdFromSelf().c_str(), TEST_ALIAS);
-    ret = ckmc_set_permission_by_adm(USER_ID_1, aliasWithLabel("another-owner", aliasLabel.c_str()).c_str(), APP_LABEL_1, CKMC_PERMISSION_READ);
+    std::string aliasLabel = aliasWithLabel(getOwnerIdFromSelf(), TEST_ALIAS);
+    ret = ckmc_set_permission_by_adm(USER_ID_1, aliasWithLabel("another-owner", aliasLabel).c_str(), APP_LABEL_1, CKMC_PERMISSION_READ);
     RUNNER_ASSERT(CKMC_ERROR_INVALID_PARAMETER == ret);
 }
 
@@ -641,17 +641,17 @@ RUNNER_TEST(T3102_control_deny_access_invalid, RemoveDataEnv<USER_ID_1>)
     }
 
     RUNNER_ASSERT(CKMC_ERROR_INVALID_PARAMETER ==
-            ckmc_set_permission_by_adm(USER_ID_1, aliasWithLabel(NULL, TEST_ALIAS).c_str(),
+            ckmc_set_permission_by_adm(USER_ID_1, aliasWithLabel("", TEST_ALIAS).c_str(),
             "accessor", CKMC_PERMISSION_NONE));
     RUNNER_ASSERT(CKMC_ERROR_INVALID_PARAMETER ==
             ckmc_set_permission_by_adm(USER_ID_1, aliasWithLabel("owner", TEST_ALIAS).c_str(),
             NULL, CKMC_PERMISSION_NONE));
 
     // double owner
-    std::string aliasLabel = aliasWithLabel(getOwnerIdFromSelf().c_str(), TEST_ALIAS);
+    std::string aliasLabel = aliasWithLabel(getOwnerIdFromSelf(), TEST_ALIAS);
     RUNNER_ASSERT(CKMC_ERROR_INVALID_PARAMETER ==
             ckmc_set_permission_by_adm(USER_ID_1, aliasWithLabel("another-owner",
-            aliasLabel.c_str()).c_str(), APP_LABEL_1, CKMC_PERMISSION_NONE));
+            aliasLabel).c_str(), APP_LABEL_1, CKMC_PERMISSION_NONE));
 }
 
 // tries to allow access for non existing alias
@@ -879,7 +879,7 @@ RUNNER_TEST(T3121_control_access_allowed, RemoveDataEnv<USER_ID_1>)
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
+        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS), TEST_DATA);
     }
 }
 
@@ -899,7 +899,7 @@ RUNNER_TEST(T3122_control_access_allowed_with_remove, RemoveDataEnv<USER_ID_1>)
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
+        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS), TEST_DATA);
     }
 }
 
@@ -919,7 +919,7 @@ RUNNER_TEST(T3122_control_access_allowed_remove_denied, RemoveDataEnv<USER_ID_1>
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_remove_denied(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
+        check_remove_denied(aliasWithLabel(APP_LABEL_1, TEST_ALIAS));
     }
 }
 
@@ -939,7 +939,7 @@ RUNNER_TEST(T3125_control_remove_allowed, RemoveDataEnv<USER_ID_1>)
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
+        check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS));
     }
 }
 
@@ -963,8 +963,8 @@ RUNNER_TEST(T3126_control_double_allow, RemoveDataEnv<USER_ID_1>)
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
         std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
-        check_remove_denied(TEST_ALIAS_adr.c_str());
-        check_read_allowed(TEST_ALIAS_adr.c_str(), TEST_DATA);
+        check_remove_denied(TEST_ALIAS_adr);
+        check_read_allowed(TEST_ALIAS_adr, TEST_DATA);
     }
 }
 
@@ -985,8 +985,8 @@ RUNNER_TEST(T3127_control_allow_deny, RemoveDataEnv<USER_ID_1>)
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_remove_denied(TEST_ALIAS_adr.c_str());
-        check_read_allowed(TEST_ALIAS_adr.c_str(), TEST_DATA);
+        check_remove_denied(TEST_ALIAS_adr);
+        check_read_allowed(TEST_ALIAS_adr, TEST_DATA);
     }
 
     deny_access_by_adm(USER_ID_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2);
@@ -994,8 +994,8 @@ RUNNER_TEST(T3127_control_allow_deny, RemoveDataEnv<USER_ID_1>)
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_remove_not_visible(TEST_ALIAS_adr.c_str());
-        check_read_not_visible(TEST_ALIAS_adr.c_str());
+        check_remove_not_visible(TEST_ALIAS_adr);
+        check_read_not_visible(TEST_ALIAS_adr);
     }
 }
 
@@ -1086,7 +1086,7 @@ RUNNER_TEST(T3142_control_deprecated_access_allowed, RemoveDataEnv<USER_ID_1>)
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
+        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS), TEST_DATA);
     }
 }
 
@@ -1106,7 +1106,7 @@ RUNNER_TEST(T3143_control_deprecated_access_allowed_with_remove, RemoveDataEnv<U
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
+        check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS), TEST_DATA);
     }
 }
 
@@ -1126,7 +1126,7 @@ RUNNER_TEST(T3144_control_deprecated_access_allowed_remove_denied, RemoveDataEnv
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_remove_denied(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
+        check_remove_denied(aliasWithLabel(APP_LABEL_1, TEST_ALIAS));
     }
 }
 
@@ -1146,7 +1146,7 @@ RUNNER_TEST(T3145_control_deprecated_remove_allowed, RemoveDataEnv<USER_ID_1>)
     {
         ScopedAppContext ctx(APP_LABEL_2, USER_ID_1, GROUP_ID_1);
 
-        check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
+        check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS));
     }
 }
 

diff --git a/src/ckm/privileged/initial-values.cpp b/src/ckm/privileged/initial-values.cpp
index 8c4f4547901097ec4e91abac5215cdf526e328bb..7671c0362a8bb42fe2fa335e1b48bfe4a98adc45 100644 (file)
--- a/src/ckm/privileged/initial-values.cpp
+++ b/src/ckm/privileged/initial-values.cpp
@@ -129,7 +129,7 @@ RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP)
         check_key(XML_1_EXPECTED_KEY_2_RSA.c_str(), CKMC_ERROR_NOT_EXPORTABLE);
         check_key_allowed(XML_1_EXPECTED_KEY_3_AES.c_str(), CKMC_KEY_AES);
         check_cert_allowed(XML_1_EXPECTED_CERT_1.c_str());
-        check_read_allowed(XML_1_EXPECTED_DATA_1.c_str(), XML_1_EXPECTED_DATA_1_DATA);
+        check_read_allowed(XML_1_EXPECTED_DATA_1, XML_1_EXPECTED_DATA_1_DATA);
     }
 
     // [test2]
@@ -141,7 +141,7 @@ RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP)
         check_key_not_visible(XML_1_EXPECTED_KEY_2_RSA.c_str());
         check_key_allowed(XML_1_EXPECTED_KEY_3_AES.c_str(), CKMC_KEY_AES);
         check_cert_not_visible(XML_1_EXPECTED_CERT_1.c_str());
-        check_read_allowed(XML_1_EXPECTED_DATA_1.c_str(), XML_1_EXPECTED_DATA_1_DATA);
+        check_read_allowed(XML_1_EXPECTED_DATA_1, XML_1_EXPECTED_DATA_1_DATA);
     }
 
     // [test3]
@@ -154,7 +154,7 @@ RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP)
         check_key(XML_1_EXPECTED_KEY_2_RSA.c_str(), CKMC_ERROR_NOT_EXPORTABLE);
         check_key_allowed(XML_1_EXPECTED_KEY_3_AES.c_str(), CKMC_KEY_AES);
         check_cert_allowed(XML_1_EXPECTED_CERT_1.c_str());
-        check_read_allowed(XML_1_EXPECTED_DATA_1.c_str(), XML_1_EXPECTED_DATA_1_DATA);
+        check_read_allowed(XML_1_EXPECTED_DATA_1, XML_1_EXPECTED_DATA_1_DATA);
     }
 }
 
@@ -174,8 +174,8 @@ RUNNER_TEST(T6020_PARSE_TWO_XML_FILES_AT_STARTUP)
     check_key_allowed(XML_2_EXPECTED_KEY_3_AES.c_str(), CKMC_KEY_AES);
     check_cert_allowed(XML_1_EXPECTED_CERT_1.c_str());
     check_cert_allowed(XML_2_EXPECTED_CERT_1.c_str());
-    check_read_allowed(XML_1_EXPECTED_DATA_1.c_str(), XML_1_EXPECTED_DATA_1_DATA);
-    check_read_allowed(XML_2_EXPECTED_DATA_1.c_str(), XML_2_EXPECTED_DATA_1_DATA);
+    check_read_allowed(XML_1_EXPECTED_DATA_1, XML_1_EXPECTED_DATA_1_DATA);
+    check_read_allowed(XML_2_EXPECTED_DATA_1, XML_2_EXPECTED_DATA_1_DATA);
 }
 
 RUNNER_TEST(T6030_PARSE_FAIL_XML_AT_STARTUP)
@@ -185,7 +185,7 @@ RUNNER_TEST(T6030_PARSE_FAIL_XML_AT_STARTUP)
     check_key_not_visible(XML_3_EXPECTED_KEY_1_RSA.c_str());
     check_key_not_visible(XML_3_EXPECTED_KEY_2_RSA.c_str());
     check_cert_not_visible(XML_3_EXPECTED_CERT_1.c_str());
-    check_read_not_visible(XML_3_EXPECTED_DATA_1.c_str());
+    check_read_not_visible(XML_3_EXPECTED_DATA_1);
 }
 
 RUNNER_TEST(T6040_CHECK_KEYS_VALID)

diff --git a/src/ckm/privileged/system-db.cpp b/src/ckm/privileged/system-db.cpp
index 4bda7eddb5f86fb420515f4ff1c788f7007fc0e2..fbaf5dbf337b51a31d2457ba613324057193a101 100644 (file)
--- a/src/ckm/privileged/system-db.cpp
+++ b/src/ckm/privileged/system-db.cpp
@@ -69,8 +69,8 @@ RUNNER_TEST(T5010_ACCESS_SYSTEM_DB, RemoveDataEnv<0, USER_ID>)
     // try to access the item - expect fail (db is locked)
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
-    allow_access(TEST_SYSTEM_ALIAS.c_str(), TEST_LABEL, CKMC_PERMISSION_READ);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
+    allow_access(TEST_SYSTEM_ALIAS, TEST_LABEL, CKMC_PERMISSION_READ);
 
     // [test]
     {
@@ -108,7 +108,7 @@ RUNNER_TEST(T5030_CLIENT_APP_TRY_ADDING_SYSTEM_ITEM, RemoveDataEnv<0, USER_ID>)
     ScopedDBUnlock unlock(USER_ID, APP_PASS);
     ScopedAppContext ctx(TEST_LABEL, USER_ID, GROUP_ID);
 
-    save_data(aliasWithLabel(SYSTEM_LABEL, TEST_ALIAS).c_str(), TEST_DATA, CKMC_ERROR_PERMISSION_DENIED);
+    save_data(aliasWithLabel(SYSTEM_LABEL, TEST_ALIAS), TEST_DATA, CKMC_ERROR_PERMISSION_DENIED);
     check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA, CKMC_ERROR_DB_ALIAS_UNKNOWN);
 }
 
@@ -122,8 +122,8 @@ RUNNER_TEST(T5031_CLIENT_APP_ACCESS_WITH_PERMISSION, RemoveDataEnv<0, USER_ID>)
     // switch to user app, unlock DB
     // try to access the system item - expect success
 
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
-    allow_access(TEST_SYSTEM_ALIAS.c_str(), TEST_LABEL, CKMC_PERMISSION_READ);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
+    allow_access(TEST_SYSTEM_ALIAS, TEST_LABEL, CKMC_PERMISSION_READ);
 
     // [test]
     ScopedDBUnlock unlock(USER_ID, APP_PASS);
@@ -142,7 +142,7 @@ RUNNER_TEST(T5032_CLIENT_APP_ACCESS_NO_PERMISSION, RemoveDataEnv<0, USER_ID>)
     // try to access the system item - expect fail
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
 
     // [test]
     ScopedDBUnlock unlock(USER_ID, APP_PASS);
@@ -168,8 +168,8 @@ RUNNER_TEST(T5033_CLIENT_APP_PERMISSION_REMOVAL, RemoveDataEnv<0, USER_ID>)
     // try to access the system item - expect fail
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
-    allow_access(TEST_SYSTEM_ALIAS.c_str(), TEST_LABEL, CKMC_PERMISSION_READ);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
+    allow_access(TEST_SYSTEM_ALIAS, TEST_LABEL, CKMC_PERMISSION_READ);
 
     ScopedDBUnlock unlock(USER_ID, APP_PASS);
 
@@ -181,7 +181,7 @@ RUNNER_TEST(T5033_CLIENT_APP_PERMISSION_REMOVAL, RemoveDataEnv<0, USER_ID>)
     }
 
     // [prepare2]
-    check_remove_allowed(TEST_SYSTEM_ALIAS.c_str());
+    check_remove_allowed(TEST_SYSTEM_ALIAS);
 
     // [test2]
     {
@@ -203,7 +203,7 @@ RUNNER_TEST(T5034_CLIENT_APP_SET_READ_ACCESS, RemoveDataEnv<0, USER_ID>)
     ScopedAppContext ctx(TEST_LABEL, USER_ID, GROUP_ID);
 
     ScopedSaveData ssdsystem_user(TEST_ALIAS, TEST_DATA);
-    ScopedSaveData ssdsystem_system(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA, CKMC_ERROR_PERMISSION_DENIED);
+    ScopedSaveData ssdsystem_system(TEST_SYSTEM_ALIAS, TEST_DATA, CKMC_ERROR_PERMISSION_DENIED);
     check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA, CKMC_ERROR_DB_ALIAS_UNKNOWN);
 }
 
@@ -218,14 +218,14 @@ RUNNER_TEST(T5035_CLIENT_APP_TRY_REMOVING_SYSTEM_ITEM, RemoveDataEnv<0, USER_ID>
     // try to remove item from system DB  - expect fail
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
-    allow_access(TEST_SYSTEM_ALIAS.c_str(), TEST_LABEL, CKMC_PERMISSION_READ);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
+    allow_access(TEST_SYSTEM_ALIAS, TEST_LABEL, CKMC_PERMISSION_READ);
 
     // [test]
     ScopedDBUnlock unlock(USER_ID, APP_PASS);
     ScopedAppContext ctx(TEST_LABEL, USER_ID, GROUP_ID);
 
-    check_remove_denied(TEST_SYSTEM_ALIAS.c_str());
+    check_remove_denied(TEST_SYSTEM_ALIAS);
 }
 
 RUNNER_TEST(T5036_CLIENT_LIST_ACCESSIBLE_ITEMS, RemoveDataEnv<0, USER_ID>)
@@ -243,19 +243,19 @@ RUNNER_TEST(T5036_CLIENT_LIST_ACCESSIBLE_ITEMS, RemoveDataEnv<0, USER_ID>)
     // user lists items - expect system item A and private item
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
-    save_data(TEST_SYSTEM_ALIAS_2.c_str(), TEST_DATA);
-    allow_access(TEST_SYSTEM_ALIAS.c_str(), TEST_LABEL, CKMC_PERMISSION_READ);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
+    save_data(TEST_SYSTEM_ALIAS_2, TEST_DATA);
+    allow_access(TEST_SYSTEM_ALIAS, TEST_LABEL, CKMC_PERMISSION_READ);
 
     // [test]
-    check_alias_list({TEST_SYSTEM_ALIAS.c_str(), TEST_SYSTEM_ALIAS_2.c_str()});
+    check_alias_list({TEST_SYSTEM_ALIAS, TEST_SYSTEM_ALIAS_2});
 
     // [test2]
     ScopedDBUnlock unlock(USER_ID, APP_PASS);
     ScopedAppContext ctx(TEST_LABEL, USER_ID, GROUP_ID);
     ScopedSaveData user_data(TEST_ALIAS, TEST_DATA);
 
-    check_alias_list({TEST_SYSTEM_ALIAS.c_str(),
+    check_alias_list({TEST_SYSTEM_ALIAS,
                         aliasWithLabel(TEST_LABEL, TEST_ALIAS)});
 }
 
@@ -375,10 +375,10 @@ RUNNER_TEST(T5039_SYSTEM_APP_SET_REMOVE_ACCESS, RemoveDataEnv<0>)
     // add remove permission to a user app - expect fail
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
 
     // [test]
-    allow_access_negative(TEST_SYSTEM_ALIAS.c_str(), TEST_LABEL, CKMC_PERMISSION_REMOVE, CKMC_ERROR_INVALID_PARAMETER);
+    allow_access_negative(TEST_SYSTEM_ALIAS, TEST_LABEL, CKMC_PERMISSION_REMOVE, CKMC_ERROR_INVALID_PARAMETER);
 }
 
 RUNNER_TEST(T5040_SYSTEM_SVC_ACCESS_DB, RemoveDataEnv<0>)
@@ -390,7 +390,7 @@ RUNNER_TEST(T5040_SYSTEM_SVC_ACCESS_DB, RemoveDataEnv<0>)
     // try to access the item - expect success
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
 
     // [test]
     check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA);
@@ -406,7 +406,7 @@ RUNNER_TEST(T5041_SYSTEM_SVC_1234_ACCESS_DB, RemoveDataEnv<0, SERVICE_USER_ID_2>
     // try to access the item - expect success
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
 
     // [test]
     ScopedAppContext ctx(TEST_LABEL_2, SERVICE_USER_ID_2, SERVICE_GROUP_ID_2);
@@ -427,7 +427,7 @@ RUNNER_TEST(T5042_SYSTEM_SVC_1234_ADD_ITEM_TO_DB, RemoveDataEnv<0, SERVICE_USER_
     ScopedAppContext ctx(TEST_LABEL_2, SERVICE_USER_ID_2, SERVICE_GROUP_ID_2);
 
     // [test]
-    ScopedSaveData ssd(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
+    ScopedSaveData ssd(TEST_SYSTEM_ALIAS, TEST_DATA);
     check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA);
 }
 
@@ -441,7 +441,7 @@ RUNNER_TEST(T5043_SYSTEM_SVC_4999_ACCESS_DB, RemoveDataEnv<0, SERVICE_USER_ID_MA
     // try to access the item - expect success
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
 
     // [test]
     ScopedAppContext ctx(TEST_LABEL_2, SERVICE_USER_ID_MAX, SERVICE_GROUP_ID_MAX);
@@ -459,7 +459,7 @@ RUNNER_TEST(T5044_SYSTEM_SVC_5000_ACCESS_DB, RemoveDataEnv<0, SERVICE_USER_ID_FA
     // try to access the item - expect fail (no system service)
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
 
     // [test]
     ScopedAppContext ctx(TEST_LABEL_2, SERVICE_USER_ID_FAIL, SERVICE_GROUP_ID_FAIL);
@@ -476,10 +476,10 @@ RUNNER_TEST(T5045_SYSTEM_DB_ADD_WITH_INVALID_LABEL, RemoveDataEnv<0>)
     // try to add item using explicit system label - expect success
 
     // [test]
-    save_data(aliasWithLabel(INVALID_LABEL, TEST_ALIAS).c_str(), TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
+    save_data(aliasWithLabel(INVALID_LABEL, TEST_ALIAS), TEST_DATA, CKMC_ERROR_INVALID_PARAMETER);
     check_read(TEST_ALIAS, INVALID_LABEL, TEST_DATA, CKMC_ERROR_DB_ALIAS_UNKNOWN);
 
-    save_data(aliasWithLabel(SYSTEM_LABEL, TEST_ALIAS).c_str(), TEST_DATA);
+    save_data(aliasWithLabel(SYSTEM_LABEL, TEST_ALIAS), TEST_DATA);
     check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA);
 }
 
@@ -493,8 +493,8 @@ RUNNER_TEST(T5046_CLIENT_GET_ALIAS_STATUS_NO_PASSWORD, RemoveDataEnv<0>)
     // system service list alias status - expect both items to have no password protection
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
-    save_data(TEST_SYSTEM_ALIAS_2.c_str(), TEST_DATA);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
+    save_data(TEST_SYSTEM_ALIAS_2, TEST_DATA);
 
     // [test]
     InfoVector expected;
@@ -516,9 +516,9 @@ RUNNER_TEST(T5047_CLIENT_GET_ALIAS_STATUS_PASSWORD_PROTECTED, RemoveDataEnv<0>)
     // protected with password
 
     // [prepare]
-    save_data(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
-    save_data(TEST_SYSTEM_ALIAS_2.c_str(), TEST_DATA, strlen(TEST_DATA), TEST_PASSWORD);
-    save_data((TEST_SYSTEM_ALIAS_2 + "1").c_str(), TEST_DATA, strlen(TEST_DATA), TEST_PASSWORD);
+    save_data(TEST_SYSTEM_ALIAS, TEST_DATA);
+    save_data(TEST_SYSTEM_ALIAS_2, TEST_DATA, strlen(TEST_DATA), TEST_PASSWORD);
+    save_data(TEST_SYSTEM_ALIAS_2 + "1", TEST_DATA, strlen(TEST_DATA), TEST_PASSWORD);
 
     // [test]
     InfoVector expected;

diff --git a/src/ckm/unprivileged/capi-testcases.cpp b/src/ckm/unprivileged/capi-testcases.cpp
index c688471133c9d5cd3d3b13af1a2ac1ac4ecb33c6..d8c89c8e7628568932e1adf3e4f0f6b129d3a6f3 100644 (file)
--- a/src/ckm/unprivileged/capi-testcases.cpp
+++ b/src/ckm/unprivileged/capi-testcases.cpp
@@ -769,7 +769,7 @@ RUNNER_TEST(T3045_save_big_data_C_API, RemoveDataEnv<OWNER_USER_ID>)
 
        save_data(TEST_OBJECT1, big_data.data(), big_size, CKMC_ERROR_NONE);
        auto self_label = getOwnerIdFromSelf();
-       check_read(TEST_OBJECT1, self_label.c_str(), big_data.data(), big_size, CKMC_ERROR_NONE);
+       check_read(TEST_OBJECT1, self_label, big_data.data(), big_size, CKMC_ERROR_NONE);
 }
 
 RUNNER_TEST(T3046_save_get_password_protected_data)

diff --git a/src/ckm/unprivileged/main.cpp b/src/ckm/unprivileged/main.cpp
index 88e8afe753cda739e3d4e6608c0d85e96fbac9e8..f3efeb91f23b8af17acee86f9e99cec297eb9e12 100644 (file)
--- a/src/ckm/unprivileged/main.cpp
+++ b/src/ckm/unprivileged/main.cpp
@@ -252,7 +252,7 @@ RUNNER_TEST(T1014_save_with_label)
     CKM::KeyShPtr key_name, key_full_addr;
     CKM::Alias alias = "mykey-2";
     std::string top_label = getOwnerIdFromSelf();
-    std::string full_address = aliasWithLabel(top_label.c_str(), alias.c_str());
+    std::string full_address = aliasWithLabel(top_label, alias);
 
     RUNNER_ASSERT_MSG(
         CKM_API_SUCCESS == (temp = manager->saveKey(full_address, key, CKM::Policy())),