Move key-chain to security subdirectory.
diff --git a/Makefile.am b/Makefile.am
index c882616..9608b28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,6 @@
ndn-cpp/common.hpp ndn-cpp/common.cpp \
ndn-cpp/data.cpp ndn-cpp/c/data.h ndn-cpp/data.hpp \
ndn-cpp/interest.cpp ndn-cpp/c/interest.h ndn-cpp/interest.hpp \
- ndn-cpp/key-chain.cpp ndn-cpp/key-chain.hpp \
ndn-cpp/key.cpp ndn-cpp/c/key.h ndn-cpp/key.hpp \
ndn-cpp/face.cpp ndn-cpp/face.hpp \
ndn-cpp/name.cpp ndn-cpp/c/name.h ndn-cpp/name.hpp \
@@ -57,6 +56,7 @@
ndn-cpp/c/encoding/binary-xml-structure-decoder.h ndn-cpp/encoding/binary-xml-structure-decoder.hpp \
ndn-cpp/encoding/binary-xml-wire-format.cpp ndn-cpp/c/encoding/binary-xml-name.h ndn-cpp/encoding/binary-xml-wire-format.hpp \
ndn-cpp/encoding/wire-format.cpp ndn-cpp/encoding/wire-format.hpp \
+ ndn-cpp/c/util/crypto.h ndn-cpp/security/key-chain.cpp ndn-cpp/security/key-chain.hpp \
ndn-cpp/c/transport/socket-transport.h ndn-cpp/c/transport/tcp-transport.h ndn-cpp/transport/tcp-transport.cpp ndn-cpp/transport/tcp-transport.hpp \
ndn-cpp/transport/transport.cpp ndn-cpp/transport/transport.hpp \
ndn-cpp/c/transport/socket-transport.h ndn-cpp/c/transport/udp-transport.h ndn-cpp/transport/udp-transport.cpp ndn-cpp/transport/udp-transport.hpp \
diff --git a/Makefile.in b/Makefile.in
index f594d19..c21b539 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -152,11 +152,11 @@
am__v_lt_1 =
libndn_cpp_la_LIBADD =
am_libndn_cpp_la_OBJECTS = ndn-cpp/common.lo ndn-cpp/data.lo \
- ndn-cpp/interest.lo ndn-cpp/key-chain.lo ndn-cpp/key.lo \
- ndn-cpp/face.lo ndn-cpp/name.lo ndn-cpp/node.lo \
+ ndn-cpp/interest.lo ndn-cpp/key.lo ndn-cpp/face.lo \
+ ndn-cpp/name.lo ndn-cpp/node.lo \
ndn-cpp/encoding/binary-xml-element-reader.lo \
ndn-cpp/encoding/binary-xml-wire-format.lo \
- ndn-cpp/encoding/wire-format.lo \
+ ndn-cpp/encoding/wire-format.lo ndn-cpp/security/key-chain.lo \
ndn-cpp/transport/tcp-transport.lo \
ndn-cpp/transport/transport.lo \
ndn-cpp/transport/udp-transport.lo \
@@ -491,7 +491,6 @@
ndn-cpp/common.hpp ndn-cpp/common.cpp \
ndn-cpp/data.cpp ndn-cpp/c/data.h ndn-cpp/data.hpp \
ndn-cpp/interest.cpp ndn-cpp/c/interest.h ndn-cpp/interest.hpp \
- ndn-cpp/key-chain.cpp ndn-cpp/key-chain.hpp \
ndn-cpp/key.cpp ndn-cpp/c/key.h ndn-cpp/key.hpp \
ndn-cpp/face.cpp ndn-cpp/face.hpp \
ndn-cpp/name.cpp ndn-cpp/c/name.h ndn-cpp/name.hpp \
@@ -504,6 +503,7 @@
ndn-cpp/c/encoding/binary-xml-structure-decoder.h ndn-cpp/encoding/binary-xml-structure-decoder.hpp \
ndn-cpp/encoding/binary-xml-wire-format.cpp ndn-cpp/c/encoding/binary-xml-name.h ndn-cpp/encoding/binary-xml-wire-format.hpp \
ndn-cpp/encoding/wire-format.cpp ndn-cpp/encoding/wire-format.hpp \
+ ndn-cpp/c/util/crypto.h ndn-cpp/security/key-chain.cpp ndn-cpp/security/key-chain.hpp \
ndn-cpp/c/transport/socket-transport.h ndn-cpp/c/transport/tcp-transport.h ndn-cpp/transport/tcp-transport.cpp ndn-cpp/transport/tcp-transport.hpp \
ndn-cpp/transport/transport.cpp ndn-cpp/transport/transport.hpp \
ndn-cpp/c/transport/socket-transport.h ndn-cpp/c/transport/udp-transport.h ndn-cpp/transport/udp-transport.cpp ndn-cpp/transport/udp-transport.hpp \
@@ -691,8 +691,6 @@
ndn-cpp/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/interest.lo: ndn-cpp/$(am__dirstamp) \
ndn-cpp/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/key-chain.lo: ndn-cpp/$(am__dirstamp) \
- ndn-cpp/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/key.lo: ndn-cpp/$(am__dirstamp) \
ndn-cpp/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/face.lo: ndn-cpp/$(am__dirstamp) \
@@ -715,6 +713,14 @@
ndn-cpp/encoding/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/encoding/wire-format.lo: ndn-cpp/encoding/$(am__dirstamp) \
ndn-cpp/encoding/$(DEPDIR)/$(am__dirstamp)
+ndn-cpp/security/$(am__dirstamp):
+ @$(MKDIR_P) ndn-cpp/security
+ @: > ndn-cpp/security/$(am__dirstamp)
+ndn-cpp/security/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) ndn-cpp/security/$(DEPDIR)
+ @: > ndn-cpp/security/$(DEPDIR)/$(am__dirstamp)
+ndn-cpp/security/key-chain.lo: ndn-cpp/security/$(am__dirstamp) \
+ ndn-cpp/security/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/transport/$(am__dirstamp):
@$(MKDIR_P) ndn-cpp/transport
@: > ndn-cpp/transport/$(am__dirstamp)
@@ -835,6 +841,8 @@
-rm -f ndn-cpp/c/util/*.lo
-rm -f ndn-cpp/encoding/*.$(OBJEXT)
-rm -f ndn-cpp/encoding/*.lo
+ -rm -f ndn-cpp/security/*.$(OBJEXT)
+ -rm -f ndn-cpp/security/*.lo
-rm -f ndn-cpp/transport/*.$(OBJEXT)
-rm -f ndn-cpp/transport/*.lo
-rm -f ndn-cpp/util/*.$(OBJEXT)
@@ -848,7 +856,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/data.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/face.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/interest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/key-chain.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/key.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/name.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/node.Plo@am__quote@
@@ -872,6 +879,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/encoding/$(DEPDIR)/binary-xml-element-reader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/encoding/$(DEPDIR)/binary-xml-wire-format.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/encoding/$(DEPDIR)/wire-format.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/security/$(DEPDIR)/key-chain.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/tcp-transport.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/transport.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/udp-transport.Plo@am__quote@
@@ -941,6 +949,7 @@
-rm -rf ndn-cpp/c/transport/.libs ndn-cpp/c/transport/_libs
-rm -rf ndn-cpp/c/util/.libs ndn-cpp/c/util/_libs
-rm -rf ndn-cpp/encoding/.libs ndn-cpp/encoding/_libs
+ -rm -rf ndn-cpp/security/.libs ndn-cpp/security/_libs
-rm -rf ndn-cpp/transport/.libs ndn-cpp/transport/_libs
-rm -rf ndn-cpp/util/.libs ndn-cpp/util/_libs
@@ -1210,6 +1219,8 @@
-rm -f ndn-cpp/c/util/$(am__dirstamp)
-rm -f ndn-cpp/encoding/$(DEPDIR)/$(am__dirstamp)
-rm -f ndn-cpp/encoding/$(am__dirstamp)
+ -rm -f ndn-cpp/security/$(DEPDIR)/$(am__dirstamp)
+ -rm -f ndn-cpp/security/$(am__dirstamp)
-rm -f ndn-cpp/transport/$(DEPDIR)/$(am__dirstamp)
-rm -f ndn-cpp/transport/$(am__dirstamp)
-rm -f ndn-cpp/util/$(DEPDIR)/$(am__dirstamp)
@@ -1227,7 +1238,7 @@
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ndn-cpp/$(DEPDIR) ndn-cpp/c/$(DEPDIR) ndn-cpp/c/encoding/$(DEPDIR) ndn-cpp/c/transport/$(DEPDIR) ndn-cpp/c/util/$(DEPDIR) ndn-cpp/encoding/$(DEPDIR) ndn-cpp/transport/$(DEPDIR) ndn-cpp/util/$(DEPDIR) tests/$(DEPDIR)
+ -rm -rf ndn-cpp/$(DEPDIR) ndn-cpp/c/$(DEPDIR) ndn-cpp/c/encoding/$(DEPDIR) ndn-cpp/c/transport/$(DEPDIR) ndn-cpp/c/util/$(DEPDIR) ndn-cpp/encoding/$(DEPDIR) ndn-cpp/security/$(DEPDIR) ndn-cpp/transport/$(DEPDIR) ndn-cpp/util/$(DEPDIR) tests/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -1275,7 +1286,7 @@
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ndn-cpp/$(DEPDIR) ndn-cpp/c/$(DEPDIR) ndn-cpp/c/encoding/$(DEPDIR) ndn-cpp/c/transport/$(DEPDIR) ndn-cpp/c/util/$(DEPDIR) ndn-cpp/encoding/$(DEPDIR) ndn-cpp/transport/$(DEPDIR) ndn-cpp/util/$(DEPDIR) tests/$(DEPDIR)
+ -rm -rf ndn-cpp/$(DEPDIR) ndn-cpp/c/$(DEPDIR) ndn-cpp/c/encoding/$(DEPDIR) ndn-cpp/c/transport/$(DEPDIR) ndn-cpp/c/util/$(DEPDIR) ndn-cpp/encoding/$(DEPDIR) ndn-cpp/security/$(DEPDIR) ndn-cpp/transport/$(DEPDIR) ndn-cpp/util/$(DEPDIR) tests/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/libtool b/libtool
index 0331b3e..ad8e0f5 100755
--- a/libtool
+++ b/libtool
@@ -2,7 +2,7 @@
# libtool - Provide generalized library-building support services.
# Generated automatically by config.status (ndn-cpp) 0.5
-# Libtool was configured on host Jeffs-MacBook-Pro.local:
+# Libtool was configured on host liger.remap.ucla.edu:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
diff --git a/ndn-cpp/node.cpp b/ndn-cpp/node.cpp
index 369f3ca..a93ebd7 100644
--- a/ndn-cpp/node.cpp
+++ b/ndn-cpp/node.cpp
@@ -57,6 +57,7 @@
{
if (ndndIdData->getSignedInfo().getPublisherPublicKeyDigest().getPublisherPublicKeyDigest().size() > 0) {
// Set the ndndId_ and continue.
+ // TODO: If there are multiple connected hubs, the NDN ID is really stored per connected hub.
info_->node_.ndndId_ = ndndIdData->getSignedInfo().getPublisherPublicKeyDigest().getPublisherPublicKeyDigest();
info_->node_.registerPrefixHelper(info_->prefix_, info_->onInterest_, info_->flags_);
}
diff --git a/ndn-cpp/key-chain.cpp b/ndn-cpp/security/key-chain.cpp
similarity index 98%
rename from ndn-cpp/key-chain.cpp
rename to ndn-cpp/security/key-chain.cpp
index b917405..65d61bb 100644
--- a/ndn-cpp/key-chain.cpp
+++ b/ndn-cpp/security/key-chain.cpp
@@ -4,9 +4,9 @@
*/
#include <stdexcept>
-#include "c/util/crypto.h"
-#include "c/encoding/binary-xml-data.h"
-#include "encoding/binary-xml-encoder.hpp"
+#include "../c/util/crypto.h"
+#include "../c/encoding/binary-xml-data.h"
+#include "../encoding/binary-xml-encoder.hpp"
#include "key-chain.hpp"
using namespace std;
diff --git a/ndn-cpp/key-chain.hpp b/ndn-cpp/security/key-chain.hpp
similarity index 98%
rename from ndn-cpp/key-chain.hpp
rename to ndn-cpp/security/key-chain.hpp
index cc15882..662e6a4 100644
--- a/ndn-cpp/key-chain.hpp
+++ b/ndn-cpp/security/key-chain.hpp
@@ -6,7 +6,7 @@
#ifndef NDN_KEY_CHAIN_HPP
#define NDN_KEY_CHAIN_HPP
-#include "data.hpp"
+#include "../data.hpp"
namespace ndn {
diff --git a/tests/test-encode-decode-data.cpp b/tests/test-encode-decode-data.cpp
index 387712a..0b4aa26 100644
--- a/tests/test-encode-decode-data.cpp
+++ b/tests/test-encode-decode-data.cpp
@@ -8,7 +8,7 @@
#include <iostream>
#include <time.h>
#include "../ndn-cpp/data.hpp"
-#include "../ndn-cpp/key-chain.hpp"
+#include "../ndn-cpp/security/key-chain.hpp"
using namespace std;
using namespace ndn;