remove JSON parameter list from challenge module and add unified return interfaces for challenge modules
Change-Id: I0e69f7f8ef2ea36f38f11815aa980928b049cdc7
diff --git a/src/challenge-module/challenge-pin.hpp b/src/challenge-module/challenge-pin.hpp
index 44db7d8..88cf9bd 100644
--- a/src/challenge-module/challenge-pin.hpp
+++ b/src/challenge-module/challenge-pin.hpp
@@ -52,26 +52,24 @@
const time::seconds& secretLifetime = time::seconds(3600));
// For CA
- void
+ std::tuple<Error, std::string>
handleChallengeRequest(const Block& params, CertificateRequest& request) override;
// For Client
- JsonSection
- getRequirementForChallenge(Status status, const std::string& challengeStatus) override;
-
- JsonSection
- genChallengeRequestJson(Status status, const std::string& challengeStatus, const JsonSection& params) override;
+ std::vector<std::tuple<std::string, std::string>>
+ getRequestedParameterList(Status status, const std::string& challengeStatus) override;
Block
- genChallengeRequestTLV(Status status, const std::string& challengeStatus, const JsonSection& params) override;
+ genChallengeRequestTLV(Status status, const std::string& challengeStatus,
+ std::vector<std::tuple<std::string, std::string>>&& params) override;
PUBLIC_WITH_TESTS_ELSE_PRIVATE:
// challenge status
static const std::string NEED_CODE;
static const std::string WRONG_CODE;
- // JSON attribute
- static const std::string JSON_PIN_CODE;
+ // parameters
+ static const std::string PARAMETER_KEY_CODE;
private:
time::seconds m_secretLifetime;