Revert "[UTC][key-manager][Non-ACR] Fix ckmc_deny_access_n3 test"

This reverts commit fb6c0488d47fe4c512aedaf98645f54d71f05afc.

This change should be effective since Tizen 4.0.

Change-Id: I172354a0fc577bc3cf91479388fe931a4ad7fb1a

diff --git a/src/utc/key-manager/tct-key-manager-core_common_iot.h b/src/utc/key-manager/tct-key-manager-core_common_iot.h
index df9b06b394a1253bc60ece938c50efc9ed466a4c..44eaea9fb30d9a656464abd6c7491f32f2e0d22a 100755 (executable)
--- a/src/utc/key-manager/tct-key-manager-core_common_iot.h
+++ b/src/utc/key-manager/tct-key-manager-core_common_iot.h
@@ -97,9 +97,9 @@ extern int utc_ckmc_allow_access_n(void);
 extern int utc_ckmc_allow_access_n2(void);
 extern int utc_ckmc_deny_access_p(void);
 extern int utc_ckmc_deny_access_p2(void);
-extern int utc_ckmc_deny_access_p3(void);
 extern int utc_ckmc_allow_deny_n(void);
 extern int utc_ckmc_allow_deny_n2(void);
+extern int utc_ckmc_deny_access_n3(void);
 extern int utc_ckmc_alias_new_p(void);
 extern int utc_ckmc_alias_new_n(void);
 extern int utc_ckmc_alias_new_n2(void);
@@ -230,9 +230,9 @@ testcase tc_array[] = {
     {"utc_ckmc_allow_access_n2", utc_ckmc_allow_access_n2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_deny_access_p", utc_ckmc_deny_access_p, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_deny_access_p2", utc_ckmc_deny_access_p2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
-    {"utc_ckmc_deny_access_p3", utc_ckmc_deny_access_p3, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_allow_deny_n", utc_ckmc_allow_deny_n, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_allow_deny_n2", utc_ckmc_allow_deny_n2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
+    {"utc_ckmc_deny_access_n3", utc_ckmc_deny_access_n3, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_alias_new_p", utc_ckmc_alias_new_p, utc_key_manager_type_startup, utc_key_manager_type_cleanup},
     {"utc_ckmc_alias_new_n", utc_ckmc_alias_new_n, utc_key_manager_type_startup, utc_key_manager_type_cleanup},
     {"utc_ckmc_alias_new_n2", utc_ckmc_alias_new_n2, utc_key_manager_type_startup, utc_key_manager_type_cleanup},

diff --git a/src/utc/key-manager/tct-key-manager-core_mobile.h b/src/utc/key-manager/tct-key-manager-core_mobile.h
index df9b06b394a1253bc60ece938c50efc9ed466a4c..44eaea9fb30d9a656464abd6c7491f32f2e0d22a 100755 (executable)
--- a/src/utc/key-manager/tct-key-manager-core_mobile.h
+++ b/src/utc/key-manager/tct-key-manager-core_mobile.h
@@ -97,9 +97,9 @@ extern int utc_ckmc_allow_access_n(void);
 extern int utc_ckmc_allow_access_n2(void);
 extern int utc_ckmc_deny_access_p(void);
 extern int utc_ckmc_deny_access_p2(void);
-extern int utc_ckmc_deny_access_p3(void);
 extern int utc_ckmc_allow_deny_n(void);
 extern int utc_ckmc_allow_deny_n2(void);
+extern int utc_ckmc_deny_access_n3(void);
 extern int utc_ckmc_alias_new_p(void);
 extern int utc_ckmc_alias_new_n(void);
 extern int utc_ckmc_alias_new_n2(void);
@@ -230,9 +230,9 @@ testcase tc_array[] = {
     {"utc_ckmc_allow_access_n2", utc_ckmc_allow_access_n2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_deny_access_p", utc_ckmc_deny_access_p, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_deny_access_p2", utc_ckmc_deny_access_p2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
-    {"utc_ckmc_deny_access_p3", utc_ckmc_deny_access_p3, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_allow_deny_n", utc_ckmc_allow_deny_n, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_allow_deny_n2", utc_ckmc_allow_deny_n2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
+    {"utc_ckmc_deny_access_n3", utc_ckmc_deny_access_n3, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_alias_new_p", utc_ckmc_alias_new_p, utc_key_manager_type_startup, utc_key_manager_type_cleanup},
     {"utc_ckmc_alias_new_n", utc_ckmc_alias_new_n, utc_key_manager_type_startup, utc_key_manager_type_cleanup},
     {"utc_ckmc_alias_new_n2", utc_ckmc_alias_new_n2, utc_key_manager_type_startup, utc_key_manager_type_cleanup},

diff --git a/src/utc/key-manager/tct-key-manager-core_tv.h b/src/utc/key-manager/tct-key-manager-core_tv.h
index df9b06b394a1253bc60ece938c50efc9ed466a4c..44eaea9fb30d9a656464abd6c7491f32f2e0d22a 100755 (executable)
--- a/src/utc/key-manager/tct-key-manager-core_tv.h
+++ b/src/utc/key-manager/tct-key-manager-core_tv.h
@@ -97,9 +97,9 @@ extern int utc_ckmc_allow_access_n(void);
 extern int utc_ckmc_allow_access_n2(void);
 extern int utc_ckmc_deny_access_p(void);
 extern int utc_ckmc_deny_access_p2(void);
-extern int utc_ckmc_deny_access_p3(void);
 extern int utc_ckmc_allow_deny_n(void);
 extern int utc_ckmc_allow_deny_n2(void);
+extern int utc_ckmc_deny_access_n3(void);
 extern int utc_ckmc_alias_new_p(void);
 extern int utc_ckmc_alias_new_n(void);
 extern int utc_ckmc_alias_new_n2(void);
@@ -230,9 +230,9 @@ testcase tc_array[] = {
     {"utc_ckmc_allow_access_n2", utc_ckmc_allow_access_n2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_deny_access_p", utc_ckmc_deny_access_p, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_deny_access_p2", utc_ckmc_deny_access_p2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
-    {"utc_ckmc_deny_access_p3", utc_ckmc_deny_access_p3, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_allow_deny_n", utc_ckmc_allow_deny_n, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_allow_deny_n2", utc_ckmc_allow_deny_n2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
+    {"utc_ckmc_deny_access_n3", utc_ckmc_deny_access_n3, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_alias_new_p", utc_ckmc_alias_new_p, utc_key_manager_type_startup, utc_key_manager_type_cleanup},
     {"utc_ckmc_alias_new_n", utc_ckmc_alias_new_n, utc_key_manager_type_startup, utc_key_manager_type_cleanup},
     {"utc_ckmc_alias_new_n2", utc_ckmc_alias_new_n2, utc_key_manager_type_startup, utc_key_manager_type_cleanup},

diff --git a/src/utc/key-manager/tct-key-manager-core_wearable.h b/src/utc/key-manager/tct-key-manager-core_wearable.h
index df9b06b394a1253bc60ece938c50efc9ed466a4c..44eaea9fb30d9a656464abd6c7491f32f2e0d22a 100755 (executable)
--- a/src/utc/key-manager/tct-key-manager-core_wearable.h
+++ b/src/utc/key-manager/tct-key-manager-core_wearable.h
@@ -97,9 +97,9 @@ extern int utc_ckmc_allow_access_n(void);
 extern int utc_ckmc_allow_access_n2(void);
 extern int utc_ckmc_deny_access_p(void);
 extern int utc_ckmc_deny_access_p2(void);
-extern int utc_ckmc_deny_access_p3(void);
 extern int utc_ckmc_allow_deny_n(void);
 extern int utc_ckmc_allow_deny_n2(void);
+extern int utc_ckmc_deny_access_n3(void);
 extern int utc_ckmc_alias_new_p(void);
 extern int utc_ckmc_alias_new_n(void);
 extern int utc_ckmc_alias_new_n2(void);
@@ -230,9 +230,9 @@ testcase tc_array[] = {
     {"utc_ckmc_allow_access_n2", utc_ckmc_allow_access_n2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_deny_access_p", utc_ckmc_deny_access_p, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_deny_access_p2", utc_ckmc_deny_access_p2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
-    {"utc_ckmc_deny_access_p3", utc_ckmc_deny_access_p3, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_allow_deny_n", utc_ckmc_allow_deny_n, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_allow_deny_n2", utc_ckmc_allow_deny_n2, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
+    {"utc_ckmc_deny_access_n3", utc_ckmc_deny_access_n3, utc_key_manager_store_startup, utc_key_manager_store_cleanup},
     {"utc_ckmc_alias_new_p", utc_ckmc_alias_new_p, utc_key_manager_type_startup, utc_key_manager_type_cleanup},
     {"utc_ckmc_alias_new_n", utc_ckmc_alias_new_n, utc_key_manager_type_startup, utc_key_manager_type_cleanup},
     {"utc_ckmc_alias_new_n2", utc_ckmc_alias_new_n2, utc_key_manager_type_startup, utc_key_manager_type_cleanup},

diff --git a/src/utc/key-manager/utc-key-manager-storage.c b/src/utc/key-manager/utc-key-manager-storage.c
index 929a86a342d6d61b1f1fbbfbe7b061b52b573c9d..f7a2fc67df6704a1e944bc350168e878b2730383 100755 (executable)
--- a/src/utc/key-manager/utc-key-manager-storage.c
+++ b/src/utc/key-manager/utc-key-manager-storage.c
@@ -1503,43 +1503,6 @@ int utc_ckmc_deny_access_p2(void)
     return 0;
 }
 
-/**
- * @testcase        utc_ckmc_deny_access_p3
- * @since_tizen     3.0
- * @description     Check if we can remove access which was not granted
- * @scenario        Store a data
-                    Try to deny access on it without allowing access.
- */
-int utc_ckmc_deny_access_p3(void)
-{
-    int temp;
-    const char *alias = "deny_access_p3";
-    const char *accessor = "deny_access_p3_to";
-
-    // for saving data to share
-    char *policy_password = NULL;
-    char *bin_data = "My bin data";
-    ckmc_raw_buffer_s test_data;
-    ckmc_policy_s test_policy;
-
-    test_data.data = (unsigned char *) bin_data;
-    test_data.size = strlen(bin_data);
-    test_policy.password = policy_password;
-    test_policy.extractable = true;
-
-    temp = ckmc_save_data(alias, test_data, test_policy);
-    assert_eq(temp, CKMC_ERROR_NONE);
-
-    temp = ckmc_deny_access(alias, accessor);
-    assert_eq(temp, CKMC_ERROR_NONE);
-
-    temp = ckmc_remove_alias(alias);
-    assert_eq(temp, CKMC_ERROR_NONE);
-
-    return 0;
-}
-
-
 /**
  * @testcase        utc_ckmc_allow_deny_n
  * @since_tizen     2.3
@@ -1596,3 +1559,39 @@ int utc_ckmc_allow_deny_n2(void)
 
     return 0;
 }
+
+/**
+ * @testcase        utc_ckmc_deny_access_n3
+ * @since_tizen     2.3
+ * @description     Check an error in denying access
+ * @scenario        Store a data
+                    Try to deny access on it without allowing access.
+ */
+int utc_ckmc_deny_access_n3(void)
+{
+    int temp;
+    const char *alias = "deny_access_n3";
+    const char *accessor = "deny_access_n3_to";
+
+    // for saving data to share
+    char *policy_password = NULL;
+    char *bin_data = "My bin data";
+    ckmc_raw_buffer_s test_data;
+    ckmc_policy_s test_policy;
+
+    test_data.data = (unsigned char *) bin_data;
+    test_data.size = strlen(bin_data);
+    test_policy.password = policy_password;
+    test_policy.extractable = true;
+
+    temp = ckmc_save_data(alias, test_data, test_policy);
+    assert_eq(temp, CKMC_ERROR_NONE);
+
+    temp = ckmc_deny_access(alias, accessor);
+    assert_eq(temp, CKMC_ERROR_INVALID_PARAMETER);
+
+    temp = ckmc_remove_alias(alias);
+    assert_eq(temp, CKMC_ERROR_NONE);
+
+    return 0;
+}