Merge branch 'ckm' into tizen

[platform/core/test/security-tests.git] / src / ckm / unprivileged / capi-certificate-chains.cpp

diff --git a/src/ckm/unprivileged/capi-certificate-chains.cpp b/src/ckm/unprivileged/capi-certificate-chains.cpp
index 0c6dd75..a9d22b7 100644 (file)
--- a/src/ckm/unprivileged/capi-certificate-chains.cpp
+++ b/src/ckm/unprivileged/capi-certificate-chains.cpp
@@ -319,7 +319,7 @@ RUNNER_TEST(TCCH_0010_get_chain_old_api)
     ChainVerifierOld cv;
     cv.verifyNegative(TestData::THIRD_PARTY_LEAF);
 
-    cv.addUntrusted(TestData::THIRD_PARTY_IM_CA2);
+    cv.addUntrusted(TestData::THIRD_PARTY_IM_CA);
     cv.verifyPositive(TestData::THIRD_PARTY_LEAF, 3); // including system cert
     cv.verifyNegative(TestData::TEST_LEAF);
 }
@@ -330,7 +330,7 @@ RUNNER_TEST(TCCH_0020_get_chain_old_api_system_only)
     remove_user_data(APP_UID);
 
     ChainVerifierOld cv;
-    cv.verifyPositive(TestData::THIRD_PARTY_IM_CA2, 2); // including system cert
+    cv.verifyPositive(TestData::THIRD_PARTY_IM_CA, 2); // including system cert
 }
 
 // check invalid arguments
@@ -338,8 +338,8 @@ RUNNER_TEST(TCCH_0100_get_certificate_chain_invalid_param)
 {
     remove_user_data(APP_UID);
 
-    ckmc_cert_s* ca2 = create_cert(TestData::THIRD_PARTY_IM_CA2);
-    ckmc_cert_s* ca1 = create_cert(TestData::THIRD_PARTY_IM_CA1);
+    ckmc_cert_s* ca2 = create_cert(TestData::THIRD_PARTY_LEAF);
+    ckmc_cert_s* ca1 = create_cert(TestData::THIRD_PARTY_IM_CA);
     ckmc_cert_list_s* chain = NULL;
 
     // cert
@@ -375,7 +375,7 @@ RUNNER_TEST(TCCH_0120_get_certificate_chain_root_ca_negative)
     cv.enableSystem(false);
     cv.verifyNegative(TestData::THIRD_PARTY_ROOT_CA);
 
-    cv.addUntrusted(TestData::THIRD_PARTY_IM_CA2);
+    cv.addUntrusted(TestData::THIRD_PARTY_IM_CA);
     cv.verifyNegative(TestData::THIRD_PARTY_LEAF);
 }
 
@@ -402,7 +402,7 @@ RUNNER_TEST(TCCH_0150_get_certificate_chain_system_only)
     remove_user_data(APP_UID);
 
     ChainVerifier cv;
-    cv.verifyPositive(TestData::THIRD_PARTY_IM_CA2, 2); // including system cert
+    cv.verifyPositive(TestData::THIRD_PARTY_IM_CA, 2); // including system cert
     cv.verifyNegative(TestData::THIRD_PARTY_LEAF);
 }
 
@@ -416,7 +416,7 @@ RUNNER_TEST(TCCH_0160_get_certificate_chain_no_untrusted)
     ChainVerifier cv;
     cv.addTrusted(TestData::TEST_ROOT_CA);
     cv.verifyPositive(TestData::TEST_IM_CA, 2); // signed by trusted cert (TEST_ROOT_CA)
-    cv.verifyPositive(TestData::THIRD_PARTY_IM_CA2, 2); // signed by system cert (THIRD_PARTY_ROOT_CA)
+    cv.verifyPositive(TestData::THIRD_PARTY_IM_CA, 2); // signed by system cert (THIRD_PARTY_ROOT_CA)
     cv.verifyNegative(TestData::THIRD_PARTY_LEAF);
 }
 
@@ -425,7 +425,7 @@ RUNNER_TEST(TCCH_0170_get_certificate_chain_no_trusted)
     remove_user_data(APP_UID);
 
     ChainVerifier cv;
-    cv.addUntrusted(TestData::THIRD_PARTY_IM_CA2);
+    cv.addUntrusted(TestData::THIRD_PARTY_IM_CA);
     cv.verifyPositive(TestData::THIRD_PARTY_LEAF, 3); // including system cert
     cv.verifyNegative(TestData::TEST_LEAF);
 }
@@ -467,14 +467,9 @@ RUNNER_TEST(TCCH_0200_get_certificate_chain_all)
     ChainVerifier cv;
     cv.enableSystem(true);
     cv.addTrusted(TestData::TEST_ROOT_CA);
-    cv.addUntrusted(TestData::THIRD_PARTY_IM_CA1);
-    cv.addUntrusted(TestData::THIRD_PARTY_IM_CA2);
-    /*
-     * In combat conditions this may as well be 3. Because of 2 existing GeoTrust certificates with
-     * same Subject and Public key one being root ca and the other not there are 2 possible chains
-     * of trust for this certificate.
-     */
-    cv.verifyPositive(TestData::THIRD_PARTY_LEAF, 4);
+    cv.addUntrusted(TestData::THIRD_PARTY_IM_CA);
+
+    cv.verifyPositive(TestData::THIRD_PARTY_LEAF, 3);
     cv.verifyNegative(TestData::TEST_LEAF);
 }