commit 222810b36edcb12353217bf1adac62feb8ab770e
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Fri Oct 16 21:50:35 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Fri Oct 16 21:50:35 2020 -0700
tree 162dca4a901e3389454f3aae859271bb4786ec78
parent 5c05945a32ca636e2f68a818c7a573b6782380c7

update crypto helper

Change-Id: I59718964ce305888a8fc3947cde68c937a3ba64a

src/requester.cpp

diff --git a/src/requester.cpp b/src/requester.cpp
index 4368700..1e503d5 100644
--- a/src/requester.cpp
+++ b/src/requester.cpp
@@ -224,7 +224,7 @@
 }
 
 shared_ptr<Interest>
-Requester::genChallengeInterest(const RequesterState& state,
+Requester::genChallengeInterest(RequesterState& state,
                                 std::vector<std::tuple<std::string, std::string>>&& parameters)
 {
   if (state.m_challengeType == "") {
@@ -245,7 +245,9 @@
   // encrypt the Interest parameters
   auto paramBlock = encodeBlockWithAesGcm128(ndn::tlv::ApplicationParameters, state.m_aesKey,
                                              challengeParams.value(), challengeParams.value_size(),
-                                             (const uint8_t*)"test", strlen("test"));
+                                             (const uint8_t*)state.m_requestId.c_str(),
+                                             state.m_requestId.size(),
+                                             state.m_aesBlockCounter);
   interest->setApplicationParameters(paramBlock);
   state.m_keyChain.sign(*interest, signingByKey(state.m_keyPair.getName()));
   return interest;
@@ -259,7 +261,9 @@
     NDN_THROW(std::runtime_error("Cannot verify replied Data packet signature."));
   }
   processIfError(reply);
-  auto result = decodeBlockWithAesGcm128(reply.getContent(), state.m_aesKey, (const uint8_t*)"test", strlen("test"));
+  auto result = decodeBlockWithAesGcm128(reply.getContent(), state.m_aesKey,
+                                         (const uint8_t*)state.m_requestId.c_str(),
+                                         state.m_requestId.size());
   Block contentTLV = makeBinaryBlock(tlv::EncryptedPayload, result.data(), result.size());
   ChallengeEncoder::decodeDataContent(contentTLV, state);
 }