commit 5181d8950a7be6f89b9e005e1b63dc4fecffc075
author Alexander Afanasyev <aa@cs.fiu.edu> Sat Jun 06 18:05:47 2020 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Sat Jun 06 18:05:47 2020 -0400
tree b1e69ada0ba12f34a343245b067ebfa010f4f721
parent 1b9be6c1914bdc0bc6b935d93276117433299570

Adjust includes for the updated locations of ndn-cxx security headers

Change-Id: I4b527581a97f706e348096b4d77c8f13559c9224

tools/ndn-nac/add-member.cpp

diff --git a/tools/ndn-nac/add-member.cpp b/tools/ndn-nac/add-member.cpp
index cc8455c..c6d0347 100644
--- a/tools/ndn-nac/add-member.cpp
+++ b/tools/ndn-nac/add-member.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
  *
  * NAC library is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -80,8 +80,8 @@
     output = "-";
 
   try {
-    security::v2::KeyChain keyChain;
-    security::Identity id = keyChain.getPib().getIdentity(identityName);
+    KeyChain keyChain;
+    Identity id = keyChain.getPib().getIdentity(identityName);
 
     auto cert = loadCertificate(member);
 

tools/ndn-nac/dump-kek.cpp

diff --git a/tools/ndn-nac/dump-kek.cpp b/tools/ndn-nac/dump-kek.cpp
index 5d3c35e..afc8047 100644
--- a/tools/ndn-nac/dump-kek.cpp
+++ b/tools/ndn-nac/dump-kek.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
  *
  * NAC library is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -71,8 +71,8 @@
     output = "-";
 
   try {
-    security::v2::KeyChain keyChain;
-    security::Identity id = keyChain.getPib().getIdentity(identityName);
+    KeyChain keyChain;
+    Identity id = keyChain.getPib().getIdentity(identityName);
 
     util::DummyClientFace face(keyChain); // to avoid any real IO
     AccessManager manager(id, datasetName, keyChain, face);

tools/ndn-nac/ndn-nac.hpp

diff --git a/tools/ndn-nac/ndn-nac.hpp b/tools/ndn-nac/ndn-nac.hpp
index 3f70bbd..5c8fd85 100644
--- a/tools/ndn-nac/ndn-nac.hpp
+++ b/tools/ndn-nac/ndn-nac.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
  *
  * NAC library is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
@@ -44,14 +44,14 @@
 int
 nac_add_member(int argc, char** argv);
 
-inline security::v2::Certificate
+inline Certificate
 loadCertificate(const std::string& fileName)
 {
-  shared_ptr<security::v2::Certificate> cert;
+  shared_ptr<Certificate> cert;
   if (fileName == "-")
-    cert = io::load<security::v2::Certificate>(std::cin);
+    cert = io::load<Certificate>(std::cin);
   else
-    cert = io::load<security::v2::Certificate>(fileName);
+    cert = io::load<Certificate>(fileName);
 
   if (cert == nullptr) {
     BOOST_THROW_EXCEPTION(std::runtime_error("Cannot load certificate from " + fileName));