commons clean up
Change-Id: I13ce15666974e294d2645768dd20194f0584d406
diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index 821372b..5481b2b 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -357,11 +357,11 @@
"No parameters are found after decryption."));
return;
}
- Block paramTLV = makeBinaryBlock(tlv_encrypted_payload, paramTLVPayload.data(), paramTLVPayload.size());
+ Block paramTLV = makeBinaryBlock(tlv::EncryptedPayload, paramTLVPayload.data(), paramTLVPayload.size());
paramTLV.parse();
// load the corresponding challenge module
- std::string challengeType = readString(paramTLV.get(tlv_selected_challenge));
+ std::string challengeType = readString(paramTLV.get(tlv::SelectedChallenge));
auto challenge = ChallengeModule::createChallengeModule(challengeType);
if (challenge == nullptr) {
NDN_LOG_TRACE("Unrecognized challenge type: " << challengeType);
@@ -389,7 +389,7 @@
payload = CHALLENGE::encodeDataContent(requestState);
payload.parse();
- payload.push_back(makeNestedBlock(tlv_issued_cert_name, issuedCert.getName()));
+ payload.push_back(makeNestedBlock(tlv::IssuedCertName, issuedCert.getName()));
payload.encode();
NDN_LOG_TRACE("Challenge succeeded. Certificate has been issued: " << issuedCert.getName());
}