security: Move KeyChain to security::v1 namespace and deprecated it
Change-Id: Ic4b6915ca15998a83b410f3f8fac027f797ee7ca
Refs: #3098
diff --git a/tools/ndnsec/cert-revoke.hpp b/tools/ndnsec/cert-revoke.hpp
index 6aa8d02..6e948e0 100644
--- a/tools/ndnsec/cert-revoke.hpp
+++ b/tools/ndnsec/cert-revoke.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+ * Copyright (c) 2013-2017 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -33,12 +33,12 @@
using namespace ndn::security;
namespace po = boost::program_options;
- KeyChain keyChain;
+ ndn::security::v1::KeyChain keyChain;
std::string requestFile("-");
Name signId = keyChain.getDefaultIdentity();
bool hasSignId = false;
- Name certPrefix = KeyChain::DEFAULT_PREFIX;
+ Name certPrefix = ndn::security::v1::KeyChain::DEFAULT_PREFIX;
po::options_description description("General Usage\n ndnsec cert-revoke [-h] request\n"
"General options");
@@ -108,7 +108,7 @@
}
Name certName;
- if (certPrefix == KeyChain::DEFAULT_PREFIX) {
+ if (certPrefix == ndn::security::v1::KeyChain::DEFAULT_PREFIX) {
certName = revokedCertificate->getName().getPrefix(-1);
}
else {
@@ -157,7 +157,7 @@
std::cerr << "ERROR: Cannot determine the signing key!" << std::endl;
return 1;
}
- catch (const SecPublicInfo::Error& e) {
+ catch (const v1::SecPublicInfo::Error& e) {
std::cerr << "ERROR: Incomplete or corrupted PIB (" << e.what() << ")" << std::endl;
return 1;
}