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

diff --git a/ccnx/ccnx-cert.h b/ccnx/ccnx-cert.h
index c0e2b74..d2399e6 100644
--- a/ccnx/ccnx-cert.h
+++ b/ccnx/ccnx-cert.h
@@ -43,6 +43,7 @@
 
   Cert();
   Cert(const PcoPtr &keyObject, const PcoPtr &metaObject);
+  ~Cert();
 
   void
   updateMeta(const PcoPtr &metaObject);
@@ -51,10 +52,10 @@
   name() { return m_name; }
 
   Bytes
-  raw() { return m_raw; }
+  rawKeyBytes() { return m_rawKeyBytes; }
 
   Hash
-  keyDigest() { return m_hash; }
+  keyDigest() { return m_keyHash; }
 
   std::string
   realworldID() { return m_meta.realworldID; }
@@ -62,6 +63,9 @@
   std::string
   affilication() { return m_meta.affiliation; }
 
+  ccn_pkey *
+  pkey() { return m_pkey; }
+
   VALIDITY
   validity();
 
@@ -82,8 +86,9 @@
   };
 
   Name m_name;
-  Hash m_hash; // publisherPublicKeyHash
-  Bytes m_raw;
+  Hash m_keyHash; // publisherPublicKeyHash
+  Bytes m_rawKeyBytes;
+  ccn_pkey *m_pkey;
   Meta m_meta;
 };