commit 60514ecc5d1a1b1c7f1d8b54f68d9d30c4b41c48
author Alexander Afanasyev <aa@cs.fiu.edu> Wed Jun 03 14:18:53 2020 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Wed Jun 10 10:53:45 2020 -0400
tree b86c486435690f55fc39c837109c126bedbbe3f5
parent 1bff1b2199b9ebec581f7ce8540bc98e328e46da

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

Change-Id: Id1e44e929541fdd1132a4b3e6366404232351e68

src/util/cert-helper.cpp

diff --git a/src/util/cert-helper.cpp b/src/util/cert-helper.cpp
index b4f3cab..164a34f 100644
--- a/src/util/cert-helper.cpp
+++ b/src/util/cert-helper.cpp
@@ -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.
@@ -39,7 +39,7 @@
   }
 }
 
-security::v2::Certificate
+security::Certificate
 CertHelper::getCertificate(const KeyChain& keyChain,
                            const Name& identity,
                            const Name& certName)
@@ -67,7 +67,7 @@
   BOOST_THROW_EXCEPTION(std::runtime_error(certName.toUri() + " is not a legal cert name"));
 }
 
-security::v2::Certificate
+security::Certificate
 CertHelper::getCertificate(const KeyChain& keyChain,
                            const Name& certName)
 {
@@ -89,7 +89,7 @@
                                             .getName();
 }
 
-security::v2::Certificate
+security::Certificate
 CertHelper::createCertificate(KeyChain& keyChain,
                               const security::Key& key,
                               const security::Key& signingKey,
@@ -100,7 +100,7 @@
   certificateName
     .append(issuer)
     .appendVersion();
-  security::v2::Certificate certificate;
+  security::Certificate certificate;
   certificate.setName(certificateName);
 
   // set metainfo

src/util/cert-helper.hpp

diff --git a/src/util/cert-helper.hpp b/src/util/cert-helper.hpp
index 6fd5f20..e9b627f 100644
--- a/src/util/cert-helper.hpp
+++ b/src/util/cert-helper.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.
@@ -40,12 +40,12 @@
   static Name
   getIdentityNameFromCert(const Name& certName);
 
-  static security::v2::Certificate
+  static security::Certificate
   getCertificate(const KeyChain& keyChain,
                  const Name& identity,
                  const Name& certName);
 
-  static security::v2::Certificate
+  static security::Certificate
   getCertificate(const KeyChain& keyChain,
                  const Name& certName);
 
@@ -55,7 +55,7 @@
   static const Name&
   getDefaultCertificateNameOfIdentity(const KeyChain& keyChain, const Name& identityName);
 
-  static security::v2::Certificate
+  static security::Certificate
   createCertificate(KeyChain& keyChain,
                     const security::Key& key,
                     const security::Key& signingKey,