CKM: Adjust tests to AliasInfo changes

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

diff --git a/src/ckm/ckm-common.h b/src/ckm/ckm-common.h
index f930657..115c4a4 100644 (file)
--- a/src/ckm/ckm-common.h
+++ b/src/ckm/ckm-common.h
@@ -145,11 +145,19 @@ void reset_user_data(uid_t user_id, const char *passwd);
 
 ckmc_raw_buffer_s prepare_message_buffer(const char * input);
 void check_alias_list(const CKM::AliasVector& expected);
-void check_alias_info_list_helper(const CKM::AliasInfoVector& expected,
-                                  const CKM::AliasInfoVector& actual,
+
+struct PasswordInfo {
+    PasswordInfo(const CKM::Alias &alias, bool passwordProtected) : alias(alias), passwordProtected(passwordProtected) {}
+
+    CKM::Alias alias;
+    bool passwordProtected;
+};
+typedef std::vector<PasswordInfo> PasswordInfoVector;
+
+void check_alias_info_list_helper(const PasswordInfoVector& expected,
+                                  const std::unordered_map<std::string, bool>& actual,
                                   const std::string &userSmackLabel = {});
-std::pair<std::string, CKM::AliasInfo> make_alias_info(const std::string& alias, bool password);
-void check_alias_info_list(const CKM::AliasInfoVector& expected);
+void check_alias_info_list(const PasswordInfoVector& expected);
 
 typedef enum {
     ALIAS_KEY,