CKM: Fix tests for initial-values: T6010, T6030, T6040.

Change-Id: I0182c9e9dcdb1e3f3d4efff9b7c8c1e8349094eb

diff --git a/src/ckm/initial-values.cpp b/src/ckm/initial-values.cpp
index a940b00..535694a 100644 (file)
--- a/src/ckm/initial-values.cpp
+++ b/src/ckm/initial-values.cpp
@@ -37,45 +37,45 @@ const char* TEST_WEB_APP_1      = "web_app1";
 const char* TEST_WEB_APP_2      = "web_app2";
 
 const char *XML_1_okay                  = "XML_1_okay.xml";
-const char *XML_1_EXPECTED_KEY_1_RSA    = "/ test-key1";
-const char *XML_1_EXPECTED_KEY_1_PASSWD = "123";
-const char *XML_1_EXPECTED_KEY_2_RSA    = "/ test-key2";
+std::string XML_1_EXPECTED_KEY_1_RSA    = aliasWithLabel(ckmc_owner_id_system, "test-key1");
+std::string XML_1_EXPECTED_KEY_1_PASSWD = "123";
+std::string XML_1_EXPECTED_KEY_2_RSA    = aliasWithLabel(ckmc_owner_id_system, "test-key2");
 // uncomment when AES is supported (+ usage in the tests)
-//const char *XML_1_EXPECTED_KEY_3_AES    = "/ test-aes1";
-const char *XML_1_EXPECTED_CERT_1       = "/ test-cert1";
-const char *XML_1_EXPECTED_DATA_1       = "/ test-data1";
+//const char *XML_1_EXPECTED_KEY_3_AES    = "/System test-aes1";
+std::string XML_1_EXPECTED_CERT_1       = aliasWithLabel(ckmc_owner_id_system, "test-cert1");
+std::string XML_1_EXPECTED_DATA_1       = aliasWithLabel(ckmc_owner_id_system, "test-data1");
 const char *XML_1_EXPECTED_DATA_1_DATA  = "My secret data";
 
 const char *XML_2_okay                  = "XML_2_okay.xml";
-const char *XML_2_EXPECTED_KEY_1_RSA    = "/ test2-key1";
-const char *XML_2_EXPECTED_KEY_2_RSA    = "/ test2-key2";
+std::string XML_2_EXPECTED_KEY_1_RSA    = aliasWithLabel(ckmc_owner_id_system, "test2-key1");
+std::string XML_2_EXPECTED_KEY_2_RSA    = aliasWithLabel(ckmc_owner_id_system, "test2-key2");
 // uncomment when AES is supported
-//const char *XML_2_EXPECTED_KEY_3_AES    = "/ test2-aes1";
-const char *XML_2_EXPECTED_CERT_1       = "/ test2-cert1";
-const char *XML_2_EXPECTED_DATA_1       = "/ test2-data1";
+//const char *XML_2_EXPECTED_KEY_3_AES    = "/System test2-aes1";
+std::string XML_2_EXPECTED_CERT_1       = aliasWithLabel(ckmc_owner_id_system, "test2-cert1");
+std::string XML_2_EXPECTED_DATA_1       = aliasWithLabel(ckmc_owner_id_system, "test2-data1");
 const char *XML_2_EXPECTED_DATA_1_DATA  = "My secret data";
 
 const char *XML_3_wrong                 = "XML_3_wrong.xml";
-const char *XML_3_EXPECTED_KEY_1_RSA    = "/ test3-key1";
-const char *XML_3_EXPECTED_KEY_2_RSA    = "/ test3-key2";
+std::string XML_3_EXPECTED_KEY_1_RSA    = aliasWithLabel(ckmc_owner_id_system, "test3-key1");
+std::string XML_3_EXPECTED_KEY_2_RSA    = aliasWithLabel(ckmc_owner_id_system, "test3-key2");
 // uncomment when AES is supported
-//const char *XML_2_EXPECTED_KEY_3_AES    = "/ test3-aes1";
-const char *XML_3_EXPECTED_CERT_1       = "/ test3-cert1";
-const char *XML_3_EXPECTED_DATA_1       = "/ test3-data1";
+//const char *XML_2_EXPECTED_KEY_3_AES    = "/System test3-aes1";
+std::string XML_3_EXPECTED_CERT_1       = aliasWithLabel(ckmc_owner_id_system, "test3-cert1");
+std::string XML_3_EXPECTED_DATA_1       = aliasWithLabel(ckmc_owner_id_system, "test3-data1");
 
 void feedGarbageCollector(GarbageCollector & gc)
 {
     // [prepare]
-    gc.add(XML_1_EXPECTED_KEY_1_RSA);
-    gc.add(XML_1_EXPECTED_KEY_2_RSA);
+    gc.add(XML_1_EXPECTED_KEY_1_RSA.c_str());
+    gc.add(XML_1_EXPECTED_KEY_2_RSA.c_str());
     //gc.add(XML_1_EXPECTED_KEY_3_AES);
-    gc.add(XML_1_EXPECTED_CERT_1);
-    gc.add(XML_1_EXPECTED_DATA_1);
-    gc.add(XML_2_EXPECTED_KEY_1_RSA);
-    gc.add(XML_2_EXPECTED_KEY_2_RSA);
+    gc.add(XML_1_EXPECTED_CERT_1.c_str());
+    gc.add(XML_1_EXPECTED_DATA_1.c_str());
+    gc.add(XML_2_EXPECTED_KEY_1_RSA.c_str());
+    gc.add(XML_2_EXPECTED_KEY_2_RSA.c_str());
     //gc.add(XML_2_EXPECTED_KEY_3_AES);
-    gc.add(XML_2_EXPECTED_CERT_1);
-    gc.add(XML_2_EXPECTED_DATA_1);
+    gc.add(XML_2_EXPECTED_CERT_1.c_str());
+    gc.add(XML_2_EXPECTED_DATA_1.c_str());
 }
 
 std::string format_src_path(const char *file)
@@ -145,11 +145,11 @@ RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP)
     test_exists(format_dest_path(XML_1_okay), false);
 
     // [test1]
-    check_key(XML_1_EXPECTED_KEY_1_RSA, CKMC_ERROR_NOT_EXPORTABLE);
-    check_key_allowed(XML_1_EXPECTED_KEY_2_RSA, CKMC_KEY_RSA_PRIVATE);
+    check_key(XML_1_EXPECTED_KEY_1_RSA.c_str(), CKMC_ERROR_NOT_EXPORTABLE);
+    check_key_allowed(XML_1_EXPECTED_KEY_2_RSA.c_str(), CKMC_KEY_RSA_PRIVATE);
     //check_key_allowed(XML_1_EXPECTED_KEY_3_AES, CKMC_KEY_AES);
-    check_cert_allowed(XML_1_EXPECTED_CERT_1);
-    check_read_allowed(XML_1_EXPECTED_DATA_1, XML_1_EXPECTED_DATA_1_DATA);
+    check_cert_allowed(XML_1_EXPECTED_CERT_1.c_str());
+    check_read_allowed(XML_1_EXPECTED_DATA_1.c_str(), XML_1_EXPECTED_DATA_1_DATA);
 
     // [test2]
     {
@@ -158,11 +158,11 @@ RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP)
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
         ScopedDBUnlock unlock(USER_APP, APP_PASS);
 
-        check_key(XML_1_EXPECTED_KEY_1_RSA, CKMC_ERROR_NOT_EXPORTABLE);
-        check_key_not_visible(XML_1_EXPECTED_KEY_2_RSA);
+        check_key(XML_1_EXPECTED_KEY_1_RSA.c_str(), CKMC_ERROR_NOT_EXPORTABLE);
+        check_key_not_visible(XML_1_EXPECTED_KEY_2_RSA.c_str());
         // check_key_allowed(XML_1_EXPECTED_KEY_3_AES, CKMC_KEY_AES);
-        check_cert_not_visible(XML_1_EXPECTED_CERT_1);
-        check_read_allowed(XML_1_EXPECTED_DATA_1, XML_1_EXPECTED_DATA_1_DATA);
+        check_cert_not_visible(XML_1_EXPECTED_CERT_1.c_str());
+        check_read_allowed(XML_1_EXPECTED_DATA_1.c_str(), XML_1_EXPECTED_DATA_1_DATA);
     }
 
     // [test3]
@@ -172,11 +172,11 @@ RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP)
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
         ScopedDBUnlock unlock(USER_APP, APP_PASS);
 
-        check_key_not_visible(XML_1_EXPECTED_KEY_1_RSA);
-        check_key_allowed(XML_1_EXPECTED_KEY_2_RSA, CKMC_KEY_RSA_PRIVATE);
+        check_key_not_visible(XML_1_EXPECTED_KEY_1_RSA.c_str());
+        check_key_allowed(XML_1_EXPECTED_KEY_2_RSA.c_str(), CKMC_KEY_RSA_PRIVATE);
         // check_key_allowed(XML_1_EXPECTED_KEY_3_AES, CKMC_KEY_AES);
-        check_cert_allowed(XML_1_EXPECTED_CERT_1);
-        check_read_allowed(XML_1_EXPECTED_DATA_1, XML_1_EXPECTED_DATA_1_DATA);
+        check_cert_allowed(XML_1_EXPECTED_CERT_1.c_str());
+        check_read_allowed(XML_1_EXPECTED_DATA_1.c_str(), XML_1_EXPECTED_DATA_1_DATA);
     }
 }
 
@@ -208,16 +208,16 @@ RUNNER_TEST(T6020_PARSE_TWO_XML_FILES_AT_STARTUP)
     test_exists(format_dest_path(XML_2_okay), false);
 
     // [test1]
-    check_key(XML_1_EXPECTED_KEY_1_RSA, CKMC_ERROR_NOT_EXPORTABLE);
-    check_key(XML_2_EXPECTED_KEY_1_RSA, CKMC_ERROR_NOT_EXPORTABLE);
-    check_key_allowed(XML_1_EXPECTED_KEY_2_RSA, CKMC_KEY_RSA_PRIVATE);
-    check_key_allowed(XML_2_EXPECTED_KEY_2_RSA, CKMC_KEY_RSA_PRIVATE);
+    check_key(XML_1_EXPECTED_KEY_1_RSA.c_str(), CKMC_ERROR_NOT_EXPORTABLE);
+    check_key(XML_2_EXPECTED_KEY_1_RSA.c_str(), CKMC_ERROR_NOT_EXPORTABLE);
+    check_key_allowed(XML_1_EXPECTED_KEY_2_RSA.c_str(), CKMC_KEY_RSA_PRIVATE);
+    check_key_allowed(XML_2_EXPECTED_KEY_2_RSA.c_str(), CKMC_KEY_RSA_PRIVATE);
     //check_key_allowed(XML_1_EXPECTED_KEY_3_AES, CKMC_KEY_AES);
     //check_key_allowed(XML_2_EXPECTED_KEY_3_AES, CKMC_KEY_AES);
-    check_cert_allowed(XML_1_EXPECTED_CERT_1);
-    check_cert_allowed(XML_2_EXPECTED_CERT_1);
-    check_read_allowed(XML_1_EXPECTED_DATA_1, XML_1_EXPECTED_DATA_1_DATA);
-    check_read_allowed(XML_2_EXPECTED_DATA_1, XML_2_EXPECTED_DATA_1_DATA);
+    check_cert_allowed(XML_1_EXPECTED_CERT_1.c_str());
+    check_cert_allowed(XML_2_EXPECTED_CERT_1.c_str());
+    check_read_allowed(XML_1_EXPECTED_DATA_1.c_str(), XML_1_EXPECTED_DATA_1_DATA);
+    check_read_allowed(XML_2_EXPECTED_DATA_1.c_str(), XML_2_EXPECTED_DATA_1_DATA);
 }
 
 RUNNER_TEST(T6030_PARSE_FAIL_XML_AT_STARTUP)
@@ -242,11 +242,11 @@ RUNNER_TEST(T6030_PARSE_FAIL_XML_AT_STARTUP)
     test_exists(format_dest_path(XML_3_wrong), false);
 
     // [test1]
-    check_key_not_visible(XML_3_EXPECTED_KEY_1_RSA);
-    check_key_not_visible(XML_3_EXPECTED_KEY_2_RSA);
+    check_key_not_visible(XML_3_EXPECTED_KEY_1_RSA.c_str());
+    check_key_not_visible(XML_3_EXPECTED_KEY_2_RSA.c_str());
     //check_key_not_visible(XML_3_EXPECTED_KEY_3_AES);
-    check_cert_not_visible(XML_3_EXPECTED_CERT_1);
-    check_read_not_visible(XML_3_EXPECTED_DATA_1);
+    check_cert_not_visible(XML_3_EXPECTED_CERT_1.c_str());
+    check_read_not_visible(XML_3_EXPECTED_DATA_1.c_str());
 }
 
 RUNNER_TEST(T6040_CHECK_KEYS_VALID)
@@ -273,7 +273,7 @@ RUNNER_TEST(T6040_CHECK_KEYS_VALID)
     int temp;
     RUNNER_ASSERT_MSG(
             CKMC_ERROR_NONE == (temp = ckmc_create_signature(
-                    XML_1_EXPECTED_KEY_2_RSA,
+                    XML_1_EXPECTED_KEY_2_RSA.c_str(),
                     NULL,
                     msg_buff,
                     hash_algo,
@@ -284,7 +284,7 @@ RUNNER_TEST(T6040_CHECK_KEYS_VALID)
     // invalid password
     RUNNER_ASSERT_MSG(
             CKMC_ERROR_AUTHENTICATION_FAILED == (temp = ckmc_verify_signature(
-                        XML_1_EXPECTED_KEY_1_RSA,
+                        XML_1_EXPECTED_KEY_1_RSA.c_str(),
                         NULL,
                         msg_buff,
                         *signature,
@@ -295,8 +295,8 @@ RUNNER_TEST(T6040_CHECK_KEYS_VALID)
     // correct password
     RUNNER_ASSERT_MSG(
             CKMC_ERROR_NONE == (temp = ckmc_verify_signature(
-                    XML_1_EXPECTED_KEY_1_RSA,
-                    XML_1_EXPECTED_KEY_1_PASSWD,
+                    XML_1_EXPECTED_KEY_1_RSA.c_str(),
+                    XML_1_EXPECTED_KEY_1_PASSWD.c_str(),
                     msg_buff,
                     *signature,
                     hash_algo,