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.cpp

diff --git a/ccnx/ccnx-cert.cpp b/ccnx/ccnx-cert.cpp
index e202c65..fc83c66 100644
--- a/ccnx/ccnx-cert.cpp
+++ b/ccnx/ccnx-cert.cpp
@@ -30,19 +30,31 @@
 namespace Ccnx {
 
 Cert::Cert()
-    : m_meta("", "",  0, 0)
+    : m_pkey(0)
+    , m_meta("", "",  0, 0)
 {
 }
 
 Cert::Cert(const PcoPtr &keyObject, const PcoPtr &metaObject = PcoPtr())
-    : m_meta("", "", 0, 0)
+    : m_pkey(0)
+    , m_meta("", "", 0, 0)
 {
   m_name = keyObject->name();
-  m_raw = keyObject->content();
-  m_hash = *(Hash::FromBytes(m_raw));
+  m_rawKeyBytes = keyObject->content();
+  m_keyHash = *(Hash::FromBytes(m_rawKeyBytes));
+  m_pkey = ccn_d2i_pubkey(head(m_rawKeyBytes), m_rawKeyBytes.size());
   updateMeta(metaObject);
 }
 
+Cert::~Cert()
+{
+  if (m_pkey != 0)
+  {
+    ccn_pubkey_free(m_pkey);
+    m_pkey = 0;
+  }
+}
+
 void
 Cert::updateMeta(const PcoPtr &metaObject)
 {
@@ -85,7 +97,7 @@
     }
     else
     {
-      _LOG_ERROR("Cannot parse meta info:" << std::string(head(xml), xml.size()));
+      _LOG_ERROR("Cannot parse meta info:" << std::string((const char *)head(xml), xml.size()));
     }
   }
 }