commit d5d99bed9e2ee7d2a6c4e5625bfbe14dfa07c151
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Mar 13 19:15:56 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 15 13:30:11 2013 -0700
tree 6c00f26d3910ac1c826e4d974b8bc779f82de0c0
parent 746d444c4997d8df31c0fb996c8acc832617c324

ccnx: Correct way of verification, no longer rely on ccnx checking

Change-Id: I10c7fb51bc9bcabb906749a0d5122dfa1fc57970

ccnx/ccnx-wrapper.cpp

diff --git a/ccnx/ccnx-wrapper.cpp b/ccnx/ccnx-wrapper.cpp
index e318f19..8a21d18 100644
--- a/ccnx/ccnx-wrapper.cpp
+++ b/ccnx/ccnx-wrapper.cpp
@@ -473,8 +473,6 @@
   tuple<Closure *, ExecutorPtr, Selectors> *realData = reinterpret_cast< tuple<Closure*, ExecutorPtr, Selectors>* > (selfp->data);
   tie (cp, executor, selectors) = *realData;
 
-  bool checked = false;
-
   switch (kind)
     {
     case CCN_UPCALL_FINAL:  // effecitve in unit tests
@@ -486,10 +484,15 @@
       return CCN_UPCALL_RESULT_OK;
 
     case CCN_UPCALL_CONTENT:
-      checked = true;
       _LOG_TRACE (">> incomingData content upcall: " << Name (info->content_ccnb, info->content_comps));
       break;
 
+    // this is the case where the intentionally unsigned packets coming (in Encapsulation case)
+    case CCN_UPCALL_CONTENT_BAD:
+      _LOG_TRACE (">> incomingData content bad upcall: " << Name (info->content_ccnb, info->content_comps));
+      break;
+
+    // always ask ccnd to try to fetch the key
     case CCN_UPCALL_CONTENT_UNVERIFIED:
       _LOG_TRACE (">> incomingData content unverified upcall: " << Name (info->content_ccnb, info->content_comps));
       break;
@@ -513,7 +516,7 @@
       return CCN_UPCALL_RESULT_OK;
     }
 
-  PcoPtr pco = make_shared<ParsedContentObject> (info->content_ccnb, info->pco->offset[CCN_PCO_E], checked);
+  PcoPtr pco = make_shared<ParsedContentObject> (info->content_ccnb, info->pco->offset[CCN_PCO_E]);
 
   // this will be run in executor
   executor->execute (bind (&Closure::runDataCallback, cp, pco->name (), pco));
@@ -702,17 +705,9 @@
 }
 
 bool
-CcnxWrapper::checkPcoIntegrity(PcoPtr &pco)
+CcnxWrapper::verifyKey(PcoPtr &pco, double maxWait)
 {
-  bool checked = (ccn_verify_content(m_handle, pco->msg(), (ccn_parsed_ContentObject *)pco->pco()) == 0);
-  pco->setIntegrityChecked(checked);
-  return checked;
-}
-
-bool
-CcnxWrapper::verifyKey(PcoPtr &pco)
-{
-  return m_verifier->verify(pco);
+  return m_verifier->verify(pco, maxWait);
 }
 
 // This is needed just for get function implementation