Remove more use of deprecated code

Change-Id: I4322ab4aedb9287acf2eb608f96b7eefbc5f7dba
Refs: #3988

src/security/certificate-store.hpp

@@ -26,7 +26,7 @@
 #include "../test-access-control.hpp"
 
 #include <ndn-cxx/interest.hpp>
-#include <ndn-cxx/security/identity-certificate.hpp>
+#include <ndn-cxx/security/v1/identity-certificate.hpp>
 
 namespace nlsr {
 namespace security {

tests-integrated/test-validator.cpp

@@ -219,7 +219,7 @@ BOOST_FIXTURE_TEST_CASE(InfoCertFetch, ValidatorFixture)
 
 BOOST_FIXTURE_TEST_CASE(CertificateStorage, ValidatorFixture)
 {
-  std::vector<ndn::CertificateSubjectDescription> subjectDescription;
+  std::vector<ndn::security::v1::CertificateSubjectDescription> subjectDescription;
 
   // Create an operator identity
   ndn::Name opIdentity("/TestValidator/operator/NLSR");

tests/update/test-prefix-update-processor.cpp

@@ -146,8 +146,8 @@ public:
     opCert->setNotBefore(time::system_clock::now() - time::days(1));
     opCert->setNotAfter(time::system_clock::now() + time::days(1));
     opCert->setPublicKeyInfo(*pubKey);
-    opCert->addSubjectDescription(CertificateSubjectDescription(ndn::oid::ATTRIBUTE_NAME,
-                                                                keyName.toUri()));
+    opCert->addSubjectDescription(ndn::security::v1::CertificateSubjectDescription(ndn::oid::ATTRIBUTE_NAME,
+                                                                                   keyName.toUri()));
     opCert->encode();
 
     keyChain.signByIdentity(*opCert, siteIdentity);