projects / platform / core / test / security-tests.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
CAPI changes (set permission, remove alias): tests adjusted.
[platform/core/test/security-tests.git] / tests / ckm / async-api.cpp
diff --git a/tests/ckm/async-api.cpp b/tests/ckm/async-api.cpp
index 39bd712..ded20be 100644 (file)
--- a/tests/ckm/async-api.cpp
+++ b/tests/ckm/async-api.cpp
@@ -26,6 +26,7 @@
 #include <condition_variable>
 #include <cassert>
 
+#include <ckmc/ckmc-type.h>
 #include <ckm/ckm-manager-async.h>
 #include <ckm/ckm-manager.h>
 #include <ckm/ckm-control.h>
@@ -65,9 +66,7 @@ public:
     void ReceivedSaveCertificate() { Succeeded(); }
     void ReceivedSaveData() { Succeeded(); }
 
-    void ReceivedRemovedKey() { Succeeded(); }
-    void ReceivedRemovedCertificate() { Succeeded(); }
-    void ReceivedRemovedData() { Succeeded(); }
+    void ReceivedRemovedAlias() { Succeeded(); }
 
     void ReceivedKey(Key &&) { Succeeded(); }
     void ReceivedCertificate(Certificate &&) { Succeeded(); }
@@ -86,11 +85,10 @@ public:
 
     void ReceivedCreateSignature(RawBuffer && buffer) { m_signed = move(buffer); Succeeded(); }
     void ReceivedVerifySignature() { Succeeded(); }
-
     void ReceivedOCSPCheck(int status) { m_ocspStatus = status; Succeeded(); }
 
-    void ReceivedAllowAccess() { Succeeded(); }
-    void ReceivedDenyAccess() { Succeeded(); }
+    void ReceivedSetPermission() { Succeeded(); }
+
 
     void WaitForResponse()
     {
@@ -401,8 +399,6 @@ RUNNER_TEST(TA0000_init)
 {
     int temp;
     ControlShPtr control = Control::create();
-    RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->unlockUserKey(APP_UID, TEST_PASS)),
-                         "Error=" << ErrorToString(temp));
     RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = control->removeUserData(APP_UID)),
                          "Error=" << ErrorToString(temp));
 }
@@ -422,10 +418,10 @@ RUNNER_CHILD_TEST(TA0020_save_key_already_exists)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias"), keys[RSA][0].prv, Policy());
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias"), keys[RSA][0].prv, Policy());
     test_negative(&ManagerAsync::saveKey,
                   CKM_API_ERROR_DB_ALIAS_EXISTS,
-                  dbc.key("alias"),
+                  dbc.alias("alias"),
                   keys[RSA][0].prv,
                   Policy());
 }
@@ -435,7 +431,7 @@ RUNNER_CHILD_TEST(TA0050_save_key_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias"), keys[RSA][0].prv, Policy());
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias"), keys[RSA][0].prv, Policy());
 }
 
 
@@ -455,10 +451,10 @@ RUNNER_CHILD_TEST(TA0120_save_cert_already_exists)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveCertificate, dbc.cert("alias"), certs[0], Policy());
+    test_positive(&ManagerAsync::saveCertificate, dbc.alias("alias"), certs[0], Policy());
     test_negative(&ManagerAsync::saveCertificate,
                   CKM_API_ERROR_DB_ALIAS_EXISTS,
-                  dbc.cert("alias"),
+                  dbc.alias("alias"),
                   certs[0],
                   Policy());
 }
@@ -468,7 +464,7 @@ RUNNER_CHILD_TEST(TA0150_save_cert_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveCertificate, dbc.cert("alias"), certs[0], Policy());
+    test_positive(&ManagerAsync::saveCertificate, dbc.alias("alias"), certs[0], Policy());
 }
 
 
@@ -487,10 +483,10 @@ RUNNER_CHILD_TEST(TA0220_save_data_already_exists)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveData, dbc.data("alias"), test_buffer, Policy());
+    test_positive(&ManagerAsync::saveData, dbc.alias("alias"), test_buffer, Policy());
     test_negative(&ManagerAsync::saveData,
                   CKM_API_ERROR_DB_ALIAS_EXISTS,
-                  dbc.data("alias"),
+                  dbc.alias("alias"),
                   test_buffer,
                   Policy());
 }
@@ -500,24 +496,24 @@ RUNNER_CHILD_TEST(TA0250_save_data_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveData, dbc.data("alias"), test_buffer, Policy());
+    test_positive(&ManagerAsync::saveData, dbc.alias("alias"), test_buffer, Policy());
 }
 
 
 // removeKey
-RUNNER_CHILD_TEST(TA0310_remove_key_invalid_param)
+RUNNER_CHILD_TEST(TA0310_remove_alias_invalid_param)
 {
     switch_to_storage_user(TEST_LABEL);
 
-    test_no_observer(&ManagerAsync::removeKey, "alias");
-    test_invalid_param(&ManagerAsync::removeKey, "");
+    test_no_observer(&ManagerAsync::removeAlias, "alias");
+    test_invalid_param(&ManagerAsync::removeAlias, "");
 }
 
-RUNNER_CHILD_TEST(TA0330_remove_key_unknown_alias)
+RUNNER_CHILD_TEST(TA0330_remove_alias_unknown_alias)
 {
     switch_to_storage_user(TEST_LABEL);
 
-    test_negative(&ManagerAsync::removeKey, CKM_API_ERROR_DB_ALIAS_UNKNOWN, "non-existing-alias");
+    test_negative(&ManagerAsync::removeAlias, CKM_API_ERROR_DB_ALIAS_UNKNOWN, "non-existing-alias");
 }
 
 RUNNER_CHILD_TEST(TA0350_remove_key_positive)
@@ -525,62 +521,28 @@ RUNNER_CHILD_TEST(TA0350_remove_key_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias"), keys[RSA][0].prv, Policy());
-    test_positive(&ManagerAsync::removeKey, dbc.key("alias"));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias"), keys[RSA][0].prv, Policy());
+    test_positive(&ManagerAsync::removeAlias, dbc.alias("alias"));
 }
 
 
-// removeCert
-RUNNER_CHILD_TEST(TA0410_remove_cert_invalid_param)
-{
-    switch_to_storage_user(TEST_LABEL);
-
-    test_no_observer(&ManagerAsync::removeCertificate, "alias");
-    test_invalid_param(&ManagerAsync::removeCertificate, "");
-}
-
-RUNNER_CHILD_TEST(TA0430_remove_cert_unknown_alias)
-{
-    switch_to_storage_user(TEST_LABEL);
-
-    test_negative(&ManagerAsync::removeCertificate,
-                  CKM_API_ERROR_DB_ALIAS_UNKNOWN,
-                  "non-existing-alias");
-}
-
 RUNNER_CHILD_TEST(TA0450_remove_cert_positive)
 {
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveCertificate, dbc.cert("alias"), certs[0], Policy());
-    test_positive(&ManagerAsync::removeCertificate, dbc.cert("alias"));
-}
-
-
-// removeData
-RUNNER_CHILD_TEST(TA0510_remove_data_invalid_param)
-{
-    switch_to_storage_user(TEST_LABEL);
-
-    test_no_observer(&ManagerAsync::removeData, "alias");
-    test_invalid_param(&ManagerAsync::removeData, "");
+    test_positive(&ManagerAsync::saveCertificate, dbc.alias("alias"), certs[0], Policy());
+    test_positive(&ManagerAsync::removeAlias, dbc.alias("alias"));
 }
 
-RUNNER_CHILD_TEST(TA0530_remove_data_unknown_alias)
-{
-    switch_to_storage_user(TEST_LABEL);
-
-    test_negative(&ManagerAsync::removeData, CKM_API_ERROR_DB_ALIAS_UNKNOWN, "non-existing-alias");
-}
 
 RUNNER_CHILD_TEST(TA0550_remove_data_positive)
 {
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveData, dbc.data("alias"), test_buffer, Policy());
-    test_positive(&ManagerAsync::removeData, dbc.data("alias"));
+    test_positive(&ManagerAsync::saveData, dbc.alias("alias"), test_buffer, Policy());
+    test_positive(&ManagerAsync::removeAlias, dbc.alias("alias"));
 }
 
 
@@ -605,10 +567,10 @@ RUNNER_CHILD_TEST(TA0640_get_key_wrong_password)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias"), keys[RSA][0].prv, Policy("password"));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias"), keys[RSA][0].prv, Policy("password"));
     test_negative(&ManagerAsync::getKey,
                   CKM_API_ERROR_SERVER_ERROR,
-                  dbc.key("alias"),
+                  dbc.alias("alias"),
                   "wrong-password");
 }
 
@@ -617,8 +579,8 @@ RUNNER_CHILD_TEST(TA0650_get_key_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias"), keys[RSA][0].prv, Policy("password"));
-    test_positive(&ManagerAsync::getKey, dbc.key("alias"), "password");
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias"), keys[RSA][0].prv, Policy("password"));
+    test_positive(&ManagerAsync::getKey, dbc.alias("alias"), "password");
 }
 
 
@@ -647,12 +609,12 @@ RUNNER_CHILD_TEST(TA0740_get_cert_wrong_password)
 
     DBCleanup dbc;
     test_positive(&ManagerAsync::saveCertificate,
-                  dbc.cert("alias"),
+                  dbc.alias("alias"),
                   certs[0],
                   Policy("password"));
     test_negative(&ManagerAsync::getCertificate,
                   CKM_API_ERROR_SERVER_ERROR,
-                  dbc.cert("alias"),
+                  dbc.alias("alias"),
                   "wrong-password");
 }
 
@@ -661,8 +623,8 @@ RUNNER_CHILD_TEST(TA0750_get_cert_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveCertificate, dbc.cert("alias"), certs[0], Policy("password"));
-    test_positive(&ManagerAsync::getCertificate, dbc.cert("alias"), "password");
+    test_positive(&ManagerAsync::saveCertificate, dbc.alias("alias"), certs[0], Policy("password"));
+    test_positive(&ManagerAsync::getCertificate, dbc.alias("alias"), "password");
 }
 
 
@@ -687,10 +649,10 @@ RUNNER_CHILD_TEST(TA0840_get_data_wrong_password)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveData, dbc.data("alias"), test_buffer, Policy("password"));
+    test_positive(&ManagerAsync::saveData, dbc.alias("alias"), test_buffer, Policy("password"));
     test_negative(&ManagerAsync::getData,
                   CKM_API_ERROR_SERVER_ERROR,
-                  dbc.data("alias"),
+                  dbc.alias("alias"),
                   "wrong-password");
 }
 
@@ -699,8 +661,8 @@ RUNNER_CHILD_TEST(TA0850_get_data_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveData, dbc.data("alias"), test_buffer, Policy("password"));
-    test_positive(&ManagerAsync::getData, dbc.data("alias"), "password");
+    test_positive(&ManagerAsync::saveData, dbc.alias("alias"), test_buffer, Policy("password"));
+    test_positive(&ManagerAsync::getData, dbc.alias("alias"), "password");
 }
 
 
@@ -717,15 +679,15 @@ RUNNER_CHILD_TEST(TA0950_get_key_alias_vector_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias1"), keys[RSA][0].prv, Policy());
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { Alias(dbc.key("alias1")) });
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias1"), keys[RSA][0].prv, Policy());
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")) });
 
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias2"), keys[DSA][0].prv, Policy());
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { Alias(dbc.key("alias1")),
-                                                           Alias(dbc.key("alias2")) });
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias2"), keys[DSA][0].prv, Policy());
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")),
+                                                           aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 
-    test_positive(&ManagerAsync::removeKey, dbc.key("alias1"));
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { Alias(dbc.key("alias2")) });
+    test_positive(&ManagerAsync::removeAlias, dbc.alias("alias1"));
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 }
 
 
@@ -742,15 +704,15 @@ RUNNER_CHILD_TEST(TA1050_get_cert_alias_vector_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveCertificate, dbc.cert("alias1"), certs[0], Policy());
-    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { Alias(dbc.cert("alias1")) });
+    test_positive(&ManagerAsync::saveCertificate, dbc.alias("alias1"), certs[0], Policy());
+    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")) });
 
-    test_positive(&ManagerAsync::saveCertificate, dbc.cert("alias2"), certs[1], Policy());
-    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { Alias(dbc.cert("alias1")),
-                                                                   Alias(dbc.cert("alias2")) });
+    test_positive(&ManagerAsync::saveCertificate, dbc.alias("alias2"), certs[1], Policy());
+    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")),
+                                                                   aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 
-    test_positive(&ManagerAsync::removeCertificate, dbc.cert("alias1"));
-    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { Alias(dbc.cert("alias2")) });
+    test_positive(&ManagerAsync::removeAlias, dbc.alias("alias1"));
+    test_check_aliases(&ManagerAsync::getCertificateAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 }
 
 
@@ -767,15 +729,15 @@ RUNNER_CHILD_TEST(TA1150_get_data_alias_vector_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveData, dbc.data("alias1"), test_buffer, Policy());
-    test_check_aliases(&ManagerAsync::getDataAliasVector, { Alias(dbc.data("alias1")) });
+    test_positive(&ManagerAsync::saveData, dbc.alias("alias1"), test_buffer, Policy());
+    test_check_aliases(&ManagerAsync::getDataAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")) });
 
-    test_positive(&ManagerAsync::saveData, dbc.data("alias2"), test_buffer, Policy());
-    test_check_aliases(&ManagerAsync::getDataAliasVector, { Alias(dbc.data("alias1")),
-                                                            Alias(dbc.data("alias2")) });
+    test_positive(&ManagerAsync::saveData, dbc.alias("alias2"), test_buffer, Policy());
+    test_check_aliases(&ManagerAsync::getDataAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias1")),
+                                                            aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 
-    test_positive(&ManagerAsync::removeData, dbc.data("alias1"));
-    test_check_aliases(&ManagerAsync::getDataAliasVector, { Alias(dbc.data("alias2")) });
+    test_positive(&ManagerAsync::removeAlias, dbc.alias("alias1"));
+    test_check_aliases(&ManagerAsync::getDataAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias2")) });
 }
 
 
@@ -797,12 +759,12 @@ RUNNER_CHILD_TEST(TA1220_create_key_pair_rsa_already_exists)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias_prv"), keys[RSA][0].prv, Policy());
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias_prv"), keys[RSA][0].prv, Policy());
     test_negative(&ManagerAsync::createKeyPairRSA,
                   CKM_API_ERROR_DB_ALIAS_EXISTS,
                   1024,
-                  dbc.key("alias_prv"),
-                  dbc.key("alias_pub"),
+                  dbc.alias("alias_prv"),
+                  dbc.alias("alias_pub"),
                   Policy(),
                   Policy());
 }
@@ -814,13 +776,13 @@ RUNNER_CHILD_TEST(TA1250_create_key_pair_rsa_positive)
     DBCleanup dbc;
     test_positive(&ManagerAsync::createKeyPairRSA,
                   1024,
-                  dbc.key("alias_prv"),
-                  dbc.key("alias_pub"),
+                  dbc.alias("alias_prv"),
+                  dbc.alias("alias_pub"),
                   Policy(),
                   Policy());
 
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { Alias(dbc.data("alias_prv")),
-                                                           Alias(dbc.data("alias_pub")) });
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias_prv")),
+                                                           aliasWithLabel(TEST_LABEL, dbc.alias("alias_pub")) });
 }
 
 // createKeyPairDSA
@@ -841,12 +803,12 @@ RUNNER_CHILD_TEST(TA1280_create_key_pair_dsa_already_exists)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias_prv"), keys[DSA][0].prv, Policy());
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias_prv"), keys[DSA][0].prv, Policy());
     test_negative(&ManagerAsync::createKeyPairDSA,
                   CKM_API_ERROR_DB_ALIAS_EXISTS,
                   1024,
-                  dbc.key("alias_prv"),
-                  dbc.key("alias_pub"),
+                  dbc.alias("alias_prv"),
+                  dbc.alias("alias_pub"),
                   Policy(),
                   Policy());
 }
@@ -858,13 +820,13 @@ RUNNER_CHILD_TEST(TA1290_create_key_pair_dsa_positive)
     DBCleanup dbc;
     test_positive(&ManagerAsync::createKeyPairDSA,
                   1024,
-                  dbc.key("alias_prv"),
-                  dbc.key("alias_pub"),
+                  dbc.alias("alias_prv"),
+                  dbc.alias("alias_pub"),
                   Policy(),
                   Policy());
 
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { Alias(dbc.data("alias_prv")),
-                                                           Alias(dbc.data("alias_pub")) });
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias_prv")),
+                                                           aliasWithLabel(TEST_LABEL, dbc.alias("alias_pub")) });
 }
 
 // createKeyPairECDSA
@@ -885,12 +847,12 @@ RUNNER_CHILD_TEST(TA1320_create_key_pair_ecdsa_already_exists)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias_prv"), keys[ECDSA][0].prv, Policy());
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias_prv"), keys[ECDSA][0].prv, Policy());
     test_negative(&ManagerAsync::createKeyPairECDSA,
                   CKM_API_ERROR_DB_ALIAS_EXISTS,
                   ElipticCurve::prime192v1,
-                  dbc.key("alias_prv"),
-                  dbc.key("alias_pub"),
+                  dbc.alias("alias_prv"),
+                  dbc.alias("alias_pub"),
                   Policy(),
                   Policy());
 }
@@ -902,13 +864,13 @@ RUNNER_CHILD_TEST(TA1350_create_key_pair_ecdsa_positive)
     DBCleanup dbc;
     test_positive(&ManagerAsync::createKeyPairECDSA,
                   ElipticCurve::prime192v1,
-                  dbc.key("alias_prv"),
-                  dbc.key("alias_pub"),
+                  dbc.alias("alias_prv"),
+                  dbc.alias("alias_pub"),
                   Policy(),
                   Policy());
 
-    test_check_aliases(&ManagerAsync::getKeyAliasVector, { Alias(dbc.data("alias_prv")),
-                                                           Alias(dbc.data("alias_pub")) });
+    test_check_aliases(&ManagerAsync::getKeyAliasVector, { aliasWithLabel(TEST_LABEL, dbc.alias("alias_prv")),
+                                                           aliasWithLabel(TEST_LABEL, dbc.alias("alias_pub")) });
 }
 
 
@@ -947,7 +909,7 @@ RUNNER_CHILD_TEST(TA1420_get_certificate_chain_negative)
                                 CKM_API_ERROR_VERIFICATION_FAILED,
                                 cert,
                                 certv);
-    AliasVector aliasv = { dbc.cert("alias") };
+    AliasVector aliasv = { dbc.alias("alias") };
     test_positive(&ManagerAsync::saveCertificate, aliasv[0], certs[0], Policy());
     test_negative<certChainFn2>(&ManagerAsync::getCertificateChain,
                                 CKM_API_ERROR_VERIFICATION_FAILED,
@@ -964,7 +926,7 @@ RUNNER_CHILD_TEST(TA1450_get_certificate_chain_positive)
     CertificateShPtrVector certv = { certs[1] };
     test_check_cert_chain<certChainFn1>(&ManagerAsync::getCertificateChain, 3, cert, certv);
 
-    AliasVector aliasv = { dbc.cert("alias") };
+    AliasVector aliasv = { dbc.alias("alias") };
     test_positive(&ManagerAsync::saveCertificate, aliasv[0], certs[1], Policy());
     test_check_cert_chain<certChainFn2>(&ManagerAsync::getCertificateChain, 3, cert, aliasv);
 }
@@ -1000,10 +962,10 @@ RUNNER_CHILD_TEST(TA1520_create_signature_invalid_password)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias"), keys[RSA][0].prv, Policy("password"));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias"), keys[RSA][0].prv, Policy("password"));
     test_negative(&ManagerAsync::createSignature,
                   CKM_API_ERROR_INPUT_PARAM,
-                  dbc.key("alias"),
+                  dbc.alias("alias"),
                   "wrong-password",
                   RawBuffer(),
                   HashAlgorithm::SHA1,
@@ -1015,9 +977,9 @@ RUNNER_CHILD_TEST(TA1550_create_signature_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias"), keys[RSA][0].prv, Policy("password"));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias"), keys[RSA][0].prv, Policy("password"));
     test_positive(&ManagerAsync::createSignature,
-                  dbc.key("alias"),
+                  dbc.alias("alias"),
                   "password",
                   test_buffer,
                   HashAlgorithm::SHA1,
@@ -1051,10 +1013,10 @@ RUNNER_CHILD_TEST(TA1620_verify_signature_invalid_password)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias_prv"), keys[RSA][0].prv, Policy("pass1"));
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias_pub"), keys[RSA][0].pub, Policy("pass2"));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias_prv"), keys[RSA][0].prv, Policy("pass1"));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias_pub"), keys[RSA][0].pub, Policy("pass2"));
     auto obs = test_positive(&ManagerAsync::createSignature,
-                             dbc.key("alias_prv"),
+                             dbc.alias("alias_prv"),
                              "pass1",
                              test_buffer,
                              HashAlgorithm::SHA1,
@@ -1062,7 +1024,7 @@ RUNNER_CHILD_TEST(TA1620_verify_signature_invalid_password)
 
     test_negative(&ManagerAsync::verifySignature,
                   CKM_API_ERROR_SERVER_ERROR,
-                  dbc.key("alias_pub"),
+                  dbc.alias("alias_pub"),
                   "wrong-password",
                   test_buffer,
                   obs->m_signed,
@@ -1075,11 +1037,11 @@ RUNNER_CHILD_TEST(TA1630_verify_signature_invalid_message)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias_prv"), keys[RSA][0].prv, Policy(""));
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias_pub"), keys[RSA][0].pub, Policy(""));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias_prv"), keys[RSA][0].prv, Policy(""));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias_pub"), keys[RSA][0].pub, Policy(""));
 
     auto obs = test_positive(&ManagerAsync::createSignature,
-                             dbc.key("alias_prv"),
+                             dbc.alias("alias_prv"),
                              "",
                              test_buffer,
                              HashAlgorithm::SHA1,
@@ -1087,7 +1049,7 @@ RUNNER_CHILD_TEST(TA1630_verify_signature_invalid_message)
 
     test_negative(&ManagerAsync::verifySignature,
                   CKM_API_ERROR_VERIFICATION_FAILED,
-                  dbc.key("alias_pub"),
+                  dbc.alias("alias_pub"),
                   "",
                   raw_buffer("invalid-unsigned-mesage"),
                   obs->m_signed,
@@ -1100,11 +1062,11 @@ RUNNER_CHILD_TEST(TA1640_verify_signature_invalid_signature)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias_pub"), keys[RSA][0].pub, Policy(""));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias_pub"), keys[RSA][0].pub, Policy(""));
 
     test_negative(&ManagerAsync::verifySignature,
                   CKM_API_ERROR_VERIFICATION_FAILED,
-                  dbc.key("alias_pub"),
+                  dbc.alias("alias_pub"),
                   "",
                   test_buffer,
                   raw_buffer("invalid-signature"),
@@ -1117,9 +1079,9 @@ RUNNER_CHILD_TEST(TA1650_verify_signature_wrong_key)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias_prv"), keys[RSA][0].prv, Policy(""));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias_prv"), keys[RSA][0].prv, Policy(""));
     auto obs = test_positive(&ManagerAsync::createSignature,
-                             dbc.key("alias_prv"),
+                             dbc.alias("alias_prv"),
                              "",
                              test_buffer,
                              HashAlgorithm::SHA1,
@@ -1127,7 +1089,7 @@ RUNNER_CHILD_TEST(TA1650_verify_signature_wrong_key)
 
     test_negative(&ManagerAsync::verifySignature,
                   CKM_API_ERROR_SERVER_ERROR,
-                  dbc.key("alias_prv"),
+                  dbc.alias("alias_prv"),
                   "",
                   test_buffer,
                   obs->m_signed,
@@ -1140,17 +1102,17 @@ RUNNER_CHILD_TEST(TA1660_verify_signature_positive)
     switch_to_storage_user(TEST_LABEL);
 
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias_prv"), keys[RSA][0].prv, Policy("pass1"));
-    test_positive(&ManagerAsync::saveKey, dbc.key("alias_pub"), keys[RSA][0].pub, Policy("pass2"));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias_prv"), keys[RSA][0].prv, Policy("pass1"));
+    test_positive(&ManagerAsync::saveKey, dbc.alias("alias_pub"), keys[RSA][0].pub, Policy("pass2"));
     auto obs = test_positive(&ManagerAsync::createSignature,
-                             dbc.key("alias_prv"),
+                             dbc.alias("alias_prv"),
                              "pass1",
                              test_buffer,
                              HashAlgorithm::SHA1,
                              RSAPaddingAlgorithm::PKCS1);
 
     test_positive(&ManagerAsync::verifySignature,
-                  dbc.key("alias_pub"),
+                  dbc.alias("alias_pub"),
                   "pass2",
                   test_buffer,
                   obs->m_signed,
@@ -1193,42 +1155,49 @@ RUNNER_CHILD_TEST(TA1750_ocsp_check_positive)
                          "Verification failed. Error: " << obs->m_ocspStatus);
 }
 
-// allowAccess
+// setPermission
 RUNNER_CHILD_TEST(TA1810_allow_access_invalid_param)
 {
     switch_to_storage_user(TEST_LABEL);
 
-    test_no_observer(&ManagerAsync::allowAccess, "alias", "accessor", AccessRight::AR_READ_REMOVE);
-    test_invalid_param(&ManagerAsync::allowAccess, "", "accessor", AccessRight::AR_READ_REMOVE);
-    test_invalid_param(&ManagerAsync::allowAccess, "alias", "", AccessRight::AR_READ_REMOVE);
+    test_no_observer(&ManagerAsync::setPermission, "alias", "accessor", CKM::Permission::READ | CKM::Permission::REMOVE);
+    test_invalid_param(&ManagerAsync::setPermission, "", "accessor", CKM::Permission::READ | CKM::Permission::REMOVE);
+    test_invalid_param(&ManagerAsync::setPermission, "alias", "", CKM::Permission::READ | CKM::Permission::REMOVE);
 }
 
 RUNNER_TEST(TA1820_allow_access)
 {
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveData, dbc.data("alias"), test_buffer, Policy());
-    test_positive(&ManagerAsync::saveData, dbc.data("alias2"), test_buffer, Policy());
-    test_positive(&ManagerAsync::saveData, dbc.data("alias3"), test_buffer, Policy());
-    test_positive(&ManagerAsync::allowAccess,
-                  dbc.data("alias2"),
+    CharPtr top_label = get_label();
+    test_positive(&ManagerAsync::saveData, dbc.alias("alias"), test_buffer, Policy());
+    test_positive(&ManagerAsync::saveData, dbc.alias("alias2"), test_buffer, Policy());
+    test_positive(&ManagerAsync::saveData, dbc.alias("alias3"), test_buffer, Policy());
+    test_positive(&ManagerAsync::setPermission,
+                  dbc.alias("alias2"),
                   TEST_LABEL,
-                  AccessRight::AR_READ);
-    test_positive(&ManagerAsync::allowAccess,
-                  dbc.data("alias3"),
+                  CKM::Permission::READ);
+    test_positive(&ManagerAsync::setPermission,
+                  dbc.alias("alias3"),
                   TEST_LABEL,
-                  AccessRight::AR_READ_REMOVE);
+                  CKM::Permission::READ | CKM::Permission::REMOVE);
 
     {
         ScopedLabel label(TEST_LABEL);
 
-        test_negative(&ManagerAsync::getData, CKM_API_ERROR_ACCESS_DENIED, dbc.data("alias"), "");
-        test_negative(&ManagerAsync::removeData, CKM_API_ERROR_ACCESS_DENIED, dbc.data("alias"));
+        test_negative(&ManagerAsync::getData, CKM_API_ERROR_DB_ALIAS_UNKNOWN, dbc.alias("alias"), "");
+        test_negative(&ManagerAsync::removeAlias, CKM_API_ERROR_DB_ALIAS_UNKNOWN, dbc.alias("alias"));
+
+        // test from allowed label, but without properly addressing alias (coming from default label)
+        test_negative(&ManagerAsync::getData, CKM_API_ERROR_DB_ALIAS_UNKNOWN, dbc.alias("alias2"), "");
 
-        test_positive(&ManagerAsync::getData, dbc.data("alias2"), "");
-        test_negative(&ManagerAsync::removeData, CKM_API_ERROR_ACCESS_DENIED, dbc.data("alias2"));
+        // now test with appropriate addressing
+        std::string full_alias2_address = aliasWithLabel(top_label.get(), dbc.alias("alias2"));
+        test_positive(&ManagerAsync::getData, full_alias2_address, "");
+        test_negative(&ManagerAsync::removeAlias, CKM_API_ERROR_ACCESS_DENIED, full_alias2_address);
 
-        test_positive(&ManagerAsync::getData, dbc.data("alias3"), "");
-        test_positive(&ManagerAsync::removeData, dbc.data("alias3"));
+        std::string full_alias3_address = aliasWithLabel(top_label.get(), dbc.alias("alias3"));
+        test_positive(&ManagerAsync::getData, full_alias3_address, "");
+        test_positive(&ManagerAsync::removeAlias, full_alias3_address);
     }
 }
 
@@ -1237,26 +1206,28 @@ RUNNER_CHILD_TEST(TA1910_deny_access_invalid_param)
 {
     switch_to_storage_user(TEST_LABEL);
 
-    test_no_observer(&ManagerAsync::denyAccess, "alias", "accessor");
-    test_invalid_param(&ManagerAsync::denyAccess, "", "accessor");
-    test_invalid_param(&ManagerAsync::denyAccess, "alias", "");
+    test_no_observer(&ManagerAsync::setPermission, "alias", "accessor", CKM::Permission::NONE);
+    test_invalid_param(&ManagerAsync::setPermission, "", "accessor", CKM::Permission::NONE);
+    test_invalid_param(&ManagerAsync::setPermission, "alias", "", CKM::Permission::NONE);
 }
 
 RUNNER_TEST(TA1920_deny_access)
 {
     DBCleanup dbc;
-    test_positive(&ManagerAsync::saveData, dbc.data("alias"), test_buffer, Policy());
-    test_positive(&ManagerAsync::allowAccess,
-                  dbc.data("alias"),
+    CharPtr top_label = get_label();
+    test_positive(&ManagerAsync::saveData, dbc.alias("alias"), test_buffer, Policy());
+    test_positive(&ManagerAsync::setPermission,
+                  dbc.alias("alias"),
                   TEST_LABEL,
-                  AccessRight::AR_READ_REMOVE);
-    test_positive(&ManagerAsync::denyAccess, dbc.data("alias"), TEST_LABEL);
+                  CKM::Permission::READ | CKM::Permission::REMOVE);
+    test_positive(&ManagerAsync::setPermission, dbc.alias("alias"), TEST_LABEL, CKM::Permission::NONE);
 
     {
         ScopedLabel label(TEST_LABEL);
 
-        test_negative(&ManagerAsync::getData, CKM_API_ERROR_ACCESS_DENIED, dbc.data("alias"), "");
-        test_negative(&ManagerAsync::removeData, CKM_API_ERROR_ACCESS_DENIED, dbc.data("alias"));
+        std::string full_alias_address = aliasWithLabel(top_label.get(), dbc.alias("alias"));
+        test_negative(&ManagerAsync::getData, CKM_API_ERROR_DB_ALIAS_UNKNOWN, full_alias_address, "");
+        test_negative(&ManagerAsync::removeAlias, CKM_API_ERROR_DB_ALIAS_UNKNOWN, full_alias_address);
     }
 }
 
Domain: Security / Uncategorized;