commit 35020caedf296346332155e22eae447b7785b873
author Junxiao Shi <git@mail1.yoursunny.com> Wed Jul 01 16:46:51 2015 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Wed Jul 01 16:46:51 2015 -0700
tree 914e76966f24af49d7006bade2e1e8b9ce07fb7a
parent 2d6954c574e6bfa00cdede84694df18974e18679

management: deprecate CommandOptions signing params

refs #2893

Change-Id: I07e53094cf598015456b666e1d0991b45452c900

src/management/nfd-command-options.cpp

diff --git a/src/management/nfd-command-options.cpp b/src/management/nfd-command-options.cpp
index 97a1be8..72326c9 100644
--- a/src/management/nfd-command-options.cpp
+++ b/src/management/nfd-command-options.cpp
@@ -108,8 +108,8 @@
   return *this;
 }
 
-CommandOptions&
-CommandOptions::setSigningCertificate(const Name& certificateName)
+static security::SigningInfo
+makeSigningInfoFromIdentityCertificate(const Name& certificateName)
 {
   // A valid IdentityCertificate has at least 4 name components,
   // as it follows `<...>/KEY/<...>/<key-id>/ID-CERT/<version>` naming model.
@@ -117,14 +117,21 @@
     throw std::invalid_argument("certificate is invalid");
   }
 
-  m_signingInfo = security::signingByCertificate(certificateName);
+  return security::signingByCertificate(certificateName);
+}
+
+CommandOptions&
+CommandOptions::setSigningCertificate(const Name& certificateName)
+{
+  m_signingInfo = makeSigningInfoFromIdentityCertificate(certificateName);
   return *this;
 }
 
 CommandOptions&
 CommandOptions::setSigningCertificate(const IdentityCertificate& certificate)
 {
-  return this->setSigningCertificate(certificate.getName());
+  m_signingInfo = makeSigningInfoFromIdentityCertificate(certificate.getName());
+  return *this;
 }
 
 #endif // NDN_MANAGEMENT_NFD_COMMAND_OPTIONS_KEEP_DEPRECATED_SIGNING_PARAMS