commit fe4733a1608712e389fe10b329a9fd61575ad075
author Yingdi Yu <yuyingdi@gmail.com> Thu Oct 22 14:24:12 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 09 13:20:52 2017 -0800
tree 86384a4e1a9aea4afd374487c579d8b53ead3478
parent c95f5647783476101b721e833ce58deaf3378882

security: Add new v2::KeyChain

Change-Id: I5fdf51ecd96b50db2a7cbf730c6e8b1d9fbe09e9
Refs: #2926

src/security/signing-info.cpp

diff --git a/src/security/signing-info.cpp b/src/security/signing-info.cpp
index f8a7892..48b278a 100644
--- a/src/security/signing-info.cpp
+++ b/src/security/signing-info.cpp
@@ -20,13 +20,30 @@
  */
 
 #include "signing-info.hpp"
-#include "key-chain.hpp"
 
 namespace ndn {
 namespace security {
 
-const Name SigningInfo::EMPTY_NAME;
-const SignatureInfo SigningInfo::EMPTY_SIGNATURE_INFO;
+const Name&
+SigningInfo::getEmptyName()
+{
+  static Name emptyName;
+  return emptyName;
+}
+
+const SignatureInfo&
+SigningInfo::getEmptySignatureInfo()
+{
+  static SignatureInfo emptySignatureInfo;
+  return emptySignatureInfo;
+}
+
+const Name&
+SigningInfo::getDigestSha256Identity()
+{
+  static Name digestSha256Identity("/localhost/identity/digest-sha256");
+  return digestSha256Identity;
+}
 
 SigningInfo::SigningInfo(SignerType signerType,
                          const Name& signerName,
@@ -56,7 +73,7 @@
   std::string nameArg = signingStr.substr(pos + 1);
 
   if (scheme == "id") {
-    if (nameArg == KeyChain::DIGEST_SHA256_IDENTITY.toUri()) {
+    if (nameArg == getDigestSha256Identity().toUri()) {
       setSha256Signing();
     }
     else {
@@ -129,7 +146,7 @@
       os << "cert:";
       break;
     case SigningInfo::SIGNER_TYPE_SHA256:
-      os << "id:" << KeyChain::DIGEST_SHA256_IDENTITY;
+      os << "id:" << SigningInfo::getDigestSha256Identity();
       return os;
     default:
       BOOST_THROW_EXCEPTION(std::invalid_argument("Unknown signer type"));