commit e07e33961cb9b236bf5bd5e05220bdde4d43b9fa
author Yingdi Yu <yuyingdi@gmail.com> Tue Jan 28 10:29:27 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jan 29 14:28:45 2014 -0800
tree 9be327d5a17be149f5c467a2a3b3c5aa9c7c1d6b
parent 90566ddbb42517fb96c018129f67a0cdf0d80b0d

security: Enabling SignedInterest processing in SecPolicy and Verifier.

refs: #1161

Change-Id: I701ad619299e8e5aae03658b5ce2d3e7fed179cd

src/security/verifier.hpp

diff --git a/src/security/verifier.hpp b/src/security/verifier.hpp
index 2dbd995..07c1494 100644
--- a/src/security/verifier.hpp
+++ b/src/security/verifier.hpp
@@ -11,12 +11,24 @@
 
 #include "../data.hpp"
 #include "../face.hpp"
-#include "sec-policy.hpp"
 #include "validation-request.hpp"
 #include "public-key.hpp"
 #include "signature-sha256-with-rsa.hpp"
 
 namespace ndn {
+
+class SecPolicy;
+
+/**
+ * An OnVerified function object is used to pass a callback to verifyData to report a successful verification.
+ */
+typedef func_lib::function<void()> OnVerified;
+
+/**
+ * An OnVerifyFailed function object is used to pass a callback to verifyData to report a failed verification.
+ */
+typedef func_lib::function<void()> OnVerifyFailed;
+
   
 /**
  * Verifier is one of the main classes of the security librar .
@@ -36,7 +48,7 @@
    * Setting face is necessary for verifier operation that involve fetching data.
    */
   void
-  setFace(const ptr_lib::shared_ptr<Face> &face) { face_ = face; }
+  setFace(const ptr_lib::shared_ptr<Face> &face) { m_face = face; }
   
   /**
    * @brief Get the policy.
@@ -45,10 +57,10 @@
   inline SecPolicy&
   policy()
   {
-    if (!policy_)
+    if (static_cast<bool>(m_policy))
       throw Error("policy is not assigned to the KeyChain");
 
-    return *policy_;
+    return *m_policy;
   }
 
 
@@ -61,8 +73,12 @@
    * @param onVerifyFailed If the signature check fails, this calls onVerifyFailed(data).
    */
   void
-  verifyData
-    (const ptr_lib::shared_ptr<Data>& data, const OnVerified& onVerified, const OnVerifyFailed& onVerifyFailed, int stepCount = 0);
+  verify
+  (const ptr_lib::shared_ptr<const Data> &data, const OnVerified &onVerified, const OnVerifyFailed &onVerifyFailed, int stepCount = 0);
+
+  void
+  verify
+  (const ptr_lib::shared_ptr<const Interest> &Interest, const OnVerified &onVerified, const OnVerifyFailed &onVerifyFailed, int stepCount = 0);
 
   /*****************************************
    *      verifySignature method set       *
@@ -89,12 +105,11 @@
   
   void
   onCertificateInterestTimeout
-    (const ptr_lib::shared_ptr<const Interest> &interest, int retry, const OnVerifyFailed& onVerifyFailed, 
-     const ptr_lib::shared_ptr<Data> &data, ptr_lib::shared_ptr<ValidationRequest> nextStep);
+    (const ptr_lib::shared_ptr<const Interest> &interest, int retry, const OnVerifyFailed& onVerifyFailed, ptr_lib::shared_ptr<ValidationRequest> nextStep);
 
 private:
-  ptr_lib::shared_ptr<SecPolicy>     policy_;
-  ptr_lib::shared_ptr<Face>        face_;
+  ptr_lib::shared_ptr<SecPolicy>         m_policy;
+  ptr_lib::shared_ptr<Face>              m_face;
 };
 
 }