--- gvpe/src/Makefile.in	2011/02/15 13:31:23	1.19
+++ gvpe/src/Makefile.in	2016/11/10 15:15:23	1.25
@@ -154,6 +154,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -172,18 +173,22 @@
    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 curve25519-donna-c64.c
 
+@ROHC_FALSE@ROHCLIB = 
 
 @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 ev_cpp.h ev_cpp.C 
+COMMON = global.h conf.h conf.C util.h util.C slog.h slog.C netcompat.h \
+         ev_cpp.h ev_cpp.C crypto.h crypto.C
 
 
 gvpe_SOURCES = gvpe.C vpn.h vpn.C vpn_tcp.C vpn_dns.C \
                sockinfo.h sockinfo.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)
@@ -211,9 +216,10 @@
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 
 am__objects_1 = conf.$(OBJEXT) util.$(OBJEXT) slog.$(OBJEXT) \
-	ev_cpp.$(OBJEXT)
+	ev_cpp.$(OBJEXT) crypto.$(OBJEXT)
 am_gvpe_OBJECTS = gvpe.$(OBJEXT) vpn.$(OBJEXT) vpn_tcp.$(OBJEXT) \
-	vpn_dns.$(OBJEXT) sockinfo.$(OBJEXT) connection.$(OBJEXT) \
+	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 \
@@ -228,8 +234,10 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/conf.Po ./$(DEPDIR)/connection.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/crypto.Po ./$(DEPDIR)/curve25519.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/device.Po ./$(DEPDIR)/ev_cpp.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/gvpe.Po ./$(DEPDIR)/gvpectrl.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/hkdf.Po ./$(DEPDIR)/iv_gen.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
@@ -318,10 +326,14 @@
 
 @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)/crypto.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)/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@