encoding: Move oid support from security/certificate to encoding.
diff --git a/Makefile.am b/Makefile.am
index 779bd10..807e8f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,15 +40,15 @@
include/ndn-cpp/node.hpp \
include/ndn-cpp/publisher-public-key-digest.hpp \
include/ndn-cpp/sha256-with-rsa-signature.hpp \
- include/ndn-cpp/encoding/element-listener.hpp \
include/ndn-cpp/encoding/binary-xml-wire-format.hpp \
+ include/ndn-cpp/encoding/element-listener.hpp \
+ include/ndn-cpp/encoding/oid.hpp \
include/ndn-cpp/encoding/wire-format.hpp \
include/ndn-cpp/security/security-common.hpp \
include/ndn-cpp/security/key-chain.hpp \
include/ndn-cpp/security/security-exception.hpp \
include/ndn-cpp/security/certificate/certificate.hpp \
include/ndn-cpp/security/certificate/identity-certificate.hpp \
- include/ndn-cpp/security/certificate/oid.hpp \
include/ndn-cpp/security/certificate/public-key.hpp \
include/ndn-cpp/security/encryption/encryption-manager.hpp \
include/ndn-cpp/security/identity/basic-identity-storage.hpp \
@@ -112,10 +112,10 @@
ndn-cpp/encoding/binary-xml-structure-decoder.hpp \
ndn-cpp/encoding/binary-xml-wire-format.cpp \
ndn-cpp/encoding/element-listener.cpp \
+ ndn-cpp/encoding/oid.cpp \
ndn-cpp/encoding/wire-format.cpp \
ndn-cpp/security/key-chain.cpp \
ndn-cpp/security/security-exception.cpp \
- ndn-cpp/security/certificate/oid.cpp \
ndn-cpp/security/certificate/public-key.cpp \
ndn-cpp/security/identity/basic-identity-storage.cpp \
ndn-cpp/security/identity/identity-manager.cpp \
diff --git a/Makefile.in b/Makefile.in
index 45cdd95..ddbd037 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -180,10 +180,9 @@
ndn-cpp/publisher-public-key-digest.lo \
ndn-cpp/sha256-with-rsa-signature.lo \
ndn-cpp/encoding/binary-xml-wire-format.lo \
- ndn-cpp/encoding/element-listener.lo \
+ ndn-cpp/encoding/element-listener.lo ndn-cpp/encoding/oid.lo \
ndn-cpp/encoding/wire-format.lo ndn-cpp/security/key-chain.lo \
ndn-cpp/security/security-exception.lo \
- ndn-cpp/security/certificate/oid.lo \
ndn-cpp/security/certificate/public-key.lo \
ndn-cpp/security/identity/basic-identity-storage.lo \
ndn-cpp/security/identity/identity-manager.lo \
@@ -576,15 +575,15 @@
include/ndn-cpp/node.hpp \
include/ndn-cpp/publisher-public-key-digest.hpp \
include/ndn-cpp/sha256-with-rsa-signature.hpp \
- include/ndn-cpp/encoding/element-listener.hpp \
include/ndn-cpp/encoding/binary-xml-wire-format.hpp \
+ include/ndn-cpp/encoding/element-listener.hpp \
+ include/ndn-cpp/encoding/oid.hpp \
include/ndn-cpp/encoding/wire-format.hpp \
include/ndn-cpp/security/security-common.hpp \
include/ndn-cpp/security/key-chain.hpp \
include/ndn-cpp/security/security-exception.hpp \
include/ndn-cpp/security/certificate/certificate.hpp \
include/ndn-cpp/security/certificate/identity-certificate.hpp \
- include/ndn-cpp/security/certificate/oid.hpp \
include/ndn-cpp/security/certificate/public-key.hpp \
include/ndn-cpp/security/encryption/encryption-manager.hpp \
include/ndn-cpp/security/identity/basic-identity-storage.hpp \
@@ -650,10 +649,10 @@
ndn-cpp/encoding/binary-xml-structure-decoder.hpp \
ndn-cpp/encoding/binary-xml-wire-format.cpp \
ndn-cpp/encoding/element-listener.cpp \
+ ndn-cpp/encoding/oid.cpp \
ndn-cpp/encoding/wire-format.cpp \
ndn-cpp/security/key-chain.cpp \
ndn-cpp/security/security-exception.cpp \
- ndn-cpp/security/certificate/oid.cpp \
ndn-cpp/security/certificate/public-key.cpp \
ndn-cpp/security/identity/basic-identity-storage.cpp \
ndn-cpp/security/identity/identity-manager.cpp \
@@ -868,6 +867,8 @@
ndn-cpp/encoding/element-listener.lo: \
ndn-cpp/encoding/$(am__dirstamp) \
ndn-cpp/encoding/$(DEPDIR)/$(am__dirstamp)
+ndn-cpp/encoding/oid.lo: ndn-cpp/encoding/$(am__dirstamp) \
+ 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):
@@ -887,9 +888,6 @@
ndn-cpp/security/certificate/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) ndn-cpp/security/certificate/$(DEPDIR)
@: > ndn-cpp/security/certificate/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/security/certificate/oid.lo: \
- ndn-cpp/security/certificate/$(am__dirstamp) \
- ndn-cpp/security/certificate/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/security/certificate/public-key.lo: \
ndn-cpp/security/certificate/$(am__dirstamp) \
ndn-cpp/security/certificate/$(DEPDIR)/$(am__dirstamp)
@@ -1063,10 +1061,10 @@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/util/$(DEPDIR)/ndn_realloc.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)/element-listener.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/encoding/$(DEPDIR)/oid.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/security/$(DEPDIR)/security-exception.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/security/certificate/$(DEPDIR)/oid.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/security/certificate/$(DEPDIR)/public-key.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/security/identity/$(DEPDIR)/basic-identity-storage.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/security/identity/$(DEPDIR)/identity-manager.Plo@am__quote@
diff --git a/include/Makefile.am b/include/Makefile.am
index f3a7493..06d98aa 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,5 +1,5 @@
# "make install" will install these in the install include directory, for example
-# /usr/local/include/ndn-cpp/name.hpp.
+# /usr/local/ndn-cpp/name.hpp.
# These files are included by the application with, for example
# #include <ndn-cpp/namp.hpp>
# Internal include headers are not put in this public install directory.
@@ -27,15 +27,15 @@
ndn-cpp/node.hpp \
ndn-cpp/publisher-public-key-digest.hpp \
ndn-cpp/sha256-with-rsa-signature.hpp \
- ndn-cpp/encoding/element-listener.hpp \
ndn-cpp/encoding/binary-xml-wire-format.hpp \
+ ndn-cpp/encoding/element-listener.hpp \
+ ndn-cpp/encoding/oid.hpp \
ndn-cpp/encoding/wire-format.hpp \
ndn-cpp/security/security-common.hpp \
ndn-cpp/security/key-chain.hpp \
ndn-cpp/security/security-exception.hpp \
ndn-cpp/security/certificate/certificate.hpp \
ndn-cpp/security/certificate/identity-certificate.hpp \
- ndn-cpp/security/certificate/oid.hpp \
ndn-cpp/security/certificate/public-key.hpp \
ndn-cpp/security/encryption/encryption-manager.hpp \
ndn-cpp/security/identity/basic-identity-storage.hpp \
diff --git a/include/Makefile.in b/include/Makefile.in
index 8f4827a..0ede7e9 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@
# "make install" will install these in the install include directory, for example
-# /usr/local/include/ndn-cpp/name.hpp.
+# /usr/local/ndn-cpp/name.hpp.
# These files are included by the application with, for example
# #include <ndn-cpp/namp.hpp>
# Internal include headers are not put in this public install directory.
@@ -344,15 +344,15 @@
ndn-cpp/node.hpp \
ndn-cpp/publisher-public-key-digest.hpp \
ndn-cpp/sha256-with-rsa-signature.hpp \
- ndn-cpp/encoding/element-listener.hpp \
ndn-cpp/encoding/binary-xml-wire-format.hpp \
+ ndn-cpp/encoding/element-listener.hpp \
+ ndn-cpp/encoding/oid.hpp \
ndn-cpp/encoding/wire-format.hpp \
ndn-cpp/security/security-common.hpp \
ndn-cpp/security/key-chain.hpp \
ndn-cpp/security/security-exception.hpp \
ndn-cpp/security/certificate/certificate.hpp \
ndn-cpp/security/certificate/identity-certificate.hpp \
- ndn-cpp/security/certificate/oid.hpp \
ndn-cpp/security/certificate/public-key.hpp \
ndn-cpp/security/encryption/encryption-manager.hpp \
ndn-cpp/security/identity/basic-identity-storage.hpp \
diff --git a/include/ndn-cpp/security/certificate/oid.hpp b/include/ndn-cpp/encoding/oid.hpp
similarity index 100%
rename from include/ndn-cpp/security/certificate/oid.hpp
rename to include/ndn-cpp/encoding/oid.hpp
diff --git a/include/ndn-cpp/security/certificate/public-key.hpp b/include/ndn-cpp/security/certificate/public-key.hpp
index 7db3f49..fa8724f 100644
--- a/include/ndn-cpp/security/certificate/public-key.hpp
+++ b/include/ndn-cpp/security/certificate/public-key.hpp
@@ -10,7 +10,7 @@
#define NDN_PUBLIC_KEY_HPP
#include "../../util/blob.hpp"
-#include "oid.hpp"
+#include "../../encoding/oid.hpp"
#include "../security-common.hpp"
namespace ndn {
diff --git a/ndn-cpp/security/certificate/oid.cpp b/ndn-cpp/encoding/oid.cpp
similarity index 95%
rename from ndn-cpp/security/certificate/oid.cpp
rename to ndn-cpp/encoding/oid.cpp
index b03d93e..236e420 100644
--- a/ndn-cpp/security/certificate/oid.cpp
+++ b/ndn-cpp/encoding/oid.cpp
@@ -8,7 +8,7 @@
#include <stdlib.h>
#include <sstream>
-#include <ndn-cpp/security/certificate/oid.hpp>
+#include <ndn-cpp/encoding/oid.hpp>
using namespace std;