CKM: Check backend info

[platform/core/test/security-tests.git] / src / ckm / unprivileged / main.cpp

diff --git a/src/ckm/unprivileged/main.cpp b/src/ckm/unprivileged/main.cpp
index 9204738..f55aeb2 100644 (file)
--- a/src/ckm/unprivileged/main.cpp
+++ b/src/ckm/unprivileged/main.cpp
@@ -442,7 +442,7 @@ RUNNER_TEST(T1024_app_user_save_keys_get_alias_pwd)
     const int aliasNameCount = 10;
     auto manager = CKM::Manager::create();
 
-    PasswordInfoVector expected;
+    InfoVector expected;
     CKM::RawBuffer buffer(KEY_PEM.begin(), KEY_PEM.end());
     auto key = CKM::Key::create(buffer, CKM::Password());
     std::string currentAlias;
@@ -453,14 +453,14 @@ RUNNER_TEST(T1024_app_user_save_keys_get_alias_pwd)
     {
         CKM::Policy policy = generate_ckm_policy(it);
         currentAlias = "T1024_appkey" + std::to_string(it);
-        expected.emplace_back(currentAlias, !policy.password.empty());
+        expected.emplace_back(currentAlias, !policy.password.empty(), backend());
         RUNNER_ASSERT_MSG(
             CKM_API_SUCCESS == (exitCode = manager->saveKey(currentAlias, key, policy)),
             "Error=" << CKM::APICodeToString(exitCode));
     }
 
     CKM::AliasInfoVector aliasInfoVector;
-    std::unordered_map<std::string, bool> actual;
+    InfoMap actual;
 
     RUNNER_ASSERT_MSG(
         CKM_API_SUCCESS == (exitCode = manager->getKeyAliasInfoVector(aliasInfoVector)),
@@ -475,7 +475,7 @@ RUNNER_TEST(T1024_app_user_save_keys_get_alias_pwd)
         exitCode = manager->getKeyEncryptionStatus(info.alias, status);
         RUNNER_ASSERT_MSG(CKM_API_SUCCESS == exitCode, "Error=" << CKM::APICodeToString(exitCode));
 
-        actual[info.alias] = status;
+        actual.try_emplace(info.alias, info.alias, status, info.backend);
     }
 
     check_alias_info_list_helper(expected, actual, "/User ");
@@ -491,7 +491,7 @@ RUNNER_TEST(T1025_app_user_save_certificates_get_alias_pwd)
     const int aliasNameCount = 10;
     auto manager = CKM::Manager::create();
 
-    PasswordInfoVector expected;
+    InfoVector expected;
     auto cert = TestData::getTestCertificate(TestData::TEST_LEAF);
     std::string currentAlias;
 
@@ -500,14 +500,14 @@ RUNNER_TEST(T1025_app_user_save_certificates_get_alias_pwd)
     {
         CKM::Policy policy = generate_ckm_policy(it);
         currentAlias = "T1025_appcert" + std::to_string(it);
-        expected.emplace_back(currentAlias, !policy.password.empty());
+        expected.emplace_back(currentAlias, !policy.password.empty(), CKM::BackendId::SW);
         RUNNER_ASSERT_MSG(
                 CKM_API_SUCCESS == (exitCode = manager->saveCertificate(currentAlias, cert, policy)),
                     "Error=" << CKM::APICodeToString(exitCode));
     }
 
     CKM::AliasInfoVector aliasInfoVector;
-    std::unordered_map<std::string, bool> actual;
+    InfoMap actual;
 
     RUNNER_ASSERT_MSG(
         CKM_API_SUCCESS == (exitCode = manager->getCertificateAliasInfoVector(aliasInfoVector)),
@@ -522,7 +522,7 @@ RUNNER_TEST(T1025_app_user_save_certificates_get_alias_pwd)
         exitCode = manager->getCertificateEncryptionStatus(info.alias, status);
         RUNNER_ASSERT_MSG(CKM_API_SUCCESS == exitCode, "Error=" << CKM::APICodeToString(exitCode));
 
-        actual[info.alias] = status;
+        actual.try_emplace(info.alias, info.alias, status, info.backend);
     }
 
     check_alias_info_list_helper(expected, actual, "/User ");
@@ -538,7 +538,7 @@ RUNNER_TEST(T1026_app_user_save_data_get_alias_pwd)
     const int aliasNameCount = 10;
     auto manager = CKM::Manager::create();
 
-    PasswordInfoVector expected;
+    InfoVector expected;
     std::string binData = "My bin data";
     CKM::RawBuffer buffer(binData.begin(), binData.end());
     std::string currentAlias;
@@ -548,14 +548,14 @@ RUNNER_TEST(T1026_app_user_save_data_get_alias_pwd)
     {
         CKM::Policy policy = generate_ckm_policy(it);
         currentAlias = "T1026_appdata" + std::to_string(it);
-        expected.emplace_back(currentAlias, !policy.password.empty());
+        expected.emplace_back(currentAlias, !policy.password.empty(), backend());
         RUNNER_ASSERT_MSG(
             CKM_API_SUCCESS == (exitCode = manager->saveData(currentAlias, buffer, policy)),
                 "Error=" << CKM::APICodeToString(exitCode));
     }
 
     CKM::AliasInfoVector aliasInfoVector;
-    std::unordered_map<std::string, bool> actual;
+    InfoMap actual;
 
     RUNNER_ASSERT_MSG(
         CKM_API_SUCCESS == (exitCode = manager->getDataAliasInfoVector(aliasInfoVector)),
@@ -570,7 +570,7 @@ RUNNER_TEST(T1026_app_user_save_data_get_alias_pwd)
         exitCode = manager->getDataEncryptionStatus(info.alias, status);
         RUNNER_ASSERT_MSG(CKM_API_SUCCESS == exitCode, "Error=" << CKM::APICodeToString(exitCode));
 
-        actual[info.alias] = status;
+        actual.try_emplace(info.alias, info.alias, status, info.backend);
     }
 
     check_alias_info_list_helper(expected, actual, "/User ");