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-pco.h

diff --git a/ccnx/ccnx-pco.h b/ccnx/ccnx-pco.h
index d75a7ea..7532630 100644
--- a/ccnx/ccnx-pco.h
+++ b/ccnx/ccnx-pco.h
@@ -31,8 +31,8 @@
 
 struct MisformedContentObjectException : virtual boost::exception, virtual std::exception { };
 
-class Key;
-typedef boost::shared_ptr<Key> KeyPtr;
+class Cert;
+typedef boost::shared_ptr<Cert> CertPtr;
 
 class ParsedContentObject
 {
@@ -43,10 +43,10 @@
     KEY,
     OTHER
   };
-  ParsedContentObject(const unsigned char *data, size_t len, bool integrityChecked = false, bool verified = false);
-  ParsedContentObject(const unsigned char *data, const ccn_parsed_ContentObject &pco, bool integrityChecked = false, bool verified = false);
-  ParsedContentObject(const Bytes &bytes, bool integrityChecked = false, bool verified = false);
-  ParsedContentObject(const ParsedContentObject &other, bool integrityChecked = false, bool verified = false);
+  ParsedContentObject(const unsigned char *data, size_t len, bool verified = false);
+  ParsedContentObject(const unsigned char *data, const ccn_parsed_ContentObject &pco, bool verified = false);
+  ParsedContentObject(const Bytes &bytes, bool verified = false);
+  ParsedContentObject(const ParsedContentObject &other, bool verified = false);
   virtual ~ParsedContentObject();
 
   Bytes
@@ -74,13 +74,7 @@
   verified() const { return m_verified; }
 
   void
-  setVerified(bool verified) { m_verified = verified; }
-
-  bool
-  integrityChecked() const { return m_integrityChecked; }
-
-  void
-  setIntegrityChecked(bool checked) { m_integrityChecked = checked; }
+  verifySignature(const CertPtr &cert);
 
   const unsigned char *
   msg() const { return head(m_bytes); }