commit 1b101b3067f91988835dc68f604d6a4f32cf50dc
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Feb 17 14:36:03 2021 -0800
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Feb 17 14:36:03 2021 -0800
tree 065fb02a782f7f8053a82a9124330348fad41372
parent 3f1c7cf7804e22c81272e44d4866be263f8875b6

add RestartSec in systemd file, remove status field from NEW packets

Change-Id: Ia4e6831af565ad19d9b0a778ea9fb5ae1ec652c5

src/detail/new-renew-revoke-encoder.cpp

diff --git a/src/detail/new-renew-revoke-encoder.cpp b/src/detail/new-renew-revoke-encoder.cpp
index 84313e7..5ad3859 100644
--- a/src/detail/new-renew-revoke-encoder.cpp
+++ b/src/detail/new-renew-revoke-encoder.cpp
@@ -27,10 +27,11 @@
 namespace ndncert {
 
 Block
-requesttlv::encodeApplicationParameters(RequestType requestType, const std::vector<uint8_t>& ecdhPub,
-                                                   const security::Certificate& certRequest)
+requesttlv::encodeApplicationParameters(RequestType requestType, const std::vector <uint8_t>& ecdhPub,
+                                        const security::Certificate& certRequest)
 {
-  Block request(ndn::tlv::ApplicationParameters);
+  Block
+  request(ndn::tlv::ApplicationParameters);
   request.push_back(makeBinaryBlock(tlv::EcdhPub, ecdhPub.data(), ecdhPub.size()));
   if (requestType == RequestType::NEW || requestType == RequestType::RENEW) {
     request.push_back(makeNestedBlock(tlv::CertRequest, certRequest));
@@ -44,8 +45,8 @@
 
 void
 requesttlv::decodeApplicationParameters(const Block& payload, RequestType requestType,
-                                                   std::vector<uint8_t>& ecdhPub,
-                                                   shared_ptr<security::Certificate>& clientCert)
+                                        std::vector <uint8_t>& ecdhPub,
+                                        shared_ptr <security::Certificate>& clientCert)
 {
   payload.parse();
 
@@ -63,19 +64,18 @@
   requestPayload.parse();
 
   security::Certificate cert = security::Certificate(requestPayload.get(ndn::tlv::Data));
-  clientCert =std::make_shared<security::Certificate>(cert);
+  clientCert = std::make_shared<security::Certificate>(cert);
 }
 
 Block
-requesttlv::encodeDataContent(const std::vector<uint8_t>& ecdhKey, const std::array<uint8_t, 32>& salt,
-                                         const RequestId& requestId, const Status& status,
-                                         const std::vector<std::string>& challenges)
+requesttlv::encodeDataContent(const std::vector <uint8_t>& ecdhKey, const std::array<uint8_t, 32>& salt,
+                              const RequestId& requestId,
+                              const std::vector <std::string>& challenges)
 {
   Block response(ndn::tlv::Content);
   response.push_back(makeBinaryBlock(tlv::EcdhPub, ecdhKey.data(), ecdhKey.size()));
   response.push_back(makeBinaryBlock(tlv::Salt, salt.data(), salt.size()));
   response.push_back(makeBinaryBlock(tlv::RequestId, requestId.data(), requestId.size()));
-  response.push_back(makeNonNegativeIntegerBlock(tlv::Status, static_cast<size_t>(status)));
   for (const auto& entry: challenges) {
     response.push_back(makeStringBlock(tlv::Challenge, entry));
   }
@@ -83,12 +83,11 @@
   return response;
 }
 
-std::list<std::string>
-requesttlv::decodeDataContent(const Block& content, std::vector<uint8_t>& ecdhKey,
-                                         std::array<uint8_t, 32>& salt, RequestId& requestId, Status& status)
+std::list <std::string>
+requesttlv::decodeDataContent(const Block& content, std::vector <uint8_t>& ecdhKey,
+                              std::array<uint8_t, 32>& salt, RequestId& requestId)
 {
   content.parse();
-  status = statusFromBlock(content.get(tlv::Status));
 
   const auto& ecdhBlock = content.get(tlv::EcdhPub);
   ecdhKey.resize(ecdhBlock.value_size());
@@ -100,7 +99,7 @@
   const auto& requestIdBlock = content.get(tlv::RequestId);
   std::memcpy(requestId.data(), requestIdBlock.value(), requestIdBlock.value_size());
 
-  std::list<std::string> challenges;
+  std::list <std::string> challenges;
   for (auto const& element : content.elements()) {
     if (element.type() == tlv::Challenge) {
       challenges.push_back(readString(element));

src/detail/new-renew-revoke-encoder.hpp

diff --git a/src/detail/new-renew-revoke-encoder.hpp b/src/detail/new-renew-revoke-encoder.hpp
index 2b8e0e2..25a9989 100644
--- a/src/detail/new-renew-revoke-encoder.hpp
+++ b/src/detail/new-renew-revoke-encoder.hpp
@@ -37,12 +37,12 @@
 
 Block
 encodeDataContent(const std::vector<uint8_t>& ecdhKey, const std::array<uint8_t, 32>& salt,
-                  const RequestId& requestId, const Status& status,
+                  const RequestId& requestId,
                   const std::vector<std::string>& challenges);
 
 std::list<std::string>
 decodeDataContent(const Block& content, std::vector<uint8_t>& ecdhKey,
-                  std::array<uint8_t, 32>& salt, RequestId& requestId, Status& status);
+                  std::array<uint8_t, 32>& salt, RequestId& requestId);
 
 } // namespace requesttlv
 } // namespace ndncert