commit 6f1a2abb7cb8cbf0daf30bf272c27515e91a015a
author Davide Pesavento <davidepesa@gmail.com> Thu Mar 17 03:57:21 2022 -0400
committer Davide Pesavento <davidepesa@gmail.com> Thu Mar 17 03:57:21 2022 -0400
tree 947036e64157ce9c40c0992d3a4d72dd5eafe17e
parent ca23bb00b5c1dbca7ebf6c0fa9e6851a7acec8a4

Avoid deprecated ndn-cxx functions

Change-Id: Idcef8a642affb276581397e869d19534ec776240

src/requester-request.cpp

diff --git a/src/requester-request.cpp b/src/requester-request.cpp
index 60442c1..4e6d654 100644
--- a/src/requester-request.cpp
+++ b/src/requester-request.cpp
@@ -140,7 +140,7 @@
   Certificate certRequest;
   certRequest.setName(Name(keyName).append("cert-request").appendVersion());
   certRequest.setContentType(ndn::tlv::ContentType_Key);
-  certRequest.setContent(m_keyPair.getPublicKey().data(), m_keyPair.getPublicKey().size());
+  certRequest.setContent(m_keyPair.getPublicKey());
   SignatureInfo signatureInfo;
   signatureInfo.setValidityPeriod(ndn::security::ValidityPeriod(notBefore, notAfter));
   m_keyChain.sign(certRequest, signingByKey(keyName).setSignatureInfo(signatureInfo));
@@ -213,7 +213,7 @@
 std::shared_ptr<Interest>
 Request::genChallengeInterest(std::multimap<std::string, std::string>&& parameters)
 {
-  if (m_challengeType == "") {
+  if (m_challengeType.empty()) {
     NDN_THROW(std::runtime_error("The challenge has not been selected."));
   }
   auto challenge = ChallengeModule::createChallengeModule(m_challengeType);
@@ -223,7 +223,7 @@
   auto challengeParams = challenge->genChallengeRequestTLV(m_status, m_challengeStatus, std::move(parameters));
 
   Name interestName = m_caProfile.caPrefix;
-  interestName.append("CA").append("CHALLENGE").append(m_requestId.data(), m_requestId.size());
+  interestName.append("CA").append("CHALLENGE").append(Name::Component(m_requestId));
   auto interest = std::make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);