Adjust includes for the updated locations of ndn-cxx security headers
Change-Id: Id1e44e929541fdd1132a4b3e6366404232351e68
diff --git a/src/daemon/name-server.cpp b/src/daemon/name-server.cpp
index 3e0c2b6..c1d3bfa 100644
--- a/src/daemon/name-server.cpp
+++ b/src/daemon/name-server.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2018, Regents of the University of California.
+ * Copyright (c) 2014-2020, Regents of the University of California.
*
* This file is part of NDNS (Named Data Networking Domain Name Service).
* See AUTHORS.md for complete list of NDNS authors and contributors.
@@ -30,7 +30,7 @@
const time::milliseconds NAME_SERVER_DEFAULT_CONTENT_FRESHNESS(4000);
NameServer::NameServer(const Name& zoneName, const Name& certName, Face& face, DbMgr& dbMgr,
- KeyChain& keyChain, security::v2::Validator& validator)
+ KeyChain& keyChain, security::Validator& validator)
: m_zone(zoneName)
, m_dbMgr(dbMgr)
, m_ndnsPrefix(zoneName)
@@ -133,7 +133,7 @@
}
m_validator.validate(*data,
bind(&NameServer::doUpdate, this, interest.shared_from_this(), data),
- [] (const Data& data, const security::v2::ValidationError& msg) {
+ [] (const Data& data, const security::ValidationError& msg) {
NDNS_LOG_WARN("Ignoring update that did not pass the verification. "
<< "Check the root certificate");
});
diff --git a/src/daemon/name-server.hpp b/src/daemon/name-server.hpp
index d54a71b..fd820e5 100644
--- a/src/daemon/name-server.hpp
+++ b/src/daemon/name-server.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2017, Regents of the University of California.
+ * Copyright (c) 2014-2020, Regents of the University of California.
*
* This file is part of NDNS (Named Data Networking Domain Name Service).
* See AUTHORS.md for complete list of NDNS authors and contributors.
@@ -53,7 +53,7 @@
public:
explicit
NameServer(const Name& zoneName, const Name& certName, Face& face, DbMgr& dbMgr,
- KeyChain& keyChain, security::v2::Validator& validator);
+ KeyChain& keyChain, security::Validator& validator);
NDNS_PUBLIC_WITH_TESTS_ELSE_PRIVATE:
void
@@ -117,7 +117,7 @@
Face& m_face;
KeyChain& m_keyChain;
- security::v2::Validator& m_validator;
+ security::Validator& m_validator;
};
} // namespace ndns
diff --git a/src/daemon/rrset-factory.cpp b/src/daemon/rrset-factory.cpp
index 710a513..029e3b0 100644
--- a/src/daemon/rrset-factory.cpp
+++ b/src/daemon/rrset-factory.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2018, Regents of the University of California.
+ * Copyright (c) 2014-2020, Regents of the University of California.
*
* This file is part of NDNS (Named Data Networking Domain Name Service).
* See AUTHORS.md for complete list of NDNS authors and contributors.
@@ -178,7 +178,7 @@
RrsetFactory::generateCertRrset(const Name& label,
uint64_t version,
time::seconds ttl,
- const ndn::security::v2::Certificate& cert)
+ const ndn::security::Certificate& cert)
{
if (!m_checked) {
BOOST_THROW_EXCEPTION(Error("You have to call checkZoneKey before call generate functions"));
diff --git a/src/daemon/rrset-factory.hpp b/src/daemon/rrset-factory.hpp
index e8babc7..1773fe0 100644
--- a/src/daemon/rrset-factory.hpp
+++ b/src/daemon/rrset-factory.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2018, Regents of the University of California.
+ * Copyright (c) 2014-2020, Regents of the University of California.
*
* This file is part of NDNS (Named Data Networking Domain Name Service).
* See AUTHORS.md for complete list of NDNS authors and contributors.
@@ -80,7 +80,7 @@
generateCertRrset(const Name& label,
uint64_t version,
time::seconds ttl,
- const ndn::security::v2::Certificate& cert);
+ const ndn::security::Certificate& cert);
/**
* @brief DoE records are just txt records of all entries of a zone