Various fixes for NFD/ndn-cxx 0.7.0
Change-Id: I68e5d4d57d81c3f2e46fc59680cd416b06c8190c
diff --git a/utils/dummy-keychain.cpp b/utils/dummy-keychain.cpp
index 02a3fad..3f62a4e 100644
--- a/utils/dummy-keychain.cpp
+++ b/utils/dummy-keychain.cpp
@@ -251,6 +251,13 @@
return make_shared<Buffer>(DUMMY_SIGNATURE, sizeof(DUMMY_SIGNATURE));
}
+bool
+DummyKeyHandle::doVerify(DigestAlgorithm digestAlgorithm, const uint8_t* buf, size_t bufLen,
+ const uint8_t* sig, size_t sigLen) const
+{
+ throw Error("Not supported");
+}
+
ConstBufferPtr
DummyKeyHandle::doDecrypt(const uint8_t* cipherText, size_t cipherTextLen) const
{
@@ -329,6 +336,12 @@
throw Error("Not supported");
}
+void
+DummyTpm::doImportKey(const Name& keyName, shared_ptr<transform::PrivateKey> key)
+{
+ throw Error("Not supported");
+}
+
std::string
DummyTpm::getScheme()
{
diff --git a/utils/dummy-keychain.hpp b/utils/dummy-keychain.hpp
index e71d083..7f8b0a3 100644
--- a/utils/dummy-keychain.hpp
+++ b/utils/dummy-keychain.hpp
@@ -147,6 +147,10 @@
ConstBufferPtr
doSign(DigestAlgorithm digestAlgorithm, const uint8_t* buf, size_t size) const final;
+ bool
+ doVerify(DigestAlgorithm digestAlgorithm, const uint8_t* buf, size_t bufLen,
+ const uint8_t* sig, size_t sigLen) const final;
+
ConstBufferPtr
doDecrypt(const uint8_t* cipherText, size_t cipherTextLen) const final;
@@ -209,6 +213,9 @@
void
doImportKey(const Name& keyName, const uint8_t* pkcs8, size_t pkcs8Len, const char* pw, size_t pwLen) final;
+ void
+ doImportKey(const Name& keyName, shared_ptr<transform::PrivateKey> key) final;
+
public:
static const std::string SCHEME;
};
diff --git a/utils/topology/annotated-topology-reader.hpp b/utils/topology/annotated-topology-reader.hpp
index 343743d..2f066dc 100644
--- a/utils/topology/annotated-topology-reader.hpp
+++ b/utils/topology/annotated-topology-reader.hpp
@@ -25,6 +25,7 @@
#include "ns3/topology-reader.h"
#include "ns3/random-variable-stream.h"
#include "ns3/object-factory.h"
+#include "ns3/node-container.h"
namespace ns3 {