security: Reorganizing source code to prepare for support of two version of NDN certificates
This commit also removes unused ndn_digestSha256 function and deprecates
crypto::sha256 in favor of crypto::computeSha256Digest in util/crypto.hpp.
Change-Id: I24ee50ff073a96b868633bdf2cfade412d3605f3
Refs: #3098
diff --git a/tools/ndnsec/util.hpp b/tools/ndnsec/util.hpp
index 253f170..696d348 100644
--- a/tools/ndnsec/util.hpp
+++ b/tools/ndnsec/util.hpp
@@ -37,9 +37,6 @@
#include <boost/asio.hpp>
#include <boost/exception/all.hpp>
-
-#include "security/cryptopp.hpp"
-
#include "security/key-chain.hpp"
#include "util/io.hpp"
@@ -84,14 +81,14 @@
#endif // NDN_CXX_HAVE_GETPASS
}
-ndn::shared_ptr<ndn::IdentityCertificate>
+ndn::shared_ptr<ndn::security::v1::IdentityCertificate>
getIdentityCertificate(const std::string& fileName)
{
if (fileName == "-")
- return ndn::io::load<ndn::IdentityCertificate>(std::cin);
+ return ndn::io::load<ndn::security::v1::IdentityCertificate>(std::cin);
else
- return ndn::io::load<ndn::IdentityCertificate>(fileName);
+ return ndn::io::load<ndn::security::v1::IdentityCertificate>(fileName);
}