CKM: Adjust to C++ API changes

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

diff --git a/src/ckm/ckm-common.cpp b/src/ckm/ckm-common.cpp
index 01c265c..5479eb6 100644 (file)
--- a/src/ckm/ckm-common.cpp
+++ b/src/ckm/ckm-common.cpp
@@ -387,8 +387,9 @@ void check_alias_list(const CKM::AliasVector& expected)
     RUNNER_ASSERT_MSG(expected == actual, "Actual list of aliases differ from expected list.");
 }
 
-void check_alias_info_list_helper(const CKM::AliasPwdVector& expected, const CKM::AliasPwdVector& actual,
-        const std::string &userSmackLabel)
+void check_alias_info_list_helper(const CKM::AliasInfoVector& expected,
+                                  const CKM::AliasInfoVector& actual,
+                                  const std::string &userSmackLabel)
 {
     std::string errorLogMsg;
     std::unordered_map<std::string, bool> aliasPwdMap;
@@ -398,7 +399,7 @@ void check_alias_info_list_helper(const CKM::AliasPwdVector& expected, const CKM
 
     for (const auto &it : actual)
     {
-        aliasPwdMap[std::get<0>(it)] = std::get<1>(it);
+        aliasPwdMap[std::get<0>(it)] = std::get<1>(it).passwordProtected;
     }
 
 
@@ -406,9 +407,9 @@ void check_alias_info_list_helper(const CKM::AliasPwdVector& expected, const CKM
     {
         auto aliasPwd = aliasPwdMap.find(userSmackLabel + std::get<0>(it));
         if (aliasPwd != aliasPwdMap.end()) {
-            if (aliasPwd->second != std::get<1>(it)) {
+            if (aliasPwd->second != std::get<1>(it).passwordProtected) {
                 errorLogMsg += "Alias: " + std::get<0>(it) + " has wrong encryption status: "
-                                + std::to_string(std::get<1>(it)) + "\n";
+                                + std::to_string(std::get<1>(it).passwordProtected) + "\n";
             }
         }
         else {
@@ -420,20 +421,25 @@ void check_alias_info_list_helper(const CKM::AliasPwdVector& expected, const CKM
         for (const auto &it : actual)
         {
             errorLogMsg += "Actual alias: " + std::get<0>(it) + " status: "
-                + std::to_string(std::get<1>(it)) + "\n";
+                + std::to_string(std::get<1>(it).passwordProtected) + "\n";
         }
         RUNNER_FAIL_MSG("Actual list of aliases differ from expected list.\n" + errorLogMsg);
     }
 }
 
-void check_alias_info_list(const CKM::AliasPwdVector& expected)
+std::pair<std::string, CKM::AliasInfo> make_alias_info(const std::string& alias, bool password)
+{
+    return std::make_pair(alias, CKM::AliasInfo({password, CKM::BackendId::SW}));
+}
+
+void check_alias_info_list(const CKM::AliasInfoVector& expected)
 {
     ckmc_alias_info_list_s *aliasInfoList = NULL;
     int ret = ckmc_get_data_alias_info_list(&aliasInfoList);
     RUNNER_ASSERT_MSG(ret == CKMC_ERROR_NONE, "Failed to get the list of data aliases. " << ret << " / "
                       << CKMCErrorToString(ret));
 
-    CKM::AliasPwdVector actual;
+    CKM::AliasInfoVector actual;
     ckmc_alias_info_list_s *plist = aliasInfoList;
     char* alias;
     bool isPasswordProtected;
@@ -447,7 +453,7 @@ void check_alias_info_list(const CKM::AliasPwdVector& expected)
         RUNNER_ASSERT_MSG(ret == CKMC_ERROR_NONE, "Failed to get password protection status" << ret << " / "
                           << CKMCErrorToString(ret));
         RUNNER_ASSERT_MSG(alias != nullptr, "Got null alias. Iterator: " << it);
-        actual.push_back(std::make_pair(alias, isPasswordProtected));
+        actual.push_back(make_alias_info(alias, isPasswordProtected));
         plist = plist->next;
         it++;
     }