diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | keyDerivation.h | 10 | ||||
| -rw-r--r-- | syncSocket.h | 4 |
4 files changed, 15 insertions, 3 deletions
@@ -67,7 +67,7 @@ OBJS = anytun.o \ EXECUTABLE = anytun -all: $(EXECUTABLE) doxygen +all: $(EXECUTABLE) anytun: $(OBJS) $(LD) $(OBJS) -o $@ $(LDFLAGS) @@ -3,6 +3,8 @@ Dependencies libgcrypt11-dev libssl-dev (Openssl) +libboost-serialization-dev +libboost-dev Building ======== diff --git a/keyDerivation.h b/keyDerivation.h index a0c1a01..a1a2987 100644 --- a/keyDerivation.h +++ b/keyDerivation.h @@ -33,6 +33,8 @@ #include "datatypes.h" #include "buffer.h" +//#include <boost/archive/text_oarchive.hpp> +//#include <boost/archive/text_iarchive.hpp> extern "C" { @@ -56,7 +58,13 @@ public: void setLogKDRate(const u_int8_t ld_rate); void generate(satp_prf_label label, seq_nr_t seq_nr, Buffer& key, u_int32_t length); void clear(); - +private: + template<class Archive> + void serialize(Archive & ar, const unsigned int version) + { + ar & ld_kdr_; + ar & salt_; + } protected: int8_t ld_kdr_; // ld(key_derivation_rate) diff --git a/syncSocket.h b/syncSocket.h index 75d7c7c..25cc11a 100644 --- a/syncSocket.h +++ b/syncSocket.h @@ -4,7 +4,9 @@ #include "Sockets/TcpSocket.h" #include "Sockets/ISocketHandler.h" -using namespace sockets; +#ifdef SOCKETS_NAMESPACE +using namespace SOCKETS_NAMESPACE; +#endif // SOCKETS_NAMESPACE class SyncSocket : public TcpSocket { |