Revocation: fixes and combine with New

Change-Id: I68bc117d1ae35d7dc4c754c76bf88003ebc637b5
diff --git a/src/client-module.hpp b/src/client-module.hpp
index f6d706f..eefccad 100644
--- a/src/client-module.hpp
+++ b/src/client-module.hpp
@@ -97,6 +97,15 @@
   onNewResponse(const Data& reply);
 
   shared_ptr<Interest>
+  generateRevokeInterest(const security::v2::Certificate& certificate);
+
+  std::list<std::string>
+  onRevokeResponse(const Data& reply);
+
+  std::list<std::string>
+  onRequestInitResponse(const Data& reply, int requestType);
+
+  shared_ptr<Interest>
   generateChallengeInterest(const Block& paramTLV);
 
   void
@@ -108,12 +117,6 @@
   shared_ptr<Interest>
   generateCertFetchInterest();
 
-  shared_ptr<Interest>
-  generateRevokeInterest(const security::v2::Certificate& certificate);
-
-  std::list<std::string>
-  onRevokeResponse(const Data& reply);
-
   void
   onCertFetchResponse(const Data& reply);