commit fa0b6a02e3967ebadc4f1445e7374a68c09379b8
author Yingdi Yu <yuyingdi@gmail.com> Wed Apr 30 14:26:42 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri May 09 15:16:12 2014 -0700
tree 065b692368cdc5c01b31a937c8755f348ec30062
parent c13830ba3907dd9f0ea878fcf535609104619c29

build: == Dependency change ==  ChronoChat now depends on ndn-cxx library

Change-Id: I25d1abe8035c34a7d34cba53960e3456d6677fdc

src/endorse-certificate.cpp

diff --git a/src/endorse-certificate.cpp b/src/endorse-certificate.cpp
index b5c94ad..faa0972 100644
--- a/src/endorse-certificate.cpp
+++ b/src/endorse-certificate.cpp
@@ -12,7 +12,6 @@
 #include "endorse-extension.pb.h"
 #include <boost/iostreams/stream.hpp>
 
-
 using namespace ndn;
 
 namespace chronos{
@@ -24,7 +23,7 @@
 
 Chronos::EndorseExtensionMsg&
 operator << (Chronos::EndorseExtensionMsg& endorseExtension, const std::vector<std::string>& endorseList)
-{ 
+{
   std::vector<std::string>::const_iterator it = endorseList.begin();
   for(; it != endorseList.end(); it++)
     endorseExtension.add_endorseentry()->set_name(*it);
@@ -58,7 +57,7 @@
   setNotBefore(kskCertificate.getNotBefore());
   setNotAfter(kskCertificate.getNotAfter());
   addSubjectDescription(CertificateSubjectDescription("2.5.4.41", m_keyName.toUri()));
-  setPublicKeyInfo(kskCertificate.getPublicKeyInfo());  
+  setPublicKeyInfo(kskCertificate.getPublicKeyInfo());
 
   OBufferStream profileStream;
   m_profile.encode(profileStream);
@@ -69,7 +68,7 @@
   endorseExtension << m_endorseList;
   endorseExtension.SerializeToOstream(&endorseStream);
   addExtension(CertificateExtension(ENDORSE_EXT_OID, true, *endorseStream.buf()));
-  
+
   encode();
 }
 
@@ -85,7 +84,7 @@
   Name dataName = m_keyName;
   dataName.append("PROFILE-CERT").append(m_signer.wireEncode()).appendVersion();
   setName(dataName);
-  
+
   setNotBefore(endorseCertificate.getNotBefore());
   setNotAfter(endorseCertificate.getNotAfter());
   addSubjectDescription(CertificateSubjectDescription("2.5.4.41", m_keyName.toUri()));
@@ -120,7 +119,7 @@
   Name dataName = m_keyName;
   dataName.append("PROFILE-CERT").append(m_signer.wireEncode()).appendVersion();
   setName(dataName);
-  
+
   setNotBefore(notBefore);
   setNotAfter(notAfter);
   addSubjectDescription(CertificateSubjectDescription("2.5.4.41", m_keyName.toUri()));
@@ -136,7 +135,7 @@
   endorseExtension.SerializeToOstream(&endorseStream);
   addExtension(CertificateExtension(ENDORSE_EXT_OID, true, *endorseStream.buf()));
 
-  encode();  
+  encode();
 }
 
 EndorseCertificate::EndorseCertificate(const EndorseCertificate& endorseCertificate)
@@ -153,17 +152,17 @@
   const Name& dataName = data.getName();
 
   if(dataName.size() < 3 || dataName.get(-3).toEscapedString() != "PROFILE-CERT")
-    throw Error("No PROFILE-CERT component in data name!");    
+    throw Error("No PROFILE-CERT component in data name!");
 
   m_keyName = dataName.getPrefix(-3);
   m_signer.wireDecode(dataName.get(-2).blockFromValue());
 
-  ExtensionList::iterator it = extensionList_.begin();
-  for(; it != extensionList_.end(); it++)
+  ExtensionList::iterator it = m_extensionList.begin();
+  for(; it != m_extensionList.end(); it++)
     {
       if(PROFILE_EXT_OID == it->getOid())
 	{
-          boost::iostreams::stream<boost::iostreams::array_source> is 
+          boost::iostreams::stream<boost::iostreams::array_source> is
             (reinterpret_cast<const char*>(it->getValue().buf()), it->getValue().size());
 	  m_profile.decode(is);
 	}
@@ -171,8 +170,8 @@
         {
           Chronos::EndorseExtensionMsg endorseExtension;
 
-          boost::iostreams::stream<boost::iostreams::array_source> is 
-            (reinterpret_cast<const char*>(it->getValue().buf()), it->getValue().size());          
+          boost::iostreams::stream<boost::iostreams::array_source> is
+            (reinterpret_cast<const char*>(it->getValue().buf()), it->getValue().size());
           endorseExtension.ParseFromIstream(&is);
 
           endorseExtension >> m_endorseList;