--- gvpe/src/Makefile.in	2005/03/25 16:05:22	1.15
+++ gvpe/src/Makefile.in	2014/06/18 20:40:52	1.23
@@ -65,11 +65,12 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 HAVE_TUNTAP = @HAVE_TUNTAP@
 IFSUBTYPE = @IFSUBTYPE@
 IFTYPE = @IFTYPE@
 
-INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/libev @INCLUDES@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -100,6 +101,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
@@ -114,8 +116,6 @@
 XGETTEXT = @XGETTEXT@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -130,22 +130,30 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+
+localedir = $(datadir)/locale
 localstatedir = @localstatedir@
 mandir = @mandir@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -164,19 +172,23 @@
    tincd/linux/device.c tincd/mingw/common.h tincd/mingw/device.c tincd/netbsd/device.c	\
    tincd/openbsd/device.c tincd/raw_socket/device.c tincd/solaris/device.c \
    tincd/uml_socket/device.c tincd/bsd/device.c \
-   ether_emu.C lzf/lzf_c.c lzf/lzf_d.c
+   ether_emu.C lzf/lzf_c.c lzf/lzf_d.c \
+   curve25519-donna.c
 
 
 @ROHC_TRUE@ROHCLIB = rohc/librohc.a
 @ROHC_FALSE@ROHCLIB = 
 
 COMMON = global.h conf.h conf.C util.h util.C \
-         slog.h slog.C netcompat.h
+         slog.h slog.C netcompat.h ev_cpp.h ev_cpp.C
 
 
-gvpe_SOURCES = gvpe.C hash_map.h vpn.h vpn.C vpn_tcp.C vpn_dns.C \
+gvpe_SOURCES = gvpe.C vpn.h vpn.C vpn_tcp.C vpn_dns.C \
                sockinfo.h sockinfo.C \
-               lzf/lzf.h lzf/lzfP.h iom.h iom_conf.h iom.C \
+               curve25519.h curve25519.C \
+               iv_gen.h iv_gen.C \
+               hkdf.h hkdf.C \
+               lzf/lzf.h lzf/lzfP.h \
                connection.h connection.C callback.h device.h device.C \
                $(COMMON)
 
@@ -186,8 +198,6 @@
 gvpectrl_SOURCES = gvpectrl.C $(COMMON)
 gvpectrl_LDADD = $(top_builddir)/lib/libgvpe.a
 
-localedir = $(datadir)/locale
-
 DEFINES = -DPKGLIBDIR=$(pkglibdir) -DCONFDIR=\"$(sysconfdir)\"	\
 	  -DLOCALEDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" \
           -DIFTYPE_@IFTYPE@=1 -DIF_@IFSUBTYPE@=1
@@ -204,10 +214,12 @@
 sbin_PROGRAMS = gvpe$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 
-am__objects_1 = conf.$(OBJEXT) util.$(OBJEXT) slog.$(OBJEXT)
+am__objects_1 = conf.$(OBJEXT) util.$(OBJEXT) slog.$(OBJEXT) \
+	ev_cpp.$(OBJEXT)
 am_gvpe_OBJECTS = gvpe.$(OBJEXT) vpn.$(OBJEXT) vpn_tcp.$(OBJEXT) \
-	vpn_dns.$(OBJEXT) sockinfo.$(OBJEXT) iom.$(OBJEXT) \
-	connection.$(OBJEXT) device.$(OBJEXT) $(am__objects_1)
+	vpn_dns.$(OBJEXT) sockinfo.$(OBJEXT) curve25519.$(OBJEXT) \
+	iv_gen.$(OBJEXT) hkdf.$(OBJEXT) connection.$(OBJEXT) \
+	device.$(OBJEXT) $(am__objects_1)
 gvpe_OBJECTS = $(am_gvpe_OBJECTS)
 @ROHC_TRUE@gvpe_DEPENDENCIES = $(top_builddir)/lib/libgvpe.a \
 @ROHC_TRUE@	rohc/librohc.a
@@ -221,11 +233,13 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/conf.Po ./$(DEPDIR)/connection.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/device.Po ./$(DEPDIR)/gvpe.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/gvpectrl.Po ./$(DEPDIR)/iom.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/slog.Po ./$(DEPDIR)/sockinfo.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/util.Po ./$(DEPDIR)/vpn.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/vpn_dns.Po ./$(DEPDIR)/vpn_tcp.Po
+@AMDEP_TRUE@	./$(DEPDIR)/curve25519.Po ./$(DEPDIR)/device.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/ev_cpp.Po ./$(DEPDIR)/gvpe.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/gvpectrl.Po ./$(DEPDIR)/hkdf.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/iv_gen.Po ./$(DEPDIR)/slog.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/sockinfo.Po ./$(DEPDIR)/util.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/vpn.Po ./$(DEPDIR)/vpn_dns.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/vpn_tcp.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@@ -311,10 +325,13 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve25519.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ev_cpp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvpe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvpectrl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iom.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hkdf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iv_gen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockinfo.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@