From: Krzysztof Jackiewicz Date: Fri, 14 Jul 2023 07:53:16 +0000 (+0200) Subject: CKM: Fix policy generation and expectation X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb8b44bce1a5b12bdff1d782ff04c3b61ee7f663;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git CKM: Fix policy generation and expectation Some of the possible policy setups were skipped. Make the generate_ckm_policy() generate all possible combinations. Expect backend depending on the policy's extractable flag in T1024 Change-Id: I1bd0f5b1a544c8385fdd9c66d23cbd5385137cd0 --- diff --git a/src/ckm/ckm-common.cpp b/src/ckm/ckm-common.cpp index 2ceb95bb..a0bdcee4 100644 --- a/src/ckm/ckm-common.cpp +++ b/src/ckm/ckm-common.cpp @@ -621,10 +621,10 @@ CipherCtxPtr create_cipher_ctx(ckmc_cipher_ctx_h ctx) } CKM::Policy generate_ckm_policy(int iterator_nr) { - if (iterator_nr % 2) { // policy with password and with / without extractable flag - return CKM::Policy(CKM::Password("test_pwd"), iterator_nr % 4); - } - return CKM::Policy(); + CKM::Password password; + if ((iterator_nr & 0x1) != 0) + password.assign("test_pwd"); + return CKM::Policy(password, (iterator_nr & 0x2) != 0); } void require_default_user(char *argv[]) diff --git a/src/ckm/unprivileged/main.cpp b/src/ckm/unprivileged/main.cpp index 8f02903f..07edb738 100644 --- a/src/ckm/unprivileged/main.cpp +++ b/src/ckm/unprivileged/main.cpp @@ -459,7 +459,9 @@ 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(), backend()); + expected.emplace_back(currentAlias, + !policy.password.empty(), + policy.extractable ? CKM::BackendId::SW : backend()); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (exitCode = manager->saveKey(currentAlias, key, policy)), "Error=" << CKM::APICodeToString(exitCode));