commit 70fe25837375216fc26a097cad945f3cb29c8f3c
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Fri May 19 15:01:03 2017 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon May 22 10:22:58 2017 -0700
tree bc8e18f8f40a568d30781fc73ae296ee39b350f4
parent a63b7379e0d8e2ded9531895bc8c7ab9fc7f9f66

Change the logic in credential challenge: credential cert can under different prefix

Change-Id: Ieab9d5e111c84da8ad7896b9fac8f28887da9f2d

tests/unit-tests/challenge-credential.t.cpp

diff --git a/tests/unit-tests/challenge-credential.t.cpp b/tests/unit-tests/challenge-credential.t.cpp
index 8a0cfe5..772c57f 100644
--- a/tests/unit-tests/challenge-credential.t.cpp
+++ b/tests/unit-tests/challenge-credential.t.cpp
@@ -32,8 +32,9 @@
 BOOST_AUTO_TEST_CASE(LoadConfig)
 {
   ChallengeCredential challenge("./tests/unit-tests/challenge-credential.conf.test");
-  BOOST_CHECK_EQUAL(challenge.CHALLENGE_TYPE, "CREDENTIAL");
+  BOOST_CHECK_EQUAL(challenge.CHALLENGE_TYPE, "Credential");
 
+  challenge.parseConfigFile();
   BOOST_CHECK_EQUAL(challenge.m_trustAnchors.size(), 1);
   auto cert = challenge.m_trustAnchors.front();
   BOOST_CHECK_EQUAL(cert.getName(),
@@ -44,23 +45,29 @@
 {
   // create trust anchor
   ChallengeCredential challenge("./tests/unit-tests/challenge-credential.conf.test");
-  auto identity0 = addIdentity(Name("/trust"));
-  auto key0 = identity0.getDefaultKey();
-  auto trustAnchor = key0.getDefaultCertificate();
+  auto identity = addIdentity(Name("/trust"));
+  auto key = identity.getDefaultKey();
+  auto trustAnchor = key.getDefaultCertificate();
+  challenge.parseConfigFile();
   challenge.m_trustAnchors.front() = trustAnchor;
 
   // create certificate request
-  auto identity = addIdentity(Name("/example"));
-  auto key = identity.getDefaultKey();
-  auto cert = key.getDefaultCertificate();
-  CertificateRequest request(Name("/example"), "123", cert);
+  auto identityA = addIdentity(Name("/example"));
+  auto keyA = identityA.getDefaultKey();
+  auto certA = key.getDefaultCertificate();
+  CertificateRequest request(Name("/example"), "123", certA);
+
+  // create requester's existing cert
+  auto identityB = addIdentity(Name("/trust/cert"));
+  auto keyB = identityB.getDefaultKey();
+  auto certB = key.getDefaultCertificate();
 
   // using trust anchor to sign cert request to get credential
-  Name credentialName = cert.getKeyName();
+  Name credentialName = certB.getKeyName();
   credentialName.append("Credential").appendVersion();
-  security::v2::Certificate credential = cert;
+  security::v2::Certificate credential = certB;
   credential.setName(credentialName);
-  credential.setContent(cert.getContent());
+  credential.setContent(certB.getContent());
   m_keyChain.sign(credential, signingByCertificate(trustAnchor));
 
   // generate SELECT interest
@@ -71,15 +78,20 @@
   ss.str("");
   ss.clear();
 
-  io::save<security::v2::Certificate>(credential, ss);
   std::list<std::string> paramList;
-  std::string jsonString = ss.str();
-  paramList.push_back(jsonString);
-  JsonSection credentialJson = challenge.genSelectParamsJson(ChallengeModule::WAIT_SELECTION, paramList);
-  BOOST_CHECK_EQUAL(credentialJson.get<std::string>(ChallengeCredential::JSON_CREDENTIAL), jsonString);
+  io::save<security::v2::Certificate>(credential, ss);
+  std::string paramString = ss.str();
+  paramList.push_back(paramString);
   ss.str("");
   ss.clear();
 
+  io::save<security::v2::Certificate>(certB, ss);
+  paramString = ss.str();
+  paramList.push_back(paramString);
+  ss.str("");
+  ss.clear();
+  JsonSection credentialJson = challenge.genSelectParamsJson(ChallengeModule::WAIT_SELECTION, paramList);
+
   boost::property_tree::write_json(ss, credentialJson);
   Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());