commit 70fe25837375216fc26a097cad945f3cb29c8f3c
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Fri May 19 15:01:03 2017 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon May 22 10:22:58 2017 -0700
tree bc8e18f8f40a568d30781fc73ae296ee39b350f4
parent a63b7379e0d8e2ded9531895bc8c7ab9fc7f9f66

Change the logic in credential challenge: credential cert can under different prefix

Change-Id: Ieab9d5e111c84da8ad7896b9fac8f28887da9f2d

src/challenge-module/challenge-credential.hpp

diff --git a/src/challenge-module/challenge-credential.hpp b/src/challenge-module/challenge-credential.hpp
index 07f4b88..a617f18 100644
--- a/src/challenge-module/challenge-credential.hpp
+++ b/src/challenge-module/challenge-credential.hpp
@@ -32,6 +32,10 @@
  * could proof his/her possession of an existing certificate from other certificate, th
  * requester could finish the challenge.
  *
+ * The requester needs to provide the proof of the possession of a certificate issued by
+ * a trust anchor. The challenge require the requester to pass the BASE64 certificate and
+ * a BASE64 self-signed certificate whose key is the same as the key in certificate.
+ *
  * The main process of this challenge module is:
  *   1. Requester provides a certificate signed by that trusted certificate as credential.
  *   2. The challenge module will verify the signature of the credential.
@@ -42,7 +46,7 @@
 class ChallengeCredential : public ChallengeModule
 {
 public:
-  ChallengeCredential(const std::string& configPath = "challenge-credential.conf");
+  ChallengeCredential(const std::string& configPath = "");
 
 PUBLIC_WITH_TESTS_ELSE_PROTECTED:
   JsonSection
@@ -72,7 +76,8 @@
 PUBLIC_WITH_TESTS_ELSE_PRIVATE:
   static const std::string FAILURE_INVALID_CREDENTIAL;
   static const std::string FAILURE_INVALID_FORMAT;
-  static const std::string JSON_CREDENTIAL;
+  static const std::string JSON_CREDENTIAL_CERT;
+  static const std::string JSON_CREDENTIAL_SELF;
 
 PUBLIC_WITH_TESTS_ELSE_PRIVATE:
   std::list<security::v2::Certificate> m_trustAnchors;