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;
for (const auto &it : actual)
{
- aliasPwdMap[std::get<0>(it)] = std::get<1>(it);
+ aliasPwdMap[std::get<0>(it)] = std::get<1>(it).passwordProtected;
}
{
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 {
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;
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++;
}
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::AliasPwdVector& expected, const CKM::AliasPwdVector& actual,
+void check_alias_info_list_helper(const CKM::AliasInfoVector& expected,
+ const CKM::AliasInfoVector& actual,
const std::string &userSmackLabel = {});
-void check_alias_info_list(const CKM::AliasPwdVector& expected);
+std::pair<std::string, CKM::AliasInfo> make_alias_info(const std::string& alias, bool password);
+void check_alias_info_list(const CKM::AliasInfoVector& expected);
typedef enum {
ALIAS_KEY,
save_data(TEST_SYSTEM_ALIAS_2.c_str(), TEST_DATA);
// [test]
- CKM::AliasPwdVector aliasPwdVector;
- aliasPwdVector.push_back(std::make_pair(TEST_SYSTEM_ALIAS.c_str(), false));
- aliasPwdVector.push_back(std::make_pair(TEST_SYSTEM_ALIAS_2.c_str(), false));
+ CKM::AliasInfoVector aliasInfoVector;
+ aliasInfoVector.push_back(make_alias_info(TEST_SYSTEM_ALIAS.c_str(), false));
+ aliasInfoVector.push_back(make_alias_info(TEST_SYSTEM_ALIAS_2.c_str(), false));
- check_alias_info_list(aliasPwdVector);
+ check_alias_info_list(aliasInfoVector);
}
RUNNER_TEST(T5047_CLIENT_GET_ALIAS_STATUS_PASSWORD_PROTECTED, RemoveDataEnv<0>)
save_data((TEST_SYSTEM_ALIAS_2 + "1").c_str(), TEST_DATA, strlen(TEST_DATA), TEST_PASSWORD);
// [test]
- CKM::AliasPwdVector aliasPwdVector;
- aliasPwdVector.push_back(std::make_pair(TEST_SYSTEM_ALIAS.c_str(), false));
- aliasPwdVector.push_back(std::make_pair(TEST_SYSTEM_ALIAS_2.c_str(), true));
- aliasPwdVector.push_back(std::make_pair((TEST_SYSTEM_ALIAS_2 + "1").c_str(),true));
+ CKM::AliasInfoVector aliasInfoVector;
+ aliasInfoVector.push_back(make_alias_info(TEST_SYSTEM_ALIAS.c_str(), false));
+ aliasInfoVector.push_back(make_alias_info(TEST_SYSTEM_ALIAS_2.c_str(), true));
+ aliasInfoVector.push_back(make_alias_info((TEST_SYSTEM_ALIAS_2 + "1").c_str(),true));
- check_alias_info_list(aliasPwdVector);
+ check_alias_info_list(aliasInfoVector);
}
const int aliasNameCount = 10;
auto manager = CKM::Manager::create();
- CKM::AliasPwdVector expected;
+ CKM::AliasInfoVector expected;
CKM::RawBuffer buffer(KEY_PEM.begin(), KEY_PEM.end());
auto key = CKM::Key::create(buffer, CKM::Password());
std::string currentAlias;
{
CKM::Policy policy = generate_ckm_policy(it);
currentAlias = "T1024_appkey" + std::to_string(it);
- expected.push_back(std::make_pair(currentAlias, !policy.password.empty()));
+ expected.push_back(make_alias_info(currentAlias, !policy.password.empty()));
RUNNER_ASSERT_MSG(
CKM_API_SUCCESS == (exitCode = manager->saveKey(currentAlias, key, policy)),
"Error=" << CKM::APICodeToString(exitCode));
}
- CKM::AliasPwdVector actual;
+ CKM::AliasInfoVector actual;
RUNNER_ASSERT_MSG(
- CKM_API_SUCCESS == (exitCode = manager->getKeyAliasPwdVector(actual)),
+ CKM_API_SUCCESS == (exitCode = manager->getKeyAliasInfoVector(actual)),
"Error=" << CKM::APICodeToString(exitCode));
RUNNER_ASSERT_MSG(
actual.size() == (beforeSaveAliasCount + aliasNameCount),
const int aliasNameCount = 10;
auto manager = CKM::Manager::create();
- CKM::AliasPwdVector expected;
+ CKM::AliasInfoVector expected;
auto cert = TestData::getTestCertificate(TestData::TEST_LEAF);
std::string currentAlias;
{
CKM::Policy policy = generate_ckm_policy(it);
currentAlias = "T1025_appcert" + std::to_string(it);
- expected.push_back(std::make_pair(currentAlias, !policy.password.empty()));
+ expected.push_back(make_alias_info(currentAlias, !policy.password.empty()));
RUNNER_ASSERT_MSG(
CKM_API_SUCCESS == (exitCode = manager->saveCertificate(currentAlias, cert, policy)),
"Error=" << CKM::APICodeToString(exitCode));
}
- CKM::AliasPwdVector actual;
+ CKM::AliasInfoVector actual;
RUNNER_ASSERT_MSG(
- CKM_API_SUCCESS == (exitCode = manager->getCertificateAliasPwdVector(actual)),
+ CKM_API_SUCCESS == (exitCode = manager->getCertificateAliasInfoVector(actual)),
"Error=" << CKM::APICodeToString(exitCode));
RUNNER_ASSERT_MSG(
actual.size() == (beforeSaveAliasCount + aliasNameCount),
const int aliasNameCount = 10;
auto manager = CKM::Manager::create();
- CKM::AliasPwdVector expected;
+ CKM::AliasInfoVector expected;
std::string binData = "My bin data";
CKM::RawBuffer buffer(binData.begin(), binData.end());
std::string currentAlias;
{
CKM::Policy policy = generate_ckm_policy(it);
currentAlias = "T1026_appdata" + std::to_string(it);
- expected.push_back(std::make_pair(currentAlias, !policy.password.empty()));
+ expected.push_back(make_alias_info(currentAlias, !policy.password.empty()));
RUNNER_ASSERT_MSG(
CKM_API_SUCCESS == (exitCode = manager->saveData(currentAlias, buffer, policy)),
"Error=" << CKM::APICodeToString(exitCode));
}
- CKM::AliasPwdVector actual;
+ CKM::AliasInfoVector actual;
RUNNER_ASSERT_MSG(
- CKM_API_SUCCESS == (exitCode = manager->getDataAliasPwdVector(actual)),
+ CKM_API_SUCCESS == (exitCode = manager->getDataAliasInfoVector(actual)),
"Error=" << CKM::APICodeToString(exitCode));
RUNNER_ASSERT_MSG(
actual.size() == (beforeSaveAliasCount + aliasNameCount),