rebaes to the new master branch from named-data/ndncert
Change-Id: I4d40daa5d1047a02fe814c464c73f06666c73bc7
diff --git a/src/ca-detail/ca-memory.cpp b/src/ca-detail/ca-memory.cpp
index 67fd57b..437afa4 100644
--- a/src/ca-detail/ca-memory.cpp
+++ b/src/ca-detail/ca-memory.cpp
@@ -20,7 +20,7 @@
#include "ca-memory.hpp"
-#include <ndn-cxx/security/validation-policy.hpp>
+#include <ndn-cxx/security/v2/validation-policy.hpp>
namespace ndn {
namespace ndncert {
@@ -105,7 +105,7 @@
}
// certificate related
-security::Certificate
+security::v2::Certificate
CaMemory::getCertificate(const std::string& certId)
{
auto search = m_issuedCerts.find(certId);
@@ -116,7 +116,7 @@
}
void
-CaMemory::addCertificate(const std::string& certId, const security::Certificate& cert)
+CaMemory::addCertificate(const std::string& certId, const security::v2::Certificate& cert)
{
auto search = m_issuedCerts.find(certId);
if (search == m_issuedCerts.end()) {
@@ -128,7 +128,7 @@
}
void
-CaMemory::updateCertificate(const std::string& certId, const security::Certificate& cert)
+CaMemory::updateCertificate(const std::string& certId, const security::v2::Certificate& cert)
{
m_issuedCerts[certId] = cert;
}
@@ -142,23 +142,23 @@
}
}
-std::list<security::Certificate>
+std::list<security::v2::Certificate>
CaMemory::listAllIssuedCertificates()
{
- std::list<security::Certificate> result;
+ std::list<security::v2::Certificate> result;
for (const auto& entry : m_issuedCerts) {
result.push_back(entry.second);
}
return result;
}
-std::list<security::Certificate>
+std::list<security::v2::Certificate>
CaMemory::listAllIssuedCertificates(const Name& caName)
{
- std::list<security::Certificate> result;
+ std::list<security::v2::Certificate> result;
for (const auto& entry : m_issuedCerts) {
- const auto& klName = entry.second.getSignatureInfo().getKeyLocator().getName();
- if (security::extractIdentityNameFromKeyLocator(klName) == caName) {
+ const auto& klName = entry.second.getSignature().getKeyLocator().getName();
+ if (security::v2::extractIdentityFromKeyName(klName) == caName) {
result.push_back(entry.second);
}
}
diff --git a/src/ca-detail/ca-memory.hpp b/src/ca-detail/ca-memory.hpp
index fb61218..859c726 100644
--- a/src/ca-detail/ca-memory.hpp
+++ b/src/ca-detail/ca-memory.hpp
@@ -52,27 +52,27 @@
listAllRequests(const Name& caName) override;
// certificate related
- security::Certificate
+ security::v2::Certificate
getCertificate(const std::string& certId) override;
void
- addCertificate(const std::string& certId, const security::Certificate& cert) override;
+ addCertificate(const std::string& certId, const security::v2::Certificate& cert) override;
void
- updateCertificate(const std::string& certId, const security::Certificate& cert) override;
+ updateCertificate(const std::string& certId, const security::v2::Certificate& cert) override;
void
deleteCertificate(const std::string& certId) override;
- std::list<security::Certificate>
+ std::list<security::v2::Certificate>
listAllIssuedCertificates() override;
- std::list<security::Certificate>
+ std::list<security::v2::Certificate>
listAllIssuedCertificates(const Name& caName) override;
private:
std::map<std::string, CertificateRequest> m_requests;
- std::map<std::string, security::Certificate> m_issuedCerts;
+ std::map<std::string, security::v2::Certificate> m_issuedCerts;
};
} // namespace ndncert
diff --git a/src/ca-detail/ca-sqlite.cpp b/src/ca-detail/ca-sqlite.cpp
index dec5146..baaf771 100644
--- a/src/ca-detail/ca-sqlite.cpp
+++ b/src/ca-detail/ca-sqlite.cpp
@@ -20,7 +20,7 @@
#include "ca-sqlite.hpp"
-#include <ndn-cxx/security/validation-policy.hpp>
+#include <ndn-cxx/security/v2/validation-policy.hpp>
#include <ndn-cxx/util/sqlite3-statement.hpp>
#include <sqlite3.h>
@@ -125,7 +125,7 @@
Name caName(statement.getBlock(2));
int status = statement.getInt(3);
std::string challengeStatus = statement.getString(4);
- security::Certificate cert(statement.getBlock(6));
+ security::v2::Certificate cert(statement.getBlock(6));
std::string challengeType = statement.getString(7);
std::string challengeSecrets = statement.getString(8);
std::string challengeTp = statement.getString(9);
@@ -250,7 +250,7 @@
Name caName(statement.getBlock(2));
int status = statement.getInt(3);
std::string challengeStatus = statement.getString(4);
- security::Certificate cert(statement.getBlock(6));
+ security::v2::Certificate cert(statement.getBlock(6));
std::string challengeType = statement.getString(7);
std::string challengeSecrets = statement.getString(8);
std::string challengeTp = statement.getString(9);
@@ -277,7 +277,7 @@
Name caName(statement.getBlock(2));
int status = statement.getInt(3);
std::string challengeStatus = statement.getString(4);
- security::Certificate cert(statement.getBlock(6));
+ security::v2::Certificate cert(statement.getBlock(6));
std::string challengeType = statement.getString(7);
std::string challengeSecrets = statement.getString(8);
std::string challengeTp = statement.getString(9);
@@ -300,7 +300,7 @@
statement.step();
}
-security::Certificate
+security::v2::Certificate
CaSqlite::getCertificate(const std::string& certId)
{
Sqlite3Statement statement(m_database,
@@ -308,7 +308,7 @@
statement.bind(1, certId, SQLITE_TRANSIENT);
if (statement.step() == SQLITE_ROW) {
- return security::Certificate(statement.getBlock(0));
+ return security::v2::Certificate(statement.getBlock(0));
}
else {
BOOST_THROW_EXCEPTION(Error("Certificate with ID " + certId + " cannot be fetched from database"));
@@ -316,7 +316,7 @@
}
void
-CaSqlite::addCertificate(const std::string& certId, const security::Certificate& cert)
+CaSqlite::addCertificate(const std::string& certId, const security::v2::Certificate& cert)
{
Sqlite3Statement statement(m_database,
R"_SQLTEXT_(INSERT INTO IssuedCerts (cert_id, cert_key_name, cert)
@@ -331,7 +331,7 @@
}
void
-CaSqlite::updateCertificate(const std::string& certId, const security::Certificate& cert)
+CaSqlite::updateCertificate(const std::string& certId, const security::v2::Certificate& cert)
{
Sqlite3Statement statement(m_database,
R"_SQLTEXT_(UPDATE IssuedCerts SET cert = ? WHERE cert_id = ?)_SQLTEXT_");
@@ -352,10 +352,10 @@
statement.step();
}
-std::list<security::Certificate>
+std::list<security::v2::Certificate>
CaSqlite::listAllIssuedCertificates()
{
- std::list<security::Certificate> result;
+ std::list<security::v2::Certificate> result;
Sqlite3Statement statement(m_database, R"_SQLTEXT_(SELECT * FROM IssuedCerts)_SQLTEXT_");
while (statement.step() == SQLITE_ROW) {
@@ -364,14 +364,14 @@
return result;
}
-std::list<security::Certificate>
+std::list<security::v2::Certificate>
CaSqlite::listAllIssuedCertificates(const Name& caName)
{
auto allCerts = listAllIssuedCertificates();
- std::list<security::Certificate> result;
+ std::list<security::v2::Certificate> result;
for (const auto& entry : allCerts) {
- const auto& klName = entry.getSignatureInfo().getKeyLocator().getName();
- if (security::extractIdentityNameFromKeyLocator(klName) == caName) {
+ const auto& klName = entry.getSignature().getKeyLocator().getName();
+ if (security::v2::extractIdentityFromKeyName(klName) == caName) {
result.push_back(entry);
}
}
diff --git a/src/ca-detail/ca-sqlite.hpp b/src/ca-detail/ca-sqlite.hpp
index 9b09e1a..f0039f8 100644
--- a/src/ca-detail/ca-sqlite.hpp
+++ b/src/ca-detail/ca-sqlite.hpp
@@ -60,22 +60,22 @@
listAllRequests(const Name& caName) override;
// certificate related
- security::Certificate
+ security::v2::Certificate
getCertificate(const std::string& certId) override;
void
- addCertificate(const std::string& certId, const security::Certificate& cert) override;
+ addCertificate(const std::string& certId, const security::v2::Certificate& cert) override;
void
- updateCertificate(const std::string& certId, const security::Certificate& cert) override;
+ updateCertificate(const std::string& certId, const security::v2::Certificate& cert) override;
void
deleteCertificate(const std::string& certId) override;
- std::list<security::Certificate>
+ std::list<security::v2::Certificate>
listAllIssuedCertificates() override;
- std::list<security::Certificate>
+ std::list<security::v2::Certificate>
listAllIssuedCertificates(const Name& caName) override;
PUBLIC_WITH_TESTS_ELSE_PRIVATE: